diff --git a/backend/src/ee/services/permission/org-permission.ts b/backend/src/ee/services/permission/org-permission.ts index 9a5afe024..4c0770ad9 100644 --- a/backend/src/ee/services/permission/org-permission.ts +++ b/backend/src/ee/services/permission/org-permission.ts @@ -27,7 +27,7 @@ export enum OrgPermissionSubjects { SecretScanning = "secret-scanning", Identity = "identity", Kms = "kms", - AdminConsole = "admin-console" + AdminConsole = "organization-admin-console" } export type OrgPermissionSet = diff --git a/frontend/src/context/OrgPermissionContext/types.ts b/frontend/src/context/OrgPermissionContext/types.ts index 9d846a065..5b7ef0174 100644 --- a/frontend/src/context/OrgPermissionContext/types.ts +++ b/frontend/src/context/OrgPermissionContext/types.ts @@ -21,7 +21,7 @@ export enum OrgPermissionSubjects { SecretScanning = "secret-scanning", Identity = "identity", Kms = "kms", - AdminConsole = "admin-console" + AdminConsole = "organization-admin-console" } export enum OrgPermissionAdminConsoleAction { diff --git a/frontend/src/views/Org/RolePage/components/OrgRoleModifySection.utils.ts b/frontend/src/views/Org/RolePage/components/OrgRoleModifySection.utils.ts index 2d83bf705..13cf2316b 100644 --- a/frontend/src/views/Org/RolePage/components/OrgRoleModifySection.utils.ts +++ b/frontend/src/views/Org/RolePage/components/OrgRoleModifySection.utils.ts @@ -44,7 +44,7 @@ export const formSchema = z.object({ ldap: generalPermissionSchema, billing: generalPermissionSchema, identity: generalPermissionSchema, - "admin-console": adminConsolePermissionSchmea + "organization-admin-console": adminConsolePermissionSchmea }) .optional() }); diff --git a/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx b/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx index c657aa8a4..cc21abdf1 100644 --- a/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx +++ b/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx @@ -29,7 +29,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }: const rule = useWatch({ control, - name: "permissions.admin-console" + name: "permissions.organization-admin-console" }); const selectedPermissionCategory = useMemo(() => { @@ -62,7 +62,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }: if (val === Permission.NoAccess) { setValue( - "permissions.admin-console", + "permissions.organization-admin-console", { "access-all-projects": false }, { shouldDirty: true } ); @@ -102,8 +102,8 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }: {PERMISSION_ACTIONS.map(({ action, label }) => { return ( ( {label} diff --git a/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx b/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx index ea7f368c5..a4eb51774 100644 --- a/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx +++ b/frontend/src/views/Org/RolePage/components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx @@ -112,7 +112,7 @@ export const OrgRoleWorkspaceRow = ({ isEditable, control, setValue }: Props) => } field.onChange(e); }} - id={`permissions.admin-console.${action}`} + id={`permissions.organization-admin-console.${action}`} > {label} diff --git a/frontend/src/views/Org/RolePage/components/RolePermissionsSection/RolePermissionRow.tsx b/frontend/src/views/Org/RolePage/components/RolePermissionsSection/RolePermissionRow.tsx index 7f6c3953e..ba76effe1 100644 --- a/frontend/src/views/Org/RolePage/components/RolePermissionsSection/RolePermissionRow.tsx +++ b/frontend/src/views/Org/RolePage/components/RolePermissionsSection/RolePermissionRow.tsx @@ -63,7 +63,7 @@ type Props = { title: string; formName: keyof Omit< Exclude, - "workspace" | "admin-console" + "workspace" | "organization-admin-console" >; setValue: UseFormSetValue; control: Control;