Enable role creation and deletion capability in sub organization level

wso2 · Jan 2, 2025 · d0ea674 · d0ea674
1 parent 2236b69
commit d0ea674
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/features/admin.roles.v2/components/role-list.tsx b/features/admin.roles.v2/components/role-list.tsx
@@ -29,6 +29,7 @@ import {
     IdentifiableComponentInterface,
     LoadableComponentInterface,
     RoleListInterface,
+    RolePropertyInterface,
     RolesInterface
 } from "@wso2is/core/models";
 import {
@@ -296,8 +297,10 @@ export const RoleList: React.FunctionComponent<RoleListProps> = (props: RoleList
             },
             {
                 hidden: (role: RolesInterface) => {
-                    return isSubOrg
-                    || role?.meta?.systemRole
+                    const isSharedRole: boolean = role?.properties?.some((property: RolePropertyInterface) =>
+                        property?.name === "isSharedRole" && property?.value === "true");
+
+                    return role?.meta?.systemRole
                     || (
                         role?.displayName === CommonRoleConstants.ADMIN_ROLE ||
                         role?.displayName === CommonRoleConstants.ADMIN_GROUP ||
@@ -306,7 +309,8 @@ export const RoleList: React.FunctionComponent<RoleListProps> = (props: RoleList
                     || !isFeatureEnabled(userRolesFeatureConfig,
                         RoleConstants.FEATURE_DICTIONARY.get("ROLE_DELETE"))
                     || !hasRequiredScopes(userRolesFeatureConfig,
-                        userRolesFeatureConfig?.scopes?.delete, allowedScopes);
+                        userRolesFeatureConfig?.scopes?.delete, allowedScopes)
+                    || isSharedRole;
                 },
                 icon: (): SemanticICONS => "trash alternate",
                 onClick: (e: SyntheticEvent, role: RolesInterface): void => {

diff --git a/features/admin.roles.v2/pages/role.tsx b/features/admin.roles.v2/pages/role.tsx
@@ -221,27 +221,25 @@ const RolesPage: FunctionComponent<RolesPagePropsInterface> = (
     return (
         <PageLayout
             action={
-                !isSubOrg && !isRolesListLoading && (rolesList?.totalResults > 0)
-                    ? (
-                        <Show when={ featureConfig?.userRoles?.scopes?.create }>
-                            <PrimaryButton
-                                data-componentid={ `${componentId}-add-button` }
-                                onClick={ () => handleCreateRole() }
-                            >
-                                <Icon
-                                    data-componentid={ `${componentId}-add-button-icon` }
-                                    name="add"
-                                />
-                                { t("roles:list.buttons.addButton", { type: "Role" }) }
-                            </PrimaryButton>
-                        </Show>
-                    ) : null
+                (
+                    <Show when={ featureConfig?.userRoles?.scopes?.create }>
+                        <PrimaryButton
+                            data-componentid={ `${componentId}-add-button` }
+                            onClick={ () => handleCreateRole() }
+                        >
+                            <Icon
+                                data-componentid={ `${componentId}-add-button-icon` }
+                                name="add"
+                            />
+                            { t("roles:list.buttons.addButton", { type: "Role" }) }
+                        </PrimaryButton>
+                    </Show>
+                )
             }
             title={ t("pages:roles.title") }
             pageTitle={ t("pages:roles.title") }
-            description={ isSubOrg
-                ? t("pages:roles.alternateSubTitle")
-                : (
+            description={
+                (
                     <>
                         { t("pages:roles.subTitle") }
                         <DocumentationLink

diff --git a/modules/core/src/models/roles.ts b/modules/core/src/models/roles.ts
@@ -28,6 +28,7 @@ export interface RolesInterface {
     permissions?: string[] | RolePermissionInterface[];
     audience?: RoleAudiencesInterface;
     associatedApplications?: RoleConnectedApplicationInterface[];
+    properties?: RolePropertyInterface[];
 }
 
 /**
@@ -101,3 +102,8 @@ export interface RoleConnectedApplicationInterface {
     value?: string;
     $ref?: string;
 }
+
+export interface RolePropertyInterface {
+    name: string;
+    value: string;
+}