Merge pull request #2189 from objectcomputing/feature-2185/resurrect-…

…roles-editing Resurrected the ability to add and update roles
objectcomputing · Apr 11, 2024 · dcf4ac4 · dcf4ac4
2 parents 6ce7c95 + ce3a9ad
commit dcf4ac4
Show file tree

Hide file tree

Showing 7 changed files with 651 additions and 247 deletions.
diff --git a/web-ui/src/api/roles.js b/web-ui/src/api/roles.js
@@ -41,9 +41,16 @@ export const addNewRole = async (role, cookie) => {
   return resolve({
     method: "POST",
     url: roleURL,
-    data: {
-      role: role,
-    },
+    data: role,
     headers: { "X-CSRF-Header": cookie, "Accept": "application/json", "Content-Type": "application/json;charset=UTF-8" },
   });
 };
+
+export const updateRole = async (role, cookie) => {
+  return resolve({
+    method: "PUT",
+    url: roleURL,
+    data: role,
+    headers: { "X-CSRF-Header": cookie, "Accept": "application/json", "Content-Type": "application/json;charset=UTF-8" },
+  });
+};
diff --git a/web-ui/src/components/admin/roles/RoleUserCards.jsx b/web-ui/src/components/admin/roles/RoleUserCards.jsx
@@ -11,45 +11,45 @@ import {
   Typography,
 } from "@mui/material";
 
-const RoleUserCards = ({ role, roleToMemberMap, removeFromRole }) => {
-  roleToMemberMap[role].sort((a, b) => a.name.localeCompare(b.name));
-  return roleToMemberMap[role].map(
-    (member) =>
-      member && (
-        <div key={member.id}>
-          <ListItem className="roles-list-item">
-            <ListItemAvatar>
-              <Avatar
-                alt={`${member.name}'s avatar`}
-                className="large"
-                src={getAvatarURL(member.workEmail)}
-              />
-            </ListItemAvatar>
-            <ListItemText
-              primary={
-                <Typography variant="h5" component="h2">
-                  {member.name}
-                </Typography>
-              }
-              secondary={
-                <Typography color="textSecondary" component="h3">
-                  {member.title}
-                </Typography>
-              }
+const RoleUserCards = ({ roleMembers, onRemove, memberQuery }) => {
+  roleMembers?.sort((a, b) => a.name?.localeCompare(b.name) || -1);
+  return roleMembers?.map((member) =>
+    member &&
+    ((memberQuery && memberQuery.trim())
+      ? member.name.toLowerCase().includes(memberQuery.trim().toLowerCase())
+      : true) && (
+      <div key={member.id}>
+        <ListItem className="roles-list-item">
+          <ListItemAvatar>
+            <Avatar
+              alt={`${member.name}'s avatar`}
+              className="large"
+              src={getAvatarURL(member.workEmail)}
             />
-            <div
-              className="icon"
-              onClick={() => {
-                removeFromRole(member, role);
-              }}
-            >
-              <DeleteIcon />
-            </div>
-          </ListItem>
-          <Divider variant="inset" component="li" />
-        </div>
-      )
-  );
+          </ListItemAvatar>
+          <ListItemText
+            primary={
+              <Typography variant="h5" component="h2">
+                {member.name}
+              </Typography>
+            }
+            secondary={
+              <Typography color="textSecondary" component="h3">
+                {member.title}
+              </Typography>
+            }
+          />
+          <div
+            className="icon"
+            onClick={() => onRemove(member)}
+          >
+            <DeleteIcon />
+          </div>
+        </ListItem>
+        <Divider variant="inset" component="li" style={{ marginRight: "2rem" }} />
+      </div>
+    )
+  ) || null;
 };
 
 export default RoleUserCards;
diff --git a/web-ui/src/components/admin/roles/Roles.css b/web-ui/src/components/admin/roles/Roles.css
@@ -1,6 +1,14 @@
-.role-buttons {
+.role-header {
   display: flex;
-  justify-content: flex-end;
+  flex-direction: row;
+  align-items: center;
+  height: 100px;
+  justify-content: space-between;
+  padding: 0 1rem 0 1rem;
+}
+
+.role-header-title {
+  width: 50%;
 }
 
 .role-modal {
@@ -43,20 +51,17 @@
 
 .roles-content {
   margin-left: 1rem;
-}
-
-.roles-header {
-  display: flex;
-  justify-content: center;
+  margin-right: 1rem;
 }
 
 .roles-content .icon {
-  padding-right: 2rem;
   cursor: pointer;
 }
 
 .roles-content .roles-list-item {
   align-items: center;
+  padding-left: 2rem;
+  padding-right: 2rem;
 }
 
 .roles-content .roles-search {
@@ -86,30 +91,77 @@
   overflow: scroll;
 }
 
-.roles-content .roles .role-buttons .role-add {
+.role-header-buttons {
+  display: flex;
+  flex-direction: row;
+}
+
+.roles-content .roles .role-header-buttons .role-add {
   cursor: pointer;
   display: flex;
   align-items: center;
   margin-left: 0.5rem;
 }
 
-.roles-content .roles .role-buttons .role-edit {
+.roles-content .roles .role-header-buttons .role-edit {
   cursor: pointer;
   display: flex;
   align-items: center;
   margin-left: 0.5rem;
 }
 
-.roles-content .roles .role-buttons span {
+.roles-content .roles .role-header-buttons span {
   margin-right: 0.5rem;
 }
 
 .roles-content .roles .roles-bot {
-  display: flex;
+  display: grid;
+  grid-template-columns: 1fr 1fr;
 }
 
 .roles-content .roles .roles-top {
   display: flex;
   justify-content: space-between;
-  margin-left: 16px;
 }
+
+.roles-content .roles .roles-top .roles-top-left {
+  display: flex;
+}
+.roles-content .roles .roles-top .roles-top-right {
+  display: flex;
+}
+
+.roles-content .roles .roles-top-search-fields {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  width: 100%;
+}
+
+.roles-content .roles .roles-top-search-fields .role-select {
+  width: 50%;
+  margin-right: 2rem;
+}
+
+.roles-content .roles .roles-top-search-fields .member-role-search {
+  width: 50%;
+}
+
+@media screen and (max-width: 600px) {
+
+  .roles-content .roles .roles-top .roles-top-search-fields {
+    flex-direction: column;
+  }
+
+  .roles-content .roles .roles-top .roles-top-search-fields .role-select {
+    width: 300px;
+    margin-top: 0;
+    margin-right: 0;
+  }
+
+  .roles-content .roles .roles-top .roles-top-search-fields .member-role-search {
+    width: 300px;
+    margin-bottom: 1rem;
+  }
+
+}