adminizer 4.4.0-build.154 → 4.4.0-build.155

package/controllers/media-manager/mediaManagerAdapter.js

@@ -73,7 +73,8 @@ export class MediaManagerAdapter {
             "No variants found": "",
             "Actions": "",
             "Yes": "",
-            "No": ""
+            "No": "",
+            'File type are not supported': ""
         };
         return Object.fromEntries(Object.keys(messages).map(key => [key, req.i18n.__(key)]));
     }

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

@@ -33,6 +33,7 @@ export interface MediaManagerWidgetClientItem extends MediaManagerWidgetItem {
      */
     mimeType: string;
     variants: MediaManagerItem[];
+    filename: string;
     url?: string;
 }
 export interface MediaManagerWidgetJSON {

package/lib/media-manager/DefaultMediaManager.js

@@ -92,6 +92,7 @@ export class DefaultMediaManager extends AbstractMediaManager {
             widgetItems.push({
                 id: file[fieldName].id,
                 mimeType: file[fieldName].mimeType,
+                filename: file[fieldName].filename,
                 url: file[fieldName].url,
                 variants: []
             });

package/lib/model/adapter/waterline.d.ts

@@ -8,7 +8,7 @@ export declare class WaterlineModel<T> extends AbstractModel<T> {
     /** Custom populate all function */
     private populateAll;
     protected _findOne(criteria: Partial<T>): Promise<T | null>;
-    protected _find(criteria?: Partial<T>, options?: FindOptions): Promise<T[]>;
+    protected _find(criteria?: Partial<any>, options?: FindOptions): Promise<T[]>;
     protected _updateOne(criteria: Partial<T>, data: Partial<T>): Promise<T | null>;
     protected _update(criteria: Partial<T>, data: Partial<T>): Promise<T[]>;
     protected _destroyOne(criteria: Partial<T>): Promise<T | null>;

package/lib/model/adapter/waterline.js

@@ -36,9 +36,20 @@ export class WaterlineModel extends AbstractModel {
         // Hack
         const attributes = this.model.attributes;
         const associations = Object.keys(attributes).filter(attr => attributes[attr].model || attributes[attr].collection);
-        //@ts-ignore
-        if (associations.includes(criteria?.sort?.split(' ')[0]) && JSON.stringify(criteria.where) === '{}')
-            criteria.sort = undefined;
+        if (JSON.stringify(criteria.where) === '{}') {
+            let sortField;
+            if (criteria?.sort) {
+                if (typeof criteria.sort === 'string') {
+                    sortField = criteria.sort.split(' ')[0];
+                }
+                else if (Array.isArray(criteria.sort)) {
+                    sortField = criteria.sort[0];
+                }
+            }
+            if (sortField && associations.includes(sortField)) {
+                criteria.sort = undefined;
+            }
+        }
         let query = this.model.find(criteria);
         if (options.populate && Array.isArray(options.populate) && options.populate.length > 0) {
             options.populate.forEach(([field, populateCriteria]) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.4.0-build.154",
+  "version": "4.4.0-build.155",
   "main": "index.js",
   "exports": {
     ".": "./index.js",

package/translations/en.json

@@ -3,10 +3,10 @@
   "Actions": "Actions",
   "All": "All",
   "Are you sure?": "Are you sure?",
-  "Back": "Back",
-  "Back to Login": "Back to Login",
-  "Additional login page": "Additional login page",
-  "Clean": "Clean",
+  "Back": "Back",
+  "Back to Login": "Back to Login",
+  "Additional login page": "Additional login page",
+  "Clean": "Clean",
   "Confirm Password": "Confirm Password",
   "Confirm Password*": "Confirm Password*",
   "Create": "Create",
@@ -139,5 +139,6 @@
   "W x H (orig.)": "W x H (orig.)",
   "Sizes/Ver": "Sizes/Ver",
   "Locales": "Locales",
-  "Date": "Date"
-}
+  "Date": "Date",
+  "File type are not supported": "File type are not supported"
+}

package/translations/ru.json

@@ -119,5 +119,6 @@
   "W x H (orig.)": "W x H (orig.)",
   "Sizes/Ver": "Sizes/Ver",
   "Locales": "Locales",
-  "Leave this field empty if you don't want to change the password": "Оставьте это поле пустым, если не хотите менять пароль"
+  "Leave this field empty if you don't want to change the password": "Оставьте это поле пустым, если не хотите менять пароль",
+  "File type are not supported": "Этот файл не поддерживается"
 }