@applica-software-guru/react-admin 1.0.44 → 1.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applica-software-guru/react-admin",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "private": false,
   "repository": {
     "type": "git",

package/src/hooks/useMenu.jsx

@@ -95,7 +95,7 @@ const mapParent = (group) => {
   return group;
 };
 
-const createNodes = ({ userGroups, resources, permissions, translate }) => {
+const createNodes = ({ userGroups, resources, permissions, translate, roles }) => {
   const translateRecursive = (group) => {
     group.title = translate(group.title, { _: group.title });
 
@@ -149,34 +149,24 @@ const createNodes = ({ userGroups, resources, permissions, translate }) => {
   const groups = [...groupsA, ...groupsB];
 
   Object.values(resources).forEach((resource) => {
-    if (!resource.hasList) {
-      return;
-    }
-
-    const group = getGroup(groups, resource, permissions);
-    const exists = group?.children?.some((c) => c.id === resource.name);
-    if (!hasPermission(resource, permissions)) {
-      if (exists && group?.children?.length > 0) {
-        group.children = group.children.filter((c) => c.id !== resource.name);
+    const resourceGroup = getGroup(groups, resource, permissions);
+    const resourceMenu = resourceGroup?.children?.find((c) => c.id === resource.name);
+    const resourceExists = resourceGroup?.children?.some((c) => c.id === resource.name);
+    const resourceRoles = resourceMenu?.roles || resource.options?.roles || [];
+    const hasRoles = !resourceRoles || resourceRoles.length === 0 || resourceRoles.some((role) => roles.includes(role));
+    if (!hasPermission(resource, permissions) || !resource.hasList || !hasRoles) {
+      if (resourceExists && resourceGroup?.children?.length > 0) {
+        resourceGroup.children = resourceGroup.children.filter((c) => c.id !== resource.name);
       }
       return;
     }
-    if (group) {
-      if (!group.children) {
-        group.children = [];
+    if (resourceGroup) {
+      if (!resourceGroup.children) {
+        resourceGroup.children = [];
       }
-      if (exists) {
+      if (resourceExists) {
         return;
       }
-      // group.children.push({
-      //   id: resource.name,
-      //   type: 'item',
-      //   title: translate(resource.options?.label || `ra.menu.item.${resource.name}`, {
-      //     _: resource.options?.label || resource.name
-      //   }),
-      //   url: `/${resource.name}`,
-      //   icon: resource.options?.icon || exists?.icon || AntDesignOutlined
-      // })
     }
   });
 
@@ -195,11 +185,13 @@ const useMenu = () => {
       return null;
     }
 
+    const roles = (identity?.roles || []).map((role) => role.id);
     const groups = createNodes({
       resources,
       permissions,
       translate,
-      userGroups
+      userGroups,
+      roles
     });
 
     return groups;