adminizer 4.3.0-build.88 → 4.3.0-build.90

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,9 +1,7 @@
 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";
@@ -114,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(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/remove.js

@@ -1,4 +1,5 @@
 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) {
@@ -61,7 +62,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/lib/media-manager/AbstractMediaManager.d.ts

@@ -192,6 +192,22 @@ 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 getItemsList(items: MediaManagerWidgetItem[]): Promise<MediaManagerWidgetClientItem[]>;
     /**
      * Search all items.

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

@@ -1,8 +1,9 @@
-import { AbstractMediaManager, MediaManagerItem, File, MediaManagerWidgetItem, MediaManagerWidgetClientItem, SortCriteria } from "./AbstractMediaManager";
+import { AbstractMediaManager, MediaManagerItem, File, MediaManagerWidgetItem, MediaManagerWidgetData, 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);
@@ -11,5 +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[]>;
 }

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";
-    // public modelAssoc: string = "mediamanagerassociationsap";
+    modelAssoc = "mediamanagerassociationsap";
     id;
     adminizer;
     constructor(adminizer, id, urlPathPrefix, fileStoragePath) {
@@ -55,29 +55,27 @@ export class DefaultMediaManager extends AbstractMediaManager {
         }
         return data;
     }
-    // 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 setRelations(data, model, modelId, widgetName) {
+        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;
+            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) {

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

@@ -1,5 +1,7 @@
-import { MediaManagerItem, MediaManagerWidgetJSON } from "../AbstractMediaManager";
+import { Fields } from "../../../helpers/fieldsHelper";
+import { MediaManagerItem, MediaManagerWidgetItem, 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
@@ -14,14 +16,24 @@ 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[]>;
+/**
+ * Delate Ralations
+ * @param model
+ * @param record
+ */
+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,17 +18,17 @@ export function randomFileName(filenameOrig, type, prefix) {
  * @param model
  * @param recordId
  */
-// 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)
-//         }
-//     }
-// }
+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
@@ -37,25 +37,23 @@ export async function getRelationsMediaManager(data) {
     let mediaManager = MediaManagerHandler.get(data.mediaManagerId);
     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)
-//         }
-//     }
-// }
+/**
+ * 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);
+        }
+    }
+}
 /**
  * @param adminizer
  * @param variants

package/migrations/umzug/0001.js

@@ -104,6 +104,8 @@ export async function up({ context }) {
     await context.createTable("groupapuserap", {
         UserAPId: { type: DataTypes.INTEGER, allowNull: false, references: { model: "userap", key: "id" } },
         GroupAPId: { type: DataTypes.INTEGER, allowNull: false, references: { model: "groupap", key: "id" } },
+        createdAt: { type: DataTypes.DATE, allowNull: false, defaultValue: DataTypes.NOW },
+        updatedAt: { type: DataTypes.DATE, allowNull: false, defaultValue: DataTypes.NOW },
     });
 }
 export async function down({ context }) {

package/package.json

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