Merge pull request #6998 from pavinduLakshan/fix_role_assign

wso2 · Oct 16, 2024 · d7aea08 · d7aea08
2 parents a830ef1 + 13db519
commit d7aea08
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.changeset/smooth-pants-hear.md b/.changeset/smooth-pants-hear.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.roles.v2": patch
+---
+
+Fix default selected user store being set to undefined in role assign view
diff --git a/features/admin.roles.v2/components/edit-role/edit-role-users.tsx b/features/admin.roles.v2/components/edit-role/edit-role-users.tsx
@@ -128,11 +128,14 @@ export const RoleUsersList: FunctionComponent<RoleUsersPropsInterface> = (
         const userNameChunks: string[] = user.userName.split("/");
 
         return (userNameChunks.length === 1 && userStoreName === "PRIMARY")
-        || (userNameChunks.length === 2 && userNameChunks[0] === userStoreName.toUpperCase());
+        || (userNameChunks.length === 2 && userNameChunks[0] === userStoreName?.toUpperCase());
     };
 
     useEffect(() => {
-        setSelectedUserStoreDomainName(activeUserStore);
+        const defaultSelectedUserStore: string = activeUserStore ??
+            disabledUserstores.includes(RemoteUserStoreConstants.PRIMARY_USER_STORE_NAME) ? "DEFAULT" : "PRIMARY";
+
+        setSelectedUserStoreDomainName(defaultSelectedUserStore);
     }, [ activeUserStore ]);
 
     useEffect(() => {