adminizer 4.1.0-build.20 → 4.1.0-build.21

package/helpers/accessRightsHelper.d.ts

@@ -13,3 +13,6 @@ export declare class AccessRightsHelper {
     enoughPermissions(tokens: string[], user: UserAP): boolean;
     hasPermission(tokenId: string, user: UserAP): boolean;
 }
+export declare class GroupsAccessRightsHelper {
+    static hasAccess(user: UserAP, groupsAccessRights?: string[]): boolean;
+}

package/helpers/accessRightsHelper.js

@@ -62,3 +62,15 @@ export class AccessRightsHelper {
         return user.groups.some((group) => group.tokens?.includes(tokenId));
     }
 }
+export class GroupsAccessRightsHelper {
+    static hasAccess(user, groupsAccessRights) {
+        const userGroups = user.groups?.map(group => group.name.toLowerCase());
+        if (groupsAccessRights) {
+            const allowedGroups = groupsAccessRights.map(item => item.toLowerCase());
+            return userGroups?.some(group => allowedGroups.includes(group)) ?? false;
+        }
+        else {
+            return true;
+        }
+    }
+}

package/helpers/inertiaMenuHelper.js

@@ -5,7 +5,7 @@ export class InertiaMenuHelper {
     }
     getMenuItems(req) {
         let menu = [];
-        for (const menuItem of this.adminizer.menuHelper.getMenuItems()) {
+        for (const menuItem of this.adminizer.menuHelper.getMenuItems(req.user)) {
             const menuItemTokens = menuItem.actions ? menuItem.actions.map(item => {
                 return item.accessRightsToken;
             }).filter(item => {

package/helpers/menuHelper.d.ts

@@ -3,6 +3,7 @@
  *
  * @constructor
  */
+import { UserAP } from "models/UserAP";
 import { ActionType, AdminpanelConfig, HrefConfig, ModelConfig } from "../interfaces/adminpanelConfig";
 export type MenuItem = {
     link: string;
@@ -60,5 +61,5 @@ export declare class MenuHelper {
      *
      * @returns {Array}
      */
-    getMenuItems(): MenuItem[];
+    getMenuItems(user: UserAP): MenuItem[];
 }

package/helpers/menuHelper.js

@@ -1,3 +1,4 @@
+import { GroupsAccessRightsHelper } from "./accessRightsHelper";
 export class MenuHelper {
     static config;
     constructor(config) {
@@ -98,7 +99,7 @@ export class MenuHelper {
      *
      * @returns {Array}
      */
-    getMenuItems() {
+    getMenuItems(user) {
         let menus = [];
         if (MenuHelper.config.navbar.additionalLinks && MenuHelper.config.navbar.additionalLinks.length > 0) {
             MenuHelper.config.navbar.additionalLinks.forEach(function (additionalLink) {
@@ -118,7 +119,12 @@ export class MenuHelper {
         }
         if (MenuHelper.config.models) {
             Object.entries(MenuHelper.config.models).forEach(function ([key, val]) {
-                if (!val.hide) {
+                const hide = typeof val.navbar?.visible === 'boolean'
+                    ? !val.navbar.visible
+                    : val.navbar?.groupsAccessRights
+                        ? !GroupsAccessRightsHelper.hasAccess(user, val.navbar.groupsAccessRights)
+                        : false;
+                if (!hide) {
                     if (val.tools && val.tools.length > 0 && val.tools[0].id !== "overview") {
                         val.tools.unshift({
                             id: "overview",

package/interfaces/adminpanelConfig.d.ts

@@ -184,9 +184,18 @@ export interface ModelConfig {
      * */
     model: string;
     /**
-     * Hide entity in left navbar
+     * If the field is not definitely, then it will appear in Navbar
      * */
-    hide?: boolean;
+    navbar?: {
+        /**
+         * @default true
+         */
+        visible?: boolean;
+        /**
+         * For which it will be shown if not established will be shown to all groups who have the rights to read
+         */
+        groupsAccessRights?: string[];
+    };
     /**
      * Entity fields configuration
      * */

package/lib/v4/DataAccessor.js

@@ -37,6 +37,7 @@ export class DataAccessor {
         }
         const result = {};
         Object.entries(modelAttributes).forEach(([key, modelField]) => {
+            console.log(key);
             // The fields that are recorded separately from the connection in some ORMs, because they are processed at the level above them.
             if (modelAttributes[key].primaryKeyForAssociation === true) {
                 return undefined;
@@ -77,7 +78,7 @@ export class DataAccessor {
             let populatedModelFieldsConfig = {};
             if (modelField.type === "association" || modelField.type === "association-many") {
                 const modelName = modelField.model || modelField.collection;
-                const tokenId = `${this.actionVerb}-${modelName}-${this.entity.type}`;
+                const tokenId = `read-${modelName}-${this.entity.type}`;
                 if (!this.adminizer.accessRightsHelper.hasPermission(tokenId, this.user)) {
                     Adminizer.log.silly(`No access rights to ${this.entity.type}: ${this.entity.model.modelname}`);
                     return undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.1.0-build.20",
+  "version": "4.1.0-build.21",
   "main": "index.js",
   "scripts": {
     "test": "vitest --reporter verbose",