staff permission data structure change(id, name)

compliance-api/src/compliance_api/schemas/staff_user.py

@@ -33,9 +33,10 @@ class Meta(AutoSchemaBase.Meta):  # pylint: disable=too-few-public-methods
         include_fk = True
 
     position = fields.Nested(KeyValueSchema, dump_only=True)
-    permission = fields.Str(
-        metadata={"description": "The permission level of the user in the app"}
-    )
+    # permission = fields.Str(
+    #     metadata={"description": "The permission level of the user in the app"}
+    # )
+    permission = fields.Raw()
     name = fields.Method("get_full_name")
 
     def get_full_name(self, obj):  # pylint: disable=no-self-use
@@ -52,7 +53,11 @@ def nullify_nested(
         if data.get("supervisor_id") is None:
             data["supervisor"] = None
         if data.get("permission") in [p.name for p in PermissionEnum]:
-            data["permission"] = getattr(PermissionEnum, data.get("permission")).name
+            # data["permission"] = getattr(PermissionEnum, data.get("permission")).value
+            data["permission"] = {
+                "id": getattr(PermissionEnum, data.get("permission")).name,
+                "name": getattr(PermissionEnum, data.get("permission")).value
+            }
         return data
 
 

compliance-api/src/compliance_api/services/staff_user.py

@@ -1,6 +1,10 @@
 """Service for user management."""
 
-from compliance_api.exceptions import ResourceExistsError, ResourceNotFoundError, UnprocessableEntityError
+from compliance_api.exceptions import (
+    ResourceExistsError,
+    ResourceNotFoundError,
+    UnprocessableEntityError,
+)
 from compliance_api.models.db import session_scope
 from compliance_api.models.staff_user import StaffUser as StaffUserModel
 from compliance_api.utils.constant import AUTH_APP
@@ -109,7 +113,7 @@ def _create_staff_user_object(user_data: dict, auth_user: dict):
         "deputy_director_id": user_data.get("deputy_director_id"),
         "supervisor_id": user_data.get("supervisor_id", None),
         "auth_user_guid": auth_user.get("username", None),
-        "is_active": auth_user.get("is_active")
+        "is_active": auth_user.get("is_active"),
     }
 
 
@@ -129,7 +133,11 @@ def _set_permission_level_in_compliance_user_obj(
     """Set the permission level in compliance user."""
     if auth_user and auth_user.get("groups", None):
         sorted_groups = sorted(auth_user.get("groups", None), key=_get_level)
-        if sorted_groups[-1] and sorted_groups[-1]["name"]:
+        if (
+            sorted_groups[-1]
+            and sorted_groups[-1]["name"]
+            and sorted_groups[-1]["name"] in [p.name for p in PermissionEnum]
+        ):
             setattr(compliance_user, "permission", sorted_groups[-1]["name"])
     return compliance_user
 

compliance-web/src/components/App/Staff/StaffForm.tsx

@@ -22,6 +22,7 @@ const StaffForm: React.FC<StaffFormProps> = ({
   authUsersList,
   staffUsersList,
 }) => {
+  console.log(existingStaff)
   return (
     <>
       <ControlledAutoComplete

compliance-web/src/components/App/Staff/StaffModal.tsx

@@ -65,7 +65,7 @@ const StaffModal: React.FC<StaffModalProps> = ({ onSubmit, staff }) => {
           undefined,
         position: staff.position || undefined,
         permission:
-          permissionsList?.find((item) => item.id === staff.permission) ||
+          permissionsList?.find((item) => item.id === staff.permission?.id) ||
           undefined,
         deputyDirector:
           staffUsersList?.find(

compliance-web/src/models/Staff.ts

@@ -11,7 +11,7 @@ export interface StaffUser {
   position_id?: number;
   deputy_director_id?: number;
   supervisor_id?: number;
-  permission?: string;
+  permission?: Permission;
   position?: Position;
   deputy_director?: StaffUser;
   supervisor?: StaffUser;

compliance-web/src/routes/_authenticated/admin/staff.tsx

@@ -68,7 +68,7 @@ export function Staff() {
     );
     setPermissionList(
       [
-        ...new Set(staffUsersList?.map((staff) => staff.permission ?? "")),
+        ...new Set(staffUsersList.map((staff) => staff.permission?.name)),
       ].filter(Boolean)
     );
   }, [staffUsersList]);
@@ -187,7 +187,7 @@ export function Staff() {
         },
       },
       {
-        accessorKey: "permission",
+        accessorFn: (row) => row.permission?.name,
         header: "Permission Level",
         filterVariant: "multi-select",
         filterSelectOptions: permissionList,
@@ -223,7 +223,6 @@ export function Staff() {
         },
         filterVariant: "multi-select",
         filterSelectOptions: ["Active", "Inactive"],
-        filterValue: ["Active"],
         Filter: ({ header, column }) => {
           return (
             <TableFilter
@@ -251,8 +250,7 @@ export function Staff() {
               id: "name",
               desc: false,
             },
-          ],
-          columnFilters: [{ id: "Status", value: ["Active"] }],
+          ]
         }}
         state={{
           isLoading: isLoading,