adminizer 4.1.0-build.3 → 4.1.0-build.31

package/helpers/controllerHelper.js

@@ -28,7 +28,15 @@ export class ControllerHelper {
      * @private
      */
     static _isValidModelConfig(config) {
-        return (typeof config === "object" && typeof config.model === "string");
+        try {
+            if (!config)
+                throw `Config is not defined ${config}`;
+            return (typeof config === "object" && typeof config.model === "string");
+        }
+        catch (error) {
+            Adminizer.log.error(error);
+            return false;
+        }
     }
     ;
     /**
@@ -84,7 +92,7 @@ export class ControllerHelper {
         const entityType = req.params.entityType;
         if (!entityType) {
             const extractedEntityType = req.originalUrl.split('/')[2];
-            if (["form", "model", "wizard"].includes(extractedEntityType)) {
+            if (["form", "model"].includes(extractedEntityType)) {
                 return extractedEntityType;
             }
             else {
@@ -101,22 +109,28 @@ export class ControllerHelper {
      * @returns {?string}
      */
     static findEntityName(req) {
-        if (!req.params.entityName) {
-            let entityType = req.originalUrl.split('/')[2];
-            let entityName = req.originalUrl.split('/')[3];
-            if (entityType === "form" && (!req.adminizer.config.forms || !req.adminizer.config.forms.data || !req.adminizer.config.forms.data[entityName])) {
-                return null;
-            }
-            else if (entityType === "model" && (!req.adminizer.config.models || !req.adminizer.config.models[entityName])) {
-                return null;
+        if (req.params.entityName) {
+            return req.params.entityName;
+        }
+        const urlParts = req.originalUrl.split('/');
+        const entityType = urlParts[2];
+        const entityName = urlParts[3];
+        if (entityType === 'form') {
+            const forms = req.adminizer.config.forms?.data;
+            if (!forms || !Object.keys(forms).some(key => key.toLowerCase() === entityName.toLowerCase())) {
+                throw new Error(`Form "${entityName}" not found`);
             }
-            else {
-                return entityName;
+            return Object.keys(forms).find(key => key.toLowerCase() === entityName.toLowerCase());
+        }
+        if (entityType === 'model') {
+            const models = req.adminizer.config.models;
+            if (!models || !Object.keys(models).some(key => key.toLowerCase() === entityName.toLowerCase())) {
+                throw new Error(`Model "${entityName}" not found`);
             }
+            return Object.keys(models).find(key => key.toLowerCase() === entityName.toLowerCase());
         }
-        return req.params.entityName;
+        throw new Error(`Unsupported entity type "${entityType}" in URL`);
     }
-    ;
     /**
      * Searches for config from admin panel
      *
@@ -125,11 +139,17 @@ export class ControllerHelper {
      * @returns {?Object}
      */
     static findModelConfig(req, entityName) {
-        if (!req.adminizer.config.models || !req.adminizer.config.models[entityName]) {
-            Adminizer.log.error('No such route exists');
+        const models = req.adminizer.config.models;
+        if (!models) {
+            Adminizer.log.error('No models configuration found');
+            return null;
+        }
+        const foundKey = Object.keys(models).find(key => key.toLowerCase() === entityName.toLowerCase());
+        if (!foundKey) {
+            Adminizer.log.error(`No such route exists: ${entityName}`);
             return null;
         }
-        return this._normalizeModelConfig(entityName, req.adminizer.config.models[entityName]);
+        return this._normalizeModelConfig(foundKey, models[foundKey]);
     }
     /**
      * Will get action config from configuration file depending to given action
@@ -200,7 +220,8 @@ export class ControllerHelper {
             name: entityName,
             uri: entityUri,
             type: entityType,
-            model: null
+            model: null,
+            config: null
         };
         // If the entity type is "model", add additional properties
         if (entityType === "model") {

package/helpers/fieldsHelper.d.ts

@@ -1,20 +1,21 @@
-import { ActionType, BaseFieldConfig, FieldsTypes } from "../interfaces/adminpanelConfig";
+import { ActionType, BaseFieldConfig, FieldsTypes, ModelConfig } from "../interfaces/adminpanelConfig";
 import { Attribute } from "../lib/v4/model/AbstractModel";
 export type Field = {
     config: BaseFieldConfig & {
         /** @deprecated record should not be in config anymore */
-        records?: object[];
+        records?: Record<string, any>[];
         file?: string;
         key?: string;
         required?: boolean;
         type?: FieldsTypes;
         groupsAccessRights?: string[];
     } | string | boolean;
-    /** for populated fields' configs */
+    /** For render associalitons fields */
     populated: {
         [key: string]: Field;
     } | undefined;
     model: Attribute;
+    modelConfig: ModelConfig;
 };
 export type Fields = {
     [key: string]: Field;

package/helpers/fieldsHelper.js

@@ -1,5 +1,6 @@
 import { DataAccessor } from "../lib/v4/DataAccessor";
 import { Adminizer } from "../lib/Adminizer";
+import { isObject } from "./JsUtils";
 export class FieldsHelper {
     /**
      * Load list of records for all associations into `fields`
@@ -20,6 +21,9 @@ export class FieldsHelper {
          */
         let loadAssoc = async function (key, action) {
             let fieldConfigConfig = fields[key].config;
+            if (!isObject(fieldConfigConfig)) {
+                throw 'type error: fieldConfigConfig should be normalized';
+            }
             if (fieldConfigConfig.type !== 'association' && fieldConfigConfig.type !== 'association-many') {
                 return;
             }
@@ -42,7 +46,7 @@ export class FieldsHelper {
                     name: modelName, config: req.adminizer.config.models[modelName],
                     model: Model, uri: `${req.adminizer.config.routePrefix}/model/${modelName}`, type: "model"
                 };
-                let dataAccessor = new DataAccessor(req, entity, action);
+                let dataAccessor = new DataAccessor(req.adminizer, req.user, entity, "view");
                 list = await Model.find({}, dataAccessor);
             }
             catch (e) {

package/helpers/inertiaActionsHelper.js

@@ -4,7 +4,7 @@ export default function inertiaActionsHelper(actionType, entity, req) {
         const actions = req.adminizer.menuHelper.getGlobalActions(entity.config, actionType);
         if (actions && actions.length > 0) {
             actions.forEach(function (action) {
-                if (req.adminizer.accessRightsHelper.hasPermission(action.accessRightsToken, req.session.UserAP)) {
+                if (req.adminizer.accessRightsHelper.hasPermission(action.accessRightsToken, req.user)) {
                     resActions.push({
                         link: action.link,
                         id: action.id,

package/helpers/inertiaAddHelper.d.ts

@@ -1,8 +1,7 @@
 import { Entity, PropsField } from "../interfaces/types";
 import { Actions } from "./inertiaActionsHelper";
-import { Fields } from "./fieldsHelper";
-import { BaseFieldConfig } from "../interfaces/adminpanelConfig";
-import { AbstractControls, ControlType } from "../lib/controls/AbstractControls";
+import { Fields, Field } from "./fieldsHelper";
+import { AbstractControls, ControlType } from "../lib/v4/controls/AbstractControls";
 export type PropsFieldType = 'text' | 'number' | 'range' | 'week' | 'month' | 'email' | 'color' | 'time' | 'date' | 'datetime-local' | 'password' | 'select' | 'select-many' | 'association-many' | 'association' | 'textarea' | 'checkbox' | ControlType;
 interface FieldProps extends Record<string | number | symbol, unknown> {
     edit: boolean;
@@ -21,7 +20,7 @@ interface FieldProps extends Record<string | number | symbol, unknown> {
     postLink: string;
 }
 export default function inertiaAddHelper(req: ReqType, entity: Entity, fields: Fields, record?: Record<string, string | boolean | number | string[]>, view?: boolean): FieldProps;
-export declare function getControlsOptions(fieldConfig: BaseFieldConfig, req: ReqType, type: ControlType, defaultControlName: string): {
+export declare function getControlsOptions(fieldConfig: Field["config"], req: ReqType, type: ControlType, defaultControlName: string): {
     name: string;
     config: {
         el?: HTMLElement;

package/helpers/inertiaAddHelper.js

@@ -1,5 +1,6 @@
 import inertiaActionsHelper from "./inertiaActionsHelper";
 import chalk from "chalk";
+import { isObject } from "./JsUtils";
 export default function inertiaAddHelper(req, entity, fields, record, view = false) {
     const actionType = 'add';
     let props = {
@@ -25,6 +26,10 @@ export default function inertiaAddHelper(req, entity, fields, record, view = fal
             continue;
         let field = fields[key];
         let fieldConfig = field.config;
+        if (!isObject(fieldConfig))
+            throw `Type error: fieldConfig is object`;
+        if (!!fieldConfig.visible === false)
+            continue;
         const type = (fieldConfig.type || fieldConfig.type).toLowerCase();
         //@ts-ignore TODO: fix model validations
         const isIn = typeof fieldConfig.isIn === 'object' ? fieldConfig.isIn : (field.model && typeof { ...field.model.validations }.isIn === 'object' ? { ...field.model.validations }.isIn : []);
@@ -113,6 +118,8 @@ export default function inertiaAddHelper(req, entity, fields, record, view = fal
     return props;
 }
 export function getControlsOptions(fieldConfig, req, type, defaultControlName) {
+    if (!isObject(fieldConfig))
+        throw `Type error: fieldConfig is object`;
     const fieldOptions = fieldConfig?.options;
     let control = getControl(req, type, fieldOptions?.name, defaultControlName);
     let editorName = control.getName();
@@ -190,6 +197,8 @@ function setAssociationValues(field, value) {
     let options = [];
     let initValue = [];
     const config = field.config;
+    if (!isObject(config))
+        throw `Type error: config is object`;
     const isOptionSelected = (option, value) => {
         if (Array.isArray(value)) {
             return value.includes(option);
@@ -198,8 +207,8 @@ function setAssociationValues(field, value) {
             return (option == value);
         }
     };
-    const getAssociationValue = (value, config) => {
-        const displayField = config.displayField || 'id';
+    const getAssociationValue = (value, field) => {
+        const displayField = field.modelConfig?.titleField || 'id';
         if (value === null)
             return [];
         if (Array.isArray(value)) {
@@ -212,13 +221,24 @@ function setAssociationValues(field, value) {
         return String(value);
     };
     for (let opt of config.records) {
+        const optAny = opt;
+        const displayField = typeof field.modelConfig.titleField !== 'undefined'
+            ? field.modelConfig.titleField
+            : typeof optAny.title !== 'undefined'
+                ? 'title'
+                : typeof optAny.name !== 'undefined'
+                    ? 'name'
+                    : config.identifierField;
+        const label = typeof config.displayModifier === 'function'
+            ? config.displayModifier(opt)
+            : optAny[displayField];
         options.push({
-            label: config.displayModifier && typeof config.displayModifier === 'function'
-                ? config.displayModifier(opt)
-                : (config.displayField ? opt[config.displayField] : opt[config.identifierField]),
-            value: opt[config.identifierField],
+            label,
+            value: optAny[config.identifierField],
         });
-        if (isOptionSelected(opt[config.identifierField], getAssociationValue(value, config))) {
+        if (!isObject(config))
+            throw `Type error: config is object`;
+        if (config.identifierField && isOptionSelected(opt[config.identifierField], getAssociationValue(value, field))) {
             initValue.push(opt[config.identifierField]);
         }
     }

package/helpers/inertiaFromHelper.js

@@ -9,6 +9,8 @@ export default function inertiaFormHelper(req, postLink, formData) {
     };
     for (const key of Object.keys(formData)) {
         let field = formData[key];
+        if (!!field.visible === false)
+            continue;
         const type = (field.type || field.type).toLowerCase();
         const isIn = field.isIn ?? [];
         let label = field.title ?? '';

package/helpers/inertiaGroupHelper.d.ts

@@ -1,3 +1,5 @@
+import { GroupAP } from "models/GroupAP";
+import { UserAP } from "models/UserAP";
 import { AccessRightsToken, Entity, PropsField } from "../interfaces/types";
 interface groupedTokens {
     header: string;
@@ -20,7 +22,7 @@ interface listProps extends Record<string | number | symbol, unknown> {
     users: PropsField[];
     groupedTokens: groupedTokens[];
 }
-export declare function inertiaGroupHelper(entity: Entity, req: ReqType, users: ModelsAP["UserAP"][], groupedTokens: {
+export declare function inertiaGroupHelper(entity: Entity, req: ReqType, users: UserAP[], groupedTokens: {
     [key: string]: AccessRightsToken[];
-}, group?: ModelsAP["GroupAP"], view?: boolean): listProps;
+}, group?: GroupAP, view?: boolean): listProps;
 export {};

package/helpers/inertiaGroupHelper.js

@@ -55,7 +55,7 @@ export function inertiaGroupHelper(entity, req, users, groupedTokens, group, vie
                     label: token.name,
                     tooltip: token.description,
                     name: `token-checkbox-${token.id}`,
-                    value: group ? (group.tokens && group.tokens.includes(token.id)) : false,
+                    value: group ? (group.tokens && group.tokens?.includes(token.id)) : false,
                     type: 'checkbox'
                 });
             }

package/helpers/inertiaListHelper.js

@@ -24,22 +24,22 @@ export function inertiaListHelper(entity, req, fields) {
         searchBtn: req.i18n.__('Search'),
         resetBtn: req.i18n.__('Reset'),
     };
-    if (entity.config.add && req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.session.UserAP)) {
+    if (entity.config.add && req.adminizer.accessRightsHelper.hasPermission(`create-${entity.name}-model`, req.user)) {
         props.crudActions.createTitle = req.i18n.__('create');
     }
-    if (req.adminizer.accessRightsHelper.hasPermission(`update-${entity.name}-model`, req.session.UserAP)) {
+    if (req.adminizer.accessRightsHelper.hasPermission(`update-${entity.name}-model`, req.user)) {
         props.crudActions.editTitle = req.i18n.__('Edit');
     }
-    if (req.adminizer.accessRightsHelper.hasPermission(`read-${entity.name}-model`, req.session.UserAP)) {
+    if (req.adminizer.accessRightsHelper.hasPermission(`read-${entity.name}-model`, req.user)) {
         props.crudActions.viewsTitle = req.i18n.__('View');
     }
-    if (req.adminizer.accessRightsHelper.hasPermission(`delete-${entity.name}-model`, req.session.UserAP)) {
+    if (req.adminizer.accessRightsHelper.hasPermission(`delete-${entity.name}-model`, req.user)) {
         props.crudActions.deleteTitle = req.i18n.__('Delete');
     }
     props.actions = inertiaActionsHelper(actionType, entity, req);
     if (req.adminizer.menuHelper.hasInlineActions(entity.config, 'list')) {
         for (const inlineAction of req.adminizer.menuHelper.getInlineActions(entity.config, 'list')) {
-            if (req.adminizer.accessRightsHelper.hasPermission(inlineAction.accessRightsToken, req.session.UserAP)) {
+            if (req.adminizer.accessRightsHelper.hasPermission(inlineAction.accessRightsToken, req.user)) {
                 props.inlineActions.push({
                     icon: inlineAction.icon,
                     id: inlineAction.id,

package/helpers/inertiaMenuHelper.d.ts

@@ -3,6 +3,6 @@ export declare class InertiaMenuHelper {
     private adminizer;
     constructor(adminizer: Adminizer);
     getMenuItems(req: ReqType): import("./menuHelper").MenuItem[];
-    getBrandTitle(): any;
+    getBrandTitle(): string;
     getLogoutUrl(): string;
 }

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 => {
@@ -13,7 +13,7 @@ export class InertiaMenuHelper {
             }) : [];
             if (menuItem.accessRightsToken)
                 menuItemTokens.push(menuItem.accessRightsToken);
-            if (this.adminizer.accessRightsHelper.enoughPermissions(menuItemTokens, req.session.UserAP)) {
+            if (this.adminizer.accessRightsHelper.enoughPermissions(menuItemTokens, req.user)) {
                 menu.push(menuItem);
             }
         }

package/helpers/inertiaUserHelper.d.ts

@@ -1,3 +1,5 @@
+import { GroupAP } from "models/GroupAP";
+import { UserAP } from "models/UserAP";
 import { Entity, PropsField } from "../interfaces/types";
 interface listProps extends Record<string | number | symbol, unknown> {
     edit: boolean;
@@ -16,6 +18,10 @@ interface listProps extends Record<string | number | symbol, unknown> {
     fields: PropsField[];
     groups: PropsField[];
     locales: Record<string, string>[];
+    userPretend: {
+        label: string;
+        postLink: string;
+    };
 }
-export declare function inertiaUserHelper(entity: Entity, req: ReqType, groups: ModelsAP["GroupAP"][], user?: ModelsAP["UserAP"], view?: boolean): listProps;
+export declare function inertiaUserHelper(entity: Entity, req: ReqType, groups: GroupAP[], user?: UserAP, view?: boolean): listProps;
 export {};

package/helpers/inertiaUserHelper.js

@@ -6,6 +6,10 @@ export function inertiaUserHelper(entity, req, groups, user, view = false) {
             title: req.i18n.__('Back'),
             link: entity.uri
         },
+        userPretend: {
+            label: req.i18n.__('Pretend to be a user'),
+            postLink: `${req.adminizer.config.routePrefix}/model/userap/login`
+        },
         passwordError: req.i18n.__('Values in "password" and "repeatPassword" fields should be the same'),
         btnSave: {
             title: req.i18n.__('Save')
@@ -58,7 +62,7 @@ export function inertiaUserHelper(entity, req, groups, user, view = false) {
             value: user?.locale ?? ''
         });
     }
-    if (req.session.UserAP.isAdministrator) {
+    if (req.user.isAdministrator) {
         props.fields.push({
             label: req.i18n.__('Profile expires'),
             type: 'date',

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;
@@ -15,14 +16,14 @@ export type MenuItem = {
     entityName?: string;
 };
 export declare class MenuHelper {
-    private static config;
+    private config;
     constructor(config: AdminpanelConfig);
     /**
      * Get menu brand title
      *
      * @returns {string}
      */
-    getBrandTitle(): any;
+    getBrandTitle(): string;
     /**
      * Check if global actions buttons added to action
      *
@@ -60,5 +61,5 @@ export declare class MenuHelper {
      *
      * @returns {Array}
      */
-    getMenuItems(): MenuItem[];
+    getMenuItems(user: UserAP): MenuItem[];
 }

package/helpers/menuHelper.js

@@ -1,7 +1,8 @@
+import { GroupsAccessRightsHelper } from "./accessRightsHelper";
 export class MenuHelper {
-    static config;
+    config;
     constructor(config) {
-        MenuHelper.config = config;
+        this.config = config;
     }
     /**
      * Get menu brand title
@@ -9,14 +10,14 @@ export class MenuHelper {
      * @returns {string}
      */
     getBrandTitle() {
-        if (!MenuHelper.config.brand || !MenuHelper.config.brand.link) {
+        if (!this.config.brand || !this.config.brand.link) {
             return 'Adminizer';
         }
-        if (typeof MenuHelper.config.brand.link === "string") {
-            return MenuHelper.config.brand.link;
+        if (typeof this.config.brand.link === "string") {
+            return this.config.brand.link;
         }
-        if (typeof MenuHelper.config.brand.link === "object" && typeof MenuHelper.config.brand.link.title === "string") {
-            return MenuHelper.config.brand.link.title;
+        if (typeof this.config.brand.link === "object" && typeof this.config.brand.link.title === "string") {
+            return this.config.brand.link.title;
         }
         return 'Adminizer';
     }
@@ -98,10 +99,10 @@ 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) {
+        if (this.config.navbar.additionalLinks && this.config.navbar.additionalLinks.length > 0) {
+            this.config.navbar.additionalLinks.forEach(function (additionalLink) {
                 if (!additionalLink.link || !additionalLink.title || additionalLink.disabled) {
                     return;
                 }
@@ -116,13 +117,19 @@ export class MenuHelper {
                 });
             });
         }
-        if (MenuHelper.config.models) {
-            Object.entries(MenuHelper.config.models).forEach(function ([key, val]) {
-                if (!val.hide) {
+        if (this.config.models) {
+            const _this = this;
+            Object.entries(this.config.models).forEach(function ([key, val]) {
+                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",
-                            link: MenuHelper.config.routePrefix + '/model/' + key,
+                            link: _this.config.routePrefix + '/model/' + key,
                             title: 'Overview',
                             type: 'self',
                             icon: "list",
@@ -130,7 +137,7 @@ export class MenuHelper {
                         });
                     }
                     menus.push({
-                        link: MenuHelper.config.routePrefix + '/model/' + key,
+                        link: _this.config.routePrefix + '/model/' + key,
                         title: val.title || key,
                         icon: val.icon || null,
                         actions: val.tools || null,

package/index.d.ts

@@ -1,8 +1,7 @@
 export * from "./helpers/configHelper";
 export * from "./helpers/accessRightsHelper";
-export * from "./lib/installStepper/installStepper";
-export * from "./lib/widgets/widgetHandler";
-export * from "./lib/catalog/CatalogHandler";
+export * from "./lib/v4/widgets/widgetHandler";
+export * from "./lib/v4/catalog/CatalogHandler";
 export * from "./lib/media-manager/MediaManagerHandler";
 export * from "./interfaces/adminpanelConfig";
 export * from "./lib/v4/model/AbstractModel";
@@ -10,3 +9,6 @@ export * from "./lib/v4/model/adapter/waterline";
 export * from "./lib/v4/model/adapter/typeorm";
 export * from "./lib/v4/model/adapter/sequelize";
 export * from "./lib/Adminizer";
+export * from "./models/GroupAP";
+export * from "./models/UserAP";
+export * from "./models/NavigationAP";

package/index.js

@@ -1,8 +1,7 @@
 export * from "./helpers/configHelper";
 export * from "./helpers/accessRightsHelper";
-export * from "./lib/installStepper/installStepper";
-export * from "./lib/widgets/widgetHandler";
-export * from "./lib/catalog/CatalogHandler";
+export * from "./lib/v4/widgets/widgetHandler";
+export * from "./lib/v4/catalog/CatalogHandler";
 export * from "./lib/media-manager/MediaManagerHandler";
 export * from "./interfaces/adminpanelConfig";
 export * from "./lib/v4/model/AbstractModel";
@@ -10,3 +9,9 @@ export * from "./lib/v4/model/adapter/waterline";
 export * from "./lib/v4/model/adapter/typeorm";
 export * from "./lib/v4/model/adapter/sequelize";
 export * from "./lib/Adminizer";
+export * from "./models/GroupAP";
+export * from "./models/UserAP";
+// export * from "./models/MediaManagerAP"
+// export * from "./models/MediaManagerAssociationsAP"
+// export * from "./models/MediaManagerMetaAP"
+export * from "./models/NavigationAP";