adminizer 4.7.0-build.222 → 5.0.0-build.0

package/helpers/inertiaAutHelper.js

@@ -1,5 +1,5 @@
 export function redirectToLogin(req, res) {
-    const loginUrl = `${req.adminizer.config.routePrefix}/model/userap/login`;
+    const loginUrl = `${req.adminizer.config.routePrefix}/model/User/login`;
     const redirectTo = encodeURIComponent(req.originalUrl);
     res.redirect(`${loginUrl}?redirectTo=${redirectTo}`);
 }
@@ -15,12 +15,12 @@ export function inertiaLoginHelper(req) {
         success: req.i18n.__("Verification complete!"),
         error: req.i18n.__("Error solving CAPTCHA. Try again."),
     };
-    props.submitLink = `${req.adminizer.config.routePrefix}/model/userap/login`;
+    props.submitLink = `${req.adminizer.config.routePrefix}/model/User/login`;
     props.redirectTo = req.query?.redirectTo || '';
     if (req.adminizer.config.registration?.enable === true) {
         props.registerLink = {
             title: req.i18n.__("Register"),
-            link: `${req.adminizer.config.routePrefix}/model/userap/register`
+            link: `${req.adminizer.config.routePrefix}/model/User/register`
         };
     }
     // Optional additional link at the bottom of login page
@@ -46,7 +46,7 @@ export function inertiaLoginHelper(req) {
 }
 export function inertiaRegisterHelper(req) {
     let props = {};
-    props.submitLink = `${req.adminizer.config.routePrefix}/model/userap/register`;
+    props.submitLink = `${req.adminizer.config.routePrefix}/model/User/register`;
     props.header = {
         title: req.i18n.__("Create an Account"),
         desc: req.i18n.__("Please fill out the fields below")
@@ -60,7 +60,7 @@ export function inertiaRegisterHelper(req) {
     props.localeLabel = req.i18n.__("Locale");
     props.submitButton = req.i18n.__("Register");
     props.backToLogin = {
-        link: `${req.adminizer.config.routePrefix}/model/userap/login`,
+        link: `${req.adminizer.config.routePrefix}/model/User/login`,
         text: req.i18n.__("Back to Login")
     };
     return props;

package/helpers/inertiaGroupHelper.d.ts

@@ -1,5 +1,5 @@
-import { GroupAP } from "../models/GroupAP";
-import { UserAP } from "../models/UserAP";
+import { Group } from "../models/Group";
+import { User } from "../models/User";
 import { AccessRightsToken, ModelResource, PropsField } from "../interfaces/types";
 interface groupedTokens {
     header: string;
@@ -22,7 +22,7 @@ interface listProps extends Record<string | number | symbol, unknown> {
     users: PropsField[];
     groupedTokens: groupedTokens[];
 }
-export declare function inertiaGroupHelper(modelResource: ModelResource, req: ReqType, users: UserAP[], groupedTokens: {
+export declare function inertiaGroupHelper(modelResource: ModelResource, req: ReqType, users: User[], groupedTokens: {
     [key: string]: AccessRightsToken[];
-}, group?: GroupAP, view?: boolean): listProps;
+}, group?: Group, view?: boolean): listProps;
 export {};

package/helpers/inertiaMenuHelper.js

@@ -51,6 +51,6 @@ export class InertiaMenuHelper {
         return this.adminizer.menuHelper.getBrandTitle();
     }
     getLogoutUrl() {
-        return `${this.adminizer.config.routePrefix}/model/userap/logout`;
+        return `${this.adminizer.config.routePrefix}/model/User/logout`;
     }
 }

package/helpers/inertiaUserHelper.d.ts

@@ -1,5 +1,5 @@
-import { GroupAP } from "../models/GroupAP";
-import { UserAP } from "../models/UserAP";
+import { Group } from "../models/Group";
+import { User } from "../models/User";
 import { ModelResource, PropsField } from "../interfaces/types";
 interface listProps extends Record<string | number | symbol, unknown> {
     edit: boolean;
@@ -24,5 +24,5 @@ interface listProps extends Record<string | number | symbol, unknown> {
     };
     apiKey?: string;
 }
-export declare function inertiaUserHelper(modelResource: ModelResource, req: ReqType, groups: GroupAP[], user?: UserAP, view?: boolean): listProps;
+export declare function inertiaUserHelper(modelResource: ModelResource, req: ReqType, groups: Group[], user?: User, view?: boolean): listProps;
 export {};

package/helpers/inertiaUserHelper.js

@@ -8,7 +8,7 @@ export function inertiaUserHelper(modelResource, req, groups, user, view = false
         },
         userPretend: {
             label: req.i18n.__('Pretend to be a user'),
-            postLink: `${req.adminizer.config.routePrefix}/model/userap/login`
+            postLink: `${req.adminizer.config.routePrefix}/model/User/login`
         },
         passwordError: req.i18n.__('Values in "password" and "repeatPassword" fields should be the same'),
         btnSave: {

package/helpers/menuHelper.d.ts

@@ -3,7 +3,7 @@
  *
  * @constructor
  */
-import { UserAP } from "../models/UserAP";
+import { User } from "../models/User";
 import { ActionType, AdminpanelConfig, HrefConfig, ModelConfig } from "../interfaces/adminpanelConfig";
 export type MenuItem = {
     link: string;
@@ -65,5 +65,5 @@ export declare class MenuHelper {
      *
      * @returns {Array}
      */
-    getMenuItems(user: UserAP): MenuItem[];
+    getMenuItems(user: User): MenuItem[];
 }

package/index.d.ts

@@ -8,8 +8,8 @@ export * from "./lib/widgets/abstractWidgetBase";
 export * from "./lib/widgets/abstractSwitch";
 export * from "./lib/widgets/widgetHandler";
 export * from "./lib/catalog/AbstractCatalog";
-export * from "./lib/catalog/Navigation";
 export * from "./lib/catalog/CatalogHandler";
+export * from "./lib/catalog/CatalogTemplateComponentHandler";
 export * from "./lib/media-manager/MediaManagerHandler";
 export * from "./controllers/media-manager/mediaManagerAdapter";
 export * from "./interfaces/adminpanelConfig";
@@ -20,26 +20,38 @@ export * from "./interfaces/internalModelAccess";
 export * from "./interfaces/MaaterialIcons";
 export * from "./lib/model/AbstractModel";
 export * from "./lib/model/InternalModelAccessFactory";
+export * from "./system/systemModelContracts";
 export * from "./lib/model/adapter/sequelize";
 export * from "./lib/model/adapter/typeorm";
 export * from "./lib/media-manager/AbstractMediaManager";
-export * from "./lib/controls/AbstractControls";
+export * from "./lib/controls/Control";
 export * from "./lib/controls/ControlsHandler";
 export * from "./lib/Adminizer";
 export * from "./lib/I18n";
-export * from "./models/GroupAP";
-export * from "./models/UserAP";
+export * from "./models/Group";
+export * from "./models/User";
+export * from "./models/Filter";
+export * from "./models/FilterColumn";
+export * from "./models/HistoryActions";
+export * from "./models/Notification";
+export * from "./models/UserNotification";
 export * from "./models/MediaManagerAP";
 export * from "./models/MediaManagerAssociationsAP";
 export * from "./models/MediaManagerMetaAP";
-export * from "./models/NavigationAP";
-export * from "./system/bindNavigation";
+export * from "./policies/authPolicies";
 export * from "./lib/helper/jwt";
 export * from "./lib/notifications/AbstractNotificationService";
 export * from "./lib/POWCaptcha";
 export * from "./lib/ai-assistant/AbstractAiModelService";
+export * from "./lib/ai-assistant/AiAssistantHandler";
 export * from "./lib/DataAccessor";
 export * from "./lib/history-actions/AbstractHistoryAdapter";
 export * from "./lib/filters/CustomFilterHandler";
 export * from "./lib/feedback/AbstractFeedbackHandler";
 export * from "./lib/feedback/FeedbackHandler";
+export * from "./lib/app-manager/AdminizerApp";
+export * from "./lib/app-manager/AppManager";
+export * from "./lib/app-manager/ControllerHandler";
+export * from "./lib/app-manager/AssetHandler";
+export * from "./lib/app-manager/ConfigLayerHandler";
+export * from "./lib/access-rights/AccessRightsHandler";

package/index.js

@@ -8,8 +8,8 @@ export * from "./lib/widgets/abstractWidgetBase.js";
 export * from "./lib/widgets/abstractSwitch.js";
 export * from "./lib/widgets/widgetHandler.js";
 export * from "./lib/catalog/AbstractCatalog.js";
-export * from "./lib/catalog/Navigation.js";
 export * from "./lib/catalog/CatalogHandler.js";
+export * from "./lib/catalog/CatalogTemplateComponentHandler.js";
 export * from "./lib/media-manager/MediaManagerHandler.js";
 export * from "./controllers/media-manager/mediaManagerAdapter.js";
 export * from "./interfaces/adminpanelConfig.js";
@@ -20,26 +20,38 @@ export * from "./interfaces/internalModelAccess.js";
 export * from "./interfaces/MaaterialIcons.js";
 export * from "./lib/model/AbstractModel.js";
 export * from "./lib/model/InternalModelAccessFactory.js";
+export * from "./system/systemModelContracts.js";
 export * from "./lib/model/adapter/sequelize.js";
 export * from "./lib/model/adapter/typeorm.js";
 export * from "./lib/media-manager/AbstractMediaManager.js";
-export * from "./lib/controls/AbstractControls.js";
+export * from "./lib/controls/Control.js";
 export * from "./lib/controls/ControlsHandler.js";
 export * from "./lib/Adminizer.js";
 export * from "./lib/I18n.js";
-export * from "./models/GroupAP.js";
-export * from "./models/UserAP.js";
+export * from "./models/Group.js";
+export * from "./models/User.js";
+export * from "./models/Filter.js";
+export * from "./models/FilterColumn.js";
+export * from "./models/HistoryActions.js";
+export * from "./models/Notification.js";
+export * from "./models/UserNotification.js";
 export * from "./models/MediaManagerAP.js";
 export * from "./models/MediaManagerAssociationsAP.js";
 export * from "./models/MediaManagerMetaAP.js";
-export * from "./models/NavigationAP.js";
-export * from "./system/bindNavigation.js";
+export * from "./policies/authPolicies.js";
 export * from "./lib/helper/jwt.js";
 export * from "./lib/notifications/AbstractNotificationService.js";
 export * from "./lib/POWCaptcha.js";
 export * from "./lib/ai-assistant/AbstractAiModelService.js";
+export * from "./lib/ai-assistant/AiAssistantHandler.js";
 export * from "./lib/DataAccessor.js";
 export * from "./lib/history-actions/AbstractHistoryAdapter.js";
 export * from "./lib/filters/CustomFilterHandler.js";
 export * from "./lib/feedback/AbstractFeedbackHandler.js";
 export * from "./lib/feedback/FeedbackHandler.js";
+export * from "./lib/app-manager/AdminizerApp.js";
+export * from "./lib/app-manager/AppManager.js";
+export * from "./lib/app-manager/ControllerHandler.js";
+export * from "./lib/app-manager/AssetHandler.js";
+export * from "./lib/app-manager/ConfigLayerHandler.js";
+export * from "./lib/access-rights/AccessRightsHandler.js";

package/interfaces/adminpanelConfig.d.ts

@@ -1,14 +1,15 @@
 import { MaterialIcon } from "./MaaterialIcons";
 import { EditorOptions } from "@toast-ui/editor/types/editor";
 import { GridSettings as HandsontableSettings } from "handsontable/settings";
-import { GroupAP } from "../models/GroupAP";
-import { UserAP } from "../models/UserAP";
+import { Group } from "../models/Group";
+import { User } from "../models/User";
 import { InternalModelAccessMap } from "./internalModelAccess";
 /**
  * Controller function type - async function that handles requests and returns a response
  */
 export type ControllerFunction = (req: ReqType, res: ResType) => Promise<any>;
 export type AdminpanelIcon = MaterialIcon;
+export type NonEmptyArray<T> = [T, ...T[]];
 export type FieldsTypes = "string" | "password" | "date" | "datetime" | "time" | "integer" | "number" | "float" | "color" | "email" | "month" | "week" | "range" | "boolean" | "binary" | "text" | "longtext" | "mediumtext" | "ckeditor" | "wysiwyg" | "texteditor" | "word" | 'tui' | 'tuieditor' | 'toast-ui' | "jsoneditor" | "json" | "array" | "object" | "ace" | "code" | "html" | "xml" | "aceeditor" | "menu" | "schedule" | "worktime" | "association" | "association-many" | "select" | "select-many" | "table" | "geojson" | "mediamanager" | "single-file" | 
 /**
  * it will be needed only for polygon data
@@ -58,7 +59,7 @@ export interface AdminpanelConfig {
         /**
          * Optional additional link at the bottom of the login page
          * Example:
-         *  addishinalLoginPage: { link: '/model/userap/register', textKey: 'Additional login page' }
+         *  addishinalLoginPage: { link: '/model/User/register', textKey: 'Additional login page' }
          *  link can be relative to routePrefix (e.g. 'model/help' or '/model/help') or absolute (https://...)
          */
         addishinalLoginPage?: {
@@ -98,13 +99,13 @@ export interface AdminpanelConfig {
          * Optional callback to filter or transform all navbar links after models have been processed.
          * Receives all links (static + model-generated) and the current user; returns the final array.
          */
-        handleAdditionalLinks?: (user: UserAP, allLinks: HrefConfig[]) => HrefConfig[];
+        handleAdditionalLinks?: (user: User, allLinks: HrefConfig[]) => HrefConfig[];
         /**
          * Per-section handlers, applied after all links (static + model-generated) are collected.
          * Each key is a section name; the handler receives links belonging to that section.
          */
         sectionHandlers?: {
-            [section: string]: (user: UserAP, links: HrefConfig[]) => HrefConfig[];
+            [section: string]: (user: User, links: HrefConfig[]) => HrefConfig[];
         };
     };
     /**
@@ -198,10 +199,6 @@ export interface AdminpanelConfig {
      * System field for store absolute root path adminpanel hookfolder
      */
     rootPath?: string;
-    /**
-     *  Navigation
-     */
-    navigation?: NavigationConfig;
     mediamanager?: MediaManagerConfig;
     /** System settings */
     system?: {
@@ -395,15 +392,15 @@ export interface ModelConfig {
      * */
     identifierField?: string;
     /** In this field we can set model field, for which we want to check user access right.
-     *  May be association or association-many to UserAP or GroupAP */
+     *  May be association or association-many to User or Group */
     userAccessRelation?: {
         field: string;
         via?: string;
     } | string;
     userAccessRelationCallback?: (userWithGroups: UserWithGroups, record: any) => boolean;
 }
-type UserWithGroups = UserAP & {
-    groups: GroupAP[];
+type UserWithGroups = User & {
+    groups: Group[];
 };
 export type ModelFieldConfig = (BaseFieldConfig | TuiEditorFieldConfig) & {
     groupsAccessRights?: string[];
@@ -491,7 +488,7 @@ export interface TuiEditorFieldConfig extends BaseFieldConfig {
 export interface MediaManagerOptionsField {
     id: 'default' | string;
     group: string;
-    accept: string[];
+    accept: NonEmptyArray<string>;
     initTab?: 'tile-image' | 'table-video' | 'table-text' | 'table-application' | 'table-all' | 'tile-all';
     config?: Record<string, any>;
     onlyView?: boolean;
@@ -586,26 +583,6 @@ export interface HrefConfig {
      */
     section?: string;
 }
-export interface NavigationItemTypeConfig {
-    model: string;
-    title: string;
-    /**
-     *  /page/${data.record.slug}
-     */
-    urlPath: string | ((v: any) => string);
-}
-export interface NavigationConfig {
-    model?: string;
-    sections: string[];
-    groupField: {
-        name: string;
-        required: boolean;
-        label: string;
-    }[];
-    allowContentInGroup?: boolean;
-    items: NavigationItemTypeConfig[];
-    movingGroupsRootOnly?: boolean;
-}
 export interface MediaManagerConfig {
     fileStoragePath: string;
     allowMIME?: string[];

package/interfaces/global.d.ts

@@ -4,7 +4,8 @@ import multer from "multer";
 import { I18n } from "../lib/I18n";
 import { Inertia } from "../lib/inertia/inertiaAdapter";
 import { Flash } from "../lib/inertia/flash";
-import { UserAP } from "../models/UserAP";
+import { User } from "../models/User";
+import { AppRuntime } from "../lib/app-manager/AdminizerApp";
 declare global {
     /** @deprecated use import from TS model decalration */
     type ModelsAP = {
@@ -38,25 +39,20 @@ declare global {
             isPublic?: boolean;
             parent?: ModelsAP["MediaManagerAP"];
         };
-        NavigationAP: {
-            id?: string;
-            label: string;
-            tree: any;
-        };
     };
     type reqSession = {
         flashMessages: Record<string, string[]>;
         xInertiaCurrentComponent: string | undefined;
-        UserAP: UserAP;
+        User: User;
         messages: {
             adminError: string[];
             adminSuccess: string[];
         };
-        userPretended?: UserAP;
+        userPretended?: User;
     };
     type FlashMessages = 'info' | 'error' | 'success' | string;
     type ReqType = Request & {
-        user: UserAP;
+        user: User;
         Inertia: Inertia;
         flash: Flash<FlashMessages>;
         session: reqSession;
@@ -67,7 +63,11 @@ declare global {
         route: {
             [key: string]: string;
         };
+        /**
+         * @deprecated Will be removed in Adminizer v6. Use `runtime` in app controllers.
+         */
         adminizer: Adminizer;
+        runtime: AppRuntime;
         upload: (options?: {
             destination?: string;
             filename?: (file: Express.Multer.File) => string;
@@ -77,12 +77,7 @@ declare global {
         uploadedFileType: string;
         params: Record<string, string>;
     };
-    type ResType = Response & {
-        /**
-         * @deprecated // TODO delete after finish catalog
-         */
-        viewAdmin(specifiedPath: string, locals?: any, cb_view?: Function): void;
-    };
+    type ResType = Response;
     type MiddlewareType = (req: ReqType, res: ResType, next: NextFunction) => void;
     type PropType<TObj, TProp extends keyof TObj> = TObj[TProp];
 }

package/interfaces/listQueryBuilder.d.ts

@@ -1,4 +1,4 @@
-import { FilterCondition } from "../models/FilterAP";
+import { FilterCondition } from "../models/Filter";
 /**
  * Input format for list/feed/export query builder.
  * This is not the internal model query language.

package/lib/Adminizer.d.ts

@@ -14,15 +14,29 @@ import type { ViteDevServer } from 'vite';
 import { MenuHelper } from "../helpers/menuHelper";
 import { ControlsHandler } from "./controls/ControlsHandler";
 import { CatalogHandler } from "./catalog/CatalogHandler";
+import { CatalogTemplateComponentHandler } from "./catalog/CatalogTemplateComponentHandler";
 import { AiAssistantHandler } from './ai-assistant/AiAssistantHandler';
 import { NotificationHandler } from './notifications/NotificationHandler';
 import { INotification } from "../interfaces/types";
 import { MediaManagerHandler } from "./media-manager/MediaManagerHandler";
-import { StorageServices } from "./catalog/Navigation";
 import { HistoryHandler } from "./history-actions/HistoryHandler";
 import { CustomFilterHandler } from "./filters/CustomFilterHandler";
 import { FeedbackHandler } from "./feedback/FeedbackHandler";
+import { AppManager } from "./app-manager/AppManager";
+import { ControllerHandler } from "./app-manager/ControllerHandler";
+import { AssetHandler } from "./app-manager/AssetHandler";
+import { ConfigLayerHandler } from "./app-manager/ConfigLayerHandler";
+import { AccessRightsHandler } from "./access-rights/AccessRightsHandler";
+export declare function createAdminizerLogger(): winston.Logger;
+export interface EmitAsyncOptions {
+    /**
+     * Maximum time to wait for each listener. Set to 0 to disable the timeout.
+     * @default 10000
+     */
+    timeoutMs?: number;
+}
 export declare class Adminizer {
+    private static readonly defaultListenerTimeoutMs;
     /**
      * If you convey this default Middleware, it will add it to the very top of the router,
      * and will contact each request
@@ -46,9 +60,14 @@ export declare class Adminizer {
     vite: ViteDevServer;
     controlsHandler: ControlsHandler;
     catalogHandler: CatalogHandler;
+    catalogTemplateComponentHandler: CatalogTemplateComponentHandler;
     mediaManagerHandler: MediaManagerHandler;
-    storageServices: StorageServices;
     feedbackHandler: FeedbackHandler;
+    appManager: AppManager;
+    controllerHandler: ControllerHandler;
+    assetHandler: AssetHandler;
+    configLayerHandler: ConfigLayerHandler;
+    accessRightsHandler: AccessRightsHandler;
     jwtSecret: string;
     static logger: winston.Logger;
     constructor(ormAdapters: AbstractAdapter[]);
@@ -61,6 +80,10 @@ export declare class Adminizer {
     init(config: AdminpanelConfig): Promise<void>;
     sendNotification(notification: Omit<INotification, 'id' | 'createdAt' | 'icon'>): Promise<boolean>;
     get emitter(): EventEmitter;
+    /**
+     * Runs event listeners and waits for async module side effects before continuing.
+     */
+    emitAsync<TPayload = unknown>(event: string | symbol, payload: TPayload, options?: EmitAsyncOptions): Promise<void>;
     getOrmAdapter(ormType: string): AbstractAdapter;
     static get log(): {
         info: (...args: any[]) => winston.Logger;