adminizer 4.1.0-build.34 → 4.1.0-build.35

package/controllers/catalog/FrontentCatalogAdapter.js

@@ -39,6 +39,8 @@ export class VueCatalog {
             "OR": "",
             "Open in a new window": "",
             "Clean": "",
+            "Performing an action...": "",
+            "Action completed": "",
         };
         obj[this.catalog.name] = "";
         for (const actionHandler of this.catalog.actionHandlers) {
@@ -65,19 +67,15 @@ export class VueCatalog {
             return (await this.catalog.getActions(arrItems))?.filter(e => e.displayContext);
         }
     }
-    async handleAction(actionId, items, config, req) {
+    async handleAction(actionId, items, req) {
         let arrItems = [];
         for (const item of items) {
             arrItems.push(await this.catalog.find(item.data));
         }
-        return this.catalog.handleAction(actionId, arrItems, config, req);
+        return this.catalog.handleAction(actionId, arrItems, req);
     }
-    /**
-     * @deprecated reason: migration for intertia
-     * // TODO: need passing custom React module
-     */
-    async getPopUpHTML(actionId) {
-        return this.catalog.getPopUpHTML(actionId);
+    async getPopUpTemplate(actionId) {
+        return this.catalog.getPopUpTemplate(actionId);
     }
     async getLink(actionId) {
         return this.catalog.getLink(actionId);
@@ -88,15 +86,15 @@ export class VueCatalog {
         return VueCatalogUtils.arrayToNode(rootItems, this.catalog.getGroupType().type);
     }
     async createItem(data, req) {
+        // TODO It's not clear why it's here.
         //data = VueCatalogUtils.refinement(data);
-        if (this.catalog.slug !== "navigation") {
-            let item = data.record;
-            item.parenId = data.parenId;
-            return await this.catalog.createItem(item, req);
-        }
-        else {
-            return await this.catalog.createItem(data, req);
-        }
+        // if (this.catalog.slug !== "navigation") {
+        //     let item = data.record;
+        //     item.parenId = data.parenId;
+        //     return await this.catalog.createItem(item, req);
+        // } else {
+        return await this.catalog.createItem(data, req);
+        // }
     }
     async getChilds(data, req) {
         data = VueCatalogUtils.refinement(data);
@@ -129,13 +127,13 @@ export class VueCatalog {
         return Promise.resolve('ok');
     }
     async updateItem(item, modelId, data, req) {
+        //TODO It's not clear why it's here.
         //data = VueCatalogUtils.refinement(data);
-        if (this.catalog.slug !== "navigation") {
-            return await this.catalog.updateModelItems(data.modelId, data.type, data.record, req);
-        }
-        else {
-            return await this.catalog.updateModelItems(modelId, item.type, data, req);
-        }
+        // if (this.catalog.slug !== "navigation") {
+        //     return await this.catalog.updateModelItems(data.modelId, data.type, data.record, req);
+        // } else {
+        return await this.catalog.updateModelItems(modelId, item.type, data, req);
+        // }
     }
     async deleteItem(item, req) {
         // Получаем всех непосредственных потомков текущего элемента

package/lib/v4/catalog/AbstractCatalog.d.ts

@@ -1,4 +1,3 @@
-import { JSONSchema4 } from "json-schema";
 import { Adminizer } from "../../Adminizer";
 /**
  * Interface `Item` describes the data that the UI will operate on
@@ -91,7 +90,7 @@ export declare abstract class BaseItem<T extends Item> {
      * @param req
      */
     abstract getAddTemplate(req: ReqType): Promise<{
-        type: 'component' | 'navigation.item' | 'navigation.group' | 'navigation.link' | 'model';
+        type: 'component' | 'navigation.group' | 'navigation.link' | 'model';
         data: any;
     }>;
     /**
@@ -102,7 +101,7 @@ export declare abstract class BaseItem<T extends Item> {
      * @param modelId
      */
     abstract getEditTemplate(id: string | number, catalogId: string, req: ReqType, modelId?: string | number): Promise<{
-        type: 'component' | 'navigation.item' | 'navigation.group' | 'navigation.link' | 'model';
+        type: 'component' | 'navigation.group' | 'navigation.link' | 'model';
         data: any;
     }>;
     _getChilds(parentId: string | number, catalogId: string, req?: ReqType): Promise<Item[]>;
@@ -122,7 +121,7 @@ export declare abstract class ActionHandler {
      * Three actions are possible, without configuration, configuration via pop-up, and just external action
      * For the first two, a handler is provided, but the third type of action simply calls the HTML in the popup; the controller will be implemented externally
      * */
-    abstract readonly type: "basic" | "json-forms" | "external" | "link" | "partial";
+    abstract readonly type: "basic" | "external" | "link";
     /**
      * Will be shown in the context menu section
      */
@@ -131,18 +130,10 @@ export declare abstract class ActionHandler {
      * Will be shown in the toolbox section
      */
     abstract readonly displayTool: boolean;
-    /** (!*1)
-     * Only for json-forms
-     * ref: https://jsonforms.io/docs
-     */
-    abstract readonly uiSchema: any;
-    abstract readonly jsonSchema: JSONSchema4;
     /**
-     * For "json-forms" | "external"
-     * @deprecated reason: migration for intertia
-     * // TODO: need passing custom React module
+     * For "external"
      */
-    abstract getPopUpHTML(data?: any): Promise<string>;
+    abstract getPopUpTemplate(data?: any): Promise<string>;
     /**
      * Only for link type
      */
@@ -161,9 +152,9 @@ export declare abstract class ActionHandler {
      * Implementation of a method that will do something with elements.
      * there's really not much you can do with the context menu
      * @param items
-     * @param config
+     * @param req
      */
-    abstract handler(items: Item[], data?: any, req?: ReqType): Promise<void>;
+    abstract handler(items: Item[], req?: ReqType): Promise<void>;
 }
 /**
  *
@@ -238,7 +229,7 @@ export declare abstract class AbstractCatalog {
      * @param modelId
      */
     getEditTemplate(item: Item, id: string | number, req: ReqType, modelId?: string | number): Promise<{
-        type: "component" | "navigation.item" | "navigation.group" | "navigation.link" | "model";
+        type: "component" | "navigation.group" | "navigation.link" | "model";
         data: any;
     }>;
     /**
@@ -247,7 +238,7 @@ export declare abstract class AbstractCatalog {
      * @param req
      */
     getAddTemplate(item: Item, req: ReqType): Promise<{
-        type: "component" | "navigation.item" | "navigation.group" | "navigation.link" | "model";
+        type: "component" | "navigation.group" | "navigation.link" | "model";
         data: any;
     }>;
     addActionHandler(actionHandler: ActionHandler): void;
@@ -259,19 +250,17 @@ export declare abstract class AbstractCatalog {
     /**
      * Implements search and execution of a specific action.handler
      */
-    handleAction(actionId: string, items?: Item[], config?: any, req?: ReqType): Promise<void>;
+    handleAction(actionId: string, items?: Item[], req?: ReqType): Promise<void>;
     /**
      * Only For a Link action
      * @param actionId
      */
     getLink(actionId: string): Promise<string>;
     /**
-     * For Extermal and JsonForms actions
+     * For Extermal and actions
      * @param actionId
-    * @deprecated reason: migration for intertia
-     * // TODO: need passing custom React module
      */
-    getPopUpHTML(actionId: string): Promise<string>;
+    getPopUpTemplate(actionId: string): Promise<string>;
     /**
      *
      * @param data

package/lib/v4/catalog/AbstractCatalog.js

@@ -194,7 +194,7 @@ export class AbstractCatalog {
     /**
      * Implements search and execution of a specific action.handler
      */
-    async handleAction(actionId, items, config, req) {
+    async handleAction(actionId, items, req) {
         let action = null;
         if (items.length === 1) {
             const item = items[0];
@@ -211,7 +211,7 @@ export class AbstractCatalog {
         }
         if (!action)
             throw `Action with id \`${actionId}\` not found`;
-        return await action.handler(items, config, req);
+        return await action.handler(items, req);
     }
     /**
      * Only For a Link action
@@ -221,13 +221,11 @@ export class AbstractCatalog {
         return this.actionHandlers.find((it) => it.id === actionId)?.getLink();
     }
     /**
-     * For Extermal and JsonForms actions
+     * For Extermal and actions
      * @param actionId
-    * @deprecated reason: migration for intertia
-     * // TODO: need passing custom React module
      */
-    async getPopUpHTML(actionId) {
-        return this.actionHandlers.find((it) => it.id === actionId)?.getPopUpHTML();
+    async getPopUpTemplate(actionId) {
+        return this.actionHandlers.find((it) => it.id === actionId)?.getPopUpTemplate();
     }
     /**
      *

package/package.json

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

package/system/bindModels.js

@@ -30,7 +30,7 @@ export default async function bindModels(adminizer) {
         const modelConfig = Object.entries(adminizer.config.models)
             .find(([key, value]) => value && typeof value !== "boolean" && value.model.toLowerCase() === modelName)?.[1];
         if (!systemModels.includes(modelName)) {
-            const adapterName = typeof modelConfig !== "boolean" ? modelConfig.adapter || defaultOrmAdapter : defaultOrmAdapter;
+            const adapterName = typeof modelConfig !== "boolean" ? modelConfig?.adapter || defaultOrmAdapter : defaultOrmAdapter;
             const ormAdapter = adminizer.getOrmAdapter(adapterName);
             if (!ormAdapter) {
                 throw new Error(`Adapter ${adapterName} was not found for model ${modelName}. Please check your configuration`);