Swag at permissions changes

Author: mkimberlin

server/src/main/java/com/objectcomputing/checkins/security/permissions/Permissions.java

@@ -1,21 +1,37 @@
 package com.objectcomputing.checkins.security.permissions;
 
 public enum Permissions {
-    CAN_VIEW_FEEDBACK_REQUEST,
-    CAN_CREATE_FEEDBACK_REQUEST,
-    CAN_DELETE_FEEDBACK_REQUEST,
-    CAN_VIEW_FEEDBACK_ANSWER,
-    CAN_DELETE_ORGANIZATION_MEMBERS,
-    CAN_CREATE_ORGANIZATION_MEMBERS,
-    CAN_VIEW_ROLE_PERMISSIONS,
-    CAN_ASSIGN_ROLE_PERMISSIONS,
-    CAN_VIEW_PERMISSIONS,
-    CAN_VIEW_SKILLS_REPORT,
-    CAN_VIEW_RETENTION_REPORT,
-    CAN_VIEW_ANNIVERSARY_REPORT,
-    CAN_VIEW_BIRTHDAY_REPORT,
-    CAN_VIEW_PROFILE_REPORT,
-    CAN_CREATE_CHECKINS,
-    CAN_VIEW_CHECKINS,
-    CAN_UPDATE_CHECKINS,
-}
+    CAN_VIEW_FEEDBACK_REQUEST("View feedback requests", "Feedback"),
+    CAN_CREATE_FEEDBACK_REQUEST("Create feedback requests", "Feedback"),
+    CAN_DELETE_FEEDBACK_REQUEST("Delete feedback requests", "Feedback"),
+    CAN_VIEW_FEEDBACK_ANSWER("View feedback answers", "Feedback"),
+    CAN_DELETE_ORGANIZATION_MEMBERS("Delete organization members", "User Management"),
+    CAN_CREATE_ORGANIZATION_MEMBERS("Create organization members", "User Management"),
+    CAN_VIEW_ROLE_PERMISSIONS("View role permissions", "Security"),
+    CAN_ASSIGN_ROLE_PERMISSIONS("Assign role permissions", "Security"),
+    CAN_VIEW_PERMISSIONS("View all permissions", "Security"),
+    CAN_VIEW_SKILLS_REPORT("View skills report", "Reporting"),
+    CAN_VIEW_RETENTION_REPORT("View retention report", "Reporting"),
+    CAN_VIEW_ANNIVERSARY_REPORT("View anniversary report", "Reporting"),
+    CAN_VIEW_BIRTHDAY_REPORT("View birthday report", "Reporting"),
+    CAN_VIEW_PROFILE_REPORT("View profile report", "Reporting"),
+    CAN_CREATE_CHECKINS("Create check-ins", "Check-ins"),
+    CAN_VIEW_CHECKINS("View check-ins", "Check-ins"),
+    CAN_UPDATE_CHECKINS("Update check-ins", "Check-ins");
+
+    private final String description;
+    private final String category;
+
+    Permissions(String description, String category) {
+        this.description = description;
+        this.category = category;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+}

server/src/main/java/com/objectcomputing/checkins/services/permissions/Permission.java

@@ -1,5 +1,6 @@
 package com.objectcomputing.checkins.services.permissions;
 
+import com.objectcomputing.checkins.security.permissions.Permissions;
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.data.annotation.AutoPopulated;
@@ -59,13 +60,17 @@ public void setPermission(String permission) {
     }
 
     public String getDescription() {
-        return description;
+        return Permissions.valueOf(permission).getDescription(); //ignoring the database for now...
     }
 
     public void setDescription(String description) {
         this.description = description;
     }
 
+    public String getCategory() {
+        return Permissions.valueOf(permission).getCategory();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

web-ui/src/pages/EditPermissionsPage.jsx

@@ -16,10 +16,29 @@ import { selectCurrentUserId } from "../context/selectors";
 
 import "./EditPermissionsPage.css";
 
+const groupPermissionsByCategory = (permissions) => permissions.reduce((categories, permission) => {
+  const category = permission.category;
+  const existingCategory = categories.find(cat => cat.category === category);
+
+  // If category exists, add permission to its permissions array
+  if (existingCategory) {
+    existingCategory.permissions.push(permission);
+  } else {
+    // Create a new category object and add it to categories
+    categories.push({
+      category,
+      permissions: [permission],
+    });
+  }
+
+  return categories;
+}, []);
+
 const EditPermissionsPage = () => {
   const { state } = useContext(AppContext);
   const { csrf } = state;
   const [permissionsList, setPermissionsList] = useState([]);
+  const [categoriesList, setCategoriesList] = useState([]);
   const [adminId, setAdminId] = useState("");
   const [pdlId, setPDLId] = useState("");
   const [memberId, setMemberId] = useState("");
@@ -704,6 +723,7 @@ const EditPermissionsPage = () => {
         res.payload && res.payload.data && !res.error ? res.payload.data : null;
       if (data) {
         setPermissionsList(data);
+        setCategoriesList(groupPermissionsByCategory(data));
       }
     };
     const doTask3 = async () => {