adminizer 4.5.0-build.187 → 4.5.0-build.189

package/controllers/catalog/FrontendCatalogAdapter.js

@@ -157,13 +157,13 @@ export class FrontendCatalog {
     async deleteItem(item, req) {
         if (item.id === 0)
             item.id = null;
-        // Получаем всех непосредственных потомков текущего элемента
+        // Get all immediate children of the current element
         const children = await this.catalog.getChilds(item.id, undefined, req);
-        // Рекурсивно удаляем всех потомков
+        // Recursively removing all children
         for (const child of children) {
             await this.deleteItem(child, req);
         }
-        // После удаления всех потомков удаляем сам элемент
+        // After deleting all descendants, delete the element itself
         await this.catalog.deleteItem(item.type, item.id, req);
         return { ok: true };
     }

package/controllers/catalog/FrontentCatalogAdapter.js

@@ -154,13 +154,13 @@ export class FrontendCatalog {
     async deleteItem(item, req) {
         if (item.id === 0)
             item.id = null;
-        // Получаем всех непосредственных потомков текущего элемента
+        // Get all immediate children of the current element
         const children = await this.catalog.getChilds(item.id, undefined, req);
-        // Рекурсивно удаляем всех потомков
+        // Recursively removing all children
         for (const child of children) {
             await this.deleteItem(child, req);
         }
-        // После удаления всех потомков удаляем сам элемент
+        // After deleting all descendants, delete the element itself
         await this.catalog.deleteItem(item.type, item.id, req);
         return { ok: true };
     }

package/controllers/history-actions/HistoryController.js

@@ -1,7 +1,8 @@
 import { Adminizer } from "../../lib/Adminizer.js";
 export class HistoryController {
     static async index(req, res) {
-        if (!HistoryController.checkHistoryPermission(req, res))
+        const isUiRequest = req.method.toUpperCase() === 'GET';
+        if (!HistoryController.checkHistoryPermission(req, res, isUiRequest))
             return;
         const adapter = HistoryController.getAdapter(req);
         if (req.method.toUpperCase() === 'GET') {
@@ -21,7 +22,7 @@ export class HistoryController {
             const models = rawModels.map(model => {
                 const normalizedModelName = model.toLowerCase();
                 const configModel = normalizedModelConfig.get(normalizedModelName);
-                const title = req.i18n.__(configModel?.title) ?? model; // если title нет — использовать оригинальное имя
+                const title = req.i18n.__(configModel?.title) ?? model; // if there is no title, use the original name
                 return {
                     name: model,
                     title
@@ -115,18 +116,25 @@ export class HistoryController {
         const adapter = req.adminizer.config.history?.adapter ?? 'default';
         return req.adminizer.historyHandler.get(adapter);
     }
-    static checkHistoryPermission(req, res) {
+    static checkHistoryPermission(req, res, shouldRedirectToLogin = false) {
         if (!req.adminizer?.historyHandler) {
             res.status(401).json({ error: 'History system not initialized' });
             return false;
         }
-        if (req.adminizer.config.auth.enable && !req.user) {
-            res.status(401).json({ error: 'Unauthorized' });
-            return false;
+        if (req.adminizer.config.auth.enable) {
+            if (!req.user) {
+                if (shouldRedirectToLogin) {
+                    res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
+                }
+                else {
+                    res.status(401).json({ error: 'Unauthorized' });
+                }
+                return false;
+            }
         }
         const hasPermission = req.adminizer.accessRightsHelper.hasPermission(`history-${req.adminizer.config.history?.adapter ?? 'default'}`, req.user);
         if (!hasPermission) {
-            res.status(403).json({ error: 'Forbidden' });
+            res.sendStatus(403);
             return false;
         }
         return true;

package/controllers/list.js

@@ -104,7 +104,7 @@ function setColumns(fields, orderColumn, direction, searchPairs, req) {
             title: req.i18n.__(field.config.title),
             data: String(i),
             direction: String(i) === orderColumn ? direction : undefined,
-            searchColumnValue: searchValue || undefined, // undefined, если поиска нет
+            searchColumnValue: searchValue || undefined, // undefined if there is no search
         };
         nodeTreeColumns.push({
             data: String(i),

package/controllers/media-manager/mediaManagerAdapter.js

@@ -200,9 +200,9 @@ export class MediaManagerAdapter {
     checkMIMEType(allowedTypes, type) {
         const [category] = type.split("/"); // "image/jpeg" → "image"
         const wildcardType = `${category}/*`; // "image/*"
-        // Разрешено, если:
-        // 1. Точное совпадение (например, "image/jpeg" в allowedTypes)
-        // 2. Разрешена вся категория (например, "image/*" в allowedTypes)
+        // Allowed if:
+        // 1. Exact match (e.g. "image/jpeg" in allowedTypes)
+        // 2. The entire category is allowed (for example, "image/*" in allowedTypes)
         return allowedTypes.includes(type) || allowedTypes.includes(wildcardType);
     }
 }

package/controllers/notifications/NotificationController.d.ts

@@ -1,9 +1,9 @@
 export declare class NotificationController {
     static search(req: ReqType, res: ResType): Promise<void>;
-    static viewAll(req: ReqType, res: ResType): Promise<import("express").Response<any, Record<string, any>>>;
-    static getNotificationClasses(req: ReqType, res: ResType): Promise<ResType>;
+    static viewAll(req: ReqType, res: ResType): Promise<void>;
+    static getNotificationClasses(req: ReqType, res: ResType): Promise<void>;
     static getNotificationsStream(req: ReqType, res: ResType): Promise<void>;
-    static getNotificationsByClass(req: ReqType, res: ResType): Promise<ResType>;
+    static getNotificationsByClass(req: ReqType, res: ResType): Promise<void>;
     static getUserNotifications(req: ReqType, res: ResType): Promise<void>;
     static markAsRead(req: ReqType, res: ResType): Promise<void>;
     static markAllAsRead(req: ReqType, res: ResType): Promise<void>;

package/controllers/notifications/NotificationController.js

@@ -1,7 +1,8 @@
 import { Adminizer } from '../../lib/Adminizer.js';
 export class NotificationController {
     static async search(req, res) {
-        NotificationController.checkNotifPermission(req, res);
+        if (!NotificationController.checkNotifPermission(req, res))
+            return;
         if (req.method.toUpperCase() === 'POST') {
             const { s, notificationClass } = req.body;
             const hasPermission = req.adminizer.accessRightsHelper.hasPermission(`notification-${notificationClass}`, req.user);
@@ -14,7 +15,9 @@ export class NotificationController {
         }
     }
     static async viewAll(req, res) {
-        NotificationController.checkNotifPermission(req, res);
+        const isUiRequest = req.method.toUpperCase() === 'GET';
+        if (!NotificationController.checkNotifPermission(req, res, isUiRequest))
+            return;
         if (req.method.toUpperCase() === 'POST') {
             const messages = {
                 "Make read": "",
@@ -27,82 +30,89 @@ export class NotificationController {
                 "Diff": "",
                 "The end of the list has been reached": "",
             };
-            return res.json(Object.fromEntries(Object.keys(messages).map(key => [key, req.i18n.__(key)])));
+            res.json(Object.fromEntries(Object.keys(messages).map(key => [key, req.i18n.__(key)])));
+            return;
         }
         if (req.method.toUpperCase() === 'GET') {
-            return req.Inertia.render({
+            req.Inertia.render({
                 component: 'notification',
                 props: {
                     title: req.i18n.__('Notifications'),
                 }
             });
+            return;
         }
-        return res.status(405);
+        res.status(405).end();
     }
     static async getNotificationClasses(req, res) {
-        NotificationController.checkNotifPermission(req, res);
-        if (req.adminizer.config.notifications.enabled === false)
-            return res.json([]);
+        if (!NotificationController.checkNotifPermission(req, res))
+            return;
+        if (req.adminizer.config.notifications.enabled === false) {
+            Adminizer.log.warn('[Notifications] Notifications disabled in config');
+            res.json([]);
+            return;
+        }
         const services = req.adminizer.notificationHandler.getAllServices();
         let activeServices = [];
         for (const service of services) {
-            // Получаем только клиентов текущего пользователя
-            const userClients = service.getUserClients(req.user.id);
-            if (userClients.size > 0) {
+            const hasPermission = req.adminizer.accessRightsHelper.hasPermission(`notification-${service.notificationClass}`, req.user);
+            if (hasPermission) {
                 activeServices.push({
                     displayName: req.i18n.__(service.displayName),
                     notificationClass: service.notificationClass,
                 });
             }
         }
-        return res.json({
+        res.json({
             activeServices: activeServices,
             initTab: req.adminizer.config?.notifications?.initTab || null
         });
     }
-    // Единый SSE endpoint для всех уведомлений
     static async getNotificationsStream(req, res) {
-        NotificationController.checkNotifPermission(req, res);
-        // Устанавливаем заголовки для SSE
+        if (!NotificationController.checkNotifPermission(req, res))
+            return;
         res.setHeader('Content-Type', 'text/event-stream');
-        res.setHeader('Cache-Control', 'no-cache');
+        res.setHeader('Cache-Control', 'no-cache, no-transform');
         res.setHeader('Connection', 'keep-alive');
+        res.setHeader('X-Accel-Buffering', 'no');
+        res.setHeader('Content-Encoding', 'identity');
         res.setHeader('Access-Control-Allow-Origin', '*');
         res.flushHeaders();
+        res.write(': stream-open\n\n');
         const clientId = `user-${req.user?.id}-${Date.now()}`;
-        // Функция для отправки событий клиенту
+        // Function for sending events to the client
         const sendEvent = (event) => {
-            // Фильтруем уведомления по правам пользователя
+            // Filtering notifications by user rights
             if (event.type === 'notification') {
                 const notificationClass = event.notificationClass;
-                // ЕДИНАЯ проверка прав через AccessRightsHelper
+                // UNIFIED rights check via AccessRightsHelper
                 const hasPermission = req.adminizer.accessRightsHelper.hasPermission(`notification-${notificationClass}`, req.user);
                 if (!hasPermission) {
-                    return; // Пользователь не имеет прав на этот класс уведомлений
+                    return; // The user does not have rights to this notification class
                 }
-                // Проверка персональных уведомлений (только для целевого пользователя)
+                // Checking personal notifications (target user only)
                 if (event.userId !== null && event.userId !== req.user.id) {
                     return;
                 }
             }
             res.write(`event: ${event.type}\n`);
             res.write(`data: ${JSON.stringify(event.data)}\n\n`);
+            res.flush?.();
         };
-        // Подключаем клиента ко всем сервисам
+        // We connect the client to all services
         const services = req.adminizer.notificationHandler.getAllServices();
         const allowedServices = services.filter(service => req.adminizer.accessRightsHelper.hasPermission(`notification-${service.notificationClass}`, req.user));
         allowedServices.forEach(service => {
             service.addClient(clientId, sendEvent, req.user);
-            // Для системного сервиса добавляем клиента в CRUD каналы
+            // For a system service, add a client to CRUD channels
             // if (service.notificationClass === 'system') {
             //     const systemService = service as SystemNotificationService;
-            //     // Добавляем клиента в основные CRUD каналы с указанием userId
+            //     // Add the client to the main CRUD channels indicating userId
             //     ['created', 'updated', 'deleted', 'system'].forEach(channel => {
             //         systemService.addClientToChannel(clientId, channel, req.user.id);
             //     });
             // }
         });
-        // Отправляем приветственное сообщение
         sendEvent({
             type: 'connected',
             data: {
@@ -110,12 +120,12 @@ export class NotificationController {
                 clientId: clientId
             }
         });
-        // Обработка закрытия соединения
+        // Handling connection closure
         req.on('close', () => {
-            // Отключаем клиента от всех сервисов
+            // Disconnecting the client from all services
             services.forEach(service => {
                 service.removeClient(clientId);
-                // Для системного сервиса удаляем из всех каналов
+                // For system service, remove from all channels
                 // if (service.notificationClass === 'system') {
                 //     const systemService = service as SystemNotificationService;
                 //     if (systemService.removeClientFromAllChannels) {
@@ -125,12 +135,11 @@ export class NotificationController {
             });
             res.end();
         });
-        // Heartbeat для поддержания соединения
+        // Heartbeat to keep you connected
         const heartbeatInterval = setInterval(() => {
             if (!res.writableEnded) {
-                services.forEach(service => {
-                    service.sendHeartbeat(clientId);
-                });
+                res.write(': keepalive\n\n');
+                res.flush?.();
             }
             else {
                 clearInterval(heartbeatInterval);
@@ -140,34 +149,39 @@ export class NotificationController {
             clearInterval(heartbeatInterval);
         });
     }
-    // API для получения уведомлений по классу
+    // API for receiving class notifications
     static async getNotificationsByClass(req, res) {
-        NotificationController.checkNotifPermission(req, res);
+        if (!NotificationController.checkNotifPermission(req, res))
+            return;
         try {
             const { notificationClass } = req.params;
             const { limit = 20, skip = 0, unreadOnly = false } = req.query;
-            // Проверяем права доступа
+            // Checking access rights
             const hasPermission = req.adminizer.accessRightsHelper.hasPermission(`notification-${notificationClass}`, req.user);
             if (!hasPermission) {
-                return res.status(403).json({ error: 'Forbidden' });
+                res.status(403).json({ error: 'Forbidden' });
+                return;
             }
             const service = req.adminizer.notificationHandler.getService(notificationClass);
-            if (!service)
-                return res.json({});
+            if (!service) {
+                res.json({});
+                return;
+            }
             const notifications = await service.getNotifications(req.user?.id, Number(limit), Number(skip), unreadOnly === 'true');
-            return res.json(notifications);
+            res.json(notifications);
         }
         catch (error) {
             Adminizer.log.error('Error getting notifications:', error);
-            return res.status(500).json({ error: 'Internal server error' });
+            res.status(500).json({ error: 'Internal server error' });
         }
     }
-    // API для получения всех уведомлений пользователя
+    // API for receiving all user notifications
     static async getUserNotifications(req, res) {
-        NotificationController.checkNotifPermission(req, res);
+        if (!NotificationController.checkNotifPermission(req, res))
+            return;
         const { limit = 4, skip = 0, unreadOnly = false } = req.query;
         try {
-            // Фильтруем сервисы по правам доступа
+            // Filtering services by access rights
             const services = req.adminizer.notificationHandler.getAllServices();
             const allowedServices = services.filter(service => req.adminizer.accessRightsHelper.hasPermission(`notification-${service.notificationClass}`, req.user));
             const allNotifications = [];
@@ -175,7 +189,7 @@ export class NotificationController {
                 const notifications = await service.getNotifications(req.user.id, Number(limit), Number(skip), unreadOnly === 'true');
                 allNotifications.push(...notifications);
             }
-            // Сортируем по дате создания
+            // Sort by creation date
             const sortedNotifications = allNotifications.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()).slice(0, Number(limit));
             res.json(sortedNotifications);
         }
@@ -184,9 +198,10 @@ export class NotificationController {
             res.status(500).json({ error: 'Internal server error' });
         }
     }
-    // API для пометки как прочитанного
+    // API for marking as read
     static async markAsRead(req, res) {
-        NotificationController.checkNotifPermission(req, res);
+        if (!NotificationController.checkNotifPermission(req, res))
+            return;
         try {
             const { notificationClass, id } = req.params;
             const service = req.adminizer.notificationHandler.getService(notificationClass);
@@ -199,7 +214,8 @@ export class NotificationController {
         }
     }
     static async markAllAsRead(req, res) {
-        NotificationController.checkNotifPermission(req, res);
+        if (!NotificationController.checkNotifPermission(req, res))
+            return;
         try {
             const services = req.adminizer.notificationHandler.getAllServices();
             for (const service of services) {
@@ -212,15 +228,21 @@ export class NotificationController {
             res.status(500).json({ error: 'Internal server error' });
         }
     }
-    static checkNotifPermission(req, res) {
+    static checkNotifPermission(req, res, shouldRedirectToLogin = false) {
         if (!req.adminizer?.notificationHandler) {
             res.status(500).json({ error: 'Notification system not initialized' });
-            return;
+            return false;
         }
-        // // Проверяем аутентификацию
+        // We use the redirect only for UI pages; API requests receive 401.
         if (req.adminizer.config.auth.enable && !req.user) {
-            res.status(401).json({ error: 'Unauthorized' });
-            return;
+            if (shouldRedirectToLogin) {
+                res.redirect(`${req.adminizer.config.routePrefix}/model/userap/login`);
+            }
+            else {
+                res.status(401).json({ error: 'Unauthorized' });
+            }
+            return false;
         }
+        return true;
     }
 }

package/helpers/diffHelpers.js

@@ -2,11 +2,11 @@ export function sanitizeForDiff(data) {
     if (!data)
         return {};
     const result = { ...data };
-    // Удаляем системные поля
+    // Removing system fields
     const systemFields = ['id', 'createdAt', 'updatedAt', 'deletedAt', '__v', '_id'];
     systemFields.forEach(field => delete result[field]);
-    // Очищаем чувствительные данные
-    // TODO: Вынести в переменные окружения или в конфиг
+    // Cleaning sensitive data
+    // TODO: Place in environment variables or config
     const sensitiveFields = ['password', 'token', 'secret', 'apiKey', 'creditCard'];
     sensitiveFields.forEach(field => {
         if (result[field] !== undefined) {
@@ -17,7 +17,7 @@ export function sanitizeForDiff(data) {
 }
 export function formatChanges(diffObj, oldData, newData, operation) {
     const changes = [];
-    // Специальная обработка для операции добавления
+    // Special handling for append operation
     if (operation === 'add') {
         for (const [key, value] of Object.entries(newData)) {
             if (value === '***HIDDEN***')
@@ -32,9 +32,9 @@ export function formatChanges(diffObj, oldData, newData, operation) {
         }
         return changes;
     }
-    // Стандартная обработка для remove и update
+    // Standard handling for remove and update
     for (const [key, value] of Object.entries(diffObj)) {
-        // Для добавленных полей (когда oldData[key] undefined)
+        // For added fields (when oldData[key] is undefined)
         if (oldData[key] === undefined && newData[key] !== undefined) {
             changes.push({
                 field: key,
@@ -44,7 +44,7 @@ export function formatChanges(diffObj, oldData, newData, operation) {
                 operation: 'add'
             });
         }
-        // Для удаленных полей (когда newData[key] undefined)
+        // For removed fields (when newData[key] is undefined)
         else if (newData[key] === undefined && oldData[key] !== undefined) {
             changes.push({
                 field: key,
@@ -54,7 +54,7 @@ export function formatChanges(diffObj, oldData, newData, operation) {
                 operation: 'remove'
             });
         }
-        // Для измененных полей
+        // For changed fields
         else {
             changes.push({
                 field: key,

package/index.d.ts

@@ -19,6 +19,8 @@ export * from "./lib/model/AbstractModel";
 export * from "./lib/model/adapter/waterline";
 export * from "./lib/model/adapter/sequelize";
 export * from "./lib/media-manager/AbstractMediaManager";
+export * from "./lib/controls/AbstractControls";
+export * from "./lib/controls/ControlsHandler";
 export * from "./lib/Adminizer";
 export * from "./models/GroupAP";
 export * from "./models/UserAP";

package/index.js

@@ -19,6 +19,8 @@ export * from "./lib/model/AbstractModel.js";
 export * from "./lib/model/adapter/waterline.js";
 export * from "./lib/model/adapter/sequelize.js";
 export * from "./lib/media-manager/AbstractMediaManager.js";
+export * from "./lib/controls/AbstractControls.js";
+export * from "./lib/controls/ControlsHandler.js";
 export * from "./lib/Adminizer.js";
 export * from "./models/GroupAP.js";
 export * from "./models/UserAP.js";

package/lib/Adminizer.js

@@ -226,7 +226,7 @@ export class Adminizer {
          */
         this._emitter.emit('adminizer:loaded');
     }
-    // Хелпер для отправки уведомлений
+    // Helper for sending notifications
     async sendNotification(notification) {
         if (this.config.notifications.enabled) {
             const notificationClass = notification.notificationClass || 'general';

package/lib/history-actions/AbstractHistoryAdapter.js

@@ -144,12 +144,12 @@ export class AbstractHistoryAdapter {
                     accessHistory.push(historyRecord);
                 }
             }
-            // Группируем записи по модели для оптимизации
+            // Grouping records by model for optimization
             const fieldsCache = new Map();
             for (const historyRecord of accessHistory) {
                 const entity = this.findEntityObject(historyRecord);
                 const modelKey = historyRecord.modelName;
-                // Используем кэш, чтобы не создавать DataAccessor для каждой записи
+                // We use a cache so as not to create a DataAccessor for each record
                 if (!fieldsCache.has(modelKey)) {
                     const dataAccessor = new DataAccessor(this.adminizer, user, entity, "edit");
                     let fields = dataAccessor.getFieldsConfig();

package/lib/history-actions/DefaultHistoryAdapter.js

@@ -29,9 +29,9 @@ export class DefaultHistoryAdapter extends AbstractHistoryAdapter {
         let totalFetched = 0;
         let resultItems = [];
         let currentSkip = skip;
-        // Дозагружаем пока не наберем нужное количество
+        // Add more until you get the required amount
         while (resultItems.length < limit) {
-            // Запрашиваем с запасом, чтобы уменьшить количество запросов к БД
+            // We request with a reserve to reduce the number of requests to the database
             const fetchLimit = Math.min(limit * 2, 50);
             const history = await this.adminizer.modelHandler.model.get(this.model)["_find"]({
                 where: query,
@@ -40,10 +40,10 @@ export class DefaultHistoryAdapter extends AbstractHistoryAdapter {
                 skip: currentSkip
             });
             if (history.length === 0) {
-                break; // Больше нет данных
+                break; // No more data
             }
             const filteredHistory = await this._getAllHistory(history, user);
-            // Добавляем отфильтрованные записи к результату
+            // Add filtered records to the result
             for (const item of filteredHistory) {
                 if (resultItems.length < limit) {
                     resultItems.push(item);
@@ -51,7 +51,7 @@ export class DefaultHistoryAdapter extends AbstractHistoryAdapter {
             }
             totalFetched += history.length;
             currentSkip += history.length;
-            // Если получили меньше чем запросили, значит в БД кончились данные
+            // If you receive less than what you requested, it means the database has run out of data
             if (history.length < fetchLimit) {
                 break;
             }

package/lib/inertia/inertiaAdapter.js

@@ -19,7 +19,7 @@ const inertiaExpressAdapter = function ({ version, html, flashMessages, enableRe
                     secure: process.env.NODE_ENV === 'production' && process.env.CSRF_COOKIE_INSECURE !== '1',
                     sameSite: 'lax',
                 });
-                // Проверяем CSRF только для не-GET запросов И не-API routes
+                // Checking CSRF only for non-GET requests AND non-API routes
                 if (!['GET', 'HEAD', 'OPTIONS'].includes(req.method)) {
                     const csrfCookie = req.cookies['XSRF-TOKEN'];
                     const csrfHeader = req.headers[csrf.headerName || 'x-xsrf-token'];
@@ -134,7 +134,7 @@ const inertiaExpressAdapter = function ({ version, html, flashMessages, enableRe
         return next();
     };
 };
-// Вспомогательная функция для определения API routes
+// Helper function for defining API routes
 function isApiRequest(req) {
     const adminizer = req.adminizer;
     if (!adminizer?.config?.cors?.enabled) {
@@ -142,9 +142,9 @@ function isApiRequest(req) {
     }
     const corsConfig = adminizer.config.cors;
     const routePrefix = adminizer.config.routePrefix || '';
-    // Создаем базовый путь для API
+    // Create a base path for the API
     const apiBasePath = `${routePrefix}/${corsConfig.path?.replace('*', '')}`;
-    // Проверяем начинается ли путь с API base path
+    // Checking if the path starts with API base path
     return req.path.startsWith(apiBasePath);
 }
 export default inertiaExpressAdapter;

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

@@ -12,7 +12,7 @@ export declare class DefaultMediaManager extends AbstractMediaManager {
         next: boolean;
     }>;
     searchAll(s: string, group: string): Promise<MediaManagerItem[]>;
-    setRelations(data: MediaManagerWidgetData[], model: string, modelId: string | number, //Обновлено
+    setRelations(data: MediaManagerWidgetData[], model: string, modelId: string | number, //Updated
     widgetName: string): Promise<void>;
     getRelations(model: string, widgetName: string, modelId: string | number): Promise<MediaManagerWidgetClientItem[]>;
 }

package/lib/media-manager/DefaultMediaManager.js

@@ -55,12 +55,12 @@ export class DefaultMediaManager extends AbstractMediaManager {
         }
         return data;
     }
-    async setRelations(data, model, modelId, //Обновлено
+    async setRelations(data, model, modelId, //Updated
     widgetName) {
         if (modelId == null) {
             throw new Error("modelId must be a string or number");
         }
-        const modelIdStr = String(modelId); //Нормализуем к строке
+        const modelIdStr = String(modelId); //Normalize to string
         let modelAssociations = await this.adminizer.modelHandler.model.get(this.modelAssoc)["_find"]({
             where: {
                 modelId: modelIdStr,
@@ -79,7 +79,7 @@ export class DefaultMediaManager extends AbstractMediaManager {
             await this.adminizer.modelHandler.model.get(this.modelAssoc)["_create"]({
                 mediaManagerId: this.id,
                 model: model.toLowerCase(),
-                modelId: modelIdStr, //Сохраняем как строку
+                modelId: modelIdStr, //Save as a string
                 [fieldName]: widgetItem.id,
                 widgetName: widgetName,
                 sortOrder: key + 1,
@@ -90,14 +90,14 @@ export class DefaultMediaManager extends AbstractMediaManager {
         if (modelId == null) {
             throw new Error("modelId must be a string or number");
         }
-        const modelIdStr = String(modelId); //Нормализуем к строке
+        const modelIdStr = String(modelId); //Normalize to string
         let widgetItems = [];
         const fieldName = this.adminizer.ormAdapters[0].ormType === 'sequelize' ? 'fileRef' : 'file';
         let files = await this.adminizer.modelHandler.model.get(this.modelAssoc)['_find']({
             where: {
                 model: model.toLowerCase(),
                 widgetName: widgetName,
-                modelId: modelIdStr, //Поиск по строке
+                modelId: modelIdStr, //Search by string
             },
             sort: "sortOrder ASC"
         }, { populate: [[fieldName, {}]] });