Merge pull request #7586 from Yasasr1/userstore-console-admin

Show secondary userstore dropdown in the sub-organization console settings.
wso2 · Feb 10, 2025 · 95193da · 95193da
2 parents 722e48b + 8ea1855
commit 95193da
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/.changeset/happy-terms-pay.md b/.changeset/happy-terms-pay.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.console-settings.v1": patch
+---
+
+Show secondary userstore dropdown in the sub-organization console settings.
diff --git a/...settings.v1/components/console-administrators/administrators-list/administrators-list.tsx b/...settings.v1/components/console-administrators/administrators-list/administrators-list.tsx
@@ -157,7 +157,7 @@ const AdministratorsList: FunctionComponent<AdministratorsListProps> = (
         "consoleSettings.invitedExternalAdmins"
     );
 
-    const { isSubOrganization, isFirstLevelOrganization, isSuperOrganization } = useGetCurrentOrganizationType();
+    const { isSubOrganization, isFirstLevelOrganization } = useGetCurrentOrganizationType();
     const { unassignAdministratorRoles } = useBulkAssignAdministratorRoles();
 
     const [ listOffset, setListOffset ] = useState<number>(0);
@@ -427,20 +427,16 @@ const AdministratorsList: FunctionComponent<AdministratorsListProps> = (
             );
         }
 
-        if (isFirstLevelOrganization() || isSuperOrganization()) {
-            return (
-                <Dropdown
-                    data-testid="user-mgt-user-list-userstore-dropdown"
-                    selection
-                    options={ availableUserStores }
-                    onChange={ handleSelectedUserStoreChange }
-                    value={ selectedUserStore }
-                    defaultValue={ primaryUserStoreDomainName }
-                />
-            );
-        }
-
-        return null;
+        return (
+            <Dropdown
+                data-testid="user-mgt-user-list-userstore-dropdown"
+                selection
+                options={ availableUserStores }
+                onChange={ handleSelectedUserStoreChange }
+                value={ selectedUserStore }
+                defaultValue={ primaryUserStoreDomainName }
+            />
+        );
     };
 
     return (