Merge pull request #1750 from ntrehan/1486-v2

1486 - Giving the capability for admin to change user access level for any user
hackforla · Sep 24, 2024 · a5f1d59 · a5f1d59
2 parents 1d47e39 + ebe9c06
commit a5f1d59
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 9 deletions.
diff --git a/backend/models/user.model.js b/backend/models/user.model.js
@@ -9,7 +9,11 @@ const userSchema = mongoose.Schema({
     lastName: { type: String },
   },
   email: { type: String, unique: true },
-  accessLevel: { type: String, default: "user" },
+  accessLevel: { 
+    type: String, 
+    enum: ["user", "admin"], // restricts values to "user" and "admin"
+    default: "user" 
+  },
   createdDate: { type: Date, default: Date.now },
   currentRole: { type: String }, // will remove but need to update check-in form
   desiredRole: { type: String }, // will remove but need to update check-in form

diff --git a/client/src/api/UserApiService.js b/client/src/api/UserApiService.js
@@ -73,6 +73,23 @@ class UserApiService {
       alert('server not responding.  Please try again.');
     }
   }
+
+  // Update user's access level (admin/user)
+  async updateUserAccessLevel(userToEdit, accessLevel) {
+    const url = `${this.baseUserUrl}${userToEdit._id}`;
+    const requestOptions = {
+      method: 'PATCH',
+      headers: this.headers,
+      body: JSON.stringify({ accessLevel }),
+    };
+
+    try {
+      return await fetch(url, requestOptions);
+    } catch (err) {
+      console.error('update access level error', err);
+      alert('server not responding.  Please try again.');
+    }
+  }
 }
 
 export default UserApiService;
diff --git a/client/src/components/user-admin/EditUsers.jsx b/client/src/components/user-admin/EditUsers.jsx
@@ -3,10 +3,11 @@ import '../../sass/UserAdmin.scss';
 import { FormGroup, FormControlLabel, Switch } from '@mui/material'
 
 // child of UserAdmin. Displays form to update users.
-const EditUsers = ({ userToEdit, backToSearch, updateUserDb, projects, updateUserActiveStatus }) => {
+const EditUsers = ({ userToEdit, backToSearch, updateUserDb, projects, updateUserActiveStatus, updateUserAccessLevel }) => {
   const [userManagedProjects, setUserManagedProjects] = useState([]); //  The projects that the selected user is assigned
   const [projectValue, setProjectValue] = useState(''); // State and handler for form in EditUsers
   const [isActive, setIsActive] = useState(userToEdit.isActive);
+  const [isAdmin, setIsAdmin] = useState(userToEdit.accessLevel === "admin");
 
   // Prepare data for display
   const userName = `${userToEdit.name?.firstName} ${userToEdit.name?.lastName}`;
@@ -64,6 +65,12 @@ const EditUsers = ({ userToEdit, backToSearch, updateUserDb, projects, updateUse
     updateUserActiveStatus(userToEdit, !isActive)
   }
 
+  const handleSetAccessLevel = () => {
+    const newAccessLevel = isAdmin ? "user" : "admin";
+    setIsAdmin(!isAdmin);
+    updateUserAccessLevel(userToEdit, newAccessLevel);
+  };
+
   return (
     <div className="edit-users">
       <div className="ua-row">
@@ -74,15 +81,24 @@ const EditUsers = ({ userToEdit, backToSearch, updateUserDb, projects, updateUse
         <div className="user-display-column-left">Email:</div>
         <div className="user-display-column-right">{userEmail}</div>
       </div>
-      <div className="ua-row is-active-flex">
-        <div className="user-is-active-column-left">Is Active:</div>
-        <div className="is-active-flex">
-          <span className="active-status">{isActive.toString()}</span>
+      <div className="ua-row toggle-flex">
+        <div className="user-toggle-column-left">Is Active:</div>
+        <div className="toggle-flex">
+          <span className="toggle-status">{isActive.toString()}</span>
           <FormGroup>
             <FormControlLabel control={<Switch checked={isActive} />} onClick={() => handleSetIsActive()} />
           </FormGroup>
         </div>
       </div>
+      <div className="ua-row toggle-flex">
+        <div className="user-toggle-column-left">VRSM Admin:</div>
+        <div className="toggle-flex">
+          <span className="toggle-status">{isAdmin ? "Yes" : "No"}</span>
+          <FormGroup>
+            <FormControlLabel control={<Switch checked={isAdmin} />} onClick={() => handleSetAccessLevel()} />
+          </FormGroup>
+        </div>
+      </div>
       <div className="ua-row">
         <div className="user-display-column-left">Projects:</div>
         <div className="user-display-column-right">

diff --git a/client/src/pages/UserAdmin.jsx b/client/src/pages/UserAdmin.jsx
@@ -37,6 +37,15 @@ const UserAdmin = () => {
     }, [userApiService, fetchUsers]
   )
 
+  // Update user's access level (admin/user)
+  const updateUserAccessLevel = useCallback(
+    async (user, newAccessLevel) => {
+      await userApiService.updateUserAccessLevel(user, newAccessLevel);
+      fetchUsers();
+    },
+    [userApiService, fetchUsers]
+  );
+
   const fetchProjects = useCallback(async () => {
     const projectRes = await projectApiService.fetchProjects();
     setProjects(projectRes);
@@ -65,6 +74,7 @@ const UserAdmin = () => {
         updateUserDb={updateUserDb}
         backToSearch={backToSearch}
         updateUserActiveStatus={updateUserActiveStatus}
+        updateUserAccessLevel={updateUserAccessLevel}
       />
     );
   }

diff --git a/client/src/sass/UserAdmin.scss b/client/src/sass/UserAdmin.scss
@@ -65,18 +65,18 @@
   margin-bottom: 8px;
 }
 
-.user-is-active-column-left {
+.user-toggle-column-left {
   display: flex;
   flex-direction: column;
   flex-basis: 15%;
 }
 
-.active-status {
+.toggle-status {
   margin-right: 15px;
   width: 25px;
 }
 
-.is-active-flex {
+.toggle-flex {
   display: flex;
   align-items: center;
 }