adminizer 4.3.0-build.117 → 4.3.0-build.119

package/controllers/catalog/Catalog.js

@@ -46,22 +46,21 @@ export async function catalogController(req, res) {
                         return res.json(await frontendCatalog.getAddTemplate(item, req));
                     case 'getEditTemplate':
                         return res.json(await frontendCatalog.getEditTemplate(item, data.id, req, data.modelId));
-                    case 'getCatalog':
-                        {
-                            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 'getCatalog': {
+                        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 frontendCatalog.createItem(data.data, req) });
                     case 'getChilds':

package/interfaces/adminpanelConfig.d.ts

@@ -457,7 +457,6 @@ export interface NavigationConfig {
     allowContentInGroup?: boolean;
     items: NavigationItemTypeConfig[];
     movingGroupsRootOnly?: boolean;
-    bindAfter: boolean;
 }
 export interface MediaManagerConfig {
     fileStoragePath: string;

package/lib/Adminizer.d.ts

@@ -15,6 +15,7 @@ import { CatalogHandler } from "./catalog/CatalogHandler";
 import { NotificationHandler } from './notifications/NotificationHandler';
 import { INotification } from "../interfaces/types";
 import { MediaManagerHandler } from "./media-manager/MediaManagerHandler";
+import { StorageServices } from "./catalog/Navigation";
 export declare class Adminizer {
     /**
      * If you convey this default Middleware, it will add it to the very top of the router,
@@ -36,6 +37,7 @@ export declare class Adminizer {
     controlsHandler: ControlsHandler;
     catalogHandler: CatalogHandler;
     mediaManagerHandler: MediaManagerHandler;
+    storageServices: StorageServices;
     jwtSecret: string;
     static logger: winston.Logger;
     constructor(ormAdapters: AbstractAdapter[]);

package/lib/Adminizer.js

@@ -54,6 +54,7 @@ export class Adminizer {
     controlsHandler;
     catalogHandler;
     mediaManagerHandler;
+    storageServices;
     // Constants
     jwtSecret = process.env.JWT_SECRET ?? uuid();
     static logger = winston.createLogger({
@@ -208,8 +209,7 @@ export class Adminizer {
             }
         }
         await bindDashboardWidgets(this);
-        if (!this.config.navigation?.bindAfter)
-            bindNavigation(this);
+        await bindNavigation(this);
         bindMediaManager(this);
         await bindAccessRights(this);
         if (I18n.appendLocale) {

package/lib/catalog/AbstractCatalog.d.ts

@@ -1,4 +1,5 @@
 import { Adminizer } from "../Adminizer";
+import { StorageServices } from "./Navigation";
 /**
  * Interface `Item` describes the data that the UI will operate on
  * This is a common interface for all data that is linked to the catalog
@@ -24,6 +25,7 @@ export type _Item_ = {
  * General Item structure that will be available for all elements, including groups
  */
 export declare abstract class BaseItem<T extends Item> {
+    storageServices?: StorageServices;
     abstract readonly type: string;
     /**
      * Used for infer T

package/lib/catalog/AbstractCatalog.js

@@ -2,6 +2,7 @@
  * General Item structure that will be available for all elements, including groups
  */
 export class BaseItem {
+    storageServices;
     /**
      * Array of all global contexts, which will appear for all elements
      */
@@ -253,7 +254,7 @@ export class AbstractCatalog {
      * Method for getting group elements
      */
     getitemTypes() {
-        return this.itemTypes.map(({ adminizer, ...rest }) => rest);
+        return this.itemTypes.map(({ adminizer, storageServices, ...rest }) => rest);
     }
     ;
     async search(s, hasExtras = true, req) {

package/lib/catalog/Navigation.d.ts

@@ -27,10 +27,11 @@ export declare class StorageService {
     search(s: string, type: string): Promise<NavItem[]>;
 }
 export declare class StorageServices {
-    protected static storages: StorageService[];
-    static add(storage: StorageService): void;
-    static get(id: string): StorageService;
-    static getAll(): StorageService[];
+    protected storages: StorageService[];
+    constructor();
+    add(storage: StorageService): void;
+    get(id: string): StorageService;
+    getAll(): StorageService[];
 }
 export declare class Navigation extends AbstractCatalog {
     readonly name: string;
@@ -38,6 +39,7 @@ export declare class Navigation extends AbstractCatalog {
     readonly icon: string;
     readonly actionHandlers: ActionHandler[];
     idList: string[];
+    storageServices: StorageServices;
     constructor(adminizer: Adminizer, config: NavigationConfig);
     getIdList(): Promise<string[]>;
 }

package/lib/catalog/Navigation.js

@@ -138,14 +138,16 @@ export class StorageService {
     }
 }
 export class StorageServices {
-    static storages = [];
-    static add(storage) {
+    storages = [];
+    constructor() {
+    }
+    add(storage) {
         this.storages.push(storage);
     }
-    static get(id) {
+    get(id) {
         return this.storages.find(storage => storage.getId() === id);
     }
-    static getAll() {
+    getAll() {
         return this.storages;
     }
 }
@@ -155,17 +157,21 @@ export class Navigation extends AbstractCatalog {
     icon = "box";
     actionHandlers = [];
     idList = [];
+    storageServices;
     constructor(adminizer, config) {
         let items = [];
+        const storageServices = new StorageServices();
         for (const configElement of config.items) {
-            items.push(new NavigationItem(adminizer, configElement.title, configElement.model, config.model, configElement.urlPath));
+            items.push(new NavigationItem(adminizer, configElement.title, configElement.model, config.model, configElement.urlPath, storageServices));
         }
-        items.push(new NavigationGroup(adminizer, config.groupField));
-        items.push(new LinkItem(adminizer));
+        items.push(new NavigationGroup(adminizer, config.groupField, storageServices));
+        items.push(new LinkItem(adminizer, storageServices));
+        super(adminizer, items);
+        this.storageServices = storageServices;
+        adminizer.storageServices = storageServices;
         for (const section of config.sections) {
-            StorageServices.add(new StorageService(adminizer, section, config.model));
+            this.storageServices.add(new StorageService(adminizer, section, config.model));
         }
-        super(adminizer, items);
         this.movingGroupsRootOnly = config.movingGroupsRootOnly;
         this.idList = config.sections ?? [];
     }
@@ -183,7 +189,7 @@ class NavigationItem extends AbstractItem {
     actionHandlers = [];
     urlPath;
     adminizer;
-    constructor(adminizer, name, model, navigationModel, urlPath) {
+    constructor(adminizer, name, model, navigationModel, urlPath, storageServices) {
         super();
         this.name = name;
         this.navigationModel = navigationModel;
@@ -193,9 +199,10 @@ class NavigationItem extends AbstractItem {
         let configModel = adminizer.config.models[this.model];
         this.icon = configModel?.icon ?? 'file_present';
         this.adminizer = adminizer;
+        this.storageServices = storageServices;
     }
     async create(data, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         let storageData = null;
         if (data._method === 'select') {
             // Direct call by model adapter
@@ -213,7 +220,7 @@ class NavigationItem extends AbstractItem {
         return await storage.setElement(data.id, storageData);
     }
     async dataPreparation(data, catalogId, sortOrder) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         let urlPath = eval('`' + this.urlPath + '`');
         let parentId = data.parentId ? data.parentId : 0; // changed from null to 0
         return {
@@ -231,7 +238,7 @@ class NavigationItem extends AbstractItem {
         };
     }
     async updateModelItems(modelId, data, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         let items = await storage.findElementByModelId(modelId);
         let urlPath = eval('`' + this.urlPath + '`');
         let response = [];
@@ -247,15 +254,15 @@ class NavigationItem extends AbstractItem {
         return response[0];
     }
     async update(itemId, data, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.setElement(itemId, data);
     }
     async deleteItem(itemId, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.removeElementById(itemId);
     }
     async find(itemId, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.findElementById(itemId);
     }
     /**
@@ -288,7 +295,7 @@ class NavigationItem extends AbstractItem {
         };
     }
     async getChilds(parentId, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.findElementsByParentId(parentId, this.type);
     }
     async getEditTemplate(id, catalogId, req, modelId) {
@@ -300,7 +307,7 @@ class NavigationItem extends AbstractItem {
         });
     }
     async search(s, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.search(s, this.type);
     }
 }
@@ -309,13 +316,14 @@ class NavigationGroup extends AbstractGroup {
     name = "Group";
     groupField;
     adminizer;
-    constructor(adminizer, groupField) {
+    constructor(adminizer, groupField, storageServices) {
         super();
         this.groupField = groupField;
         this.adminizer = adminizer;
+        this.storageServices = storageServices;
     }
     async create(data, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         let storageData = await this.dataPreparation(data, catalogId);
         delete data.name;
         delete data.parentId;
@@ -323,7 +331,7 @@ class NavigationGroup extends AbstractGroup {
         return await storage.setElement(storageData.id, storageData);
     }
     async dataPreparation(data, catalogId, sortOrder) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         let parentId = data.parentId ? data.parentId : 0; // changed from null to 0
         return {
             id: uuid(),
@@ -338,19 +346,19 @@ class NavigationGroup extends AbstractGroup {
         };
     }
     async deleteItem(itemId, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.removeElementById(itemId);
     }
     async find(itemId, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.findElementById(itemId);
     }
     async update(itemId, data, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.setElement(itemId, data);
     }
     async updateModelItems(modelId, data, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.setElement(modelId, data);
     }
     getAddTemplate(req) {
@@ -404,11 +412,11 @@ class NavigationGroup extends AbstractGroup {
         });
     }
     async getChilds(parentId, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.findElementsByParentId(parentId, this.type);
     }
     async search(s, catalogId) {
-        let storage = StorageServices.get(catalogId);
+        let storage = this.storageServices.get(catalogId);
         return await storage.search(s, this.type);
     }
 }
@@ -418,8 +426,8 @@ class LinkItem extends NavigationGroup {
     name = 'Link';
     type = 'link';
     isGroup = false;
-    constructor(adminizer) {
-        super(adminizer, []);
+    constructor(adminizer, storageServices) {
+        super(adminizer, [], storageServices);
     }
     getAddTemplate(req) {
         let type = 'navigation.link';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.3.0-build.117",
+  "version": "4.3.0-build.119",
   "main": "index.js",
   "exports": {
     ".": "./index.js",