adminizer 4.6.0 → 4.7.0-build.221

package/lib/model/internalModelAccessToken.d.ts

@@ -0,0 +1 @@
+export declare const INTERNAL_MODEL_ACCESS_TOKEN: unique symbol;

package/lib/model/internalModelAccessToken.js

@@ -0,0 +1 @@
+export const INTERNAL_MODEL_ACCESS_TOKEN = Symbol("InternalModelAccess");

package/lib/model/internalModelRepository.d.ts

@@ -0,0 +1,3 @@
+import { InternalModelRepository } from "../../interfaces/internalModelAccess";
+import { AbstractModel } from "./AbstractModel";
+export declare function createInternalModelRepository<T>(modelName: string, model: AbstractModel<T>): InternalModelRepository<T>;

package/lib/model/internalModelRepository.js

@@ -0,0 +1,4 @@
+import { INTERNAL_MODEL_ACCESS_TOKEN } from "./internalModelAccessToken.js";
+export function createInternalModelRepository(modelName, model) {
+    return model.createInternalRepository(INTERNAL_MODEL_ACCESS_TOKEN, modelName);
+}

package/lib/notifications/AbstractNotificationService.d.ts

@@ -56,6 +56,9 @@ export declare abstract class AbstractNotificationService extends EventEmitter {
     abstract readonly icon: string;
     abstract readonly iconColor: string;
     constructor(adminizer: Adminizer);
+    protected notificationModel(): import("../..").InternalModelRepository<any>;
+    protected userNotificationModel(): import("../..").InternalModelRepository<any>;
+    protected userModel(): import("../..").InternalModelRepository<UserAP>;
     private _bindAccessRight;
     /**
      * Registers a client for a user and associates it with a send function.

package/lib/notifications/AbstractNotificationService.js

@@ -53,6 +53,15 @@ export class AbstractNotificationService extends EventEmitter {
         this.adminizer = adminizer;
         this._bindAccessRight();
     }
+    notificationModel() {
+        return this.adminizer.modelHandler.internal("notifications").get("NotificationAP");
+    }
+    userNotificationModel() {
+        return this.adminizer.modelHandler.internal("notifications").get("UserNotificationAP");
+    }
+    userModel() {
+        return this.adminizer.modelHandler.internal("notifications").get("UserAP");
+    }
     _bindAccessRight() {
         setTimeout(() => {
             this.adminizer.accessRightsHelper.registerToken({
@@ -80,7 +89,6 @@ export class AbstractNotificationService extends EventEmitter {
         // We get the Map of the user's clients and add a new client
         const userClients = this.clients.get(userId);
         userClients.set(clientId, sendFn);
-        Adminizer.log.info(`[${this.notificationClass}] Client ${clientId} connected for user ${userId}. Total users: ${this.clients.size}, user clients: ${userClients.size}`);
     }
     /**
      * Removes a client from the internal tracking structure.
@@ -96,7 +104,6 @@ export class AbstractNotificationService extends EventEmitter {
                 if (userClients.size === 0) {
                     this.clients.delete(userId);
                 }
-                Adminizer.log.info(`[${this.notificationClass}] Client ${clientId} disconnected from user ${userId}. Total users: ${this.clients.size}`);
                 return;
             }
         }
@@ -177,9 +184,9 @@ export class AbstractNotificationService extends EventEmitter {
      * @returns {Promise<void>} A promise that resolves when the record is created or an error is logged.
      */
     async createUserNotification(notificationId, userId) {
-        if (this.adminizer.modelHandler.model.has('usernotificationap') && userId) {
+        if (userId) {
             try {
-                await this.adminizer.modelHandler.model.get('usernotificationap')["_create"]({
+                await this.userNotificationModel().create({
                     userId: userId,
                     notificationId: notificationId,
                     read: false
@@ -198,18 +205,15 @@ export class AbstractNotificationService extends EventEmitter {
      * @returns {Promise<any>} A promise that resolves with the found record or null if not found or an error occurs.
      */
     async getUserNotification(notificationId, userId) {
-        if (this.adminizer.modelHandler.model.has('usernotificationap')) {
-            try {
-                return await this.adminizer.modelHandler.model.get('usernotificationap')["_findOne"]({
-                    where: { notificationId: notificationId, userId: userId }
-                });
-            }
-            catch (error) {
-                Adminizer.log.error(`Error getting user notification:`, error);
-                return null;
-            }
+        try {
+            return await this.userNotificationModel().findOne({
+                where: { notificationId: notificationId, userId: userId }
+            });
+        }
+        catch (error) {
+            Adminizer.log.error(`Error getting user notification:`, error);
+            return null;
         }
-        return null;
     }
     /**
      * Retrieves a paginated list of notifications for a specific user, optionally filtered by read status.
@@ -220,17 +224,15 @@ export class AbstractNotificationService extends EventEmitter {
      * @returns {Promise<INotification[]>} A promise that resolves with an array of notification objects.
      */
     async getNotifications(userId, limit = 20, skip = 0, unreadOnly = false) {
-        if (!this.adminizer.modelHandler.model.has('notificationap')) {
-            return [];
-        }
         try {
             let query = { notificationClass: this.notificationClass };
             // If notifications are requested for a specific user, we obtain the user's notification ID
-            const userNotifications = await this.adminizer.modelHandler.model.get('usernotificationap')["_find"]({
+            const userNotifications = await this.userNotificationModel().find({
                 where: {
                     userId: userId
-                }
-            }, { populate: [['notificationId', {}]] });
+                },
+                populate: { notificationId: true }
+            });
             const notificationIds = userNotifications.map((un) => un.notificationId.id);
             if (unreadOnly) {
                 // Only unread
@@ -243,7 +245,7 @@ export class AbstractNotificationService extends EventEmitter {
             }
             if (query.id.length === 0)
                 return [];
-            const notificationsDB = await this.adminizer.modelHandler.model.get('notificationap')["_find"]({
+            const notificationsDB = await this.notificationModel().find({
                 where: query,
                 sort: 'createdAt DESC',
                 limit: limit,
@@ -288,15 +290,16 @@ export class AbstractNotificationService extends EventEmitter {
      */
     async search(s, userId) {
         try {
-            const userNotifications = await this.adminizer.modelHandler.model.get('usernotificationap')["_find"]({
+            const userNotifications = await this.userNotificationModel().find({
                 where: {
                     userId: userId
-                }
-            }, { populate: [['notificationId', {}]] });
+                },
+                populate: { notificationId: true }
+            });
             const notificationIds = userNotifications.map((un) => un.notificationId.id);
             if (notificationIds.length === 0)
                 return [];
-            const notificationsDB = await this.adminizer.modelHandler.model.get('notificationap')["_find"]({
+            const notificationsDB = await this.notificationModel().find({
                 where: {
                     message: { contains: s },
                     id: notificationIds,
@@ -321,8 +324,8 @@ export class AbstractNotificationService extends EventEmitter {
         try {
             const userNotification = await this.getUserNotification(id, userId);
             if (userNotification) {
-                await this.adminizer.modelHandler.model.get('usernotificationap')["_update"]({
-                    id: userNotification.id
+                await this.userNotificationModel().update({
+                    where: { id: userNotification.id }
                 }, { read: true });
             }
         }
@@ -337,11 +340,11 @@ export class AbstractNotificationService extends EventEmitter {
      */
     async markAllAsRead(userId) {
         try {
-            const userNotifications = await this.adminizer.modelHandler.model.get('usernotificationap')["_find"]({
+            const userNotifications = await this.userNotificationModel().find({
                 where: { userId: userId }
             });
             for (const userNotification of userNotifications) {
-                await this.adminizer.modelHandler.model.get('usernotificationap')["_update"]({
+                await this.userNotificationModel().update({
                     where: { id: userNotification.id },
                 }, { read: true });
             }
@@ -372,9 +375,10 @@ export class AbstractNotificationService extends EventEmitter {
             }
             // if unreadOnly = false - we get ALL records (both read and not)
             // We receive all user-notification communications
-            const userNotifications = await this.adminizer.modelHandler.model.get('usernotificationap')["_find"]({
-                where: whereClause
-            }, { populate: [['notificationId', {}]] });
+            const userNotifications = await this.userNotificationModel().find({
+                where: whereClause,
+                populate: { notificationId: true }
+            });
             if (userNotifications.length === 0)
                 return 0;
             // Filter by notification class using notificationId
@@ -384,9 +388,11 @@ export class AbstractNotificationService extends EventEmitter {
             if (validNotificationIds.length === 0)
                 return 0;
             // We recalculate only those whose notificationClass matches
-            return await this.adminizer.modelHandler.model.get('notificationap')["_count"]({
-                id: validNotificationIds,
-                notificationClass: this.notificationClass
+            return await this.notificationModel().count({
+                where: {
+                    id: validNotificationIds,
+                    notificationClass: this.notificationClass
+                }
             });
         }
         catch (error) {

package/lib/notifications/GeneralNotificationService.js

@@ -11,51 +11,48 @@ export class GeneralNotificationService extends AbstractNotificationService {
             notificationClass: this.notificationClass
         };
         let notificationDB;
-        // Save to the database
-        if (this.adminizer.modelHandler.model.has('notificationap')) {
-            try {
-                notificationDB = await this.adminizer.modelHandler.model.get('notificationap')["_create"](fullNotification);
-                if (notification.userId) {
-                    // For specific user
-                    await this.createUserNotification(notificationDB.id, notification.userId);
-                }
-                else {
-                    // For all users
-                    const users = await this.adminizer.modelHandler.model.get('userap')["_find"]({});
-                    for (const user of users) {
-                        try {
-                            if (this.adminizer.accessRightsHelper.hasPermission(`notification-${this.notificationClass}`, user)) {
-                                await this.createUserNotification(notificationDB.id, user.id);
-                            }
-                            else {
-                                Adminizer.log.error(`[${this.notificationClass}] User ${user.id} doesn't have permission to receive this notification`);
-                            }
+        try {
+            notificationDB = await this.notificationModel().create(fullNotification);
+            if (notification.userId) {
+                // For specific user
+                await this.createUserNotification(notificationDB.id, notification.userId);
+            }
+            else {
+                // For all users
+                const users = await this.userModel().find({});
+                for (const user of users) {
+                    try {
+                        if (this.adminizer.accessRightsHelper.hasPermission(`notification-${this.notificationClass}`, user)) {
+                            await this.createUserNotification(notificationDB.id, user.id);
                         }
-                        catch (error) {
-                            Adminizer.log.error('Error creating UserNotificationAP:', error);
+                        else {
+                            Adminizer.log.warn(`[${this.notificationClass}] User ${user.id} doesn't have permission to receive this notification`);
                         }
                     }
+                    catch (error) {
+                        Adminizer.log.error('Error creating UserNotificationAP:', error);
+                    }
                 }
-                const event = {
-                    type: 'notification',
-                    data: {
-                        ...notificationDB,
-                        read: false,
-                        icon: {
-                            icon: this.icon,
-                            iconColor: this.iconColor
-                        },
-                    },
-                    notificationClass: this.notificationClass,
-                    userId: notification.userId ?? null
-                };
-                this.broadcast(event);
-                Adminizer.log.info(`[General] Notification dispatched: ${fullNotification.title}`);
-                return true;
-            }
-            catch (error) {
-                Adminizer.log.error('Error saving notification to database:', error);
             }
+            const event = {
+                type: 'notification',
+                data: {
+                    ...notificationDB,
+                    read: false,
+                    icon: {
+                        icon: this.icon,
+                        iconColor: this.iconColor
+                    },
+                },
+                notificationClass: this.notificationClass,
+                userId: notification.userId ?? null
+            };
+            this.broadcast(event);
+            Adminizer.log.info(`[General] Notification dispatched: ${fullNotification.title}`);
+            return true;
+        }
+        catch (error) {
+            Adminizer.log.error('Error saving notification to database:', error);
         }
         return false;
     }

package/lib/notifications/SystemNotificationService.js

@@ -14,47 +14,44 @@ export class SystemNotificationService extends AbstractNotificationService {
             channel: notification.channel ?? ''
         };
         let notificationDB;
-        // Save to the database
-        if (this.adminizer.modelHandler.model.has('notificationap')) {
-            try {
-                notificationDB = await this.adminizer.modelHandler.model.get('notificationap')["_create"](fullNotification);
-                const users = await this.adminizer.modelHandler.model.get('userap')["_find"]({});
-                for (const user of users) {
-                    try {
-                        if (this.adminizer.accessRightsHelper.hasPermission(`notification-${this.notificationClass}`, user)) {
-                            await this.createUserNotification(notificationDB.id, user.id);
-                        }
-                    }
-                    catch (error) {
-                        Adminizer.log.error('Error creating UserNotificationAP:', error);
+        try {
+            notificationDB = await this.notificationModel().create(fullNotification);
+            const users = await this.userModel().find({});
+            for (const user of users) {
+                try {
+                    if (this.adminizer.accessRightsHelper.hasPermission(`notification-${this.notificationClass}`, user)) {
+                        await this.createUserNotification(notificationDB.id, user.id);
                     }
                 }
-                const event = {
-                    type: 'notification',
-                    data: {
-                        ...notificationDB,
-                        icon: {
-                            icon: this.icon,
-                            iconColor: this.iconColor
-                        },
-                    },
-                    notificationClass: this.notificationClass,
-                    userId: notification.userId ?? null,
-                    channel: notification.channel ?? 'system'
-                };
-                // Send to all channels or to a specific channel
-                if (notification.channel) {
-                    this.broadcastToChannel(notification.channel, event);
-                }
-                else {
-                    this.broadcastToChannel('system', event);
+                catch (error) {
+                    Adminizer.log.error('Error creating UserNotificationAP:', error);
                 }
-                Adminizer.log.info(`[System] Notification dispatched: ${fullNotification.title}`);
-                return true;
             }
-            catch (error) {
-                Adminizer.log.error('Error saving system notification to database:', error);
+            const event = {
+                type: 'notification',
+                data: {
+                    ...notificationDB,
+                    icon: {
+                        icon: this.icon,
+                        iconColor: this.iconColor
+                    },
+                },
+                notificationClass: this.notificationClass,
+                userId: notification.userId ?? null,
+                channel: notification.channel ?? 'system'
+            };
+            // Send to all channels or to a specific channel
+            if (notification.channel) {
+                this.broadcastToChannel(notification.channel, event);
+            }
+            else {
+                this.broadcastToChannel('system', event);
             }
+            Adminizer.log.info(`[System] Notification dispatched: ${fullNotification.title}`);
+            return true;
+        }
+        catch (error) {
+            Adminizer.log.error('Error saving system notification to database:', error);
         }
         return false;
     }

package/lib/requestProcessor.js

@@ -29,9 +29,6 @@ export class RequestProcessor {
         }
         for (let key in postParams) {
             let field = fields[key];
-            if (key === 'sort') {
-                console.log(fields[key], key, postParams[key]);
-            }
             // if (field.model.type === 'boolean') {
             //     postParams[key] = ['true', '1', 'yes', "TRUE", "on"].includes(postParams[key].toString().toLowerCase());
             //     continue;

package/lib/ui-i18n/getUiTranslations.d.ts

@@ -0,0 +1 @@
+export declare function getUiTranslations(req: ReqType, keys: readonly string[]): Record<string, string>;

package/lib/ui-i18n/getUiTranslations.js

@@ -0,0 +1,3 @@
+export function getUiTranslations(req, keys) {
+    return Object.fromEntries(keys.map((key) => [key, req.i18n.__(key)]));
+}

package/lib/ui-i18n/uiTranslationKeys.d.ts

@@ -0,0 +1,6 @@
+export declare const COMMON_UI_TRANSLATION_KEYS: readonly ["Delete", "Diff", "Preview", "Add", "Search", "Yes", "No", "On", "Off", "Hide", "Show", "No notifications found", "No notifications", "No widgets found", "Changes not found", "Old", "New", "Added", "Removed", "Updated", "changed type", "Error: Invalid field data", "Error: Fields data is invalid", "No fields to display", "Error: Some fields are missing required properties (name, type, label)", "Edit", "create", "Clean", "Are you sure?", "Select Item type", "Select Ids", "Open in a new window", "Visible", "Performing an action...", "Action completed", "Save", "First", "Last", "Previous", "Next", "Send feedback", "Feedback", "Title", "Description", "Attach files", "Send", "Sending...", "Feedback sent successfully", "Title is required", "File size exceeds the 5 MB limit", "Remove file", "Max 5 MB per file", "View All", "Make read", "Make all read", "Message", "Date", "Watch", "Current", "There is no history"];
+export declare const FILTER_UI_TRANSLATION_KEYS: readonly ["Filters", "Saved filters", "Active filter", "Add filter", "Reset filter", "Reset", "Equal", "Not equal", "Contains", "Not contains", "Starts with", "Ends with", "Is empty", "Is not empty", "Greater than", "Greater or equal", "Less than", "Less or equal", "Between", "After", "After or equal", "Before", "Before or equal", "In list", "Not in list", "Is null", "Is not null", "Yes", "No", "From", "To", "From...", "To...", "Date...", "Today", "Month", "Month range", "Year", "Year range", "Value...", "Select...", "selected", "Search...", "No results", "Error", "Model not found", "Error applying filter", "Enter filter name", "Temporary filter", "Error: model not found", "Error loading columns", "Network error", "Columns settings", "Available columns", "Visible columns", "Add all", "Hide all", "No available columns", "Move columns here", "Save changes", "Apply", "Save", "Back", "Cancel", "conditions", "modified", "Private filter", "For groups", "Public filter", "Only for you", "For selected groups", "For all users", "Visible only to you", "Visible only to your group", "API access (feed)", "Hide", "Show", "Regenerate", "copied to clipboard", "Failed to copy", "Loading filters...", "No saved filters", "Save current filter for quick access", "Someone else's private filter (owner:", "unknown)", "Owner", "Apply filter", "Delete filter", "No permission to delete filter", "Edit filter", "New filter", "Filter conditions", "Add condition", "Select field", "No conditions. Add a condition above.", "Name", "Description", "Icon", "Color", "Filter parameters", "Change filter conditions and parameters", "Configure filter conditions", "Specify name and parameters for saving", "Someone else's private filter", "You cannot change someone else's filter visibility", "Private", "Public", "Visibility", "Export", "Exporting...", "Export is only available with an active filter", "Export to", "completed", "Export error", "Data in JSON format", "Text format CSV", "Excel file", "Conditions", "Access for groups", "Selected groups", "Groups list", "Columns", "Saving...", "Error saving filter", "Column configuration", "Select and arrange columns to display in the table", "Loading columns...", "Use buttons", "to move and", "to change order", "Add", "Edit", "Save filter", "and", "Custom filtering", "Select a saved filter or create a new one", "Select a filter or create a new one", "Filter visibility", "Unknown", "JSON URL", "XML URL", "API key is not created", "The key is not created. Create it or contact an administrator.", "OK"];
+export declare const HISTORY_UI_TRANSLATION_KEYS: readonly ["Models", "All", "Users", "Date", "Pick a date", "Search", "Reset", "Model", "Name", "Event", "User", "Diff", "The end of the list has been reached", "There are no records to display"];
+export declare const HISTORY_TABLE_UI_TRANSLATION_KEYS: readonly ["Event", "Date", "User", "Watch", "Current", "There is no history", "Diff"];
+export declare const NOTIFICATION_UI_TRANSLATION_KEYS: readonly ["Make read", "View All", "Search", "Make all read", "Title", "Message", "Date", "Diff", "No notifications", "No notifications found", "The end of the list has been reached"];
+export declare const USER_FILTERS_UI_TRANSLATION_KEYS: readonly ["Loading...", "Search filters...", "All models", "No filters found", "Loading more...", "Filter Name", "Model", "Visibility", "API access (feed)", "Owner", "Private", "Public", "Groups", "Yes", "No", "You", "Unknown", "Reset", "found", "User Filters"];