adminizer 4.2.0-build.59 → 4.2.0-build.61

package/controllers/catalog/Catalog.js

@@ -1,4 +1,3 @@
-import { CatalogHandler } from "../../lib/v4/catalog/CatalogHandler";
 import { VueCatalog } from "./FrontentCatalogAdapter";
 import { Adminizer } from "../../lib/Adminizer";
 export async function catalogController(req, res) {
@@ -16,7 +15,7 @@ export async function catalogController(req, res) {
     if (slug === 'navigation' && !id) {
         return res.sendStatus(404);
     }
-    const _catalog = CatalogHandler.getCatalog(slug);
+    const _catalog = req.adminizer.catalogHandler.getCatalog(slug);
     if (_catalog === undefined)
         return res.sendStatus(404);
     const idList = await _catalog.getIdList();

package/controllers/edit.js

@@ -1,7 +1,6 @@
 import { ControllerHelper } from "../helpers/controllerHelper";
 import { RequestProcessor } from "../lib/requestProcessor";
 import { FieldsHelper } from "../helpers/fieldsHelper";
-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";
@@ -122,7 +121,7 @@ export default async function edit(req, res) {
                 // update navigation tree after model updated
                 if (req.adminizer.config.navigation) {
                     for (const section of req.adminizer.config.navigation.sections) {
-                        let navigation = CatalogHandler.getCatalog('navigation');
+                        let navigation = req.adminizer.catalogHandler.getCatalog('navigation');
                         navigation.setId(section);
                         let navItem = navigation.itemTypes.find(item => item.type === entity.name.toLowerCase());
                         if (navItem) {

package/lib/Adminizer.d.ts

@@ -11,6 +11,7 @@ import { AbstractAdapter } from "./v4/model/AbstractModel";
 import type { ViteDevServer } from 'vite';
 import { MenuHelper } from "../helpers/menuHelper";
 import { ControlsHandler } from "./v4/controls/ControlsHandler";
+import { CatalogHandler } from "./v4/catalog/CatalogHandler";
 export declare class Adminizer {
     /**
      * If you convey this default Middleware, it will add it to the very top of the router,
@@ -29,6 +30,7 @@ export declare class Adminizer {
     widgetHandler: WidgetHandler;
     vite: ViteDevServer;
     controlsHandler: ControlsHandler;
+    catalogHandler: CatalogHandler;
     jwtSecret: string;
     static logger: winston.Logger;
     constructor(ormAdapters: AbstractAdapter[]);

package/lib/Adminizer.js

@@ -27,6 +27,7 @@ import { bindInertia } from "../system/bindInertia";
 import { MenuHelper } from "../helpers/menuHelper";
 import { bindControls } from "../system/bindControls";
 import { ControlsHandler } from "./v4/controls/ControlsHandler";
+import { CatalogHandler } from "./v4/catalog/CatalogHandler";
 import { v4 as uuid } from "uuid";
 export class Adminizer {
     // Preconfigures
@@ -48,6 +49,7 @@ export class Adminizer {
     widgetHandler;
     vite;
     controlsHandler;
+    catalogHandler;
     // Constants
     jwtSecret = process.env.JWT_SECRET ?? uuid();
     static logger = winston.createLogger({
@@ -145,6 +147,7 @@ export class Adminizer {
         this.configHelper = new ConfigHelper(this);
         this.menuHelper = new MenuHelper(this.config);
         this.widgetHandler = new WidgetHandler(this);
+        this.catalogHandler = new CatalogHandler();
         bindExpressUtils(this.app);
         bindReqFunctions(this);
         // Bind assets

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

@@ -1,7 +1,7 @@
 import { AbstractCatalog } from "./AbstractCatalog";
 export declare class CatalogHandler {
-    private static catalog;
-    static add(catalog: AbstractCatalog): AbstractCatalog;
-    static getAll(): AbstractCatalog[];
-    static getCatalog(slug: string): AbstractCatalog;
+    private catalog;
+    add(catalog: AbstractCatalog): AbstractCatalog;
+    getAll(): AbstractCatalog[];
+    getCatalog(slug: string): AbstractCatalog;
 }

package/lib/v4/catalog/CatalogHandler.js

@@ -1,13 +1,13 @@
 export class CatalogHandler {
-    static catalog = [];
-    static add(catalog) {
+    catalog = [];
+    add(catalog) {
         this.catalog.push(catalog);
         return catalog;
     }
-    static getAll() {
+    getAll() {
         return this.catalog;
     }
-    static getCatalog(slug) {
+    getCatalog(slug) {
         return this.catalog.find((catalog) => catalog.slug === slug);
     }
 }

package/lib/v4/widgets/widgetHandler.js

@@ -1,8 +1,3 @@
-import { SwitchBase } from "./abstractSwitch";
-import { InfoBase } from "./abstractInfo";
-import { ActionBase } from "./abstractAction";
-import { LinkBase } from "./abstractLink";
-import { CustomBase } from "./abstractCustom";
 import * as process from "node:process";
 export class WidgetHandler {
     widgets = [];
@@ -40,7 +35,7 @@ export class WidgetHandler {
         if (this.widgets.length) {
             let id_key = 0;
             for (const widget of this.widgets) {
-                if (widget instanceof SwitchBase) {
+                if (widget.widgetType === 'switcher') {
                     if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, user)) {
                         widgets.push({
                             id: `${widget.id}__${id_key}`,
@@ -54,7 +49,7 @@ export class WidgetHandler {
                         });
                     }
                 }
-                else if (widget instanceof InfoBase) {
+                else if (widget.widgetType === 'info') {
                     if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, user)) {
                         widgets.push({
                             id: `${widget.id}__${id_key}`,
@@ -68,7 +63,7 @@ export class WidgetHandler {
                         });
                     }
                 }
-                else if (widget instanceof ActionBase) {
+                else if (widget.widgetType === 'action') {
                     if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, user)) {
                         widgets.push({
                             id: `${widget.id}__${id_key}`,
@@ -82,7 +77,7 @@ export class WidgetHandler {
                         });
                     }
                 }
-                else if (widget instanceof LinkBase) {
+                else if (widget.widgetType === 'link') {
                     if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, user)) {
                         let links_id_key = 0;
                         for (const link of widget.links) {
@@ -100,7 +95,7 @@ export class WidgetHandler {
                         }
                     }
                 }
-                else if (widget instanceof CustomBase) {
+                else if (widget.widgetType === 'custom') {
                     if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, user)) {
                         widgets.push({
                             id: `${widget.id}_${id_key}`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.2.0-build.59",
+  "version": "4.2.0-build.61",
   "main": "index.js",
   "exports": {
     ".": "./index.js",

package/system/bindNavigation.js

@@ -1,12 +1,11 @@
 import { Navigation } from "../lib/v4/catalog/Navigation";
-import { CatalogHandler } from "../lib/v4/catalog/CatalogHandler";
 export default function bindNavigation(adminizer) {
     adminizer.emitter.on("adminizer:loaded", async () => {
         if (adminizer.config.navigation) {
             try {
                 adminizer.config.navigation.model = adminizer.config.navigation.model ? adminizer.config.navigation.model : 'NavigationAP';
                 let navigation = new Navigation(adminizer, adminizer.config.navigation);
-                CatalogHandler.add(navigation);
+                adminizer.catalogHandler.add(navigation);
                 adminizer.config.models[adminizer.config.navigation.model.toLowerCase()] = {
                     add: false,
                     edit: {