Merge pull request #6941 from pavinduLakshan/fix_admins_org_modify

wso2 · Sep 30, 2024 · d78ad1e · d78ad1e
2 parents 3401eb8 + 711a030
commit d78ad1e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 33 deletions.
diff --git a/.changeset/pink-pets-worry.md b/.changeset/pink-pets-worry.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.organizations.v1": patch
+---
+
+Use scopes to determine whether an admin is able to edit/delete suborganization
diff --git a/features/admin.organizations.v1/components/organization-list.tsx b/features/admin.organizations.v1/components/organization-list.tsx
@@ -167,6 +167,8 @@ export const OrganizationList: FunctionComponent<OrganizationListPropsInterface>
     const featureConfig: FeatureConfigInterface = useSelector((state: AppState) => state.config.ui.features);
 
     const hasOrganizationUpdatePermissions: boolean = useRequiredScopes(featureConfig?.organizations?.scopes?.update);
+    const hasOrganizationDeletePermissions: boolean = useRequiredScopes(featureConfig?.organizations?.scopes?.delete);
+
     const [ showDeleteConfirmationModal, setShowDeleteConfirmationModal ] = useState<boolean>(false);
     const [ deletingOrganization, setDeletingOrganization ] = useState<OrganizationInterface>(undefined);
 
@@ -426,51 +428,24 @@ export const OrganizationList: FunctionComponent<OrganizationListPropsInterface>
                         featureConfig?.organizations,
                         OrganizationManagementConstants.FEATURE_DICTIONARY.get("ORGANIZATION_UPDATE")
                     ),
-                icon: (organization: OrganizationInterface): SemanticICONS => {
-
-                    let isAuthorized: boolean = false;
-
-                    authorizedList?.organizations?.map((org: OrganizationInterface) => {
-                        if (org.id === organization.id) {
-                            isAuthorized = true;
-                        }
-                    });
-
-                    return !hasOrganizationUpdatePermissions || !isAuthorized
+                icon: (_organization: OrganizationInterface): SemanticICONS => {
+                    return !hasOrganizationUpdatePermissions
                         ? "eye"
                         : "pencil alternate";
                 },
                 onClick: (e: SyntheticEvent, organization: OrganizationInterface): void =>
                     handleOrganizationEdit(organization.id),
-                popupText: (organization: OrganizationInterface ): string => {
-
-                    let isAuthorized: boolean = false;
-
-                    authorizedList?.organizations?.map((org: OrganizationInterface) => {
-                        if (org.id === organization.id) {
-                            isAuthorized = true;
-                        }
-                    });
-
-                    return !hasOrganizationUpdatePermissions || !isAuthorized
+                popupText: (_organization: OrganizationInterface ): string => {
+                    return !hasOrganizationUpdatePermissions
                         ? t("common:view")
                         : t("common:edit");
                 },
                 renderer: "semantic-icon"
             },
             {
                 "data-componentid": `${ componentId }-item-delete-button`,
-                hidden: (organization: OrganizationInterface): boolean => {
-
-                    let isAuthorized: boolean = false;
-
-                    authorizedList?.organizations?.map((org: OrganizationInterface) => {
-                        if (org.id === organization.id) {
-                            isAuthorized = true;
-                        }
-                    });
-
-                    return !hasOrganizationUpdatePermissions || !isAuthorized;
+                hidden: (_organization: OrganizationInterface): boolean => {
+                    return !hasOrganizationDeletePermissions;
                 },
                 icon: (): SemanticICONS => "trash alternate",
                 onClick: (e: SyntheticEvent, organization: OrganizationInterface): void => {