@acorex/platform 20.6.0-next.1 → 20.6.0-next.11

package/fesm2022/acorex-platform-layout-entity.mjs

@@ -15,7 +15,7 @@ import { AXPWidgetsCatalog, AXPWidgetCoreModule, AXPPageStatus, AXPWidgetRegistr
 import { AXPCommandService, AXPQueryService, provideCommandSetups, provideQuerySetups } from '@acorex/platform/runtime';
 import * as i5 from '@angular/common';
 import { CommonModule } from '@angular/common';
-import { castArray, get, cloneDeep, set, merge, isEqual, isNil, isEmpty, sortBy } from 'lodash-es';
+import { castArray, get, cloneDeep, set, merge, orderBy, isEqual, isNil, isEmpty, sortBy } from 'lodash-es';
 import { AXDataSource } from '@acorex/cdk/common';
 import { AXFormatService } from '@acorex/core/format';
 import * as i4$1 from '@acorex/platform/common';
@@ -76,24 +76,41 @@ class AXPOpenEntityDetailsCommand {
     async execute(input) {
         const { entity, data } = input;
         if (!entity) {
-            throw new Error('Entity name is required for opening details view');
+            return {
+                success: false,
+                message: {
+                    text: 'Entity name is required for opening details view'
+                }
+            };
         }
         if (!data?.id) {
-            throw new Error('Entity ID is required for opening details view');
+            return {
+                success: false,
+                message: {
+                    text: 'Entity ID is required for opening details view'
+                }
+            };
         }
         const [module, entityName] = entity.split('.');
         if (!module || !entityName) {
-            throw new Error('Entity must be in format "ModuleName.EntityName"');
+            return {
+                success: false,
+                message: {
+                    text: 'Entity must be in format "ModuleName.EntityName"'
+                }
+            };
         }
         const url = `/${this.sessionService.application?.name}/m/${module}/e/${entityName}/${data.id}/new-view`;
         // Navigate to the entity details page
         this.router.navigate([url]);
-        return { success: true };
+        return {
+            success: true,
+        };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPOpenEntityDetailsCommand, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPOpenEntityDetailsCommand, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPOpenEntityDetailsCommand, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPOpenEntityDetailsCommand, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPOpenEntityDetailsCommand, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPOpenEntityDetailsCommand, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -368,10 +385,10 @@ class AXPEntityDetailPopoverComponent {
             .slice(0, 7); // Limit to 7 most important fields
         return importantProperties;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDetailPopoverComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.10", type: AXPEntityDetailPopoverComponent, isStandalone: true, selector: "axp-entity-detail-popover", inputs: { entity: { classPropertyName: "entity", publicName: "entity", isSignal: true, isRequired: true, transformFunction: null }, entityId: { classPropertyName: "entityId", publicName: "entityId", isSignal: true, isRequired: true, transformFunction: null }, textField: { classPropertyName: "textField", publicName: "textField", isSignal: true, isRequired: false, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: false, transformFunction: null }, item: { classPropertyName: "item", publicName: "item", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "detailPopover", first: true, predicate: ["detailPopover"], descendants: true, isSignal: true }], ngImport: i0, template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        @if (entityDetails()?.entityData?.[textField()]) {\n          {{ entityDetails()?.entityData[textField()] }}\n        } @else {\n          {{ item()?.[textField()] }}\n        }\n      </h3>\n    </div>\n    @if (isLoadingDetails()) {\n      <div class=\"ax-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button [color]=\"'primary'\" [look]=\"'solid'\" text=\"Open Details\" (click)=\"navigateToDetails()\"> </ax-button>\n      </div>\n    }\n  </div>\n</ax-popover>\n", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.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: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i3$1.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDetailPopoverComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.12", type: AXPEntityDetailPopoverComponent, isStandalone: true, selector: "axp-entity-detail-popover", inputs: { entity: { classPropertyName: "entity", publicName: "entity", isSignal: true, isRequired: true, transformFunction: null }, entityId: { classPropertyName: "entityId", publicName: "entityId", isSignal: true, isRequired: true, transformFunction: null }, textField: { classPropertyName: "textField", publicName: "textField", isSignal: true, isRequired: false, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: false, transformFunction: null }, item: { classPropertyName: "item", publicName: "item", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "detailPopover", first: true, predicate: ["detailPopover"], descendants: true, isSignal: true }], ngImport: i0, template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        @if (entityDetails()?.entityData?.[textField()]) {\n          {{ entityDetails()?.entityData[textField()] }}\n        } @else {\n          {{ item()?.[textField()] }}\n        }\n      </h3>\n    </div>\n    @if (isLoadingDetails()) {\n      <div class=\"ax-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button [color]=\"'primary'\" [look]=\"'solid'\" text=\"Open Details\" (click)=\"navigateToDetails()\"> </ax-button>\n      </div>\n    }\n  </div>\n</ax-popover>\n", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.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: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i3$1.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDetailPopoverComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDetailPopoverComponent, decorators: [{
             type: Component,
             args: [{ selector: 'axp-entity-detail-popover', changeDetection: ChangeDetectionStrategy.OnPush, imports: [
                         CommonModule,
@@ -436,10 +453,10 @@ class AXPEntityDetailPopoverService {
     get isActive() {
         return this.activePopoverRef !== null;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDetailPopoverService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDetailPopoverService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDetailPopoverService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDetailPopoverService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDetailPopoverService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDetailPopoverService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -456,10 +473,10 @@ class AXPDataSeederService {
             await loader?.seed();
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPDataSeederService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPDataSeederService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPDataSeederService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPDataSeederService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPDataSeederService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPDataSeederService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -484,10 +501,10 @@ class AXPEntityResolver {
         }
         return null;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityResolver, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityResolver, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityResolver, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityResolver, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityResolver, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityResolver, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -507,6 +524,7 @@ class AXPEntityCommandTriggerViewModel {
         this.disabled = action.disabled ?? false;
         this.default = action.default ?? false;
         this.scope = action.scope;
+        this.order = action.order ?? 0;
     }
 }
 class AXPEntityListViewColumnViewModel {
@@ -868,10 +886,10 @@ class AXPEntityEventDispatcherService {
     async dispatchDeleted(entityName, data) {
         await this.dispatchEntityEvent('deleted', entityName, data);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityEventDispatcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityEventDispatcherService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityEventDispatcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityEventDispatcherService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityEventDispatcherService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityEventDispatcherService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1120,7 +1138,9 @@ class AXPEntityMiddleware {
         this.providedModifiers = inject(AXP_ENTITY_MODIFIER, { optional: true }) || [];
         this.providedActionPlugins = inject(AXP_ENTITY_ACTION_PLUGIN, { optional: true }) || [];
         this.injector = inject(Injector);
+        console.log('[AXPEntityMiddleware] Registering', this.providedModifiers.length, 'modifiers');
         for (const { entityName, modifier } of this.providedModifiers) {
+            console.log('[AXPEntityMiddleware] Registering modifier for pattern:', entityName);
             this.register(entityName, modifier);
         }
     }
@@ -1159,13 +1179,26 @@ class AXPEntityMiddleware {
             }
         }
         // Then apply entity-specific modifiers
+        // Collect all matching modifiers
+        const modifiers = [];
         // Exact match first
         const exact = this.exactModifiers.get(entity.name);
-        const modifier = exact ?? this.patternModifiers.find((x) => x.pattern.test(entity.name))?.modifier;
-        if (!modifier) {
-            return context.toEntity();
+        if (exact) {
+            console.log('[AXPEntityMiddleware] Found exact modifier for:', entity.name);
+            modifiers.push(exact);
+        }
+        // Then all pattern matches
+        for (const { pattern, modifier } of this.patternModifiers) {
+            if (pattern.test(entity.name)) {
+                console.log('[AXPEntityMiddleware] Pattern matched for', entity.name, '- pattern:', pattern);
+                modifiers.push(modifier);
+            }
+        }
+        console.log('[AXPEntityMiddleware] Applying', modifiers.length, 'modifiers to entity:', entity.name);
+        // Apply all matching modifiers in order
+        for (const modifier of modifiers) {
+            modifier(context);
         }
-        modifier(context);
         return context.toEntity();
     }
     //#endregion
@@ -1179,10 +1212,10 @@ class AXPEntityMiddleware {
         const flags = rx.flags.replace('g', '');
         return new RegExp(rx.source, flags);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityMiddleware, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityMiddleware, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityMiddleware, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityMiddleware, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityMiddleware, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityMiddleware, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [] });
@@ -1334,10 +1367,10 @@ class AXPEntityDefinitionRegistryService {
     createEntityKey(moduleName, entityName) {
         return `${moduleName}.${entityName}`;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDefinitionRegistryService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDefinitionRegistryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDefinitionRegistryService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDefinitionRegistryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDefinitionRegistryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDefinitionRegistryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1498,10 +1531,10 @@ class AXPEntityCreateViewModelFactory {
         this.layout.setNavigationLoading(false);
         return new AXPEntityMasterCreateViewModel(this.injector, config, initialData, options);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityCreateViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityCreateViewModelFactory, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityCreateViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityCreateViewModelFactory, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityCreateViewModelFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityCreateViewModelFactory, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -1605,7 +1638,9 @@ class AXPEntityMasterListViewModel {
         //****************** Actions ******************//
         this.allActions = computed(() => {
             const list = this.entityDef.interfaces?.master?.list?.actions ?? [];
-            return list.map((tr) => new AXPEntityCommandTriggerViewModel(this.entityDef, tr)) ?? [];
+            const actions = list.map((tr) => new AXPEntityCommandTriggerViewModel(this.entityDef, tr)) ?? [];
+            const orderedActions = orderBy(actions, 'order', 'asc');
+            return orderedActions;
         }, ...(ngDevMode ? [{ debugName: "allActions" }] : []));
         this.selectedScopeActionsCount = computed(() => {
             return this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Selected).length;
@@ -2018,20 +2053,33 @@ class AXPEntityMasterListViewModel {
             });
         }
         else {
-            // this.commandService.execute(command, options);
-            this.commandService.execute(command, {
-                entity: getEntityInfo(this.entityDef).source,
-                entityInfo: {
-                    name: this.entityDef.name,
-                    module: this.entityDef.module,
-                    title: this.entityDef.title,
-                    parentKey: this.entityDef.parentKey,
-                    source: `${this.entityDef.module}.${this.entityDef.name}`,
+            const commandOptions = merge(options, {
+                __context__: {
+                    data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
+                    entity: getEntityInfo(this.entityDef).source,
+                    entityInfo: {
+                        name: this.entityDef.name,
+                        module: this.entityDef.module,
+                        title: this.entityDef.title,
+                        parentKey: this.entityDef.parentKey,
+                    },
                 },
-                data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
-                options: options,
-                metadata: action?.metadata,
-            });
+                __metadata__: action?.metadata,
+            }, options);
+            this.commandService.execute(command, commandOptions);
+            // this.commandService.execute(command, {
+            //   entity: getEntityInfo(this.entityDef).source,
+            //   entityInfo: {
+            //     name: this.entityDef.name,
+            //     module: this.entityDef.module,
+            //     title: this.entityDef.title,
+            //     parentKey: this.entityDef.parentKey,
+            //     source: `${this.entityDef.module}.${this.entityDef.name}`,
+            //   },
+            //   data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
+            //   options: options,
+            //   metadata: action?.metadata,
+            // });
         }
     }
     async execute(command) {
@@ -2066,10 +2114,10 @@ class AXPEntityListViewModelFactory {
         this.layout.setNavigationLoading(false);
         return new AXPEntityMasterListViewModel(this.injector, config);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListViewModelFactory, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListViewModelFactory, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListViewModelFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListViewModelFactory, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -2087,10 +2135,10 @@ class AXPEntityService {
     createPath(module, entity, path = 'list') {
         return `/${this.sessionService.application?.name}/m/${module}/e/${entity}/${path}`;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -2243,10 +2291,10 @@ class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
             }
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityPerformDeleteAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityPerformDeleteAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityPerformDeleteAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityPerformDeleteAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityPerformDeleteAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityPerformDeleteAction, decorators: [{
             type: Injectable
         }] });
 const AXPDeleteEntityWorkflow = {
@@ -2425,10 +2473,10 @@ class AXPEntityMasterUpdateViewModelFactory {
         this.layout.setNavigationLoading(false);
         return Promise.reject('cannot fetch ');
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityMasterUpdateViewModelFactory, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -2471,10 +2519,10 @@ class AXPEntityModifySectionPopupAction extends AXPWorkflowAction {
             context.setVariable('data', cloneDeep(popup.data.context));
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityModifySectionPopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityModifySectionPopupAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModifySectionPopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModifySectionPopupAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityModifySectionPopupAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModifySectionPopupAction, decorators: [{
             type: Injectable
         }] });
 class AXPEntityModifyConfirmedAction extends AXPWorkflowAction {
@@ -2489,10 +2537,10 @@ class AXPEntityModifyConfirmedAction extends AXPWorkflowAction {
             },
         }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityModifyConfirmedAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityModifyConfirmedAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModifyConfirmedAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModifyConfirmedAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityModifyConfirmedAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModifyConfirmedAction, decorators: [{
             type: Injectable
         }] });
 const AXPModifyEntitySectionWorkflow = {
@@ -2513,8 +2561,8 @@ const AXPModifyEntitySectionWorkflow = {
             action: 'AXPToastAction',
             input: {
                 color: 'success',
-                title: 'workflow.entity-modified-title',
-                content: 'workflow.entity-modified-body',
+                title: '@general:workflow.entity-modified-title',
+                content: '@general:workflow.entity-modified-body',
             },
             nextSteps: [
                 {
@@ -2785,10 +2833,10 @@ class AXPEntityDetailViewModelFactory {
         this.layout.setNavigationLoading(false);
         return Promise.reject('cannot fetch ');
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDetailViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDetailViewModelFactory, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDetailViewModelFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDetailViewModelFactory, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDetailViewModelFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDetailViewModelFactory, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -3001,7 +3049,6 @@ class AXPLayoutAdapterBuilder {
     }
     createExecuteFunction() {
         return (command, context) => {
-            console.log('layout execute', command, context);
             return Promise.resolve({ success: true });
         };
     }
@@ -3009,14 +3056,14 @@ class AXPLayoutAdapterBuilder {
         return async () => {
             return {
                 success: true,
-                result: this.rootContext,
+                data: this.rootContext,
             };
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLayoutAdapterBuilder, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLayoutAdapterBuilder, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLayoutAdapterBuilder, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLayoutAdapterBuilder, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLayoutAdapterBuilder, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLayoutAdapterBuilder, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -3239,7 +3286,7 @@ class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
             const evaluatedConditionValues = await Promise.all(conditionValues.map((c) => evaluateExpressions(c)));
             const id = evaluatedConditionValues[0];
             const result = await fn(id);
-            return { success: true, result };
+            return { success: true, data: result };
         };
     }
     createExecuteFunction(entityDef) {
@@ -3247,12 +3294,15 @@ class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
             if (e.name === 'update-entity') {
                 const fn = entityDef?.commands?.update?.execute;
                 const result = await fn(context);
-                return { success: true, result };
+                return { success: true, data: result };
             }
             else {
                 return {
                     success: false,
-                    error: { code: 'invalid_command', message: 'Invalid command' },
+                    message: {
+                        code: 'invalid_command',
+                        text: 'Invalid command'
+                    }
                 };
             }
         };
@@ -3356,11 +3406,10 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                         console.warn(`Action ${commandName} not found in entity definition`);
                         return {
                             success: false,
-                            error: {
+                            message: {
                                 code: 'ACTION_NOT_FOUND',
-                                message: `Action ${commandName} not found`,
-                                details: command,
-                            },
+                                text: `Action ${commandName} not found`,
+                            }
                         };
                     }
                     await context.workflowService.execute(commandName, {
@@ -3384,10 +3433,9 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                     console.error('Error executing command:', error);
                     return {
                         success: false,
-                        error: {
+                        message: {
                             code: 'EXECUTION_ERROR',
-                            message: error instanceof Error ? error.message : 'Unknown error occurred',
-                            details: error,
+                            text: error instanceof Error ? error.message : 'Unknown error occurred',
                         },
                     };
                 }
@@ -3545,10 +3593,10 @@ class AXPRelatedEntityConverterFactory {
     createTabListConverter() {
         return this.createConverter('tab-list');
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPRelatedEntityConverterFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPRelatedEntityConverterFactory, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPRelatedEntityConverterFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPRelatedEntityConverterFactory, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPRelatedEntityConverterFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPRelatedEntityConverterFactory, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -3577,7 +3625,7 @@ class AXPMainEntityContentBuilder {
             ? this.createExpressionEvaluator(rootContext, dependencies.expressionEvaluator)
             : null;
         // Prepare merge-details structures (sections and properties per section)
-        let evaluatedRelatedEntities = { ...(entity?.relatedEntities ?? []) };
+        let evaluatedRelatedEntities = [...(entity?.relatedEntities ?? [])];
         if (evaluatedRelatedEntities && evaluateExpressions) {
             // Only evaluate the 'hidden' property for each related entity
             evaluatedRelatedEntities = await Promise.all((entity.relatedEntities ?? []).map(async (re) => {
@@ -3657,6 +3705,7 @@ class AXPMainEntityContentBuilder {
                         return;
                     }
                     const relSingle = entityDef?.interfaces?.master?.single;
+                    const relUpdate = entityDef?.interfaces?.master?.update;
                     const relGroups = entityDef?.groups ?? [];
                     // Merge related groups into allGroups (avoid duplicates by id)
                     for (const rg of relGroups) {
@@ -3705,6 +3754,7 @@ class AXPMainEntityContentBuilder {
                         const propClone = { ...p };
                         propClone.__dataPath = relatedEntity?.persistence?.dataPath || entityName;
                         propClone.__layout = relSingle?.properties?.find((x) => x.name === p.name)?.layout;
+                        propClone.__isEditable = !!relUpdate?.properties?.some((x) => x.name === p.name);
                         acc[p.groupId].push(propClone);
                         return acc;
                     }, {});
@@ -3839,7 +3889,7 @@ class AXPMainEntityContentBuilder {
         const tabListTabs = await this.buildTabLists(tabListEntities ?? [], rootContext, dependencies);
         // Build actions from single interface
         const actions = this.buildActions(entity, singleInterface);
-        console.log({ rootContext, dependencies });
+        //console.log({ rootContext, dependencies });
         return {
             id: entity?.name ?? '',
             // title: singleInterface?.title ?? entity?.formats.individual ?? '',
@@ -3872,12 +3922,12 @@ class AXPMainEntityContentBuilder {
                 if (params?.forceRefresh) {
                     return {
                         success: true,
-                        result: await dependencies.reloadRootContext(),
+                        data: await dependencies.reloadRootContext(),
                     };
                 }
                 return {
                     success: true,
-                    result: rootContext,
+                    data: rootContext,
                 };
             },
             execute: async (e, context) => {
@@ -3887,7 +3937,7 @@ class AXPMainEntityContentBuilder {
                         const result = await fn(context);
                         return {
                             success: true,
-                            result: result,
+                            data: result,
                         };
                     }
                     else {
@@ -3930,9 +3980,9 @@ class AXPMainEntityContentBuilder {
                         }
                         return {
                             success: false,
-                            error: {
+                            message: {
                                 code: 'invalid_command',
-                                message: 'Invalid command',
+                                text: 'Invalid command',
                             },
                         };
                     }
@@ -3940,9 +3990,8 @@ class AXPMainEntityContentBuilder {
                 catch (error) {
                     return {
                         success: false,
-                        error: {
-                            //TODO: handle error as object
-                            message: error,
+                        message: {
+                            text: error,
                         },
                     };
                 }
@@ -3991,12 +4040,19 @@ class AXPMainEntityContentBuilder {
                                             },
                                         },
                                         children: (await getVisiblePropertyByGroupId(s.id))
-                                            .filter((p) => visiblePropertyNames.has(p.name))
+                                            .filter((p) => {
+                                            const isFromRelated = p.__dataPath != null;
+                                            const visibleInMain = visiblePropertyNames.has(p.name);
+                                            const visibleInRelated = isFromRelated ? !!p.__layout : false;
+                                            return visibleInMain || visibleInRelated;
+                                        })
                                             .map((p) => {
                                             const layout = getPropertyLayout(p.name, p);
                                             const prefixed = p.__dataPath ? `${p.__dataPath}.${p.name}` : p.name;
                                             // Check if property is editable (exists in update interface)
-                                            const isEditable = editablePropertyNames.has(p.name);
+                                            const isEditable = p.__isEditable != null
+                                                ? p.__isEditable
+                                                : editablePropertyNames.has(p.name);
                                             // Check if property has its own disabled option
                                             const hasOwnDisabled = p.schema.interface?.options?.disabled !== undefined;
                                             return {
@@ -4113,6 +4169,7 @@ class AXPMainEntityContentBuilder {
                 disabled: disabled || false,
                 zone: 'header',
                 priority: action.priority,
+                scope: action.scope,
                 command: {
                     name: action.name,
                     options: options,
@@ -4151,10 +4208,10 @@ class AXPMainEntityContentBuilder {
         }
         return tabs;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPMainEntityContentBuilder, deps: [{ token: AXPRelatedEntityConverterFactory }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPMainEntityContentBuilder, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPMainEntityContentBuilder, deps: [{ token: AXPRelatedEntityConverterFactory }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPMainEntityContentBuilder, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPMainEntityContentBuilder, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPMainEntityContentBuilder, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -4295,10 +4352,10 @@ class AXPLayoutAdapterFactory {
         const title = await dependencies.expressionEvaluator.evaluate(entity.interfaces?.master?.single?.title, rootContext);
         return title;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLayoutAdapterFactory, deps: [{ token: AXPRelatedEntityConverterFactory }, { token: AXPMainEntityContentBuilder }, { token: AXPLayoutAdapterBuilder }, { token: i4$1.AXPFilterOperatorMiddlewareService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLayoutAdapterFactory, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLayoutAdapterFactory, deps: [{ token: AXPRelatedEntityConverterFactory }, { token: AXPMainEntityContentBuilder }, { token: AXPLayoutAdapterBuilder }, { token: i4$1.AXPFilterOperatorMiddlewareService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLayoutAdapterFactory, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLayoutAdapterFactory, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLayoutAdapterFactory, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -4319,6 +4376,29 @@ const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver =
     return await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
 };
 
+const eventDispatchMiddleware = {
+    target: { ops: ['create', 'update', 'delete'], order: 90 },
+    execute: async (ctx, next) => {
+        const dispatcher = inject(AXPEntityEventDispatcherService);
+        await next();
+        if (ctx.op === 'create') {
+            const createdData = ctx.result ? { ...ctx.data, id: ctx.result } : ctx.data;
+            await dispatcher.dispatchInserted(ctx.entityName, { refType: ctx.entityName, data: createdData });
+        }
+        else if (ctx.op === 'update') {
+            await dispatcher.dispatchUpdated(ctx.entityName, {
+                refType: ctx.entityName,
+                data: ctx.result,
+                changes: ctx.locals.get('changes'),
+            });
+        }
+        else if (ctx.op === 'delete') {
+            // For delete, prefer previous entity if available
+            await dispatcher.dispatchDeleted(ctx.entityName, { refType: ctx.entityName, data: ctx.result ?? ctx.previous });
+        }
+    },
+};
+
 /**
  * Default widths for common text columns
  */
@@ -4370,6 +4450,200 @@ const createColumnWidthMiddlewareProvider = (widths, entityName = '*') => ({
 const columnWidthMiddlewareProvider = createColumnWidthMiddlewareProvider(DEFAULT_COLUMN_WIDTHS);
 //#endregion
 
+/**
+ * Default order for common sections
+ */
+const DEFAULT_SECTION_ORDER = {
+    'basic-info': 0,
+    'classification': 20,
+    'appearance': 30,
+    'settings': 100,
+    'advanced': 110,
+    'metadata': 120,
+};
+/**
+ * Default order for common properties
+ * Format: 'sectionId.propertyName' for section-specific or 'propertyName' for any section
+ */
+const DEFAULT_PROPERTY_ORDER = {
+    // Basic Info section
+    'basic-info.code': 1,
+    'basic-info.title': 2,
+    'basic-info.name': 3,
+    'basic-info.description': 10,
+    'basic-info.note': 11,
+    'basic-info.notes': 12,
+    // Classification section
+    'classification.categoryIds': 1,
+    'classification.tags': 2,
+    'classification.type': 3,
+    // Appearance section
+    'appearance.icon': 1,
+    'appearance.color': 2,
+    'appearance.avatar': 3,
+    // Settings section
+    'settings.isDefault': 90,
+    'settings.isPrimary': 91,
+    'settings.isDisabled': 95,
+    'settings.isArchived': 96,
+    // Generic fallbacks (apply to any section if not specified above)
+    'code': 1,
+    'title': 2,
+    'name': 3,
+    'icon': 5,
+    'color': 6,
+    'avatar': 7,
+    'description': 10,
+    'categoryIds': 15,
+    'tags': 16,
+    'isDefault': 90,
+    'isPrimary': 91,
+    'isDisabled': 95,
+    'isArchived': 96,
+};
+/**
+ * Get the property order for a given section and property name
+ */
+const getPropertyOrder = (sectionId, propertyName, orderConfig) => {
+    // Try section-specific order first
+    if (sectionId) {
+        const sectionSpecific = orderConfig[`${sectionId}.${propertyName}`];
+        if (sectionSpecific !== undefined) {
+            return sectionSpecific;
+        }
+    }
+    // Fall back to generic property order
+    return orderConfig[propertyName];
+};
+/**
+ * Factory to create a layout ordering middleware
+ */
+const layoutOrderingMiddlewareFactory = (config) => {
+    console.log('[Layout Ordering Middleware] Factory called - creating middleware function');
+    return (context) => {
+        console.log('[Layout Ordering Middleware] ========================================');
+        console.log('[Layout Ordering Middleware] MIDDLEWARE CALLED FOR ENTITY:', context.entity.name);
+        console.log('[Layout Ordering Middleware] Entity module:', context.entity.module);
+        console.log('[Layout Ordering Middleware] ========================================');
+        const { sections: sectionOrder, properties: propertyOrder } = config;
+        console.log('[Layout Ordering Middleware] Section order config:', sectionOrder);
+        //#region ----   Order Sections   ----
+        const orderSections = (layout) => {
+            if (!layout || !layout.sections) {
+                console.log('[Layout Ordering Middleware] No sections found in layout');
+                return;
+            }
+            console.log('[Layout Ordering Middleware] Before ordering sections:', layout.sections.map((s) => ({ id: s.id, order: s.order })));
+            layout.sections.forEach((section) => {
+                const defaultOrder = sectionOrder[section.id];
+                if (defaultOrder !== undefined) {
+                    console.log(`[Layout Ordering Middleware] Setting section "${section.id}" order from ${section.order} to ${defaultOrder}`);
+                    // Always apply the default order if configured (force override)
+                    section.order = defaultOrder;
+                }
+                else {
+                    console.log(`[Layout Ordering Middleware] No default order for section "${section.id}"`);
+                }
+            });
+            // Sort sections by order
+            layout.sections.sort((a, b) => {
+                const orderA = a.order ?? 999;
+                const orderB = b.order ?? 999;
+                return orderA - orderB;
+            });
+            console.log('[Layout Ordering Middleware] After ordering sections:', layout.sections.map((s) => ({ id: s.id, order: s.order })));
+        };
+        //#endregion
+        //#region ----   Order Properties Within Sections   ----
+        const orderProperties = (layout) => {
+            if (!layout || !layout.properties) {
+                return;
+            }
+            layout.properties.forEach((prop) => {
+                const groupId = context.properties.find(prop.name).get()?.groupId;
+                const defaultOrder = getPropertyOrder(groupId, prop.name, propertyOrder);
+                if (defaultOrder !== undefined) {
+                    // Ensure layout.positions exists
+                    if (!prop.layout) {
+                        prop.layout = {};
+                    }
+                    if (!prop.layout.positions) {
+                        prop.layout.positions = {};
+                    }
+                    if (!prop.layout.positions.lg) {
+                        prop.layout.positions.lg = {};
+                    }
+                    // Set order if not already defined
+                    if (prop.layout.positions.lg.order === undefined) {
+                        prop.layout.positions.lg.order = defaultOrder;
+                    }
+                }
+            });
+            // Sort properties by order
+            layout.properties.sort((a, b) => {
+                const orderA = a.layout?.positions?.lg?.order ?? 999;
+                const orderB = b.layout?.positions?.lg?.order ?? 999;
+                return orderA - orderB;
+            });
+        };
+        //#endregion
+        //#region ----   Apply to All Layouts   ----
+        // Apply to create layout
+        context.interfaces.master.create.update((create) => {
+            console.log('[Layout Ordering Middleware] Processing CREATE layout');
+            if (create) {
+                orderSections(create);
+                orderProperties(create);
+            }
+            return create ?? { sections: [], properties: [] };
+        });
+        // Apply to modify layout
+        context.interfaces.master.modify.update((modify) => {
+            console.log('[Layout Ordering Middleware] Processing MODIFY layout');
+            if (modify) {
+                orderSections(modify);
+                orderProperties(modify);
+            }
+            return modify ?? { sections: [], properties: [] };
+        });
+        // Apply to single layout
+        context.interfaces.master.single.update((single) => {
+            console.log('[Layout Ordering Middleware] Processing SINGLE layout');
+            if (single) {
+                orderSections(single);
+                orderProperties(single);
+            }
+            return single ?? { title: context.entity.title, sections: [], properties: [] };
+        });
+        //#endregion
+    };
+};
+//#endregion
+//#region ----   Provider Registration   ----
+/**
+ * Helper to create a provider for the layout ordering middleware
+ * By default it applies to all entities using the '*' pattern
+ */
+const createLayoutOrderingMiddlewareProvider = (config = {}, entityName = '*') => {
+    console.log('[Layout Ordering Middleware] Creating provider for entityName pattern:', entityName);
+    return {
+        entityName,
+        modifier: layoutOrderingMiddlewareFactory({
+            sections: { ...DEFAULT_SECTION_ORDER, ...config.sections },
+            properties: { ...DEFAULT_PROPERTY_ORDER, ...config.properties },
+        }),
+    };
+};
+/**
+ * Default provider registered with the default configuration
+ */
+const layoutOrderingMiddlewareProvider = createLayoutOrderingMiddlewareProvider();
+console.log('[Layout Ordering Middleware] Provider initialized with config:', {
+    sections: DEFAULT_SECTION_ORDER,
+    propertyCount: Object.keys(DEFAULT_PROPERTY_ORDER).length
+});
+//#endregion
+
 class AXPEntityCommandSearchDefinitionProvider {
     async provide(context) {
         context.addDefinition('command', 'Commands', 'command', 'fa-solid fa-command', 1, {
@@ -4530,10 +4804,10 @@ class AXPMiddlewareEntityStorageService extends AXPEntityStorageService {
         const ctx = this.createCtx('query', entityName, { request });
         return this.run(ctx, () => this.backend.query(entityName, request));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPMiddlewareEntityStorageService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPMiddlewareEntityStorageService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPMiddlewareEntityStorageService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPMiddlewareEntityStorageService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPMiddlewareEntityStorageService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPMiddlewareEntityStorageService, decorators: [{
             type: Injectable
         }] });
 
@@ -4788,10 +5062,10 @@ class AXPEntityListTableService {
             },
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListTableService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListTableService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListTableService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListTableService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListTableService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListTableService, decorators: [{
             type: Injectable
         }] });
 
@@ -4885,10 +5159,10 @@ class AXPEntityListToolbarService {
             };
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListToolbarService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListToolbarService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListToolbarService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListToolbarService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListToolbarService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListToolbarService, decorators: [{
             type: Injectable
         }] });
 
@@ -4999,6 +5273,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         this.context = {};
         this.previousQueries = null;
     }
+    handleUnselectAll() {
+        this.selectedItems.set([]);
+    }
     handleActionClick(item) {
         if (item.command && (item.items?.length ?? 0) == 0) {
             this.execute(item.command.name, null);
@@ -5186,8 +5463,8 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         this.destroyed.next();
         this.destroyed.complete();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.10", type: AXPEntityListWidgetViewComponent, isStandalone: true, selector: "ng-component", host: { properties: { "class": "\"ax-h-full\"" } }, providers: [AXPEntityListTableService, AXPEntityListToolbarService], viewQueries: [{ propertyName: "list", first: true, predicate: ["list"], descendants: true, isSignal: true }, { propertyName: "allWidgets", predicate: AXPWidgetRendererDirective, descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.12", type: AXPEntityListWidgetViewComponent, isStandalone: true, selector: "ng-component", host: { properties: { "class": "\"ax-h-full\"" } }, providers: [AXPEntityListTableService, AXPEntityListToolbarService], viewQueries: [{ propertyName: "list", first: true, predicate: ["list"], descendants: true, isSignal: true }, { propertyName: "allWidgets", predicate: AXPWidgetRendererDirective, descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
     @if (showEntityActions()) {
       <div class="ax-flex ax-gap-2 ax-justify-end ax-mb-4">
         @for (action of primaryActions(); track $index) {
@@ -5277,6 +5554,17 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
           [mode]="this.mode"
         ></ng-container>
       }
+      <!-- <div class="ax-flex ax-items-center ax-justify-between ax-gap-1 ">
+        <span
+          >{{ selectedItems().length }}
+          <span>{{ '@general:terms.interface.items-selected' | translate | async }}</span>
+        </span>
+        <ax-button
+          text="@general:terms.interface.unselect-all"
+          class="ax-xs"
+          (onClick)="handleUnselectAll()"
+        ></ax-button>
+      </div> -->
       @if (listNode() != null) {
         <ng-container
           #list
@@ -5288,9 +5576,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         ></ng-container>
       }
     </div>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.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: AXPWidgetCoreModule }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.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: "component", type: i3.AXButtonItemComponent, selector: "ax-button-item", inputs: ["color", "disabled", "text", "selected", "divided", "data", "name"], outputs: ["onClick", "onFocus", "onBlur", "disabledChange"] }, { kind: "component", type: i3.AXButtonItemListComponent, selector: "ax-button-item-list", inputs: ["items"], outputs: ["onItemClick"] }, { kind: "ngmodule", type: AXDropdownModule }, { kind: "component", type: i4$2.AXDropdownPanelComponent, selector: "ax-dropdown-panel", inputs: ["isOpen", "fitParent", "dropdownWidth", "position", "placement", "_target", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.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: AXPWidgetCoreModule }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.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: "component", type: i3.AXButtonItemComponent, selector: "ax-button-item", inputs: ["color", "disabled", "text", "selected", "divided", "data", "name"], outputs: ["onClick", "onFocus", "onBlur", "disabledChange"] }, { kind: "component", type: i3.AXButtonItemListComponent, selector: "ax-button-item-list", inputs: ["items", "closeParentOnClick", "lockOnLoading"], outputs: ["onItemClick"] }, { kind: "ngmodule", type: AXDropdownModule }, { kind: "component", type: i4$2.AXDropdownPanelComponent, selector: "ax-dropdown-panel", inputs: ["isOpen", "fitParent", "dropdownWidth", "position", "placement", "_target", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityListWidgetViewComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityListWidgetViewComponent, decorators: [{
             type: Component,
             args: [{
                     template: `
@@ -5383,6 +5671,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImpo
           [mode]="this.mode"
         ></ng-container>
       }
+      <!-- <div class="ax-flex ax-items-center ax-justify-between ax-gap-1 ">
+        <span
+          >{{ selectedItems().length }}
+          <span>{{ '@general:terms.interface.items-selected' | translate | async }}</span>
+        </span>
+        <ax-button
+          text="@general:terms.interface.unselect-all"
+          class="ax-xs"
+          (onClick)="handleUnselectAll()"
+        ></ax-button>
+      </div> -->
       @if (listNode() != null) {
         <ng-container
           #list
@@ -5443,10 +5742,10 @@ const AXPEntityListWidget = {
 };
 
 class AXPEntityReferenceWidgetViewComponent extends AXPLayoutBaseWidgetComponent {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityReferenceWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.10", type: AXPEntityReferenceWidgetViewComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: ``, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityReferenceWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.12", type: AXPEntityReferenceWidgetViewComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: ``, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityReferenceWidgetViewComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityReferenceWidgetViewComponent, decorators: [{
             type: Component,
             args: [{
                     template: ``,
@@ -5475,10 +5774,10 @@ class AXPEntityReferenceWidgetEditComponent extends AXPLayoutBaseWidgetComponent
         }, ...(ngDevMode ? [{ debugName: "#efEntity" }] : []));
     }
     #efEntity;
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityReferenceWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.10", type: AXPEntityReferenceWidgetEditComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: ``, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: FormsModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityReferenceWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.12", type: AXPEntityReferenceWidgetEditComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: ``, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: FormsModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityReferenceWidgetEditComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityReferenceWidgetEditComponent, decorators: [{
             type: Component,
             args: [{
                     template: ``,
@@ -5494,10 +5793,10 @@ var entityReferenceWidgetEdit_component = /*#__PURE__*/Object.freeze({
 });
 
 class AXPEntityReferenceWidgetColumnComponent extends AXPColumnWidgetComponent {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityReferenceWidgetColumnComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.10", type: AXPEntityReferenceWidgetColumnComponent, isStandalone: true, selector: "ng-component", inputs: { rawValue: "rawValue" }, usesInheritance: true, ngImport: i0, template: `{{rawValue}}`, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityReferenceWidgetColumnComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.12", type: AXPEntityReferenceWidgetColumnComponent, isStandalone: true, selector: "ng-component", inputs: { rawValue: "rawValue" }, usesInheritance: true, ngImport: i0, template: `{{rawValue}}`, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityReferenceWidgetColumnComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityReferenceWidgetColumnComponent, decorators: [{
             type: Component,
             args: [{
                     template: `{{rawValue}}`,
@@ -5514,10 +5813,10 @@ var entityReferenceWidgetColumn_component = /*#__PURE__*/Object.freeze({
 });
 
 class AXPEntityReferenceWidgetPrintComponent extends AXPLayoutBaseWidgetComponent {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityReferenceWidgetPrintComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.10", type: AXPEntityReferenceWidgetPrintComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: ``, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityReferenceWidgetPrintComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.12", type: AXPEntityReferenceWidgetPrintComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: ``, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityReferenceWidgetPrintComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityReferenceWidgetPrintComponent, decorators: [{
             type: Component,
             args: [{
                     template: ``,
@@ -5534,10 +5833,10 @@ var entityReferenceWidgetPrint_component = /*#__PURE__*/Object.freeze({
 });
 
 class AXPEntityReferenceWidgetDesignerComponent extends AXPLayoutBaseWidgetComponent {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityReferenceWidgetDesignerComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.10", type: AXPEntityReferenceWidgetDesignerComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: ``, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityReferenceWidgetDesignerComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.12", type: AXPEntityReferenceWidgetDesignerComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: ``, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityReferenceWidgetDesignerComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityReferenceWidgetDesignerComponent, decorators: [{
             type: Component,
             args: [{
                     template: ``,
@@ -5585,6 +5884,7 @@ class AXPLookupFilterWidgetEditComponent extends AXPValueWidgetComponent {
         super(...arguments);
         //#region ----   Computed Properties   ----
         this.editorPath = `__${this.path}EditorValue`;
+        this.lookupWidgetRenderer = viewChild('widgetRenderer', ...(ngDevMode ? [{ debugName: "lookupWidgetRenderer" }] : []));
         this.entity = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entity" }] : []));
         this.textField = computed(() => this.options()['textField'] ?? 'title', ...(ngDevMode ? [{ debugName: "textField" }] : []));
         this.valueField = computed(() => this.options()['valueField'] ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : []));
@@ -5629,7 +5929,6 @@ class AXPLookupFilterWidgetEditComponent extends AXPValueWidgetComponent {
             this.lookupNode.set(node);
         }, ...(ngDevMode ? [{ debugName: "#efUpdateLookupNode" }] : []));
         this.#efUpdateValue = effect(() => {
-            debugger;
             const newValueObj = this.contextService.getValue(`${this.path}EditorObj`);
             const prevValue = untracked(() => this.getValue()?.value);
             const newValue = this.multiple()
@@ -5653,18 +5952,73 @@ class AXPLookupFilterWidgetEditComponent extends AXPValueWidgetComponent {
                 displayText: displayText,
             });
         }, ...(ngDevMode ? [{ debugName: "#efUpdateValue" }] : []));
+        //#endregion
+        //#region ----   Focus Management   ----
+        this.shouldFocus = signal(false, ...(ngDevMode ? [{ debugName: "shouldFocus" }] : []));
+        /**
+         * Reactive effect to auto-focus the lookup editor when component is ready
+         */
+        this.#focusEffect = effect(() => {
+            const renderer = this.lookupWidgetRenderer();
+            const shouldFocus = this.shouldFocus();
+            // Early return if no renderer or shouldn't focus
+            if (!renderer || !shouldFocus) {
+                return;
+            }
+            // Listen to componentRefSignal reactively
+            const componentRef = renderer.componentRefSignal();
+            // When componentRef is set (not null), focus the widget
+            if (componentRef) {
+                const componentInstance = componentRef.instance;
+                // Try to use the component's native focus method
+                if (componentInstance && typeof componentInstance.focus === 'function') {
+                    try {
+                        componentInstance.focus();
+                        // Reset focus flag after successful focus
+                        this.shouldFocus.set(false);
+                    }
+                    catch (error) {
+                        // console.error('Error focusing lookup widget component:', error);
+                    }
+                }
+            }
+        }, ...(ngDevMode ? [{ debugName: "#focusEffect" }] : []));
     }
     //#endregion
     //#region ----   Effects   ----
     #efUpdateLookupNode;
     #efUpdateValue;
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLookupFilterWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.10", type: AXPLookupFilterWidgetEditComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: ` <ng-container axp-widget-renderer [node]="lookupNode()" [mode]="'edit'"></ng-container> `, isInline: true, dependencies: [{ kind: "ngmodule", type: FormsModule }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "ngmodule", type: AXTextBoxModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged"], exportAs: ["widgetRenderer"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    /**
+     * Reactive effect to auto-focus the lookup editor when component is ready
+     */
+    #focusEffect;
+    /**
+     * Public focus method to trigger focusing
+     */
+    focus() {
+        this.shouldFocus.set(true);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLookupFilterWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.2.0", version: "20.3.12", type: AXPLookupFilterWidgetEditComponent, isStandalone: true, selector: "ng-component", viewQueries: [{ propertyName: "lookupWidgetRenderer", first: true, predicate: ["widgetRenderer"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
+    <ng-container
+      axp-widget-renderer
+      #widgetRenderer="widgetRenderer"
+      [node]="lookupNode()"
+      [mode]="'edit'"
+    ></ng-container>
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: FormsModule }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "ngmodule", type: AXTextBoxModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged"], exportAs: ["widgetRenderer"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLookupFilterWidgetEditComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLookupFilterWidgetEditComponent, decorators: [{
             type: Component,
             args: [{
-                    template: ` <ng-container axp-widget-renderer [node]="lookupNode()" [mode]="'edit'"></ng-container> `,
+                    template: `
+    <ng-container
+      axp-widget-renderer
+      #widgetRenderer="widgetRenderer"
+      [node]="lookupNode()"
+      [mode]="'edit'"
+    ></ng-container>
+  `,
                     changeDetection: ChangeDetectionStrategy.OnPush,
                     imports: [
                         FormsModule,
@@ -5678,7 +6032,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImpo
                         AXPWidgetCoreModule,
                     ],
                 }]
-        }] });
+        }], propDecorators: { lookupWidgetRenderer: [{ type: i0.ViewChild, args: ['widgetRenderer', { isSignal: true }] }] } });
 
 var lookupFilterWidgetEdit_component = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -5710,6 +6064,10 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
         this.valueField = computed(() => this.options()['valueField'] ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : []));
         this.textField = computed(() => this.options()['textField'] ?? 'title', ...(ngDevMode ? [{ debugName: "textField" }] : []));
         this.badgeClass = computed(() => this.options()['badgeClass'] ?? 'ax-accent1', ...(ngDevMode ? [{ debugName: "badgeClass" }] : []));
+        this.displayFormat = computed(() => {
+            const template = this.options()['displayFormat'];
+            return template ? template.replace(/\{/g, '{{').replace(/\}/g, '}}') : undefined;
+        }, ...(ngDevMode ? [{ debugName: "displayFormat" }] : []));
         this.displayField = computed(() => {
             return this.textField() ?? this.entityDef()?.formats.lookup ?? this.entityDef()?.properties.find((c) => c.name != 'id')?.name ?? 'title';
         }, ...(ngDevMode ? [{ debugName: "displayField" }] : []));
@@ -5735,26 +6093,34 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
         if (typeof item == 'object') {
             return {
                 id: item[this.valueField()],
-                text: this.formatService.format(this.displayField(), 'string', item),
+                text: this.getDisplayText(item),
             };
         }
-        else {
-            const def = this.entityDef();
-            const byKey = def?.queries.byKey?.execute;
-            if (byKey) {
-                this.loading.set(true);
-                const fetchedItem = await byKey(item);
-                this.loading.set(false);
-                return {
-                    id: fetchedItem[this.valueField()],
-                    text: this.formatService.format(this.displayField(), 'string', fetchedItem),
-                };
-            }
+        const def = this.entityDef();
+        const byKey = def?.queries.byKey?.execute;
+        if (byKey) {
+            this.loading.set(true);
+            const fetchedItem = await byKey(item);
+            this.loading.set(false);
             return {
-                id: item,
-                text: item
+                id: fetchedItem[this.valueField()],
+                text: this.getDisplayText(fetchedItem),
             };
         }
+        return {
+            id: item,
+            text: item,
+        };
+    }
+    getDisplayText(item) {
+        const template = this.displayFormat();
+        if (template) {
+            const formatted = this.formatService.format(template, 'string', item);
+            if (formatted) {
+                return formatted;
+            }
+        }
+        return this.formatService.format(this.displayField(), 'string', item);
     }
     get __class() {
         const cls = {};
@@ -5762,8 +6128,8 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
         cls[`ax-gap-1`] = true;
         return cls;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLookupWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.10", type: AXPLookupWidgetViewComponent, isStandalone: true, selector: "axp-lookup-widget-view", host: { properties: { "class": "this.__class" } }, usesInheritance: true, ngImport: i0, template: `
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLookupWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.12", type: AXPLookupWidgetViewComponent, isStandalone: true, selector: "axp-lookup-widget-view", host: { properties: { "class": "this.__class" } }, usesInheritance: true, ngImport: i0, template: `
     @if(loading())
     {
       <ax-loading></ax-loading>
@@ -5783,7 +6149,7 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
     }
   `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLookupWidgetViewComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLookupWidgetViewComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'axp-lookup-widget-view',
@@ -5868,6 +6234,7 @@ class AXPEntityDataSelectorService {
             columns,
             selectionMode: options.allowMultiple ? 'multiple' : 'single',
             searchFields,
+            initialSearchTerm: options.initialSearchTerm,
             parentField: options.entity.parentKey,
             filters: options.filters || undefined,
             allowCreate: options.allowCreate ?? this.canCreate(options.entity),
@@ -5949,13 +6316,19 @@ class AXPEntityDataSelectorService {
      */
     getSearchFields(options) {
         const { entity, searchFields } = options;
+        const searchableFields = entity.properties
+            .filter(p => p.options?.filter?.inline?.enabled)
+            .map(p => {
+            return {
+                name: p.name,
+                title: p.title,
+            };
+        }) ?? [];
         if (searchFields && searchFields.length > 0) {
-            return searchFields;
+            return searchableFields.filter(f => searchFields.includes(f.name));
         }
         // Auto-detect searchable fields from entity properties
-        return entity.properties
-            .filter(p => p.options?.filter?.inline?.enabled)
-            .map(p => p.name);
+        return searchableFields;
     }
     /**
      * Check if entity supports create operation
@@ -5999,10 +6372,10 @@ class AXPEntityDataSelectorService {
         }
         return request;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDataSelectorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDataSelectorService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDataSelectorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDataSelectorService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDataSelectorService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDataSelectorService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -6018,6 +6391,9 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.popupService = inject(AXPopupService);
         this.entityDataSelectorService = inject(AXPEntityDataSelectorService);
         this.translateService = inject(AXTranslationService);
+        this.selectBox = viewChild('selectBox', ...(ngDevMode ? [{ debugName: "selectBox" }] : []));
+        this.tagBox = viewChild('tagBoxComponent', ...(ngDevMode ? [{ debugName: "tagBox" }] : []));
+        this.shouldFocus = signal(false, ...(ngDevMode ? [{ debugName: "shouldFocus" }] : []));
         this.expose = computed(() => this.options()['expose'], ...(ngDevMode ? [{ debugName: "expose" }] : []));
         this.entity = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entity" }] : []));
         this.disabled = computed(() => this.options()['disabled'], ...(ngDevMode ? [{ debugName: "disabled" }] : []));
@@ -6038,9 +6414,15 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             return this.defaultTextField();
         }, ...(ngDevMode ? [{ debugName: "displayField" }] : []));
         this.selectedItemsText = computed(() => {
-            return this.selectedItems().map((item) => get(item, this.displayField())).join(', ');
+            return this.selectedItems()
+                .map((item) => get(item, this.displayField()))
+                .join(', ');
         }, ...(ngDevMode ? [{ debugName: "selectedItemsText" }] : []));
         this.valueField = computed(() => this.entityDef()?.properties.find((c) => c.name == 'id')?.name ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : []));
+        this.displayFormat = computed(() => {
+            const template = this.options()['displayFormat'];
+            return template ? template.replace(/\{/g, '{{').replace(/\}/g, '}}') : undefined;
+        }, ...(ngDevMode ? [{ debugName: "displayFormat" }] : []));
         this.entityDef = signal(null, ...(ngDevMode ? [{ debugName: "entityDef" }] : []));
         this.dataSource = computed(() => {
             const entity = this.entityDef();
@@ -6061,15 +6443,12 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             });
         }, ...(ngDevMode ? [{ debugName: "dataSource" }] : []));
         this.searchTerm = signal(null, ...(ngDevMode ? [{ debugName: "searchTerm" }] : []));
+        this.searchPlaceholderText = signal('', ...(ngDevMode ? [{ debugName: "searchPlaceholderText" }] : []));
         this.selectedItems = signal([], ...(ngDevMode ? [{ debugName: "selectedItems" }] : []));
         this.textbox = viewChild(AXTagBoxComponent, ...(ngDevMode ? [{ debugName: "textbox" }] : []));
         this.isLoading = signal(false, ...(ngDevMode ? [{ debugName: "isLoading" }] : []));
         this.isOpen = signal(false, ...(ngDevMode ? [{ debugName: "isOpen" }] : []));
-        this.placeholder = computed(() => {
-            return this.selectedItems().length
-                ? ''
-                : this.translateService.translateSync('@general:widgets.lookup.search');
-        }, ...(ngDevMode ? [{ debugName: "placeholder" }] : []));
+        this.placeholderUpdateToken = 0;
         this.#efEntity = effect(async () => {
             const [module, entity] = this.entity().split('.');
             this.entityDef.set(await this.entityResolver.get(module, entity));
@@ -6082,9 +6461,76 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                 this.clear();
             }
         }, ...(ngDevMode ? [{ debugName: "#efValue" }] : []));
+        this.#efSearchPlaceholder = effect(() => {
+            const entity = this.entityDef();
+            if (!entity) {
+                this.searchPlaceholderText.set('');
+                return;
+            }
+            let inlineFields = entity.properties
+                .filter((property) => property.options?.filter?.inline?.enabled)
+                .map((property) => ({
+                title: property.title,
+                name: property.name,
+            })) ?? [];
+            if (!inlineFields.length) {
+                const displayFieldName = this.displayField();
+                const displayProperty = entity.properties.find((property) => property.name === displayFieldName);
+                if (displayProperty) {
+                    inlineFields = [
+                        {
+                            title: displayProperty.title,
+                            name: displayProperty.name,
+                        },
+                    ];
+                }
+            }
+            void this.updateSearchPlaceholder(inlineFields);
+        }, ...(ngDevMode ? [{ debugName: "#efSearchPlaceholder" }] : []));
+        //#region ----   Focus Management   ----
+        /**
+         * Reactive effect to auto-focus when viewChild is ready
+         * This handles the case where selectBox/tagBox are inside @if conditions
+         */
+        this.#focusEffect = effect(() => {
+            const shouldFocus = this.shouldFocus();
+            // Early return if shouldn't focus
+            if (!shouldFocus) {
+                return;
+            }
+            // Check which viewChild is available based on look type
+            const look = this.look();
+            if (look === 'select') {
+                const selectBox = this.selectBox();
+                if (selectBox) {
+                    try {
+                        selectBox.focus();
+                        // Reset focus flag after successful focus
+                        this.shouldFocus.set(false);
+                    }
+                    catch (error) {
+                        // console.error('Error focusing select box:', error);
+                    }
+                }
+            }
+            else {
+                const tagBox = this.tagBox();
+                if (tagBox) {
+                    try {
+                        tagBox.focus();
+                        // Reset focus flag after successful focus
+                        this.shouldFocus.set(false);
+                    }
+                    catch (error) {
+                        // console.error('Error focusing tag box:', error);
+                    }
+                }
+            }
+        }, ...(ngDevMode ? [{ debugName: "#focusEffect" }] : []));
     }
     #efEntity;
     #efValue;
+    #efSearchPlaceholder;
     async findByValue() {
         this.isLoading.set(true);
         const rawValue = this.getValue();
@@ -6111,6 +6557,8 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     }
     async showSelector() {
         this.isOpen.set(true);
+        const inlineSearchValue = (this.searchTerm() ?? '').trim();
+        const initialSearchTerm = inlineSearchValue.length > 0 ? inlineSearchValue : undefined;
         try {
             const result = await this.entityDataSelectorService.open({
                 entity: this.entityDef(),
@@ -6119,7 +6567,8 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                 filters: this.customFilter(),
                 parentFilters: this.filter,
                 columns: this.columns(),
-                allowCreate: true
+                allowCreate: true,
+                initialSearchTerm,
             });
             if (result && 'items' in result) {
                 this.setItems(result.items);
@@ -6147,6 +6596,11 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             }
         }
     }
+    handleSearchInputChange(e) {
+        if (e.isUserInteraction) {
+            this.searchTerm.set(e.value ?? '');
+        }
+    }
     handleOnBlur(e) {
         setTimeout(() => {
             if (!this.isOpen()) {
@@ -6228,11 +6682,57 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.textbox()?.inputValue.set('');
         this.searchTerm.set('');
     }
+    getTagLabel(item) {
+        if (!item) {
+            return '';
+        }
+        const template = this.displayFormat();
+        if (template) {
+            const formatted = this.formatService.format(template, 'string', item);
+            if (formatted) {
+                return formatted;
+            }
+        }
+        return get(item, this.displayField()) ?? '';
+    }
+    async updateSearchPlaceholder(fields) {
+        const updateToken = ++this.placeholderUpdateToken;
+        if (!fields || fields.length === 0) {
+            const fallback = await this.translateService.translateAsync('@general:actions.search.title');
+            if (updateToken !== this.placeholderUpdateToken) {
+                return;
+            }
+            this.searchPlaceholderText.set(fallback ? `${fallback}...` : '');
+            return;
+        }
+        const translatedFields = await Promise.all(fields.map(async (field) => {
+            const translated = await this.translateService.translateAsync(field.title || field.name);
+            return translated ?? field.title ?? field.name;
+        }));
+        const translatedText = translatedFields
+            .filter((value) => Boolean(value && value.trim().length > 0))
+            .join(', ');
+        const fallbackText = fields
+            .map((field) => field.title || field.name)
+            .filter((value) => Boolean(value && value.trim().length > 0))
+            .join(', ');
+        let fieldsText = translatedText || fallbackText;
+        if (!fieldsText) {
+            fieldsText = (await this.translateService.translateAsync('@general:terms.items')) ?? 'items';
+        }
+        const placeholder = await this.translateService.translateAsync('@general:widgets.lookup.search-placeholder', {
+            params: { fields: fieldsText },
+        });
+        if (updateToken !== this.placeholderUpdateToken) {
+            return;
+        }
+        this.searchPlaceholderText.set(placeholder ?? `Search in ${fieldsText}...`);
+    }
     async searchByValue(value) {
         if (!this.entityDef())
             return null;
         const entity = this.entityDef();
-        const searchFields = entity.properties.filter(p => p.options?.filter?.inline?.enabled);
+        const searchFields = entity.properties.filter((p) => p.options?.filter?.inline?.enabled);
         const inlineFilters = {
             field: null,
             logic: 'or',
@@ -6258,7 +6758,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         if (request.filter) {
             request.filter = {
                 logic: 'and',
-                filters: [...[request.filter], ...(filter.filters ?? [])]
+                filters: [...[request.filter], ...(filter.filters ?? [])],
             };
         }
         else {
@@ -6269,149 +6769,189 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     singleOrMultiple(values) {
         return this.multiple() ? values : values[0];
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLookupWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.10", type: AXPLookupWidgetEditComponent, isStandalone: true, selector: "axp-lookup-widget-edit", viewQueries: [{ propertyName: "textbox", first: true, predicate: AXTagBoxComponent, descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
-  @if(dataSource()) {
-    @if (look() == 'select') {
-      <ax-select-box
-        [dataSource]="dataSource()!"
-        [ngModel]="selectedItems()"
-        [textField]="displayField()"
-        [valueField]="valueField()"
-        [disabled]="disabled()"
-        [multiple]="multiple()"
-        (onValueChanged)="selectBoxValueChange($event)"
-      >
-        <ax-search-box>
-          <ax-clear-button></ax-clear-button>
-        </ax-search-box>
-        @for (validation of validationRules(); track $index) {
-          <ax-validation-rule
-            [rule]="validation.rule"
-            [message]="validation.options?.message"
-            [options]="validation.options"
-          ></ax-validation-rule>
-        }
-        @if (allowClear()) {
-          <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
-        }
-      </ax-select-box>
-    } @else {
-      <ax-tag-box
-        [ngModel]="selectedItems()"
-        [textField]="displayField()"
-        [valueField]="valueField()"
-        (onValueChanged)="handleValueChange($event)"
-        [placeholder]="placeholder() | translate | async"
-        [addOnEnter]="false"
-        [addOnComma]="false"
-        [disabled]="disabled()"
-        (onKeyUp)="handleKeyUp($event)"
-        (onBlur)="handleOnBlur($event)"
-      >
-        @for (validation of validationRules(); track $index) {
-          <ax-validation-rule
-            [rule]="validation.rule"
-            [message]="validation.options?.message"
-            [options]="validation.options"
-          ></ax-validation-rule>
-        }
-        @if (selectedItems().length > 1 || allowClear()) {
-          <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
-        }
-
-        <ax-suffix>
-          <ax-button
-            color="ghost"
-            look="blank"
-            [disabled]="isLoading() || disabled()"
-            (onClick)="handleOnClick($event)"
+    //#region ----   Focus Management   ----
+    /**
+     * Reactive effect to auto-focus when viewChild is ready
+     * This handles the case where selectBox/tagBox are inside @if conditions
+     */
+    #focusEffect;
+    /**
+     * Public focus method to trigger focusing
+     */
+    focus() {
+        this.shouldFocus.set(true);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLookupWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.12", type: AXPLookupWidgetEditComponent, isStandalone: true, selector: "axp-lookup-widget-edit", viewQueries: [{ propertyName: "selectBox", first: true, predicate: ["selectBox"], descendants: true, isSignal: true }, { propertyName: "tagBox", first: true, predicate: ["tagBoxComponent"], descendants: true, isSignal: true }, { propertyName: "textbox", first: true, predicate: AXTagBoxComponent, descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
+    @if (dataSource()) {
+      @if (look() == 'select') {
+        <ax-select-box
+          #selectBox
+          [dataSource]="dataSource()!"
+          [ngModel]="selectedItems()"
+          [textField]="displayField()"
+          [valueField]="valueField()"
+          [disabled]="disabled()"
+          [multiple]="multiple()"
+          (onValueChanged)="selectBoxValueChange($event)"
+        >
+          <ax-search-box
+            [placeholder]="selectedItems().length ? '' : searchPlaceholderText()"
+            (onValueChanged)="handleSearchInputChange($event)"
           >
-            @if (isLoading()) {
-              <ax-loading></ax-loading>
-            } @else {
-              <ax-icon icon="far fa-search"> </ax-icon>
-            }
-          </ax-button>
-        </ax-suffix>
-      </ax-tag-box>
+            <ax-clear-button></ax-clear-button>
+          </ax-search-box>
+          @for (validation of validationRules(); track $index) {
+            <ax-validation-rule
+              [rule]="validation.rule"
+              [message]="validation.options?.message"
+              [options]="validation.options"
+            ></ax-validation-rule>
+          }
+          @if (allowClear()) {
+            <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
+          }
+        </ax-select-box>
+      } @else {
+        <ax-tag-box
+          #tagBoxComponent
+          [tagTemplate]="tagTemplate"
+          [ngModel]="selectedItems()"
+          [textField]="displayField()"
+          [valueField]="valueField()"
+          (onValueChanged)="handleValueChange($event)"
+          [placeholder]="selectedItems().length ? '' : searchPlaceholderText()"
+          [addOnEnter]="false"
+          [addOnComma]="false"
+          [disabled]="disabled()"
+          (onKeyUp)="handleKeyUp($event)"
+          (onBlur)="handleOnBlur($event)"
+        >
+          @for (validation of validationRules(); track $index) {
+            <ax-validation-rule
+              [rule]="validation.rule"
+              [message]="validation.options?.message"
+              [options]="validation.options"
+            ></ax-validation-rule>
+          }
+          @if (selectedItems().length > 1 || allowClear()) {
+            <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
+          }
+
+          <ax-suffix>
+            <ax-button
+              color="ghost"
+              look="blank"
+              [disabled]="isLoading() || disabled()"
+              (onClick)="handleOnClick($event)"
+            >
+              @if (isLoading()) {
+                <ax-loading></ax-loading>
+              } @else {
+                <ax-icon icon="far fa-search"> </ax-icon>
+              }
+            </ax-button>
+          </ax-suffix>
+        </ax-tag-box>
+        <ng-template #tagTemplate let-item let-index="index">
+          <div class="ax-inline-flex ax-items-center ax-gap-1.5 ax-rounded-md ax-px-3 ax-py-1 ax-text-sm ax-surface">
+            <span>{{ getTagLabel(item) }}</span>
+            <button type="button" (click)="tagBoxComponent.removeItem(index)">
+              <ax-icon class="ax-icon ax-icon-close"></ax-icon>
+            </button>
+          </div>
+        </ng-template>
+      }
     }
-  }
   `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: 
                 //
-                AXButtonModule }, { kind: "component", type: i3.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$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3$2.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: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXTagBoxModule }, { kind: "component", type: i6$1.AXTagBoxComponent, selector: "ax-tag-box", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "id", "placeholder", "allowNull", "type", "look", "addOnComma", "addOnEnter", "valueField", "textField", "readonlyField", "allowDuplicateValues", "tagTemplate"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress", "onTagClick", "onTagDblClick", "onTagContextMenu"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i7.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", "itemHeight", "maxVisibleItems", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed", "onItemSelected", "onItemClick"] }, { kind: "component", type: AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+                AXButtonModule }, { kind: "component", type: i3.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$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3$2.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: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXTagBoxModule }, { kind: "component", type: i6$1.AXTagBoxComponent, selector: "ax-tag-box", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "id", "placeholder", "allowNull", "type", "look", "addOnComma", "addOnEnter", "valueField", "textField", "readonlyField", "allowDuplicateValues", "tagTemplate"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress", "onTagClick", "onTagDblClick", "onTagContextMenu"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i7.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", "itemHeight", "maxVisibleItems", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed", "onItemSelected", "onItemClick"] }, { kind: "component", type: AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type", "autoSearch"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLookupWidgetEditComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLookupWidgetEditComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'axp-lookup-widget-edit',
                     template: `
-  @if(dataSource()) {
-    @if (look() == 'select') {
-      <ax-select-box
-        [dataSource]="dataSource()!"
-        [ngModel]="selectedItems()"
-        [textField]="displayField()"
-        [valueField]="valueField()"
-        [disabled]="disabled()"
-        [multiple]="multiple()"
-        (onValueChanged)="selectBoxValueChange($event)"
-      >
-        <ax-search-box>
-          <ax-clear-button></ax-clear-button>
-        </ax-search-box>
-        @for (validation of validationRules(); track $index) {
-          <ax-validation-rule
-            [rule]="validation.rule"
-            [message]="validation.options?.message"
-            [options]="validation.options"
-          ></ax-validation-rule>
-        }
-        @if (allowClear()) {
-          <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
-        }
-      </ax-select-box>
-    } @else {
-      <ax-tag-box
-        [ngModel]="selectedItems()"
-        [textField]="displayField()"
-        [valueField]="valueField()"
-        (onValueChanged)="handleValueChange($event)"
-        [placeholder]="placeholder() | translate | async"
-        [addOnEnter]="false"
-        [addOnComma]="false"
-        [disabled]="disabled()"
-        (onKeyUp)="handleKeyUp($event)"
-        (onBlur)="handleOnBlur($event)"
-      >
-        @for (validation of validationRules(); track $index) {
-          <ax-validation-rule
-            [rule]="validation.rule"
-            [message]="validation.options?.message"
-            [options]="validation.options"
-          ></ax-validation-rule>
-        }
-        @if (selectedItems().length > 1 || allowClear()) {
-          <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
-        }
-
-        <ax-suffix>
-          <ax-button
-            color="ghost"
-            look="blank"
-            [disabled]="isLoading() || disabled()"
-            (onClick)="handleOnClick($event)"
+    @if (dataSource()) {
+      @if (look() == 'select') {
+        <ax-select-box
+          #selectBox
+          [dataSource]="dataSource()!"
+          [ngModel]="selectedItems()"
+          [textField]="displayField()"
+          [valueField]="valueField()"
+          [disabled]="disabled()"
+          [multiple]="multiple()"
+          (onValueChanged)="selectBoxValueChange($event)"
+        >
+          <ax-search-box
+            [placeholder]="selectedItems().length ? '' : searchPlaceholderText()"
+            (onValueChanged)="handleSearchInputChange($event)"
           >
-            @if (isLoading()) {
-              <ax-loading></ax-loading>
-            } @else {
-              <ax-icon icon="far fa-search"> </ax-icon>
-            }
-          </ax-button>
-        </ax-suffix>
-      </ax-tag-box>
+            <ax-clear-button></ax-clear-button>
+          </ax-search-box>
+          @for (validation of validationRules(); track $index) {
+            <ax-validation-rule
+              [rule]="validation.rule"
+              [message]="validation.options?.message"
+              [options]="validation.options"
+            ></ax-validation-rule>
+          }
+          @if (allowClear()) {
+            <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
+          }
+        </ax-select-box>
+      } @else {
+        <ax-tag-box
+          #tagBoxComponent
+          [tagTemplate]="tagTemplate"
+          [ngModel]="selectedItems()"
+          [textField]="displayField()"
+          [valueField]="valueField()"
+          (onValueChanged)="handleValueChange($event)"
+          [placeholder]="selectedItems().length ? '' : searchPlaceholderText()"
+          [addOnEnter]="false"
+          [addOnComma]="false"
+          [disabled]="disabled()"
+          (onKeyUp)="handleKeyUp($event)"
+          (onBlur)="handleOnBlur($event)"
+        >
+          @for (validation of validationRules(); track $index) {
+            <ax-validation-rule
+              [rule]="validation.rule"
+              [message]="validation.options?.message"
+              [options]="validation.options"
+            ></ax-validation-rule>
+          }
+          @if (selectedItems().length > 1 || allowClear()) {
+            <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
+          }
+
+          <ax-suffix>
+            <ax-button
+              color="ghost"
+              look="blank"
+              [disabled]="isLoading() || disabled()"
+              (onClick)="handleOnClick($event)"
+            >
+              @if (isLoading()) {
+                <ax-loading></ax-loading>
+              } @else {
+                <ax-icon icon="far fa-search"> </ax-icon>
+              }
+            </ax-button>
+          </ax-suffix>
+        </ax-tag-box>
+        <ng-template #tagTemplate let-item let-index="index">
+          <div class="ax-inline-flex ax-items-center ax-gap-1.5 ax-rounded-md ax-px-3 ax-py-1 ax-text-sm ax-surface">
+            <span>{{ getTagLabel(item) }}</span>
+            <button type="button" (click)="tagBoxComponent.removeItem(index)">
+              <ax-icon class="ax-icon ax-icon-close"></ax-icon>
+            </button>
+          </div>
+        </ng-template>
+      }
     }
-  }
   `,
                     changeDetection: ChangeDetectionStrategy.OnPush,
                     imports: [
@@ -6429,7 +6969,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImpo
                         AXSearchBoxComponent,
                     ],
                 }]
-        }], propDecorators: { textbox: [{ type: i0.ViewChild, args: [i0.forwardRef(() => AXTagBoxComponent), { isSignal: true }] }] } });
+        }], propDecorators: { selectBox: [{ type: i0.ViewChild, args: ['selectBox', { isSignal: true }] }], tagBox: [{ type: i0.ViewChild, args: ['tagBoxComponent', { isSignal: true }] }], textbox: [{ type: i0.ViewChild, args: [i0.forwardRef(() => AXTagBoxComponent), { isSignal: true }] }] } });
 
 var lookupWidgetEdit_component = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -6441,6 +6981,7 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         super(...arguments);
         //#region ----   Dependencies   ----
         this.entityDetailPopoverService = inject(AXPEntityDetailPopoverService);
+        this.formatService = inject(AXFormatService);
         //#endregion
         //#region ----   View Children   ----
         this.moreButton = viewChild('moreButton', ...(ngDevMode ? [{ debugName: "moreButton" }] : []));
@@ -6453,6 +6994,10 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         this.entity = this.options['entity'] ?? 'title';
         this.columnName = this.options['columnName'] ?? 'title';
         this.maxVisible = this.options['maxVisible'] ?? 2;
+        this.displayFormat = computed(() => {
+            const template = this.options['displayFormat'];
+            return template ? template.replace(/\{/g, '{{').replace(/\}/g, '}}') : undefined;
+        }, ...(ngDevMode ? [{ debugName: "displayFormat" }] : []));
         //#endregion
         //#region ----   Signals   ----
         this.isMorePopoverOpen = signal(false, ...(ngDevMode ? [{ debugName: "isMorePopoverOpen" }] : []));
@@ -6523,22 +7068,33 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         if (isNil(item)) {
             return null;
         }
-        return typeof item == 'object'
-            ? {
-                [this.valueField]: item?.[this.valueField],
-                [this.textField]: item?.[this.textField],
+        if (typeof item === 'object') {
+            return item;
+        }
+        return {
+            [this.valueField]: item,
+            [this.textField]: item,
+        };
+    }
+    getDisplayText(item) {
+        if (!item) {
+            return '';
+        }
+        const template = this.displayFormat();
+        if (template) {
+            const formatted = this.formatService.format(template, 'string', item);
+            if (formatted) {
+                return formatted;
             }
-            : {
-                [this.valueField]: item,
-                [this.textField]: item,
-            };
+        }
+        return item?.[this.textField] ?? '';
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLookupWidgetColumnComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.10", type: AXPLookupWidgetColumnComponent, isStandalone: true, selector: "ng-component", inputs: { rawValue: "rawValue", rowData: "rowData" }, viewQueries: [{ propertyName: "moreButton", first: true, predicate: ["moreButton"], descendants: true, isSignal: true }, { propertyName: "morePopover", first: true, predicate: ["morePopover"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"ax-flex ax-gap-1 ax-items-center\">\n  @if (visibleItems().length > 0) {\n    @for (item of visibleItems(); track $index) {\n      <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"handleItemClick($index)\">\n        {{ item[this.textField] }}\n      </span>\n      @if ($index < visibleItems().length - 1) {\n        <span class=\"ax-text-muted\">\u2022</span>\n      }\n    }\n  } @else {\n    <span class=\"ax-text-muted\">---</span>\n  }\n\n  @if (hasMoreItems()) {\n    <span\n      class=\"ax-absolute ax-flex ax-items-center ax-end-0 ax-px-1 ax-cursor-pointer ax-h-full hover:ax-primary-lighter\"\n      (click)=\"showMoreItems()\"\n      #moreButton\n    >\n      <i class=\"fa-light fa-ellipsis-vertical\"></i>\n    </span>\n  }\n</div>\n\n<!-- More Items Popover -->\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onMorePopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[280px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">All {{ allItems().length }} Items</h3>\n    </div>\n    <div class=\"ax-max-h-64 ax-flex ax-flex-col ax-gap-3\">\n      @for (item of allItems(); track $index) {\n        <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"showItemDetail(item, $index)\">\n          {{ item[this.textField] }}\n        </span>\n      }\n    </div>\n  </div>\n</ax-popover>\n", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLookupWidgetColumnComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.12", type: AXPLookupWidgetColumnComponent, isStandalone: true, selector: "ng-component", inputs: { rawValue: "rawValue", rowData: "rowData" }, viewQueries: [{ propertyName: "moreButton", first: true, predicate: ["moreButton"], descendants: true, isSignal: true }, { propertyName: "morePopover", first: true, predicate: ["morePopover"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"ax-flex ax-gap-1 ax-items-center\">\n  @if (visibleItems().length > 0) {\n  @for (item of visibleItems(); track $index) {\n  <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"handleItemClick($index)\">\n    {{ getDisplayText(item) }}\n  </span>\n  @if ($index < visibleItems().length - 1) { <span class=\"ax-text-muted\">\u2022</span>\n    }\n    }\n    } @else {\n    <span class=\"ax-text-muted\">---</span>\n    }\n\n    @if (hasMoreItems()) {\n    <span\n      class=\"ax-absolute ax-flex ax-items-center ax-end-0 ax-px-1 ax-cursor-pointer ax-h-full hover:ax-primary-lighter\"\n      (click)=\"showMoreItems()\" #moreButton>\n      <i class=\"fa-light fa-ellipsis-vertical\"></i>\n    </span>\n    }\n</div>\n\n<!-- More Items Popover -->\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onMorePopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[280px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">All {{ allItems().length }} Items</h3>\n    </div>\n    <div class=\"ax-max-h-64 ax-flex ax-flex-col ax-gap-3\">\n      @for (item of allItems(); track $index) {\n      <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"showItemDetail(item, $index)\">\n        {{ getDisplayText(item) }}\n      </span>\n      }\n    </div>\n  </div>\n</ax-popover>", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPLookupWidgetColumnComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLookupWidgetColumnComponent, decorators: [{
             type: Component,
-            args: [{ changeDetection: ChangeDetectionStrategy.OnPush, imports: [CommonModule, AXBadgeModule, AXButtonModule, AXPopoverModule], inputs: ['rawValue', 'rowData'], template: "<div class=\"ax-flex ax-gap-1 ax-items-center\">\n  @if (visibleItems().length > 0) {\n    @for (item of visibleItems(); track $index) {\n      <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"handleItemClick($index)\">\n        {{ item[this.textField] }}\n      </span>\n      @if ($index < visibleItems().length - 1) {\n        <span class=\"ax-text-muted\">\u2022</span>\n      }\n    }\n  } @else {\n    <span class=\"ax-text-muted\">---</span>\n  }\n\n  @if (hasMoreItems()) {\n    <span\n      class=\"ax-absolute ax-flex ax-items-center ax-end-0 ax-px-1 ax-cursor-pointer ax-h-full hover:ax-primary-lighter\"\n      (click)=\"showMoreItems()\"\n      #moreButton\n    >\n      <i class=\"fa-light fa-ellipsis-vertical\"></i>\n    </span>\n  }\n</div>\n\n<!-- More Items Popover -->\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onMorePopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[280px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">All {{ allItems().length }} Items</h3>\n    </div>\n    <div class=\"ax-max-h-64 ax-flex ax-flex-col ax-gap-3\">\n      @for (item of allItems(); track $index) {\n        <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"showItemDetail(item, $index)\">\n          {{ item[this.textField] }}\n        </span>\n      }\n    </div>\n  </div>\n</ax-popover>\n" }]
+            args: [{ changeDetection: ChangeDetectionStrategy.OnPush, imports: [CommonModule, AXBadgeModule, AXButtonModule, AXPopoverModule], inputs: ['rawValue', 'rowData'], template: "<div class=\"ax-flex ax-gap-1 ax-items-center\">\n  @if (visibleItems().length > 0) {\n  @for (item of visibleItems(); track $index) {\n  <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"handleItemClick($index)\">\n    {{ getDisplayText(item) }}\n  </span>\n  @if ($index < visibleItems().length - 1) { <span class=\"ax-text-muted\">\u2022</span>\n    }\n    }\n    } @else {\n    <span class=\"ax-text-muted\">---</span>\n    }\n\n    @if (hasMoreItems()) {\n    <span\n      class=\"ax-absolute ax-flex ax-items-center ax-end-0 ax-px-1 ax-cursor-pointer ax-h-full hover:ax-primary-lighter\"\n      (click)=\"showMoreItems()\" #moreButton>\n      <i class=\"fa-light fa-ellipsis-vertical\"></i>\n    </span>\n    }\n</div>\n\n<!-- More Items Popover -->\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onMorePopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[280px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">All {{ allItems().length }} Items</h3>\n    </div>\n    <div class=\"ax-max-h-64 ax-flex ax-flex-col ax-gap-3\">\n      @for (item of allItems(); track $index) {\n      <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"showItemDetail(item, $index)\">\n        {{ getDisplayText(item) }}\n      </span>\n      }\n    </div>\n  </div>\n</ax-popover>" }]
         }], propDecorators: { moreButton: [{ type: i0.ViewChild, args: ['moreButton', { isSignal: true }] }], morePopover: [{ type: i0.ViewChild, args: ['morePopover', { isSignal: true }] }] } });
 
 var lookupWidgetColumn_component = /*#__PURE__*/Object.freeze({
@@ -6587,6 +7143,20 @@ const AXPLookupWidget = {
             visible: true,
         },
         AXP_ALLOW_MULTIPLE_PROPERTY,
+        {
+            name: 'displayFormat',
+            title: 'Display Format',
+            group: AXP_DATA_PROPERTY_GROUP,
+            schema: {
+                dataType: 'string',
+                interface: {
+                    name: 'displayFormat',
+                    path: 'options.displayFormat',
+                    type: AXPWidgetsCatalog.template,
+                },
+            },
+            visible: true,
+        },
     ],
     components: {
         view: {
@@ -6648,8 +7218,8 @@ class AXPWidgetSelectorWidgetEditComponent extends AXPValueWidgetComponent {
         const widget = this.widgetRegisteryService.resolve(e.values.type);
         this.setValue({ title: widget?.title, ...e.values });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWidgetSelectorWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.10", type: AXPWidgetSelectorWidgetEditComponent, isStandalone: true, selector: "ng-component", viewQueries: [{ propertyName: "textbox", first: true, predicate: AXTextBoxComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: `
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetSelectorWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.12", type: AXPWidgetSelectorWidgetEditComponent, isStandalone: true, selector: "ng-component", viewQueries: [{ propertyName: "textbox", first: true, predicate: AXTextBoxComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: `
     <ax-text-box [ngModel]="displayText()" [placeholder]="placeholder()" [readonly]="true">
       @for (validation of validationRules(); track $index) {
       <ax-validation-rule
@@ -6670,7 +7240,7 @@ class AXPWidgetSelectorWidgetEditComponent extends AXPValueWidgetComponent {
     }
   `, isInline: true, dependencies: [{ kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "ngmodule", type: AXTextBoxModule }, { kind: "component", type: i2$2.AXTextBoxComponent, selector: "ax-text-box", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "id", "placeholder", "maxLength", "allowNull", "type", "autoComplete", "look", "mask-options", "class"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.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$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.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: AXLoadingModule }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "component", type: AXPWidgetPropertyViewerComponent, selector: "axp-widget-property-viewer", inputs: ["widget", "mode"], outputs: ["onChanged"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWidgetSelectorWidgetEditComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetSelectorWidgetEditComponent, decorators: [{
             type: Component,
             args: [{
                     template: `
@@ -6717,10 +7287,10 @@ var widgetSelectorWidgetEdit_component = /*#__PURE__*/Object.freeze({
 });
 
 class AXPWidgetSelectorWidgetViewComponent extends AXPValueWidgetComponent {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWidgetSelectorWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.10", type: AXPWidgetSelectorWidgetViewComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: `{{ getValue()?.title }}`, isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetSelectorWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.12", type: AXPWidgetSelectorWidgetViewComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: `{{ getValue()?.title }}`, isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPWidgetSelectorWidgetViewComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetSelectorWidgetViewComponent, decorators: [{
             type: Component,
             args: [{
                     template: `{{ getValue()?.title }}`,
@@ -6797,10 +7367,10 @@ class AXPEntityCreatePopupAction extends AXPWorkflowAction {
             }
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityCreatePopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityCreatePopupAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityCreatePopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityCreatePopupAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityCreatePopupAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityCreatePopupAction, decorators: [{
             type: Injectable
         }] });
 class AXPEntityCreateSubmittedAction extends AXPWorkflowAction {
@@ -6808,10 +7378,10 @@ class AXPEntityCreateSubmittedAction extends AXPWorkflowAction {
         this.dispatch(AXPEntityCreateEvent({ entity: context.getVariable('entity'), meta: context.getVariable('meta') }));
         this.dispatch(AXPRefreshEvent({ entity: context.getVariable('entity'), meta: context.getVariable('meta') }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityCreateSubmittedAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityCreateSubmittedAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityCreateSubmittedAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityCreateSubmittedAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityCreateSubmittedAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityCreateSubmittedAction, decorators: [{
             type: Injectable
         }] });
 const AXPCreateEntityWorkflow = {
@@ -6902,10 +7472,10 @@ class AXPQuickEntityModifyPopupAction extends AXPWorkflowAction {
             context.setVariable('data', cloneDeep(popup.data.context));
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPQuickEntityModifyPopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPQuickEntityModifyPopupAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPQuickEntityModifyPopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPQuickEntityModifyPopupAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPQuickEntityModifyPopupAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPQuickEntityModifyPopupAction, decorators: [{
             type: Injectable
         }] });
 const AXPQuickModifyEntityWorkflow = {
@@ -6926,8 +7496,8 @@ const AXPQuickModifyEntityWorkflow = {
             action: 'AXPToastAction',
             input: {
                 color: 'success',
-                title: 'workflow.entity-modified-title',
-                content: 'workflow.entity-modified-body',
+                title: '@general:workflow.entity-modified-title',
+                content: '@general:workflow.entity-modified-body',
             },
             nextSteps: [
                 {
@@ -6962,10 +7532,10 @@ class AXPEntityApplyUpdatesAction extends AXPWorkflowAction {
             context.setOutput('error', error);
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityApplyUpdatesAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityApplyUpdatesAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityApplyUpdatesAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityApplyUpdatesAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityApplyUpdatesAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityApplyUpdatesAction, decorators: [{
             type: Injectable
         }] });
 
@@ -6984,10 +7554,10 @@ class AXPShowDetailViewAction extends AXPWorkflowAction {
         context.setVariable('payload', newPayload);
         this.navigation.execute(context);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPShowDetailViewAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPShowDetailViewAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPShowDetailViewAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPShowDetailViewAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPShowDetailViewAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPShowDetailViewAction, decorators: [{
             type: Injectable
         }] });
 const AXPShowDetailsViewWorkflow = {
@@ -7041,10 +7611,10 @@ class AXPShowFileUploaderPopupAction extends AXPWorkflowAction {
             context.setVariable('data', cloneDeep(entityData));
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPShowFileUploaderPopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPShowFileUploaderPopupAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPShowFileUploaderPopupAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPShowFileUploaderPopupAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPShowFileUploaderPopupAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPShowFileUploaderPopupAction, decorators: [{
             type: Injectable
         }] });
 const AXPShowFileUploaderPopupWorkflow = {
@@ -7064,8 +7634,8 @@ const AXPShowFileUploaderPopupWorkflow = {
             action: 'AXPToastAction',
             input: {
                 color: 'success',
-                title: 'workflow.entity-modified-title',
-                content: 'workflow.entity-modified-body',
+                title: '@general:workflow.entity-modified-title',
+                content: '@general:workflow.entity-modified-body',
             },
             nextSteps: [
                 {
@@ -7095,10 +7665,10 @@ class AXPShowListViewAction extends AXPWorkflowAction {
         context.setVariable('payload', newPayload);
         this.navigation.execute(context);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPShowListViewAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPShowListViewAction }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPShowListViewAction, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPShowListViewAction }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPShowListViewAction, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPShowListViewAction, decorators: [{
             type: Injectable
         }] });
 const AXPShowListViewWorkflow = {
@@ -7187,9 +7757,9 @@ class AXPEntityModule {
             },
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityModule, deps: [{ token: i1$1.AXPAppStartUpService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityModule, imports: [RouterModule, i2$3.AXPWorkflowModule, i3$1.AXPWidgetCoreModule] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityModule, providers: [
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModule, deps: [{ token: i1$1.AXPAppStartUpService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModule, imports: [RouterModule, i2$3.AXPWorkflowModule, i3$1.AXPWidgetCoreModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModule, providers: [
             {
                 provide: ROUTES,
                 multi: true,
@@ -7212,6 +7782,11 @@ class AXPEntityModule {
                 useValue: columnWidthMiddlewareProvider,
                 multi: true,
             },
+            {
+                provide: AXP_ENTITY_MODIFIER,
+                useValue: layoutOrderingMiddlewareProvider,
+                multi: true,
+            },
             provideCommandSetups([
                 {
                     key: 'Entity:OpenDetails',
@@ -7219,7 +7794,7 @@ class AXPEntityModule {
                 },
                 {
                     key: 'Entity:Create',
-                    command: () => import('./acorex-platform-layout-entity-create-entity.command-BsLbiAdA.mjs').then((c) => c.AXPCreateEntityCommand),
+                    command: () => import('./acorex-platform-layout-entity-create-entity.command-Bui87lV1.mjs').then((c) => c.AXPCreateEntityCommand),
                 },
             ]),
             provideQuerySetups([
@@ -7266,7 +7841,7 @@ class AXPEntityModule {
                 ],
             })] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
@@ -7333,6 +7908,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImpo
                             useValue: columnWidthMiddlewareProvider,
                             multi: true,
                         },
+                        {
+                            provide: AXP_ENTITY_MODIFIER,
+                            useValue: layoutOrderingMiddlewareProvider,
+                            multi: true,
+                        },
                         provideCommandSetups([
                             {
                                 key: 'Entity:OpenDetails',
@@ -7340,7 +7920,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImpo
                             },
                             {
                                 key: 'Entity:Create',
-                                command: () => import('./acorex-platform-layout-entity-create-entity.command-BsLbiAdA.mjs').then((c) => c.AXPCreateEntityCommand),
+                                command: () => import('./acorex-platform-layout-entity-create-entity.command-Bui87lV1.mjs').then((c) => c.AXPCreateEntityCommand),
                             },
                         ]),
                         provideQuerySetups([
@@ -7353,29 +7933,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImpo
                 }]
         }], ctorParameters: () => [{ type: i1$1.AXPAppStartUpService }, { type: i0.Injector }] });
 
-const eventDispatchMiddleware = {
-    target: { ops: ['create', 'update', 'delete'], order: 90 },
-    execute: async (ctx, next) => {
-        const dispatcher = inject(AXPEntityEventDispatcherService);
-        await next();
-        if (ctx.op === 'create') {
-            const createdData = ctx.result ? { ...ctx.data, id: ctx.result } : ctx.data;
-            await dispatcher.dispatchInserted(ctx.entityName, { refType: ctx.entityName, data: createdData });
-        }
-        else if (ctx.op === 'update') {
-            await dispatcher.dispatchUpdated(ctx.entityName, {
-                refType: ctx.entityName,
-                data: ctx.result,
-                changes: ctx.locals.get('changes'),
-            });
-        }
-        else if (ctx.op === 'delete') {
-            // For delete, prefer previous entity if available
-            await dispatcher.dispatchDeleted(ctx.entityName, { refType: ctx.entityName, data: ctx.result ?? ctx.previous });
-        }
-    },
-};
-
 //#endregion
 //#region ----   Get Entity Details Query   ----
 /**
@@ -7441,10 +7998,10 @@ class AXPGetEntityDetailsQuery {
             throw new Error(`Failed to fetch entity data: ${error instanceof Error ? error.message : 'Unknown error'}`);
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPGetEntityDetailsQuery, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPGetEntityDetailsQuery, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPGetEntityDetailsQuery, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPGetEntityDetailsQuery, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPGetEntityDetailsQuery, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPGetEntityDetailsQuery, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -7467,10 +8024,10 @@ class AXPEntityDynamicDialogService {
     entity(fullName) {
         return new InterfaceSelector(this.entityRegistry, this.layoutBuilder, this.layoutTheme, fullName);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDynamicDialogService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDynamicDialogService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDynamicDialogService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDynamicDialogService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: AXPEntityDynamicDialogService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityDynamicDialogService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -7750,6 +8307,7 @@ function entityMasterBulkDeleteAction() {
         priority: 'primary',
         type: AXPSystemActionType.Delete,
         scope: AXPEntityCommandScope.Selected,
+        order: 100,
     };
 }
 function entityMasterViewAction() {
@@ -7769,6 +8327,7 @@ function entityMasterDeleteAction() {
         priority: 'secondary',
         type: AXPSystemActionType.Delete,
         scope: AXPEntityCommandScope.Individual,
+        order: 100,
     };
 }
 function entityMasterCrudActions(options) {
@@ -7929,5 +8488,5 @@ function detectEntityChanges(oldObj, newObj) {
  * Generated bundle index. Do not edit.
  */
 
-export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntityApplyUpdatesAction, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityDynamicDialogService, AXPEntityEventDispatcherService, AXPEntityListTableService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityReferenceWidget, AXPEntityReferenceWidgetColumnComponent, AXPEntityReferenceWidgetDesignerComponent, AXPEntityReferenceWidgetEditComponent, AXPEntityReferenceWidgetPrintComponent, AXPEntityReferenceWidgetViewComponent, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPGetEntityDetailsQuery, AXPLookupFilterWidget, AXPLookupFilterWidgetEditComponent, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPWidgetSelectorWidget, AXPWidgetSelectorWidgetEditComponent, AXPWidgetSelectorWidgetViewComponent, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, DEFAULT_COLUMN_WIDTHS, actionExists, columnWidthMiddlewareFactory, columnWidthMiddlewareProvider, createColumnWidthMiddlewareProvider, createModifierContext, detectEntityChanges, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, isAXPMiddlewareAbortError };
+export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntityApplyUpdatesAction, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityDynamicDialogService, AXPEntityEventDispatcherService, AXPEntityListTableService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityReferenceWidget, AXPEntityReferenceWidgetColumnComponent, AXPEntityReferenceWidgetDesignerComponent, AXPEntityReferenceWidgetEditComponent, AXPEntityReferenceWidgetPrintComponent, AXPEntityReferenceWidgetViewComponent, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPGetEntityDetailsQuery, AXPLookupFilterWidget, AXPLookupFilterWidgetEditComponent, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPWidgetSelectorWidget, AXPWidgetSelectorWidgetEditComponent, AXPWidgetSelectorWidgetViewComponent, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, DEFAULT_COLUMN_WIDTHS, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, actionExists, columnWidthMiddlewareFactory, columnWidthMiddlewareProvider, createColumnWidthMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, detectEntityChanges, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider };
 //# sourceMappingURL=acorex-platform-layout-entity.mjs.map