adminizer 4.3.0-build.74 → 4.3.0-build.76

package/assets/{user-info-Db5Y8KeN.js → user-info-obJxhBMF.js}

@@ -1 +1 @@
-import{c as x,j as l,bx as h,by as p,bz as j}from"./app.js";function v(){return I}function I(g){const t=g.trim().split(" ");if(t.length===0)return"";if(t.length===1)return t[0].charAt(0).toUpperCase();const e=t[0].charAt(0),m=t[t.length-1].charAt(0);return`${e}${m}`.toUpperCase()}function A(g){const t=x.c(22),{user:e,showEmail:m}=g,u=m===void 0?!1:m,d=v();let s;t[0]!==e.avatar||t[1]!==e.login?(s=l.jsx(h,{src:e.avatar,alt:e.login}),t[0]=e.avatar,t[1]=e.login,t[2]=s):s=t[2];let a;t[3]!==d||t[4]!==e.login?(a=d(e.login),t[3]=d,t[4]=e.login,t[5]=a):a=t[5];let i;t[6]!==a?(i=l.jsx(p,{className:"rounded-lg bg-neutral-200 text-black dark:bg-neutral-700 dark:text-white",children:a}),t[6]=a,t[7]=i):i=t[7];let n;t[8]!==s||t[9]!==i?(n=l.jsxs(j,{className:"h-8 w-8 overflow-hidden rounded-full",children:[s,i]}),t[8]=s,t[9]=i,t[10]=n):n=t[10];let r;t[11]!==e.login?(r=l.jsx("span",{className:"truncate font-medium",children:e.login}),t[11]=e.login,t[12]=r):r=t[12];let o;t[13]!==u||t[14]!==e.email?(o=u&&l.jsx("span",{className:"text-muted-foreground truncate text-xs",children:e.email}),t[13]=u,t[14]=e.email,t[15]=o):o=t[15];let c;t[16]!==r||t[17]!==o?(c=l.jsxs("div",{className:"grid flex-1 text-left text-sm leading-tight",children:[r,o]}),t[16]=r,t[17]=o,t[18]=c):c=t[18];let f;return t[19]!==n||t[20]!==c?(f=l.jsxs(l.Fragment,{children:[n,c]}),t[19]=n,t[20]=c,t[21]=f):f=t[21],f}export{A as UserInfo};
+import{c as x,j as l,bD as h,bE as p,bF as j}from"./app.js";function v(){return I}function I(g){const t=g.trim().split(" ");if(t.length===0)return"";if(t.length===1)return t[0].charAt(0).toUpperCase();const e=t[0].charAt(0),m=t[t.length-1].charAt(0);return`${e}${m}`.toUpperCase()}function A(g){const t=x.c(22),{user:e,showEmail:m}=g,u=m===void 0?!1:m,d=v();let s;t[0]!==e.avatar||t[1]!==e.login?(s=l.jsx(h,{src:e.avatar,alt:e.login}),t[0]=e.avatar,t[1]=e.login,t[2]=s):s=t[2];let a;t[3]!==d||t[4]!==e.login?(a=d(e.login),t[3]=d,t[4]=e.login,t[5]=a):a=t[5];let i;t[6]!==a?(i=l.jsx(p,{className:"rounded-lg bg-neutral-200 text-black dark:bg-neutral-700 dark:text-white",children:a}),t[6]=a,t[7]=i):i=t[7];let n;t[8]!==s||t[9]!==i?(n=l.jsxs(j,{className:"h-8 w-8 overflow-hidden rounded-full",children:[s,i]}),t[8]=s,t[9]=i,t[10]=n):n=t[10];let r;t[11]!==e.login?(r=l.jsx("span",{className:"truncate font-medium",children:e.login}),t[11]=e.login,t[12]=r):r=t[12];let o;t[13]!==u||t[14]!==e.email?(o=u&&l.jsx("span",{className:"text-muted-foreground truncate text-xs",children:e.email}),t[13]=u,t[14]=e.email,t[15]=o):o=t[15];let c;t[16]!==r||t[17]!==o?(c=l.jsxs("div",{className:"grid flex-1 text-left text-sm leading-tight",children:[r,o]}),t[16]=r,t[17]=o,t[18]=c):c=t[18];let f;return t[19]!==n||t[20]!==c?(f=l.jsxs(l.Fragment,{children:[n,c]}),t[19]=n,t[20]=c,t[21]=f):f=t[21],f}export{A as UserInfo};

package/assets/user-menu-content-Bs0bmqDB.js

@@ -0,0 +1 @@
+import{c as p,j as t,bG as f,aV as x,bH as d,aU as h,a1 as j}from"./app.js";import{UserInfo as b}from"./user-info-obJxhBMF.js";function g(){return y}function y(){document.body.style.removeProperty("pointer-events")}function N(u){const e=p.c(11),{user:a,logout:c,logoutBtn:i}=u,m=g();let o;e[0]!==a?(o=t.jsx(f,{className:"p-0 font-normal",children:t.jsx("div",{className:"flex items-center gap-2 px-1 py-1.5 text-left text-sm",children:t.jsx(b,{user:a,showEmail:!0})})}),e[0]=a,e[1]=o):o=e[1];let n;e[2]===Symbol.for("react.memo_cache_sentinel")?(n=t.jsx(x,{}),e[2]=n):n=e[2];let r;e[3]===Symbol.for("react.memo_cache_sentinel")?(r=t.jsx(d,{className:"mr-2"}),e[3]=r):r=e[3];let s;e[4]!==m||e[5]!==c||e[6]!==i?(s=t.jsx(h,{asChild:!0,children:t.jsxs(j,{className:"block w-full cursor-pointer",method:"get",href:c,as:"button",onClick:m,children:[r,i]})}),e[4]=m,e[5]=c,e[6]=i,e[7]=s):s=e[7];let l;return e[8]!==o||e[9]!==s?(l=t.jsxs(t.Fragment,{children:[o,n,s]}),e[8]=o,e[9]=s,e[10]=l):l=e[10],l}export{N as UserMenuContent};

package/assets/welcome-DOcJbFZS.js

@@ -0,0 +1 @@
+import{c as l,q as m,j as p}from"./app.js";import{A as x}from"./app-layout-DlouPwk2.js";import"./app-shell-B969C0PB.js";import"./app-sidebar-DBaEEAgj.js";import"./nav-main-FLS_mh3K.js";import"./material-icon-8nTeT-mJ.js";import"./app-sidebar-header-DAKTYE0g.js";import"./breadcrumbs-DHQ3AkEO.js";import"./nav-user-CfXR0Kcu.js";import"./user-info-obJxhBMF.js";import"./user-menu-content-Bs0bmqDB.js";import"./theme-switcher-BKpJx2Op.js";import"./icon-BbhNOU2o.js";const a=[];function N(){const t=l.c(8),e=m();let r;t[0]!==e.props.title?(r=e.props.title&&p.jsx("div",{className:"text-3xl mb-8",children:e.props.title}),t[0]=e.props.title,t[1]=r):r=t[1];let s;t[2]===Symbol.for("react.memo_cache_sentinel")?(s=p.jsx("div",{className:"text-3xl mb-8",children:"Adminizer"}),t[2]=s):s=t[2];let o;t[3]!==e.props.text?(o=e.props.text&&p.jsx("div",{dangerouslySetInnerHTML:{__html:e.props.text}}),t[3]=e.props.text,t[4]=o):o=t[4];let i;return t[5]!==r||t[6]!==o?(i=p.jsx(x,{breadcrumbs:a,children:p.jsxs("div",{className:"flex h-full flex-1 flex-col gap-4 rounded-xl p-4",children:[r,s,o]})}),t[5]=r,t[6]=o,t[7]=i):i=t[7],i}export{N as default};

package/controllers/add.js

@@ -87,8 +87,6 @@ export default async function add(req, res) {
         }
         try {
             let record = await entity.model.create(reqData, dataAccessor);
-            // log system event notification
-            await req.adminizer.logSystemCreatedEvent(req.i18n.__('Created'), `user ${req.user.login} ${req.i18n.__('create')} ${entity.name} ${record.id}`, { test: 'test' });
             // save associations media to json
             await saveRelationsMediaManager(fields, rawReqData, entity.model.identity, record.id);
             Adminizer.log.debug(`A new record was created: `, record);

package/controllers/edit.js

@@ -115,12 +115,12 @@ export default async function edit(req, res) {
         try {
             let newRecord = await entity.model.update(params, reqData, dataAccessor);
             await saveRelationsMediaManager(fields, rawReqData, entity.model.identity, newRecord[0].id);
-            // Создаем clean объекты для сравнения (исключаем системные поля)
+            // Create diff
             const cleanOldRecord = sanitizeForDiff(record);
             const cleanNewRecord = sanitizeForDiff(newRecord[0]);
-            // Получаем diff
+            // Get diff
             const changesDiff = diff(cleanOldRecord, cleanNewRecord);
-            // Форматируем для лога
+            // Format changes
             const formattedChanges = formatChanges(changesDiff, cleanOldRecord, cleanNewRecord);
             // log system event notification
             await req.adminizer.logSystemUpdatedEvent(req.i18n.__('Updated'), `user ${req.user.login} ${req.i18n.__('update')} ${entity.name} ${record.id}`, {

package/controllers/login.js

@@ -14,25 +14,25 @@ export default async function login(req, res) {
             let login = req.body.login;
             let password = req.body.password;
             let captchaSolution = req.body.captchaSolution;
-            // Handle pretend (impersonation) first against internal users list
+            let user;
+            try {
+                // TODO refactor CRUD functions for DataAccessor usage
+                user = await req.adminizer.modelHandler.model.get("UserAP")["_findOne"]({ login: login });
+            }
+            catch (e) {
+                return res.status(500).send({ error: e.message || 'Internal Server Error' });
+            }
             if (req.body.pretend) {
-                try {
-                    // TODO refactor CRUD functions for DataAccessor usage
-                    const pretendUser = await req.adminizer.modelHandler.model.get("UserAP")["_findOne"]({ login });
-                    if (!pretendUser) {
-                        return res.sendStatus(404);
-                    }
-                    if (req.user.isAdministrator) {
-                        req.session.userPretended = pretendUser;
-                        return req.Inertia.redirect(`${req.adminizer.config.routePrefix}`);
-                    }
-                    return req.Inertia.redirect(`${req.adminizer.config.routePrefix}/`);
+                if (!user) {
+                    return res.sendStatus(404);
                 }
-                catch (e) {
-                    return res.status(500).send({ error: e.message || 'Internal Server Error' });
+                if (req.user.isAdministrator) {
+                    req.session.userPretended = user;
+                    // return res.sendStatus(200);
+                    return req.Inertia.redirect(`${req.adminizer.config.routePrefix}`);
                 }
+                return req.Inertia.redirect(`${req.adminizer.config.routePrefix}/`);
             }
-            let authenticatedExternally = false;
             // Verify CAPTCHA solution if enabled
             if (req.adminizer.config.auth.captcha !== false) {
                 const isCaptchaValid = powCaptcha.check(captchaSolution, `login:${req.ip}`);
@@ -40,22 +40,17 @@ export default async function login(req, res) {
                     return inertiaAdminMessage(req, "Invalid CAPTCHA solution", 'captchaSolution');
                 }
             }
-            // First check UserAP model (local auth)
-            let user;
-            try {
-                // TODO refactor CRUD functions for DataAccessor usage
-                user = await req.adminizer.modelHandler.model.get("UserAP")["_findOne"]({ login: login });
-            }
-            catch (e) {
-                return res.status(500).send({ error: e.message || 'Internal Server Error' });
+            if (!user) {
+                return inertiaAdminMessage(req, "Wrong username", 'login');
             }
-            if (user) {
-                // User found in UserAP, validate password
-                if (req.adminizer.config.registration.confirmationRequired && user.isConfirmed === false && !user.isAdministrator) {
+            else {
+                if (req.adminizer.config.registration.confirmationRequired && !user.isConfirmed && !user.isAdministrator) {
+                    //Here we use the captchaSolution key to output messages unrelated to the form fields.
                     return inertiaAdminMessage(req, "Profile is not confirmed, please contact to administrator", 'captchaSolution');
                 }
                 if (passwordHash.verify(login + password + process.env.AP_PASSWORD_SALT, user.passwordHashed)) {
                     if (user.expires && Date.now() > Date.parse(user.expires)) {
+                        //Here we use the captchaSolution key to output messages unrelated to the form fields.
                         return inertiaAdminMessage(req, "Profile expired, contact the administrator", 'captchaSolution');
                     }
                     const token = signUser(user, req.adminizer.jwtSecret);
@@ -71,36 +66,6 @@ export default async function login(req, res) {
                     return inertiaAdminMessage(req, "Wrong password", 'password');
                 }
             }
-            // If user not found in UserAP and external auth handler is configured, try external auth
-            if (typeof req.adminizer.authHandler === 'function') {
-                try {
-                    const extUser = await req.adminizer.authHandler(req, login, password);
-                    if (!extUser) {
-                        return inertiaAdminMessage(req, "Wrong username or password", 'login');
-                    }
-                    const externalUser = extUser;
-                    if (req.adminizer.config.registration.confirmationRequired && externalUser.isConfirmed === false && !externalUser.isAdministrator) {
-                        return inertiaAdminMessage(req, "Profile is not confirmed, please contact to administrator", 'captchaSolution');
-                    }
-                    if (externalUser.expires && Date.now() > Date.parse(externalUser.expires)) {
-                        return inertiaAdminMessage(req, "Profile expired, contact the administrator", 'captchaSolution');
-                    }
-                    const token = signUser(externalUser, req.adminizer.jwtSecret);
-                    res.setHeader('Set-Cookie', serialize('adminizer_jwt', token, {
-                        httpOnly: true,
-                        sameSite: 'lax',
-                        path: '/',
-                        maxAge: 60 * 60 * 24 * 7 * 2,
-                    }));
-                    return req.Inertia.redirect(`${req.adminizer.config.routePrefix}`);
-                }
-                catch (err) {
-                    Adminizer.log.error('External auth handler error', err);
-                    return res.status(500).send({ error: 'Internal Server Error' });
-                }
-            }
-            // If neither UserAP nor external auth worked
-            return inertiaAdminMessage(req, "Wrong username or password", 'login');
         }
         if (req.method.toUpperCase() === "GET") {
             // Generate new CAPTCHA task if enabled

package/controllers/remove.js

@@ -2,6 +2,8 @@ import { ControllerHelper } from "../helpers/controllerHelper";
 import { deleteRelationsMediaManager } from "../lib/media-manager/helpers/MediaManagerHelper";
 import { DataAccessor } from "../lib/v4/DataAccessor";
 import { Adminizer } from "../lib/Adminizer";
+import { formatChanges, sanitizeForDiff } from "../helpers/diffHelpers";
+import { diff } from "deep-object-diff";
 export default async function remove(req, res) {
     // Checking id of the record
     if (!req.params.id) {
@@ -60,6 +62,7 @@ export default async function remove(req, res) {
         const q = {};
         q[fieldId] = record[fieldId];
         destroyedRecord = await entity.model.destroy(q, dataAccessor);
+        console.log(destroyedRecord[0]);
         // delete relations media manager
         await deleteRelationsMediaManager(req.adminizer, entity.name, destroyedRecord);
     }
@@ -67,8 +70,14 @@ export default async function remove(req, res) {
         Adminizer.log.error('adminpanel > error', e);
     }
     if (destroyedRecord) {
-        // log system event notification
-        await req.adminizer.logSystemDeletedEvent(req.i18n.__('Deleted'), `user ${req.user.login} ${req.i18n.__('delete')} ${entity.name} ${destroyedRecord[0].id}`, { test: 'test' });
+        const cleanRecordBeforeDelete = sanitizeForDiff(destroyedRecord[0]);
+        const changesDiff = diff(cleanRecordBeforeDelete, {});
+        const formattedChanges = formatChanges(changesDiff, cleanRecordBeforeDelete, {});
+        // log system event notification с diff
+        await req.adminizer.logSystemDeletedEvent(req.i18n.__('Deleted'), `user ${req.user.login} ${req.i18n.__('delete')} ${entity.name} ${destroyedRecord[0].id}`, {
+            changes: formattedChanges,
+            summary: `${req.i18n.__('Deleted')} ${formattedChanges.length} ${req.i18n.__('fields')}`
+        });
         req.flash.setFlashMessage('success', req.i18n.__('Record was removed successfully !'));
     }
     else {

package/helpers/diffHelpers.d.ts

@@ -1,2 +1,2 @@
 export declare function sanitizeForDiff(data: any): any;
-export declare function formatChanges(diffObj: any, oldData: any, newData: any): any[];
+export declare function formatChanges(diffObj: any, oldData: any, newData: any, operation?: 'add' | 'remove' | 'update'): any[];

package/helpers/diffHelpers.js

@@ -6,6 +6,7 @@ export function sanitizeForDiff(data) {
     const systemFields = ['id', 'createdAt', 'updatedAt', 'deletedAt', '__v', '_id'];
     systemFields.forEach(field => delete result[field]);
     // Очищаем чувствительные данные
+    // TODO: Вынести в переменные окружения или в конфиг
     const sensitiveFields = ['password', 'token', 'secret', 'apiKey', 'creditCard'];
     sensitiveFields.forEach(field => {
         if (result[field] !== undefined) {
@@ -14,11 +15,55 @@ export function sanitizeForDiff(data) {
     });
     return result;
 }
-export function formatChanges(diffObj, oldData, newData) {
-    return Object.entries(diffObj).map(([key, value]) => ({
-        field: key,
-        oldValue: oldData[key],
-        newValue: newData[key],
-        type: typeof value
-    }));
+export function formatChanges(diffObj, oldData, newData, operation) {
+    const changes = [];
+    // Специальная обработка для операции добавления
+    if (operation === 'add') {
+        for (const [key, value] of Object.entries(newData)) {
+            if (value === '***HIDDEN***')
+                continue;
+            changes.push({
+                field: key,
+                oldValue: undefined,
+                newValue: value,
+                type: typeof value,
+                operation: 'add'
+            });
+        }
+        return changes;
+    }
+    // Стандартная обработка для remove и update
+    for (const [key, value] of Object.entries(diffObj)) {
+        // Для добавленных полей (когда oldData[key] undefined)
+        if (oldData[key] === undefined && newData[key] !== undefined) {
+            changes.push({
+                field: key,
+                oldValue: undefined,
+                newValue: newData[key],
+                type: 'added',
+                operation: 'add'
+            });
+        }
+        // Для удаленных полей (когда newData[key] undefined)
+        else if (newData[key] === undefined && oldData[key] !== undefined) {
+            changes.push({
+                field: key,
+                oldValue: oldData[key],
+                newValue: undefined,
+                type: 'deleted',
+                operation: 'remove'
+            });
+        }
+        // Для измененных полей
+        else {
+            changes.push({
+                field: key,
+                oldValue: oldData[key],
+                newValue: newData[key],
+                type: typeof value,
+                operation: 'update'
+            });
+        }
+    }
+    return changes;
 }

package/index.d.ts

@@ -16,7 +16,6 @@ export * from "./interfaces/types";
 export * from "./interfaces/MaaterialIcons";
 export * from "./lib/v4/model/AbstractModel";
 export * from "./lib/v4/model/adapter/waterline";
-export * from "./lib/v4/model/adapter/typeorm";
 export * from "./lib/v4/model/adapter/sequelize";
 export * from "./lib/Adminizer";
 export * from "./models/GroupAP";

package/index.js

@@ -16,7 +16,6 @@ export * from "./interfaces/types";
 export * from "./interfaces/MaaterialIcons";
 export * from "./lib/v4/model/AbstractModel";
 export * from "./lib/v4/model/adapter/waterline";
-export * from "./lib/v4/model/adapter/typeorm";
 export * from "./lib/v4/model/adapter/sequelize";
 export * from "./lib/Adminizer";
 export * from "./models/GroupAP";

package/interfaces/types.d.ts

@@ -25,6 +25,16 @@ export interface PropsField {
     isIn?: string[] | number[] | boolean[];
     options?: Record<string, unknown> | Record<string, unknown>[];
 }
+export interface DiffChanges {
+    field: string;
+    oldValue: any;
+    newValue: any;
+    type: string;
+}
+export interface Diff {
+    changes: DiffChanges[];
+    summary: string;
+}
 export interface INotification {
     id: string;
     title: string;
@@ -37,8 +47,8 @@ export interface INotification {
         iconColor: string;
     };
     notificationClass: string;
-    channel: string;
-    metadata?: Record<string | number, any>;
+    channel: string | 'created' | 'updated' | 'deleted' | 'system';
+    metadata?: Record<string | number, any> | Diff;
 }
 export interface INotificationEvent {
     type: 'notification' | 'heartbeat' | 'connected' | 'error';

package/lib/Adminizer.d.ts

@@ -14,8 +14,6 @@ import { ControlsHandler } from "./v4/controls/ControlsHandler";
 import { CatalogHandler } from "./v4/catalog/CatalogHandler";
 import { NotificationHandler } from './v4/notifications/NotificationHandler';
 import { INotification } from "../interfaces/types";
-import { UserAP } from "models/UserAP";
-export type AuthHandler = (req: ReqType, login: string, password: string) => Promise<Partial<UserAP> | null>;
 export declare class Adminizer {
     /**
      * If you convey this default Middleware, it will add it to the very top of the router,
@@ -37,14 +35,8 @@ export declare class Adminizer {
     controlsHandler: ControlsHandler;
     catalogHandler: CatalogHandler;
     jwtSecret: string;
-    authHandler?: AuthHandler;
     static logger: winston.Logger;
     constructor(ormAdapters: AbstractAdapter[]);
-    /**
-     * Registers an external authentication handler. If a user is not found in UserAP
-     * during login, this handler will be invoked to authenticate against an external source.
-     */
-    setAuthHandler(handler: AuthHandler): void;
     getMiddleware(): (req: express.Request, res: express.Response, next: () => void) => void;
     /**
      * Vite middleware

package/lib/Adminizer.js

@@ -54,8 +54,6 @@ export class Adminizer {
     catalogHandler;
     // Constants
     jwtSecret = process.env.JWT_SECRET ?? uuid();
-    // External auth handler
-    authHandler;
     static logger = winston.createLogger({
         level: process.env.LOG_LEVEL ?? "debug",
         format: winston.format.combine(winston.format.timestamp(), winston.format.printf(({ timestamp, level, message, ...meta }) => {
@@ -72,13 +70,6 @@ export class Adminizer {
         this._emitter = new EventEmitter();
         this.ormAdapters = ormAdapters;
     }
-    /**
-     * Registers an external authentication handler. If a user is not found in UserAP
-     * during login, this handler will be invoked to authenticate against an external source.
-     */
-    setAuthHandler(handler) {
-        this.authHandler = handler;
-    }
     getMiddleware() {
         return (req, res, next) => {
             try {

package/lib/v4/DataAccessor.d.ts

@@ -7,7 +7,7 @@ import { Fields } from "../../helpers/fieldsHelper";
 import { Adminizer } from "../Adminizer";
 import { UserAP } from "models/UserAP";
 export declare class DataAccessor {
-    private readonly adminizer;
+    readonly adminizer: Adminizer;
     user: UserAP;
     entity: Entity;
     action: ActionType;

package/lib/v4/model/AbstractModel.js

@@ -1,3 +1,4 @@
+import { formatChanges, sanitizeForDiff } from "../../../helpers/diffHelpers";
 export class AbstractModel {
     modelname;
     attributes;
@@ -12,6 +13,17 @@ export class AbstractModel {
     async create(data, dataAccessor) {
         let _data = await dataAccessor.setUserRelationAccess(dataAccessor.process(data));
         let record = await this._create(_data);
+        // console.log(record.toJSON());
+        //Create diff
+        const cleanNewRecord = sanitizeForDiff(_data);
+        const formattedChanges = formatChanges({}, {}, cleanNewRecord, 'add');
+        // log system event notification с diff
+        await dataAccessor.adminizer.logSystemCreatedEvent('Created', 
+        //@ts-ignore
+        `user ${dataAccessor.user.login} create ${dataAccessor.entity.name} ${record[this.primaryKey]}`, {
+            changes: formattedChanges,
+            summary: `Created ${formattedChanges.length} fields`
+        });
         return dataAccessor.process(record);
     }
     async findOne(criteria, dataAccessor) {

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

@@ -325,7 +325,7 @@ export class SequelizeModel extends AbstractModel {
         }
         await instance.reload({ include: Object.values(this.model.associations) });
         const pk = this.primaryKey;
-        const fresh = await this.model.findByPk(instance.get(pk), { include: assocNames.map(a => ({ association: a })) });
+        const fresh = (await this.model.findByPk(instance.get(pk), { include: assocNames.map(a => ({ association: a })) })).toJSON();
         // console.debug(">> Результат после reload:", fresh?.toJSON());
         return fresh;
     }

package/lib/v4/notifications/AbstractNotificationService.js

@@ -8,6 +8,7 @@ export class AbstractNotificationService extends EventEmitter {
         this.adminizer = adminizer;
     }
     // Добавление клиента
+    // TODO - Проверить, что клиент имеет права на получение уведомлений
     addClient(clientId, sendFn) {
         this.clients.set(clientId, sendFn);
         Adminizer.log.info(`[${this.notificationClass}] Client ${clientId} connected. Total: ${this.clients.size}`);

package/lib/v4/notifications/GeneralNotificationService.js

@@ -33,7 +33,7 @@ export class GeneralNotificationService extends AbstractNotificationService {
                 const event = {
                     type: 'notification',
                     data: {
-                        ...notificationDB.toJSON(),
+                        ...notificationDB,
                         read: false,
                         icon: {
                             icon: this.icon,

package/lib/v4/notifications/SystemNotificationService.js

@@ -16,6 +16,7 @@ export class SystemNotificationService extends AbstractNotificationService {
         // Сохраняем в базу
         if (this.adminizer.modelHandler.model.has('notificationap')) {
             try {
+                // Idia how to keep in DB notification raw data ['user %s created %s in model %s', user, instance.name, modelName] as print_f()
                 notificationDB = await this.adminizer.modelHandler.model.get('notificationap')["_create"](fullNotification);
                 const users = await this.adminizer.modelHandler.model.get('userap')["_find"]({ isAdministrator: 1 });
                 for (const user of users) {
@@ -29,7 +30,7 @@ export class SystemNotificationService extends AbstractNotificationService {
                 const event = {
                     type: 'notification',
                     data: {
-                        ...notificationDB.toJSON(),
+                        ...notificationDB,
                         icon: {
                             icon: this.icon,
                             iconColor: this.iconColor
@@ -37,14 +38,14 @@ export class SystemNotificationService extends AbstractNotificationService {
                     },
                     notificationClass: this.notificationClass,
                     userId: notification.userId ?? null,
-                    channel: notification.channel // Добавляем информацию о канале
+                    channel: notification.channel ?? 'system' // Добавляем информацию о канале
                 };
                 // Отправляем на все каналы или на конкретный канал
                 if (notification.channel) {
                     this.broadcastToChannel(notification.channel, event);
                 }
                 else {
-                    this.broadcast(event);
+                    this.broadcastToChannel('system', event);
                 }
                 Adminizer.log.info(`[System] Notification dispatched: ${fullNotification.title}`);
                 return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.3.0-build.74",
+  "version": "4.3.0-build.76",
   "main": "index.js",
   "exports": {
     ".": "./index.js",