diff --git a/backend/src/ee/services/permission/permission-fns.ts b/backend/src/ee/services/permission/permission-fns.ts index f8f2fa0b8..f8a36bcad 100644 --- a/backend/src/ee/services/permission/permission-fns.ts +++ b/backend/src/ee/services/permission/permission-fns.ts @@ -187,7 +187,9 @@ const constructPermissionErrorMessage = ( opAction: OrgPermissionSet[0] | ProjectPermissionSet[0], opSubject: OrgPermissionSet[1] | ProjectPermissionSet[1] ) => { - return `${baseMessage}${shouldUseNewPrivilegeSystem ? `. Missing permission ${opAction} on ${opSubject}` : ""}`; + return `${baseMessage}${ + shouldUseNewPrivilegeSystem ? `. Missing permission ${opAction as string} on ${opSubject as string}` : "" + }`; }; export { diff --git a/backend/src/services/org/org-service.ts b/backend/src/services/org/org-service.ts index 844d3f385..9b4680317 100644 --- a/backend/src/services/org/org-service.ts +++ b/backend/src/services/org/org-service.ts @@ -1076,9 +1076,9 @@ export const orgServiceFactory = ({ const sanitizedProjectMembershipRoles: TProjectUserMembershipRolesInsert[] = []; invitedProjectRoles.forEach((projectRole) => { const isCustomRole = Boolean(customRolesGroupBySlug?.[projectRole]?.[0]); - projectMemberships.forEach((membership) => { + projectMemberships.forEach((membershipEntry) => { sanitizedProjectMembershipRoles.push({ - projectMembershipId: membership.id, + projectMembershipId: membershipEntry.id, role: isCustomRole ? ProjectMembershipRole.Custom : projectRole, customRoleId: customRolesGroupBySlug[projectRole] ? customRolesGroupBySlug[projectRole][0].id : null }); diff --git a/frontend/src/pages/organization/AccessManagementPage/components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal.tsx b/frontend/src/pages/organization/AccessManagementPage/components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal.tsx index 71cfe460f..aa505965b 100644 --- a/frontend/src/pages/organization/AccessManagementPage/components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal.tsx +++ b/frontend/src/pages/organization/AccessManagementPage/components/UpgradePrivilegeSystemModal/UpgradePrivilegeSystemModal.tsx @@ -64,7 +64,7 @@ export const UpgradePrivilegeSystemModal = ({ isOpen, onOpenChange }: Props) => Introducing Permission-Based Privilege Management

- We've developed an improved privilege management system that enhances how access + We've developed an improved privilege management system that enhances how access controls work in your organization.

@@ -75,19 +75,22 @@ export const UpgradePrivilegeSystemModal = ({ isOpen, onOpenChange }: Props) =>

How it works:

-

+

Legacy system: Users with higher privilege levels could modify - access for anyone below them. + access for anyone below them. This limits accountability and makes it impossible + to allow specialized roles (like team leads) to manage their team's access + without granting them broader administrative powers.

New system: Users need explicit permission to modify specific - access levels, providing targeted control. After upgrading, you'll need to grant - the new 'Manage Privileges' permission at organization or project level. + access levels, providing targeted control. After upgrading, you'll need to + grant the new 'Manage Privileges' permission at organization or project + level.

-
+

Benefits:

@@ -128,8 +131,8 @@ export const UpgradePrivilegeSystemModal = ({ isOpen, onOpenChange }: Props) =>

Once upgraded, your organization cannot revert to - the legacy privilege system. Please ensure you've completed all preparations before - proceeding. + the legacy privilege system. Please ensure you've completed all preparations + before proceeding.