feat: refactor admin panel binding and update model configurations for dishes, groups, orders, and promotions

Author: VuXfi

hook/bindAdminpanel.js

@@ -6,23 +6,27 @@ const ProductCatalog_1 = require("../libs/adminpanel/ProductCatalog/ProductCatal
 const ProductMediaManager_1 = require("../libs/adminpanel/ProductMediaManager/ProductMediaManager");
 const bind_1 = require("../libs/adminpanel/models/bind");
 function bindAdminpanel() {
+    processBindAdminpanel();
     sails.on('Adminpanel:afterHook:loaded', async () => {
-        processBindAdminpanel();
         // Catalog bind
-        const CatalogHandler = sails.hooks.adminpanel.getCatalogHandler();
+        const CatalogHandler = sails.hooks.adminpanel.adminizer.getCatalogHandler();
         const productCatalog = new ProductCatalog_1.ProductCatalog();
         CatalogHandler.add(productCatalog);
         // Product media manager bind
-        const MediaManagerHandler = sails.hooks.adminpanel.getMediaManagerHandler();
+        const MediaManagerHandler = sails.hooks.adminpanel.adminizer.getMediaManagerHandler();
         const productMediaManager = new ProductMediaManager_1.ProductMediaManager();
         MediaManagerHandler.add(productMediaManager);
     });
 }
+// Добавляем метод для обновления моделей админки
+function addModelConfig(newModels) {
+    if (!sails.config.adminpanel || !sails.config.adminpanel.models)
+        return;
+    Object.assign(sails.config.adminpanel.models, newModels);
+}
 function processBindAdminpanel() {
-    if (sails.hooks?.adminpanel?.addModelConfig !== undefined) {
-        const addModelConfig = sails.hooks.adminpanel.addModelConfig;
-        addModelConfig(bind_1.models);
-    }
+    // Используем локальный addModelConfig
+    addModelConfig(bind_1.models);
     if (Array.isArray(sails.config.adminpanel?.sections)) {
         let baseRoute = sails.config.adminpanel.routePrefix;
         sails.config.adminpanel.sections.push({

hook/bindAdminpanel.ts

@@ -3,34 +3,38 @@ import { ProductCatalog } from "../libs/adminpanel/ProductCatalog/ProductCatalog
 import { ProductMediaManager } from "../libs/adminpanel/ProductMediaManager/ProductMediaManager";
 import {models } from "../libs/adminpanel/models/bind" 
 export default function bindAdminpanel () {
+  processBindAdminpanel();
   sails.on('Adminpanel:afterHook:loaded', async ()=>{
-    processBindAdminpanel();
     // Catalog bind
-    const CatalogHandler = sails.hooks.adminpanel.getCatalogHandler()
+    const CatalogHandler = sails.hooks.adminpanel.adminizer.getCatalogHandler()
     const productCatalog = new ProductCatalog()
     CatalogHandler.add(productCatalog);
 
     // Product media manager bind
-    const MediaManagerHandler = sails.hooks.adminpanel.getMediaManagerHandler()
+    const MediaManagerHandler = sails.hooks.adminpanel.adminizer.getMediaManagerHandler()
     const productMediaManager = new ProductMediaManager()
     MediaManagerHandler.add(productMediaManager)
   })
 }
 
+// Добавляем метод для обновления моделей админки
+function addModelConfig(newModels: Record<string, any>) {
+  if (!sails.config.adminpanel || !sails.config.adminpanel.models) return;
+  Object.assign(sails.config.adminpanel.models, newModels);
+}
+
 function processBindAdminpanel(){
-  if(sails.hooks?.adminpanel?.addModelConfig !== undefined) {
-    const addModelConfig = sails.hooks.adminpanel.addModelConfig;
-    addModelConfig(models);
-  }
+  // Используем локальный addModelConfig
+  addModelConfig(models);
 
   if(Array.isArray(sails.config.adminpanel?.sections)){
     let baseRoute = sails.config.adminpanel.routePrefix;
     sails.config.adminpanel.sections.push({
       id: 'products',
-          title: 'Products',
-          link: `${baseRoute}/catalog/products`,
-          icon: `barcode`
-      });
+      title: 'Products',
+      link: `${baseRoute}/catalog/products`,
+      icon: `barcode`
+    });
   }
 }
 

libs/adminpanel/models/bind.d.ts

@@ -4,7 +4,7 @@ export declare const models: {
         model: string;
         icon: string;
     };
-    products: {
+    dish: {
         model: string;
         title: string;
         icon: string;
@@ -14,7 +14,7 @@ export declare const models: {
         edit: import("sails-adminpanel/interfaces/adminpanelConfig").CreateUpdateConfig;
         add: import("sails-adminpanel/interfaces/adminpanelConfig").CreateUpdateConfig;
     };
-    groups: {
+    group: {
         model: string;
         title: string;
         icon: string;
@@ -24,7 +24,7 @@ export declare const models: {
         edit: import("sails-adminpanel/interfaces/adminpanelConfig").CreateUpdateConfig;
         add: import("sails-adminpanel/interfaces/adminpanelConfig").CreateUpdateConfig;
     };
-    orders: {
+    order: {
         model: string;
         title: string;
         icon: string;
@@ -44,7 +44,7 @@ export declare const models: {
         title: string;
         icon: string;
     };
-    promotions: {
+    promotion: {
         model: string;
         title: string;
         icon: string;

libs/adminpanel/models/bind.js

@@ -7,73 +7,73 @@ exports.models = {
     user: {
         title: "User",
         model: "user",
-        icon: "user"
+        icon: "person"
     },
-    products: {
+    dish: {
         model: 'dish',
         title: 'Products',
-        icon: 'hamburger',
+        icon: 'restaurant_menu',
         list: product_1.ProductConfig.list(),
         edit: product_1.ProductConfig.edit(),
         add: product_1.ProductConfig.add(),
     },
-    groups: {
+    group: {
         model: 'group',
         title: 'Groups',
-        icon: 'folder',
+        icon: 'group',
         list: group_1.GroupConfig.list(),
         edit: group_1.GroupConfig.edit(),
         add: group_1.GroupConfig.add(),
     },
-    orders: {
+    order: {
         model: 'order',
         title: 'Orders',
-        icon: 'shopping-cart'
+        icon: 'shopping_cart'
     },
     bonusprogram: {
         model: 'bonusprogram',
         title: 'Bonus programs',
-        icon: 'comments-dollar'
+        icon: 'card_giftcard'
     },
     userbonusprogram: {
         model: 'userbonusprogram',
         title: 'User bonusprograms',
-        icon: 'money-bill-wave-alt'
+        icon: 'loyalty'
     },
     userbonustransaction: {
         model: 'userbonustransaction',
         title: 'Userbonus transactions',
-        icon: 'exchange-alt'
+        icon: 'swap_horiz'
     },
-    promotions: {
+    promotion: {
         model: 'promotion',
         title: 'Promotions',
-        icon: 'gift'
+        icon: 'local_offer'
     },
     promotioncode: {
         model: 'promotioncode',
         title: 'Promotion codes',
-        icon: 'qrcode'
+        icon: 'confirmation_number'
     },
     place: {
         model: 'place',
         title: 'Places',
-        icon: 'store'
+        icon: 'place'
     },
     street: {
         model: 'street',
         title: 'Street',
-        icon: 'road'
+        icon: 'location_on'
     },
     paymentMethod: {
         model: 'paymentmethod',
         title: 'Payment method',
-        icon: 'credit-card'
+        icon: 'payment'
     },
     maintenance: {
         model: "maintenance",
         title: "Scheduled Maintenance on the Website",
-        icon: "pause",
+        icon: "build",
         fields: {
             id: false,
             createdAt: false,

libs/adminpanel/models/bind.ts

@@ -5,73 +5,73 @@ export const models = {
   user: {
     title: "User",
     model: "user",
-    icon: "user"
+    icon: "person"
   },
-  products: {
+  dish: {
     model: 'dish',
     title: 'Products',
-    icon: 'hamburger',
+    icon: 'restaurant_menu',
     list: ProductConfig.list(),
     edit: ProductConfig.edit(),
     add: ProductConfig.add(),
   },
-  groups: {
+  group: {
     model: 'group',
     title: 'Groups',
-    icon: 'folder',
+    icon: 'group',
     list: GroupConfig.list(),
     edit: GroupConfig.edit(),
     add: GroupConfig.add(),
   },
-  orders: {
+  order: {
     model: 'order',
     title: 'Orders',
-    icon: 'shopping-cart'
+    icon: 'shopping_cart'
   },
   bonusprogram: {
     model: 'bonusprogram',
     title: 'Bonus programs',
-    icon: 'comments-dollar'
+    icon: 'card_giftcard'
   },
   userbonusprogram: {
     model: 'userbonusprogram',
     title: 'User bonusprograms',
-    icon: 'money-bill-wave-alt'
+    icon: 'loyalty'
   },
   userbonustransaction: {
     model: 'userbonustransaction',
     title: 'Userbonus transactions',
-    icon: 'exchange-alt'
+    icon: 'swap_horiz'
   },
-  promotions: {
+  promotion: {
     model: 'promotion',
     title: 'Promotions',
-    icon: 'gift'
+    icon: 'local_offer'
   },
   promotioncode: {
     model: 'promotioncode',
     title: 'Promotion codes',
-    icon: 'qrcode'
+    icon: 'confirmation_number'
   },
   place: {
     model: 'place',
     title: 'Places',
-    icon: 'store'
+    icon: 'place'
   },
   street: {
     model: 'street',
     title: 'Street',
-    icon: 'road'
+    icon: 'location_on'
   },
   paymentMethod: {
     model: 'paymentmethod',
     title: 'Payment method',
-    icon: 'credit-card'
+    icon: 'payment'
   },
   maintenance: {
     model: "maintenance",
     title: "Scheduled Maintenance on the Website",
-    icon: "pause",
+    icon: "build",
     fields: {
       id: false,
       createdAt: false,