From 6dbac5bd7fab037a37646b5fd37af1bfab52c519 Mon Sep 17 00:00:00 2001
From: JamesNg <njames15@gmail.com>
Date: Tue, 7 Oct 2025 23:08:43 -0400
Subject: [PATCH 1/2] use React context hook to replace useState for search
 queries

---
 VRMS                                          |   1 +
 client/src/App.jsx                            |  69 ++--
 .../components/user-admin/UserManagement.jsx  |  15 +-
 .../user-admin/UserPermissionSearch.jsx       |  18 +-
 client/src/context/searchContext.jsx          |  23 ++
 client/src/pages/UserPermissionSearch.jsx     | 314 ------------------
 6 files changed, 76 insertions(+), 364 deletions(-)
 create mode 160000 VRMS
 create mode 100644 client/src/context/searchContext.jsx
 delete mode 100644 client/src/pages/UserPermissionSearch.jsx

diff --git a/VRMS b/VRMS
new file mode 160000
index 00000000..7042af0f
--- /dev/null
+++ b/VRMS
@@ -0,0 +1 @@
+Subproject commit 7042af0f43f0b034977c7f64c613e9d8b7199edb
diff --git a/client/src/App.jsx b/client/src/App.jsx
index 5be55b97..d8325df3 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -1,7 +1,5 @@
-import React from 'react';
 import { AuthProvider } from './context/authContext';
 import { Route, Redirect, Switch } from 'react-router-dom';
-
 import Home from './pages/Home';
 import Navbar from './components/Navbar';
 import Footer from './components/Footer';
@@ -26,13 +24,9 @@ import addProject from './components/manageProjects/addProject';
 import HealthCheck from './pages/HealthCheck';
 import SecretPassword from './pages/SecretPassword';
 import UserWelcome from './pages/UserWelcome';
-// Added User Permission Search component
-import UserPermissionSearch from './pages/UserPermissionSearch';
 import UserPermission from './pages/UserPermission';
-
 import { Box, ThemeProvider } from '@mui/material';
 import theme from './theme';
-
 import './App.scss';
 
 /* 
@@ -44,6 +38,7 @@ import './App.scss';
    Return <ComponentName {...props} auth={auth} /> if user is logged in
 */
 import withAuth from './hooks/withAuth';
+import { SearchTextProvider } from './context/searchContext';
 
 const routes = [
   { path: '/', name: 'home', Component: Home },
@@ -93,47 +88,49 @@ const App = () => {
   return (
     <ThemeProvider theme={theme}>
       <AuthProvider>
-        <Box
-          sx={{
-            height: '100%',
-            width: '100vw',
-            display: 'flex',
-            justifyContent: 'center',
-            alignItems: 'center',
-            overflow: 'hidden',
-            maxHeight: '90vh',
-            margin: '5vh 0',
-          }}
-        >
+        <SearchTextProvider>
           <Box
             sx={{
-              position: 'relative',
-              maxWidth: '500px',
-              width: '100%',
-              backgroundColor: 'white',
+              height: '100%',
+              width: '100vw',
+              display: 'flex',
+              justifyContent: 'center',
+              alignItems: 'center',
               overflow: 'hidden',
-              borderRadius: '10px',
-              padding: '15px',
+              maxHeight: '90vh',
+              margin: '5vh 0',
             }}
           >
-            <Navbar />
             <Box
-              component="main"
               sx={{
-                height: 'calc(90vh - 160px)',
-                overflowY: 'scroll',
+                position: 'relative',
+                maxWidth: '500px',
+                width: '100%',
+                backgroundColor: 'white',
+                overflow: 'hidden',
+                borderRadius: '10px',
+                padding: '15px',
               }}
             >
-              <Switch>
-                {routes.map(({ path, Component }) => (
-                  <Route key={path} exact path={path} component={Component} />
-                ))}
-                <Redirect to="/" />
-              </Switch>
+              <Navbar />
+              <Box
+                component="main"
+                sx={{
+                  height: 'calc(90vh - 160px)',
+                  overflowY: 'scroll',
+                }}
+              >
+                <Switch>
+                  {routes.map(({ path, Component }) => (
+                    <Route key={path} exact path={path} component={Component} />
+                  ))}
+                  <Redirect to="/" />
+                </Switch>
+              </Box>
+              <Footer />
             </Box>
-            <Footer />
           </Box>
-        </Box>
+        </SearchTextProvider>
       </AuthProvider>
     </ThemeProvider>
   );
diff --git a/client/src/components/user-admin/UserManagement.jsx b/client/src/components/user-admin/UserManagement.jsx
index 1ead7238..1fa2abcd 100644
--- a/client/src/components/user-admin/UserManagement.jsx
+++ b/client/src/components/user-admin/UserManagement.jsx
@@ -1,4 +1,3 @@
-import React, { useState } from 'react';
 import {
   Box,
   Button,
@@ -11,6 +10,7 @@ import {
 } from '@mui/material';
 
 import '../../sass/UserAdmin.scss';
+import { useSearchText } from '../../context/searchContext';
 
 const Buttonsx = {
   px: 2,
@@ -19,8 +19,7 @@ const Buttonsx = {
 
 const UserManagement = ({ users, setUserToEdit }) => {
   let searchResults = [];
-  const [searchResultType, setSearchResultType] = useState('name'); // Which results will diplay
-  const [searchTerm, setSearchTerm] = useState(''); // Serch term for the user/email search
+  const { searchText, setSearchText, searchResultType, setSearchResultType } = useSearchText(); // React context hook
 
   // Swaps the buttons and displayed panels for the search results, by email or by name
   const buttonSwap = () =>
@@ -30,10 +29,10 @@ const UserManagement = ({ users, setUserToEdit }) => {
 
   // Handle change on input in search form
   const handleChange = (event) => {
-    setSearchTerm(event.target.value);
+    setSearchText(event.target.value);
   };
 
-  if (!searchTerm) {
+  if (!searchText) {
     searchResults = [];
   } else {
     searchResults =
@@ -42,14 +41,14 @@ const UserManagement = ({ users, setUserToEdit }) => {
             .filter((user) =>
               user.email
                 ?.toLowerCase()
-                .includes(searchTerm.toLowerCase().trim())
+                .includes(searchText.toLowerCase().trim())
             )
             .sort((a, b) => a.email.localeCompare(b.email))
         : Object.values(users)
             .filter((user) =>
               `${user.name?.firstName} ${user.name?.lastName}`
                 .toLowerCase()
-                .includes(searchTerm.toLowerCase().trim())
+                .includes(searchText.toLowerCase().trim())
             )
             .sort((a, b) =>
               a.name?.firstName
@@ -103,7 +102,7 @@ const UserManagement = ({ users, setUserToEdit }) => {
           type="text"
           placeholder="Enter name and / or email to find a user."
           variant="standard"
-          value={searchTerm}
+          value={searchText}
           onChange={handleChange}
         />
         <Box
diff --git a/client/src/components/user-admin/UserPermissionSearch.jsx b/client/src/components/user-admin/UserPermissionSearch.jsx
index 96f1a950..1c45db2d 100644
--- a/client/src/components/user-admin/UserPermissionSearch.jsx
+++ b/client/src/components/user-admin/UserPermissionSearch.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { useEffect } from 'react';
 import {
   Box,
   Button,
@@ -11,6 +11,7 @@ import {
   ListItemButton,
 } from '@mui/material';
 import { useLocation } from 'react-router-dom';
+import { useSearchText } from '../../context/searchContext';
 
 import '../../sass/UserAdmin.scss';
 
@@ -101,9 +102,7 @@ const DummyComponent = ({ data, isProjectLead, setUserToEdit }) => {
 };
 
 const UserPermissionSearch = ({ admins, projectLeads, setUserToEdit }) => {
-  const [userType, setUserType] = useState('admin'); // Which results will display
-  const [searchText, setSearchText] = useState(''); // Search term for the admin/PM search
-  const [isProjectLead, setIsProjectLead] = useState(false);
+  const { searchText, setSearchText, userType, setUserType, isProjectLead, setIsProjectLead } = useSearchText(); // React context hook
 
   const location = useLocation();
 
@@ -121,8 +120,15 @@ const UserPermissionSearch = ({ admins, projectLeads, setUserToEdit }) => {
   }, [userType]);
 
   // Swaps the buttons and displayed panels for the search results, by email or by name
-  const buttonSwap = () =>
-    isProjectLead ? setIsProjectLead(false) : setIsProjectLead(true);
+  const buttonSwap = () => {
+    if (isProjectLead) {
+      setIsProjectLead(false);
+      setUserType('admin');
+    } else {
+      setIsProjectLead(true);
+      setUserType('projectLead');
+    }
+  }
 
   // Handle change on input in search form
   const handleChange = (event) => {
diff --git a/client/src/context/searchContext.jsx b/client/src/context/searchContext.jsx
new file mode 100644
index 00000000..779ea1eb
--- /dev/null
+++ b/client/src/context/searchContext.jsx
@@ -0,0 +1,23 @@
+import { createContext, useContext, useState } from 'react';
+
+const SearchTextContext = createContext();
+
+export const SearchTextProvider = ({ children }) => {
+  const [searchText, setSearchText] = useState('');
+  const [searchResultType, setSearchResultType] = useState('name');
+  const [userType, setUserType] = useState('admin');
+  const [isProjectLead, setIsProjectLead] = useState(false);
+  
+  return (
+    <SearchTextContext.Provider value={{ 
+      searchText, setSearchText, 
+      searchResultType, setSearchResultType,
+      userType, setUserType,
+      isProjectLead, setIsProjectLead
+    }}>
+      {children}
+    </SearchTextContext.Provider>
+  );
+};
+
+export const useSearchText = () => useContext(SearchTextContext);
\ No newline at end of file
diff --git a/client/src/pages/UserPermissionSearch.jsx b/client/src/pages/UserPermissionSearch.jsx
deleted file mode 100644
index a077aa33..00000000
--- a/client/src/pages/UserPermissionSearch.jsx
+++ /dev/null
@@ -1,314 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import {
-  Box,
-  Button,
-  ButtonGroup,
-  Grid,
-  TextField,
-  Typography,
-  List,
-  ListItem,
-  ListItemButton,
-} from '@mui/material';
-import { useLocation } from 'react-router-dom';
-
-import '../sass/UserAdmin.scss';
-
-const Buttonsx = {
-  px: 2,
-  py: 0.5,
-};
-
-const dummyData = [
-  {
-    _id: 1,
-    name: {
-      firstName: 'John',
-      lastName: 'Doe',
-    },
-    accessLevel: 'admin',
-    email: 'johndoe@hackforla.org',
-    projects: [],
-  },
-  {
-    _id: 2,
-    name: {
-      firstName: 'Vinny',
-      lastName: 'Harris',
-    },
-    accessLevel: 'admin',
-    email: 'vinnyharris@hackforla.org',
-    projects: [],
-  },
-  {
-    _id: 3,
-    name: {
-      firstName: 'Gary',
-      lastName: 'Jones',
-    },
-    accessLevel: 'admin',
-    email: 'garyjones@hackforla.org',
-    projects: [],
-  },
-  {
-    _id: 4,
-    name: {
-      firstName: 'Jane',
-      lastName: 'Smith',
-    },
-    accessLevel: 'projectLead',
-    email: 'janesmith@hackforla.org',
-    projects: ['VRMS', 'Mobile'],
-  },
-  {
-    _id: 5,
-    name: {
-      firstName: 'Bonnie',
-      lastName: 'Wolfe',
-    },
-    accessLevel: 'projectLead',
-    email: 'bonnie@hackforla.org',
-    projects: ['Home Unite Us'],
-  },
-  {
-    _id: 6,
-    name: {
-      firstName: 'Diana',
-      lastName: 'Loeb',
-    },
-    accessLevel: 'projectLead',
-    email: 'dianaloeb@hackforla.org',
-    projects: ['HackforLA Mobile', 'LA TDM Calculator'],
-  },
-  {
-    _id: 7,
-    name: {
-      firstName: 'Zack',
-      lastName: 'Cruz',
-    },
-    accessLevel: 'projectLead',
-    email: 'dianaloeb@hackforla.org',
-    projects: ['LA TDM Calculator', 'VRMS backend'],
-  },
-  {
-    _id: 8,
-    name: {
-      firstName: 'Iris',
-      lastName: 'Sosa',
-    },
-    accessLevel: 'projectLead',
-    email: 'irissosa@hackforla.org',
-    projects: ['Home Unite Us', 'VRMS Support'],
-  },
-];
-
-const DummyComponent = ({ data, type }) => {
-  return (
-    <List className="search-results disablePadding">
-      {data.map((user, index) => {
-        // Destructure user object
-        const { _id, name, email } = user;
-        return type === 'admin' ? (
-          <ListItem
-            sx={{
-              px: 2.4,
-              py: 1,
-              borderBottom: 1.6,
-              borderBottomColor: 'grey.300',
-            }}
-            key={`result_${_id}/${index}`}
-          >
-            <ListItemButton
-              sx={{
-                px: 0.25,
-                py: 0.36,
-                color: 'primary.main',
-                mx: 0.16,
-              }}
-              className="search-results-button"
-              type="button"
-              onClick={() => setUserToEdit(user)}
-            >
-              <Grid container>
-                <Grid item>
-                  <Typography style={{ fontWeight: 600 }}>
-                    {`${name.firstName.toUpperCase()} ${name.lastName.toUpperCase()} ( ${email.toUpperCase()} )`}
-                  </Typography>
-                </Grid>
-              </Grid>
-            </ListItemButton>
-          </ListItem>
-        ) : (
-          <ListItem
-            style={{ display: 'flex', justifyContent: 'flex-end' }}
-            sx={{
-              px: 2.4,
-              py: 1,
-              borderBottom: 1.6,
-              borderBottomColor: 'grey.300',
-            }}
-            key={`result_${_id}/${index}`}
-          >
-            <ListItemButton
-              sx={{
-                px: 0.25,
-                py: 0.36,
-                color: 'primary.main',
-                mx: 0.16,
-              }}
-              className="search-results-button"
-              type="button"
-              onClick={() => setUserToEdit(user)}
-            >
-              <Grid container justifyContent={'space-between'}>
-                <Grid item>
-                  <Typography style={{ fontWeight: 600 }}>
-                    {name.firstName.toUpperCase() +
-                      ' ' +
-                      name.lastName.toUpperCase()}
-                  </Typography>
-                </Grid>
-                <Grid item>
-                  <Typography style={{ fontWeight: 600 }} color="black">
-                    {user.project}
-                  </Typography>
-                </Grid>
-              </Grid>
-            </ListItemButton>
-          </ListItem>
-        );
-      })}
-    </List>
-  );
-};
-
-const UserPermissionSearch = ({ users, setUserToEdit }) => {
-  const [userType, setUserType] = useState('admin'); // Which results will display
-  const [searchText, setSearchText] = useState(''); // Search term for the admin/PM search
-
-  const location = useLocation();
-
-  useEffect(() => {
-    // Edits url by adding '/admin' upon loading
-    let editURL = '';
-    if (userType === 'admin') {
-      editURL = location.pathname + '/admin';
-    } else {
-      editURL = location.pathname + '/projects';
-    }
-    window.history.replaceState({}, '', editURL);
-  }, [userType]);
-
-  // Swaps the buttons and displayed panels for the search results, by email or by name
-  const buttonSwap = () =>
-    userType === 'projectLead'
-      ? setUserType('admin')
-      : setUserType('projectLead');
-
-  // Handle change on input in search form
-  const handleChange = (event) => {
-    setSearchText(event.target.value);
-  };
-
-  // Filtering logic
-  let filteredData;
-  if (!searchText) {
-    filteredData = dummyData.filter((user) => user.accessLevel === userType);
-    if (userType === 'admin') {
-      // Default display for admins, sorted ASC based on first name
-      filteredData.sort((u1, u2) =>
-        u1.name?.firstName.localeCompare(u2.name?.firstName)
-      );
-    } else {
-      // Default display of all PMs, sorted ASC based on project name, then first name
-      let tempFilter = [];
-      filteredData.forEach((user) => {
-        user.projects.forEach((project) => {
-          tempFilter.push({ ...user, project });
-        });
-      });
-      tempFilter.sort(
-        (u1, u2) =>
-          u1.project.localeCompare(u2.project) ||
-          u1.name?.firstName.localeCompare(u2.name?.firstName)
-      );
-      filteredData = [...tempFilter];
-    }
-  }
-
-  return (
-    <Box className="container--usermanagement" sx={{ px: '1.8rem', mb: 0 }}>
-      <Box
-        sx={{
-          display: 'flex',
-          flexDirection: 'column',
-          alignItems: 'center',
-          pt: 5,
-          height: '100%',
-          width: 1 / 1,
-        }}
-      >
-        <Typography
-          variant="h4"
-          style={{ marginBottom: 20, fontWeight: 'bold' }}
-        >
-          User Permission Search
-        </Typography>
-        <Box className="tab-buttons">
-          <ButtonGroup
-            fullWidth
-            sx={{
-              display: 'flex',
-              flexDirection: 'row',
-              justifyContent: 'center',
-              whiteSpace: 'nowrap',
-              mx: 1,
-            }}
-          >
-            <Button
-              sx={Buttonsx}
-              type="button"
-              variant={userType === 'admin' ? 'contained' : 'secondary'}
-              onClick={buttonSwap}
-            >
-              Admins
-            </Button>
-            <Button
-              sx={Buttonsx}
-              type="button"
-              variant={userType === 'projectLead' ? 'contained' : 'secondary'}
-              onClick={buttonSwap}
-            >
-              Project Members
-            </Button>
-          </ButtonGroup>
-        </Box>
-        <TextField
-          type="text"
-          placeholder={
-            userType === 'admin' ? 'Search name' : 'Search name or project'
-          }
-          variant="standard"
-          value={searchText}
-          onChange={handleChange}
-        />
-        <Box
-          sx={{
-            bgcolor: dummyData.length > 0 ? '#F5F5F5' : 'transparent',
-            my: 1.2,
-            borderRadius: 1,
-            flexGrow: 1,
-            width: 1 / 1,
-          }}
-        >
-          <Box>
-            {/*Component to render admins and PMs*/}
-            <DummyComponent data={filteredData} type={userType} />
-          </Box>
-        </Box>
-      </Box>
-    </Box>
-  );
-};
-
-export default UserPermissionSearch;

From e176047e8f3111ae41f328b4952da46ec7f2ca6a Mon Sep 17 00:00:00 2001
From: JamesNg <njames15@gmail.com>
Date: Wed, 29 Oct 2025 17:19:47 -0400
Subject: [PATCH 2/2] fix bugs preventing proper updating of user profile
 during search nav

---
 client/src/App.jsx                                 |  2 +-
 client/src/components/user-admin/EditUsers.jsx     |  7 ++-----
 .../components/user-admin/UserPermissionSearch.jsx |  8 ++++----
 client/src/pages/UserPermission.jsx                | 14 +++++++-------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/client/src/App.jsx b/client/src/App.jsx
index d8325df3..5242b0f8 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -63,7 +63,7 @@ const routes = [
   {
     path: '/users/permission-search',
     name: 'useradmin',
-    Component: UserPermission,
+    Component: withAuth(UserPermission),
   },
   {
     path: '/projects/:projectId',
diff --git a/client/src/components/user-admin/EditUsers.jsx b/client/src/components/user-admin/EditUsers.jsx
index 30defbee..6b62bdef 100644
--- a/client/src/components/user-admin/EditUsers.jsx
+++ b/client/src/components/user-admin/EditUsers.jsx
@@ -17,6 +17,7 @@ import {
 } from '@mui/material';
 import '../../sass/UserAdmin.scss';
 
+
 // child of UserAdmin. Displays form to update users.
 const EditUsers = ({
   userToEdit,
@@ -47,8 +48,6 @@ const EditUsers = ({
     setUserManagedProjects(userToEdit.managedProjects);
   }, [userToEdit]);
 
-  console.log(userManagedProjects)
-
   const userProjectsToDisplay = activeProjects.filter((item) =>
     userProjects.includes(item[0])
   );
@@ -64,7 +63,6 @@ const EditUsers = ({
     ) {
       const newProjects = [...userManagedProjects, projectValue];
       updateUserDb(userToEdit, projectValue, 'add');
-      // updateUserDb(userToEdit, newProjects);
       setUserManagedProjects(newProjects);
       setProjectValue('');
     } else {
@@ -78,11 +76,10 @@ const EditUsers = ({
         (p) => p !== projectToRemove
       );
       updateUserDb(userToEdit, projectToRemove, 'remove');
-      // updateUserDb(userToEdit, newProjects);
       setUserManagedProjects(newProjects);
     }
   };
-
+  
   const handleSetIsActive = () => {
     if (!isSuperAdmin) {
       setIsActive(!isActive);
diff --git a/client/src/components/user-admin/UserPermissionSearch.jsx b/client/src/components/user-admin/UserPermissionSearch.jsx
index 1c45db2d..75083eb7 100644
--- a/client/src/components/user-admin/UserPermissionSearch.jsx
+++ b/client/src/components/user-admin/UserPermissionSearch.jsx
@@ -20,7 +20,7 @@ const Buttonsx = {
   py: 0.5,
 };
 
-const DummyComponent = ({ data, isProjectLead, setUserToEdit }) => {
+const ListComponent = ({ data, isProjectLead, setUserToEdit }) => {
   return (
     <List className="search-results disablePadding">
       {data.map((u, idx) => {
@@ -101,12 +101,12 @@ const DummyComponent = ({ data, isProjectLead, setUserToEdit }) => {
   );
 };
 
-const UserPermissionSearch = ({ admins, projectLeads, setUserToEdit }) => {
+const UserPermissionSearch = ({ admins, projectManagers, setUserToEdit }) => {
   const { searchText, setSearchText, userType, setUserType, isProjectLead, setIsProjectLead } = useSearchText(); // React context hook
 
   const location = useLocation();
 
-  const resultData = [...admins, ...projectLeads];
+  const resultData = [...admins, ...projectManagers];
 
   useEffect(() => {
     // Edit url by adding '/admin' upon loading
@@ -274,7 +274,7 @@ const UserPermissionSearch = ({ admins, projectLeads, setUserToEdit }) => {
         >
           <Box>
             {/*Component to render admins and PMs*/}
-            <DummyComponent
+            <ListComponent
               data={filteredData}
               isProjectLead={isProjectLead}
               setUserToEdit={setUserToEdit}
diff --git a/client/src/pages/UserPermission.jsx b/client/src/pages/UserPermission.jsx
index af38752a..1aeea1b6 100644
--- a/client/src/pages/UserPermission.jsx
+++ b/client/src/pages/UserPermission.jsx
@@ -29,8 +29,8 @@ const UserPermission = () => {
   }, [userApiService]);
 
   const updateUserDb = useCallback(
-    async (user, managedProjects) => {
-      await userApiService.updateUserDbProjects(user, managedProjects);
+    async (user, managedProjects, action) => {
+      await userApiService.updateUserDbProjects(user, managedProjects, action);
       fetchAdmins();
     },
     [userApiService, fetchAdmins]
@@ -38,7 +38,7 @@ const UserPermission = () => {
 
   const updateUserActiveStatus = useCallback(
     async (user, isActive) => {
-      await userApiService.updateUserDbIsActive(admins, isActive);
+      await userApiService.updateUserDbIsActive(user, isActive);
       fetchAdmins();
     },
     [userApiService, fetchAdmins]
@@ -46,8 +46,8 @@ const UserPermission = () => {
 
   // Update user's access level (admin/user)
   const updateUserAccessLevel = useCallback(
-    async (admin, newAccessLevel) => {
-      await userApiService.updateUserAccessLevel(admin, newAccessLevel);
+    async (user, newAccessLevel) => {
+      await userApiService.updateUserAccessLevel(user, newAccessLevel);
       fetchAdmins();
     },
     [userApiService, fetchAdmins]
@@ -62,7 +62,7 @@ const UserPermission = () => {
     fetchAdmins();
     fetchProjects();
     fetchProjectsManagers();
-  }, [fetchAdmins, fetchProjects, fetchProjectsManagers]);
+  }, [userToEdit, fetchAdmins, fetchProjects, fetchProjectsManagers]);
 
   const backToSearch = () => {
     setUserToEdit({});
@@ -76,7 +76,7 @@ const UserPermission = () => {
     return (
       <UserPermissionSearch
         admins={admins}
-        projectLeads={projectManagers}
+        projectManagers={projectManagers}
         setUserToEdit={setUserToEdit}
       />
     );