@acorex/modules 20.2.3 → 20.2.4-next.1

package/fesm2022/acorex-modules-common.mjs

@@ -1,30 +1,32 @@
 import { AXPSessionService, AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
-import { AXPHomePageService, AXPSearchCommandProvider, AXPSearchService, AXPSettingService, AXPLockService, AXP_MENU_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER, AXP_SEARCH_PROVIDER } from '@acorex/platform/common';
-import { AXPEntityDefinitionRegistryService, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
+import { AXPHomePageService, AXPSearchCommandProvider, AXPSearchService, AXPSettingService, AXPEntityCommandScope, AXPLockService, createAllQueryView, AXPEntityQueryType, AXP_MENU_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER, AXP_SEARCH_PROVIDER } from '@acorex/platform/common';
 import * as i0 from '@angular/core';
-import { inject, Injector, Injectable, input, signal, ViewEncapsulation, Component, NgModule, InjectionToken, HostListener, computed, viewChild } from '@angular/core';
+import { inject, Injectable, input, signal, ViewEncapsulation, Component, NgModule, InjectionToken, HostListener, computed, Injector, runInInjectionContext, viewChild } from '@angular/core';
 import { firstValueFrom, Subject } from 'rxjs';
 import * as i1$2 from '@acorex/platform/core';
-import { objectKeyValueTransforms, AXPPlatformScope, AXPActivityLogService, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER } from '@acorex/platform/core';
+import { objectKeyValueTransforms, AXPPlatformScope, AXPActivityLogService, AXPSystemActionType, extractTextFromHtml, AXPDataGenerator, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER } from '@acorex/platform/core';
 import * as i4 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
 import { AXPWidgetsCatalog } from '@acorex/platform/layout/builder';
 import { AXPWidgetsModule } from '@acorex/platform/widgets';
-import * as i1$1 from '@acorex/platform/workflow';
-import { AXPWorkflowAction, AXPWorkflowModule, AXPWorkflowService } from '@acorex/platform/workflow';
-import * as i1 from '@angular/common';
+import * as i3 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i2 from '@acorex/components/button';
 import { AXButtonModule } from '@acorex/components/button';
 import { AXBasePageComponent } from '@acorex/components/page';
-import * as i3 from '@acorex/components/decorators';
+import * as i1 from '@acorex/components/decorators';
 import { AXDecoratorModule } from '@acorex/components/decorators';
 import * as i2$1 from '@acorex/platform/layout/components';
-import { AXPCompareViewComponent, AXPComponentSlotModule } from '@acorex/platform/layout/components';
+import { AXPCompareViewComponent, AXPComponentSlotModule, AXP_EXTRA_PROPERTY_TYPES } from '@acorex/platform/layout/components';
+import * as i1$1 from '@acorex/platform/workflow';
+import { AXPWorkflowAction, AXPWorkflowModule, AXPWorkflowService } from '@acorex/platform/workflow';
 import { AXPopupService } from '@acorex/components/popup';
+import { AXPEntityDefinitionRegistryService, AXP_ENTITY_STORAGE_BACKEND, detectEntityChanges, ensureListActions, actionExists, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_ENTITY_ACTION_PLUGIN, AXMEntityCrudServiceImpl, entityMasterCrudActions, entityMasterDeleteAction, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
 import { AXFormatService } from '@acorex/core/format';
 import { AXTextBoxModule } from '@acorex/components/text-box';
+import { AXCalendarService } from '@acorex/core/date-time';
 import { AXDialogService } from '@acorex/components/dialog';
+import { provideCommandSetups } from '@acorex/platform/runtime';
 import * as i1$3 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
 import * as i4$1 from '@acorex/components/form';
@@ -36,7 +38,6 @@ import { AXSelectBoxModule } from '@acorex/components/select-box';
 import * as i7 from '@acorex/components/text-area';
 import { AXTextAreaModule } from '@acorex/components/text-area';
 import { AXValidationModule } from '@acorex/core/validation';
-import { AXCalendarService } from '@acorex/core/date-time';
 
 const config = {
     i18n: 'common',
@@ -52,31 +53,6 @@ const RootConfig = {
     entities: {},
 };
 
-class AXMEntityProvider {
-    constructor() {
-        this.injector = inject(Injector);
-    }
-    preload() {
-        const module = RootConfig.module.name;
-        return Array.from(Object.values(RootConfig.entities)).map((entity) => ({
-            module: module,
-            entity: entity.name,
-        }));
-    }
-    async get(moduleName, entityName) {
-        if (moduleName == RootConfig.module.name) {
-            switch (entityName) {
-            }
-        }
-        return null;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMEntityProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMEntityProvider }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMEntityProvider, decorators: [{
-            type: Injectable
-        }] });
-
 class AXMMenuProvider {
     constructor() {
         this.sessionService = inject(AXPSessionService);
@@ -116,7 +92,7 @@ class AXMMenuProvider {
         context.addItems([
             {
                 name: 'tenant-application-settings',
-                priority: 10000,
+                priority: 10000000,
                 text: `t('tenant.title', {scope: "settings"})`,
                 type: 'menu',
                 icon: 'fa-light fa-gear',
@@ -217,9 +193,9 @@ class AXPComparePopupComponent extends AXBasePageComponent {
                 // Angular
                 CommonModule }, { kind: "ngmodule", type: 
                 // ACoreX
-                AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i2.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: 
+                AXDecoratorModule }, { kind: "component", type: i1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i2.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: 
                 // Compare View
-                AXPCompareViewComponent, selector: "axp-compare-view", inputs: ["inputs", "mode"] }, { kind: "pipe", type: i1.AsyncPipe, name: "async" }, { kind: "pipe", type: i4.AXTranslatorPipe, name: "translate" }], encapsulation: i0.ViewEncapsulation.None }); }
+                AXPCompareViewComponent, selector: "axp-compare-view", inputs: ["inputs", "mode"] }, { kind: "pipe", type: i3.AsyncPipe, name: "async" }, { kind: "pipe", type: i4.AXTranslatorPipe, name: "translate" }], encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPComparePopupComponent, decorators: [{
             type: Component,
@@ -472,7 +448,7 @@ class AXPGlobalSearchSlotComponent {
       </div>
       <kbd class="ax-text-sm">Ctrl+K</kbd>
     </div>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i2.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "directive", type: i4.AXTranslatorDirective, selector: "[translate]" }, { kind: "ngmodule", type: AXTextBoxModule }, { kind: "pipe", type: i1.AsyncPipe, name: "async" }] }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i2.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "directive", type: i4.AXTranslatorDirective, selector: "[translate]" }, { kind: "ngmodule", type: AXTextBoxModule }, { kind: "pipe", type: i3.AsyncPipe, name: "async" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPGlobalSearchSlotComponent, decorators: [{
             type: Component,
@@ -546,7 +522,7 @@ class AXPGlobalSearchModule {
             {
                 provide: AXP_GLOBAL_SEARCH_CONFIG_TOKEN,
                 useValue: {
-                    window: () => import('./acorex-modules-common-search-popup.component-39U0-TIj.mjs').then((c) => c.AXPGlobalSearchPopupComponent),
+                    window: () => import('./acorex-modules-common-search-popup.component-BSQyjDKA.mjs').then((c) => c.AXPGlobalSearchPopupComponent),
                 },
             },
         ], imports: [AXPComponentSlotModule.forChild({
@@ -597,7 +573,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
                         {
                             provide: AXP_GLOBAL_SEARCH_CONFIG_TOKEN,
                             useValue: {
-                                window: () => import('./acorex-modules-common-search-popup.component-39U0-TIj.mjs').then((c) => c.AXPGlobalSearchPopupComponent),
+                                window: () => import('./acorex-modules-common-search-popup.component-BSQyjDKA.mjs').then((c) => c.AXPGlobalSearchPopupComponent),
                             },
                         },
                     ]
@@ -706,15 +682,322 @@ class AXPGlobalSearchViewModel {
     }
 }
 
+class AXMVersionHistoryPopupStartAction extends AXPWorkflowAction {
+    constructor() {
+        super(...arguments);
+        this.popupService = inject(AXPopupService);
+        this.translate = inject(AXTranslationService);
+    }
+    async execute(context) {
+        const comp = (await import('./acorex-modules-common-timeline-version-history-popup.component-ByAc4Yp9.mjs')).AXMTimelineVersionHistoryPopupComponent;
+        this.popupService.open(comp, {
+            title: await this.translate.translateAsync('@activity-log:actions.view-history'),
+            data: {
+                refId: context.getVariable('options.refId'),
+                refType: context.getVariable('options.refType'),
+                fromDate: context.getVariable('options.fromDate'),
+                toDate: context.getVariable('options.toDate'),
+                limit: context.getVariable('options.limit'),
+                offset: context.getVariable('options.offset'),
+            },
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMVersionHistoryPopupStartAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMVersionHistoryPopupStartAction }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMVersionHistoryPopupStartAction, decorators: [{
+            type: Injectable
+        }] });
+const AXMVersionHistoryPopupWorkflow = {
+    startStepId: 'start',
+    steps: {
+        start: {
+            action: 'show-version-history-popup-action',
+        },
+    },
+};
+
+const historyLoggerMiddleware = {
+    target: { ops: ['create', 'update', 'delete'], order: 80 },
+    execute: async (ctx, next) => {
+        const entityRegistry = inject(AXPEntityDefinitionRegistryService);
+        const sessionService = inject(AXPSessionService);
+        const backend = inject(AXP_ENTITY_STORAGE_BACKEND);
+        // Capture previous for update/delete
+        if (ctx.op === 'update' || ctx.op === 'delete') {
+            try {
+                ctx.previous = await ctx.backend.getOneRaw(ctx.entityName, ctx.id);
+            }
+            catch { /* ignore */ }
+        }
+        await next();
+        // Build history entry
+        const now = new Date();
+        const [moduleName, entityModuleName] = ctx.entityName.split('.');
+        const entityConfig = await entityRegistry.resolve(moduleName, entityModuleName);
+        const actions = [];
+        if (ctx.op === 'update' && ctx.previous && ctx.result) {
+            const changes = detectEntityChanges(ctx.previous, ctx.result);
+            // Build actions similar to old addToHistory mapping by widget type
+            if (entityConfig) {
+                for (const [key, value] of Object.entries(changes)) {
+                    const property = entityConfig.properties.find((p) => p.name === key);
+                    if (property && property.schema?.interface) {
+                        const widgetType = property.schema.interface.type;
+                        switch (widgetType) {
+                            case 'file-uploader':
+                                if (value.added?.length) {
+                                    actions.push({
+                                        type: AXPSystemActionType.Upload,
+                                        description: `"${value.added?.map((item) => item.name).join(', ')}"`,
+                                    });
+                                }
+                                if (value.removed?.length) {
+                                    actions.push({
+                                        type: AXPSystemActionType.Delete,
+                                        description: `"${value.removed?.map((item) => item.name).join(', ')}"`,
+                                    });
+                                }
+                                break;
+                            case 'large-text-editor':
+                            case 'rich-text-editor': {
+                                const safeValue = extractTextFromHtml(value.newValue);
+                                actions.push({
+                                    type: AXPSystemActionType.Update,
+                                    description: `${property.title} to "${safeValue.length > 100 ? safeValue.slice(0, 30) + '...' : safeValue}"`,
+                                });
+                                break;
+                            }
+                            case 'text-editor':
+                                actions.push({
+                                    type: AXPSystemActionType.Update,
+                                    description: `${property.title} to "${value.newValue.length > 100 ? value.newValue.slice(0, 30) + '...' : value.newValue}"`,
+                                });
+                                break;
+                            default:
+                                actions.push({ type: AXPSystemActionType.Update, description: `${property.title}` });
+                        }
+                    }
+                }
+            }
+            // Expose raw changes to event middleware
+            ctx.locals.set('changes', changes);
+        }
+        // Compute reference ID and final data per operation
+        let referenceId;
+        let finalData = undefined;
+        if (ctx.op === 'create') {
+            const createdId = String(ctx.result);
+            const createdEntity = { ...ctx.data, id: createdId };
+            referenceId = createdId;
+            finalData = createdEntity;
+        }
+        else if (ctx.op === 'update') {
+            referenceId = String(ctx.id);
+            finalData = ctx.result;
+        }
+        else {
+            // delete
+            referenceId = String(ctx.id);
+            finalData = ctx.previous;
+        }
+        const record = {
+            id: AXPDataGenerator.uuid(),
+            title: entityConfig?.title ?? now.toISOString(),
+            date: now,
+            user: {
+                id: sessionService.user?.id ?? 'system',
+                name: sessionService.user?.name ?? 'System',
+                title: sessionService.user?.title ?? 'System',
+            },
+            reference: { id: referenceId, type: ctx.entityName },
+            changeType: ctx.op === 'create'
+                ? AXPSystemActionType.Create
+                : ctx.op === 'update'
+                    ? AXPSystemActionType.Update
+                    : AXPSystemActionType.Delete,
+            changes: actions,
+            data: finalData,
+        };
+        // Persist via backend raw insert to avoid recursive middleware
+        try {
+            await backend.insertOne(`${ctx.entityName}-history`, { ...record, isCurrent: true });
+        }
+        catch (error) {
+            console.error(error);
+            // swallow errors to avoid breaking main flow
+        }
+    },
+};
+
+const historyPlugin = {
+    name: 'history',
+    order: 50,
+    apply: (ctx) => {
+        ensureListActions(ctx);
+        ctx.interfaces.update((i) => {
+            const cmdName = 'show-version-history-popup';
+            //
+            const listActions = i.master.list.actions;
+            if (!actionExists(listActions, cmdName)) {
+                listActions.push({
+                    title: '@activity-log:actions.view-history',
+                    command: {
+                        name: cmdName,
+                        options: {
+                            refId: '{{ context.eval("id") }}',
+                            refType: `${ctx.entity.module}.${ctx.entity.name}`,
+                        },
+                    },
+                    priority: 'secondary',
+                    type: 'version-history',
+                    scope: AXPEntityCommandScope.Individual,
+                });
+            }
+            //
+            const singleActions = i.master.single.actions;
+            if (!actionExists(singleActions, cmdName)) {
+                singleActions.push({
+                    title: '@activity-log:actions.view-history',
+                    command: {
+                        name: cmdName,
+                        options: {
+                            refId: '{{ context.eval("id") }}',
+                            refType: `${ctx.entity.module}.${ctx.entity.name}`,
+                        },
+                    },
+                    priority: 'secondary',
+                    type: 'version-history',
+                    scope: AXPEntityCommandScope.Individual,
+                });
+            }
+            //
+            return i;
+        });
+    },
+};
+
+const comparePlugin = {
+    name: 'compare',
+    order: 50,
+    apply: (ctx) => {
+        ensureListActions(ctx);
+        ctx.interfaces.update((i) => {
+            const actions = i.master.list.actions;
+            const cmdName = 'show-entity-records-compare';
+            if (!actionExists(actions, cmdName)) {
+                actions.push({
+                    title: '@activity-log:actions.compare-records',
+                    command: { name: cmdName },
+                    priority: 'secondary',
+                    type: 'compare',
+                    scope: AXPEntityCommandScope.Selected,
+                });
+            }
+            return i;
+        });
+    },
+};
+
+class AXPVersionHistoryModule {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPVersionHistoryModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXPVersionHistoryModule, imports: [i1$1.AXPWorkflowModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPVersionHistoryModule, providers: [
+            { provide: AXP_ENTITY_STORAGE_MIDDLEWARE, multi: true, useValue: historyLoggerMiddleware },
+            { provide: AXP_ENTITY_ACTION_PLUGIN, multi: true, useValue: historyPlugin },
+            { provide: AXP_ENTITY_ACTION_PLUGIN, multi: true, useValue: comparePlugin },
+        ], imports: [AXPWorkflowModule.forChild({
+                actions: {
+                    'show-version-history-popup-action': AXMVersionHistoryPopupStartAction,
+                },
+                workflows: {
+                    'show-version-history-popup': AXMVersionHistoryPopupWorkflow,
+                },
+            })] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPVersionHistoryModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    imports: [
+                        AXPWorkflowModule.forChild({
+                            actions: {
+                                'show-version-history-popup-action': AXMVersionHistoryPopupStartAction,
+                            },
+                            workflows: {
+                                'show-version-history-popup': AXMVersionHistoryPopupWorkflow,
+                            },
+                        }),
+                    ],
+                    exports: [],
+                    providers: [
+                        { provide: AXP_ENTITY_STORAGE_MIDDLEWARE, multi: true, useValue: historyLoggerMiddleware },
+                        { provide: AXP_ENTITY_ACTION_PLUGIN, multi: true, useValue: historyPlugin },
+                        { provide: AXP_ENTITY_ACTION_PLUGIN, multi: true, useValue: comparePlugin },
+                    ],
+                }]
+        }] });
+
+class AXPDateTimeEvaluatorScopeProvider {
+    constructor() {
+        this.calendarService = inject(AXCalendarService);
+    }
+    async provide(context) {
+        context.addScope('date', {
+            today: () => {
+                return this.calendarService.now();
+            },
+            tomorrow: () => {
+                return this.calendarService.create(this.calendarService.now()).add('day', 1).startOf('day').date;
+            },
+            yesterday: () => {
+                return this.calendarService.create(this.calendarService.now()).add('day', -1).startOf('day').date;
+            },
+            addDays: (date, days) => {
+                return this.calendarService.create(date).add('day', days).date;
+            },
+        });
+    }
+}
+
+class AXPTranslateEvaluatorScopeProvider {
+    constructor() {
+        this.translateService = inject(AXTranslationService);
+    }
+    async provide(context) {
+        context.addScope('translate', {
+            resolve: async (text, options) => {
+                return await this.translateService.translateAsync(text, options);
+            },
+        });
+    }
+}
+
+const lockGuardMiddleware = {
+    target: { ops: ['update', 'delete'], order: 10 },
+    execute: async (ctx, next) => {
+        const lockService = inject(AXPLockService);
+        const session = inject(AXPSessionService);
+        const lock = await lockService.check({ refId: ctx.id, refType: ctx.entityName });
+        if (lock) {
+            const info = await lockService.getInfo({ refId: ctx.id, refType: ctx.entityName });
+            if (info && session.user && info.lockedBy.id !== session.user.id) {
+                throw new Error('This record is locked and cannot be edited.');
+            }
+        }
+        await next();
+    },
+};
+
 class AXMLockPopupWorkflowAction extends AXPWorkflowAction {
     constructor() {
         super(...arguments);
         this.popupService = inject(AXPopupService);
+        this.translationService = inject(AXTranslationService);
     }
     async execute(context) {
         const comp = (await Promise.resolve().then(function () { return index; })).AXPLockPopupComponent;
         const result = await this.popupService.open(comp, {
-            title: 'lock-system.lock',
+            title: await this.translationService.translateAsync('@lock-system:lock.dialog.title'),
             data: {
                 refId: context.getVariable('options.refId'),
                 refType: context.getVariable('options.refType'),
@@ -778,7 +1061,7 @@ class AXMUnlockConfirmWorkflowAction extends AXPWorkflowAction {
         const refId = context.getVariable('options.refId');
         const refType = context.getVariable('options.refType');
         // Show confirmation dialog
-        const dialogResult = await this.dialogService.confirm(await this.translationService.translateAsync('unlock.title', { scope: 'general' }), await this.translationService.translateAsync('lock-system.confirm-unlock', { scope: 'general' }), 'warning', 'horizontal', false, 'cancel');
+        const dialogResult = await this.dialogService.confirm(await this.translationService.translateAsync('@lock-system:unlock.dialog.title'), await this.translationService.translateAsync('@lock-system:unlock.dialog.description'), 'warning', 'horizontal', false, 'cancel');
         if (dialogResult.result) {
             try {
                 // Perform unlock
@@ -793,7 +1076,7 @@ class AXMUnlockConfirmWorkflowAction extends AXPWorkflowAction {
             catch (error) {
                 console.error('Unlock failed:', error);
                 // Show error dialog
-                await this.dialogService.alert(await this.translationService.translateAsync('workflow.error'), await this.translationService.translateAsync('lock-system.unlock-failed', { scope: 'general' }), 'danger');
+                await this.dialogService.alert(await this.translationService.translateAsync('@lock-system:unlock.error.title'), await this.translationService.translateAsync('@lock-system:unlock.error.description'), 'danger');
                 context.setOutput('isCanceled', true);
                 context.setOutput('unlocked', false);
             }
@@ -838,253 +1121,635 @@ const AXMUnlockConfirmWorkflow = {
     },
 };
 
-class AXPLockPopupComponent extends AXBasePageComponent {
+class AXMLockEvaluatorScopeProvider {
     constructor() {
-        super(...arguments);
-        //#endregion
-        //#region ----   Signals & Services   ----
-        this.isBusy = signal(false, ...(ngDevMode ? [{ debugName: "isBusy" }] : []));
-        this.form = viewChild.required('form');
         this.lockService = inject(AXPLockService);
-        this.sessionService = inject(AXPSessionService);
-        this.translationService = inject(AXTranslationService);
-        //#endregion
-        //#region ----   Form Data   ----
-        this.duration = '1h';
-        this.reason = '';
-        this.lockDurations = [];
     }
-    async ngOnInit() {
-        // Load translated duration options
-        this.lockDurations = [
-            {
-                value: '1h',
-                text: await this.translationService.translateAsync('lock-system.duration.options.1h', { scope: 'general' }),
-                hours: 1
-            },
-            {
-                value: '1d',
-                text: await this.translationService.translateAsync('lock-system.duration.options.1d', { scope: 'general' }),
-                hours: 24
-            },
-            {
-                value: 'infinite',
-                text: await this.translationService.translateAsync('lock-system.duration.options.infinite', { scope: 'general' })
+    async provide(context) {
+        context.addScope('lock', {
+            check: async (refId, refType) => {
+                const lock = await this.lockService.check({
+                    refId, refType
+                });
+                return lock;
             }
-        ];
+        });
     }
-    //#endregion
-    //#region ----   UI Handlers   ----
-    async handleConfirm() {
-        if (this.isBusy()) {
-            return;
-        }
-        // Validate form
-        const validation = await this.form().validate();
-        if (!validation.result) {
-            return;
-        }
-        // Ensure duration is selected
-        if (!this.duration) {
-            return;
-        }
-        this.isBusy.set(true);
-        try {
-            const selectedDuration = this.lockDurations.find(d => d.value === this.duration);
-            const expireAt = selectedDuration?.hours
-                ? new Date(Date.now() + selectedDuration.hours * 60 * 60 * 1000)
-                : undefined; // undefined means infinite
-            await this.lockService.lock({
-                refId: this.refId,
-                refType: this.refType,
-                type: 'user',
-                date: new Date().toISOString(),
-                expireAt: expireAt,
-                lockedBy: {
-                    id: this.sessionService.user?.id ?? 'system',
-                    type: 'oidc.users',
-                },
-            });
-            // Close and notify success
-            this.close({
-                isCanceled: false,
-                duration: this.duration,
-                reason: this.reason
-            });
-        }
-        catch (error) {
-            console.error(error);
-            // TODO: show error toast if required
-        }
-        finally {
-            this.isBusy.set(false);
-        }
-    }
-    handleCancel() {
-        this.close({ isCanceled: true });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLockPopupComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.2.0", version: "20.1.6", type: AXPLockPopupComponent, isStandalone: true, selector: "axp-lock-popup", viewQueries: [{ propertyName: "form", first: true, predicate: ["form"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: "<ax-content *translate=\"let t\">\n  <div class=\"ax-p-6\">\n    <ax-form #form>\n      <div class=\"ax-grid ax-grid-cols-12 ax-gap-4\">\n        \n        <!-- Lock Duration Selection -->\n        <ax-form-field class=\"ax-col-span-12\">\n          <ax-label>{{ t('lock-system.duration.title', {scope: 'general'}) | async }}</ax-label>\n          <ax-select-box\n            [(ngModel)]=\"duration\"\n            [dataSource]=\"lockDurations\"\n            [valueField]=\"'value'\"\n            [textField]=\"'text'\"\n            name=\"duration\"\n            class=\"ax-w-full\"\n          >\n            <ax-validation-rule\n              rule=\"required\"\n              message=\"This field is required\"\n            ></ax-validation-rule>\n          </ax-select-box>\n        </ax-form-field>\n\n        <!-- Optional Reason -->\n        <ax-form-field class=\"ax-col-span-12\">\n          <ax-label>{{ t('lock-system.reason.title', {scope: 'general'}) | async }}</ax-label>\n          <ax-text-area\n            [(ngModel)]=\"reason\"\n            [placeholder]=\"t('lock-system.reason.placeholder', {scope: 'general'}) | async\"\n            name=\"reason\"\n            class=\"ax-w-full ax-min-h-20\"\n          >\n            <ax-clear-button></ax-clear-button>\n          </ax-text-area>\n        </ax-form-field>\n\n      </div>\n    </ax-form>\n  </div>\n</ax-content>\n\n<ax-footer *translate=\"let t\">\n  <ax-prefix></ax-prefix>\n  <ax-suffix>\n    <ax-button \n      [text]=\"t('cancel') | async\" \n      (onClick)=\"handleCancel()\" \n      [disabled]=\"isBusy()\"\n    ></ax-button>\n    <ax-button\n      [text]=\"t('lock-system.lock', {scope: 'general'}) | async\"\n      color=\"primary\"\n      look=\"solid\"\n      (onClick)=\"handleConfirm()\"\n      [disabled]=\"isBusy()\"\n    >\n    </ax-button>\n  </ax-suffix>\n</ax-footer>\n", styles: [""], dependencies: [{ kind: "ngmodule", type: 
-                // Angular
-                CommonModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: 
-                // ACoreX
-                AXButtonModule }, { kind: "component", type: i2.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXFormModule }, { kind: "component", type: i4$1.AXFormFieldComponent, selector: "ax-form-field", inputs: ["labelMode"] }, { kind: "component", type: i4$1.AXFormComponent, selector: "ax-form", inputs: ["labelMode", "look", "messageStyle", "updateOn"], outputs: ["onValidate", "updateOnChange"] }, { kind: "directive", type: i4$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXLabelModule }, { kind: "component", type: i5.AXLabelComponent, selector: "ax-label", inputs: ["required", "for"], outputs: ["requiredChange"] }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i6.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed"] }, { kind: "ngmodule", type: AXTextAreaModule }, { kind: "component", type: i7.AXTextAreaComponent, selector: "ax-text-area", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "placeholder", "maxLength", "look", "rows", "allowResize", "showCounter", "class"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "directive", type: i4.AXTranslatorDirective, selector: "[translate]" }, { kind: "ngmodule", type: AXValidationModule }, { kind: "pipe", type: i1.AsyncPipe, name: "async" }], encapsulation: i0.ViewEncapsulation.None }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLockPopupComponent, decorators: [{
-            type: Component,
-            args: [{ selector: 'axp-lock-popup', standalone: true, imports: [
-                        // Angular
-                        CommonModule,
-                        FormsModule,
-                        // ACoreX
-                        AXButtonModule,
-                        AXDecoratorModule,
-                        AXFormModule,
-                        AXLabelModule,
-                        AXSelectBoxModule,
-                        AXTextAreaModule,
-                        AXTranslationModule,
-                        AXValidationModule,
-                    ], encapsulation: ViewEncapsulation.None, template: "<ax-content *translate=\"let t\">\n  <div class=\"ax-p-6\">\n    <ax-form #form>\n      <div class=\"ax-grid ax-grid-cols-12 ax-gap-4\">\n        \n        <!-- Lock Duration Selection -->\n        <ax-form-field class=\"ax-col-span-12\">\n          <ax-label>{{ t('lock-system.duration.title', {scope: 'general'}) | async }}</ax-label>\n          <ax-select-box\n            [(ngModel)]=\"duration\"\n            [dataSource]=\"lockDurations\"\n            [valueField]=\"'value'\"\n            [textField]=\"'text'\"\n            name=\"duration\"\n            class=\"ax-w-full\"\n          >\n            <ax-validation-rule\n              rule=\"required\"\n              message=\"This field is required\"\n            ></ax-validation-rule>\n          </ax-select-box>\n        </ax-form-field>\n\n        <!-- Optional Reason -->\n        <ax-form-field class=\"ax-col-span-12\">\n          <ax-label>{{ t('lock-system.reason.title', {scope: 'general'}) | async }}</ax-label>\n          <ax-text-area\n            [(ngModel)]=\"reason\"\n            [placeholder]=\"t('lock-system.reason.placeholder', {scope: 'general'}) | async\"\n            name=\"reason\"\n            class=\"ax-w-full ax-min-h-20\"\n          >\n            <ax-clear-button></ax-clear-button>\n          </ax-text-area>\n        </ax-form-field>\n\n      </div>\n    </ax-form>\n  </div>\n</ax-content>\n\n<ax-footer *translate=\"let t\">\n  <ax-prefix></ax-prefix>\n  <ax-suffix>\n    <ax-button \n      [text]=\"t('cancel') | async\" \n      (onClick)=\"handleCancel()\" \n      [disabled]=\"isBusy()\"\n    ></ax-button>\n    <ax-button\n      [text]=\"t('lock-system.lock', {scope: 'general'}) | async\"\n      color=\"primary\"\n      look=\"solid\"\n      (onClick)=\"handleConfirm()\"\n      [disabled]=\"isBusy()\"\n    >\n    </ax-button>\n  </ax-suffix>\n</ax-footer>\n" }]
-        }] });
-
-var index = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPLockPopupComponent: AXPLockPopupComponent
-});
-
-class AXMLockEvaluatorScopeProvider {
-    constructor() {
-        this.lockService = inject(AXPLockService);
-    }
-    async provide(context) {
-        context.addScope('lock', {
-            check: async (refId, refType) => {
-                const lock = await this.lockService.check({
-                    refId, refType
-                });
-                return lock;
-            }
-        });
-    }
-}
-
-class AXMVersionHistoryPopupStartAction extends AXPWorkflowAction {
-    constructor() {
-        super(...arguments);
-        this.popupService = inject(AXPopupService);
-        this.translate = inject(AXTranslationService);
-    }
-    async execute(context) {
-        const comp = (await import('./acorex-modules-common-timeline-version-history-popup.component-_KJd8oGw.mjs')).AXMTimelineVersionHistoryPopupComponent;
-        this.popupService.open(comp, {
-            title: await this.translate.translateAsync('@activity-log:actions.view-history'),
-            data: {
-                refId: context.getVariable('options.refId'),
-                refType: context.getVariable('options.refType'),
-                fromDate: context.getVariable('options.fromDate'),
-                toDate: context.getVariable('options.toDate'),
-                limit: context.getVariable('options.limit'),
-                offset: context.getVariable('options.offset'),
-            },
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMVersionHistoryPopupStartAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMVersionHistoryPopupStartAction }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMVersionHistoryPopupStartAction, decorators: [{
-            type: Injectable
-        }] });
-const AXMVersionHistoryPopupWorkflow = {
-    startStepId: 'start',
-    steps: {
-        start: {
-            action: 'show-version-history-popup-action',
-        },
-    },
-};
-
-class AXPVersionHistoryModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPVersionHistoryModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXPVersionHistoryModule, imports: [i1$1.AXPWorkflowModule] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPVersionHistoryModule, imports: [AXPWorkflowModule.forChild({
-                actions: {
-                    'show-version-history-popup-action': AXMVersionHistoryPopupStartAction,
+}
+
+const lockPlugin = {
+    name: 'lock',
+    order: 50,
+    apply: (ctx) => {
+        ensureListActions(ctx);
+        ctx.interfaces.update((i) => {
+            const actions = i.master.list.actions;
+            if (!actions.some((a) => a.name === 'lock-entity')) {
+                actions.push({
+                    title: '@lock-system:lock.title',
+                    name: 'lock-entity',
+                    command: {
+                        name: 'lock-popup',
+                        options: {
+                            refId: '{{ context.eval("id") }}',
+                            refType: `${ctx.entity.module}.${ctx.entity.name}`,
+                        },
+                    },
+                    priority: 'secondary',
+                    type: 'lock',
+                    scope: AXPEntityCommandScope.Individual,
+                    hidden: `{{ lock.check(context.eval("id"), "${ctx.entity.module}.${ctx.entity.name}") }}`,
+                });
+            }
+            if (!actions.some((a) => a.name === 'unlock-entity')) {
+                actions.push({
+                    title: '@lock-system:unlock.title',
+                    name: 'unlock-entity',
+                    command: {
+                        name: 'unlock-confirm',
+                        options: {
+                            refId: '{{ context.eval("id") }}',
+                            refType: `${ctx.entity.module}.${ctx.entity.name}`,
+                        },
+                    },
+                    priority: 'secondary',
+                    type: 'unlock',
+                    scope: AXPEntityCommandScope.Individual,
+                    hidden: `{{ (await lock.check(context.eval("id"), "${ctx.entity.module}.${ctx.entity.name}"))  == false }}`,
+                });
+            }
+            return i;
+        });
+    },
+};
+
+class AXMLockSystemModule {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMLockSystemModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXMLockSystemModule, imports: [i1$1.AXPWorkflowModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMLockSystemModule, providers: [
+            { provide: AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, multi: true, useClass: AXMLockEvaluatorScopeProvider },
+            { provide: AXP_ENTITY_ACTION_PLUGIN, multi: true, useValue: lockPlugin },
+            { provide: AXP_ENTITY_STORAGE_MIDDLEWARE, multi: true, useValue: lockGuardMiddleware },
+        ], imports: [AXPWorkflowModule.forChild({
+                actions: {
+                    AXMLockPopupWorkflowAction,
+                    AXMUnlockConfirmWorkflowAction,
                 },
                 workflows: {
-                    'show-version-history-popup': AXMVersionHistoryPopupWorkflow,
+                    'lock-popup': AXMLockPopupWorkflow,
+                    'unlock-confirm': AXMUnlockConfirmWorkflow,
                 },
             })] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPVersionHistoryModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMLockSystemModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
                         AXPWorkflowModule.forChild({
                             actions: {
-                                'show-version-history-popup-action': AXMVersionHistoryPopupStartAction,
+                                AXMLockPopupWorkflowAction,
+                                AXMUnlockConfirmWorkflowAction,
                             },
                             workflows: {
-                                'show-version-history-popup': AXMVersionHistoryPopupWorkflow,
+                                'lock-popup': AXMLockPopupWorkflow,
+                                'unlock-confirm': AXMUnlockConfirmWorkflow,
                             },
                         }),
                     ],
-                    exports: [],
+                    providers: [
+                        { provide: AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, multi: true, useClass: AXMLockEvaluatorScopeProvider },
+                        { provide: AXP_ENTITY_ACTION_PLUGIN, multi: true, useValue: lockPlugin },
+                        { provide: AXP_ENTITY_STORAGE_MIDDLEWARE, multi: true, useValue: lockGuardMiddleware },
+                    ],
                 }]
         }] });
 
-class AXPDateTimeEvaluatorScopeProvider {
-    constructor() {
-        this.calendarService = inject(AXCalendarService);
-    }
-    async provide(context) {
-        context.addScope('date', {
-            today: () => {
-                return this.calendarService.now();
-            },
-            tomorrow: () => {
-                return this.calendarService.create(this.calendarService.now()).add('day', 1).startOf('day').date;
-            },
-            yesterday: () => {
-                return this.calendarService.create(this.calendarService.now()).add('day', -1).startOf('day').date;
-            },
-            addDays: (date, days) => {
-                return this.calendarService.create(date).add('day', days).date;
+/**
+ * extra-properties plugin
+ * Options:
+ * - field: string (property name to hold the extra properties array, default: 'extraProperties')
+ * - title?: string (UI title for the field)
+ */
+const extraPropertiesPlugin = {
+    name: 'extra-properties',
+    order: 60,
+    apply: async (ctx, options) => {
+        const settingsService = inject(AXPSettingService);
+        //#region ----   Options   ----
+        const field = options?.field?.trim()?.length ? options.field : 'extraProperties';
+        const title = options?.title ?? '@extra-properties:title';
+        const mode = options?.mode ?? 'defined';
+        //#endregion
+        //#region ----   Group   ----
+        // Ensure group exists
+        const groupId = 'additional';
+        const groups = ctx.groups.list() ?? [];
+        if (!groups.some((g) => g.id === groupId)) {
+            ctx.groups.add({ id: groupId, title: '@extra-properties:title' });
+        }
+        const target = `${ctx.entity.module}.${ctx.entity.name}`;
+        const schema = mode === 'inline' ? [] :
+            (await settingsService.scope(AXPPlatformScope.Tenant).get(`extra-properties.schema.${target}`)) ?? [];
+        // Ensure property exists (uses our widget)
+        const props = ctx.properties.list();
+        if (!props.some((p) => p.name === field)) {
+            ctx.properties.add({
+                name: field,
+                title,
+                groupId,
+                schema: {
+                    dataType: 'object',
+                    interface: {
+                        type: mode === 'inline' ? 'extra-properties' : 'extra-properties-values',
+                        options: {
+                            schema,
+                        },
+                    },
+                },
+            });
+        }
+        const shared = {
+            name: 'extra-properties',
+            command: {
+                name: 'manage-extra-properties',
+                options: {
+                    target,
+                }
             },
+            title: '@extra-properties:actions.manage',
+            type: 'update',
+            icon: 'fa-solid fa-gear',
+            priority: 'secondary',
+            permissions: ['@extra-properties:permissions.platform'],
+        };
+        ctx.interfaces.master.list.update((list) => {
+            const next = list ?? { title: ctx.entity.title, views: [] };
+            if (!next.actions) {
+                next.actions = [];
+            }
+            next.actions.push({
+                ...shared,
+                scope: AXPEntityCommandScope.TypeLevel,
+            });
+            return next;
         });
-    }
+        // Ensure single view includes it
+        ctx.interfaces.master.single.update((single) => {
+            const next = single ?? { title: ctx.entity.title, sections: [], properties: [] };
+            next.sections = next.sections ?? [];
+            if (!next.sections.some((s) => s.id === groupId) && schema.length > 0) {
+                next.sections.push({ id: groupId });
+            }
+            next.properties = next.properties ?? [];
+            if (!next.properties.some((p) => p.name === field)) {
+                next.properties.push({
+                    name: field,
+                    layout: {
+                        positions: { lg: { colSpan: 12, order: 98 } },
+                        label: {
+                            visible: false
+                        }
+                    },
+                });
+            }
+            // Ensure action exists
+            if (mode === 'defined') {
+                next.actions = next.actions ?? [];
+                if (!next.actions.some((a) => a.name === 'extra-properties')) {
+                    next.actions.push({
+                        ...shared,
+                        scope: AXPEntityCommandScope.Individual,
+                    });
+                }
+            }
+            return next;
+        });
+        // Ensure create view includes it
+        ctx.interfaces.master.create.update((create) => {
+            const next = create ?? { sections: [], properties: [] };
+            next.sections = next.sections ?? [];
+            if (!next.sections.some((s) => s.id === groupId)) {
+                next.sections.push({ id: groupId });
+            }
+            next.properties = next.properties ?? [];
+            if (!next.properties.some((p) => p.name === field)) {
+                next.properties.push({
+                    name: field,
+                    layout: {
+                        positions: { lg: { colSpan: 12, order: 98 } },
+                        label: {
+                            visible: false
+                        }
+                    },
+                });
+            }
+            return next;
+        });
+        // Ensure update view includes it
+        ctx.interfaces.master.modify.update((modify) => {
+            const next = modify ?? { sections: [], properties: [] };
+            next.sections = next.sections ?? [];
+            if (!next.sections.some((s) => s.id === groupId)) {
+                next.sections.push({ id: groupId });
+            }
+            next.properties = next.properties ?? [];
+            if (!next.properties.some((p) => p.name === field)) {
+                next.properties.push({
+                    name: field,
+                    layout: {
+                        positions: { lg: { colSpan: 12, order: 98 } },
+                        label: {
+                            visible: false
+                        }
+                    },
+                });
+            }
+            return next;
+        });
+    },
+};
+
+const AXPWidgetsList = {
+    Editors: {
+        DocumentAttachment: 'document-attachment-editor',
+        TagBox: 'tagable-editor',
+        CheckBox: 'checkbox-editor',
+        ColorBox: 'color-editor',
+        DateTimeBox: 'date-time-editor',
+        Direction: 'direction',
+        LargeTextBox: 'large-text-editor',
+        NumberBox: 'number-editor',
+        UnitValueBox: 'number-unit-editor',
+        PasswordBox: 'password-editor',
+        QueryBuilder: 'query-builder-editor',
+        RichText: 'rich-text-editor',
+        SelectBox: 'select-editor',
+        SelectionList: 'selection-list-editor',
+        TextBox: 'text-editor',
+        InlineDataTable: 'table-editor',
+        ToggleSwitch: 'toggle-editor',
+        FileTypeExtension: 'file-type-extension',
+        MapBox: 'map',
+        MediaGallery: 'gallery',
+        SignatureBox: 'signature',
+        LookupBox: 'lookup-editor',
+    },
+    Layouts: {
+        BlockLayout: 'block-layout',
+        RepeaterLayout: 'repeater-layout',
+        TextBlockLayout: 'text-block-layout',
+        FormField: 'form-field',
+    },
+    Actions: {
+        ActionButton: 'button-action',
+    },
+    Advanced: {
+        QRCode: 'qrcode',
+    },
+    Templates: {
+        Designer: 'template-designer',
+    },
+};
+
+const AXP_EXTRA_PROPERTY_TYPES_DEFAULT = [
+    { id: AXPWidgetsList.Editors.TextBox, title: 'Text' },
+    { id: AXPWidgetsList.Editors.CheckBox, title: 'Checkbox' },
+    { id: AXPWidgetsList.Editors.ToggleSwitch, title: 'Toggle' },
+    { id: AXPWidgetsList.Editors.NumberBox, title: 'Number' },
+    { id: AXPWidgetsList.Editors.DateTimeBox, title: 'Date', defaultOptions: { format: 'date' } },
+    { id: AXPWidgetsList.Editors.DateTimeBox, title: 'DateTime', defaultOptions: { format: 'datetime' } },
+    { id: AXPWidgetsList.Editors.DateTimeBox, title: 'Time', defaultOptions: { format: 'time' } },
+    { id: AXPWidgetsList.Editors.TextBox, title: 'Email', defaultOptions: { type: 'email' } },
+    { id: AXPWidgetsList.Editors.TextBox, title: 'Phone', defaultOptions: { type: 'tel' } },
+];
+function provideExtraPropertyTypes(types) {
+    return {
+        provide: AXP_EXTRA_PROPERTY_TYPES,
+        useValue: types,
+    };
+}
+function provideDefaultExtraPropertyTypes() {
+    return provideExtraPropertyTypes(AXP_EXTRA_PROPERTY_TYPES_DEFAULT);
 }
 
-class AXPTranslateEvaluatorScopeProvider {
+class AXPExtraPropertiesModule {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPExtraPropertiesModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXPExtraPropertiesModule }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPExtraPropertiesModule, providers: [
+            { provide: AXP_ENTITY_ACTION_PLUGIN, multi: true, useValue: extraPropertiesPlugin },
+            //
+            provideDefaultExtraPropertyTypes(),
+            //
+            provideCommandSetups([{
+                    key: 'manage-extra-properties',
+                    command: () => import('./acorex-modules-common-manage-extra-properties.command-DqdhTfLD.mjs').then(m => m.AXPManageExtraPropertiesCommand),
+                }]),
+        ] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPExtraPropertiesModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    providers: [
+                        { provide: AXP_ENTITY_ACTION_PLUGIN, multi: true, useValue: extraPropertiesPlugin },
+                        //
+                        provideDefaultExtraPropertyTypes(),
+                        //
+                        provideCommandSetups([{
+                                key: 'manage-extra-properties',
+                                command: () => import('./acorex-modules-common-manage-extra-properties.command-DqdhTfLD.mjs').then(m => m.AXPManageExtraPropertiesCommand),
+                            }]),
+                    ],
+                }]
+        }] });
+
+const categoryPlugin = {
+    name: 'category',
+    order: 45,
+    apply: (ctx, options) => {
+        const moduleName = ctx.entity.module;
+        const baseEntityName = ctx.entity.name;
+        const categoryEntityName = `${baseEntityName}Category`;
+        const propertyName = options?.propertyName?.trim()?.length ? options.propertyName : 'categoryIds';
+        const allowMultiple = options?.allowMultiple ?? true;
+        // Ensure group exists (prefer basic-info)
+        const groups = ctx.groups.list() ?? [];
+        const hasBasic = groups.some((g) => g.id === 'basic-info');
+        if (!hasBasic) {
+            ctx.groups.add({ id: 'basic-info', title: '@general:terms.basic-info' });
+        }
+        ctx.columns.add({ name: 'categoryIds', options: { dataPath: 'categories' } });
+        // Ensure property exists
+        const props = ctx.properties.list();
+        if (!props.some((p) => p.name === propertyName)) {
+            ctx.properties.add({
+                name: propertyName,
+                title: '@general:terms.category.plural',
+                groupId: 'basic-info',
+                schema: {
+                    dataType: 'string',
+                    interface: {
+                        type: AXPWidgetsList.Editors.LookupBox,
+                        options: {
+                            entity: `${moduleName}.${categoryEntityName}`,
+                            multiple: allowMultiple,
+                            expose: [
+                                { source: 'id', target: 'categories.{id}' },
+                                { source: 'title', target: 'categories.{title}' },
+                            ],
+                        },
+                    },
+                },
+            });
+        }
+        // Ensure category sidebar/filter block
+        ctx.category.update((cat) => {
+            return {
+                entity: `${moduleName}.${categoryEntityName}`,
+                title: '@general:terms.category.plural',
+                textField: 'title',
+                valueField: 'id',
+                applyConditions: [
+                    {
+                        name: propertyName,
+                        operator: { type: 'contains' },
+                        value: 'id',
+                    },
+                ],
+            };
+        });
+        // Ensure layout includes property in create/modify/single
+        const ensureLayoutProperty = (layout) => {
+            layout.sections = layout.sections ?? [];
+            if (!layout.sections.some((s) => s.id === 'basic-info')) {
+                layout.sections.push({ id: 'basic-info' });
+            }
+            layout.properties = layout.properties ?? [];
+            if (!layout.properties.some((p) => p.name === propertyName)) {
+                layout.properties.push({
+                    name: propertyName,
+                    layout: {
+                        positions: { lg: { colSpan: 12, order: 12 } },
+                    },
+                });
+            }
+            return layout;
+        };
+        ctx.interfaces.master.create.update((create) => ensureLayoutProperty(create ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.modify.update((modify) => ensureLayoutProperty(modify ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.single.update((single) => ensureLayoutProperty(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+        // Mark extension for dynamic category entity generation
+        ctx.entity.extensions ??= {};
+        ctx.entity.extensions.category = {
+            entity: `${moduleName}.${categoryEntityName}`,
+            propertyName,
+            allowMultiple,
+        };
+    },
+};
+
+class AXMEntityCategoryProvider {
     constructor() {
-        this.translateService = inject(AXTranslationService);
+        this.injector = inject(Injector);
     }
-    async provide(context) {
-        context.addScope('translate', {
-            resolve: async (text, options) => {
-                return await this.translateService.translateAsync(text, options);
-            },
-        });
+    preload() {
+        return [];
+    }
+    async get(moduleName, entityName) {
+        // Generic per-entity Category provider (works for any module)
+        if (entityName.endsWith('Category')) {
+            const fullKey = `${moduleName}.${entityName}`;
+            const dataService = runInInjectionContext(this.injector, () => new AXMEntityCrudServiceImpl(fullKey));
+            const entityDef = {
+                module: moduleName,
+                name: entityName,
+                parentKey: 'parentId',
+                plugins: [
+                // { name: 'history' },
+                // { name: 'lock' },
+                // { name: 'compare' },
+                ],
+                source: '',
+                title: '@general:terms.category.individual',
+                formats: {
+                    individual: '@general:terms.category.individual',
+                    plural: '@general:terms.category.plural',
+                    searchResult: {
+                        title: '{{ title }}',
+                        description: '{{ module }}',
+                    },
+                },
+                relatedEntities: [],
+                groups: [
+                    { id: 'basic-info', title: '@general:terms.basic-info' },
+                ],
+                properties: [
+                    {
+                        name: 'title',
+                        title: '@general:terms.title',
+                        groupId: 'basic-info',
+                        options: {
+                            sort: { enabled: true },
+                            filter: { advance: { enabled: true }, inline: { enabled: true } },
+                        },
+                        schema: { dataType: 'string', interface: { type: AXPWidgetsCatalog.text } },
+                        validations: [{ rule: 'required' }],
+                    },
+                    {
+                        name: 'parentId',
+                        title: '@general:terms.parent-id',
+                        groupId: 'basic-info',
+                        schema: {
+                            dataType: 'string',
+                            interface: {
+                                type: AXPWidgetsList.Editors.LookupBox,
+                                options: { entity: `${moduleName}.${entityName}` },
+                            },
+                        },
+                    },
+                    {
+                        name: 'description',
+                        title: '@general:terms.description',
+                        groupId: 'basic-info',
+                        schema: { dataType: 'string', interface: { type: AXPWidgetsCatalog.largeText } },
+                    },
+                ],
+                columns: [{ name: 'title' }, { name: 'description' }],
+                commands: {
+                    create: { execute: async (data) => ({ id: await dataService.insertOne(data) }) },
+                    delete: { execute: async (id) => dataService.deleteOne(id) },
+                    update: { execute: async (data) => dataService.updateOne(data.id, data) },
+                },
+                queries: {
+                    byKey: { execute: async (id) => dataService.getOne(id), type: AXPEntityQueryType.Single },
+                    list: {
+                        execute: async (e) => {
+                            const res = await dataService.query(e);
+                            // enrich hasChild for tree views if childCount is available
+                            return {
+                                items: res.items.map((item) => ({ ...item, hasChild: (item.childCount ?? 0) > 0 })),
+                                total: res.total,
+                            };
+                        },
+                        type: AXPEntityQueryType.List,
+                    },
+                },
+                interfaces: {
+                    master: {
+                        create: {
+                            sections: [{ id: 'basic-info' }],
+                            properties: [
+                                { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                                { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                                { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                            ],
+                        },
+                        update: {
+                            sections: [{ id: 'basic-info' }],
+                            properties: [
+                                { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                                { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                                { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                            ],
+                        },
+                        single: {
+                            title: '{{title}}',
+                            sections: [{ id: 'basic-info', layout: { positions: { lg: { colSpan: 12 } } } }],
+                            properties: [
+                                { name: 'title', layout: { positions: { lg: { colSpan: 12, order: 1 } } } },
+                                { name: 'parentId', layout: { positions: { lg: { colSpan: 12, order: 2 } } } },
+                                { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                            ],
+                            actions: [entityMasterDeleteAction()],
+                        },
+                        list: {
+                            actions: [...entityMasterCrudActions()],
+                            views: [createAllQueryView({ sorts: [{ name: 'title', dir: 'asc' }] })],
+                        },
+                    },
+                },
+            };
+            return entityDef;
+        }
+        return null;
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMEntityCategoryProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMEntityCategoryProvider }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMEntityCategoryProvider, decorators: [{
+            type: Injectable
+        }] });
+
+class AXPCategoryModule {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPCategoryModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXPCategoryModule }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPCategoryModule, providers: [
+            { provide: AXP_ENTITY_ACTION_PLUGIN, multi: true, useValue: categoryPlugin },
+            {
+                provide: AXP_PERMISSION_DEFINITION_PROVIDER,
+                multi: true,
+                useFactory: () => {
+                    const provider = {
+                        define: async (context) => {
+                            // Generate permissions for any entity that declared category extension
+                            // We can’t scan registry here reliably at bootstrap; rely on generic pattern per module via wildcard
+                            // Consumers can still override with module-level providers.
+                            // No-op here; permissions will be added when category entity is resolved via provideEntity elsewhere if needed.
+                        },
+                    };
+                    return provider;
+                },
+            },
+            {
+                provide: AXP_ENTITY_DEFINITION_LOADER,
+                useClass: AXMEntityCategoryProvider,
+                multi: true,
+            },
+        ] }); }
 }
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPCategoryModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    providers: [
+                        { provide: AXP_ENTITY_ACTION_PLUGIN, multi: true, useValue: categoryPlugin },
+                        {
+                            provide: AXP_PERMISSION_DEFINITION_PROVIDER,
+                            multi: true,
+                            useFactory: () => {
+                                const provider = {
+                                    define: async (context) => {
+                                        // Generate permissions for any entity that declared category extension
+                                        // We can’t scan registry here reliably at bootstrap; rely on generic pattern per module via wildcard
+                                        // Consumers can still override with module-level providers.
+                                        // No-op here; permissions will be added when category entity is resolved via provideEntity elsewhere if needed.
+                                    },
+                                };
+                                return provider;
+                            },
+                        },
+                        {
+                            provide: AXP_ENTITY_DEFINITION_LOADER,
+                            useClass: AXMEntityCategoryProvider,
+                            multi: true,
+                        },
+                    ],
+                }]
+        }] });
 
 class AXMCommonModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMCommonModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXMCommonModule, imports: [AXPGlobalSearchModule,
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXMCommonModule, imports: [AXMLockSystemModule,
+            AXPExtraPropertiesModule,
+            AXPCategoryModule,
+            AXPGlobalSearchModule,
             AXPWidgetsModule,
             AXPVersionHistoryModule,
-            AXPCompareModule, i1$1.AXPWorkflowModule] }); }
+            AXPCompareModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMCommonModule, providers: [
             {
                 provide: AXP_MENU_PROVIDER,
                 useClass: AXMMenuProvider,
                 multi: true,
             },
-            {
-                provide: AXP_ENTITY_DEFINITION_LOADER,
-                useClass: AXMEntityProvider,
-                multi: true,
-            },
             {
                 provide: AXP_SETTING_DEFINITION_PROVIDER,
                 useClass: AXMSettingProvider,
@@ -1100,11 +1765,6 @@ class AXMCommonModule {
                 useClass: AXMPermissionDefinitionProvider,
                 multi: true,
             },
-            {
-                provide: AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER,
-                useClass: AXMLockEvaluatorScopeProvider,
-                multi: true,
-            },
             {
                 provide: AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER,
                 useClass: AXPDateTimeEvaluatorScopeProvider,
@@ -1115,39 +1775,25 @@ class AXMCommonModule {
                 useClass: AXPTranslateEvaluatorScopeProvider,
                 multi: true,
             },
-        ], imports: [AXPGlobalSearchModule,
+        ], imports: [AXMLockSystemModule,
+            AXPExtraPropertiesModule,
+            AXPCategoryModule,
+            AXPGlobalSearchModule,
             AXPWidgetsModule,
             AXPVersionHistoryModule,
-            AXPCompareModule,
-            AXPWorkflowModule.forChild({
-                actions: {
-                    AXMLockPopupWorkflowAction,
-                    AXMUnlockConfirmWorkflowAction,
-                },
-                workflows: {
-                    'lock-popup': AXMLockPopupWorkflow,
-                    'unlock-confirm': AXMUnlockConfirmWorkflow,
-                },
-            })] }); }
+            AXPCompareModule] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXMCommonModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
+                        AXMLockSystemModule,
+                        AXPExtraPropertiesModule,
+                        AXPCategoryModule,
                         AXPGlobalSearchModule,
                         AXPWidgetsModule,
                         AXPVersionHistoryModule,
                         AXPCompareModule,
-                        AXPWorkflowModule.forChild({
-                            actions: {
-                                AXMLockPopupWorkflowAction,
-                                AXMUnlockConfirmWorkflowAction,
-                            },
-                            workflows: {
-                                'lock-popup': AXMLockPopupWorkflow,
-                                'unlock-confirm': AXMUnlockConfirmWorkflow,
-                            },
-                        }),
                     ],
                     exports: [],
                     declarations: [],
@@ -1157,11 +1803,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
                             useClass: AXMMenuProvider,
                             multi: true,
                         },
-                        {
-                            provide: AXP_ENTITY_DEFINITION_LOADER,
-                            useClass: AXMEntityProvider,
-                            multi: true,
-                        },
                         {
                             provide: AXP_SETTING_DEFINITION_PROVIDER,
                             useClass: AXMSettingProvider,
@@ -1177,11 +1818,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
                             useClass: AXMPermissionDefinitionProvider,
                             multi: true,
                         },
-                        {
-                            provide: AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER,
-                            useClass: AXMLockEvaluatorScopeProvider,
-                            multi: true,
-                        },
                         {
                             provide: AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER,
                             useClass: AXPDateTimeEvaluatorScopeProvider,
@@ -1196,51 +1832,124 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
                 }]
         }] });
 
-const AXPWidgetsList = {
-    Editors: {
-        DocumentAttachment: 'document-attachment-editor',
-        TagBox: 'tagable-editor',
-        CheckBox: 'checkbox-editor',
-        ColorBox: 'color-editor',
-        DateTimeBox: 'date-time-editor',
-        Direction: 'direction',
-        LargeTextBox: 'large-text-editor',
-        NumberBox: 'number-editor',
-        UnitValueBox: 'number-unit-editor',
-        PasswordBox: 'password-editor',
-        QueryBuilder: 'query-builder-editor',
-        RichText: 'rich-text-editor',
-        SelectBox: 'select-editor',
-        SelectionList: 'selection-list-editor',
-        TextBox: 'text-editor',
-        InlineDataTable: 'table-editor',
-        ToggleSwitch: 'toggle-editor',
-        FileTypeExtension: 'file-type-extension',
-        MapBox: 'map',
-        MediaGallery: 'gallery',
-        SignatureBox: 'signature',
-        LookupBox: 'lookup-editor',
-    },
-    Layouts: {
-        BlockLayout: 'block-layout',
-        RepeaterLayout: 'repeater-layout',
-        TextBlockLayout: 'text-block-layout',
-        FormField: 'form-field',
-    },
-    Actions: {
-        ActionButton: 'button-action',
-    },
-    Advanced: {
-        QRCode: 'qrcode',
-    },
-    Templates: {
-        Designer: 'template-designer',
-    },
-};
+class AXPLockPopupComponent extends AXBasePageComponent {
+    constructor() {
+        super(...arguments);
+        //#endregion
+        //#region ----   Signals & Services   ----
+        this.isBusy = signal(false, ...(ngDevMode ? [{ debugName: "isBusy" }] : []));
+        this.form = viewChild.required('form');
+        this.lockService = inject(AXPLockService);
+        this.sessionService = inject(AXPSessionService);
+        this.translationService = inject(AXTranslationService);
+        //#endregion
+        //#region ----   Form Data   ----
+        this.duration = '1h';
+        this.reason = '';
+        this.lockDurations = [];
+    }
+    async ngOnInit() {
+        // Load translated duration options
+        this.lockDurations = [
+            {
+                value: '1h',
+                text: await this.translationService.translateAsync('@lock-system:lock.duration.options.1h'),
+                hours: 1
+            },
+            {
+                value: '1d',
+                text: await this.translationService.translateAsync('@lock-system:lock.duration.options.1d'),
+                hours: 24
+            },
+            {
+                value: 'infinite',
+                text: await this.translationService.translateAsync('@lock-system:lock.duration.options.infinite')
+            }
+        ];
+    }
+    //#endregion
+    //#region ----   UI Handlers   ----
+    async handleConfirm() {
+        if (this.isBusy()) {
+            return;
+        }
+        // Validate form
+        const validation = await this.form().validate();
+        if (!validation.result) {
+            return;
+        }
+        // Ensure duration is selected
+        if (!this.duration) {
+            return;
+        }
+        this.isBusy.set(true);
+        try {
+            const selectedDuration = this.lockDurations.find(d => d.value === this.duration);
+            const expireAt = selectedDuration?.hours
+                ? new Date(Date.now() + selectedDuration.hours * 60 * 60 * 1000)
+                : undefined; // undefined means infinite
+            await this.lockService.lock({
+                refId: this.refId,
+                refType: this.refType,
+                type: 'user',
+                date: new Date().toISOString(),
+                expireAt: expireAt,
+                lockedBy: {
+                    id: this.sessionService.user?.id ?? 'system',
+                    type: 'oidc.users',
+                },
+            });
+            // Close and notify success
+            this.close({
+                isCanceled: false,
+                duration: this.duration,
+                reason: this.reason
+            });
+        }
+        catch (error) {
+            console.error(error);
+            // TODO: show error toast if required
+        }
+        finally {
+            this.isBusy.set(false);
+        }
+    }
+    handleCancel() {
+        this.close({ isCanceled: true });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLockPopupComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.2.0", version: "20.1.6", type: AXPLockPopupComponent, isStandalone: true, selector: "axp-lock-popup", viewQueries: [{ propertyName: "form", first: true, predicate: ["form"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: "<ax-content *translate=\"let t\">\n  <div class=\"ax-p-6\">\n    <ax-form #form>\n      <div class=\"ax-grid ax-grid-cols-12 ax-gap-4\">\n        <!-- Lock Duration Selection -->\n        <ax-form-field class=\"ax-col-span-12\">\n          <ax-label>{{ t('@lock-system:lock.duration.title') | async }}</ax-label>\n          <ax-select-box\n            [(ngModel)]=\"duration\"\n            [dataSource]=\"lockDurations\"\n            [valueField]=\"'value'\"\n            [textField]=\"'text'\"\n            name=\"duration\"\n            class=\"ax-w-full\"\n          >\n            <ax-validation-rule rule=\"required\" message=\"This field is required\"></ax-validation-rule>\n          </ax-select-box>\n        </ax-form-field>\n\n        <!-- Optional Reason -->\n        <ax-form-field class=\"ax-col-span-12\">\n          <ax-label>{{ t('@lock-system:lock.reason.title') | async }}</ax-label>\n          <ax-text-area\n            [(ngModel)]=\"reason\"\n            [placeholder]=\"t('@lock-system:lock.reason.placeholder') | async\"\n            name=\"reason\"\n            class=\"ax-w-full ax-min-h-20\"\n          >\n            <ax-clear-button></ax-clear-button>\n          </ax-text-area>\n        </ax-form-field>\n      </div>\n    </ax-form>\n  </div>\n</ax-content>\n\n<ax-footer *translate=\"let t\">\n  <ax-prefix></ax-prefix>\n  <ax-suffix>\n    <ax-button\n      [text]=\"t('@lock-system:lock.dialog.cancel') | async\"\n      (onClick)=\"handleCancel()\"\n      [disabled]=\"isBusy()\"\n    ></ax-button>\n    <ax-button\n      [text]=\"t('@lock-system:lock.dialog.confirm') | async\"\n      color=\"primary\"\n      look=\"solid\"\n      (onClick)=\"handleConfirm()\"\n      [disabled]=\"isBusy()\"\n    >\n    </ax-button>\n  </ax-suffix>\n</ax-footer>\n", styles: [""], dependencies: [{ kind: "ngmodule", type: 
+                // Angular
+                CommonModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: 
+                // ACoreX
+                AXButtonModule }, { kind: "component", type: i2.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i1.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXFormModule }, { kind: "component", type: i4$1.AXFormFieldComponent, selector: "ax-form-field", inputs: ["labelMode"] }, { kind: "component", type: i4$1.AXFormComponent, selector: "ax-form", inputs: ["labelMode", "look", "messageStyle", "updateOn"], outputs: ["onValidate", "updateOnChange"] }, { kind: "directive", type: i4$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXLabelModule }, { kind: "component", type: i5.AXLabelComponent, selector: "ax-label", inputs: ["required", "for"], outputs: ["requiredChange"] }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i6.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed"] }, { kind: "ngmodule", type: AXTextAreaModule }, { kind: "component", type: i7.AXTextAreaComponent, selector: "ax-text-area", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "placeholder", "maxLength", "look", "rows", "allowResize", "showCounter", "class"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "directive", type: i4.AXTranslatorDirective, selector: "[translate]" }, { kind: "ngmodule", type: AXValidationModule }, { kind: "pipe", type: i3.AsyncPipe, name: "async" }], encapsulation: i0.ViewEncapsulation.None }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLockPopupComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'axp-lock-popup', standalone: true, imports: [
+                        // Angular
+                        CommonModule,
+                        FormsModule,
+                        // ACoreX
+                        AXButtonModule,
+                        AXDecoratorModule,
+                        AXFormModule,
+                        AXLabelModule,
+                        AXSelectBoxModule,
+                        AXTextAreaModule,
+                        AXTranslationModule,
+                        AXValidationModule,
+                    ], encapsulation: ViewEncapsulation.None, template: "<ax-content *translate=\"let t\">\n  <div class=\"ax-p-6\">\n    <ax-form #form>\n      <div class=\"ax-grid ax-grid-cols-12 ax-gap-4\">\n        <!-- Lock Duration Selection -->\n        <ax-form-field class=\"ax-col-span-12\">\n          <ax-label>{{ t('@lock-system:lock.duration.title') | async }}</ax-label>\n          <ax-select-box\n            [(ngModel)]=\"duration\"\n            [dataSource]=\"lockDurations\"\n            [valueField]=\"'value'\"\n            [textField]=\"'text'\"\n            name=\"duration\"\n            class=\"ax-w-full\"\n          >\n            <ax-validation-rule rule=\"required\" message=\"This field is required\"></ax-validation-rule>\n          </ax-select-box>\n        </ax-form-field>\n\n        <!-- Optional Reason -->\n        <ax-form-field class=\"ax-col-span-12\">\n          <ax-label>{{ t('@lock-system:lock.reason.title') | async }}</ax-label>\n          <ax-text-area\n            [(ngModel)]=\"reason\"\n            [placeholder]=\"t('@lock-system:lock.reason.placeholder') | async\"\n            name=\"reason\"\n            class=\"ax-w-full ax-min-h-20\"\n          >\n            <ax-clear-button></ax-clear-button>\n          </ax-text-area>\n        </ax-form-field>\n      </div>\n    </ax-form>\n  </div>\n</ax-content>\n\n<ax-footer *translate=\"let t\">\n  <ax-prefix></ax-prefix>\n  <ax-suffix>\n    <ax-button\n      [text]=\"t('@lock-system:lock.dialog.cancel') | async\"\n      (onClick)=\"handleCancel()\"\n      [disabled]=\"isBusy()\"\n    ></ax-button>\n    <ax-button\n      [text]=\"t('@lock-system:lock.dialog.confirm') | async\"\n      color=\"primary\"\n      look=\"solid\"\n      (onClick)=\"handleConfirm()\"\n      [disabled]=\"isBusy()\"\n    >\n    </ax-button>\n  </ax-suffix>\n</ax-footer>\n" }]
+        }] });
+
+var index = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    AXPLockPopupComponent: AXPLockPopupComponent
+});
 
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AXMCommonModule, AXMEntityProvider, AXMLockPopupWorkflow, AXMLockPopupWorkflowAction, AXMMenuProvider, AXMSearchCommandProvider, AXMSettingProvider, AXMUnlockConfirmWorkflow, AXMUnlockConfirmWorkflowAction, AXPGlobalSearchModule, AXPGlobalSearchViewModel, AXPLockPopupComponent, AXPVersionHistoryModule, AXPWidgetsList, AXP_GLOBAL_SEARCH_CONFIG_TOKEN, RootConfig };
+export { AXMCommonModule, AXMLockPopupWorkflow, AXMLockPopupWorkflowAction, AXMMenuProvider, AXMSearchCommandProvider, AXMSettingProvider, AXMUnlockConfirmWorkflow, AXMUnlockConfirmWorkflowAction, AXPGlobalSearchModule, AXPGlobalSearchViewModel, AXPLockPopupComponent, AXPVersionHistoryModule, AXPWidgetsList, AXP_GLOBAL_SEARCH_CONFIG_TOKEN, RootConfig };
 //# sourceMappingURL=acorex-modules-common.mjs.map