adminizer 4.4.0-build.147 → 4.4.0-build.149

package/interfaces/adminpanelConfig.d.ts

@@ -425,8 +425,9 @@ export interface CreateUpdateConfig {
     entityModifier?: <T>(fieldData: T) => T;
     /**
      * You can change standard controller for any entity by this property
+     * Can be either a string path (for dynamic import) or a controller function
      * */
-    controller?: string;
+    controller?: string | ((req: ReqType, res: ResType) => Promise<any>);
 }
 export interface HrefConfig {
     id: string;

package/lib/model/adapter/sequelize.js

@@ -3,6 +3,7 @@ import { AbstractAdapter, AbstractModel } from "../AbstractModel.js";
 import path from "path";
 import fs from "fs";
 import { pathToFileURL } from "url";
+import { fileURLToPath } from "url";
 function generateAssociationsFromSchema(models, schemas) {
     for (const modelName in schemas) {
         const schema = schemas[modelName];
@@ -556,12 +557,14 @@ export class SequelizeAdapter extends AbstractAdapter {
     }
     /** Registration of system models */
     static async registerSystemModels(sequelize, alter = true) {
+        // Get current file directory from import.meta.url
+        const currentDir = import.meta.url ? path.dirname(fileURLToPath(import.meta.url)) : process.cwd();
         // Try multiple possible model locations
         const possiblePaths = [
-            path.resolve(import.meta.dirname, "../../../../models"),
-            path.resolve(import.meta.dirname, "../../../../src/models"),
-            path.resolve(import.meta.dirname, "../../../models"),
-            path.resolve(import.meta.dirname, "../../../src/models"),
+            path.resolve(currentDir, "../../../../models"),
+            path.resolve(currentDir, "../../../../src/models"),
+            path.resolve(currentDir, "../../../models"),
+            path.resolve(currentDir, "../../../src/models"),
             path.resolve(process.cwd(), "node_modules/adminizer/src/models"),
             path.resolve(process.cwd(), "node_modules/adminizer/models")
         ];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.4.0-build.147",
+  "version": "4.4.0-build.149",
   "main": "index.js",
   "exports": {
     ".": "./index.js",

package/system/Router.js

@@ -126,8 +126,15 @@ export default class Router {
                     if (modelConfig.add) {
                         let addHandler = modelConfig.add;
                         if (addHandler.controller) {
-                            let controller = await import(addHandler.controller);
-                            adminizer.app.all(`${adminizer.config.routePrefix}/model/${model}/add`, adminizer.policyManager.bindPolicies(policies, controller.default));
+                            if (typeof addHandler.controller === 'string') {
+                                // Dynamic import for string paths
+                                let controller = await import(addHandler.controller);
+                                adminizer.app.all(`${adminizer.config.routePrefix}/model/${model}/add`, adminizer.policyManager.bindPolicies(policies, controller.default));
+                            }
+                            else {
+                                // Direct function reference
+                                adminizer.app.all(`${adminizer.config.routePrefix}/model/${model}/add`, adminizer.policyManager.bindPolicies(policies, addHandler.controller));
+                            }
                         }
                         else {
                             adminizer.app.all(`${adminizer.config.routePrefix}/model/${model}/add`, adminizer.policyManager.bindPolicies(policies, _add));
@@ -142,8 +149,15 @@ export default class Router {
                     if (modelConfig.edit) {
                         let editHandler = modelConfig.edit;
                         if (editHandler.controller) {
-                            let controller = await import(editHandler.controller);
-                            adminizer.app.all(`${adminizer.config.routePrefix}/model/${model}/edit/:id`, adminizer.policyManager.bindPolicies(policies, controller.default));
+                            if (typeof editHandler.controller === 'string') {
+                                // Dynamic import for string paths
+                                let controller = await import(editHandler.controller);
+                                adminizer.app.all(`${adminizer.config.routePrefix}/model/${model}/edit/:id`, adminizer.policyManager.bindPolicies(policies, controller.default));
+                            }
+                            else {
+                                // Direct function reference
+                                adminizer.app.all(`${adminizer.config.routePrefix}/model/${model}/edit/:id`, adminizer.policyManager.bindPolicies(policies, editHandler.controller));
+                            }
                         }
                         else {
                             adminizer.app.all(`${adminizer.config.routePrefix}/model/${model}/edit/:id`, adminizer.policyManager.bindPolicies(policies, _edit));

package/system/defaults.js

@@ -1,6 +1,10 @@
 'use strict';
 import { FileStorageHelper } from "../helpers/fileStorageHelper.js";
 import timezones from "../lib/timezones.js";
+import addUser from "../controllers/addUser.js";
+import editUser from "../controllers/editUser.js";
+import addGroup from "../controllers/addGroup.js";
+import editGroup from "../controllers/editGroup.js";
 /**
  * Default admin config
  */
@@ -37,10 +41,10 @@ let adminpanelConfig = {
                 section: "System"
             },
             add: {
-                controller: "../controllers/addUser.js"
+                controller: addUser
             },
             edit: {
-                controller: "../controllers/editUser.js"
+                controller: editUser
             },
             fields: {
                 login: {
@@ -82,10 +86,10 @@ let adminpanelConfig = {
                 section: "System"
             },
             add: {
-                controller: "../controllers/addGroup.js"
+                controller: addGroup
             },
             edit: {
-                controller: "../controllers/editGroup.js"
+                controller: editGroup
             },
             list: {
                 fields: {