adminizer 4.4.0-build.153 → 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/lib/notifications/AbstractNotificationService.d.ts

@@ -161,4 +161,29 @@ export declare abstract class AbstractNotificationService extends EventEmitter {
      * @returns {Promise<void>} A promise that resolves when the operation is complete.
      */
     markAllAsRead(userId: number): Promise<void>;
+    /**
+  * Returns the count of user notifications: all notifications or only unread ones.
+  * If unreadOnly is true, returns the number of unread notifications.
+  * If unreadOnly is false, returns the total number of notifications (read + unread) associated with the user.
+  *
+  * @param {number} userId - The ID of the user whose notification count is requested.
+  * @param {boolean} [unreadOnly=false] - If true, counts only unread notifications; if false, counts all notifications.
+  * @returns {Promise<number>} A promise that resolves with the number of matching notifications.
+  *
+  * @example
+  * const total = await service.getNotificationsCount(123); // all notifications
+  * const unreadCount = await service.getNotificationsCount(123, true); // only unread
+  */
+    getNotificationsCount(userId: number, unreadOnly?: boolean): Promise<number>;
+    /**
+     * Convenience method to get the number of unread notifications for a user.
+     * Equivalent to calling getNotificationsCount(userId, true).
+     *
+     * @param {number} userId - The ID of the user.
+     * @returns {Promise<number>} A promise that resolves with the number of unread notifications.
+     *
+     * @example
+     * const unread = await service.getUnreadNotificationsCount(123);
+     */
+    getUnreadNotificationsCount(userId: number): Promise<number>;
 }

package/lib/notifications/AbstractNotificationService.js

@@ -350,4 +350,61 @@ export class AbstractNotificationService extends EventEmitter {
             Adminizer.log.error('Error marking all notifications as read:', error);
         }
     }
+    /**
+  * Returns the count of user notifications: all notifications or only unread ones.
+  * If unreadOnly is true, returns the number of unread notifications.
+  * If unreadOnly is false, returns the total number of notifications (read + unread) associated with the user.
+  *
+  * @param {number} userId - The ID of the user whose notification count is requested.
+  * @param {boolean} [unreadOnly=false] - If true, counts only unread notifications; if false, counts all notifications.
+  * @returns {Promise<number>} A promise that resolves with the number of matching notifications.
+  *
+  * @example
+  * const total = await service.getNotificationsCount(123); // all notifications
+  * const unreadCount = await service.getNotificationsCount(123, true); // only unread
+  */
+    async getNotificationsCount(userId, unreadOnly = false) {
+        try {
+            // Формируем условие фильтрации по статусу прочтения
+            const whereClause = { userId: userId };
+            if (unreadOnly) {
+                whereClause.read = false; // только непрочитанные
+            }
+            // если unreadOnly = false — получаем ВСЕ записи (и прочитанные, и нет)
+            // Получаем все user-notification связи
+            const userNotifications = await this.adminizer.modelHandler.model.get('usernotificationap')["_find"]({
+                where: whereClause
+            }, { populate: [['notificationId', {}]] });
+            if (userNotifications.length === 0)
+                return 0;
+            // Фильтруем по классу уведомлений через notificationId
+            const validNotificationIds = userNotifications
+                .map((un) => un.notificationId.id)
+                .filter((id) => id != null);
+            if (validNotificationIds.length === 0)
+                return 0;
+            // Пересчитываем только те, у которых notificationClass совпадает
+            return await this.adminizer.modelHandler.model.get('notificationap')["_count"]({
+                id: validNotificationIds,
+                notificationClass: this.notificationClass
+            });
+        }
+        catch (error) {
+            Adminizer.log.error(`Error counting ${unreadOnly ? 'unread' : 'all'} notifications:`, error);
+            return 0;
+        }
+    }
+    /**
+     * Convenience method to get the number of unread notifications for a user.
+     * Equivalent to calling getNotificationsCount(userId, true).
+     *
+     * @param {number} userId - The ID of the user.
+     * @returns {Promise<number>} A promise that resolves with the number of unread notifications.
+     *
+     * @example
+     * const unread = await service.getUnreadNotificationsCount(123);
+     */
+    async getUnreadNotificationsCount(userId) {
+        return this.getNotificationsCount(userId, true);
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.4.0-build.153",
+  "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": "Этот файл не поддерживается"
 }