diff --git a/.changeset/wet-mice-attend.md b/.changeset/wet-mice-attend.md new file mode 100644 index 00000000000..89408583c1f --- /dev/null +++ b/.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 diff --git a/features/admin.roles.v2/components/edit-role/edit-role-permission.tsx b/features/admin.roles.v2/components/edit-role/edit-role-permission.tsx index 245dd921c00..67f93016d59 100644 --- a/features/admin.roles.v2/components/edit-role/edit-role-permission.tsx +++ b/features/admin.roles.v2/components/edit-role/edit-role-permission.tsx @@ -27,7 +27,6 @@ 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, @@ -95,7 +94,6 @@ export const UpdatedRolePermissionDetails: FunctionComponent(false); const [ selectedAPIResourceId, setSelectedAPIResourceId ] = useState(undefined); @@ -109,7 +107,7 @@ export const UpdatedRolePermissionDetails: FunctionComponent(null); const shouldFetchAPIResources: boolean = role?.audience?.type?. - toUpperCase() === RoleAudienceTypes.ORGANIZATION && !isSubOrganization(); + toUpperCase() === RoleAudienceTypes.ORGANIZATION; const { data: currentAPIResourcesListData, diff --git a/features/admin.roles.v2/components/edit-role/edit-role.tsx b/features/admin.roles.v2/components/edit-role/edit-role.tsx index 7aaa712f352..ebf5389443a 100644 --- a/features/admin.roles.v2/components/edit-role/edit-role.tsx +++ b/features/admin.roles.v2/components/edit-role/edit-role.tsx @@ -100,8 +100,6 @@ export const EditRole: FunctionComponent = (props: EditRoleProps) const [ isAdminRole, setIsAdminRole ] = useState(false); const [ isEveryoneRole, setIsEveryoneRole ] = useState(false); - const isSubOrg: boolean = organizationType === OrganizationType.SUBORGANIZATION; - /** * Set the if the role is `Internal/admin`. */ @@ -122,7 +120,7 @@ export const EditRole: FunctionComponent = (props: EditRoleProps) render: () => ( = (props: EditRoleProps) render: () => (