adminizer 4.7.0-build.224 → 5.0.0-build.1

package/lib/notifications/AbstractNotificationService.js

@@ -54,13 +54,13 @@ export class AbstractNotificationService extends EventEmitter {
         this._bindAccessRight();
     }
     notificationModel() {
-        return this.adminizer.modelHandler.internal("notifications").get("NotificationAP");
+        return this.adminizer.modelHandler.internal("notifications").get("Notification");
     }
     userNotificationModel() {
-        return this.adminizer.modelHandler.internal("notifications").get("UserNotificationAP");
+        return this.adminizer.modelHandler.internal("notifications").get("UserNotification");
     }
     userModel() {
-        return this.adminizer.modelHandler.internal("notifications").get("UserAP");
+        return this.adminizer.modelHandler.internal("notifications").get("User");
     }
     _bindAccessRight() {
         setTimeout(() => {
@@ -78,7 +78,7 @@ export class AbstractNotificationService extends EventEmitter {
      * The client is then added to the user's Map with the provided send function.
      * @param {string} clientId - The unique identifier of the client to be registered.
      * @param {(event: INotificationEvent) => void} sendFn - The function used to send notifications to the client.
-     * @param {UserAP} user - The user associated with the client.
+     * @param {User} user - The user associated with the client.
      */
     addClient(clientId, sendFn, user) {
         const userId = user.id;
@@ -177,7 +177,7 @@ export class AbstractNotificationService extends EventEmitter {
         }
     }
     /**
-     * Creates a new user notification record in the 'usernotificationap' model.
+     * Creates a new user notification record in the 'UserNotification' model.
      * This method is used to associate a notification with a specific user and mark it as unread.
      * @param {string} notificationId - The unique identifier of the notification.
      * @param {number} [userId] - The ID of the user to associate the notification with. Optional.
@@ -198,7 +198,7 @@ export class AbstractNotificationService extends EventEmitter {
         }
     }
     /**
-     * Retrieves a user notification record from the 'usernotificationap' model.
+     * Retrieves a user notification record from the 'UserNotification' model.
      * The record is fetched based on the provided notification ID and user ID.
      * @param {string} notificationId - The unique identifier of the notification.
      * @param {number} userId - The ID of the user associated with the notification.
@@ -260,7 +260,7 @@ export class AbstractNotificationService extends EventEmitter {
     }
     /**
      * Prepares notification data by enriching it with user-specific read status and icon information.
-     * @param {NotificationAPModel[]} notificationsDB - An array of raw notification records from the database.
+     * @param {NotificationModel[]} notificationsDB - An array of raw notification records from the database.
      * @param {number} userId - The ID of the user for whom the read status is determined.
      * @returns {Promise<INotification[]>} A promise that resolves with an array of enriched notification objects.
      */
@@ -268,7 +268,7 @@ export class AbstractNotificationService extends EventEmitter {
         let notifications = [];
         for (const notification of notificationsDB) {
             let readStatus = false;
-            // Getting read status from UserNotificationAP
+            // Getting read status from UserNotification
             const userNotification = await this.getUserNotification(notification.id, userId);
             readStatus = userNotification ? userNotification.read : false;
             notifications.push({

package/lib/notifications/GeneralNotificationService.js

@@ -30,7 +30,7 @@ export class GeneralNotificationService extends AbstractNotificationService {
                         }
                     }
                     catch (error) {
-                        Adminizer.log.error('Error creating UserNotificationAP:', error);
+                        Adminizer.log.error('Error creating UserNotification:', error);
                     }
                 }
             }

package/lib/notifications/SystemNotificationService.js

@@ -24,7 +24,7 @@ export class SystemNotificationService extends AbstractNotificationService {
                     }
                 }
                 catch (error) {
-                    Adminizer.log.error('Error creating UserNotificationAP:', error);
+                    Adminizer.log.error('Error creating UserNotification:', error);
                 }
             }
             const event = {

package/lib/ui-i18n/uiTranslationKeys.d.ts

@@ -1,4 +1,4 @@
-export declare const COMMON_UI_TRANSLATION_KEYS: readonly ["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 declare const COMMON_UI_TRANSLATION_KEYS: readonly ["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", "Action failed", "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 declare const FILTER_UI_TRANSLATION_KEYS: readonly ["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 declare const HISTORY_UI_TRANSLATION_KEYS: readonly ["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 declare const HISTORY_TABLE_UI_TRANSLATION_KEYS: readonly ["Event", "Date", "User", "Watch", "Current", "There is no history", "Diff"];

package/lib/ui-i18n/uiTranslationKeys.js

@@ -34,6 +34,7 @@ export const COMMON_UI_TRANSLATION_KEYS = [
     "Visible",
     "Performing an action...",
     "Action completed",
+    "Action failed",
     "Save",
     "First",
     "Last",

package/lib/widgets/abstractCustom.d.ts

@@ -1,4 +1,5 @@
 import { MaterialIcon } from "../../interfaces/MaaterialIcons";
+import type { AppAsset } from "../app-manager/AdminizerApp";
 export declare abstract class CustomBase {
     /** Widget unique id */
     abstract readonly id: string;
@@ -6,11 +7,13 @@ export declare abstract class CustomBase {
     readonly accessRightsToken?: string;
     /** Widget Name */
     abstract readonly name: string;
-    /** JS module file path */
-    abstract readonly jsPath: {
+    /** JS module URL fallback for legacy custom widgets without asset metadata */
+    readonly jsPath?: {
         dev: string;
         production: string;
     };
+    /** JS module asset served by Adminizer asset handler */
+    readonly asset?: AppAsset;
     /** For group access rights by department */
     abstract readonly department: string;
     /** Widget background css color */

package/lib/widgets/abstractCustom.js

@@ -1,6 +1,10 @@
 export class CustomBase {
     /** Optional pre-existing access token used instead of widget-specific token */
     accessRightsToken;
+    /** JS module URL fallback for legacy custom widgets without asset metadata */
+    jsPath;
+    /** JS module asset served by Adminizer asset handler */
+    asset;
     /** Widget background css color */
     backgroundCSS;
     widgetType = 'custom';

package/lib/widgets/widgetHandler.d.ts

@@ -5,7 +5,7 @@ import { LinkBase } from "./abstractLink";
 import { CustomBase } from "./abstractCustom";
 import { AdminpanelIcon } from "../../interfaces/adminpanelConfig";
 import { Adminizer } from "../Adminizer";
-import { UserAP } from "../../models/UserAP";
+import { User } from "../../models/User";
 import { I18n } from "../I18n";
 export type WidgetType = (SwitchBase | InfoBase | ActionBase | LinkBase | CustomBase);
 export interface WidgetConfig {
@@ -46,17 +46,20 @@ export interface WidgetsLayouts {
 }
 export declare class WidgetHandler {
     private widgets;
+    private widgetAssetIds;
     adminizer: Adminizer;
     constructor(adminizer: Adminizer);
     private resolveAccessRightsToken;
     add(widget: WidgetType): void;
     getById(id: string): WidgetType | undefined;
     removeById(id: string): void;
+    private registerCustomWidgetAsset;
+    private resolveCustomWidgetScriptUrl;
     private resolveDashboardUser;
     private resolveModelTitle;
     private buildFilterDescription;
     private getBuiltInFilterWidgets;
-    getAll(user: UserAP | undefined, i18n: I18n): Promise<WidgetConfig[]>;
+    getAll(user: User | undefined, i18n: I18n): Promise<WidgetConfig[]>;
     private translateWidgetConfig;
     getWidgetsDB(id: number, auth: boolean, i18n: I18n): Promise<{
         widgets: WidgetConfig[];

package/lib/widgets/widgetHandler.js

@@ -2,6 +2,7 @@ import * as process from "node:process";
 import { FilterService } from "../filters/FilterService.js";
 export class WidgetHandler {
     widgets = [];
+    widgetAssetIds = new Map();
     adminizer;
     constructor(adminizer) {
         this.adminizer = adminizer;
@@ -10,13 +11,28 @@ export class WidgetHandler {
         return widget.accessRightsToken?.toLowerCase() ?? `widget-${widget.id}`;
     }
     add(widget) {
+        let assetId;
+        try {
+            assetId = this.registerCustomWidgetAsset(widget);
+        }
+        catch (error) {
+            throw error;
+        }
         if (!widget.accessRightsToken) {
-            this.adminizer.accessRightsHelper.registerToken({
-                id: `widget-${widget.id}`,
-                name: widget.name,
-                description: widget.description,
-                department: widget.department
-            });
+            try {
+                this.adminizer.accessRightsHelper.registerToken({
+                    id: `widget-${widget.id}`,
+                    name: widget.name,
+                    description: widget.description,
+                    department: widget.department
+                });
+            }
+            catch (error) {
+                if (assetId) {
+                    this.adminizer.assetHandler.unregister(assetId);
+                }
+                throw error;
+            }
         }
         this.widgets.push(widget);
     }
@@ -32,10 +48,35 @@ export class WidgetHandler {
         if (this.widgets.length) {
             const index = this.widgets.findIndex(widget => widget.id === id);
             if (index !== -1) {
+                const assetId = this.widgetAssetIds.get(id);
+                if (assetId) {
+                    this.adminizer.assetHandler.unregister(assetId);
+                    this.widgetAssetIds.delete(id);
+                }
                 this.widgets.splice(index, 1);
             }
         }
     }
+    registerCustomWidgetAsset(widget) {
+        if (widget.widgetType !== "custom" || !widget.asset) {
+            return undefined;
+        }
+        const appName = `legacy-widget-${widget.id}`;
+        const scriptUrl = this.adminizer.assetHandler.register(appName, widget.asset);
+        widget.scriptUrl = scriptUrl;
+        const assetId = `${appName}:${widget.asset.id}`;
+        this.widgetAssetIds.set(widget.id, assetId);
+        return assetId;
+    }
+    resolveCustomWidgetScriptUrl(widget) {
+        if (widget.scriptUrl) {
+            return widget.scriptUrl;
+        }
+        if (widget.jsPath) {
+            return process.env.ADMINIZER_ENV === 'dev' ? widget.jsPath.dev : widget.jsPath.production;
+        }
+        throw new Error(`Custom widget "${widget.id}" must provide either asset or jsPath`);
+    }
     async resolveDashboardUser(user) {
         if (user) {
             return user;
@@ -43,7 +84,7 @@ export class WidgetHandler {
         const adminLogin = this.adminizer.config.administrator?.login ?? "admin";
         const fallbackUser = await this.adminizer.modelHandler
             .internal("widgets")
-            .get("UserAP")
+            .get("User")
             .findOne({ where: { login: adminLogin } });
         return fallbackUser ?? null;
     }
@@ -131,7 +172,8 @@ export class WidgetHandler {
                             icon: widget.icon,
                             name: i18n.__(widget.name),
                             backgroundCSS: widget.backgroundCSS ?? null,
-                            size: widget.size ?? null
+                            size: widget.size ?? null,
+                            group: widget.group
                         });
                     }
                 }
@@ -147,7 +189,8 @@ export class WidgetHandler {
                             backgroundCSS: widget.backgroundCSS ?? null,
                             size: widget.size ?? null,
                             link: widget.link,
-                            linkType: widget.linkType
+                            linkType: widget.linkType,
+                            group: widget.group
                         });
                     }
                 }
@@ -161,7 +204,8 @@ export class WidgetHandler {
                             icon: widget.icon,
                             name: i18n.__(widget.name),
                             backgroundCSS: widget.backgroundCSS ?? null,
-                            size: widget.size ?? null
+                            size: widget.size ?? null,
+                            group: widget.group
                         });
                     }
                 }
@@ -177,7 +221,8 @@ export class WidgetHandler {
                                 description: i18n.__(link.description),
                                 link: link.link,
                                 icon: link.icon,
-                                backgroundCSS: link.backgroundCSS
+                                backgroundCSS: link.backgroundCSS,
+                                group: widget.group
                             });
                             links_id_key++;
                         }
@@ -194,7 +239,8 @@ export class WidgetHandler {
                             name: i18n.__(widget.name),
                             backgroundCSS: widget.backgroundCSS ?? null,
                             size: widget.size ?? null,
-                            scriptUrl: process.env.ADMINIZER_ENV === 'dev' ? widget.jsPath.dev : widget.jsPath.production,
+                            scriptUrl: this.resolveCustomWidgetScriptUrl(widget),
+                            group: widget.group
                         });
                     }
                 }
@@ -219,7 +265,7 @@ export class WidgetHandler {
             widgets: [],
             layout: { lg: [], md: [], sm: [], xs: [], xxs: [] }
         };
-        const userModel = this.adminizer.modelHandler.internal("widgets").get("UserAP");
+        const userModel = this.adminizer.modelHandler.internal("widgets").get("User");
         if (!auth) {
             user = await userModel.findOne({ where: { login: this.adminizer.config.administrator?.login ?? 'admin' } });
         }
@@ -241,7 +287,7 @@ export class WidgetHandler {
         return result;
     }
     async setWidgetsDB(id, body, auth) {
-        const userModel = this.adminizer.modelHandler.internal("widgets").get("UserAP");
+        const userModel = this.adminizer.modelHandler.internal("widgets").get("User");
         if (!auth) {
             let updatedUser = await userModel.updateOne({ where: { login: this.adminizer.config.administrator?.login ?? 'admin' } }, { widgets: body });
             return updatedUser.id;

package/models/{FilterAP.d.ts → Filter.d.ts}

@@ -1,4 +1,4 @@
-import { FilterColumnAP } from "./FilterColumnAP";
+import type { FilterColumn } from "./FilterColumn";
 /**
  * Filter operators for query conditions
  */
@@ -26,75 +26,9 @@ export interface FilterCondition {
  */
 export type FilterVisibility = 'private' | 'public' | 'groups' | 'system';
 /**
- * Filter model schema
+ * Filter interface for TypeScript
  */
-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 {
+export interface Filter {
     id?: string;
     name: string;
     description?: string;
@@ -112,5 +46,5 @@ export interface FilterAP {
     version: number;
     createdAt?: Date;
     updatedAt?: Date;
-    columns?: FilterColumnAP[];
+    columns?: FilterColumn[];
 }

package/models/Filter.js

@@ -0,0 +1 @@
+export {};

package/models/FilterColumn.d.ts

@@ -0,0 +1,10 @@
+import type { Filter } from "./Filter";
+/**
+ * FilterColumn interface for TypeScript
+ */
+export interface FilterColumn {
+    id?: number;
+    filter: string | Filter;
+    fieldName: string;
+    order: number;
+}

package/models/FilterColumn.js

@@ -0,0 +1 @@
+export {};

package/models/Group.d.ts

@@ -0,0 +1,8 @@
+import type { User } from "./User";
+export interface Group {
+    id?: number;
+    name: string;
+    description?: string;
+    tokens?: string[];
+    users?: User[];
+}

package/models/Group.js

@@ -0,0 +1 @@
+export {};

package/models/HistoryActions.d.ts

@@ -0,0 +1,14 @@
+import type { User } from "./User";
+export interface HistoryActions {
+    id?: number;
+    modelId: number | string;
+    modelName: string;
+    action: string;
+    data: any;
+    diff: any;
+    user: User;
+    isCurrent: boolean;
+    createdAt?: number;
+    updatedAt?: number;
+    preview: boolean;
+}

package/models/HistoryActions.js

@@ -0,0 +1 @@
+export {};

package/models/MediaManagerAP.d.ts

@@ -1,57 +1,5 @@
-import { MediaManagerAssociationsAP } from "./MediaManagerAssociationsAP";
-import { MediaManagerMetaAP } from "./MediaManagerMetaAP";
-declare const _default: {
-    id: {
-        type: string;
-        autoIncrement: boolean;
-        primaryKey: boolean;
-    };
-    parent: {
-        model: string;
-    };
-    variants: {
-        collection: string;
-        via: string;
-    };
-    mimeType: {
-        type: string;
-    };
-    path: {
-        type: string;
-    };
-    size: {
-        type: string;
-    };
-    group: {
-        type: string;
-    };
-    tag: {
-        type: string;
-    };
-    url: {
-        type: string;
-    };
-    filename: {
-        type: string;
-    };
-    meta: {
-        collection: string;
-        via: string;
-    };
-    modelAssociation: {
-        collection: string;
-        via: string;
-    };
-    createdAt: {
-        type: string;
-        autoCreatedAt: boolean;
-    };
-    updatedAt: {
-        type: string;
-        autoUpdatedAt: boolean;
-    };
-};
-export default _default;
+import type { MediaManagerAssociationsAP } from "./MediaManagerAssociationsAP";
+import type { MediaManagerMetaAP } from "./MediaManagerMetaAP";
 export interface MediaManagerAP {
     id: string;
     parent?: MediaManagerAP;

package/models/MediaManagerAP.js

@@ -1,51 +1 @@
-export default {
-    id: {
-        type: "number",
-        autoIncrement: true,
-        primaryKey: true
-    },
-    parent: {
-        model: "MediaManagerAP"
-    },
-    variants: {
-        collection: "MediaManagerAP",
-        via: "parent"
-    },
-    mimeType: {
-        type: "string"
-    },
-    path: {
-        type: "string"
-    },
-    size: {
-        type: "number"
-    },
-    group: {
-        type: "string"
-    },
-    tag: {
-        type: "string"
-    },
-    url: {
-        type: "string"
-    },
-    filename: {
-        type: "string"
-    },
-    meta: {
-        collection: "MediaManagerMetaAP",
-        via: "parent"
-    },
-    modelAssociation: {
-        collection: "MediaManagerAssociationsAP",
-        via: "file"
-    },
-    createdAt: {
-        type: 'datetime',
-        autoCreatedAt: true
-    },
-    updatedAt: {
-        type: 'datetime',
-        autoUpdatedAt: true
-    }
-};
+export {};

package/models/MediaManagerAssociationsAP.d.ts

@@ -1,38 +1,4 @@
-import { MediaManagerAP } from "./MediaManagerAP";
-declare const _default: {
-    id: {
-        type: string;
-        autoIncrement: boolean;
-        primaryKey: boolean;
-    };
-    mediaManagerId: {
-        type: string;
-    };
-    model: {
-        type: string;
-    };
-    modelId: {
-        type: string;
-    };
-    widgetName: {
-        type: string;
-    };
-    sortOrder: {
-        type: string;
-    };
-    file: {
-        model: string;
-    };
-    createdAt: {
-        type: string;
-        autoCreatedAt: boolean;
-    };
-    updatedAt: {
-        type: string;
-        autoUpdatedAt: boolean;
-    };
-};
-export default _default;
+import type { MediaManagerAP } from "./MediaManagerAP";
 export interface MediaManagerAssociationsAP {
     id: string;
     mediaManagerId?: string;

package/models/MediaManagerAssociationsAP.js

@@ -1,33 +1 @@
-export default {
-    id: {
-        type: "number",
-        autoIncrement: true,
-        primaryKey: true
-    },
-    mediaManagerId: {
-        type: "string"
-    },
-    model: {
-        type: "string"
-    },
-    modelId: {
-        type: "string" // ✅ Changed: support for strings and numbers via casting to string
-    },
-    widgetName: {
-        type: "string"
-    },
-    sortOrder: {
-        type: "number"
-    },
-    file: {
-        model: "MediaManagerAP"
-    },
-    createdAt: {
-        type: 'datetime',
-        autoCreatedAt: true
-    },
-    updatedAt: {
-        type: 'datetime',
-        autoUpdatedAt: true
-    }
-};
+export {};