update permission action name for org admin console

This commit is contained in:
Maidul Islam
2024-08-05 10:01:15 -04:00
parent 711a4179ce
commit e4a2137991
6 changed files with 11 additions and 11 deletions
@@ -10,7 +10,7 @@ export enum OrgPermissionActions {
} }
export enum OrgPermissionAdminConsoleAction { export enum OrgPermissionAdminConsoleAction {
GrantAccessProjects = "grant-access-projects" AccessAllProjects = "access-all-projects"
} }
export enum OrgPermissionSubjects { export enum OrgPermissionSubjects {
@@ -113,7 +113,7 @@ const buildAdminPermission = () => {
can(OrgPermissionActions.Edit, OrgPermissionSubjects.Kms); can(OrgPermissionActions.Edit, OrgPermissionSubjects.Kms);
can(OrgPermissionActions.Delete, OrgPermissionSubjects.Kms); can(OrgPermissionActions.Delete, OrgPermissionSubjects.Kms);
can(OrgPermissionAdminConsoleAction.GrantAccessProjects, OrgPermissionSubjects.AdminConsole); can(OrgPermissionAdminConsoleAction.AccessAllProjects, OrgPermissionSubjects.AdminConsole);
return build({ conditionsMatcher }); return build({ conditionsMatcher });
}; };
@@ -53,7 +53,7 @@ export const orgAdminServiceFactory = ({
actorOrgId actorOrgId
); );
ForbiddenError.from(permission).throwUnlessCan( ForbiddenError.from(permission).throwUnlessCan(
OrgPermissionAdminConsoleAction.GrantAccessProjects, OrgPermissionAdminConsoleAction.AccessAllProjects,
OrgPermissionSubjects.AdminConsole OrgPermissionSubjects.AdminConsole
); );
const projects = await projectDAL.find( const projects = await projectDAL.find(
@@ -85,7 +85,7 @@ export const orgAdminServiceFactory = ({
actorOrgId actorOrgId
); );
ForbiddenError.from(permission).throwUnlessCan( ForbiddenError.from(permission).throwUnlessCan(
OrgPermissionAdminConsoleAction.GrantAccessProjects, OrgPermissionAdminConsoleAction.AccessAllProjects,
OrgPermissionSubjects.AdminConsole OrgPermissionSubjects.AdminConsole
); );
@@ -25,7 +25,7 @@ export enum OrgPermissionSubjects {
} }
export enum OrgPermissionAdminConsoleAction { export enum OrgPermissionAdminConsoleAction {
GrantAccessProjects = "grant-access-projects" AccessAllProjects = "access-all-projects"
} }
export type OrgPermissionSet = export type OrgPermissionSet =
@@ -14,7 +14,7 @@ const generalPermissionSchema = z
const adminConsolePermissionSchmea = z const adminConsolePermissionSchmea = z
.object({ .object({
"grant-access-projects": z.boolean().optional() "access-all-projects": z.boolean().optional()
}) })
.optional(); .optional();
@@ -20,7 +20,7 @@ enum Permission {
} }
const PERMISSION_ACTIONS = [ const PERMISSION_ACTIONS = [
{ action: "grant-access-projects", label: "Grant access projects" } { action: "access-all-projects", label: "Access all organization projects" }
] as const; ] as const;
export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }: Props) => { export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }: Props) => {
@@ -33,7 +33,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }:
}); });
const selectedPermissionCategory = useMemo(() => { const selectedPermissionCategory = useMemo(() => {
if (rule?.["grant-access-projects"]) { if (rule?.["access-all-projects"]) {
return Permission.Custom; return Permission.Custom;
} }
return Permission.NoAccess; return Permission.NoAccess;
@@ -63,7 +63,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }:
if (val === Permission.NoAccess) { if (val === Permission.NoAccess) {
setValue( setValue(
"permissions.admin-console", "permissions.admin-console",
{ "grant-access-projects": false }, { "access-all-projects": false },
{ shouldDirty: true } { shouldDirty: true }
); );
} }
@@ -78,7 +78,7 @@ export const OrgPermissionAdminConsoleRow = ({ isEditable, control, setValue }:
<Td> <Td>
<FontAwesomeIcon icon={isRowExpanded ? faChevronDown : faChevronRight} /> <FontAwesomeIcon icon={isRowExpanded ? faChevronDown : faChevronRight} />
</Td> </Td>
<Td>Admin Console</Td> <Td>Organization Admin Console</Td>
<Td> <Td>
<Select <Select
value={selectedPermissionCategory} value={selectedPermissionCategory}
@@ -161,7 +161,7 @@ export const OrgAdminProjects = withPermission(
); );
}, },
{ {
action: OrgPermissionAdminConsoleAction.GrantAccessProjects, action: OrgPermissionAdminConsoleAction.AccessAllProjects,
subject: OrgPermissionSubjects.AdminConsole subject: OrgPermissionSubjects.AdminConsole
} }
); );