Refactor logic

wso2 · Aug 27, 2024 · abaf65c · abaf65c
1 parent 19751f6
commit abaf65c
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/features/admin.groups.v1/components/edit-group/add-group-user-modal.tsx b/features/admin.groups.v1/components/edit-group/add-group-user-modal.tsx
@@ -105,7 +105,25 @@ export const AddGroupUserModal: FunctionComponent<AddGroupUserModalProps> = (
         }
 
         if (originalUserList.Resources) {
-            setUserList(originalUserList.Resources);
+            const filteredUsers: UserBasicInterface[] = [];
+
+            originalUserList.Resources.map((user: UserBasicInterface) => {
+                let isUserExistInGroup: boolean = false;
+                if (user?.groups?.length > 0) {
+                    user.groups.map((userGroup: UserRoleInterface) => {
+                        if (userGroup.display === group.displayName) {
+                            isUserExistInGroup = true;
+                        }
+                    });
+                }
+
+                // Do not show the user if the user is already assigned to the group.
+                if (!isUserExistInGroup) {
+                    filteredUsers.push(user);
+                }
+            });
+
+            setUserList(filteredUsers);
         }
     }, [ originalUserList, isUserListFetchRequestLoading ]);
 
@@ -244,21 +262,6 @@ export const AddGroupUserModal: FunctionComponent<AddGroupUserModalProps> = (
                                 const resolvedGivenName: string = UserManagementUtils.resolveUserListSubheader(user);
                                 const resolvedUsername: string = getUserNameWithoutDomain(user?.userName);
 
-                                // Do not show the user if the user is already assigned to the group.
-                                let filterUser: boolean = false;
-
-                                if (user?.groups?.length > 0) {
-                                    user.groups.map((userGroup: UserRoleInterface) => {
-                                        if (userGroup.display === group.displayName) {
-                                            filterUser = true;
-                                        }
-                                    });
-                                }
-
-                                if (filterUser) {
-                                    return null;
-                                }
-
                                 return (
                                     <TransferListItem
                                         handleItemChange={ () => handleItemCheckboxChange(user) }