adminizer 4.3.0-build.98 → 4.3.0

package/controllers/notifications/NotificationController.d.ts

@@ -3,7 +3,7 @@ export declare class NotificationController {
     static viewAll(req: ReqType, res: ResType): Promise<import("express").Response<any, Record<string, any>>>;
     static getNotificationClasses(req: ReqType, res: ResType): Promise<ResType>;
     static getNotificationsStream(req: ReqType, res: ResType): Promise<void>;
-    static getNotificationsByClass(req: ReqType, res: ResType): Promise<void>;
+    static getNotificationsByClass(req: ReqType, res: ResType): Promise<ResType>;
     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

@@ -143,16 +143,17 @@ export class NotificationController {
             // Проверяем права доступа
             const hasPermission = req.adminizer.accessRightsHelper.hasPermission(`notification-${notificationClass}`, req.user);
             if (!hasPermission) {
-                res.status(403).json({ error: 'Forbidden' });
-                return;
+                return res.status(403).json({ error: 'Forbidden' });
             }
             const service = req.adminizer.notificationHandler.getService(notificationClass);
+            if (!service)
+                return res.json({});
             const notifications = await service.getNotifications(req.user?.id, Number(limit), Number(skip), unreadOnly === 'true');
-            res.json(notifications);
+            return res.json(notifications);
         }
         catch (error) {
             Adminizer.log.error('Error getting notifications:', error);
-            res.status(500).json({ error: 'Internal server error' });
+            return res.status(500).json({ error: 'Internal server error' });
         }
     }
     // API для получения всех уведомлений пользователя

package/controllers/view.js

@@ -86,9 +86,11 @@ export default async function view(req, res) {
             for (const field of Object.keys(fields)) {
                 let fieldConfigConfig = fields[field].config;
                 if (fieldConfigConfig.type === 'mediamanager') {
-                    record[field] = await getRelationsMediaManager({
-                        list: record[field],
-                        mediaManagerId: fieldConfigConfig.options?.id ?? "default"
+                    record[field] = await getRelationsMediaManager(req.adminizer, {
+                        mediaManagerId: fieldConfigConfig.options?.id ?? "default",
+                        model: entity.model.modelname,
+                        widgetName: field,
+                        modelId: req.params.id
                     });
                 }
             }

package/helpers/inertiaAddHelper.js

@@ -1,7 +1,6 @@
 import inertiaActionsHelper from "./inertiaActionsHelper";
 import chalk from "chalk";
 import { isObject } from "./JsUtils";
-import { MediaManagerHandler } from "../lib/media-manager/MediaManagerHandler";
 export default function inertiaAddHelper(req, entity, fields, record, view = false) {
     const actionType = 'add';
     let props = {
@@ -107,7 +106,7 @@ export default function inertiaAddHelper(req, entity, fields, record, view = fal
         if (type === 'mediamanager') {
             const mConfig = field.config;
             const mOptions = mConfig?.options;
-            const mediaManager = MediaManagerHandler.get(mOptions.id || 'default');
+            const mediaManager = req.adminizer.mediaManagerHandler.get(mOptions.id || 'default');
             if (!mediaManager) {
                 options = {};
             }

package/helpers/inertiaFromHelper.js

@@ -1,5 +1,4 @@
 import { inputText, setSelectMany, getControlsOptions } from "./inertiaAddHelper";
-import { MediaManagerHandler } from "../lib/media-manager/MediaManagerHandler";
 export default function inertiaFormHelper(req, postLink, formData) {
     let props = {
         fields: [],
@@ -74,7 +73,7 @@ export default function inertiaFormHelper(req, postLink, formData) {
         }
         if (type === 'mediamanager') {
             const mOptions = field.options;
-            const mediaManager = MediaManagerHandler.get(mOptions.id || 'default');
+            const mediaManager = req.adminizer.mediaManagerHandler.get(mOptions.id || 'default');
             if (!mediaManager) {
                 options = {};
             }

package/index.d.ts

@@ -17,6 +17,7 @@ export * from "./interfaces/MaaterialIcons";
 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/Adminizer";
 export * from "./models/GroupAP";
 export * from "./models/UserAP";
@@ -25,3 +26,7 @@ export * from "./models/MediaManagerAssociationsAP";
 export * from "./models/MediaManagerMetaAP";
 export * from "./models/NavigationAP";
 export * from "./migrations";
+export * from "./system/bindNavigation";
+export * from "./lib/helper/jwt";
+export * from "./lib/notifications/AbstractNotificationService";
+export * from "./lib/POWCaptcha";

package/index.js

@@ -17,6 +17,7 @@ export * from "./interfaces/MaaterialIcons";
 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/Adminizer";
 export * from "./models/GroupAP";
 export * from "./models/UserAP";
@@ -25,3 +26,7 @@ export * from "./models/MediaManagerAssociationsAP";
 export * from "./models/MediaManagerMetaAP";
 export * from "./models/NavigationAP";
 export * from "./migrations";
+export * from "./system/bindNavigation";
+export * from "./lib/helper/jwt";
+export * from "./lib/notifications/AbstractNotificationService";
+export * from "./lib/POWCaptcha";

package/interfaces/adminpanelConfig.d.ts

@@ -190,6 +190,15 @@ export interface AdminpanelConfig {
     };
     notifications?: {
         enabled: boolean;
+        enableGeneral?: boolean;
+    };
+    cors?: {
+        enabled: boolean;
+        origin: string[] | string;
+        path: string;
+        credentials?: boolean;
+        methods?: string[];
+        allowedHeaders?: string[];
     };
 }
 export interface ModelConfig {
@@ -347,6 +356,8 @@ export interface TuiEditorFieldConfig extends BaseFieldConfig {
 export interface MediaManagerOptionsField {
     id: 'default' | string;
     group: string;
+    accept: string[];
+    initTab?: 'tile-image' | 'table-video' | 'table-text' | 'table-application' | 'table-all' | 'tile-all';
     config?: Record<string, any>;
 }
 interface RangeType {
@@ -452,6 +463,7 @@ export interface NavigationConfig {
     groupField: {
         name: string;
         required: boolean;
+        label: string;
     }[];
     allowContentInGroup?: boolean;
     items: NavigationItemTypeConfig[];

package/lib/Adminizer.d.ts

@@ -14,6 +14,8 @@ import { ControlsHandler } from "./controls/ControlsHandler";
 import { CatalogHandler } from "./catalog/CatalogHandler";
 import { NotificationHandler } from './notifications/NotificationHandler';
 import { INotification } from "../interfaces/types";
+import { MediaManagerHandler } from "./media-manager/MediaManagerHandler";
+import { StorageServices } from "./catalog/Navigation";
 export declare class Adminizer {
     /**
      * If you convey this default Middleware, it will add it to the very top of the router,
@@ -34,6 +36,8 @@ export declare class Adminizer {
     vite: ViteDevServer;
     controlsHandler: ControlsHandler;
     catalogHandler: CatalogHandler;
+    mediaManagerHandler: MediaManagerHandler;
+    storageServices: StorageServices;
     jwtSecret: string;
     static logger: winston.Logger;
     constructor(ormAdapters: AbstractAdapter[]);
@@ -46,9 +50,6 @@ export declare class Adminizer {
     init(config: AdminpanelConfig): Promise<void>;
     sendNotification(notification: Omit<INotification, 'id' | 'createdAt' | 'icon'>): Promise<boolean>;
     logSystemEvent(title: string, message: string, metadata?: any): Promise<boolean>;
-    logSystemCreatedEvent(title: string, message: string, metadata?: any): Promise<boolean>;
-    logSystemUpdatedEvent(title: string, message: string, metadata?: any): Promise<boolean>;
-    logSystemDeletedEvent(title: string, message: string, metadata?: any): Promise<boolean>;
     get emitter(): EventEmitter;
     getOrmAdapter(ormType: string): AbstractAdapter;
     static get log(): {

package/lib/Adminizer.js

@@ -8,7 +8,7 @@ import Router from "./../system/Router";
 import bindAssets from "../system/bindAssets";
 import bindDev from "../system/bindDev";
 import bindDashboardWidgets from "../system/bindDashboardWidgets";
-import bindNavigation from "../system/bindNavigation";
+import { bindNavigation } from "../system/bindNavigation";
 import bindMediaManager from "../system/bindMediaManager";
 import bindAccessRights from "../system/bindAccessRights";
 import bindAuthorization from "../system/bindAuthorization";
@@ -30,6 +30,8 @@ import { ControlsHandler } from "./controls/ControlsHandler";
 import { CatalogHandler } from "./catalog/CatalogHandler";
 import { v4 as uuid } from "uuid";
 import { bindNotifications } from "../system/bindNotifications";
+import { MediaManagerHandler } from "./media-manager/MediaManagerHandler";
+import { bindCors } from "../system/bindCors";
 export class Adminizer {
     // Preconfigures
     /**
@@ -52,6 +54,8 @@ export class Adminizer {
     vite;
     controlsHandler;
     catalogHandler;
+    mediaManagerHandler;
+    storageServices;
     // Constants
     jwtSecret = process.env.JWT_SECRET ?? uuid();
     static logger = winston.createLogger({
@@ -147,16 +151,9 @@ export class Adminizer {
             chalk.blue('\nAccess your app at http://localhost:3000'));
     }
     async init(config) {
-        // set cookie parser
-        this.app.use(cookieParser());
         if (!config || Object.keys(config).length === 0) {
             Adminizer.log.warn(`Adminizer init > Adminizer config is emtpy`);
         }
-        // Set vite middleware
-        const isViteDev = process.env.VITE_ENV === "dev";
-        if (isViteDev)
-            await this.viteMiddleware();
-        this.emitter.emit('adminizer:init');
         if (this.config && Object.keys(this.config).length > 0) {
             throw new Error("Config has already been initialized");
         }
@@ -181,6 +178,15 @@ export class Adminizer {
                 set: configForms.set ?? defaultForms.set
             }
         };
+        // Bind cors
+        bindCors(this);
+        // set cookie parser
+        this.app.use(cookieParser());
+        // Set vite middleware
+        const isViteDev = process.env.VITE_ENV === "dev";
+        if (isViteDev)
+            await this.viteMiddleware();
+        this.emitter.emit('adminizer:init');
         this.modelHandler = new ModelHandler();
         // TODO: 'hot reload' unbind models & unbind forms
         await bindModels(this);
@@ -195,6 +201,7 @@ export class Adminizer {
         this.menuHelper = new MenuHelper(this.config);
         this.widgetHandler = new WidgetHandler(this);
         this.catalogHandler = new CatalogHandler();
+        this.mediaManagerHandler = new MediaManagerHandler();
         bindExpressUtils(this.app);
         bindReqFunctions(this);
         // Bind assets
@@ -205,7 +212,7 @@ export class Adminizer {
             }
         }
         await bindDashboardWidgets(this);
-        bindNavigation(this);
+        await bindNavigation(this);
         bindMediaManager(this);
         await bindAccessRights(this);
         if (I18n.appendLocale) {
@@ -250,19 +257,6 @@ export class Adminizer {
             return Promise.resolve(false);
         }
     }
-    // Хелпер для CRUD системных событий
-    async logSystemCreatedEvent(title, message, metadata) {
-        const systemNotificationService = this.notificationHandler.getService('system');
-        return systemNotificationService.logCreatedEvent(title, message, metadata);
-    }
-    async logSystemUpdatedEvent(title, message, metadata) {
-        const systemNotificationService = this.notificationHandler.getService('system');
-        return systemNotificationService.logUpdatedEvent(title, message, metadata);
-    }
-    async logSystemDeletedEvent(title, message, metadata) {
-        const systemNotificationService = this.notificationHandler.getService('system');
-        return systemNotificationService.logDeletedEvent(title, message, metadata);
-    }
     get emitter() {
         return this._emitter;
     }

package/lib/catalog/AbstractCatalog.d.ts

@@ -1,4 +1,5 @@
 import { Adminizer } from "../Adminizer";
+import { StorageServices } from "./Navigation";
 /**
  * Interface `Item` describes the data that the UI will operate on
  * This is a common interface for all data that is linked to the catalog
@@ -24,6 +25,7 @@ export type _Item_ = {
  * General Item structure that will be available for all elements, including groups
  */
 export declare abstract class BaseItem<T extends Item> {
+    storageServices?: StorageServices;
     abstract readonly type: string;
     /**
      * Used for infer T
@@ -90,7 +92,7 @@ export declare abstract class BaseItem<T extends Item> {
      * @param req
      */
     abstract getAddTemplate(req: ReqType): Promise<{
-        type: 'component' | 'navigation.group' | 'navigation.link' | 'model';
+        type: 'component' | 'navigation.group' | 'navigation.link' | 'model' | 'model.link';
         data: any;
     }>;
     /**
@@ -101,7 +103,7 @@ export declare abstract class BaseItem<T extends Item> {
      * @param modelId
      */
     abstract getEditTemplate(id: string | number, catalogId: string, req: ReqType, modelId?: string | number): Promise<{
-        type: 'component' | 'navigation.group' | 'navigation.link' | 'model';
+        type: 'component' | 'navigation.group' | 'navigation.link' | 'model' | 'model.link';
         data: any;
     }>;
     _getChilds(parentId: string | number, catalogId: string, req?: ReqType): Promise<Item[]>;
@@ -230,7 +232,7 @@ export declare abstract class AbstractCatalog {
      * @param modelId
      */
     getEditTemplate(item: Item, id: string | number, req: ReqType, modelId?: string | number): Promise<{
-        type: "component" | "navigation.group" | "navigation.link" | "model";
+        type: "component" | "navigation.group" | "navigation.link" | "model" | "model.link";
         data: any;
     }>;
     /**
@@ -239,7 +241,7 @@ export declare abstract class AbstractCatalog {
      * @param req
      */
     getAddTemplate(item: Item, req: ReqType): Promise<{
-        type: "component" | "navigation.group" | "navigation.link" | "model";
+        type: "component" | "navigation.group" | "navigation.link" | "model" | "model.link";
         data: any;
     }>;
     addActionHandler(actionHandler: ActionHandler): void;

package/lib/catalog/AbstractCatalog.js

@@ -2,6 +2,7 @@
  * General Item structure that will be available for all elements, including groups
  */
 export class BaseItem {
+    storageServices;
     /**
      * Array of all global contexts, which will appear for all elements
      */
@@ -253,7 +254,7 @@ export class AbstractCatalog {
      * Method for getting group elements
      */
     getitemTypes() {
-        return this.itemTypes.map(({ adminizer, ...rest }) => rest);
+        return this.itemTypes.map(({ adminizer, storageServices, ...rest }) => rest);
     }
     ;
     async search(s, hasExtras = true, req) {
@@ -268,7 +269,7 @@ export class AbstractCatalog {
                 const extras = await this.getChilds(item.id, undefined, req);
                 accumulator.push(...extras);
             }
-            if (item.parentId === 0)
+            if (item.parentId === null)
                 return item;
             const parentItem = await groupType._find(item.parentId, this.id);
             if (parentItem) {
@@ -284,7 +285,7 @@ export class AbstractCatalog {
             foundItems = foundItems.concat(items);
         }
         for (const item of foundItems) {
-            if (item.parentId !== 0) { // changed from null to 0
+            if (item.parentId !== null) { // changed from 0 to null
                 await buildTreeUpwards(item, hasExtras);
             }
         }
@@ -310,7 +311,7 @@ export class AbstractCatalog {
             itemMap[item.id] = item;
         });
         items.forEach(item => {
-            if (item.parentId === 0) { // changed from null to 0
+            if (item.parentId === null) {
                 tree.push(item);
             }
             else {

package/lib/catalog/Navigation.d.ts

@@ -5,14 +5,15 @@ export interface NavItem extends Item {
     urlPath?: string;
     modelId?: string | number;
     targetBlank?: boolean;
+    visible?: boolean;
 }
-declare class StorageService {
+export declare class StorageService {
     protected storageMap: Map<string | number, NavItem>;
     protected id: string;
     protected model: string;
     protected readonly adminizer: Adminizer;
     constructor(adminizer: Adminizer, id: string, model: string);
-    protected initModel(): Promise<void>;
+    initModel(): Promise<void>;
     getId(): string;
     buildTree(): Promise<any>;
     populateFromTree(tree: any[]): Promise<void>;
@@ -26,10 +27,11 @@ declare class StorageService {
     search(s: string, type: string): Promise<NavItem[]>;
 }
 export declare class StorageServices {
-    protected static storages: StorageService[];
-    static add(storage: StorageService): void;
-    static get(id: string): StorageService;
-    static getAll(): StorageService[];
+    protected storages: StorageService[];
+    constructor();
+    add(storage: StorageService): void;
+    get(id: string): StorageService;
+    getAll(): StorageService[];
 }
 export declare class Navigation extends AbstractCatalog {
     readonly name: string;
@@ -37,7 +39,7 @@ export declare class Navigation extends AbstractCatalog {
     readonly icon: string;
     readonly actionHandlers: ActionHandler[];
     idList: string[];
+    storageServices: StorageServices;
     constructor(adminizer: Adminizer, config: NavigationConfig);
     getIdList(): Promise<string[]>;
 }
-export {};