adminizer 4.2.0-build.50 → 4.2.0-build.52

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

@@ -40,11 +40,7 @@ export interface MediaManagerWidgetJSON {
     mediaManagerId: string;
 }
 export interface MediaManagerWidgetData {
-    list: MediaManagerWidgetItem[];
-    /**
-     * @deprecated Apparently this is not needed here since it is in the field config settings
-     */
-    mediaManagerId: string;
+    id: string;
 }
 export type UploaderFile = Express.Multer.File;
 export interface imageSizes {
@@ -56,22 +52,22 @@ export interface imageSizes {
 export type MediaFileType = "application" | "audio" | "example" | "image" | "message" | "model" | "multipart" | "text" | "video";
 export declare abstract class File<T extends MediaManagerItem> {
     abstract type: MediaFileType;
-    path: string;
-    dir: string;
+    urlPathPrefix: string;
+    fileStoragePath: string;
     model: string;
     metaModel: string;
     /**
      *
-     * @param path
-     * @param dir
+     * @param urlPathPrefix
+     * @param fileStoragePath
      */
-    constructor(urlPathPrefix: string, fileStoragePath: string);
+    protected constructor(urlPathPrefix: string, fileStoragePath: string);
     /**
      * Upload a file.
      * @param file
      * @param filename
      * @param origFileName
-     * @param imageSizes
+     * @param group
      */
     abstract upload(file: UploaderFile, filename: string, origFileName: string, group?: string): Promise<T[]>;
     /**
@@ -100,7 +96,8 @@ export declare abstract class File<T extends MediaManagerItem> {
      * @param item
      * @param file
      * @param fileName
-     * @param config
+     * @param group
+     * @param localeId
      */
     abstract uploadVariant(item: MediaManagerItem, file: UploaderFile, fileName: string, group?: string, localeId?: string): Promise<MediaManagerItem>;
     /**
@@ -141,9 +138,10 @@ export declare abstract class File<T extends MediaManagerItem> {
 export declare abstract class AbstractMediaManager {
     uploadMaxBytes: number;
     uloadAllowedTypes: string[];
-    dir: string;
+    fileStoragePath: string;
+    urlPathPrefix: string;
     /**
-     
+
      */
     allowSearch: boolean;
     /**⚠️ above the settings that need to be implemented*/
@@ -162,7 +160,6 @@ export declare abstract class AbstractMediaManager {
      * @param file
      * @param filename
      * @param origFileName
-     * @param imageSizes
      * @param group
      */
     upload(file: UploaderFile, filename: string, origFileName: string, group?: string): Promise<MediaManagerItem[]>;
@@ -189,7 +186,7 @@ export declare abstract class AbstractMediaManager {
      * @param limit
      * @param skip
      * @param sort
-     * @param group?
+     * @param group
      */
     getItems(type: string, limit: number, skip: number, sort: SortCriteria, group?: string): Promise<{
         data: MediaManagerItem[];
@@ -200,9 +197,9 @@ export declare abstract class AbstractMediaManager {
      * @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 modelAttribute
+     * @param widgetName
      */
-    abstract setRelations(data: MediaManagerWidgetData, 
+    abstract setRelations(data: MediaManagerWidgetData[], 
     /**
      * widget model in which a mediafile connection was added
      */
@@ -216,12 +213,14 @@ export declare abstract class AbstractMediaManager {
      * Search all items.
      * If not this.allowSearch = true then it will not come here
      * @param s
+     * @param group
      */
     abstract searchAll(s: string, group?: string): Promise<MediaManagerItem[]>;
     /**
      * Search items by type.
      * @param s
      * @param type
+     * @param group
      */
     searchItems(s: string, type: string, group?: string): Promise<MediaManagerItem[]>;
     /**
@@ -234,7 +233,8 @@ export declare abstract class AbstractMediaManager {
      * @param item
      * @param file
      * @param fileName
-     * @param config
+     * @param group
+     * @param localeId
      */
     uploadVariant(item: MediaManagerItem, file: UploaderFile, fileName: string, group?: string, localeId?: string): Promise<MediaManagerItem>;
     /**

package/lib/media-manager/AbstractMediaManager.js

@@ -1,16 +1,16 @@
 export class File {
-    path;
-    dir;
+    urlPathPrefix;
+    fileStoragePath;
     model;
     metaModel;
     /**
      *
-     * @param path
-     * @param dir
+     * @param urlPathPrefix
+     * @param fileStoragePath
      */
     constructor(urlPathPrefix, fileStoragePath) {
-        this.path = urlPathPrefix;
-        this.dir = fileStoragePath;
+        this.urlPathPrefix = urlPathPrefix;
+        this.fileStoragePath = fileStoragePath;
     }
 }
 /**
@@ -32,9 +32,10 @@ export class File {
 export class AbstractMediaManager {
     uploadMaxBytes;
     uloadAllowedTypes;
-    dir;
+    fileStoragePath;
+    urlPathPrefix;
     /**
-     
+
      */
     allowSearch;
     itemTypes = [];
@@ -59,7 +60,6 @@ export class AbstractMediaManager {
      * @param file
      * @param filename
      * @param origFileName
-     * @param imageSizes
      * @param group
      */
     upload(file, filename, origFileName, group) {
@@ -87,7 +87,7 @@ export class AbstractMediaManager {
      * @param limit
      * @param skip
      * @param sort
-     * @param group?
+     * @param group
      */
     getItems(type, limit, skip, sort, group) {
         return this.getItemType(type)?.getItems(limit, skip, sort, group);
@@ -96,6 +96,7 @@ export class AbstractMediaManager {
      * Search items by type.
      * @param s
      * @param type
+     * @param group
      */
     searchItems(s, type, group) {
         return this.getItemType(type)?.search(s, group);
@@ -113,7 +114,8 @@ export class AbstractMediaManager {
      * @param item
      * @param file
      * @param fileName
-     * @param config
+     * @param group
+     * @param localeId
      */
     uploadVariant(item, file, fileName, group, localeId) {
         const parts = item.mimeType.split("/");

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

@@ -0,0 +1,17 @@
+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);
+    getAll(limit: number, skip: number, sort: SortCriteria, group: string): Promise<{
+        data: MediaManagerItem[];
+        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[]>;
+}

package/lib/media-manager/DefaultMediaManager.js

@@ -1,125 +1,98 @@
-"use strict";
-// import {
-//   AbstractMediaManager,
-//   MediaManagerItem,
-//   File,
-//   MediaManagerWidgetItem,
-//   MediaManagerWidgetData,
-//   MediaManagerWidgetClientItem,
-//   SortCriteria,
-// } from "./AbstractMediaManager";
-// import {populateVariants} from "./helpers/MediaManagerHelper";
-// import {ApplicationItem, ImageItem, TextItem, VideoItem} from "./Items";
-// import {Adminizer} from "../Adminizer";
-//
-//
-// export class DefaultMediaManager extends AbstractMediaManager {
-//   public readonly itemTypes: File<MediaManagerItem>[] = [];
-//   public model: string = "mediamanagerap";
-//   public modelAssoc: string = "mediamanagerassociationsap";
-//   id: string;
-//   path: string;
-//   protected readonly adminizer: Adminizer;
-//
-//   constructor(adminizer: Adminizer, id: string, urlPathPrefix: string, fileStoragePath: string) {
-//     super(adminizer);
-//     this.id = id;
-//     this.path = urlPathPrefix;
-//     this.dir = fileStoragePath;
-//     this.itemTypes.push(new ImageItem(adminizer, urlPathPrefix, fileStoragePath));
-//     this.itemTypes.push(new TextItem(adminizer, urlPathPrefix, fileStoragePath));
-//     this.itemTypes.push(new ApplicationItem(adminizer, urlPathPrefix, fileStoragePath));
-//     this.itemTypes.push(new VideoItem(adminizer, urlPathPrefix, fileStoragePath));
-//     this.adminizer = adminizer;
-//   }
-//
-//   public async getAll(limit: number, skip: number, sort: SortCriteria, group: string): Promise<{
-//     data: MediaManagerItem[];
-//     next: boolean
-//   }> {
-//     // TODO refactor CRUD functions for DataAccessor usage
-//     let data: MediaManagerItem[] = await this.adminizer.modelHandler.model.get(this.model)["_find"]({
-//       where: {parent: null, group: group},
-//       limit: limit,
-//       skip: skip,
-//       sort: sort,
-//     }, {populate: [["variants", {sort: sort}], ["meta", {}]]})
-//
-//     let next = await this.adminizer.modelHandler.model.get(this.model).count({
-//         where: {parent: null, group: group},
-//         limit: limit,
-//         skip: skip === 0 ? limit : skip + limit,
-//         sort: sort,
-//       })
-//
-//     for (let elem of data) {
-//       elem.variants = await populateVariants(this.adminizer, elem.variants, this.model)
-//     }
-//
-//     return {
-//       data: data,
-//       next: !!next,
-//     };
-//   }
-//
-//   public async searchAll(s: string, group: string): Promise<MediaManagerItem[]> {
-//     // TODO refactor CRUD functions for DataAccessor usage
-//     let data: MediaManagerItem[] = await this.adminizer.modelHandler.model.get(this.model)["_find"]({
-//       where: {filename: {contains: s}, parent: null, group: group},
-//       sort: "createdAt DESC",
-//     }, {
-//       populate: [["variants", {sort: "createdAt DESC"}], ["meta", {}]],
-//       // This limitation is made strictly, if your code solves this please make a PR
-//       limit: 1000
-//     })
-//
-//
-//     for (let elem of data) {
-//       elem.variants = await populateVariants(this.adminizer, elem.variants, this.model)
-//     }
-//
-//     return data;
-//   }
-//
-//   public async setRelations(data: MediaManagerWidgetData, model: string, modelId: string, widgetName: string,): Promise<void> {
-//     // 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) {
-//       // TODO refactor CRUD functions for DataAccessor usage
-//       await this.adminizer.modelHandler.model.get(this.modelAssoc)["_destroy"](modelAssociation.id)
-//     }
-//
-//     for (const [key, widgetItem] of data.list.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,
-//       });
-//     }
-//   }
-//
-//   public async getRelations(items: MediaManagerWidgetItem[],): Promise<MediaManagerWidgetClientItem[]> {
-//     let widgetItems: MediaManagerWidgetClientItem[] = [];
-//     for (const item of items) {
-//       // TODO refactor CRUD functions for DataAccessor usage
-//       let file: MediaManagerItem = (await this.adminizer.modelHandler.model.get(this.model)["_find"]({
-//         where: {id: item.id}
-//       }, {populate: [["variants", {sort: "createdAt DESC"}]]}))[0]
-//
-//       widgetItems.push({
-//         id: file.id,
-//         mimeType: file.mimeType,
-//         url: file.url,
-//         variants: file.variants,
-//       });
-//     }
-//     return widgetItems;
-//   }
-// }
+import { AbstractMediaManager, } from "./AbstractMediaManager";
+import { populateVariants } from "./helpers/MediaManagerHelper";
+import { ApplicationItem, ImageItem, TextItem, VideoItem } from "./Items";
+export class DefaultMediaManager extends AbstractMediaManager {
+    itemTypes = [];
+    model = "mediamanagerap";
+    modelAssoc = "mediamanagerassociationsap";
+    id;
+    adminizer;
+    constructor(adminizer, id, urlPathPrefix, fileStoragePath) {
+        super(adminizer);
+        this.id = id;
+        this.urlPathPrefix = urlPathPrefix;
+        this.fileStoragePath = fileStoragePath;
+        this.itemTypes.push(new ImageItem(adminizer, urlPathPrefix, fileStoragePath));
+        this.itemTypes.push(new TextItem(adminizer, urlPathPrefix, fileStoragePath));
+        this.itemTypes.push(new ApplicationItem(adminizer, urlPathPrefix, fileStoragePath));
+        this.itemTypes.push(new VideoItem(adminizer, urlPathPrefix, fileStoragePath));
+        this.adminizer = adminizer;
+    }
+    async getAll(limit, skip, sort, group) {
+        // 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,
+            skip: skip,
+            sort: sort,
+        }, { populate: [["variants", { sort: sort }], ["meta", {}]] });
+        let next = await this.adminizer.modelHandler.model.get(this.model)["_find"]({
+            where: { parent: null, group: group },
+            limit: limit,
+            skip: skip === 0 ? limit : skip + limit,
+            sort: sort,
+        });
+        for (let elem of data) {
+            elem.variants = await populateVariants(this.adminizer, elem.variants, this.model);
+        }
+        return {
+            data: data,
+            next: !!next.length,
+        };
+    }
+    async searchAll(s, group) {
+        // 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",
+        }, {
+            populate: [["variants", { sort: "createdAt DESC" }], ["meta", {}]],
+            // This limitation is made strictly, if your code solves this please make a PR
+            limit: 1000
+        });
+        for (let elem of data) {
+            elem.variants = await populateVariants(this.adminizer, elem.variants, this.model);
+        }
+        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) {
+        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];
+            widgetItems.push({
+                id: file.id,
+                mimeType: file.mimeType,
+                url: file.url,
+                variants: file.variants,
+            });
+        }
+        return widgetItems;
+    }
+}

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

@@ -0,0 +1,45 @@
+import { File, MediaFileType, MediaManagerItem, SortCriteria, UploaderFile } from "./AbstractMediaManager";
+import sharp from "sharp";
+import { Adminizer } from "../Adminizer";
+export declare class ImageItem extends File<MediaManagerItem> {
+    type: MediaFileType;
+    model: string;
+    metaModel: string;
+    imageSizes: any;
+    protected readonly adminizer: Adminizer;
+    constructor(adminizer: Adminizer, urlPathPrefix: string, fileStoragePath: string);
+    getItems(limit: number, skip: number, sort: SortCriteria, group: string): Promise<{
+        data: MediaManagerItem[];
+        next: boolean;
+    }>;
+    search(s: string, group: string): Promise<MediaManagerItem[]>;
+    upload(file: UploaderFile, filename: string, origFileName: string, group: string): Promise<MediaManagerItem[]>;
+    getVariants(id: string): Promise<MediaManagerItem[]>;
+    protected createVariants(file: UploaderFile, parent: MediaManagerItem, filename: string, group: string): Promise<void>;
+    getOrigin(id: string): Promise<string>;
+    protected createMeta(id: string): Promise<void>;
+    protected addFileMeta(file: string, id: string): Promise<void>;
+    getMeta(id: string): Promise<{
+        key: string;
+        value: string;
+    }[]>;
+    setMeta(id: string, data: {
+        [p: string]: string;
+    }): Promise<void>;
+    protected resizeImage(input: string, output: string, width: number, height: number): Promise<sharp.OutputInfo>;
+    uploadVariant(parent: MediaManagerItem, file: UploaderFile, filename: string, group: string, localeId: string): Promise<MediaManagerItem>;
+    delete(id: string): Promise<void>;
+}
+export declare class TextItem extends ImageItem {
+    type: MediaFileType;
+    upload(file: UploaderFile, filename: string, origFileName: string, group: string): Promise<MediaManagerItem[]>;
+    getvariants(): Promise<MediaManagerItem[]>;
+    uploadVariant(parent: MediaManagerItem, file: UploaderFile, filename: string, group: string, localeId: string): Promise<MediaManagerItem>;
+    getVariants(id: string): Promise<MediaManagerItem[]>;
+}
+export declare class ApplicationItem extends TextItem {
+    type: MediaFileType;
+}
+export declare class VideoItem extends TextItem {
+    type: MediaFileType;
+}