adminizer 4.3.0-build.86 → 4.3.0-build.88

package/controllers/add.js

@@ -1,7 +1,7 @@
 import { ControllerHelper } from "../helpers/controllerHelper";
 import { RequestProcessor } from "../lib/requestProcessor";
 import { FieldsHelper } from "../helpers/fieldsHelper";
-import { saveRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper";
+// import {saveRelationsMediaManager} from "../lib/media-manager/helpers/MediaManagerHelper";
 import { DataAccessor } from "../lib/DataAccessor";
 import { Adminizer } from "../lib/Adminizer";
 import inertiaAddHelper from "../helpers/inertiaAddHelper";
@@ -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(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

@@ -1,7 +1,9 @@
 import { ControllerHelper } from "../helpers/controllerHelper";
 import { RequestProcessor } from "../lib/requestProcessor";
 import { FieldsHelper } from "../helpers/fieldsHelper";
-import { getRelationsMediaManager, saveRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper";
+import { getRelationsMediaManager,
+// saveRelationsMediaManager
+ } from "../lib/media-manager/helpers/MediaManagerHelper";
 import { DataAccessor } from "../lib/DataAccessor";
 import { Adminizer } from "../lib/Adminizer";
 import inertiaAddHelper from "../helpers/inertiaAddHelper";
@@ -27,8 +29,8 @@ export default async function edit(req, res) {
     }
     let record;
     let dataAccessor;
+    const id = req.params.id;
     try {
-        const id = req.params.id;
         dataAccessor = new DataAccessor(req.adminizer, req.user, entity, "edit");
         record = await entity.model.findOne({ id: id }, dataAccessor);
         if (!record)
@@ -112,7 +114,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(fields, rawReqData, entity.model.identity, newRecord[0].id)
             Adminizer.log.debug(`Record was updated: `, newRecord);
             if (req.body.jsonPopupCatalog) {
                 return res.json({ record: newRecord });

package/controllers/form.js

@@ -1,6 +1,7 @@
 import { FormHelper } from "../helpers/formHelper";
 import { Adminizer } from "../lib/Adminizer";
 import inertiaFormHelper from "../helpers/inertiaFromHelper";
+import { getRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper";
 export default async function form(req, res) {
     let slug = req.params.slug;
     // Check slug
@@ -54,7 +55,15 @@ export default async function form(req, res) {
     }
     for (let key of Object.keys(form)) {
         try {
-            form[key].value = await req.adminizer.config.forms.get(slug, key);
+            if (key === 'mediamanager') {
+                form[key].value = await getRelationsMediaManager({
+                    list: await req.adminizer.config.forms.get(slug, key),
+                    mediaManagerId: form[key].options?.id ?? "default"
+                });
+            }
+            else {
+                form[key].value = await req.adminizer.config.forms.get(slug, key);
+            }
         }
         catch (e) {
             Adminizer.log.silly(`'${slug}' property was not found in storage, using source file`);

package/controllers/remove.js

@@ -1,5 +1,4 @@
 import { ControllerHelper } from "../helpers/controllerHelper";
-import { deleteRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper";
 import { DataAccessor } from "../lib/DataAccessor";
 import { Adminizer } from "../lib/Adminizer";
 export default async function remove(req, res) {
@@ -62,7 +61,7 @@ export default async function remove(req, res) {
         destroyedRecord = await entity.model.destroy(q, dataAccessor);
         console.log(destroyedRecord[0]);
         // delete relations media manager
-        await deleteRelationsMediaManager(req.adminizer, entity.name, destroyedRecord);
+        // await deleteRelationsMediaManager(req.adminizer, entity.name, destroyedRecord)
     }
     catch (e) {
         Adminizer.log.error('adminpanel > error', e);

package/helpers/formHelper.js

@@ -22,7 +22,9 @@ export class FormHelper {
                 }
                 let form = path.basename(formJson, '.json');
                 try {
-                    adminizer.config.forms.data[form] = require(`${formsDirectoryPath}/${formJson}`);
+                    const filePath = path.join(formsDirectoryPath, formJson);
+                    const fileContent = fs.readFileSync(filePath, 'utf-8');
+                    adminizer.config.forms.data[form] = JSON.parse(fileContent);
                 }
                 catch (error) {
                     Adminizer.log.error(`Adminpanel > Error when reading ${formJson}: ${error}`);

package/helpers/inertiaFromHelper.js

@@ -1,4 +1,5 @@
 import { inputText, setSelectMany, getControlsOptions } from "./inertiaAddHelper";
+import { MediaManagerHandler } from "../lib/media-manager/MediaManagerHandler";
 export default function inertiaFormHelper(req, postLink, formData) {
     let props = {
         fields: [],
@@ -71,6 +72,17 @@ export default function inertiaFormHelper(req, postLink, formData) {
             fieldType = 'geoJson';
             options = getControlsOptions(field, req, fieldType, 'leaflet');
         }
+        if (type === 'mediamanager') {
+            const mOptions = field.options;
+            const mediaManager = MediaManagerHandler.get(mOptions.id || 'default');
+            if (!mediaManager) {
+                options = {};
+            }
+            else {
+                fieldType = 'mediamanager';
+                options = mOptions;
+            }
+        }
         props.fields.push({
             label: label,
             tooltip: tooltip,

package/interfaces/types.d.ts

@@ -23,7 +23,7 @@ export interface PropsField {
     disabled?: boolean;
     required?: boolean;
     isIn?: string[] | number[] | boolean[];
-    options?: Record<string, unknown> | Record<string, unknown>[];
+    options?: Record<string, any> | Record<string, any>[];
 }
 export interface DiffChanges {
     field: string;

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

@@ -192,23 +192,7 @@ export declare abstract class AbstractMediaManager {
         data: MediaManagerItem[];
         next: boolean;
     }>;
-    /**
-     * Save Relations.
-     * @param data
-     * @param model model in which a mediafile connection was added
-     * @param modelId Id in the model in which the mediafile was added
-     * @param widgetName
-     */
-    abstract setRelations(data: MediaManagerWidgetData[], 
-    /**
-     * widget model in which a mediafile connection was added
-     */
-    model: string, 
-    /**
-     * widget Id in the model in which the mediafile was added
-     */
-    modelId: string, widgetName: string): Promise<void>;
-    abstract getRelations(items: MediaManagerWidgetItem[]): Promise<MediaManagerWidgetClientItem[]>;
+    abstract getItemsList(items: MediaManagerWidgetItem[]): Promise<MediaManagerWidgetClientItem[]>;
     /**
      * Search all items.
      * If not this.allowSearch = true then it will not come here

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

@@ -1,9 +1,8 @@
-import { AbstractMediaManager, MediaManagerItem, File, MediaManagerWidgetItem, MediaManagerWidgetData, MediaManagerWidgetClientItem, SortCriteria } from "./AbstractMediaManager";
+import { AbstractMediaManager, MediaManagerItem, File, MediaManagerWidgetItem, MediaManagerWidgetClientItem, SortCriteria } from "./AbstractMediaManager";
 import { Adminizer } from "../Adminizer";
 export declare class DefaultMediaManager extends AbstractMediaManager {
     readonly itemTypes: File<MediaManagerItem>[];
     model: string;
-    modelAssoc: string;
     id: string;
     protected readonly adminizer: Adminizer;
     constructor(adminizer: Adminizer, id: string, urlPathPrefix: string, fileStoragePath: string);
@@ -12,6 +11,5 @@ 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>;
-    getRelations(items: MediaManagerWidgetItem[]): Promise<MediaManagerWidgetClientItem[]>;
+    getItemsList(items: MediaManagerWidgetItem[]): Promise<MediaManagerWidgetClientItem[]>;
 }

package/lib/media-manager/DefaultMediaManager.js

@@ -4,7 +4,7 @@ import { ApplicationItem, ImageItem, TextItem, VideoItem } from "./Items";
 export class DefaultMediaManager extends AbstractMediaManager {
     itemTypes = [];
     model = "mediamanagerap";
-    modelAssoc = "mediamanagerassociationsap";
+    // public modelAssoc: string = "mediamanagerassociationsap";
     id;
     adminizer;
     constructor(adminizer, id, urlPathPrefix, fileStoragePath) {
@@ -19,7 +19,7 @@ export class DefaultMediaManager extends AbstractMediaManager {
         this.adminizer = adminizer;
     }
     async getAll(limit, skip, sort, group) {
-        // TODO refactor CRUD functions for DataAccessor usage
+        //TODO refactor CRUD functions for DataAccessor usage
         let data = await this.adminizer.modelHandler.model.get(this.model)["_find"]({
             where: { parent: null, group: group },
             limit: limit,
@@ -41,7 +41,7 @@ export class DefaultMediaManager extends AbstractMediaManager {
         };
     }
     async searchAll(s, group) {
-        // TODO refactor CRUD functions for DataAccessor usage
+        //TODO refactor CRUD functions for DataAccessor usage
         let data = await this.adminizer.modelHandler.model.get(this.model)["_find"]({
             where: { filename: { contains: s }, parent: null, group: group },
             sort: "createdAt DESC",
@@ -55,34 +55,33 @@ export class DefaultMediaManager extends AbstractMediaManager {
         }
         return data;
     }
-    async setRelations(data, model, modelId, widgetName) {
-        // TODO refactor CRUD functions for DataAccessor usage
-        let modelAssociations = await this.adminizer.modelHandler.model.get(this.modelAssoc)["_find"]({
-            where: { modelId: modelId, model: model, widgetName: widgetName },
-        });
-        for (const modelAssociation of modelAssociations) {
-            const q = {};
-            const pk = this.adminizer.modelHandler.model.get(this.modelAssoc).primaryKey;
-            q[pk] = modelAssociation.id;
-            // TODO refactor CRUD functions for DataAccessor usage
-            await this.adminizer.modelHandler.model.get(this.modelAssoc)["_destroy"](q);
-        }
-        for (const [key, widgetItem] of data.entries()) {
-            // TODO refactor CRUD functions for DataAccessor usage
-            await this.adminizer.modelHandler.model.get(this.modelAssoc)["_create"]({
-                mediaManagerId: this.id,
-                model: model,
-                modelId: modelId,
-                file: widgetItem.id,
-                widgetName: widgetName,
-                sortOrder: key + 1,
-            });
-        }
-    }
-    async getRelations(items) {
+    // public async setRelations(data: MediaManagerWidgetData[], model: string, modelId: string, widgetName: string,): Promise<void> {
+    //     let modelAssociations = await this.adminizer.modelHandler.model.get(this.modelAssoc)["_find"]({
+    //         where: {modelId: modelId, model: model, widgetName: widgetName},
+    //     });
+    //
+    //     for (const modelAssociation of modelAssociations) {
+    //         const q: Record<string, any> = {};
+    //         const pk = this.adminizer.modelHandler.model.get(this.modelAssoc).primaryKey;
+    //         q[pk] = modelAssociation.id;
+    //         await this.adminizer.modelHandler.model.get(this.modelAssoc)["_destroy"](q);
+    //     }
+    //
+    //     for (const [key, widgetItem] of data.entries()) {
+    //         await this.adminizer.modelHandler.model.get(this.modelAssoc)["_create"]({
+    //             mediaManagerId: this.id,
+    //             model: model,
+    //             modelId: modelId,
+    //             file: widgetItem.id,
+    //             widgetName: widgetName,
+    //             sortOrder: key + 1,
+    //         });
+    //     }
+    // }
+    async getItemsList(items) {
         let widgetItems = [];
         for (const item of items) {
-            // TODO refactor CRUD functions for DataAccessor usage
+            //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];

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

@@ -1,7 +1,5 @@
-import { Fields } from "../../../helpers/fieldsHelper";
-import { MediaManagerItem, MediaManagerWidgetItem, MediaManagerWidgetJSON } from "../AbstractMediaManager";
+import { MediaManagerItem, MediaManagerWidgetJSON } from "../AbstractMediaManager";
 import { Adminizer } from "../../Adminizer";
-type PostParams = Record<string, string | number | boolean | object | string[] | number[] | null>;
 /**
  * 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
@@ -16,15 +14,14 @@ 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>;
+/**
+ * Get realtions
+ * @param data
+ */
 export declare function getRelationsMediaManager(data: MediaManagerWidgetJSON): Promise<import("../AbstractMediaManager").MediaManagerWidgetClientItem[]>;
-export declare function deleteRelationsMediaManager(adminizer: Adminizer, model: string, record: {
-    [p: string]: string | MediaManagerWidgetItem[];
-}[]): Promise<void>;
 /**
  * @param adminizer
  * @param variants
  * @param model
  */
 export declare function populateVariants(adminizer: Adminizer, variants: MediaManagerItem[], model: string): Promise<MediaManagerItem[]>;
-export {};

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

@@ -18,42 +18,44 @@ export function randomFileName(filenameOrig, type, prefix) {
  * @param model
  * @param recordId
  */
-export async function saveRelationsMediaManager(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');
-            await mediaManager.setRelations(data, model, recordId, prop);
-        }
-    }
-}
-/*
-* Get realtions
-* @param data
-*/
+// export async function saveRelationsMediaManager(fields: Fields, reqData: PostParams, model: string, recordId: string) {
+//     for (let prop in reqData) {
+//         let fieldConfigConfig = fields[prop].config as BaseFieldConfig;
+//         let options = fieldConfigConfig.options as MediaManagerOptionsField;
+//         if (fieldConfigConfig.type === 'mediamanager') {
+//             let data = reqData[prop] as MediaManagerWidgetData[];
+//             let mediaManager = MediaManagerHandler.get(options?.id ?? 'default')
+//             await mediaManager.setRelations(data, model, recordId, prop)
+//         }
+//     }
+// }
+/**
+ * Get realtions
+ * @param data
+ */
 export async function getRelationsMediaManager(data) {
     let mediaManager = MediaManagerHandler.get(data.mediaManagerId);
-    return await mediaManager.getRelations(data.list ?? []);
-}
-/*
-* Delate Ralations
-* @param model
-* @param record
-*/
-export async function deleteRelationsMediaManager(adminizer, model, record) {
-    let config = adminizer.config.models[model];
-    for (const key of Object.keys(record[0])) {
-        let field = config.fields[key];
-        if (field && field.type === 'mediamanager') {
-            const option = field.options;
-            let mediaManager = MediaManagerHandler.get(option?.id ?? 'default');
-            let emptyData = [];
-            await mediaManager.setRelations(emptyData, model, record[0].id, key);
-        }
-    }
+    return await mediaManager.getItemsList(data.list ?? []);
 }
+// /**
+//  * Delate Ralations
+//  * @param model
+//  * @param record
+//  */
+// export async function deleteRelationsMediaManager(adminizer: Adminizer, model: string, record: {
+//     [p: string]: string | MediaManagerWidgetItem[]
+// }[]) {
+//     let config = adminizer.config.models[model] as ModelConfig
+//     for (const key of Object.keys(record[0])) {
+//         let field = config.fields[key] as BaseFieldConfig
+//         if (field && field.type === 'mediamanager') {
+//             const option = field.options as MediaManagerOptionsField
+//             let mediaManager = MediaManagerHandler.get(option?.id ?? 'default')
+//             let emptyData: MediaManagerWidgetData[] = []
+//             await mediaManager.setRelations(emptyData, model, record[0].id as string, key)
+//         }
+//     }
+// }
 /**
  * @param adminizer
  * @param variants

package/lib/notifications/GeneralNotificationService.js

@@ -26,6 +26,9 @@ export class GeneralNotificationService extends AbstractNotificationService {
                             if (this.adminizer.accessRightsHelper.hasPermission(`notification-${this.notificationClass}`, user)) {
                                 await this.createUserNotification(notificationDB.id, user.id);
                             }
+                            else {
+                                Adminizer.log.error(`[${this.notificationClass}] User ${user.id} doesn't have permission to receive this notification`);
+                            }
                         }
                         catch (error) {
                             Adminizer.log.error('Error creating UserNotificationAP:', error);

package/package.json

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