Merge pull request #149 from COS301-SE-2024/fix/clientAssignmentInOrg

Fixed assigning clients in orgs to a VA
COS301-SE-2024 · Sep 29, 2024 · 3b463b3 · 3b463b3
2 parents 7d0c74c + ee0549e
commit 3b463b3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/CoVAR-app/package-lock.json b/CoVAR-app/package-lock.json
diff --git a/CoVAR-app/package.json b/CoVAR-app/package.json
@@ -20,9 +20,10 @@
         "axios-mock-adapter": "^1.22.0",
         "echarts": "^5.5.1",
         "firebase": "^10.12.2",
-        "marked": "^14.1.2",
         "i": "^0.3.7",
+        "marked": "^14.1.2",
         "moment": "^2.30.1",
+        "mui": "^0.0.1",
         "next": "14.2.13",
         "react": "^18",
         "react-dom": "^18",

diff --git a/CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx b/CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx
@@ -87,6 +87,7 @@ useEffect(() => {
                 throw new Error('Access token not found');
             }
             const users = await fetchUsers(accessToken);
+
             setUsers(users);
             setLoading(false);
         } catch (error: any) {
@@ -311,8 +312,12 @@ const handleConfirmUnassignVA = async () => {
     };
 
     const filteredUsers = users.filter(user =>
-        user.username.toLowerCase().includes(searchTerm.toLowerCase()) && user.role !== 'va'
+        user.username.toLowerCase().includes(searchTerm.toLowerCase()) &&
+        user.role !== 'va' &&
+        user.organization == null ||
+        user.organization == ""
     );
+
 
     const filteredOrganizations = organizations.filter(org =>
         org.name.toLowerCase().includes(searchTerm.toLowerCase())