Merge pull request #6827 from DonOmalVindula/fix/test-10.04

Fix issues in the user assignment modal in groups edit
wso2 · Aug 27, 2024 · c8dd63a · c8dd63a
2 parents 9c69125 + 72aff56
commit c8dd63a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/.changeset/weak-wombats-mix.md b/.changeset/weak-wombats-mix.md
@@ -0,0 +1,6 @@
+---
+"@wso2is/admin.groups.v1": patch
+"@wso2is/theme": patch
+---
+
+Fix issues in the user assignment modal in groups edit
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
@@ -83,10 +83,11 @@ export const AddGroupUserModal: FunctionComponent<AddGroupUserModalProps> = (
     const {
         data: originalUserList,
         isLoading: isUserListFetchRequestLoading,
+        isValidating: isUserListFetchRequestValidating,
         error: userListFetchRequestError
     } = useUsersList(
-        null,
-        null,
+        20,
+        0,
         !isEmpty(searchQuery) ? searchQuery : null,
         null,
         userstore,
@@ -105,17 +106,28 @@ 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) {
-                            setSelectedUsers((selectedUsers: UserBasicInterface[]) => [ ...selectedUsers, user ]);
+                            isUserExistInGroup = true;
                         }
                     });
                 }
+
+                // Do not show the user if the user is already assigned to the group.
+                if (!isUserExistInGroup) {
+                    filteredUsers.push(user);
+                }
             });
+
+            setUserList(filteredUsers);
+        } else {
+            setUserList([]);
         }
     }, [ originalUserList, isUserListFetchRequestLoading ]);
 
@@ -228,7 +240,7 @@ export const AddGroupUserModal: FunctionComponent<AddGroupUserModalProps> = (
                     className="one-column-selection"
                     selectionComponent
                     searchPlaceholder={ t("groups:edit.users.searchUsers") }
-                    isLoading={ isUserListFetchRequestLoading }
+                    isLoading={ isUserListFetchRequestLoading || isUserListFetchRequestValidating }
                     handleHeaderCheckboxChange={ () => selectAllAssignedList() }
                     isHeaderCheckboxChecked={ isSelectAllUsers }
                     handleUnelectedListSearch={ (e: FormEvent<HTMLInputElement>, { value }: { value: string }) => {
@@ -240,7 +252,7 @@ export const AddGroupUserModal: FunctionComponent<AddGroupUserModalProps> = (
                     <TransferList
                         selectionComponent
                         isListEmpty={ userList.length <= 0 }
-                        isLoading={ isUserListFetchRequestLoading }
+                        isLoading={ isUserListFetchRequestLoading || isUserListFetchRequestValidating }
                         listType="unselected"
                         selectAllCheckboxLabel={ t("groups:edit.users.selectAllUsers") }
                         data-testid={ `${ componentId }-unselected-transfer-list` }

diff --git a/features/admin.groups.v1/components/edit-group/edit-group-users.tsx b/features/admin.groups.v1/components/edit-group/edit-group-users.tsx
@@ -221,7 +221,7 @@ export const GroupUsersList: FunctionComponent<GroupUsersListProps> = (props: Gr
 
         const groupData: PatchGroupDataInterface = {
             Operations: [ {
-                "op": "replace",
+                "op": "add",
                 "value": {
                     "members": newUsers
                 }

diff --git a/modules/theme/src/themes/default/elements/segment.overrides b/modules/theme/src/themes/default/elements/segment.overrides
@@ -198,7 +198,6 @@
 .ui.segment {
     &.transfer-segment {
         margin-top: @userRolesListSegmentMarginTop;
-        height: @userRolesListSegmentHeight;
         width: @TransferComponentSegmentWidth;
     }