adminizer 4.3.0-build.104 → 4.3.0-build.106

package/controllers/add.js

@@ -88,7 +88,7 @@ export default async function add(req, res) {
         try {
             let record = await entity.model.create(reqData, dataAccessor);
             // save associations media to json
-            await saveRelationsMediaManager(fields, rawReqData, entity.model.identity, record.id);
+            await saveRelationsMediaManager(req.adminizer, fields, rawReqData, entity.model.identity, record.id);
             Adminizer.log.debug(`A new record was created: `, record);
             if (req.body.jsonPopupCatalog) {
                 dataAccessor = new DataAccessor(req.adminizer, req.user, entity, "edit");

package/controllers/edit.js

@@ -112,7 +112,7 @@ export default async function edit(req, res) {
         }
         try {
             let newRecord = await entity.model.update(params, reqData, dataAccessor);
-            await saveRelationsMediaManager(fields, rawReqData, entity.model.identity, newRecord[0].id);
+            await saveRelationsMediaManager(req.adminizer, fields, rawReqData, entity.model.modelname, newRecord[0].id);
             Adminizer.log.debug(`Record was updated: `, newRecord);
             if (req.body.jsonPopupCatalog) {
                 return res.json({ record: newRecord });
@@ -142,7 +142,7 @@ export default async function edit(req, res) {
     for (const field of Object.keys(fields)) {
         let fieldConfigConfig = fields[field].config;
         if (fieldConfigConfig.type === 'mediamanager') {
-            record[field] = await getRelationsMediaManager({
+            record[field] = await getRelationsMediaManager(req.adminizer, {
                 mediaManagerId: fieldConfigConfig.options?.id ?? "default",
                 model: entity.model.modelname,
                 widgetName: field,

package/controllers/form.js

@@ -2,7 +2,6 @@ import { FormHelper } from "../helpers/formHelper";
 import { Adminizer } from "../lib/Adminizer";
 import inertiaFormHelper from "../helpers/inertiaFromHelper";
 import { getRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper";
-import { MediaManagerHandler } from "../lib/media-manager/MediaManagerHandler";
 export default async function form(req, res) {
     let slug = req.params.slug;
     // Check slug
@@ -45,7 +44,7 @@ export default async function form(req, res) {
             }
             if (form[key].type === "mediamanager") {
                 let options = form[key].options;
-                let mediaManager = MediaManagerHandler.get(options?.id ?? "default");
+                let mediaManager = req.adminizer.mediaManagerHandler.get(options?.id ?? "default");
                 if (req.body[key])
                     await mediaManager.setRelations(req.body[key], `${slug}_${key}`, 0, key);
             }
@@ -63,7 +62,7 @@ export default async function form(req, res) {
     for (let key of Object.keys(form)) {
         try {
             if (form[key].type === 'mediamanager') {
-                form[key].value = await getRelationsMediaManager({
+                form[key].value = await getRelationsMediaManager(req.adminizer, {
                     mediaManagerId: form[key].options?.id ?? "default",
                     model: `${slug}_${key}`,
                     widgetName: key,

package/controllers/media-manager/ThumbController.js

@@ -5,6 +5,6 @@ export async function thumbController(req, res) {
     const managerId = req.query.managerId;
     if (method === 'GET') {
         res.setHeader('Content-Type', 'image/webp');
-        res.send(await MediaManagerThumb.getThumb(id, managerId));
+        res.send(await MediaManagerThumb.getThumb(id, managerId, req.adminizer));
     }
 }

package/controllers/media-manager/mediaManagerApi.js

@@ -1,4 +1,3 @@
-import { MediaManagerHandler } from "../../lib/media-manager/MediaManagerHandler";
 import { MediaManagerAdapter } from "./mediaManagerAdapter";
 export async function mediaManagerController(req, res) {
     const method = req.method.toUpperCase();
@@ -16,7 +15,7 @@ export async function mediaManagerController(req, res) {
     if (!id) {
         return res.sendStatus(404);
     }
-    const _manager = MediaManagerHandler.get(id);
+    const _manager = req.adminizer.mediaManagerHandler.get(id);
     const manager = new MediaManagerAdapter(_manager);
     if (method === 'GET') {
         if (req.query._method === 'getLocales') {

package/controllers/view.js

@@ -86,7 +86,7 @@ export default async function view(req, res) {
             for (const field of Object.keys(fields)) {
                 let fieldConfigConfig = fields[field].config;
                 if (fieldConfigConfig.type === 'mediamanager') {
-                    record[field] = await getRelationsMediaManager({
+                    record[field] = await getRelationsMediaManager(req.adminizer, {
                         mediaManagerId: fieldConfigConfig.options?.id ?? "default",
                         model: entity.model.modelname,
                         widgetName: field,

package/helpers/inertiaAddHelper.js

@@ -1,7 +1,6 @@
 import inertiaActionsHelper from "./inertiaActionsHelper";
 import chalk from "chalk";
 import { isObject } from "./JsUtils";
-import { MediaManagerHandler } from "../lib/media-manager/MediaManagerHandler";
 export default function inertiaAddHelper(req, entity, fields, record, view = false) {
     const actionType = 'add';
     let props = {
@@ -107,7 +106,7 @@ export default function inertiaAddHelper(req, entity, fields, record, view = fal
         if (type === 'mediamanager') {
             const mConfig = field.config;
             const mOptions = mConfig?.options;
-            const mediaManager = MediaManagerHandler.get(mOptions.id || 'default');
+            const mediaManager = req.adminizer.mediaManagerHandler.get(mOptions.id || 'default');
             if (!mediaManager) {
                 options = {};
             }

package/helpers/inertiaFromHelper.js

@@ -1,5 +1,4 @@
 import { inputText, setSelectMany, getControlsOptions } from "./inertiaAddHelper";
-import { MediaManagerHandler } from "../lib/media-manager/MediaManagerHandler";
 export default function inertiaFormHelper(req, postLink, formData) {
     let props = {
         fields: [],
@@ -74,7 +73,7 @@ export default function inertiaFormHelper(req, postLink, formData) {
         }
         if (type === 'mediamanager') {
             const mOptions = field.options;
-            const mediaManager = MediaManagerHandler.get(mOptions.id || 'default');
+            const mediaManager = req.adminizer.mediaManagerHandler.get(mOptions.id || 'default');
             if (!mediaManager) {
                 options = {};
             }

package/lib/Adminizer.d.ts

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

package/lib/Adminizer.js

@@ -30,6 +30,7 @@ import { ControlsHandler } from "./controls/ControlsHandler";
 import { CatalogHandler } from "./catalog/CatalogHandler";
 import { v4 as uuid } from "uuid";
 import { bindNotifications } from "../system/bindNotifications";
+import { MediaManagerHandler } from "./media-manager/MediaManagerHandler";
 export class Adminizer {
     // Preconfigures
     /**
@@ -52,6 +53,7 @@ export class Adminizer {
     vite;
     controlsHandler;
     catalogHandler;
+    mediaManagerHandler;
     // Constants
     jwtSecret = process.env.JWT_SECRET ?? uuid();
     static logger = winston.createLogger({
@@ -195,6 +197,7 @@ export class Adminizer {
         this.menuHelper = new MenuHelper(this.config);
         this.widgetHandler = new WidgetHandler(this);
         this.catalogHandler = new CatalogHandler();
+        this.mediaManagerHandler = new MediaManagerHandler();
         bindExpressUtils(this.app);
         bindReqFunctions(this);
         // Bind assets

package/lib/media-manager/DefaultMediaManager.js

@@ -57,7 +57,7 @@ export class DefaultMediaManager extends AbstractMediaManager {
     }
     async setRelations(data, model, modelId, widgetName) {
         let modelAssociations = await this.adminizer.modelHandler.model.get(this.modelAssoc)["_find"]({
-            where: { modelId: modelId, model: model.toLowerCase(), widgetName: widgetName },
+            where: { modelId: +modelId, model: model.toLowerCase(), widgetName: widgetName },
         });
         for (const modelAssociation of modelAssociations) {
             const q = {};
@@ -70,7 +70,7 @@ export class DefaultMediaManager extends AbstractMediaManager {
             await this.adminizer.modelHandler.model.get(this.modelAssoc)["_create"]({
                 mediaManagerId: this.id,
                 model: model.toLowerCase(),
-                modelId: modelId,
+                modelId: +modelId,
                 [fieldName]: widgetItem.id,
                 widgetName: widgetName,
                 sortOrder: key + 1,

package/lib/media-manager/MediaManagerHandler.d.ts

@@ -1,6 +1,6 @@
 import { AbstractMediaManager } from "./AbstractMediaManager";
 export declare class MediaManagerHandler {
-    private static managers;
-    static add(manager: AbstractMediaManager): void;
-    static get(id: string): AbstractMediaManager;
+    private managers;
+    add(manager: AbstractMediaManager): void;
+    get(id: string): AbstractMediaManager;
 }

package/lib/media-manager/MediaManagerHandler.js

@@ -1,10 +1,10 @@
 import { Adminizer } from "../Adminizer";
 export class MediaManagerHandler {
-    static managers = [];
-    static add(manager) {
+    managers = [];
+    add(manager) {
         this.managers.push(manager);
     }
-    static get(id) {
+    get(id) {
         let instance = this.managers.find(e => e.id === id);
         /**
          * ✨ We magically get one

package/lib/media-manager/Thumb.d.ts

@@ -1,3 +1,4 @@
+import { Adminizer } from "../Adminizer";
 export declare class MediaManagerThumb {
-    static getThumb(id: string, managerId: string): Promise<Buffer<ArrayBufferLike>>;
+    static getThumb(id: string, managerId: string, adminizer: Adminizer): Promise<Buffer<ArrayBufferLike>>;
 }

package/lib/media-manager/Thumb.js

@@ -1,10 +1,9 @@
 import sharp from "sharp";
 import { promises as fs } from 'fs';
-import { MediaManagerHandler } from "./MediaManagerHandler";
 export class MediaManagerThumb {
-    static async getThumb(id, managerId) {
+    static async getThumb(id, managerId, adminizer) {
         const fileExists = async (path) => !!(await fs.stat(path).catch(e => false));
-        const manager = MediaManagerHandler.get(managerId);
+        const manager = adminizer.mediaManagerHandler.get(managerId);
         const path = await manager.getOrigin(id);
         const baseThumbPath = `${process.cwd()}/.tmp/thumbs`;
         await fs.mkdir(baseThumbPath, { recursive: true });

package/lib/media-manager/helpers/MediaManagerHelper.d.ts

@@ -11,19 +11,21 @@ type PostParams = Record<string, string | number | boolean | object | string[] |
 export declare function randomFileName(filenameOrig: string, type: string, prefix: boolean): string;
 /**
  * Save media manager relations to database.
+ * @param adminizer
  * @param fields
  * @param reqData
  * @param model
  * @param recordId
  */
-export declare function saveRelationsMediaManager(fields: Fields, reqData: PostParams, model: string, recordId: number): Promise<void>;
+export declare function saveRelationsMediaManager(adminizer: Adminizer, fields: Fields, reqData: PostParams, model: string, recordId: number): Promise<void>;
 /**
  * Get realtions
+ * @param adminizer
  * @param data
  * @param model
  * @param widgetName
  */
-export declare function getRelationsMediaManager(data: MediaManagerWidgetJSON): Promise<import("../AbstractMediaManager").MediaManagerWidgetClientItem[]>;
+export declare function getRelationsMediaManager(adminizer: Adminizer, data: MediaManagerWidgetJSON): Promise<import("../AbstractMediaManager").MediaManagerWidgetClientItem[]>;
 /**
  * Delate Ralations
  * @param adminizer

package/lib/media-manager/helpers/MediaManagerHelper.js

@@ -1,4 +1,3 @@
-import { MediaManagerHandler } from "../MediaManagerHandler";
 /**
  * Create a random file name with prefix and type. If prefix is true, the file name will be prefixed with a random string.
  * @param filenameOrig
@@ -13,30 +12,32 @@ export function randomFileName(filenameOrig, type, prefix) {
 }
 /**
  * Save media manager relations to database.
+ * @param adminizer
  * @param fields
  * @param reqData
  * @param model
  * @param recordId
  */
-export async function saveRelationsMediaManager(fields, reqData, model, recordId) {
+export async function saveRelationsMediaManager(adminizer, fields, reqData, model, recordId) {
     for (let prop in reqData) {
         let fieldConfigConfig = fields[prop].config;
         let options = fieldConfigConfig.options;
         if (fieldConfigConfig.type === 'mediamanager') {
             let data = reqData[prop];
-            let mediaManager = MediaManagerHandler.get(options?.id ?? 'default');
+            let mediaManager = adminizer.mediaManagerHandler.get(options?.id ?? 'default');
             await mediaManager.setRelations(data, model, recordId, prop);
         }
     }
 }
 /**
  * Get realtions
+ * @param adminizer
  * @param data
  * @param model
  * @param widgetName
  */
-export async function getRelationsMediaManager(data) {
-    let mediaManager = MediaManagerHandler.get(data.mediaManagerId);
+export async function getRelationsMediaManager(adminizer, data) {
+    let mediaManager = adminizer.mediaManagerHandler.get(data.mediaManagerId);
     return await mediaManager.getRelations(data.model, data.widgetName, data.modelId);
 }
 /**
@@ -51,7 +52,7 @@ export async function deleteRelationsMediaManager(adminizer, model, record) {
         let field = config.fields[key];
         if (field && field.type === 'mediamanager') {
             const option = field.options;
-            let mediaManager = MediaManagerHandler.get(option?.id ?? 'default');
+            let mediaManager = adminizer.mediaManagerHandler.get(option?.id ?? 'default');
             let emptyData = [];
             await mediaManager.setRelations(emptyData, model, +record[0].id, key);
         }

package/package.json

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

package/system/bindMediaManager.js

@@ -1,5 +1,4 @@
 import { DefaultMediaManager } from "../lib/media-manager/DefaultMediaManager";
-import { MediaManagerHandler } from "../lib/media-manager/MediaManagerHandler";
 import serveStatic from "serve-static";
 import path from "path";
 export default function bindMediaManager(adminizer) {
@@ -8,7 +7,7 @@ export default function bindMediaManager(adminizer) {
     adminizer.emitter.on("adminizer:loaded", async () => {
         try {
             let mediaManager = new DefaultMediaManager(adminizer, 'default', 'media-manager', adminizer.config.mediamanager.fileStoragePath);
-            MediaManagerHandler.add(mediaManager);
+            adminizer.mediaManagerHandler.add(mediaManager);
         }
         catch (e) {
             console.log(e);