diff --git a/backend/src/services/group-project/group-project-service.ts b/backend/src/services/group-project/group-project-service.ts index 4b689f906..3a59e6615 100644 --- a/backend/src/services/group-project/group-project-service.ts +++ b/backend/src/services/group-project/group-project-service.ts @@ -68,6 +68,7 @@ export const groupProjectServiceFactory = ({ }); if (!project) throw new BadRequestError({ message: `Failed to find project with slug ${projectSlug}` }); + if (project.version < 2) throw new BadRequestError({ message: `Failed to add group to E2EE project` }); const { permission } = await permissionService.getProjectPermission( actor, diff --git a/frontend/src/views/Project/MembersPage/MembersPage.tsx b/frontend/src/views/Project/MembersPage/MembersPage.tsx index cae8ee4c3..af4b46d4b 100644 --- a/frontend/src/views/Project/MembersPage/MembersPage.tsx +++ b/frontend/src/views/Project/MembersPage/MembersPage.tsx @@ -2,7 +2,7 @@ import { motion } from "framer-motion"; import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2"; -import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context"; +import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context"; import { withProjectPermission } from "@app/hoc"; import { GroupsTab, IdentityTab, MemberListTab, ProjectRoleListTab, ServiceTokenTab } from "./components"; @@ -17,6 +17,9 @@ enum TabSections { export const MembersPage = withProjectPermission( () => { + const { currentWorkspace } = useWorkspace(); + console.log("currentWorkspace: ", currentWorkspace); + return (
Machine Identities
@@ -36,17 +41,19 @@ export const MembersPage = withProjectPermission(