adminizer 4.1.0-build.26 → 4.1.0-build.28

package/controllers/catalog/Catalog.js

@@ -1,4 +1,4 @@
-import { CatalogHandler } from "../../lib/catalog/CatalogHandler";
+import { CatalogHandler } from "../../lib/v4/catalog/CatalogHandler";
 import { VueCatalog } from "./FrontentCatalogAdapter";
 import { Adminizer } from "../../lib/Adminizer";
 export async function catalogController(req, res) {
@@ -28,64 +28,72 @@ export async function catalogController(req, res) {
     }
     const method = req.method.toUpperCase();
     if (method === 'GET') {
-        return res.viewAdmin('catalog', { entity: "entity", slug: slug, id: id });
+        return req.Inertia.render({
+            component: 'catalog',
+            props: null
+        });
     }
     if (method === 'POST' || method === 'PUT' || method === 'DELETE') {
         const data = req.body;
-        const vueCatalog = new VueCatalog(_catalog);
-        if (!vueCatalog)
+        const frontendCatalog = new VueCatalog(_catalog);
+        if (!frontendCatalog)
             return res.status(404);
-        vueCatalog.setId(id);
-        const item = vueCatalog.getItemType(data.type);
+        frontendCatalog.setId(id);
+        const item = frontendCatalog.getItemType(data.type);
         switch (method) {
             case 'POST':
                 switch (data._method) {
+                    // TODO: deprecated, passing react module instead html
                     case 'getAddHTML':
-                        return res.json(await vueCatalog.getAddHTML(item, req));
+                        return res.json(await frontendCatalog.getAddHTML(item, req));
+                    // TODO: deprecated, passing react module instead html
                     case 'getEditHTML':
-                        return res.json(await vueCatalog.getEditHTML(item, data.id, req, data.modelId));
+                        return res.json(await frontendCatalog.getEditHTML(item, data.id, req, data.modelId));
                     case 'getCatalog':
-                        const __catalog = await vueCatalog.getCatalog();
-                        return res.json({
-                            'items': vueCatalog.getitemTypes(),
-                            'catalog': {
-                                nodes: __catalog,
-                                movingGroupsRootOnly: _catalog.movingGroupsRootOnly ?? false,
-                                catalogName: _catalog.name,
-                                catalogId: _catalog.id,
-                                catalogSlug: _catalog.slug,
-                                idList: idList
-                            },
-                            'toolsActions': await vueCatalog.getActions([], 'tools')
-                        });
+                        {
+                            const __catalog = await frontendCatalog.getCatalog();
+                            return res.json({
+                                items: frontendCatalog.getitemTypes(),
+                                catalog: {
+                                    nodes: __catalog,
+                                    movingGroupsRootOnly: _catalog.movingGroupsRootOnly ?? false,
+                                    catalogName: _catalog.name,
+                                    catalogId: _catalog.id,
+                                    catalogSlug: _catalog.slug,
+                                    idList: idList
+                                },
+                                toolsActions: await frontendCatalog.getActions([], 'tools')
+                            });
+                        }
                     case 'createItem':
-                        return res.json({ 'data': await vueCatalog.createItem(data.data) });
+                        return res.json({ 'data': await frontendCatalog.createItem(data.data, req) });
                     case 'getChilds':
-                        return res.json({ data: await vueCatalog.getChilds(data.data) });
+                        return res.json({ data: await frontendCatalog.getChilds(data.data, req) });
                     case 'getActions':
-                        return res.json({ data: await vueCatalog.getActions(data.items, data.type) });
+                        return res.json({ data: await frontendCatalog.getActions(data.items, data.type) });
                     case 'search':
-                        return res.json({ data: await vueCatalog.search(data.s) });
+                        return res.json({ data: await frontendCatalog.search(data.s, req) });
                     case "getLocales":
-                        return res.json({ data: vueCatalog.getLocales(req) });
+                        return res.json({ data: frontendCatalog.getLocales(req) });
                 }
                 break;
             case 'PUT':
                 switch (data._method) {
                     case 'updateTree':
-                        return res.json({ data: await vueCatalog.updateTree(data.data) });
+                        return res.json({ data: await frontendCatalog.updateTree(data.data, req) });
                     case 'getLink':
-                        return res.json({ data: await vueCatalog.getLink(data.actionId) });
+                        return res.json({ data: await frontendCatalog.getLink(data.actionId) });
                     case 'handleAction':
-                        return res.json({ data: await vueCatalog.handleAction(data.data.actionID, data.data.items, data.data.config) });
+                        return res.json({ data: await frontendCatalog.handleAction(data.data.actionID, data.data.items, data.data.config, req) });
                     case 'getPopUpHTML':
-                        return res.json({ data: await vueCatalog.getPopUpHTML(data.actionId) });
+                        // TODO: deprecated, passing react module instead html
+                        return res.json({ data: await frontendCatalog.getPopUpHTML(data.actionId) });
                     case 'updateItem':
-                        return res.json({ data: await vueCatalog.updateItem(item, data.modelId, data.data) });
+                        return res.json({ data: await frontendCatalog.updateItem(item, data.modelId, data.data, req) });
                 }
                 break;
             case 'DELETE':
-                return res.json({ data: await vueCatalog.deleteItem(data.data) });
+                return res.json({ data: await frontendCatalog.deleteItem(data.data, req) });
         }
     }
 }

package/controllers/catalog/FrontentCatalogAdapter.d.ts

@@ -1,9 +1,9 @@
-import { AbstractCatalog, Item } from "../../lib/catalog/AbstractCatalog";
+import { AbstractCatalog, Item } from "../../lib/v4/catalog/AbstractCatalog";
 interface NodeModel<TDataType> {
-    title: string;
-    isLeaf: boolean;
-    isExpanded: boolean;
-    ind: number;
+    text: string;
+    droppable: boolean;
+    id: number;
+    parent: number;
     data?: TDataType;
     children?: NodeModel<TDataType>[];
     isSelected?: boolean;
@@ -18,40 +18,62 @@ interface NodeModel<TDataType> {
 }
 interface NodeData extends Item {
 }
-interface obj {
-    [key: string]: string;
-}
 interface RequestData {
     reqNode: NodeModel<NodeData>[];
     reqParent: NodeModel<NodeData>;
     _method: string;
 }
+/**
+ * @deprecated Now is React
+ * // TODO: refactor for react name
+ */
 export declare class VueCatalog {
     catalog: AbstractCatalog;
     constructor(_catalog: AbstractCatalog);
     setId(id: string): void;
-    getItemType(type: string): import("../../lib/catalog/AbstractCatalog").BaseItem<Item>;
+    getItemType(type: string): import("../../lib/v4/catalog/AbstractCatalog").BaseItem<Item>;
+    /**
+     * @deprecated reason: migration for intertia
+     * // TODO: need passing custom React module
+     */
     getAddHTML(item: any, req: ReqType): Promise<{
-        type: "link" | "html" | "jsonForm";
-        data: string;
+        type: "component" | "model" | string;
+        data: any;
     }>;
+    /**
+     * @deprecated reason: migration for intertia
+     * TODO need passing custom React module
+     */
     getEditHTML(item: any, id: string | number, req: ReqType, modelId: string | number): Promise<{
         type: "link" | "html" | "jsonForm";
         data: string;
     }>;
-    getitemTypes(): import("../../lib/catalog/AbstractCatalog").BaseItem<Item>[];
-    getLocales(req: ReqType): obj;
-    getActions(items: NodeModel<any>[], type: string): Promise<import("../../lib/catalog/AbstractCatalog").ActionHandler[]>;
-    handleAction(actionId: string, items: any[], config: any): Promise<void>;
+    getitemTypes(): {
+        type: string;
+        name: string;
+        isGroup: boolean;
+        allowedRoot: boolean;
+        icon: string;
+        actionHandlers: import("../../lib/v4/catalog/AbstractCatalog").ActionHandler[];
+    }[];
+    getLocales(req: ReqType): {
+        [key: string]: string;
+    };
+    getActions(items: NodeModel<any>[], type: string): Promise<import("../../lib/v4/catalog/AbstractCatalog").ActionHandler[]>;
+    handleAction(actionId: string, items: any[], config: any, req: ReqType): Promise<void>;
+    /**
+     * @deprecated reason: migration for intertia
+     * // TODO: need passing custom React module
+     */
     getPopUpHTML(actionId: string): Promise<string>;
     getLink(actionId: string): Promise<string>;
     getCatalog(): Promise<NodeModel<Item>[]>;
-    createItem(data: any): Promise<any>;
-    getChilds(data: any): Promise<NodeModel<Item>[]>;
-    search(s: string): Promise<NodeModel<Item>[]>;
-    updateTree(data: RequestData): Promise<any>;
-    updateItem(item: any, modelId: string, data: any): Promise<any>;
-    deleteItem(items: NodeModel<any>[]): Promise<{
+    createItem(data: any, req: ReqType): Promise<any>;
+    getChilds(data: any, req: ReqType): Promise<NodeModel<Item>[]>;
+    search(s: string, req: ReqType): Promise<NodeModel<Item>[]>;
+    updateTree(data: RequestData, req: ReqType): Promise<any>;
+    updateItem(item: any, modelId: string, data: any, req: ReqType): Promise<any>;
+    deleteItem(items: NodeModel<any>[], req: ReqType): Promise<{
         ok: boolean;
     }>;
 }

package/controllers/catalog/FrontentCatalogAdapter.js

@@ -1,4 +1,8 @@
-import { AbstractCatalog } from "../../lib/catalog/AbstractCatalog";
+import { AbstractCatalog } from "../../lib/v4/catalog/AbstractCatalog";
+/**
+ * @deprecated Now is React
+ * // TODO: refactor for react name
+ */
 export class VueCatalog {
     catalog;
     constructor(_catalog) {
@@ -10,9 +14,17 @@ export class VueCatalog {
     getItemType(type) {
         return this.catalog.getItemType(type);
     }
+    /**
+     * @deprecated reason: migration for intertia
+     * // TODO: need passing custom React module
+     */
     getAddHTML(item, req) {
         return this.catalog.getAddHTML(item, req);
     }
+    /**
+     * @deprecated reason: migration for intertia
+     * TODO need passing custom React module
+     */
     getEditHTML(item, id, req, modelId) {
         return this.catalog.getEditHTML(item, id, req, modelId);
     }
@@ -31,19 +43,21 @@ export class VueCatalog {
             "No, cancel": "",
             "Are you sure?": "",
             "Yes, I'm sure": "",
-            "Select Ids": ""
+            "Select Ids": "",
+            "OR": "",
         };
         obj[this.catalog.name] = "";
         for (const actionHandler of this.catalog.actionHandlers) {
             obj[actionHandler.name] = "";
         }
         let messages = obj;
-        req.i18n.setLocale(req.user.locale);
         let outMessages = {};
         for (const mess of Object.keys(messages)) {
             outMessages[mess] = req.i18n.__(mess);
         }
-        return outMessages;
+        return {
+            ...outMessages,
+        };
     }
     async getActions(items, type) {
         let arrItems = [];
@@ -57,13 +71,17 @@ export class VueCatalog {
             return (await this.catalog.getActions(arrItems))?.filter(e => e.displayContext);
         }
     }
-    async handleAction(actionId, items, config) {
+    async handleAction(actionId, items, config, req) {
         let arrItems = [];
         for (const item of items) {
             arrItems.push(await this.catalog.find(item.data));
         }
-        return this.catalog.handleAction(actionId, arrItems, config);
+        return this.catalog.handleAction(actionId, arrItems, config, req);
     }
+    /**
+     * @deprecated reason: migration for intertia
+     * // TODO: need passing custom React module
+     */
     async getPopUpHTML(actionId) {
         return this.catalog.getPopUpHTML(actionId);
     }
@@ -72,35 +90,35 @@ export class VueCatalog {
     }
     //Below are the methods that require action
     async getCatalog() {
-        let rootItems = await this.catalog.getChilds(null);
+        let rootItems = await this.catalog.getChilds(0);
         return VueCatalogUtils.arrayToNode(rootItems, this.catalog.getGroupType().type);
     }
-    createItem(data) {
+    async createItem(data, req) {
         //data = VueCatalogUtils.refinement(data);
         if (this.catalog.slug !== "navigation") {
             let item = data.record;
             item.parenId = data.parenId;
-            return this.catalog.createItem(item);
+            return await this.catalog.createItem(item, req);
         }
         else {
-            return this.catalog.createItem(data);
+            return await this.catalog.createItem(data, req);
         }
     }
-    async getChilds(data) {
+    async getChilds(data, req) {
         data = VueCatalogUtils.refinement(data);
-        return VueCatalogUtils.arrayToNode(await this.catalog.getChilds(data.id), this.catalog.getGroupType().type);
+        return VueCatalogUtils.arrayToNode(await this.catalog.getChilds(data.id, undefined, req), this.catalog.getGroupType().type);
     }
     // Moved into actions
     // getCreatedItems(data: any) {
     //   data = VueCatalogUtils.refinement(data);
     //   return this.catalog.getChilds(data.id);
     // }
-    async search(s) {
-        let searchResult = await this.catalog.search(s);
+    async search(s, req) {
+        let searchResult = await this.catalog.search(s, undefined, req);
         let itemsTree = AbstractCatalog.buildTree(searchResult);
         return VueCatalogUtils.treeToNode(itemsTree, this.catalog.getGroupType().type);
     }
-    async updateTree(data) {
+    async updateTree(data, req) {
         let reqNodes = data.reqNode;
         if (!Array.isArray(data.reqNode)) {
             reqNodes = [data.reqNode];
@@ -114,7 +132,7 @@ export class VueCatalog {
         }
         // It’s unclear why he’s coming reqNodes
         for (const reqNode of reqNodes) {
-            const item = await this.catalog.find(reqNode.data);
+            const item = await this.catalog.find(reqNode.data, req);
             if (!item) {
                 throw `reqNode Item not found`;
             }
@@ -124,26 +142,26 @@ export class VueCatalog {
         for (const childNode of reqParent.children) {
             childNode.data.sortOrder = sortCount;
             childNode.data.parentId = reqParent.data.id;
-            await this.catalog.updateItem(childNode.data.id, childNode.data.type, childNode.data);
+            await this.catalog.updateItem(childNode.data.id, childNode.data.type, childNode.data, req);
             sortCount++;
         }
         return Promise.resolve('ok');
     }
-    async updateItem(item, modelId, data) {
+    async updateItem(item, modelId, data, req) {
         //data = VueCatalogUtils.refinement(data);
         if (this.catalog.slug !== "navigation") {
-            return await this.catalog.updateModelItems(data.modelId, data.type, data.record);
+            return await this.catalog.updateModelItems(data.modelId, data.type, data.record, req);
         }
         else {
-            return await this.catalog.updateModelItems(modelId, item.type, data);
+            return await this.catalog.updateModelItems(modelId, item.type, data, req);
         }
     }
-    async deleteItem(items) {
+    async deleteItem(items, req) {
         for (const item1 of items) {
             if (item1.children?.length) {
-                await this.deleteItem(item1.children);
+                await this.deleteItem(item1.children, req);
             }
-            this.catalog.deleteItem(item1.data.type, item1.data.id);
+            await this.catalog.deleteItem(item1.data.type, item1.data.id, req);
         }
         return { ok: true };
     }
@@ -161,16 +179,18 @@ export class VueCatalogUtils {
     static toNode(data, groupTypeName) {
         return {
             data: data,
-            isLeaf: data.type !== groupTypeName,
-            isExpanded: false,
-            ind: data.sortOrder,
-            title: data.name
+            // droppable: data.type !== groupTypeName,
+            droppable: true,
+            // isExpanded: false,
+            id: data.sortOrder + 1,
+            text: data.name,
+            parent: 0
         };
     }
     static expandTo(vueCatalogData, theseItemIdsNeedToBeOpened) {
         function expand(node) {
             if (theseItemIdsNeedToBeOpened.includes(node.data.id)) {
-                node.isExpanded = true;
+                // node.isExpanded = true;
             }
             if (node.children) {
                 for (const child of node.children) {
@@ -191,7 +211,7 @@ export class VueCatalogUtils {
                     // Sort the children before building their nodes
                     item.childs.sort((a, b) => (a.sortOrder || 0) - (b.sortOrder || 0));
                     node.children = buildNodes(item.childs);
-                    node.isExpanded = !node.isLeaf;
+                    // node.isExpanded = !node.droppable;
                 }
                 return node;
             });

package/controllers/edit.js

@@ -1,7 +1,7 @@
 import { ControllerHelper } from "../helpers/controllerHelper";
 import { RequestProcessor } from "../lib/requestProcessor";
 import { FieldsHelper } from "../helpers/fieldsHelper";
-import { CatalogHandler } from "../lib/catalog/CatalogHandler";
+import { CatalogHandler } from "../lib/v4/catalog/CatalogHandler";
 import { getRelationsMediaManager, saveRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper";
 import { DataAccessor } from "../lib/v4/DataAccessor";
 import { Adminizer } from "../lib/Adminizer";

package/controllers/list.js

@@ -1,6 +1,6 @@
 import { ControllerHelper } from "../helpers/controllerHelper";
 import { DataAccessor } from "../lib/v4/DataAccessor";
-import { NodeTable } from "../lib/datatable/NodeTable";
+import { NodeTable } from "../lib/v4/datatable/NodeTable";
 import { Adminizer } from "../lib/Adminizer";
 import { inertiaListHelper } from "../helpers/inertiaListHelper";
 export default async function list(req, res) {

package/helpers/accessRightsHelper.js

@@ -59,6 +59,10 @@ export class AccessRightsHelper {
             Adminizer.log.error("Adminpanel > Token is not valid", tokenId, user.login);
             return false;
         }
+        if (!user.groups) {
+            Adminizer.log.error('User has no groups');
+            return false;
+        }
         return user.groups.some((group) => group.tokens?.includes(tokenId));
     }
 }

package/helpers/inertiaAddHelper.d.ts

@@ -1,7 +1,7 @@
 import { Entity, PropsField } from "../interfaces/types";
 import { Actions } from "./inertiaActionsHelper";
 import { Fields, Field } from "./fieldsHelper";
-import { AbstractControls, ControlType } from "../lib/controls/AbstractControls";
+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;

package/helpers/inertiaFromHelper.js

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

package/helpers/menuHelper.js

@@ -118,6 +118,7 @@ export class MenuHelper {
             });
         }
         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
@@ -128,7 +129,7 @@ export class MenuHelper {
                     if (val.tools && val.tools.length > 0 && val.tools[0].id !== "overview") {
                         val.tools.unshift({
                             id: "overview",
-                            link: this.config.routePrefix + '/model/' + key,
+                            link: _this.config.routePrefix + '/model/' + key,
                             title: 'Overview',
                             type: 'self',
                             icon: "list",
@@ -136,7 +137,7 @@ export class MenuHelper {
                         });
                     }
                     menus.push({
-                        link: this.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,7 +1,7 @@
 export * from "./helpers/configHelper";
 export * from "./helpers/accessRightsHelper";
-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";

package/index.js

@@ -1,7 +1,7 @@
 export * from "./helpers/configHelper";
 export * from "./helpers/accessRightsHelper";
-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";

package/interfaces/global.d.ts

@@ -2,8 +2,8 @@ import { Adminizer } from "../lib/Adminizer";
 import { NextFunction, Request, Response } from "express";
 import multer from "multer";
 import { I18n } from "../lib/v4/I18n";
-import { Inertia } from "../lib/inertia/inertiaAdapter";
-import { Flash } from "../lib/inertia/flash";
+import { Inertia } from "../lib/v4/inertia/inertiaAdapter";
+import { Flash } from "../lib/v4/inertia/flash";
 import { UserAP } from "models/UserAP";
 declare global {
     /** @deprecated use import from TS model decalration */

package/lib/Adminizer.d.ts

@@ -4,13 +4,13 @@ import EventEmitter from 'events';
 import { AdminpanelConfig } from "../interfaces/adminpanelConfig";
 import PolicyManager from "./v4/PolicyManager";
 import { ModelHandler } from "./v4/model/ModelHandler";
-import { WidgetHandler } from "./widgets/widgetHandler";
+import { WidgetHandler } from "./v4/widgets/widgetHandler";
 import { AccessRightsHelper } from "../helpers/accessRightsHelper";
 import { ConfigHelper } from "../helpers/configHelper";
 import { AbstractAdapter } from "./v4/model/AbstractModel";
 import { ViteDevServer } from 'vite';
 import { MenuHelper } from "../helpers/menuHelper";
-import { ControlsHandler } from "./controls/ControlsHandler";
+import { ControlsHandler } from "./v4/controls/ControlsHandler";
 export declare class Adminizer {
     app: Express;
     config: AdminpanelConfig;

package/lib/Adminizer.js

@@ -9,7 +9,7 @@ import Router from "./../system/Router";
 import bindAssets from "../system/bindAssets";
 import bindDev from "../system/bindDev";
 import bindDashboardWidgets from "../system/bindDashboardWidgets";
-// import bindNavigation from "../system/bindNavigation";
+import bindNavigation from "../system/bindNavigation";
 // import bindMediaManager from "../system/bindMediaManager";
 import bindAccessRights from "../system/bindAccessRights";
 import bindAuthorization from "../system/bindAuthorization";
@@ -17,7 +17,7 @@ import bindModels from "../system/bindModels";
 import bindForms from "../system/bindForms";
 import bindTranslations from "../system/bindTranslations";
 import { ModelHandler } from "./v4/model/ModelHandler";
-import { WidgetHandler } from "./widgets/widgetHandler";
+import { WidgetHandler } from "./v4/widgets/widgetHandler";
 import { AccessRightsHelper } from "../helpers/accessRightsHelper";
 import bindReqFunctions from "../system/bindReqFunctions";
 import { ConfigHelper } from "../helpers/configHelper";
@@ -28,7 +28,7 @@ import { createServer as createViteServer } from 'vite';
 import { bindInertia } from "../system/bindInertia";
 import { MenuHelper } from "../helpers/menuHelper";
 import { bindControls } from "../system/bindControls";
-import { ControlsHandler } from "./controls/ControlsHandler";
+import { ControlsHandler } from "./v4/controls/ControlsHandler";
 import { v4 as uuid } from "uuid";
 export class Adminizer {
     app;
@@ -148,7 +148,7 @@ export class Adminizer {
             }
         }
         await bindDashboardWidgets(this);
-        // bindNavigation(this);
+        bindNavigation(this);
         // bindMediaManager(this);
         await bindAccessRights(this);
         if (I18n.appendLocale) {

package/lib/requestProcessor.js

@@ -1,3 +1,4 @@
+import { isObject } from "../helpers/JsUtils";
 import { Adminizer } from "./Adminizer";
 /**
  * Default helper that will contain all methods
@@ -29,11 +30,17 @@ export class RequestProcessor {
         }
         for (let key in postParams) {
             let field = fields[key];
-            if (field.model.type === 'boolean') {
-                postParams[key] = ['true', '1', 'yes', "TRUE", "on"].includes(postParams[key].toString().toLowerCase());
-                continue;
+            if (key === 'sort') {
+                console.log(fields[key], key, postParams[key]);
             }
+            // if (field.model.type === 'boolean') {
+            //     postParams[key] = ['true', '1', 'yes', "TRUE", "on"].includes(postParams[key].toString().toLowerCase());
+            //     continue;
+            // }
             if (field.model.type === 'number') {
+                if (isObject(field.config) && field.config.type === "boolean" && typeof postParams[key] === "boolean") {
+                    postParams[key] = postParams[key] ? 1 : 0;
+                }
                 postParams[key] = parseFloat(postParams[key]);
             }
             if (field.model.type === 'json') {

package/lib/v4/DataAccessor.js

@@ -88,9 +88,9 @@ export class DataAccessor {
                     const model = this.adminizer.modelHandler.model.get(modelName);
                     if (model) {
                         populatedModelFieldsConfig = this.getAssociatedFieldsConfig(modelName);
-                        let _modelConfig = this.adminizer.config.models[model.identity];
+                        let _modelConfig = this.adminizer.config.models[modelName];
                         if (!isObject(_modelConfig))
-                            throw `type error: model config  of ${model.identity} is ${typeof (this.adminizer.config.models[model.identity])} expected object`;
+                            throw `type error: model config  of ${modelName} is ${typeof (this.adminizer.config.models[modelName])} expected object`;
                         associatedModelConfig = _modelConfig;
                     }
                     else {
@@ -112,7 +112,7 @@ export class DataAccessor {
     }
     getAssociatedFieldsConfig(modelName) {
         const model = this.adminizer.modelHandler.model.get(modelName);
-        if (!model || !this.adminizer.config.models[model.identity] || typeof this.adminizer.config.models[model.identity] === "boolean") {
+        if (!model || !this.adminizer.config.models[modelName] || typeof this.adminizer.config.models[modelName] === "boolean") {
             return undefined;
         }
         // Check if user has access to the associated model
@@ -122,7 +122,7 @@ export class DataAccessor {
             return undefined;
         }
         const associatedFields = {};
-        const modelConfig = this.adminizer.config.models[model.identity];
+        const modelConfig = this.adminizer.config.models[modelName];
         if (!isObject(modelConfig))
             throw `Type error ModelConfig should is object`;
         // Get the main fields configuration