adminizer 4.3.0-build.103 → 4.3.0-build.104

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/edit.js

@@ -143,8 +143,10 @@ export default async function edit(req, res) {
         let fieldConfigConfig = fields[field].config;
         if (fieldConfigConfig.type === 'mediamanager') {
             record[field] = await getRelationsMediaManager({
-                list: record[field],
-                mediaManagerId: fieldConfigConfig.options?.id ?? "default"
+                mediaManagerId: fieldConfigConfig.options?.id ?? "default",
+                model: entity.model.modelname,
+                widgetName: field,
+                modelId: id
             });
         }
     }

package/controllers/form.js

@@ -47,7 +47,7 @@ export default async function form(req, res) {
                 let options = form[key].options;
                 let mediaManager = 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)) {
@@ -64,8 +64,10 @@ export default async function form(req, res) {
         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"
+                    mediaManagerId: form[key].options?.id ?? "default",
+                    model: `${slug}_${key}`,
+                    widgetName: key,
+                    modelId: 0
                 });
             }
             else {

package/controllers/view.js

@@ -87,8 +87,10 @@ export default async function view(req, res) {
                 let fieldConfigConfig = fields[field].config;
                 if (fieldConfigConfig.type === 'mediamanager') {
                     record[field] = await getRelationsMediaManager({
-                        list: record[field],
-                        mediaManagerId: fieldConfigConfig.options?.id ?? "default"
+                        mediaManagerId: fieldConfigConfig.options?.id ?? "default",
+                        model: entity.model.modelname,
+                        widgetName: field,
+                        modelId: req.params.id
                     });
                 }
             }

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

@@ -16,14 +16,17 @@ export declare function randomFileName(filenameOrig: string, type: string, prefi
  * @param model
  * @param recordId
  */
-export declare function saveRelationsMediaManager(fields: Fields, reqData: PostParams, model: string, recordId: string): Promise<void>;
+export declare function saveRelationsMediaManager(fields: Fields, reqData: PostParams, model: string, recordId: number): Promise<void>;
 /**
  * Get realtions
  * @param data
+ * @param model
+ * @param widgetName
  */
 export declare function getRelationsMediaManager(data: MediaManagerWidgetJSON): Promise<import("../AbstractMediaManager").MediaManagerWidgetClientItem[]>;
 /**
  * Delate Ralations
+ * @param adminizer
  * @param model
  * @param record
  */

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

@@ -32,13 +32,16 @@ export async function saveRelationsMediaManager(fields, reqData, model, recordId
 /**
  * Get realtions
  * @param data
+ * @param model
+ * @param widgetName
  */
 export async function getRelationsMediaManager(data) {
     let mediaManager = MediaManagerHandler.get(data.mediaManagerId);
-    return await mediaManager.getItemsList(data.list ?? []);
+    return await mediaManager.getRelations(data.model, data.widgetName, data.modelId);
 }
 /**
  * Delate Ralations
+ * @param adminizer
  * @param model
  * @param record
  */
@@ -50,7 +53,7 @@ export async function deleteRelationsMediaManager(adminizer, model, record) {
             const option = field.options;
             let mediaManager = 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.104",
   "main": "index.js",
   "exports": {
     ".": "./index.js",