Merge pull request #7295 from ShanChathusanda93/app-role-assoc-apps-b…

…ranch Remove shared applications from the role creation wizard in sub org level
wso2 · Jan 11, 2025 · 7f7185c · 7f7185c
2 parents 38201e6 + 6380a4e
commit 7f7185c
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 31 deletions.
diff --git a/.changeset/breezy-sheep-sort.md b/.changeset/breezy-sheep-sort.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.roles.v2": patch
+---
+
+Remove shared apps from the role creation wizard
diff --git a/features/admin.roles.v2/components/wizard-updated/__tests__/role-basics.test.tsx b/features/admin.roles.v2/components/wizard-updated/__tests__/role-basics.test.tsx
@@ -26,6 +26,9 @@ jest.mock("@wso2is/admin.applications.v1/api/application", () => ({
             applications: [
                 {
                     "access": "WRITE",
+                    "advancedConfigurations": {
+                        "fragment": false
+                    },
                     "associatedRoles": {
                         "allowedAudience": "ORGANIZATION"
                     },

diff --git a/features/admin.roles.v2/components/wizard-updated/role-basics.tsx b/features/admin.roles.v2/components/wizard-updated/role-basics.tsx
@@ -104,7 +104,8 @@ export const RoleBasics: FunctionComponent<RoleBasicProps> = (props: RoleBasicPr
         isLoading: isApplicationListFetchRequestLoading,
         error: applicationListFetchRequestError,
         mutate: mutateApplicationListFetchRequest
-    } = useApplicationList("clientId,associatedRoles.allowedAudience", null, null, applicationSearchQuery);
+    } = useApplicationList("clientId,associatedRoles.allowedAudience,advancedConfigurations", null, null,
+        applicationSearchQuery);
 
     const {
         data: rolesList,
@@ -146,36 +147,38 @@ export const RoleBasics: FunctionComponent<RoleBasicProps> = (props: RoleBasicPr
 
         applicationList?.applications?.map((application: ApplicationListItemInterface) => {
             if (!RoleConstants.READONLY_APPLICATIONS_CLIENT_IDS.includes(application?.clientId)) {
-                options.push({
-                    content: (
-                        <ListItemText
-                            primary={ application.name }
-                            secondary={
-                                application?.associatedRoles?.allowedAudience === RoleAudienceTypes.ORGANIZATION
-                                    ? (
-                                        <>
-                                            { t("roles:addRoleWizard.forms.roleBasicDetails." +
-                                                "assignedApplication.applicationSubTitle.organization") }
-                                            <Link
-                                                data-componentid={ `${componentId}-link-navigate-roles` }
-                                                onClick={ () => navigateToApplicationEdit(application?.id) }
-                                                external={ false }
-                                            >
-                                                { t("roles:addRoleWizard.forms." +
-                                                    "roleBasicDetails.assignedApplication.applicationSubTitle." +
-                                                    "changeAudience") }
-                                            </Link>
-                                        </>
-                                    ) : t("roles:addRoleWizard.forms.roleBasicDetails." +
-                                        "assignedApplication.applicationSubTitle.application")
-                            }
-                        />
-                    ),
-                    disabled: application?.associatedRoles?.allowedAudience === RoleAudienceTypes.ORGANIZATION,
-                    key: application.id,
-                    text: application.name,
-                    value: application.id
-                });
+                if (application?.advancedConfigurations?.fragment === false) {
+                    options.push({
+                        content: (
+                            <ListItemText
+                                primary={ application.name }
+                                secondary={
+                                    application?.associatedRoles?.allowedAudience === RoleAudienceTypes.ORGANIZATION
+                                        ? (
+                                            <>
+                                                { t("roles:addRoleWizard.forms.roleBasicDetails." +
+                                                    "assignedApplication.applicationSubTitle.organization") }
+                                                <Link
+                                                    data-componentid={ `${componentId}-link-navigate-roles` }
+                                                    onClick={ () => navigateToApplicationEdit(application?.id) }
+                                                    external={ false }
+                                                >
+                                                    { t("roles:addRoleWizard.forms." +
+                                                        "roleBasicDetails.assignedApplication.applicationSubTitle." +
+                                                        "changeAudience") }
+                                                </Link>
+                                            </>
+                                        ) : t("roles:addRoleWizard.forms.roleBasicDetails." +
+                                            "assignedApplication.applicationSubTitle.application")
+                                }
+                            />
+                        ),
+                        disabled: application?.associatedRoles?.allowedAudience === RoleAudienceTypes.ORGANIZATION,
+                        key: application.id,
+                        text: application.name,
+                        value: application.id
+                    });
+                }
             }
         });