adminizer 4.3.0-build.103 → 4.3.0-build.105

package/assets/{media-manager-UQT6RhI8.js → media-manager-DyP_37fD.js}

@@ -1,4 +1,4 @@
-import{j as h,ak as kn,al as In,g as Q,w as _i,x as $i,Y as Ln,y as Wi,z as ht,a8 as Mr,a9 as Tr,aa as jr,ab as Rr,am as zn,an as Yt,B as J,a1 as Pn,a2 as Bn,a3 as _t,a4 as oe,a5 as Xn,a6 as se,I as qt,L as Ct,a as bt,ao as Hi,ap as Ui,aq as Fi,a0 as Vi,ar as Gi,f as fr,aj as Ki,D as qi,h as Ji,i as Zi,k as Qr,as as Qi}from"./app.js";import{r as g,e as B}from"./monaco-ICtx6xoc.js";import{r as mt}from"./handsontable-PVakPtJV.js";import{I as Yn,P as $t,p as ea}from"./field-renderer-4obZ_jUo.js";import{T as ta,a as ra,b as Ke,c as qe}from"./tabs-BK_5wdPA.js";import{d as na}from"./jsoneditor-D95dIAP2.js";import"./vendor-wzZzN_Jv.js";import"./dynamic-controls-BOYmRX_z.js";function ia(){for(var t=arguments.length,e=new Array(t),r=0;r<t;r++)e[r]=arguments[r];return g.useMemo(()=>n=>{e.forEach(a=>a(n))},e)}const Jt=typeof window<"u"&&typeof window.document<"u"&&typeof window.document.createElement<"u";function it(t){const e=Object.prototype.toString.call(t);return e==="[object Window]"||e==="[object global]"}function Or(t){return"nodeType"in t}function ee(t){var e,r;return t?it(t)?t:Or(t)&&(e=(r=t.ownerDocument)==null?void 0:r.defaultView)!=null?e:window:window}function Ar(t){const{Document:e}=ee(t);return t instanceof e}function Tt(t){return it(t)?!1:t instanceof ee(t).HTMLElement}function _n(t){return t instanceof ee(t).SVGElement}function at(t){return t?it(t)?t.document:Or(t)?Ar(t)?t:Tt(t)||_n(t)?t.ownerDocument:document:document:document}const pe=Jt?g.useLayoutEffect:g.useEffect;function Zt(t){const e=g.useRef(t);return pe(()=>{e.current=t}),g.useCallback(function(){for(var r=arguments.length,n=new Array(r),a=0;a<r;a++)n[a]=arguments[a];return e.current==null?void 0:e.current(...n)},[])}function aa(){const t=g.useRef(null),e=g.useCallback((n,a)=>{t.current=setInterval(n,a)},[]),r=g.useCallback(()=>{t.current!==null&&(clearInterval(t.current),t.current=null)},[]);return[e,r]}function St(t,e){e===void 0&&(e=[t]);const r=g.useRef(t);return pe(()=>{r.current!==t&&(r.current=t)},e),r}function jt(t,e){const r=g.useRef();return g.useMemo(()=>{const n=t(r.current);return r.current=n,n},[...e])}function Wt(t){const e=Zt(t),r=g.useRef(null),n=g.useCallback(a=>{a!==r.current&&(e==null||e(a,r.current)),r.current=a},[]);return[r,n]}function Ht(t){const e=g.useRef();return g.useEffect(()=>{e.current=t},[t]),e.current}let or={};function Rt(t,e){return g.useMemo(()=>{if(e)return e;const r=or[t]==null?0:or[t]+1;return or[t]=r,t+"-"+r},[t,e])}function $n(t){return function(e){for(var r=arguments.length,n=new Array(r>1?r-1:0),a=1;a<r;a++)n[a-1]=arguments[a];return n.reduce((i,o)=>{const s=Object.entries(o);for(const[d,l]of s){const c=i[d];c!=null&&(i[d]=c+t*l)}return i},{...e})}}const et=$n(1),Et=$n(-1);function oa(t){return"clientX"in t&&"clientY"in t}function Ot(t){if(!t)return!1;const{KeyboardEvent:e}=ee(t.target);return e&&t instanceof e}function sa(t){if(!t)return!1;const{TouchEvent:e}=ee(t.target);return e&&t instanceof e}function Ut(t){if(sa(t)){if(t.touches&&t.touches.length){const{clientX:e,clientY:r}=t.touches[0];return{x:e,y:r}}else if(t.changedTouches&&t.changedTouches.length){const{clientX:e,clientY:r}=t.changedTouches[0];return{x:e,y:r}}}return oa(t)?{x:t.clientX,y:t.clientY}:null}const ye=Object.freeze({Translate:{toString(t){if(!t)return;const{x:e,y:r}=t;return"translate3d("+(e?Math.round(e):0)+"px, "+(r?Math.round(r):0)+"px, 0)"}},Scale:{toString(t){if(!t)return;const{scaleX:e,scaleY:r}=t;return"scaleX("+e+") scaleY("+r+")"}},Transform:{toString(t){if(t)return[ye.Translate.toString(t),ye.Scale.toString(t)].join(" ")}},Transition:{toString(t){let{property:e,duration:r,easing:n}=t;return e+" "+r+"ms "+n}}}),en="a,frame,iframe,input:not([type=hidden]):not(:disabled),select:not(:disabled),textarea:not(:disabled),button:not(:disabled),*[tabindex]";function la(t){return t.matches(en)?t:t.querySelector(en)}const ca={display:"none"};function da(t){let{id:e,value:r}=t;return B.createElement("div",{id:e,style:ca},r)}function ua(t){let{id:e,announcement:r,ariaLiveType:n="assertive"}=t;const a={position:"fixed",top:0,left:0,width:1,height:1,margin:-1,border:0,padding:0,overflow:"hidden",clip:"rect(0 0 0 0)",clipPath:"inset(100%)",whiteSpace:"nowrap"};return B.createElement("div",{id:e,style:a,role:"status","aria-live":n,"aria-atomic":!0},r)}function ha(){const[t,e]=g.useState("");return{announce:g.useCallback(n=>{n!=null&&e(n)},[]),announcement:t}}const Wn=g.createContext(null);function fa(t){const e=g.useContext(Wn);g.useEffect(()=>{if(!e)throw new Error("useDndMonitor must be used within a children of <DndContext>");return e(t)},[t,e])}function pa(){const[t]=g.useState(()=>new Set),e=g.useCallback(n=>(t.add(n),()=>t.delete(n)),[t]);return[g.useCallback(n=>{let{type:a,event:i}=n;t.forEach(o=>{var s;return(s=o[a])==null?void 0:s.call(o,i)})},[t]),e]}const ga={draggable:`
+import{j as h,ak as kn,al as In,g as Q,w as _i,x as $i,Y as Ln,y as Wi,z as ht,a8 as Mr,a9 as Tr,aa as jr,ab as Rr,am as zn,an as Yt,B as J,a1 as Pn,a2 as Bn,a3 as _t,a4 as oe,a5 as Xn,a6 as se,I as qt,L as Ct,a as bt,ao as Hi,ap as Ui,aq as Fi,a0 as Vi,ar as Gi,f as fr,aj as Ki,D as qi,h as Ji,i as Zi,k as Qr,as as Qi}from"./app.js";import{r as g,e as B}from"./monaco-ICtx6xoc.js";import{r as mt}from"./handsontable-PVakPtJV.js";import{I as Yn,P as $t,p as ea}from"./field-renderer-BhrQ1BlC.js";import{T as ta,a as ra,b as Ke,c as qe}from"./tabs-BK_5wdPA.js";import{d as na}from"./jsoneditor-D95dIAP2.js";import"./vendor-wzZzN_Jv.js";import"./dynamic-controls-BOYmRX_z.js";function ia(){for(var t=arguments.length,e=new Array(t),r=0;r<t;r++)e[r]=arguments[r];return g.useMemo(()=>n=>{e.forEach(a=>a(n))},e)}const Jt=typeof window<"u"&&typeof window.document<"u"&&typeof window.document.createElement<"u";function it(t){const e=Object.prototype.toString.call(t);return e==="[object Window]"||e==="[object global]"}function Or(t){return"nodeType"in t}function ee(t){var e,r;return t?it(t)?t:Or(t)&&(e=(r=t.ownerDocument)==null?void 0:r.defaultView)!=null?e:window:window}function Ar(t){const{Document:e}=ee(t);return t instanceof e}function Tt(t){return it(t)?!1:t instanceof ee(t).HTMLElement}function _n(t){return t instanceof ee(t).SVGElement}function at(t){return t?it(t)?t.document:Or(t)?Ar(t)?t:Tt(t)||_n(t)?t.ownerDocument:document:document:document}const pe=Jt?g.useLayoutEffect:g.useEffect;function Zt(t){const e=g.useRef(t);return pe(()=>{e.current=t}),g.useCallback(function(){for(var r=arguments.length,n=new Array(r),a=0;a<r;a++)n[a]=arguments[a];return e.current==null?void 0:e.current(...n)},[])}function aa(){const t=g.useRef(null),e=g.useCallback((n,a)=>{t.current=setInterval(n,a)},[]),r=g.useCallback(()=>{t.current!==null&&(clearInterval(t.current),t.current=null)},[]);return[e,r]}function St(t,e){e===void 0&&(e=[t]);const r=g.useRef(t);return pe(()=>{r.current!==t&&(r.current=t)},e),r}function jt(t,e){const r=g.useRef();return g.useMemo(()=>{const n=t(r.current);return r.current=n,n},[...e])}function Wt(t){const e=Zt(t),r=g.useRef(null),n=g.useCallback(a=>{a!==r.current&&(e==null||e(a,r.current)),r.current=a},[]);return[r,n]}function Ht(t){const e=g.useRef();return g.useEffect(()=>{e.current=t},[t]),e.current}let or={};function Rt(t,e){return g.useMemo(()=>{if(e)return e;const r=or[t]==null?0:or[t]+1;return or[t]=r,t+"-"+r},[t,e])}function $n(t){return function(e){for(var r=arguments.length,n=new Array(r>1?r-1:0),a=1;a<r;a++)n[a-1]=arguments[a];return n.reduce((i,o)=>{const s=Object.entries(o);for(const[d,l]of s){const c=i[d];c!=null&&(i[d]=c+t*l)}return i},{...e})}}const et=$n(1),Et=$n(-1);function oa(t){return"clientX"in t&&"clientY"in t}function Ot(t){if(!t)return!1;const{KeyboardEvent:e}=ee(t.target);return e&&t instanceof e}function sa(t){if(!t)return!1;const{TouchEvent:e}=ee(t.target);return e&&t instanceof e}function Ut(t){if(sa(t)){if(t.touches&&t.touches.length){const{clientX:e,clientY:r}=t.touches[0];return{x:e,y:r}}else if(t.changedTouches&&t.changedTouches.length){const{clientX:e,clientY:r}=t.changedTouches[0];return{x:e,y:r}}}return oa(t)?{x:t.clientX,y:t.clientY}:null}const ye=Object.freeze({Translate:{toString(t){if(!t)return;const{x:e,y:r}=t;return"translate3d("+(e?Math.round(e):0)+"px, "+(r?Math.round(r):0)+"px, 0)"}},Scale:{toString(t){if(!t)return;const{scaleX:e,scaleY:r}=t;return"scaleX("+e+") scaleY("+r+")"}},Transform:{toString(t){if(t)return[ye.Translate.toString(t),ye.Scale.toString(t)].join(" ")}},Transition:{toString(t){let{property:e,duration:r,easing:n}=t;return e+" "+r+"ms "+n}}}),en="a,frame,iframe,input:not([type=hidden]):not(:disabled),select:not(:disabled),textarea:not(:disabled),button:not(:disabled),*[tabindex]";function la(t){return t.matches(en)?t:t.querySelector(en)}const ca={display:"none"};function da(t){let{id:e,value:r}=t;return B.createElement("div",{id:e,style:ca},r)}function ua(t){let{id:e,announcement:r,ariaLiveType:n="assertive"}=t;const a={position:"fixed",top:0,left:0,width:1,height:1,margin:-1,border:0,padding:0,overflow:"hidden",clip:"rect(0 0 0 0)",clipPath:"inset(100%)",whiteSpace:"nowrap"};return B.createElement("div",{id:e,style:a,role:"status","aria-live":n,"aria-atomic":!0},r)}function ha(){const[t,e]=g.useState("");return{announce:g.useCallback(n=>{n!=null&&e(n)},[]),announcement:t}}const Wn=g.createContext(null);function fa(t){const e=g.useContext(Wn);g.useEffect(()=>{if(!e)throw new Error("useDndMonitor must be used within a children of <DndContext>");return e(t)},[t,e])}function pa(){const[t]=g.useState(()=>new Set),e=g.useCallback(n=>(t.add(n),()=>t.delete(n)),[t]);return[g.useCallback(n=>{let{type:a,event:i}=n;t.forEach(o=>{var s;return(s=o[a])==null?void 0:s.call(o,i)})},[t]),e]}const ga={draggable:`
     To pick up a draggable item, press the space bar.
     While dragging, use the arrow keys to move the item.
     Press space again to drop the item in its new position, or press escape to cancel.

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.identity, newRecord[0].id);
             Adminizer.log.debug(`Record was updated: `, newRecord);
             if (req.body.jsonPopupCatalog) {
                 return res.json({ record: newRecord });
@@ -142,9 +142,11 @@ 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({
-                list: record[field],
-                mediaManagerId: fieldConfigConfig.options?.id ?? "default"
+            record[field] = await getRelationsMediaManager(req.adminizer, {
+                mediaManagerId: fieldConfigConfig.options?.id ?? "default",
+                model: entity.model.modelname,
+                widgetName: field,
+                modelId: id
             });
         }
     }

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,9 +44,9 @@ 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], "form", `${slug}_${key}`, key);
+                    await mediaManager.setRelations(req.body[key], `${slug}_${key}`, 0, key);
             }
         }
         for (let field of Object.keys(req.body)) {
@@ -63,9 +62,11 @@ 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({
-                    list: await req.adminizer.config.forms.get(slug, key),
-                    mediaManagerId: form[key].options?.id ?? "default"
+                form[key].value = await getRelationsMediaManager(req.adminizer, {
+                    mediaManagerId: form[key].options?.id ?? "default",
+                    model: `${slug}_${key}`,
+                    widgetName: key,
+                    modelId: 0
                 });
             }
             else {

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,9 +86,11 @@ 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({
-                        list: record[field],
-                        mediaManagerId: fieldConfigConfig.options?.id ?? "default"
+                    record[field] = await getRelationsMediaManager(req.adminizer, {
+                        mediaManagerId: fieldConfigConfig.options?.id ?? "default",
+                        model: entity.model.modelname,
+                        widgetName: field,
+                        modelId: req.params.id
                     });
                 }
             }

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/AbstractMediaManager.d.ts

@@ -36,8 +36,10 @@ export interface MediaManagerWidgetClientItem extends MediaManagerWidgetItem {
     url?: string;
 }
 export interface MediaManagerWidgetJSON {
-    list: MediaManagerWidgetItem[];
     mediaManagerId: string;
+    model: string;
+    widgetName: string;
+    modelId: string | number;
 }
 export interface MediaManagerWidgetData {
     id: string;
@@ -207,8 +209,8 @@ export declare abstract class AbstractMediaManager {
     /**
      * widget Id in the model in which the mediafile was added
      */
-    modelId: string, widgetName: string): Promise<void>;
-    abstract getItemsList(items: MediaManagerWidgetItem[]): Promise<MediaManagerWidgetClientItem[]>;
+    modelId: number, widgetName: string): Promise<void>;
+    abstract getRelations(model: string, widgetName: string, modelId: string | number): Promise<MediaManagerWidgetClientItem[]>;
     /**
      * Search all items.
      * If not this.allowSearch = true then it will not come here

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

@@ -1,4 +1,4 @@
-import { AbstractMediaManager, MediaManagerItem, File, MediaManagerWidgetItem, MediaManagerWidgetData, MediaManagerWidgetClientItem, SortCriteria } from "./AbstractMediaManager";
+import { AbstractMediaManager, MediaManagerItem, File, MediaManagerWidgetData, MediaManagerWidgetClientItem, SortCriteria } from "./AbstractMediaManager";
 import { Adminizer } from "../Adminizer";
 export declare class DefaultMediaManager extends AbstractMediaManager {
     readonly itemTypes: File<MediaManagerItem>[];
@@ -12,6 +12,6 @@ export declare class DefaultMediaManager extends AbstractMediaManager {
         next: boolean;
     }>;
     searchAll(s: string, group: string): Promise<MediaManagerItem[]>;
-    setRelations(data: MediaManagerWidgetData[], model: string, modelId: string, widgetName: string): Promise<void>;
-    getItemsList(items: MediaManagerWidgetItem[]): Promise<MediaManagerWidgetClientItem[]>;
+    setRelations(data: MediaManagerWidgetData[], model: string, modelId: number, widgetName: string): Promise<void>;
+    getRelations(model: string, widgetName: string, modelId: string | number): Promise<MediaManagerWidgetClientItem[]>;
 }

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, widgetName: widgetName },
+            where: { modelId: modelId, model: model.toLowerCase(), widgetName: widgetName },
         });
         for (const modelAssociation of modelAssociations) {
             const q = {};
@@ -69,7 +69,7 @@ export class DefaultMediaManager extends AbstractMediaManager {
         for (const [key, widgetItem] of data.entries()) {
             await this.adminizer.modelHandler.model.get(this.modelAssoc)["_create"]({
                 mediaManagerId: this.id,
-                model: model,
+                model: model.toLowerCase(),
                 modelId: modelId,
                 [fieldName]: widgetItem.id,
                 widgetName: widgetName,
@@ -77,18 +77,23 @@ export class DefaultMediaManager extends AbstractMediaManager {
             });
         }
     }
-    async getItemsList(items) {
+    async getRelations(model, widgetName, modelId) {
         let widgetItems = [];
-        for (const item of items) {
-            //TODO refactor CRUD functions for DataAccessor usage
-            let file = (await this.adminizer.modelHandler.model.get(this.model)["_find"]({
-                where: { id: item.id }
-            }, { populate: [["variants", { sort: "createdAt DESC" }]] }))[0];
+        const fieldName = this.adminizer.ormAdapters[0].ormType === 'sequelize' ? 'fileRef' : 'file';
+        let files = await this.adminizer.modelHandler.model.get(this.modelAssoc)['_find']({
+            where: {
+                model: model.toLowerCase(),
+                widgetName: widgetName,
+                modelId: +modelId
+            },
+            sort: "sortOrder ASC"
+        }, { populate: [[fieldName, {}]] });
+        for (const file of files) {
             widgetItems.push({
-                id: file.id,
-                mimeType: file.mimeType,
-                url: file.url,
-                variants: file.variants,
+                id: file[fieldName].id,
+                mimeType: file[fieldName].mimeType,
+                url: file[fieldName].url,
+                variants: []
             });
         }
         return widgetItems;

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,24 @@ 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: string): 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
  * @param model
  * @param record
  */

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,32 +12,37 @@ 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);
-    return await mediaManager.getItemsList(data.list ?? []);
+export async function getRelationsMediaManager(adminizer, data) {
+    let mediaManager = adminizer.mediaManagerHandler.get(data.mediaManagerId);
+    return await mediaManager.getRelations(data.model, data.widgetName, data.modelId);
 }
 /**
  * Delate Ralations
+ * @param adminizer
  * @param model
  * @param record
  */
@@ -48,9 +52,9 @@ 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);
+            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.103",
+  "version": "4.3.0-build.105",
   "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);