adminizer 4.5.0-build.194 → 4.5.0-build.196

package/controllers/add.js

@@ -1,7 +1,7 @@
 import { ControllerHelper } from "../helpers/controllerHelper.js";
 import { RequestProcessor } from "../lib/requestProcessor.js";
 import { FieldsHelper } from "../helpers/fieldsHelper.js";
-import { saveRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper.js";
+import { detachMediaManagerField, saveRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper.js";
 import { DataAccessor } from "../lib/DataAccessor.js";
 import { Adminizer } from "../lib/Adminizer.js";
 import inertiaAddHelper from "../helpers/inertiaAddHelper.js";
@@ -50,15 +50,9 @@ export default async function add(req, res) {
                     }
                 }
             }
-            if (fieldConfigConfig.type === 'mediamanager' && typeof reqData[prop] === "string") {
-                try {
-                    const parsed = JSON.parse(reqData[prop]);
-                    rawReqData[prop] = parsed;
-                }
-                catch (error) {
-                    throw `Error assign association-many mediamanager data for ${prop}, ${reqData[prop]}`;
-                }
-                delete reqData[prop];
+            if (fieldConfigConfig.type === 'mediamanager') {
+                detachMediaManagerField(reqData, rawReqData, prop);
+                continue;
             }
             // delete property from association-many and association if empty
             if (fields[prop] && fields[prop].model && (fields[prop].model.type === 'association-many' || fields[prop].model.type === 'association')) {

package/controllers/edit.js

@@ -1,7 +1,7 @@
 import { ControllerHelper } from "../helpers/controllerHelper.js";
 import { RequestProcessor } from "../lib/requestProcessor.js";
 import { FieldsHelper } from "../helpers/fieldsHelper.js";
-import { getRelationsMediaManager, saveRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper.js";
+import { detachMediaManagerField, getRelationsMediaManager, saveRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper.js";
 import { DataAccessor } from "../lib/DataAccessor.js";
 import { Adminizer } from "../lib/Adminizer.js";
 import inertiaAddHelper from "../helpers/inertiaAddHelper.js";
@@ -76,15 +76,9 @@ export default async function edit(req, res) {
                     }
                 }
             }
-            if (fieldConfigConfig.type === 'mediamanager' && typeof reqData[prop] === "string") {
-                try {
-                    const parsed = JSON.parse(reqData[prop]);
-                    rawReqData[prop] = parsed;
-                }
-                catch (error) {
-                    throw `Error assign association-many mediamanager data for ${prop}, ${reqData[prop]}`;
-                }
-                delete reqData[prop];
+            if (fieldConfigConfig.type === 'mediamanager') {
+                detachMediaManagerField(reqData, rawReqData, prop);
+                continue;
             }
             if (fields[prop] && fields[prop].model && fields[prop].model.type === 'json' && reqData[prop] !== '') {
                 if (typeof reqData[prop] === "string") {

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

@@ -1,7 +1,9 @@
 import { Fields } from "../../../helpers/fieldsHelper";
-import { MediaManagerItem, MediaManagerWidgetItem, MediaManagerWidgetJSON } from "../AbstractMediaManager";
+import { MediaManagerWidgetData, MediaManagerItem, MediaManagerWidgetItem, MediaManagerWidgetJSON } from "../AbstractMediaManager";
 import { Adminizer } from "../../Adminizer";
 type PostParams = Record<string, string | number | boolean | object | string[] | number[] | null>;
+export declare function normalizeMediaManagerWidgetData(value: PostParams[string] | undefined, prop: string): MediaManagerWidgetData[];
+export declare function detachMediaManagerField(reqData: PostParams, rawReqData: PostParams, prop: string): void;
 /**
  * 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

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

@@ -1,3 +1,32 @@
+export function normalizeMediaManagerWidgetData(value, prop) {
+    if (value === undefined || value === null || value === "") {
+        return [];
+    }
+    if (typeof value === "string") {
+        let parsedValue;
+        try {
+            parsedValue = JSON.parse(value);
+        }
+        catch (error) {
+            throw new Error(`Error assign association-many mediamanager data for ${prop}, ${value}`);
+        }
+        if (parsedValue === null) {
+            return [];
+        }
+        if (!Array.isArray(parsedValue)) {
+            throw new Error(`Error assign association-many mediamanager data for ${prop}, ${value}`);
+        }
+        return parsedValue;
+    }
+    if (Array.isArray(value)) {
+        return value;
+    }
+    throw new Error(`Error assign association-many mediamanager data for ${prop}, ${JSON.stringify(value)}`);
+}
+export function detachMediaManagerField(reqData, rawReqData, prop) {
+    rawReqData[prop] = normalizeMediaManagerWidgetData(reqData[prop], prop);
+    delete reqData[prop];
+}
 /**
  * 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
@@ -23,7 +52,7 @@ export async function saveRelationsMediaManager(adminizer, fields, reqData, mode
         let fieldConfigConfig = fields[prop].config;
         let options = fieldConfigConfig.options;
         if (fieldConfigConfig.type === 'mediamanager') {
-            let data = reqData[prop];
+            const data = normalizeMediaManagerWidgetData(reqData[prop], prop);
             let mediaManager = adminizer.mediaManagerHandler.get(options?.id ?? 'default');
             await mediaManager.setRelations(data, model, recordId, prop);
         }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.5.0-build.194",
+  "version": "4.5.0-build.196",
   "main": "index.js",
   "exports": {
     ".": "./index.js",
-    "./lib/*": "./dist/lib/*.js",
+    "./lib/DataAccessor": "./dist/lib/DataAccessor.js",
     "./ui/*": "./dist/ui/components/ui/*.js"
   },
   "scripts": {