fix logic

Author: tiagoapolo

frontend/common/services/useUserPermissions.ts

@@ -72,17 +72,7 @@ export const userPermissionsService = service
                 admin: false,
                 permissions: [
                   {
-                    derived_from: {
-                      roles: [
-                        {
-                          'description': 'role_1',
-                          'id': 227,
-                          'name': 'role1',
-                          'organisation': 5692,
-                          tags: [],
-                        },
-                      ],
-                    },
+                    derived_from: undefined,
                     is_directly_granted: true,
                     permission_key: 'MANAGE_USERS',
                     tags: [],

frontend/web/components/DerivedPermissionsList.tsx

@@ -42,26 +42,23 @@ const DerivedPermissionsList: FC<DerivedPermissionsListType> = ({
   numberToTruncate = 3,
 }) => {
   const { items, truncatedItems } = useMemo(() => {
-    if (
-      isAdmin ||
-      !derivedPermissions ||
-      !derivedPermissions.groups ||
-      !derivedPermissions.roles
-    ) {
+    if (isAdmin || !derivedPermissions) {
       return {
         items: [],
         truncatedItems: [],
       }
     }
 
-    const groups = derivedPermissions.groups.map((group) => ({
-      ...group,
-      type: 'group' as const,
-    }))
-    const roles = derivedPermissions.roles.map((role) => ({
-      ...role,
-      type: 'role' as const,
-    }))
+    const groups =
+      derivedPermissions?.groups?.map((group) => ({
+        ...group,
+        type: 'group' as const,
+      })) ?? []
+    const roles =
+      derivedPermissions?.roles?.map((role) => ({
+        ...role,
+        type: 'role' as const,
+      })) ?? []
     const derivedList = [...groups, ...roles]
 
     const items =
@@ -75,6 +72,12 @@ const DerivedPermissionsList: FC<DerivedPermissionsListType> = ({
     }
   }, [isAdmin, numberToTruncate, derivedPermissions])
 
+  console.log({
+    derivedPermissions,
+    items,
+    truncatedItems,
+  })
+
   if (!items?.length) return null
 
   return (

frontend/web/components/PermissionRow.tsx

@@ -84,6 +84,8 @@ export const PermissionRow: React.FC<PermissionRowProps> = ({
     (e) => e.permission_key === permission.key,
   )
 
+  console.log(matchingPermission)
+
   const hasPermission = (key: string) => {
     if (isAdmin) return true
     return entityPermissions.permissions.find(
@@ -141,9 +143,10 @@ export const PermissionRow: React.FC<PermissionRowProps> = ({
               }}
             />
           )}
-          {isDebug && !isAdmin && (
+          {isDebug && (
             <div className='mt-2'>
               <DerivedPermissionsList
+                isAdmin={isAdmin}
                 derivedPermissions={
                   (matchingPermission as Permission)?.derived_from
                 }