adminizer 4.6.0 → 4.7.0-build.221

package/lib/ui-i18n/uiTranslationKeys.js

@@ -0,0 +1,268 @@
+export const COMMON_UI_TRANSLATION_KEYS = [
+    "Delete",
+    "Diff",
+    "Preview",
+    "Add",
+    "Search",
+    "Yes",
+    "No",
+    "On",
+    "Off",
+    "Hide",
+    "Show",
+    "No notifications found",
+    "No notifications",
+    "No widgets found",
+    "Changes not found",
+    "Old",
+    "New",
+    "Added",
+    "Removed",
+    "Updated",
+    "changed type",
+    "Error: Invalid field data",
+    "Error: Fields data is invalid",
+    "No fields to display",
+    "Error: Some fields are missing required properties (name, type, label)",
+    "Edit",
+    "create",
+    "Clean",
+    "Are you sure?",
+    "Select Item type",
+    "Select Ids",
+    "Open in a new window",
+    "Visible",
+    "Performing an action...",
+    "Action completed",
+    "Save",
+    "First",
+    "Last",
+    "Previous",
+    "Next",
+    "Send feedback",
+    "Feedback",
+    "Title",
+    "Description",
+    "Attach files",
+    "Send",
+    "Sending...",
+    "Feedback sent successfully",
+    "Title is required",
+    "File size exceeds the 5 MB limit",
+    "Remove file",
+    "Max 5 MB per file",
+    "View All",
+    "Make read",
+    "Make all read",
+    "Message",
+    "Date",
+    "Watch",
+    "Current",
+    "There is no history"
+];
+export const FILTER_UI_TRANSLATION_KEYS = [
+    "Filters",
+    "Saved filters",
+    "Active filter",
+    "Add filter",
+    "Reset filter",
+    "Reset",
+    "Equal",
+    "Not equal",
+    "Contains",
+    "Not contains",
+    "Starts with",
+    "Ends with",
+    "Is empty",
+    "Is not empty",
+    "Greater than",
+    "Greater or equal",
+    "Less than",
+    "Less or equal",
+    "Between",
+    "After",
+    "After or equal",
+    "Before",
+    "Before or equal",
+    "In list",
+    "Not in list",
+    "Is null",
+    "Is not null",
+    "Yes",
+    "No",
+    "From",
+    "To",
+    "From...",
+    "To...",
+    "Date...",
+    "Today",
+    "Month",
+    "Month range",
+    "Year",
+    "Year range",
+    "Value...",
+    "Select...",
+    "selected",
+    "Search...",
+    "No results",
+    "Error",
+    "Model not found",
+    "Error applying filter",
+    "Enter filter name",
+    "Temporary filter",
+    "Error: model not found",
+    "Error loading columns",
+    "Network error",
+    "Columns settings",
+    "Available columns",
+    "Visible columns",
+    "Add all",
+    "Hide all",
+    "No available columns",
+    "Move columns here",
+    "Save changes",
+    "Apply",
+    "Save",
+    "Back",
+    "Cancel",
+    "conditions",
+    "modified",
+    "Private filter",
+    "For groups",
+    "Public filter",
+    "Only for you",
+    "For selected groups",
+    "For all users",
+    "Visible only to you",
+    "Visible only to your group",
+    "API access (feed)",
+    "Hide",
+    "Show",
+    "Regenerate",
+    "copied to clipboard",
+    "Failed to copy",
+    "Loading filters...",
+    "No saved filters",
+    "Save current filter for quick access",
+    "Someone else's private filter (owner:",
+    "unknown)",
+    "Owner",
+    "Apply filter",
+    "Delete filter",
+    "No permission to delete filter",
+    "Edit filter",
+    "New filter",
+    "Filter conditions",
+    "Add condition",
+    "Select field",
+    "No conditions. Add a condition above.",
+    "Name",
+    "Description",
+    "Icon",
+    "Color",
+    "Filter parameters",
+    "Change filter conditions and parameters",
+    "Configure filter conditions",
+    "Specify name and parameters for saving",
+    "Someone else's private filter",
+    "You cannot change someone else's filter visibility",
+    "Private",
+    "Public",
+    "Visibility",
+    "Export",
+    "Exporting...",
+    "Export is only available with an active filter",
+    "Export to",
+    "completed",
+    "Export error",
+    "Data in JSON format",
+    "Text format CSV",
+    "Excel file",
+    "Conditions",
+    "Access for groups",
+    "Selected groups",
+    "Groups list",
+    "Columns",
+    "Saving...",
+    "Error saving filter",
+    "Column configuration",
+    "Select and arrange columns to display in the table",
+    "Loading columns...",
+    "Use buttons",
+    "to move and",
+    "to change order",
+    "Add",
+    "Edit",
+    "Save filter",
+    "and",
+    "Custom filtering",
+    "Select a saved filter or create a new one",
+    "Select a filter or create a new one",
+    "Filter visibility",
+    "Unknown",
+    "JSON URL",
+    "XML URL",
+    "API key is not created",
+    "The key is not created. Create it or contact an administrator.",
+    "OK"
+];
+export const HISTORY_UI_TRANSLATION_KEYS = [
+    "Models",
+    "All",
+    "Users",
+    "Date",
+    "Pick a date",
+    "Search",
+    "Reset",
+    "Model",
+    "Name",
+    "Event",
+    "User",
+    "Diff",
+    "The end of the list has been reached",
+    "There are no records to display"
+];
+export const HISTORY_TABLE_UI_TRANSLATION_KEYS = [
+    "Event",
+    "Date",
+    "User",
+    "Watch",
+    "Current",
+    "There is no history",
+    "Diff"
+];
+export const NOTIFICATION_UI_TRANSLATION_KEYS = [
+    "Make read",
+    "View All",
+    "Search",
+    "Make all read",
+    "Title",
+    "Message",
+    "Date",
+    "Diff",
+    "No notifications",
+    "No notifications found",
+    "The end of the list has been reached"
+];
+export const USER_FILTERS_UI_TRANSLATION_KEYS = [
+    "Loading...",
+    "Search filters...",
+    "All models",
+    "No filters found",
+    "Loading more...",
+    "Filter Name",
+    "Model",
+    "Visibility",
+    "API access (feed)",
+    "Owner",
+    "Private",
+    "Public",
+    "Groups",
+    "Yes",
+    "No",
+    "You",
+    "Unknown",
+    "Reset",
+    "found",
+    "User Filters"
+];

package/lib/widgets/widgetHandler.d.ts

@@ -27,6 +27,7 @@ export interface WidgetConfig {
     };
     added?: boolean;
     hideAdminPanelUI?: boolean;
+    group?: string;
 }
 export interface WidgetLayoutItem {
     x: number;
@@ -50,7 +51,11 @@ export declare class WidgetHandler {
     add(widget: WidgetType): void;
     getById(id: string): WidgetType | undefined;
     removeById(id: string): void;
-    getAll(user: UserAP, i18n: I18n): Promise<WidgetConfig[]>;
+    private resolveDashboardUser;
+    private resolveModelTitle;
+    private buildFilterDescription;
+    private getBuiltInFilterWidgets;
+    getAll(user: UserAP | undefined, i18n: I18n): Promise<WidgetConfig[]>;
     private translateWidgetConfig;
     getWidgetsDB(id: number, auth: boolean, i18n: I18n): Promise<{
         widgets: WidgetConfig[];
@@ -59,6 +64,6 @@ export declare class WidgetHandler {
     }>;
     setWidgetsDB(id: number, body: {
         widgets: WidgetConfig[];
-        layout: WidgetLayoutItem[];
+        layout: WidgetsLayouts;
     }, auth: boolean): Promise<number>;
 }

package/lib/widgets/widgetHandler.js

@@ -1,4 +1,5 @@
-import { isAdminizerViteDevMode } from "../../helpers/runtimeMode.js";
+import * as process from "node:process";
+import { FilterService } from "../filters/FilterService.js";
 export class WidgetHandler {
     widgets = [];
     adminizer;
@@ -30,13 +31,93 @@ export class WidgetHandler {
             }
         }
     }
-    getAll(user, i18n) {
+    async resolveDashboardUser(user) {
+        if (user) {
+            return user;
+        }
+        const adminLogin = this.adminizer.config.administrator?.login ?? "admin";
+        const fallbackUser = await this.adminizer.modelHandler
+            .internal("widgets")
+            .get("UserAP")
+            .findOne({ where: { login: adminLogin } });
+        return fallbackUser ?? null;
+    }
+    resolveModelTitle(modelName) {
+        const models = this.adminizer.config.models ?? {};
+        const modelKey = Object.keys(models).find((key) => key.toLowerCase() === modelName.toLowerCase());
+        if (!modelKey) {
+            return modelName;
+        }
+        const modelConfig = models[modelKey];
+        if (typeof modelConfig === "boolean") {
+            return modelKey;
+        }
+        return modelConfig.title || modelKey;
+    }
+    buildFilterDescription(filter, modelTitle, i18n) {
+        const visibilityMap = {
+            private: i18n.__("Private"),
+            public: i18n.__("Public"),
+            groups: i18n.__("Groups"),
+            system: i18n.__("Filters"),
+        };
+        const visibilityTitle = visibilityMap[filter.visibility] || filter.visibility;
+        return `${modelTitle} - ${visibilityTitle}`;
+    }
+    async getBuiltInFilterWidgets(user, i18n) {
+        const models = this.adminizer.config.models ?? {};
+        const modelNames = Object.keys(models);
+        const filterService = new FilterService(this.adminizer);
+        const result = [];
+        for (const modelName of modelNames) {
+            if (!this.adminizer.accessRightsHelper.hasPermission(`read-${modelName}-model`, user)) {
+                continue;
+            }
+            let filters = [];
+            try {
+                filters = await filterService.getFiltersForModel(modelName, user, {
+                    includePublic: true,
+                    includeSystem: false
+                });
+            }
+            catch {
+                continue;
+            }
+            const modelTitle = this.resolveModelTitle(modelName);
+            const sortedFilters = [...filters].sort((a, b) => a.name.localeCompare(b.name));
+            for (const filter of sortedFilters) {
+                if (!filterService.canViewFilter(filter, user)) {
+                    continue;
+                }
+                const filterId = encodeURIComponent(filter.id);
+                const modelRoute = encodeURIComponent(filter.modelName);
+                result.push({
+                    id: `filterWidget-${filter.id}__0`,
+                    type: "info",
+                    api: `${this.adminizer.config.routePrefix}/widgets-filter-info/${filterId}`,
+                    link: `${this.adminizer.config.routePrefix}/model/${modelRoute}?filterId=${filterId}`,
+                    linkType: "self",
+                    description: this.buildFilterDescription(filter, modelTitle, i18n),
+                    icon: filter.icon ?? "filter_list",
+                    name: filter.name,
+                    backgroundCSS: filter.color || null,
+                    group: "filters"
+                });
+            }
+        }
+        return result;
+    }
+    async getAll(user, i18n) {
         let widgets = [];
+        const dashboardUser = await this.resolveDashboardUser(user);
+        if (!dashboardUser) {
+            return widgets;
+        }
         if (this.widgets.length) {
             let id_key = 0;
             for (const widget of this.widgets) {
                 if (widget.widgetType === 'switcher') {
-                    if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, user)) {
+                    if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, dashboardUser)) {
                         widgets.push({
                             id: `${widget.id}__${id_key}`,
                             type: widget.widgetType,
@@ -50,7 +131,7 @@ export class WidgetHandler {
                     }
                 }
                 else if (widget.widgetType === 'info') {
-                    if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, user)) {
+                    if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, dashboardUser)) {
                         widgets.push({
                             id: `${widget.id}__${id_key}`,
                             type: widget.widgetType,
@@ -66,7 +147,7 @@ export class WidgetHandler {
                     }
                 }
                 else if (widget.widgetType === 'action') {
-                    if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, user)) {
+                    if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, dashboardUser)) {
                         widgets.push({
                             id: `${widget.id}__${id_key}`,
                             type: widget.widgetType,
@@ -80,7 +161,7 @@ export class WidgetHandler {
                     }
                 }
                 else if (widget.widgetType === 'link') {
-                    if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, user)) {
+                    if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, dashboardUser)) {
                         let links_id_key = 0;
                         for (const link of widget.links) {
                             widgets.push({
@@ -98,7 +179,7 @@ export class WidgetHandler {
                     }
                 }
                 else if (widget.widgetType === 'custom') {
-                    if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, user)) {
+                    if (this.adminizer.accessRightsHelper.hasPermission(`widget-${widget.id}`, dashboardUser)) {
                         widgets.push({
                             id: `${widget.id}_${id_key}`,
                             type: widget.widgetType,
@@ -108,16 +189,17 @@ export class WidgetHandler {
                             name: i18n.__(widget.name),
                             backgroundCSS: widget.backgroundCSS ?? null,
                             size: widget.size ?? null,
-                            scriptUrl: isAdminizerViteDevMode() ? widget.jsPath.dev : widget.jsPath.production,
+                            scriptUrl: process.env.ADMINIZER_ENV === 'dev' ? widget.jsPath.dev : widget.jsPath.production,
                         });
                     }
                 }
                 else {
-                    return Promise.resolve([]);
+                    return [];
                 }
             }
         }
-        return Promise.resolve(widgets);
+        widgets.push(...await this.getBuiltInFilterWidgets(dashboardUser, i18n));
+        return widgets;
     }
     translateWidgetConfig(widget, i18n) {
         return {
@@ -132,13 +214,12 @@ export class WidgetHandler {
             widgets: [],
             layout: { lg: [], md: [], sm: [], xs: [], xxs: [] }
         };
+        const userModel = this.adminizer.modelHandler.internal("widgets").get("UserAP");
         if (!auth) {
-            // TODO refactor CRUD functions for DataAccessor usage
-            user = await this.adminizer.modelHandler.model.get("UserAP")?.["_findOne"]({ login: this.adminizer.config.administrator?.login ?? 'admin' });
+            user = await userModel.findOne({ where: { login: this.adminizer.config.administrator?.login ?? 'admin' } });
         }
         else {
-            // TODO refactor CRUD functions for DataAccessor usage
-            user = await this.adminizer.modelHandler.model.get("UserAP")?.["_findOne"]({ id: id });
+            user = await userModel.findOne({ where: { id: id } });
         }
         if (!user || !user.widgets || user.widgets.widgets.length === 0) {
             // User has no saved widgets - return all widgets with default widget IDs
@@ -155,14 +236,13 @@ export class WidgetHandler {
         return result;
     }
     async setWidgetsDB(id, body, auth) {
+        const userModel = this.adminizer.modelHandler.internal("widgets").get("UserAP");
         if (!auth) {
-            // TODO refactor CRUD functions for DataAccessor usage
-            let updatedUser = await this.adminizer.modelHandler.model.get("UserAP")?.["_updateOne"]({ login: this.adminizer.config.administrator?.login ?? 'admin' }, { widgets: body });
+            let updatedUser = await userModel.updateOne({ where: { login: this.adminizer.config.administrator?.login ?? 'admin' } }, { widgets: body });
             return updatedUser.id;
         }
         else {
-            // TODO refactor CRUD functions for DataAccessor usage
-            let updatedUser = await this.adminizer.modelHandler.model.get("UserAP")?.["_updateOne"]({ id: id }, { widgets: body });
+            let updatedUser = await userModel.updateOne({ where: { id: id } }, { widgets: body });
             return updatedUser.id;
         }
     }

package/models/FilterAP.d.ts

@@ -0,0 +1,116 @@
+import { FilterColumnAP } from "./FilterColumnAP";
+/**
+ * Filter operators for query conditions
+ */
+export type FilterOperator = 'eq' | 'neq' | 'gt' | 'gte' | 'lt' | 'lte' | 'like' | 'ilike' | 'startsWith' | 'endsWith' | 'in' | 'notIn' | 'between' | 'today' | 'month' | 'year' | 'monthBetween' | 'yearBetween' | 'isNull' | 'isNotNull' | 'regex' | 'custom';
+/**
+ * Single filter condition or condition group
+ */
+export interface FilterCondition {
+    id: string;
+    field?: string;
+    operator?: FilterOperator;
+    value?: any;
+    logic?: 'AND' | 'OR' | 'NOT';
+    children?: FilterCondition[];
+    relation?: string;
+    relationField?: string;
+    customHandler?: string;
+    customHandlerName?: string;
+    customHandlerParams?: any;
+    rawSQL?: string;
+    rawSQLParams?: any[];
+}
+/**
+ * Filter visibility types
+ */
+export type FilterVisibility = 'private' | 'public' | 'groups' | 'system';
+/**
+ * Filter model schema
+ */
+declare const _default: {
+    id: {
+        type: string;
+        primaryKey: boolean;
+    };
+    name: {
+        type: string;
+        required: boolean;
+    };
+    description: {
+        type: string;
+    };
+    modelName: {
+        type: string;
+        required: boolean;
+    };
+    conditions: {
+        type: string;
+    };
+    sortField: {
+        type: string;
+    };
+    sortDirection: {
+        type: string;
+    };
+    visibility: {
+        type: string;
+    };
+    ownerId: {
+        type: string;
+    };
+    groupIds: {
+        type: string;
+    };
+    apiEnabled: {
+        type: string;
+    };
+    apiKey: {
+        type: string;
+    };
+    icon: {
+        type: string;
+    };
+    color: {
+        type: string;
+    };
+    version: {
+        type: string;
+    };
+    columns: {
+        collection: string;
+        via: string;
+    };
+    createdAt: {
+        type: string;
+        autoCreatedAt: boolean;
+    };
+    updatedAt: {
+        type: string;
+        autoUpdatedAt: boolean;
+    };
+};
+export default _default;
+/**
+ * FilterAP interface for TypeScript
+ */
+export interface FilterAP {
+    id?: string;
+    name: string;
+    description?: string;
+    modelName: string;
+    conditions: FilterCondition[];
+    sortField?: string;
+    sortDirection?: 'ASC' | 'DESC';
+    visibility: FilterVisibility;
+    ownerId: number;
+    groupIds?: number[];
+    apiEnabled: boolean;
+    apiKey?: string;
+    icon?: string;
+    color?: string;
+    version: number;
+    createdAt?: Date;
+    updatedAt?: Date;
+    columns?: FilterColumnAP[];
+}

package/models/FilterAP.js

@@ -0,0 +1,68 @@
+/**
+ * Filter model schema
+ */
+export default {
+    id: {
+        type: "string",
+        primaryKey: true
+        // UUID will be generated before create
+    },
+    name: {
+        type: "string",
+        required: true
+    },
+    description: {
+        type: "string"
+    },
+    modelName: {
+        type: "string",
+        required: true
+    },
+    conditions: {
+        type: "json"
+    },
+    sortField: {
+        type: "string"
+    },
+    sortDirection: {
+        type: "string"
+        // 'ASC' or 'DESC'
+    },
+    visibility: {
+        type: "string"
+        // 'private' | 'public' | 'groups' | 'system'
+    },
+    ownerId: {
+        type: "number"
+    },
+    groupIds: {
+        type: "json"
+    },
+    apiEnabled: {
+        type: "boolean"
+    },
+    apiKey: {
+        type: "string"
+    },
+    icon: {
+        type: "string"
+    },
+    color: {
+        type: "string"
+    },
+    version: {
+        type: "number"
+    },
+    columns: {
+        collection: "FilterColumnAP",
+        via: "filter"
+    },
+    createdAt: {
+        type: 'datetime',
+        autoCreatedAt: true
+    },
+    updatedAt: {
+        type: 'datetime',
+        autoUpdatedAt: true
+    }
+};

package/models/FilterColumnAP.d.ts

@@ -0,0 +1,32 @@
+import { FilterAP } from "./FilterAP";
+/**
+ * FilterColumnAP model schema
+ * Represents column configuration for a filter
+ */
+declare const _default: {
+    id: {
+        type: string;
+        autoIncrement: boolean;
+        primaryKey: boolean;
+    };
+    filter: {
+        model: string;
+    };
+    fieldName: {
+        type: string;
+        required: boolean;
+    };
+    order: {
+        type: string;
+    };
+};
+export default _default;
+/**
+ * FilterColumnAP interface for TypeScript
+ */
+export interface FilterColumnAP {
+    id?: number;
+    filter: string | FilterAP;
+    fieldName: string;
+    order: number;
+}