From e4a21379911395e85f5739ed0d8243c2a4d06b60 Mon Sep 17 00:00:00 2001
From: Maidul Islam <maidul98@gmail.com>
Date: Mon, 5 Aug 2024 10:01:15 -0400
Subject: [PATCH] update permission action name for org admin console

---
 backend/src/ee/services/permission/org-permission.ts      | 4 ++--
 backend/src/services/org-admin/org-admin-service.ts       | 4 ++--
 frontend/src/context/OrgPermissionContext/types.ts        | 2 +-
 .../Org/RolePage/components/OrgRoleModifySection.utils.ts | 2 +-
 .../OrgPermissionAdminConsoleRow.tsx                      | 8 ++++----
 .../components/OrgAdminProjects/OrgAdminProjects.tsx      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/src/ee/services/permission/org-permission.ts b/backend/src/ee/services/permission/org-permission.ts
index c07107912..9a5afe024 100644
--- a/backend/src/ee/services/permission/org-permission.ts
+++ b/backend/src/ee/services/permission/org-permission.ts
@@ -10,7 +10,7 @@ export enum OrgPermissionActions {
 }
 
 export enum OrgPermissionAdminConsoleAction {
-  GrantAccessProjects = "grant-access-projects"
+  AccessAllProjects = "access-all-projects"
 }
 
 export enum OrgPermissionSubjects {
@@ -113,7 +113,7 @@ const buildAdminPermission = () => {
   can(OrgPermissionActions.Edit, OrgPermissionSubjects.Kms);
   can(OrgPermissionActions.Delete, OrgPermissionSubjects.Kms);
 
-  can(OrgPermissionAdminConsoleAction.GrantAccessProjects, OrgPermissionSubjects.AdminConsole);
+  can(OrgPermissionAdminConsoleAction.AccessAllProjects, OrgPermissionSubjects.AdminConsole);
 
   return build({ conditionsMatcher });
 };
diff --git a/backend/src/services/org-admin/org-admin-service.ts b/backend/src/services/org-admin/org-admin-service.ts
index cfdda663d..4759db309 100644
--- a/backend/src/services/org-admin/org-admin-service.ts
+++ b/backend/src/services/org-admin/org-admin-service.ts
@@ -53,7 +53,7 @@ export const orgAdminServiceFactory = ({
       actorOrgId
     );
     ForbiddenError.from(permission).throwUnlessCan(
-      OrgPermissionAdminConsoleAction.GrantAccessProjects,
+      OrgPermissionAdminConsoleAction.AccessAllProjects,
       OrgPermissionSubjects.AdminConsole
     );
     const projects = await projectDAL.find(
@@ -85,7 +85,7 @@ export const orgAdminServiceFactory = ({
       actorOrgId
     );
     ForbiddenError.from(permission).throwUnlessCan(
-      OrgPermissionAdminConsoleAction.GrantAccessProjects,
+      OrgPermissionAdminConsoleAction.AccessAllProjects,
       OrgPermissionSubjects.AdminConsole
     );
 
diff --git a/frontend/src/context/OrgPermissionContext/types.ts b/frontend/src/context/OrgPermissionContext/types.ts
index a36aaac69..9d846a065 100644
--- a/frontend/src/context/OrgPermissionContext/types.ts
+++ b/frontend/src/context/OrgPermissionContext/types.ts
@@ -25,7 +25,7 @@ export enum OrgPermissionSubjects {
 }
 
 export enum OrgPermissionAdminConsoleAction {
-  GrantAccessProjects = "grant-access-projects"
+  AccessAllProjects = "access-all-projects"
 }
 
 export type OrgPermissionSet =
diff --git a/frontend/src/views/Org/RolePage/components/OrgRoleModifySection.utils.ts b/frontend/src/views/Org/RolePage/components/OrgRoleModifySection.utils.ts
index ba5308cd9..2d83bf705 100644
--- a/frontend/src/views/Org/RolePage/components/OrgRoleModifySection.utils.ts
+++ b/frontend/src/views/Org/RolePage/components/OrgRoleModifySection.utils.ts
@@ -14,7 +14,7 @@ const generalPermissionSchema = z
 
 const adminConsolePermissionSchmea = z
   .object({
-    "grant-access-projects": z.boolean().optional()
+    "access-all-projects": z.boolean().optional()
   })
   .optional();
 
diff --git a/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx b/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx
index 21d58aabb..c657aa8a4 100644
--- a/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx
+++ b/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx
@@ -20,7 +20,7 @@ enum Permission {
 }
 
 const PERMISSION_ACTIONS = [
-  { action: "grant-access-projects", label: "Grant access projects" }
+  { action: "access-all-projects", label: "Access all organization projects" }
 ] as const;
 
 export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }: Props) => {
@@ -33,7 +33,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }:
   });
 
   const selectedPermissionCategory = useMemo(() => {
-    if (rule?.["grant-access-projects"]) {
+    if (rule?.["access-all-projects"]) {
       return Permission.Custom;
     }
     return Permission.NoAccess;
@@ -63,7 +63,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }:
     if (val === Permission.NoAccess) {
       setValue(
         "permissions.admin-console",
-        { "grant-access-projects": false },
+        { "access-all-projects": false },
         { shouldDirty: true }
       );
     }
@@ -78,7 +78,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }:
         <Td>
           <FontAwesomeIcon icon={isRowExpanded ? faChevronDown : faChevronRight} />
         </Td>
-        <Td>Admin Console</Td>
+        <Td>Organization Admin Console</Td>
         <Td>
           <Select
             value={selectedPermissionCategory}
diff --git a/frontend/src/views/OrgAdminPage/components/OrgAdminProjects/OrgAdminProjects.tsx b/frontend/src/views/OrgAdminPage/components/OrgAdminProjects/OrgAdminProjects.tsx
index 8461cc893..516f248f0 100644
--- a/frontend/src/views/OrgAdminPage/components/OrgAdminProjects/OrgAdminProjects.tsx
+++ b/frontend/src/views/OrgAdminPage/components/OrgAdminProjects/OrgAdminProjects.tsx
@@ -161,7 +161,7 @@ export const OrgAdminProjects = withPermission(
     );
   },
   {
-    action: OrgPermissionAdminConsoleAction.GrantAccessProjects,
+    action: OrgPermissionAdminConsoleAction.AccessAllProjects,
     subject: OrgPermissionSubjects.AdminConsole
   }
 );