Merge pull request wso2#6112 from pavinduLakshan/hide_system_apps

Yasasr1 · May 2, 2024 · 2a9f30f · 2a9f30f
2 parents a9a7cc9 + 0656e0a
commit 2a9f30f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/.changeset/shaggy-spoons-unite.md b/.changeset/shaggy-spoons-unite.md
@@ -0,0 +1,6 @@
+---
+"@wso2is/core": patch
+"@wso2is/features": patch
+---
+
+Prevent editing, deleting and assigning groups/users to system roles
diff --git a/features/admin.roles.v2/components/edit-role/edit-role.tsx b/features/admin.roles.v2/components/edit-role/edit-role.tsx
@@ -81,9 +81,10 @@ export const EditRole: FunctionComponent<EditRoleProps> = (props: EditRoleProps)
 
     const isReadOnly: boolean = useMemo(() => {
         return !isFeatureEnabled(featureConfig,
-            LocalRoleConstants.FEATURE_DICTIONARY.get("ROLE_UPDATE")) ||
-            !hasRequiredScopes(featureConfig,
-                featureConfig?.scopes?.update, allowedScopes);
+            LocalRoleConstants.FEATURE_DICTIONARY.get("ROLE_UPDATE"))
+            || !hasRequiredScopes(featureConfig,
+                featureConfig?.scopes?.update, allowedScopes)
+            || roleObject?.meta?.systemRole;
     }, [ featureConfig, allowedScopes ]);
 
     const isUserReadOnly: boolean = useMemo(() => {

diff --git a/features/admin.roles.v2/components/role-list.tsx b/features/admin.roles.v2/components/role-list.tsx
@@ -279,6 +279,7 @@ export const RoleList: React.FunctionComponent<RoleListProps> = (props: RoleList
     const resolveTableActions = (): TableActionsInterface[] => {
         return [
             {
+                hidden: (role: RolesInterface) => role?.meta?.systemRole,
                 icon: (): SemanticICONS =>
                     !isReadOnly
                         ? "pencil alternate"
@@ -292,14 +293,19 @@ export const RoleList: React.FunctionComponent<RoleListProps> = (props: RoleList
                 renderer: "semantic-icon"
             },
             {
-                hidden: (role: RolesInterface) => isSubOrg ||
-                    (role?.displayName === CommonRoleConstants.ADMIN_ROLE ||
+                hidden: (role: RolesInterface) => {
+                    return isSubOrg
+                    || role?.meta?.systemRole
+                    || (
+                        role?.displayName === CommonRoleConstants.ADMIN_ROLE ||
                         role?.displayName === CommonRoleConstants.ADMIN_GROUP ||
-                        role?.displayName === administratorRoleDisplayName)
+                        role?.displayName === administratorRoleDisplayName
+                    )
                     || !isFeatureEnabled(userRolesFeatureConfig,
                         RoleConstants.FEATURE_DICTIONARY.get("ROLE_DELETE"))
                     || !hasRequiredScopes(userRolesFeatureConfig,
-                        userRolesFeatureConfig?.scopes?.delete, allowedScopes),
+                        userRolesFeatureConfig?.scopes?.delete, allowedScopes);
+                },
                 icon: (): SemanticICONS => "trash alternate",
                 onClick: (e: SyntheticEvent, role: RolesInterface): void => {
                     onRoleDeleteClicked(role);

diff --git a/modules/core/src/models/roles.ts b/modules/core/src/models/roles.ts
@@ -48,6 +48,7 @@ export interface RolesMetaInterface {
     created?: string;
     location: string;
     lastModified?: string;
+    systemRole?: boolean;
 }
 
 /**