adminizer 4.2.0-build.51 → 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

@@ -5,7 +5,6 @@ export declare class DefaultMediaManager extends AbstractMediaManager {
     model: string;
     modelAssoc: string;
     id: string;
-    path: string;
     protected readonly adminizer: Adminizer;
     constructor(adminizer: Adminizer, id: string, urlPathPrefix: string, fileStoragePath: string);
     getAll(limit: number, skip: number, sort: SortCriteria, group: string): Promise<{
@@ -13,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>;
+    setRelations(data: MediaManagerWidgetData[], model: string, modelId: string, widgetName: string): Promise<void>;
     getRelations(items: MediaManagerWidgetItem[]): Promise<MediaManagerWidgetClientItem[]>;
 }

package/lib/media-manager/DefaultMediaManager.js

@@ -6,13 +6,12 @@ export class DefaultMediaManager extends AbstractMediaManager {
     model = "mediamanagerap";
     modelAssoc = "mediamanagerassociationsap";
     id;
-    path;
     adminizer;
     constructor(adminizer, id, urlPathPrefix, fileStoragePath) {
         super(adminizer);
         this.id = id;
-        this.path = urlPathPrefix;
-        this.dir = fileStoragePath;
+        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));
@@ -27,7 +26,7 @@ export class DefaultMediaManager extends AbstractMediaManager {
             skip: skip,
             sort: sort,
         }, { populate: [["variants", { sort: sort }], ["meta", {}]] });
-        let next = await this.adminizer.modelHandler.model.get(this.model)["_count"]({
+        let next = await this.adminizer.modelHandler.model.get(this.model)["_find"]({
             where: { parent: null, group: group },
             limit: limit,
             skip: skip === 0 ? limit : skip + limit,
@@ -38,7 +37,7 @@ export class DefaultMediaManager extends AbstractMediaManager {
         }
         return {
             data: data,
-            next: !!next,
+            next: !!next.length,
         };
     }
     async searchAll(s, group) {
@@ -62,10 +61,13 @@ export class DefaultMediaManager extends AbstractMediaManager {
             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"](modelAssociation.id);
+            await this.adminizer.modelHandler.model.get(this.modelAssoc)["_destroy"](q);
         }
-        for (const [key, widgetItem] of data.list.entries()) {
+        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,

package/lib/media-manager/Items.js

@@ -23,7 +23,7 @@ export class ImageItem extends File {
             skip: skip,
             sort: sort,
         }, { populate: [["variants", { sort: sort }], ["meta", {}]] });
-        let next = await this.adminizer.modelHandler.model.get(this.model)['_count']({
+        let next = await this.adminizer.modelHandler.model.get(this.model)['_find']({
             where: { parent: null, mimeType: { contains: this.type }, group: group },
             limit: limit,
             skip: skip === 0 ? limit : skip + limit,
@@ -34,7 +34,7 @@ export class ImageItem extends File {
         }
         return {
             data: data,
-            next: !!next,
+            next: !!next.length,
         };
     }
     async search(s, group) {
@@ -58,7 +58,7 @@ export class ImageItem extends File {
             group: group,
             tag: "origin",
             filename: origFileName,
-            url: `/${this.path}/${filename}`,
+            url: `/${this.urlPathPrefix}/${filename}`,
         });
         await this.createMeta(parent.id);
         await this.addFileMeta(file.path, parent.id);
@@ -84,10 +84,10 @@ export class ImageItem extends File {
             let { width, height } = this.imageSizes[sizeKey];
             const buffer = fs.readFileSync(file.path);
             const image = sizeOf(buffer);
-            if (image.width < width ||
-                image.height < height)
+            if (image.width < width || image.height < height)
                 continue;
-            let newFile = await this.resizeImage(file.path, `${this.dir}${sizeName}`, width, height);
+            const output = `${this.fileStoragePath}/${this.urlPathPrefix}/${sizeName}`;
+            let newFile = await this.resizeImage(file.path, output, width, height);
             // TODO refactor CRUD functions for DataAccessor usage
             let newSize = await this.adminizer.modelHandler.model.get(this.model)["_create"]({
                 parent: parent.id,
@@ -95,11 +95,11 @@ export class ImageItem extends File {
                 size: newFile.size,
                 filename: parent.filename,
                 group: group,
-                path: `${this.dir}${sizeName}`,
+                path: output,
                 tag: `saze:${sizeKey}`,
-                url: `/${this.path}/${sizeName}`,
+                url: `/${this.urlPathPrefix}/${sizeName}`,
             });
-            await this.addFileMeta(`${this.dir}${sizeName}`, newSize.id);
+            await this.addFileMeta(output, newSize.id);
         }
     }
     async getOrigin(id) {
@@ -169,7 +169,7 @@ export class ImageItem extends File {
             group: group,
             tag: localeId ? `loc:${localeId}` : `size:${width}x${height}`,
             filename: parent.filename,
-            url: `/${this.path}/${filename}`,
+            url: `/${this.urlPathPrefix}/${filename}`,
         });
         await this.addFileMeta(file.path, item.id);
         // TODO refactor CRUD functions for DataAccessor usage
@@ -183,6 +183,12 @@ export class ImageItem extends File {
         // TODO refactor CRUD functions for DataAccessor usage
         await this.adminizer.modelHandler.model.get(this.model)["_destroy"](criteria);
         await deleteFile(record.path);
+        // Delete all variants
+        if (record.variants.length) {
+            for (const variant of record.variants) {
+                await deleteFile(variant.path);
+            }
+        }
     }
 }
 /*
@@ -200,7 +206,7 @@ export class TextItem extends ImageItem {
             group: group,
             filename: origFileName,
             tag: "origin",
-            url: `/${this.path}/${filename}`,
+            url: `/${this.urlPathPrefix}/${filename}`,
         });
         await this.createMeta(parent.id);
         // TODO refactor CRUD functions for DataAccessor usage
@@ -222,7 +228,7 @@ export class TextItem extends ImageItem {
             group: group,
             tag: localeId ? `loc:${localeId}` : `ver: ${variants.length + 1}`,
             filename: parent.filename,
-            url: `/${this.path}/${filename}`,
+            url: `/${this.urlPathPrefix}/${filename}`,
         });
         // TODO refactor CRUD functions for DataAccessor usage
         return (await this.adminizer.modelHandler.model.get(this.model)["_findOne"]({ where: { id: item.id } }));

package/lib/media-manager/Thumb.js

@@ -7,8 +7,7 @@ export class MediaManagerThumb {
         const manager = MediaManagerHandler.get(managerId);
         const path = await manager.getOrigin(id);
         const baseThumbPath = `${process.cwd()}/.tmp/thumbs`;
-        if (!await fileExists(baseThumbPath))
-            await fs.mkdir(baseThumbPath);
+        await fs.mkdir(baseThumbPath, { recursive: true });
         const thumb = `${baseThumbPath}/${id}_thumb.webp`;
         if (await fileExists(thumb)) {
             return await fs.readFile(thumb);

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

@@ -21,9 +21,10 @@ export function randomFileName(filenameOrig, type, prefix) {
 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(data.mediaManagerId);
+            let mediaManager = MediaManagerHandler.get(options?.id ?? 'default');
             await mediaManager.setRelations(data, model, recordId, prop);
         }
     }
@@ -34,7 +35,7 @@ export async function saveRelationsMediaManager(fields, reqData, model, recordId
 */
 export async function getRelationsMediaManager(data) {
     let mediaManager = MediaManagerHandler.get(data.mediaManagerId);
-    return await mediaManager.getRelations(data.list);
+    return await mediaManager.getRelations(data.list ?? []);
 }
 /*
 * Delate Ralations
@@ -48,10 +49,7 @@ export async function deleteRelationsMediaManager(adminizer, model, record) {
         if (field && field.type === 'mediamanager') {
             const option = field.options;
             let mediaManager = MediaManagerHandler.get(option?.id ?? 'default');
-            let emptyData = {
-                list: [],
-                mediaManagerId: ''
-            };
+            let emptyData = [];
             await mediaManager.setRelations(emptyData, model, record[0].id, key);
         }
     }

package/lib/v4/model/adapter/sequelize.js

@@ -158,8 +158,7 @@ export class SequelizeModel extends AbstractModel {
         for (const key in criteria) {
             const value = criteria[key];
             if (value === undefined ||
-                value === null ||
-                (typeof value === "object" && Object.keys(value).length === 0)) {
+                (typeof value === "object" && value !== null && Object.keys(value).length === 0)) {
                 continue;
             }
             // 🧠 Заменяем ключ на `via`, если это ассоциация
@@ -168,22 +167,36 @@ export class SequelizeModel extends AbstractModel {
             if (attr?.type === "association" && attr.via) {
                 targetKey = attr.via;
             }
-            if (typeof value === "object" && !Array.isArray(value)) {
+            if (value === null) {
+                result[targetKey] = { [Op.is]: null };
+            }
+            else if (typeof value === "object" && !Array.isArray(value)) {
                 const operatorEntries = Object.entries(value)
                     .filter(([_, v]) => v !== undefined && v !== null)
                     .map(([op, val]) => {
                     switch (op) {
-                        case "contains": return [Op.like, `%${val}%`];
-                        case "startsWith": return [Op.startsWith, val];
-                        case "endsWith": return [Op.endsWith, val];
-                        case ">": return [Op.gt, val];
-                        case ">=": return [Op.gte, val];
-                        case "<": return [Op.lt, val];
-                        case "<=": return [Op.lte, val];
-                        case "!=": return [Op.ne, val];
-                        case "in": return [Op.in, val];
-                        case "nin": return [Op.notIn, val];
-                        default: return [Op.eq, val];
+                        case "contains":
+                            return [Op.like, `%${val}%`];
+                        case "startsWith":
+                            return [Op.startsWith, val];
+                        case "endsWith":
+                            return [Op.endsWith, val];
+                        case ">":
+                            return [Op.gt, val];
+                        case ">=":
+                            return [Op.gte, val];
+                        case "<":
+                            return [Op.lt, val];
+                        case "<=":
+                            return [Op.lte, val];
+                        case "!=":
+                            return [Op.ne, val];
+                        case "in":
+                            return [Op.in, val];
+                        case "nin":
+                            return [Op.notIn, val];
+                        default:
+                            return [Op.eq, val];
                     }
                 });
                 if (operatorEntries.length > 0) {
@@ -360,7 +373,7 @@ export class SequelizeModel extends AbstractModel {
             include: includes
         });
         for (const inst of instances) {
-            //For each association, we call getxxx () once again    
+            //For each association, we call getxxx () once again
             for (const alias of assocNames) {
                 // @ts-ignore accessors is present
                 const getAccessor = this.model.associations[alias].accessors.get;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.2.0-build.51",
+  "version": "4.2.0-build.52",
   "main": "index.js",
   "exports": {
     ".": "./index.js",
@@ -12,6 +12,8 @@
     "test:watch": "vitest --reporter verbose",
     "start": "cross-env NO_SEED_DATA=true ORM=sequelize tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "dev": "cross-env VITE_ENV=dev ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "dev:no-seed": "cross-env VITE_ENV=dev NO_SEED_DATA=true ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "dev:no-seed-clean": "cross-env VITE_ENV=dev NO_SEED_DATA=true CLEAN_TMP=true ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "dev:waterline": "cross-env VITE_ENV=dev ORM=waterline tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "build:assets": "vite build",
     "compile:backend": "tsc -p src/tsconfig.json",
@@ -36,6 +38,7 @@
   "dependencies": {
     "@minoru/react-dnd-treeview": "^3.5.2",
     "@radix-ui/react-context-menu": "^2.2.15",
+    "@radix-ui/react-tabs": "^1.1.12",
     "body-parser": "^1.20.3",
     "chalk": "^5.4.1",
     "cmdk": "^1.1.1",
@@ -51,6 +54,7 @@
     "multer": "^1.4.5-lts.1",
     "next-themes": "^0.4.6",
     "password-hash": "^1.2.2",
+    "react-cropper": "^2.3.3",
     "react-dnd": "^16.0.1",
     "reflect-metadata": "^0.2.2",
     "sharp": "^0.33.5",

package/system/Router.js

@@ -76,8 +76,10 @@ export default class Router {
         /**
          * Media Manager
          */
-        adminizer.app.all(`/media-manager-uploader/:id`, adminizer.policyManager.bindPolicies(policies, mediaManagerController));
-        adminizer.app.all(`/get-thumbs`, adminizer.policyManager.bindPolicies(policies, thumbController));
+        adminizer.app.post(`${adminizer.config.routePrefix}/media-manager-uploader/:id/upload`, adminizer.policyManager.bindPolicies(policies, mediaManagerController));
+        adminizer.app.post(`${adminizer.config.routePrefix}/media-manager-uploader/:id/upload-variant`, adminizer.policyManager.bindPolicies(policies, mediaManagerController));
+        adminizer.app.all(`${adminizer.config.routePrefix}/media-manager-uploader/:id`, adminizer.policyManager.bindPolicies(policies, mediaManagerController));
+        adminizer.app.all(`${adminizer.config.routePrefix}/get-thumbs`, adminizer.policyManager.bindPolicies(policies, thumbController));
         /**
          * List of records
          */

package/system/bindExpressUtils.js

@@ -14,7 +14,7 @@ export default function bindExpressUtils(app) {
         },
     }));
     /** Bind multer (important: before body-parser) */
-    app.use(upload.none()); // Processes form-data without files
+    // app.use(upload.none()); // Processes form-data without files
     /** Bind body-parser */
     app.use(bodyParser.urlencoded({ extended: true })); // To process application/x-www-form-urlencoded
     app.use(bodyParser.json()); // To process JSON

package/system/bindMediaManager.js

@@ -1,14 +1,19 @@
 import { DefaultMediaManager } from "../lib/media-manager/DefaultMediaManager";
 import { MediaManagerHandler } from "../lib/media-manager/MediaManagerHandler";
+import serveStatic from "serve-static";
+import path from "path";
 export default function bindMediaManager(adminizer) {
-    adminizer.emitter.on("orm:loaded", async () => {
+    adminizer.emitter.on("adminizer:loaded", async () => {
         try {
-            // TODO paths problem, default media manager path should be get by config
-            let mediaManager = new DefaultMediaManager(adminizer, 'default', 'media-manager', `${process.cwd()}/.tmp/public/media-manager/`);
+            let mediaManager = new DefaultMediaManager(adminizer, 'default', 'media-manager', adminizer.config.mediamanager.fileStoragePath);
             MediaManagerHandler.add(mediaManager);
         }
         catch (e) {
             console.log(e);
         }
     });
+    // Bind media manager public folder
+    adminizer.app.use(`/public`, serveStatic(adminizer.config.mediamanager.fileStoragePath));
+    // Bind file icons
+    adminizer.app.use(`${adminizer.config.routePrefix}/fileicons`, serveStatic(path.join(import.meta.dirname, '../fileicons')));
 }

package/system/bindReqFunctions.js

@@ -1,5 +1,4 @@
 import { Adminizer } from "../lib/Adminizer";
-import multer from "multer";
 import { I18n } from "../lib/v4/I18n";
 import { parse } from "cookie";
 import { verifyUser } from "../lib/v4/helper/jwt";
@@ -13,19 +12,21 @@ export default function bindReqFunctions(adminizer) {
          * Function to upload files using multer.
          * Filename can be set dynamically based on you filename using simple function
          * */
-        req.upload = (options) => {
-            const storage = multer.diskStorage({
-                destination: (req, file, cb) => {
-                    const destination = options?.destination || "uploads/";
-                    cb(null, destination);
-                },
-                filename: (req, file, cb) => {
-                    const filename = options?.filename?.(file) || `${Date.now()}-${file.originalname}`;
-                    cb(null, filename);
-                },
-            });
-            return multer({ storage });
-        };
+        // req.upload = (options?: { destination?: string; filename?: (file: Express.Multer.File) => string }) => {
+        //     const storage = multer.diskStorage({
+        //         destination: (req, file, cb) => {
+        //             const destination = options?.destination || "uploads/";
+        //             cb(null, destination);
+        //         },
+        //         filename: (req, file, cb) => {
+        //             const filename =
+        //                 options?.filename?.(file) || `${Date.now()}-${file.originalname}`;
+        //             cb(null, filename);
+        //         },
+        //     });
+        //
+        //     return multer({storage});
+        // };
         /**
          * Add i18n
          * */