adminizer 4.6.0 → 4.7.0-build.222

package/models/FilterColumnAP.js

@@ -0,0 +1,21 @@
+/**
+ * FilterColumnAP model schema
+ * Represents column configuration for a filter
+ */
+export default {
+    id: {
+        type: "number",
+        autoIncrement: true,
+        primaryKey: true
+    },
+    filter: {
+        model: 'FilterAP'
+    },
+    fieldName: {
+        type: "string",
+        required: true
+    },
+    order: {
+        type: "number"
+    }
+};

package/models/GroupAP.d.ts

@@ -23,7 +23,7 @@ declare const _default: {
 };
 export default _default;
 export interface GroupAP {
-    id: number;
+    id?: number;
     name: string;
     description?: string;
     tokens?: string[];

package/models/HistoryActionsAP.d.ts

@@ -42,7 +42,7 @@ declare const _default: {
 };
 export default _default;
 export interface HistoryActionsAP {
-    id: number;
+    id?: number;
     modelId: number | string;
     modelName: string;
     action: string;
@@ -50,7 +50,7 @@ export interface HistoryActionsAP {
     diff: any;
     user: UserAP;
     isCurrent: boolean;
-    createdAt: number;
-    updatedAt: number;
+    createdAt?: number;
+    updatedAt?: number;
     preview: boolean;
 }

package/models/MediaManagerMetaAP.d.ts

@@ -28,7 +28,7 @@ declare const _default: {
 };
 export default _default;
 export interface MediaManagerMetaAP {
-    id: string;
+    id?: string;
     key?: string;
     value?: Record<string, unknown>;
     isPublic?: boolean;

package/models/NavigationAP.d.ts

@@ -16,7 +16,7 @@ declare const _default: {
 };
 export default _default;
 export interface NavigationAP {
-    id: string;
+    id?: string;
     label: string;
     tree: Record<string, unknown>;
 }

package/models/UserAP.d.ts

@@ -52,10 +52,14 @@ declare const _default: {
     isConfirmed: {
         type: string;
     };
+    apiKey: {
+        type: string;
+        field: string;
+    };
 };
 export default _default;
 export interface UserAP {
-    id: number;
+    id?: number;
     login: string;
     fullName?: string;
     email?: string;
@@ -73,4 +77,5 @@ export interface UserAP {
         layout: WidgetsLayouts;
     };
     isConfirmed?: boolean;
+    apiKey?: string;
 }

package/models/UserAP.js

@@ -49,5 +49,9 @@ export default {
     },
     isConfirmed: {
         type: "boolean"
+    },
+    apiKey: {
+        type: "string",
+        field: "userApiKey"
     }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adminizer",
   "type": "module",
-  "version": "4.6.0",
+  "version": "4.7.0-build.222",
   "main": "index.js",
   "exports": {
     ".": "./index.js",
@@ -13,13 +13,13 @@
     "test": "vitest --watch=false",
     "test:watch": "vitest --reporter verbose",
     "start": "cross-env NO_SEED_DATA=true ORM=sequelize tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
-    "start:waterline": "cross-env NO_SEED_DATA=true ORM=waterline tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
-    "dev": "cross-env ADMINIZER_VITE_ENV=dev VITE_ENV=dev ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
-    "dev:no-seed": "cross-env ADMINIZER_VITE_ENV=dev VITE_ENV=dev NO_SEED_DATA=true ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
-    "dev:no-seed-clean": "cross-env ADMINIZER_VITE_ENV=dev VITE_ENV=dev NO_SEED_DATA=true CLEAN_TMP=true ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
-    "dev:waterline": "cross-env ADMINIZER_VITE_ENV=dev VITE_ENV=dev ORM=waterline tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
-    "dev:waterline:no-seed": "cross-env ADMINIZER_VITE_ENV=dev VITE_ENV=dev NO_SEED_DATA=true ORM=waterline tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
-    "dev:cors": "cross-env ADMINIZER_VITE_ENV=dev VITE_ENV=dev NO_SEED_DATA=true ORM=waterline FRONTEND_URL=http://localhost:8080 tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "dev": "cross-env ADMINIZER_ENV=dev ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "dev:no-seed": "cross-env ADMINIZER_ENV=dev NO_SEED_DATA=true ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "start:typeorm": "cross-env NO_SEED_DATA=true ORM=typeorm tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "dev:typeorm": "cross-env ADMINIZER_ENV=dev ORM=typeorm tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "dev:typeorm:no-seed": "cross-env ADMINIZER_ENV=dev NO_SEED_DATA=true ORM=typeorm tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "dev:no-seed-clean": "cross-env ADMINIZER_ENV=dev NO_SEED_DATA=true CLEAN_TMP=true ORM=sequelize tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "dev:cors": "cross-env ADMINIZER_ENV=dev NO_SEED_DATA=true ORM=sequelize FRONTEND_URL=http://localhost:8080 tsx watch --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "build:assets": "vite build",
     "compile:backend": "tsc -p src/tsconfig.json && node ./scripts/appendJsExtension.js",
     "compile:ui": "tsc -p tsconfig.ui.json",
@@ -33,8 +33,10 @@
     "copy:modules": "node copy-modules.js",
     "build:assets:modules": "npm run build:assets && npm run copy:modules",
     "start:seed": "cross-env ORM=sequelize tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "start:typeorm:seed": "cross-env ORM=typeorm tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
     "demo:build": "npm run copy:backend && npm run compile:backend && npm run build:assets && npm run copy:modules",
-    "demo": "cross-env ORM=sequelize tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts"
+    "demo": "cross-env ORM=sequelize tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts",
+    "demo:typeorm": "cross-env ORM=typeorm tsx --tsconfig ./fixture/tsconfig.json ./fixture/index.ts"
   },
   "keywords": [],
   "author": "Siziy Ivan <xziy88@gmail.com>",
@@ -48,25 +50,26 @@
     "url": "https://github.com/adminization/adminizer"
   },
   "dependencies": {
+    "@handsontable/react-wrapper": "^17.0.1",
     "@minoru/react-dnd-treeview": "^3.5.2",
     "@radix-ui/react-context-menu": "^2.2.15",
     "@radix-ui/react-tabs": "^1.1.12",
-    "body-parser": "^1.20.3",
+    "body-parser": "^2.2.2",
     "chalk": "^5.4.1",
     "cmdk": "^1.1.1",
     "cookie": "^1.0.2",
     "cookie-parser": "^1.4.7",
-    "cors": "^2.8.5",
+    "cors": "^2.8.6",
     "crypto-puzzle": "^5.0.2",
     "date-fns": "^3.6.0",
     "deep-object-diff": "^1.1.9",
-    "dotenv": "^17.2.2",
-    "express": "^4.21.2",
-    "express-session": "^1.18.1",
+    "dotenv": "^17.4.2",
+    "express": "^5.2.1",
+    "express-session": "^1.19.0",
     "image-size": "^2.0.2",
-    "jsonwebtoken": "^9.0.2",
+    "jsonwebtoken": "^9.0.3",
     "material-icons": "^1.13.14",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.1.1",
     "next-themes": "^0.4.6",
     "password-hash": "^1.2.2",
     "react-cropper": "^2.3.3",
@@ -77,8 +80,8 @@
     "sprintf-js": "^1.1.3",
     "typeorm": "^0.3.20",
     "uuid": "^11.0.5",
-    "waterline": "^0.15.2",
     "winston": "^3.17.0",
+    "xlsx": "^0.18.5",
     "zod": "^4.1.11"
   },
   "devDependencies": {
@@ -88,8 +91,7 @@
     "@dnd-kit/sortable": "^10.0.0",
     "@eslint/compat": "^1.2.9",
     "@faker-js/faker": "^9.7.0",
-    "@handsontable/react": "^15.2.0",
-    "@inertiajs/react": "^2.2.0",
+    "@inertiajs/react": "^3.0.3",
     "@monaco-editor/react": "^4.7.0",
     "@openai/agents": "^0.3.2",
     "@radix-ui/react-avatar": "^1.1.3",
@@ -112,15 +114,15 @@
     "@toast-ui/react-editor": "^3.2.3",
     "@types/cookie-parser": "^1.4.8",
     "@types/cors": "^2.8.17",
-    "@types/express": "^5.0.0",
-    "@types/express-session": "^1.18.1",
+    "@types/express": "^5.0.6",
+    "@types/express-session": "^1.19.0",
     "@types/he": "^1.2.3",
     "@types/json-schema": "^7.0.15",
     "@types/jsonwebtoken": "^9.0.9",
     "@types/leaflet": "^1.9.17",
     "@types/lodash": "^4.17.17",
     "@types/lodash-es": "^4.17.12",
-    "@types/multer": "^1.4.12",
+    "@types/multer": "^2.1.0",
     "@types/node": "^22.10.5",
     "@types/password-hash": "^1.2.24",
     "@types/react": "^19.0.3",
@@ -128,16 +130,14 @@
     "@types/react-grid-layout": "^1.3.5",
     "@types/sprintf-js": "^1.1.4",
     "@types/uuid": "^10.0.0",
-    "@types/waterline": "^0.13.9",
     "@typescript-eslint/eslint-plugin": "^8.32.1",
-    "@vitejs/plugin-react": "^4.3.4",
-    "babel-plugin-react-compiler": "^19.0.0-beta-e993439-20250405",
+    "@vitejs/plugin-react": "^5.2.0",
     "ckeditor5": "^45.0.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cross-env": "^7.0.3",
     "eslint": "^9.26.0",
-    "handsontable": "^15.2.0",
+    "handsontable": "^17.0.1",
     "isomorphic-webcrypto": "^2.3.8",
     "json-schema": "^0.4.0",
     "leaflet": "^1.9.4",
@@ -152,8 +152,6 @@
     "react-leaflet": "^5.0.0",
     "react-quill-new": "^3.4.6",
     "react-simple-wysiwyg": "^3.2.2",
-    "sails-disk": "^2.1.2",
-    "sails-postgresql": "^5.0.1",
     "sequelize": "^6.37.7",
     "sequelize-typescript": "^2.1.6",
     "shelljs": "^0.9.2",
@@ -161,13 +159,22 @@
     "sqlite3": "^5.1.7",
     "tailwind-merge": "^3.0.2",
     "tailwindcss": "^4.0.15",
-    "tsx": "^4.19.3",
+    "tsx": "^4.21.0",
     "tw-animate-css": "^1.2.5",
-    "typescript": "^5.7.2",
+    "typescript": "^6.0.3",
     "vanilla-jsoneditor": "^3.1.1",
-    "vite": "^6.1.0",
+    "vite": "^7.3.2",
     "vite-plugin-externals": "^0.6.2",
-    "vite-plugin-full-reload": "^1.2.0",
     "vitest": "^3.0.7"
+  },
+  "overrides": {
+    "@toast-ui/react-editor": {
+      "react": "$react",
+      "react-dom": "$react-dom"
+    },
+    "react-day-picker": {
+      "react": "$react",
+      "react-dom": "$react-dom"
+    }
   }
 }

package/policies/authPolicies.d.ts

@@ -0,0 +1,12 @@
+export type PermissionResolver = string | ((req: ReqType) => string | undefined);
+export type GuardMode = "ui" | "api";
+type GuardOptions = {
+    mode?: GuardMode;
+};
+export declare function requireAuthEnabled(): MiddlewareType;
+export declare function requireAuthUI(): MiddlewareType;
+export declare function requireAuthAPI(): MiddlewareType;
+export declare function requireAdmin(options?: GuardOptions): MiddlewareType;
+export declare function requirePermission(token: PermissionResolver, options?: GuardOptions): MiddlewareType;
+export declare function requireAnyPermission(tokens: PermissionResolver[], options?: GuardOptions): MiddlewareType;
+export {};

package/policies/authPolicies.js

@@ -0,0 +1,104 @@
+import { redirectToLogin } from "../helpers/inertiaAutHelper.js";
+function unauthorized(req, res, mode) {
+    if (mode === "ui") {
+        redirectToLogin(req, res);
+        return;
+    }
+    res.status(401).json({ error: req.i18n?.__("Unauthorized") || "Unauthorized" });
+}
+function forbidden(req, res, mode) {
+    if (mode === "ui") {
+        res.sendStatus(403);
+        return;
+    }
+    res.status(403).json({ error: req.i18n?.__("Forbidden") || "Forbidden" });
+}
+function resolveToken(token, req) {
+    if (typeof token === "function") {
+        return token(req);
+    }
+    return token;
+}
+export function requireAuthEnabled() {
+    return (req, res, next) => {
+        if (!req.adminizer.config.auth.enable) {
+            return res.status(403).json({ error: "Auth is disabled" });
+        }
+        return next();
+    };
+}
+export function requireAuthUI() {
+    return (req, res, next) => {
+        if (req.adminizer.config.auth.enable && !req.user) {
+            unauthorized(req, res, "ui");
+            return;
+        }
+        return next();
+    };
+}
+export function requireAuthAPI() {
+    return (req, res, next) => {
+        if (req.adminizer.config.auth.enable && !req.user) {
+            unauthorized(req, res, "api");
+            return;
+        }
+        return next();
+    };
+}
+export function requireAdmin(options = {}) {
+    const mode = options.mode || "api";
+    return (req, res, next) => {
+        if (!req.adminizer.config.auth.enable) {
+            return next();
+        }
+        if (!req.user) {
+            unauthorized(req, res, mode);
+            return;
+        }
+        if (!req.user.isAdministrator) {
+            forbidden(req, res, mode);
+            return;
+        }
+        return next();
+    };
+}
+export function requirePermission(token, options = {}) {
+    const mode = options.mode || "api";
+    return (req, res, next) => {
+        if (!req.adminizer.config.auth.enable) {
+            return next();
+        }
+        if (!req.user) {
+            unauthorized(req, res, mode);
+            return;
+        }
+        const tokenId = resolveToken(token, req);
+        const hasPermission = req.adminizer.accessRightsHelper.hasPermission(tokenId, req.user);
+        if (!hasPermission) {
+            forbidden(req, res, mode);
+            return;
+        }
+        return next();
+    };
+}
+export function requireAnyPermission(tokens, options = {}) {
+    const mode = options.mode || "api";
+    return (req, res, next) => {
+        if (!req.adminizer.config.auth.enable) {
+            return next();
+        }
+        if (!req.user) {
+            unauthorized(req, res, mode);
+            return;
+        }
+        const tokenIds = tokens
+            .map((token) => resolveToken(token, req))
+            .filter((token) => Boolean(token));
+        const hasPermission = req.adminizer.accessRightsHelper.enoughPermissions(tokenIds, req.user);
+        if (!hasPermission) {
+            forbidden(req, res, mode);
+            return;
+        }
+        return next();
+    };
+}

package/policies/permissionResolvers.d.ts

@@ -0,0 +1,12 @@
+export declare const GROUP_FILTER_VISIBILITY_TOKEN = "manage-group-filter-visibility";
+export declare function modelReadToken(req: ReqType): string | undefined;
+export declare function modelCreateToken(req: ReqType): string | undefined;
+export declare function modelUpdateToken(req: ReqType): string | undefined;
+export declare function modelDeleteToken(req: ReqType): string | undefined;
+export declare function widgetToken(req: ReqType): string | undefined;
+export declare function widgetsToken(): string;
+export declare function catalogToken(req: ReqType): string | undefined;
+export declare function mediaManagerToken(req: ReqType): string | undefined;
+export declare function aiModelToken(req: ReqType): string | undefined;
+export declare function historyToken(req: ReqType): string;
+export declare function groupFilterVisibilityToken(): string;

package/policies/permissionResolvers.js

@@ -0,0 +1,52 @@
+function extractModelResourceName(req) {
+    if (req.params?.modelResourceName) {
+        return req.params.modelResourceName;
+    }
+    const path = req.path || req.originalUrl || "";
+    const match = path.match(/\/model\/([^/]+)/i);
+    return match?.[1];
+}
+export const GROUP_FILTER_VISIBILITY_TOKEN = "manage-group-filter-visibility";
+export function modelReadToken(req) {
+    const modelResourceName = extractModelResourceName(req);
+    return modelResourceName ? `read-${modelResourceName}-model` : undefined;
+}
+export function modelCreateToken(req) {
+    const modelResourceName = extractModelResourceName(req);
+    return modelResourceName ? `create-${modelResourceName}-model` : undefined;
+}
+export function modelUpdateToken(req) {
+    const modelResourceName = extractModelResourceName(req);
+    return modelResourceName ? `update-${modelResourceName}-model` : undefined;
+}
+export function modelDeleteToken(req) {
+    const modelResourceName = extractModelResourceName(req);
+    return modelResourceName ? `delete-${modelResourceName}-model` : undefined;
+}
+export function widgetToken(req) {
+    const widgetId = req.params?.widgetId;
+    return widgetId ? `widget-${widgetId}` : undefined;
+}
+export function widgetsToken() {
+    return "widgets";
+}
+export function catalogToken(req) {
+    const slug = req.params?.slug;
+    if (!slug)
+        return undefined;
+    return `catalog-${slug}`;
+}
+export function mediaManagerToken(req) {
+    const id = req.params?.id;
+    return id ? `mediaManager-${id}` : undefined;
+}
+export function aiModelToken(req) {
+    const modelId = req.params?.modelId || (typeof req.body?.modelId === "string" ? req.body.modelId : undefined);
+    return modelId ? `ai-assistant-${modelId}` : undefined;
+}
+export function historyToken(req) {
+    return `history-${req.adminizer.config.history?.adapter ?? "default"}`;
+}
+export function groupFilterVisibilityToken() {
+    return GROUP_FILTER_VISIBILITY_TOKEN;
+}

package/services/FeedService.d.ts

@@ -0,0 +1,70 @@
+import { Adminizer } from "../lib/Adminizer";
+import { FilterAP } from "../models/FilterAP";
+import { UserAP } from "../models/UserAP";
+/**
+ * Feed export format types
+ */
+export type FeedFormat = 'json' | 'xml';
+/**
+ * FeedService — generates public feed exports (Atom XML, JSON) by apiKey
+ * No authentication required — access is granted via apiKey alone
+ */
+export declare class FeedService {
+    private adminizer;
+    constructor(adminizer: Adminizer);
+    /**
+     * Find filter by apiKey and verify it's enabled
+     */
+    findFilterByApiKey(apiKey: string): Promise<FilterAP | null>;
+    /**
+     * Fetch data for a filter (no auth required — public API)
+     * Bypasses permission checks by building fields directly from model config
+     * Also bypasses DataAccessor to avoid user-based filtering
+     */
+    private fetchFilterData;
+    /**
+     * Build fields object directly from model attributes (bypasses permission checks)
+     */
+    private buildFieldsFromAttributes;
+    /**
+     * Generate JSON feed
+     */
+    generateJsonFeed(filter: FilterAP, adminizer?: Adminizer, user?: UserAP): Promise<any>;
+    /**
+     * Generate Atom XML feed
+     */
+    generateAtomFeed(filter: FilterAP, adminizer?: Adminizer, user?: UserAP): Promise<string>;
+    /**
+     * Build Atom XML string
+     */
+    private buildAtomXml;
+    /**
+     * Escape XML special characters
+     */
+    private escapeXml;
+    /**
+     * Prepare data for export — convert values to human-readable format
+     */
+    private prepareExportData;
+    /**
+     * Format value for export based on type
+     */
+    private formatExportValue;
+    /**
+     * Apply custom column configuration
+     */
+    private applyCustomColumns;
+    /**
+     * Resolve the best field for "newest first" sorting.
+     * Priority: createdAt -> created_at -> id
+     */
+    private resolveCreatedAtSortField;
+    /**
+     * Find title field in fields config
+     */
+    private findTitleField;
+    /**
+     * Find date field in fields config
+     */
+    private findDateField;
+}