Enable the role basics update and role permissions update for sub organization roles

.changeset/wet-mice-attend.md

@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.roles.v2": patch
+---
+
+enable role basic update and role permission update in sub org roles

features/admin.roles.v2/components/edit-role/edit-role-permission.tsx

@@ -27,13 +27,13 @@ import { useAPIResources } from "@wso2is/admin.api-resources.v2/api";
 import { useGetAuthorizedAPIList } from "@wso2is/admin.api-resources.v2/api/useGetAuthorizedAPIList";
 import { APIResourceCategories, APIResourcesConstants } from "@wso2is/admin.api-resources.v2/constants";
 import { APIResourceUtils } from "@wso2is/admin.api-resources.v2/utils/api-resource-utils";
-import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
 import {
     AlertInterface,
     AlertLevels,
     IdentifiableComponentInterface,
     LinkInterface,
     RolePermissionInterface,
+    RolePropertyInterface,
     RolesInterface
 } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
@@ -44,6 +44,7 @@ import React, {
     ReactNode,
     SyntheticEvent,
     useEffect,
+    useMemo,
     useState
 } from "react";
 import { useTranslation } from "react-i18next";
@@ -53,7 +54,7 @@ import { DropdownItemProps, DropdownProps } from "semantic-ui-react";
 import { RenderChip } from "./edit-role-common/render-chip";
 import { RoleAPIResourcesListItem } from "./edit-role-common/role-api-resources-list-item";
 import { getAPIResourceDetailsBulk, updateRoleDetails, useAPIResourceDetails } from "../../api";
-import { RoleAudienceTypes } from "../../constants/role-constants";
+import { RoleAudienceTypes, RoleConstants } from "../../constants/role-constants";
 import { APIResourceInterface, AuthorizedAPIListItemInterface, ScopeInterface } from "../../models/apiResources";
 import { PatchRoleDataInterface, PermissionUpdateInterface, SelectedPermissionsInterface } from "../../models/roles";
 
@@ -95,7 +96,6 @@ export const UpdatedRolePermissionDetails: FunctionComponent<RolePermissionDetai
 
     const { t } = useTranslation();
     const dispatch: Dispatch = useDispatch();
-    const { isSubOrganization } = useGetCurrentOrganizationType();
 
     const [ isSubmitting, setIsSubmitting ] = useState<boolean>(false);
     const [ selectedAPIResourceId, setSelectedAPIResourceId ] = useState<string>(undefined);
@@ -108,8 +108,11 @@ export const UpdatedRolePermissionDetails: FunctionComponent<RolePermissionDetai
     const [ allAPIResourcesListData, setAllAPIResourcesListData ] = useState<APIResourceInterface[]>([]);
     const [ apiCallNextAfterValue, setAPICallNextAfterValue ] = useState<string>(null);
 
+    const isSharedRole: boolean = useMemo(() => role?.properties?.some(
+        (property: RolePropertyInterface) =>
+            property?.name === RoleConstants.IS_SHARED_ROLE && property?.value === "true"), [ role ]);
     const shouldFetchAPIResources: boolean = role?.audience?.type?.
-        toUpperCase() === RoleAudienceTypes.ORGANIZATION && !isSubOrganization();
+        toUpperCase() === RoleAudienceTypes.ORGANIZATION && !isSharedRole;
 
     const {
         data: currentAPIResourcesListData,

features/admin.roles.v2/components/edit-role/edit-role.tsx

@@ -16,14 +16,17 @@
  * under the License.
  */
 
-import { OrganizationType } from "@wso2is/admin.core.v1/constants/organization-constants";
 import { FeatureConfigInterface } from "@wso2is/admin.core.v1/models/config";
 import { AppState } from "@wso2is/admin.core.v1/store";
-import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
 import { UserManagementConstants } from "@wso2is/admin.users.v1/constants";
 import { RoleConstants } from "@wso2is/core/constants";
 import { hasRequiredScopes, isFeatureEnabled } from "@wso2is/core/helpers";
-import { FeatureAccessConfigInterface, RolesInterface, SBACInterface } from "@wso2is/core/models";
+import {
+    FeatureAccessConfigInterface,
+    RolePropertyInterface,
+    RolesInterface,
+    SBACInterface
+} from "@wso2is/core/models";
 import { ResourceTab, ResourceTabPaneInterface } from "@wso2is/react-components";
 import React, { FunctionComponent, ReactElement, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -71,7 +74,6 @@
     } = props;
 
     const { t } = useTranslation();
-    const { organizationType } = useGetCurrentOrganizationType();
 
     const featureConfig: FeatureAccessConfigInterface = useSelector(
         (state: AppState) => state?.config?.ui?.features?.userRoles);
@@ -83,6 +85,9 @@
     const userRolesDisabledFeatures: string[] = useSelector((state: AppState) => {
         return state.config.ui.features?.userRoles?.disabledFeatures;
     });
+    const isSharedRole: boolean = useMemo(() => roleObject?.properties?.some(
+        (property: RolePropertyInterface) =>
+            property?.name === LocalRoleConstants.IS_SHARED_ROLE && property?.value === "true"), [ roleObject ]);
 
     const isReadOnly: boolean = useMemo(() => {
         return !isFeatureEnabled(featureConfig,
@@ -102,8 +107,6 @@
     const [ isAdminRole, setIsAdminRole ] = useState<boolean>(false);
     const [ isEveryoneRole, setIsEveryoneRole ] = useState<boolean>(false);
 
-    const isSubOrg: boolean = organizationType === OrganizationType.SUBORGANIZATION;
-
     /**
      * Set the if the role is `Internal/admin`.
      */
@@ -124,7 +127,7 @@
                 render: () => (
                     <ResourceTab.Pane controlledSegmentation attached={ false }>
                         <BasicRoleDetails
-                            isReadOnly={ isSubOrg || isAdminRole || isEveryoneRole || isReadOnly }
+                            isReadOnly={ isAdminRole || isEveryoneRole || isReadOnly || isSharedRole }
                             role={ roleObject }
                             onRoleUpdate={ onRoleUpdate }
                             tabIndex={ 0 }
@@ -137,7 +140,7 @@
                 render: () => (
                     <ResourceTab.Pane controlledSegmentation attached={ false }>
                         <UpdatedRolePermissionDetails
-                            isReadOnly={ isSubOrg || isAdminRole || isReadOnly }
+                            isReadOnly={ isAdminRole || isReadOnly || isSharedRole }
                             role={ roleObject }
                             onRoleUpdate={ onRoleUpdate }
                             tabIndex={ 1 }