@acorex/platform 21.0.0-next.2 → 21.0.0-next.5

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

@@ -2,14 +2,13 @@ import { AXToastService } from '@acorex/components/toast';
 import * as i6 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
 import * as i4$1 from '@acorex/platform/common';
-import { AXPSettingService, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, AXPCommonSettings, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
-import * as i1$1 from '@acorex/platform/core';
+import { AXPSettingsService, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, AXPCommonSettings, AXPEntityQueryType, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
 import { AXPDeviceService, AXPBroadcastEventService, resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPPlatformScope, AXHighlightService, extractValue, setSmart, getChangedPaths, AXPSystemActionType } from '@acorex/platform/core';
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, input, viewChild, signal, ElementRef, ChangeDetectionStrategy, Component, ApplicationRef, EnvironmentInjector, createComponent, computed, effect, Input, afterNextRender, ViewEncapsulation, ChangeDetectorRef, viewChildren, linkedSignal, untracked, HostBinding, ViewChild, NgModule } from '@angular/core';
+import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, input, viewChild, signal, ElementRef, ChangeDetectionStrategy, Component, ApplicationRef, EnvironmentInjector, createComponent, computed, effect, Input, afterNextRender, ViewEncapsulation, ChangeDetectorRef, viewChildren, linkedSignal, untracked, HostBinding, NgModule } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
 import { AXPLayoutBuilderService } from '@acorex/platform/layout/builder';
-import { merge, castArray, get, cloneDeep, set, orderBy, isNil, isEmpty, isEqual, sortBy } from 'lodash-es';
+import { merge, castArray, get, cloneDeep, set, orderBy, isNil, isEmpty, isEqual } from 'lodash-es';
 import { AXPSessionService, AXPAuthGuard } from '@acorex/platform/auth';
 import { Router, RouterModule, ROUTES } from '@angular/router';
 import * as i3 from '@acorex/components/button';
@@ -19,14 +18,14 @@ import { AXLoadingModule } from '@acorex/components/loading';
 import * as i2 from '@acorex/components/popover';
 import { AXPopoverModule } from '@acorex/components/popover';
 import * as i3$1 from '@acorex/platform/layout/widget-core';
-import { AXPWidgetsCatalog, AXPWidgetCoreModule, AXPPageStatus, AXPWidgetRegistryService, AXPColumnWidgetComponent, AXPValueWidgetComponent, AXPWidgetGroupEnum, AXPWidgetRendererDirective, AXPLayoutBaseWidgetComponent, AXP_WIDGETS_EDITOR_CATEGORY } from '@acorex/platform/layout/widget-core';
-import { AXPCommandService, AXPQueryService, provideCommandSetups, provideQuerySetups } from '@acorex/platform/runtime';
+import { AXPWidgetsCatalog, AXPWidgetCoreModule, AXPPageStatus, AXPWidgetRegistryService, AXPColumnWidgetComponent, AXPValueWidgetComponent, AXPWidgetGroupEnum, AXPWidgetRendererDirective } from '@acorex/platform/layout/widget-core';
+import { AXPCommandService, AXPQueryService, AXPQueryExecutor, provideCommandSetups, provideQuerySetups } from '@acorex/platform/runtime';
 import * as i5 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { AXDataSource } from '@acorex/cdk/common';
 import { AXFormatService } from '@acorex/core/format';
-import * as i2$4 from '@acorex/platform/workflow';
-import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
+import * as i1$1 from '@acorex/platform/workflow';
+import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowEventService, AXPWorkflowModule } from '@acorex/platform/workflow';
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
 import { moveItemInArray } from '@angular/cdk/drag-drop';
 import { AXDialogService } from '@acorex/components/dialog';
@@ -43,7 +42,7 @@ import { AXSearchBoxModule, AXSearchBoxComponent } from '@acorex/components/sear
 import * as i5$1 from '@acorex/components/skeleton';
 import { AXSkeletonModule } from '@acorex/components/skeleton';
 import { AXTreeViewComponent } from '@acorex/components/tree-view';
-import { AXPStateMessageComponent, AXPDataSelectorService, AXPWidgetPropertyViewerComponent } from '@acorex/platform/layout/components';
+import { AXPStateMessageComponent, AXPDataSelectorService } from '@acorex/platform/layout/components';
 import * as i1 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
 import * as i2$2 from '@acorex/components/badge';
@@ -58,8 +57,7 @@ import * as i4$3 from '@acorex/components/dropdown';
 import { AXDropdownModule } from '@acorex/components/dropdown';
 import * as i7 from '@acorex/components/select-box';
 import { AXSelectBoxModule } from '@acorex/components/select-box';
-import * as i2$3 from '@acorex/components/text-box';
-import { AXTextBoxModule, AXTextBoxComponent } from '@acorex/components/text-box';
+import { AXTextBoxModule } from '@acorex/components/text-box';
 import { transform, isEqual as isEqual$1 } from 'lodash';
 
 function ensureListActions(ctx) {
@@ -380,7 +378,8 @@ class AXPEntityMiddleware {
         }
         // Apply all matching modifiers in order
         for (const modifier of modifiers) {
-            modifier(context);
+            //TODO Check side EFFECTS
+            runInInjectionContext(this.injector, () => modifier(context));
         }
         return context.toEntity();
     }
@@ -410,16 +409,38 @@ class AXPEntityResolver {
         this.providers = inject(AXP_ENTITY_DEFINITION_LOADER);
     }
     async get(moduleName, entityName) {
+        // Load from DI tokens
         if (Array.isArray(this.providers)) {
             for (const loader of this.providers) {
-                const entity = await loader.get(moduleName, entityName);
+                let resolvedLoader;
+                if (loader instanceof Promise) {
+                    // If loader is a promise, resolve it
+                    resolvedLoader = await loader;
+                }
+                else {
+                    // If loader is a direct instance, use it directly
+                    resolvedLoader = loader;
+                }
+                const entity = await resolvedLoader.get(moduleName, entityName);
                 if (entity) {
                     return entity;
                 }
             }
         }
         else {
-            return await this.providers.get(moduleName, entityName);
+            let resolvedLoader;
+            if (this.providers instanceof Promise) {
+                // If loader is a promise, resolve it
+                resolvedLoader = await this.providers;
+            }
+            else {
+                // If loader is a direct instance, use it directly
+                resolvedLoader = this.providers;
+            }
+            const entity = await resolvedLoader.get(moduleName, entityName);
+            if (entity) {
+                return entity;
+            }
         }
         return null;
     }
@@ -433,8 +454,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
 
 class AXPEntityDefinitionRegistryService {
     constructor() {
-        this.providers = inject(AXP_ENTITY_DEFINITION_LOADER);
-        this.resolver = inject(AXPEntityResolver);
         this.middleware = inject(AXPEntityMiddleware);
         this.onChanged = new Subject();
         // Stores AXPEntityConfig objects, keyed by a combination of module and entity name.
@@ -445,42 +464,6 @@ class AXPEntityDefinitionRegistryService {
     get onChanged$() {
         return this.onChanged.asObservable();
     }
-    async preload() {
-        const providers = Array.isArray(this.providers)
-            ? this.providers
-            : [this.providers];
-        const promises = [];
-        // Helper to wrap a promise with a timeout
-        function withTimeout(promise, ms = 10000, info = '') {
-            return Promise.race([
-                promise,
-                new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout after ${ms}ms: ${info}`)), ms))
-            ]);
-        }
-        providers.forEach((provider) => {
-            const items = typeof provider.preload == 'function' ? provider.preload() : [];
-            items.forEach((item) => {
-                //console.log('[AXPEntityDefinitionRegistryService] Preloading entity:', item.module, item.entity);
-                promises.push(withTimeout(this.resolver.get(item.module, item.entity)
-                    .catch(err => {
-                    console.error(`[AXPEntityDefinitionRegistryService] Failed to load entity ${item.module}.${item.entity}:`, err);
-                    return null;
-                }), 10000, `${item.module}.${item.entity}`));
-            });
-        });
-        const results = await Promise.allSettled(promises);
-        const loadedEntities = [];
-        results.forEach(async (result, idx) => {
-            if (result.status === 'fulfilled' && result.value != null) {
-                this.register(await this.middleware.process(result.value));
-                loadedEntities.push(result.value);
-            }
-            else if (result.status === 'rejected') {
-                console.error('[AXPEntityDefinitionRegistryService] Entity preload failed:', result.reason);
-            }
-        });
-        //console.log('[AXPEntityDefinitionRegistryService] Loaded entities:', loadedEntities);
-    }
     async refresh(arg1, arg2) {
         // No parameters: refresh all currently registered entities
         if (typeof arg1 === 'undefined' && typeof arg2 === 'undefined') {
@@ -537,6 +520,26 @@ class AXPEntityDefinitionRegistryService {
     getAll() {
         return Array.from(this.entities.values());
     }
+    /**
+     * Clear all registered entity configurations.
+     * Should be called when modules are cleared to prevent stale entity data.
+     * @param preserveModules Optional list of module names whose entities should be preserved
+     */
+    clear(preserveModules) {
+        if (preserveModules && preserveModules.length > 0) {
+            const preserveSet = new Set(preserveModules);
+            // Remove only entities from non-preserved modules
+            for (const [key, entity] of this.entities.entries()) {
+                if (!preserveSet.has(entity.module)) {
+                    this.entities.delete(key);
+                }
+            }
+        }
+        else {
+            this.entities.clear();
+        }
+        this.onChanged.next({ name: '' });
+    }
     /**
      * Resolves an entity configuration based on module and entity name. If the configuration
      * is not already registered, attempts to load it dynamically. Throws an error if the
@@ -568,6 +571,10 @@ class AXPEntityDefinitionRegistryService {
         }
         return config;
     }
+    async exists(moduleName, entityName) {
+        const key = this.createEntityKey(moduleName, entityName);
+        return this.entities.has(key);
+    }
     /**
      * Creates a unique key for an entity based on its module and name.
      *
@@ -1013,7 +1020,7 @@ function toCompatFormFieldBuilder(field) {
 class AXPCreateEntityCommand {
     constructor() {
         this.entityForm = inject(AXPEntityFormBuilderService);
-        this.settingsService = inject(AXPSettingService);
+        this.settingsService = inject(AXPSettingsService);
         this.entityService = inject(AXPEntityDefinitionRegistryService);
         this.toastService = inject(AXToastService);
         this.translationService = inject(AXTranslationService);
@@ -1133,7 +1140,7 @@ class AXPUpdateEntityCommand {
     constructor() {
         //#region ----   Services & Dependencies   ----
         this.entityForm = inject(AXPEntityFormBuilderService);
-        this.settingsService = inject(AXPSettingService);
+        this.settingsService = inject(AXPSettingsService);
         this.entityService = inject(AXPEntityDefinitionRegistryService);
         this.toastService = inject(AXToastService);
         this.translationService = inject(AXTranslationService);
@@ -1622,9 +1629,9 @@ class AXPEntityDetailPopoverComponent {
                 AXPWidgetsCatalog.text,
                 AXPWidgetsCatalog.largeText,
                 AXPWidgetsCatalog.richText,
-                //
-                AXPWidgetsCatalog.select,
-                //AXPWidgetsCatalog.lookup,
+                // TODO: Blinking issue with select widget, it seems rendering issue with select widget.
+                //AXPWidgetsCatalog.select,
+                AXPWidgetsCatalog.lookup,
                 //
                 AXPWidgetsCatalog.number,
                 AXPWidgetsCatalog.toggle,
@@ -1681,7 +1688,7 @@ class AXPEntityDetailPopoverComponent {
         return importantProperties;
     }
     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 }); }
+    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", "onLoad"], 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.12", ngImport: i0, type: AXPEntityDetailPopoverComponent, decorators: [{
             type: Component,
@@ -1765,7 +1772,15 @@ class AXPDataSeederService {
     }
     async seed() {
         for (const loader of castArray(this.loaders)) {
-            await loader?.seed();
+            if (!loader)
+                continue;
+            const seederName = loader.constructor?.name || 'UnknownSeeder';
+            const startTime = performance.now();
+            await loader.seed();
+            const duration = performance.now() - startTime;
+            if (duration > 3000) {
+                console.warn(`[AXPDataSeeder] Seeder "${seederName}" took ${duration.toFixed(2)}ms (>3000ms threshold)`);
+            }
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPDataSeederService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -1824,14 +1839,27 @@ class AXPEntityDetailListViewModel {
         this.workflow = this.injector.get(AXPWorkflowService);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
         this.expressionEvaluator = this.injector.get(AXPExpressionEvaluatorService);
+        this.queryExecutor = this.injector.get(AXPQueryExecutor);
         this.dataSource = new AXDataSource({
-            byKey: (key) => {
-                const func = this.detailEntity()?.queries.byKey.execute;
-                return func();
+            byKey: async (key) => {
+                const execute = this.detailEntity()?.queries?.byKey?.execute;
+                if (typeof execute === 'function') {
+                    return await execute(key);
+                }
+                else if (typeof execute === 'string') {
+                    return await this.queryExecutor.fetch(execute, key);
+                }
+                return null;
             },
-            load: (e) => {
-                const func = this.detailEntity()?.queries.list?.execute;
-                return func(e);
+            load: async (e) => {
+                const execute = this.detailEntity()?.queries?.list?.execute;
+                if (typeof execute === 'function') {
+                    return await execute(e);
+                }
+                else if (typeof execute === 'string') {
+                    return await this.queryExecutor.fetch(execute, e);
+                }
+                return null;
             },
             pageSize: 5,
             key: 'id',
@@ -1953,9 +1981,9 @@ class AXPEntityDetailListViewModel {
         this.initialize();
     }
     async initialize() {
-        const entityResolver = this.injector.get(AXPEntityResolver);
+        const entityResolver = this.injector.get(AXPEntityDefinitionRegistryService);
         const [moduleName, entityName] = this.detailEntityConfig.entity.split('.');
-        const entity = await entityResolver.get(moduleName, entityName);
+        const entity = await entityResolver.resolve(moduleName, entityName);
         if (!entity) {
             throw Error(`Invalid enitity name: ${this.detailEntityConfig.entity}`);
         }
@@ -2229,7 +2257,6 @@ class AXPEntityCreateViewElementViewModel {
                 path: this.name(),
                 name: this.name(),
                 children: widget.children,
-                formula: widget.formula,
                 triggers: widget.triggers,
                 defaultValue: schema.defaultValue,
                 valueTransforms: widget.valueTransforms,
@@ -2368,11 +2395,12 @@ class AXPEntityMasterListViewModel {
         this.formatService = this.injector.get(AXFormatService);
         this.session = this.injector.get(AXPSessionService);
         this.workflow = this.injector.get(AXPWorkflowService);
-        this.settings = this.injector.get(AXPSettingService);
+        this.settings = this.injector.get(AXPSettingsService);
         this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
         this.expressionEvaluator = this.injector.get(AXPExpressionEvaluatorService);
         this.commandService = this.injector.get(AXPCommandService);
         this.eventService = this.injector.get(AXPBroadcastEventService);
+        this.queryExecutor = this.injector.get(AXPQueryExecutor);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
         this.settingEntityKey = `${this.config.module}:${this.config.name}`;
         this.destroyed = new Subject();
@@ -2388,13 +2416,25 @@ class AXPEntityMasterListViewModel {
         }, ...(ngDevMode ? [{ debugName: "views" }] : []));
         this.view = signal(this.views()[0], ...(ngDevMode ? [{ debugName: "view" }] : []));
         this.dataSource = new AXDataSource({
-            byKey: (key) => {
-                const func = this.entityDef.queries.byKey.execute;
-                return func();
+            byKey: async (key) => {
+                const execute = this.entityDef.queries?.byKey?.execute;
+                if (typeof execute === 'function') {
+                    return await execute(key);
+                }
+                else if (typeof execute === 'string') {
+                    return await this.queryExecutor.fetch(execute, key);
+                }
+                return null;
             },
-            load: (e) => {
-                const func = this.entityDef.queries.list?.execute;
-                return func(e);
+            load: async (e) => {
+                const execute = this.entityDef.queries?.list?.execute;
+                if (typeof execute === 'function') {
+                    return await execute(e);
+                }
+                else if (typeof execute === 'string') {
+                    return await this.queryExecutor.fetch(execute, e);
+                }
+                return null;
             },
             pageSize: this.view().pageSize || 10,
             key: 'id',
@@ -2922,13 +2962,363 @@ const AXPEntityListViewModelResolver = (route, state, service = inject(AXPEntity
     return service.create(moduleName, entityName);
 };
 
+class AXPEntityStorageService {
+}
+class AXPEntityDataProvider {
+}
+class AXPEntityDataProviderImpl {
+    constructor(storageService, entityName) {
+        this.storageService = storageService;
+        this.entityName = entityName;
+    }
+    async initial(collection) {
+        await this.storageService.initial(this.entityName, collection);
+    }
+    getOne(id) {
+        return this.storageService.getOne(this.entityName, id);
+    }
+    getAll() {
+        return this.storageService.getAll(this.entityName);
+    }
+    query(request) {
+        return this.storageService.query(this.entityName, request);
+    }
+    updateOne(id, keyValues) {
+        return this.storageService.updateOne(this.entityName, id, keyValues);
+    }
+    deleteOne(id) {
+        return this.storageService.deleteOne(this.entityName, id);
+    }
+    insertOne(entity) {
+        return this.storageService.insertOne(this.entityName, entity);
+    }
+}
+class AXMEntityCrudService {
+}
+class AXMEntityCrudServiceImpl {
+    constructor(entityName) {
+        this.entityName = entityName;
+        this._storageService = inject(AXPEntityStorageService);
+        this.entityRegistery = inject(AXPEntityDefinitionRegistryService);
+        this._entityDataProvider = new AXPEntityDataProviderImpl(this._storageService, this.entityName);
+        this._entityCategoryDataProvider = new AXPEntityDataProviderImpl(this._storageService, `${this.entityName}Category`);
+    }
+    async insertOne(request) {
+        return this._entityDataProvider.insertOne(request);
+    }
+    async getOne(id) {
+        return this._entityDataProvider.getOne(id);
+    }
+    //DELETE
+    async deleteOne(id) {
+        return this._entityDataProvider.deleteOne(id);
+    }
+    async updateOne(id, values) {
+        return this._entityDataProvider.updateOne(id, values);
+    }
+    async query(request = { skip: 0, take: 100 }) {
+        const [moduleName, entityName] = this._entityDataProvider.entityName.split('.');
+        try {
+            const entityRef = await this.entityRegistery.resolve(moduleName, entityName);
+            if (entityRef.parentKey) {
+                if (!request.filter?.filters?.length && request.filter?.field !== entityRef.parentKey) {
+                    request.filter = {
+                        value: true,
+                        field: entityRef.parentKey,
+                        operator: {
+                            type: 'isEmpty',
+                        },
+                    };
+                }
+            }
+        }
+        catch (error) {
+            console.error(error);
+        }
+        return this._entityDataProvider.query(request);
+    }
+    async findOne(filter) {
+        const result = await this._entityDataProvider.query({ filter, skip: 0, take: 1 });
+        return result.items[0];
+    }
+    async getRoots(request) {
+        const queryRequest = {
+            skip: 0,
+            take: 1000,
+            filter: {
+                value: true,
+                field: 'parentId',
+                operator: {
+                    type: 'isEmpty',
+                },
+            },
+        };
+        const result = await this._entityDataProvider.query(queryRequest);
+        return result;
+    }
+    async getChildren(request) {
+        const parentKey = request.parentKey ?? 'parentId';
+        const queryRequest = {
+            skip: 0,
+            take: 1000,
+            filter: {
+                value: request.parentId,
+                field: parentKey,
+                operator: {
+                    type: 'equal',
+                },
+            },
+        };
+        const result = await this._entityDataProvider.query(queryRequest);
+        return result;
+    }
+    async getByCategory(request) {
+        const queryRequest = {
+            skip: 0,
+            take: 1000,
+            filter: {
+                value: request.categoryId,
+                field: request.categoryKey ?? 'categoryIds',
+                operator: {
+                    type: 'contains',
+                },
+            },
+        };
+        const result = await this._entityDataProvider.query(queryRequest);
+        return result;
+    }
+    async getCategoriesList(request = { skip: 0, take: 1000 }) {
+        return this._entityCategoryDataProvider.query(request);
+    }
+    get storageService() {
+        return this._storageService;
+    }
+    async custom(request) { }
+}
+
+//#region ----   EntityDataAccessor   ----
+/**
+ * Data accessor for entity operations.
+ * Provides methods to query and execute commands with smart resolution:
+ * 1. Checks entity definition queries/commands first
+ * 2. Falls back to CRUD service if not defined
+ */
+class EntityDataAccessor {
+    constructor(module, entity, entityRegistry, queryExecutor, commandService) {
+        this.module = module;
+        this.entity = entity;
+        this.entityRegistry = entityRegistry;
+        this.queryExecutor = queryExecutor;
+        this.commandService = commandService;
+        this.crudService = null;
+        this.entityDef = null;
+        this.entityDefPromise = null;
+    }
+    /**
+     * Resolves the entity definition lazily and caches it.
+     * @returns The resolved entity definition
+     */
+    async resolveEntityDef() {
+        if (this.entityDef) {
+            return this.entityDef;
+        }
+        if (!this.entityDefPromise) {
+            this.entityDefPromise = this.entityRegistry.resolve(this.module, this.entity);
+        }
+        this.entityDef = await this.entityDefPromise;
+        if (!this.entityDef) {
+            throw new Error(`Entity "${this.module}.${this.entity}" could not be resolved`);
+        }
+        return this.entityDef;
+    }
+    /**
+     * Gets a single entity by key.
+     * @param key - The entity key
+     * @returns The entity detail or null if not found
+     */
+    async byKey(key) {
+        const entityDef = await this.resolveEntityDef();
+        const execute = entityDef.queries?.byKey?.execute;
+        if (typeof execute === 'function') {
+            return await execute(key);
+        }
+        else if (typeof execute === 'string') {
+            return await this.queryExecutor.fetch(execute, key);
+        }
+        // Fallback to CRUD service
+        if (!this.crudService) {
+            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
+        }
+        return await this.crudService.getOne(key);
+    }
+    /**
+     * Queries a list of entities.
+     * @param request - The query request (optional)
+     * @returns The paged list result
+     */
+    async query(request) {
+        const entityDef = await this.resolveEntityDef();
+        const defaultRequest = { skip: 0, take: 10 };
+        const queryRequest = request || defaultRequest;
+        const execute = entityDef.queries?.list?.execute;
+        if (typeof execute === 'function') {
+            return await execute(queryRequest);
+        }
+        else if (typeof execute === 'string') {
+            const result = await this.queryExecutor.fetch(execute, queryRequest);
+            if (!result) {
+                throw new Error(`Query "${execute}" returned null`);
+            }
+            return result;
+        }
+        // Fallback to CRUD service
+        if (!this.crudService) {
+            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
+        }
+        return await this.crudService.query(queryRequest);
+    }
+    /**
+     * Creates a new entity.
+     * @param data - The entity data to create
+     * @returns The created entity key
+     */
+    async create(data) {
+        const entityDef = await this.resolveEntityDef();
+        const execute = entityDef.commands?.create?.execute;
+        if (typeof execute === 'function') {
+            const result = await execute(data);
+            return result?.id || result;
+        }
+        else if (typeof execute === 'string') {
+            const result = await this.commandService.execute(execute, data);
+            if (!result?.success) {
+                throw new Error(result?.message?.text || 'Failed to create entity');
+            }
+            return result.data?.id || result.data;
+        }
+        // Fallback to CRUD service
+        if (!this.crudService) {
+            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
+        }
+        return await this.crudService.insertOne(data);
+    }
+    /**
+     * Updates an existing entity.
+     * @param id - The entity key
+     * @param data - The entity data to update
+     * @returns The updated entity
+     */
+    async update(id, data) {
+        const entityDef = await this.resolveEntityDef();
+        const execute = entityDef.commands?.update?.execute;
+        const updateData = { id, ...data };
+        if (typeof execute === 'function') {
+            return await execute(updateData);
+        }
+        else if (typeof execute === 'string') {
+            const result = await this.commandService.execute(execute, updateData);
+            if (!result?.success) {
+                throw new Error(result?.message?.text || 'Failed to update entity');
+            }
+            return result.data;
+        }
+        // Fallback to CRUD service
+        if (!this.crudService) {
+            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
+        }
+        return await this.crudService.updateOne(id, data);
+    }
+    /**
+     * Deletes an entity.
+     * @param id - The entity key
+     */
+    async delete(id) {
+        const entityDef = await this.resolveEntityDef();
+        const execute = entityDef.commands?.delete?.execute;
+        if (typeof execute === 'function') {
+            await execute(id);
+            return;
+        }
+        else if (typeof execute === 'string') {
+            const result = await this.commandService.execute(execute, id);
+            if (!result?.success) {
+                throw new Error(result?.message?.text || 'Failed to delete entity');
+            }
+            return;
+        }
+        // Fallback to CRUD service
+        if (!this.crudService) {
+            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
+        }
+        return await this.crudService.deleteOne(id);
+    }
+}
+//#endregion
+//#region ----   EntityBuilder   ----
+/**
+ * Builder class for entity operations.
+ * Provides methods to create paths and access entity data.
+ */
+class EntityBuilder {
+    constructor(module, entity, sessionService, entityRegistry, queryExecutor, commandService) {
+        this.sessionService = sessionService;
+        this.entityRegistry = entityRegistry;
+        this.queryExecutor = queryExecutor;
+        this.commandService = commandService;
+        this.module = module;
+        this.entity = entity;
+    }
+    /**
+     * Creates a path for the entity.
+     * @param path - The path segment (defaults to 'list')
+     * @returns The full path string
+     */
+    createPath(path = 'list') {
+        return `/${this.sessionService.application?.name}/m/${this.module}/e/${this.entity}/${path}`;
+    }
+    /**
+     * Gets the data accessor for the entity with generic type support.
+     * Entity definition is resolved lazily on first method call.
+     * @returns An EntityDataAccessor instance
+     */
+    data() {
+        return new EntityDataAccessor(this.module, this.entity, this.entityRegistry, this.queryExecutor, this.commandService);
+    }
+}
+//#endregion
 class AXPEntityService {
     constructor() {
         this.sessionService = inject(AXPSessionService);
+        this.entityRegistry = inject(AXPEntityDefinitionRegistryService);
+        this.queryExecutor = inject(AXPQueryExecutor);
+        this.commandService = inject(AXPCommandService);
     }
+    /**
+     * @deprecated Use `withEntity(module, entity).createPath(path)` instead.
+     * This method will be removed in a future version.
+     */
     createPath(module, entity, path = 'list') {
         return `/${this.sessionService.application?.name}/m/${module}/e/${entity}/${path}`;
     }
+    withEntity(moduleOrEntityKey, entity) {
+        let module;
+        let entityName;
+        if (entity !== undefined) {
+            // Two parameters: module and entity
+            module = moduleOrEntityKey;
+            entityName = entity;
+        }
+        else {
+            // Single parameter: "module.entity" format
+            const dotIndex = moduleOrEntityKey.indexOf('.');
+            if (dotIndex === -1) {
+                throw new Error(`Invalid entity key format: "${moduleOrEntityKey}". Expected format: "module.entity"`);
+            }
+            module = moduleOrEntityKey.substring(0, dotIndex);
+            entityName = moduleOrEntityKey.substring(dotIndex + 1);
+        }
+        return new EntityBuilder(module, entityName, this.sessionService, this.entityRegistry, this.queryExecutor, this.commandService);
+    }
     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' }); }
 }
@@ -2945,13 +3335,13 @@ class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
         this.dialogService = inject(AXDialogService);
         this.loadingDialog = inject(AXLoadingDialogService);
         this.translationService = inject(AXTranslationService);
-        this.settingService = inject(AXPSettingService);
+        this.settingsService = inject(AXPSettingsService);
     }
     async execute(context) {
         const moduleEntity = context.getVariable('entity');
         const data = context.getVariable('data');
         const meta = context.getVariable('meta');
-        const showResult = await this.settingService.get(AXPCommonSettings.EnableOperationToasts);
+        const showResult = await this.settingsService.get(AXPCommonSettings.EnableOperationToasts);
         const entities = [];
         if (moduleEntity != null) {
             const ids = Array.isArray(data) ? data.map((c) => c.id) : [data.id];
@@ -3176,7 +3566,6 @@ class AXPEntityMasterUpdateElementViewModel {
                 path: this.name(),
                 name: this.name(),
                 children: widget.children,
-                formula: widget.formula,
                 triggers: widget.triggers,
                 valueTransforms: widget.valueTransforms,
                 options: merge(schema.interface?.options, {
@@ -3258,8 +3647,8 @@ class AXPEntityMasterUpdateViewModelFactory {
     async create(moduleName, entityName, id, props) {
         const config = await this.entityService.resolve(moduleName, entityName);
         this.layout.setNavigationLoading(true);
-        if (config.queries.byKey) {
-            const func = config.queries.byKey.execute;
+        if (config.queries?.byKey) {
+            const func = config.queries?.byKey?.execute;
             const data = await func(id);
             this.layout.setNavigationLoading(false);
             return new AXPEntityMasterUpdateViewModel(this.injector, config, data, props);
@@ -3434,7 +3823,6 @@ class AXPEntityMasterSingleElementViewModel {
                 mode: 'view',
                 path: this.path(),
                 children: widget.children,
-                formula: widget.formula,
                 valueTransforms: widget.valueTransforms,
                 options: merge(schema.interface?.options),
             };
@@ -3616,8 +4004,8 @@ class AXPEntityDetailViewModelFactory {
     async create(moduleName, entityName, id) {
         const config = await this.entityService.resolve(moduleName, entityName);
         this.layout.setNavigationLoading(true);
-        if (config.queries.byKey) {
-            const func = config.queries.byKey.execute;
+        if (config.queries?.byKey) {
+            const func = config.queries?.byKey?.execute;
             const data = await func(id);
             this.layout.setNavigationLoading(false);
             return new AXPEntityMasterSingleViewModel(this.injector, config, data);
@@ -3640,138 +4028,6 @@ const AXPEntityDetailViewModelResolver = (route, state, service = inject(AXPEnti
     return service.create(moduleName, entityName, id);
 };
 
-class AXPEntityStorageService {
-}
-class AXPEntityDataProvider {
-}
-class AXPEntityDataProviderImpl {
-    constructor(storageService, entityName) {
-        this.storageService = storageService;
-        this.entityName = entityName;
-    }
-    async initial(collection) {
-        await this.storageService.initial(this.entityName, collection);
-    }
-    getOne(id) {
-        return this.storageService.getOne(this.entityName, id);
-    }
-    getAll() {
-        return this.storageService.getAll(this.entityName);
-    }
-    query(request) {
-        return this.storageService.query(this.entityName, request);
-    }
-    updateOne(id, keyValues) {
-        return this.storageService.updateOne(this.entityName, id, keyValues);
-    }
-    deleteOne(id) {
-        return this.storageService.deleteOne(this.entityName, id);
-    }
-    insertOne(entity) {
-        return this.storageService.insertOne(this.entityName, entity);
-    }
-}
-class AXMEntityCrudService {
-}
-class AXMEntityCrudServiceImpl {
-    constructor(entityName) {
-        this.entityName = entityName;
-        this._storageService = inject(AXPEntityStorageService);
-        this.entityRegistery = inject(AXPEntityDefinitionRegistryService);
-        this._entityDataProvider = new AXPEntityDataProviderImpl(this._storageService, this.entityName);
-        this._entityCategoryDataProvider = new AXPEntityDataProviderImpl(this._storageService, `${this.entityName}Category`);
-    }
-    async insertOne(request) {
-        return this._entityDataProvider.insertOne(request);
-    }
-    async getOne(id) {
-        return this._entityDataProvider.getOne(id);
-    }
-    async deleteOne(id) {
-        return this._entityDataProvider.deleteOne(id);
-    }
-    async updateOne(id, values) {
-        return this._entityDataProvider.updateOne(id, values);
-    }
-    async query(request = { skip: 0, take: 100 }) {
-        const [moduleName, entityName] = this._entityDataProvider.entityName.split('.');
-        try {
-            const entityRef = await this.entityRegistery.resolve(moduleName, entityName);
-            if (entityRef.parentKey) {
-                if (!request.filter?.filters?.length && request.filter?.field !== entityRef.parentKey) {
-                    request.filter = {
-                        value: true,
-                        field: entityRef.parentKey,
-                        operator: {
-                            type: 'isEmpty',
-                        },
-                    };
-                }
-            }
-        }
-        catch (error) {
-            console.error(error);
-        }
-        return this._entityDataProvider.query(request);
-    }
-    async findOne(filter) {
-        const result = await this._entityDataProvider.query({ filter, skip: 0, take: 1 });
-        return result.items[0];
-    }
-    async getRoots(request) {
-        const queryRequest = {
-            skip: 0,
-            take: 1000,
-            filter: {
-                value: true,
-                field: 'parentId',
-                operator: {
-                    type: 'isEmpty',
-                },
-            },
-        };
-        const result = await this._entityDataProvider.query(queryRequest);
-        return result;
-    }
-    async getChildren(request) {
-        const parentKey = request.parentKey ?? 'parentId';
-        const queryRequest = {
-            skip: 0,
-            take: 1000,
-            filter: {
-                value: request.parentId,
-                field: parentKey,
-                operator: {
-                    type: 'equal',
-                },
-            },
-        };
-        const result = await this._entityDataProvider.query(queryRequest);
-        return result;
-    }
-    async getByCategory(request) {
-        const queryRequest = {
-            skip: 0,
-            take: 1000,
-            filter: {
-                value: request.categoryId,
-                field: request.categoryKey ?? 'categoryIds',
-                operator: {
-                    type: 'contains',
-                },
-            },
-        };
-        const result = await this._entityDataProvider.query(queryRequest);
-        return result;
-    }
-    async getCategoriesList(request = { skip: 0, take: 1000 }) {
-        return this._entityCategoryDataProvider.query(request);
-    }
-    get storageService() {
-        return this._storageService;
-    }
-}
-
 class AXPLayoutAdapterBuilder {
     constructor() {
         this.adapter = {};
@@ -5331,10 +5587,15 @@ const eventDispatchMiddleware = {
     target: { ops: ['create', 'update', 'delete'], order: 90 },
     execute: async (ctx, next) => {
         const dispatcher = inject(AXPEntityEventDispatcherService);
+        const workflowEventService = inject(AXPWorkflowEventService);
         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 });
+            // Dispatch workflow refresh event to trigger entity list refresh
+            workflowEventService.dispatch(AXPRefreshEvent({
+                entity: ctx.entityName,
+            }));
         }
         else if (ctx.op === 'update') {
             await dispatcher.dispatchUpdated(ctx.entityName, {
@@ -5342,10 +5603,18 @@ const eventDispatchMiddleware = {
                 data: ctx.result,
                 changes: ctx.locals.get('changes'),
             });
+            // Dispatch workflow refresh event to trigger entity list refresh
+            workflowEventService.dispatch(AXPRefreshEvent({
+                entity: ctx.entityName,
+            }));
         }
         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 });
+            // Dispatch workflow refresh event to trigger entity list refresh
+            workflowEventService.dispatch(AXPRefreshEvent({
+                entity: ctx.entityName,
+            }));
         }
     },
 };
@@ -5571,10 +5840,72 @@ const createLayoutOrderingMiddlewareProvider = (config = {}, entityName = '*') =
         }),
     };
 };
-/**
- * Default provider registered with the default configuration
- */
-const layoutOrderingMiddlewareProvider = createLayoutOrderingMiddlewareProvider();
+/**
+ * Default provider registered with the default configuration
+ */
+const layoutOrderingMiddlewareProvider = createLayoutOrderingMiddlewareProvider();
+//#endregion
+
+/**
+ * Factory to create a column width middleware using provided config map.
+ * Sets width for columns defined in the map if not already defined on the column.
+ */
+const AXPCrudModifier = {
+    entityName: '*',
+    modifier: (ctx) => {
+        const dataService = new AXMEntityCrudServiceImpl(ctx.module.get() + '.' + ctx.name.get());
+        ctx.commands.update((command) => {
+            if (!command) {
+                command = {};
+            }
+            if (!command?.create) {
+                command.create = {
+                    execute: async (data) => {
+                        const res = await dataService.insertOne(data);
+                        return { id: res };
+                    },
+                };
+            }
+            if (!command?.delete) {
+                command.delete = {
+                    execute: async (id) => {
+                        return await dataService.deleteOne(id);
+                    },
+                };
+            }
+            if (!command?.update) {
+                command.update = {
+                    execute: async (data) => {
+                        return await dataService.updateOne(data.id, data);
+                    },
+                };
+            }
+            return command;
+        });
+        ctx.queries.update((queries) => {
+            if (!queries) {
+                queries = {};
+            }
+            if (!queries?.byKey) {
+                queries.byKey = {
+                    execute: async (id) => {
+                        return await dataService.getOne(id);
+                    },
+                    type: AXPEntityQueryType.Single,
+                };
+            }
+            if (!queries?.list) {
+                queries.list = {
+                    execute: async (e) => {
+                        return await dataService.query(e);
+                    },
+                    type: AXPEntityQueryType.List,
+                };
+            }
+            return queries;
+        });
+    },
+};
 //#endregion
 
 class AXPEntityCommandSearchDefinitionProvider {
@@ -5748,7 +6079,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
 class AXPCategoryTreeService {
     constructor() {
         //#region ----   Services & Dependencies   ----
-        this.entityResolver = inject(AXPEntityResolver);
+        this.entityResolver = inject(AXPEntityDefinitionRegistryService);
         this.translate = inject(AXTranslationService);
     }
     //#endregion
@@ -5766,8 +6097,8 @@ class AXPCategoryTreeService {
             if (!module || !entity) {
                 return null;
             }
-            const categoryEntityDef = await this.entityResolver.get(module, entity);
-            if (!categoryEntityDef?.queries.list?.execute) {
+            const categoryEntityDef = await this.entityResolver.resolve(module, entity);
+            if (!categoryEntityDef?.queries?.list?.execute || typeof categoryEntityDef.queries.list.execute !== 'function') {
                 return null;
             }
             const categoryEntityQueryFunc = categoryEntityDef.queries.list.execute;
@@ -8033,7 +8364,7 @@ class AXPEntityCategoryWidgetColumnComponent extends AXPColumnWidgetComponent {
         //#region ----   Services & Dependencies   ----
         this.entityDetailPopoverService = inject(AXPEntityDetailPopoverService);
         this.formatService = inject(AXFormatService);
-        this.entityResolver = inject(AXPEntityResolver);
+        this.entityResolver = inject(AXPEntityDefinitionRegistryService);
         //#endregion
         //#region ----   Inputs   ----
         this.rawValueSignal = signal(null, ...(ngDevMode ? [{ debugName: "rawValueSignal" }] : []));
@@ -8070,7 +8401,7 @@ class AXPEntityCategoryWidgetColumnComponent extends AXPColumnWidgetComponent {
             if (!module || !entity) {
                 return;
             }
-            this.entityDef.set(await this.entityResolver.get(module, entity));
+            this.entityDef.set(await this.entityResolver.resolve(module, entity));
         }, ...(ngDevMode ? [{ debugName: "efEntity" }] : []));
         this.efDisplay = effect(async () => {
             const value = this.rawValueSignal();
@@ -8162,7 +8493,7 @@ class AXPEntityCategoryWidgetColumnComponent extends AXPColumnWidgetComponent {
         }
         else {
             // If item is just an ID, fetch the full item
-            const byKey = this.entityDef()?.queries.byKey?.execute;
+            const byKey = this.entityDef()?.queries?.byKey?.execute;
             if (byKey) {
                 try {
                     itemObj = await byKey(item);
@@ -8206,7 +8537,7 @@ class AXPEntityCategoryWidgetColumnComponent extends AXPColumnWidgetComponent {
         }
         const valueField = this.valueField();
         const textField = this.displayField();
-        const byKey = this.entityDef()?.queries.byKey?.execute;
+        const byKey = this.entityDef()?.queries?.byKey?.execute;
         if (!byKey) {
             return item;
         }
@@ -8691,7 +9022,7 @@ class AXPEntityCategoryWidgetEditComponent extends AXPValueWidgetComponent {
     constructor() {
         super(...arguments);
         //#region ----   Services & Dependencies   ----
-        this.entityResolver = inject(AXPEntityResolver);
+        this.entityResolver = inject(AXPEntityDefinitionRegistryService);
         this.popupService = inject(AXPopupService);
         this.translateService = inject(AXTranslationService);
         this.cdr = inject(ChangeDetectorRef);
@@ -8734,7 +9065,7 @@ class AXPEntityCategoryWidgetEditComponent extends AXPValueWidgetComponent {
             if (!entityKey)
                 return;
             const [module, entity] = entityKey.split('.');
-            this.entityDef.set(await this.entityResolver.get(module, entity));
+            this.entityDef.set(await this.entityResolver.resolve(module, entity));
         }, ...(ngDevMode ? [{ debugName: "#efEntity" }] : []));
         this.#efValue = effect(() => {
             const value = this.getValue();
@@ -8847,7 +9178,7 @@ class AXPEntityCategoryWidgetEditComponent extends AXPValueWidgetComponent {
         const excludedNodeId = currentEntityId ? String(currentEntityId) : undefined;
         try {
             const result = await this.popupService.open(AXPEntityCategoryTreeSelectorComponent, {
-                title: `${this.translateService.translateSync('@general:widgets.lookup.search')} ${this.translateService.translateSync(this.entityDef()?.formats.plural ?? '')}`,
+                title: `${this.translateService.translateSync('@general:widgets.lookup.search.placeholder')} ${this.translateService.translateSync(this.entityDef()?.formats.plural ?? '')}`,
                 size: 'md',
                 data: {
                     entityKey: signal(this.entity()),
@@ -8925,7 +9256,7 @@ class AXPEntityCategoryWidgetEditComponent extends AXPValueWidgetComponent {
             return;
         }
         const values = castArray(rawValue);
-        const byKey = this.entityDef()?.queries.byKey?.execute;
+        const byKey = this.entityDef()?.queries?.byKey?.execute;
         if (!byKey) {
             this.setItems([]);
             this.isLoading.set(false);
@@ -9092,7 +9423,7 @@ class AXPEntityCategoryWidgetEditComponent extends AXPValueWidgetComponent {
         }
         const valueField = this.valueField();
         const textField = this.displayField();
-        const byKey = this.entityDef()?.queries.byKey?.execute;
+        const byKey = this.entityDef()?.queries?.byKey?.execute;
         if (!byKey) {
             return item;
         }
@@ -9266,7 +9597,7 @@ class AXPEntityCategoryWidgetViewComponent extends AXPValueWidgetComponent {
         super(...arguments);
         //#region ----   Services & Dependencies   ----
         this.formatService = inject(AXFormatService);
-        this.entityResolver = inject(AXPEntityResolver);
+        this.entityResolver = inject(AXPEntityDefinitionRegistryService);
         //#endregion
         //#region ----   Computed Properties   ----
         this.entity = computed(() => this.options()['entity'] ?? '', ...(ngDevMode ? [{ debugName: "entity" }] : []));
@@ -9296,7 +9627,7 @@ class AXPEntityCategoryWidgetViewComponent extends AXPValueWidgetComponent {
             if (!module || !entity) {
                 return;
             }
-            this.entityDef.set(await this.entityResolver.get(module, entity));
+            this.entityDef.set(await this.entityResolver.resolve(module, entity));
         }, ...(ngDevMode ? [{ debugName: "efEntity" }] : []));
         this.efDisplay = effect(async () => {
             const value = this.getValue();
@@ -9319,7 +9650,7 @@ class AXPEntityCategoryWidgetViewComponent extends AXPValueWidgetComponent {
             };
         }
         const def = this.entityDef();
-        const byKey = def?.queries.byKey?.execute;
+        const byKey = def?.queries?.byKey?.execute;
         if (byKey) {
             this.loading.set(true);
             try {
@@ -9619,12 +9950,12 @@ class AXPEntityListTableService {
     createDataSource(entity) {
         return new AXDataSource({
             byKey: (key) => {
-                const func = entity.queries.byKey.execute;
+                const func = entity.queries?.byKey?.execute;
                 return func(key);
             },
             load: (e) => {
-                const func = entity.queries.list?.execute;
-                if (!func) {
+                const func = entity.queries?.list?.execute;
+                if (!func || typeof func !== 'function') {
                     throw new Error(`Entity ${entity.name} does not have a list query`);
                 }
                 return func(e);
@@ -9704,7 +10035,6 @@ class AXPEntityListTableService {
             options: options,
             metadata: action?.metadata,
         });
-        console.log('Entity List - Row command:', e.name, e.data);
     }
     /**
      * Create default events
@@ -10286,7 +10616,7 @@ 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", "closeParentOnClick", "lockOnLoading"], outputs: ["onItemClick"] }, { kind: "ngmodule", type: AXDropdownModule }, { kind: "component", type: i4$3.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", "onLoad"], 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$3.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.12", ngImport: i0, type: AXPEntityListWidgetViewComponent, decorators: [{
             type: Component,
@@ -10451,144 +10781,6 @@ const AXPEntityListWidget = {
     },
 };
 
-class AXPEntityReferenceWidgetViewComponent extends AXPLayoutBaseWidgetComponent {
-    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.12", ngImport: i0, type: AXPEntityReferenceWidgetViewComponent, decorators: [{
-            type: Component,
-            args: [{
-                    template: ``,
-                    standalone: true,
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [CommonModule],
-                }]
-        }] });
-
-var entityReferenceWidgetView_component = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPEntityReferenceWidgetViewComponent: AXPEntityReferenceWidgetViewComponent
-});
-
-class AXPEntityReferenceWidgetEditComponent extends AXPLayoutBaseWidgetComponent {
-    constructor() {
-        super(...arguments);
-        this.injector = inject(Injector);
-        this.entityResolver = inject(AXPEntityResolver);
-        this.entity = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entity" }] : []));
-        this.entityDef = signal(null, ...(ngDevMode ? [{ debugName: "entityDef" }] : []));
-        this.#efEntity = effect(async () => {
-            const [module, entity] = this.entity().split('.');
-            this.entityDef.set(await this.entityResolver.get(module, entity));
-            console.log(this.entityDef());
-        }, ...(ngDevMode ? [{ debugName: "#efEntity" }] : []));
-    }
-    #efEntity;
-    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.12", ngImport: i0, type: AXPEntityReferenceWidgetEditComponent, decorators: [{
-            type: Component,
-            args: [{
-                    template: ``,
-                    standalone: true,
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [CommonModule, FormsModule],
-                }]
-        }] });
-
-var entityReferenceWidgetEdit_component = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPEntityReferenceWidgetEditComponent: AXPEntityReferenceWidgetEditComponent
-});
-
-class AXPEntityReferenceWidgetColumnComponent extends AXPColumnWidgetComponent {
-    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.12", ngImport: i0, type: AXPEntityReferenceWidgetColumnComponent, decorators: [{
-            type: Component,
-            args: [{
-                    template: `{{rawValue}}`,
-                    standalone: true,
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [CommonModule],
-                    inputs: ['rawValue']
-                }]
-        }] });
-
-var entityReferenceWidgetColumn_component = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPEntityReferenceWidgetColumnComponent: AXPEntityReferenceWidgetColumnComponent
-});
-
-class AXPEntityReferenceWidgetPrintComponent extends AXPLayoutBaseWidgetComponent {
-    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.12", ngImport: i0, type: AXPEntityReferenceWidgetPrintComponent, decorators: [{
-            type: Component,
-            args: [{
-                    template: ``,
-                    standalone: true,
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [CommonModule],
-                    inputs: [],
-                }]
-        }] });
-
-var entityReferenceWidgetPrint_component = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPEntityReferenceWidgetPrintComponent: AXPEntityReferenceWidgetPrintComponent
-});
-
-class AXPEntityReferenceWidgetDesignerComponent extends AXPLayoutBaseWidgetComponent {
-    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.12", ngImport: i0, type: AXPEntityReferenceWidgetDesignerComponent, decorators: [{
-            type: Component,
-            args: [{
-                    template: ``,
-                    standalone: true,
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [CommonModule],
-                }]
-        }] });
-
-var entityReferenceWidgetDesigner_component = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPEntityReferenceWidgetDesignerComponent: AXPEntityReferenceWidgetDesignerComponent
-});
-
-const AXPEntityReferenceWidget = {
-    name: 'entity-reference',
-    title: 'Entity Reference',
-    description: '',
-    type: 'view',
-    categories: [],
-    groups: [AXPWidgetGroupEnum.EntityWidget],
-    icon: 'fa-solid fa-square',
-    properties: [AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY],
-    components: {
-        view: {
-            component: () => Promise.resolve().then(function () { return entityReferenceWidgetView_component; }).then((c) => c.AXPEntityReferenceWidgetViewComponent),
-        },
-        edit: {
-            component: () => Promise.resolve().then(function () { return entityReferenceWidgetEdit_component; }).then((c) => c.AXPEntityReferenceWidgetEditComponent),
-        },
-        column: {
-            component: () => Promise.resolve().then(function () { return entityReferenceWidgetColumn_component; }).then((c) => c.AXPEntityReferenceWidgetColumnComponent),
-        },
-        print: {
-            component: () => Promise.resolve().then(function () { return entityReferenceWidgetPrint_component; }).then((c) => c.AXPEntityReferenceWidgetPrintComponent),
-        },
-        designer: {
-            component: () => Promise.resolve().then(function () { return entityReferenceWidgetDesigner_component; }).then((c) => c.AXPEntityReferenceWidgetDesignerComponent),
-        },
-    },
-};
-
 class AXPLookupFilterWidgetEditComponent extends AXPValueWidgetComponent {
     constructor() {
         super(...arguments);
@@ -10717,7 +10909,7 @@ class AXPLookupFilterWidgetEditComponent extends AXPValueWidgetComponent {
       [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 }); }
+  `, 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", "onLoad"], exportAs: ["widgetRenderer"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLookupFilterWidgetEditComponent, decorators: [{
             type: Component,
@@ -10769,7 +10961,7 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
     constructor() {
         super(...arguments);
         this.formatService = inject(AXFormatService);
-        this.entityResolver = inject(AXPEntityResolver);
+        this.entityResolver = inject(AXPEntityDefinitionRegistryService);
         this.entity = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entity" }] : []));
         this.multiple = computed(() => this.options()['multiple'], ...(ngDevMode ? [{ debugName: "multiple" }] : []));
         this.valueField = computed(() => this.options()['valueField'] ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : []));
@@ -10787,7 +10979,7 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
         this.displayItems = signal([], ...(ngDevMode ? [{ debugName: "displayItems" }] : []));
         this.efEntity = effect(async () => {
             const [module, entity] = this.entity().split('.');
-            this.entityDef.set(await this.entityResolver.get(module, entity));
+            this.entityDef.set(await this.entityResolver.resolve(module, entity));
         }, ...(ngDevMode ? [{ debugName: "efEntity" }] : []));
         this.efDisplay = effect(async () => {
             const value = this.getValue();
@@ -10808,7 +11000,7 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
             };
         }
         const def = this.entityDef();
-        const byKey = def?.queries.byKey?.execute;
+        const byKey = def?.queries?.byKey?.execute;
         if (byKey) {
             this.loading.set(true);
             const fetchedItem = await byKey(item);
@@ -10824,6 +11016,9 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
         };
     }
     getDisplayText(item) {
+        if (!item) {
+            return '';
+        }
         const template = this.displayFormat();
         if (template) {
             const formatted = this.formatService.format(template, 'string', item);
@@ -10831,7 +11026,7 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
                 return formatted;
             }
         }
-        return this.formatService.format(this.displayField(), 'string', item);
+        return get(item, this.displayField()) ?? '';
     }
     get __class() {
         const cls = {};
@@ -10949,6 +11144,7 @@ class AXPEntityDataSelectorService {
             parentField: options.entity.parentKey,
             filters: options.filters || undefined,
             allowCreate: options.allowCreate ?? this.canCreate(options.entity),
+            selectedItemIds: options.selectedItemIds,
             // Note: Custom filters will be applied to the dataSource in createDataSource
         };
     }
@@ -10959,11 +11155,14 @@ class AXPEntityDataSelectorService {
         const { entity, filters, parentFilters } = options;
         return new AXDataSource({
             byKey: (key) => {
-                const func = entity.queries.byKey.execute;
-                return func();
+                const func = entity.queries?.byKey?.execute;
+                return func(key);
             },
             load: (e) => {
-                const func = entity.queries.list?.execute;
+                const func = entity.queries?.list?.execute;
+                if (!func || typeof func !== 'function') {
+                    throw new Error(`Entity ${entity.name} does not have a list query`);
+                }
                 this.mergeFilters(e, filters, parentFilters);
                 return func(e);
             },
@@ -11097,7 +11296,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     constructor() {
         super(...arguments);
         this.injector = inject(Injector);
-        this.entityResolver = inject(AXPEntityResolver);
+        this.entityResolver = inject(AXPEntityDefinitionRegistryService);
         this.formatService = inject(AXFormatService);
         this.popupService = inject(AXPopupService);
         this.entityDataSelectorService = inject(AXPEntityDataSelectorService);
@@ -11116,7 +11315,13 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.look = computed(() => this.options()['look'] ?? 'lookup', ...(ngDevMode ? [{ debugName: "look" }] : []));
         this.allowClear = computed(() => (this.options()['allowClear'] ?? false), ...(ngDevMode ? [{ debugName: "allowClear" }] : []));
         this.defaultTextField = computed(() => {
-            const textField = this.entityDef()?.formats.lookup ?? this.entityDef()?.properties.find((c) => c.name != 'id')?.name ?? 'title';
+            const list = [
+                'title',
+                'name',
+                'code',
+                'description',
+            ];
+            const textField = list.find((c) => this.entityDef()?.properties.find((p) => p.name == c)) ?? 'title';
             return textField;
         }, ...(ngDevMode ? [{ debugName: "defaultTextField" }] : []));
         this.displayField = computed(() => {
@@ -11136,18 +11341,44 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             return template ? template.replace(/\{/g, '{{').replace(/\}/g, '}}') : undefined;
         }, ...(ngDevMode ? [{ debugName: "displayFormat" }] : []));
         this.entityDef = signal(null, ...(ngDevMode ? [{ debugName: "entityDef" }] : []));
+        /**
+         * Get default sort order from entity's first list view
+         */
+        this.defaultSorts = computed(() => {
+            const entity = this.entityDef();
+            if (!entity)
+                return [];
+            // Get the first view from the list views (usually the "all" view)
+            const firstView = entity.interfaces?.master?.list?.views?.[0];
+            if (!firstView?.sorts || firstView.sorts.length === 0) {
+                return [];
+            }
+            // Convert AXPQuerySort[] (with 'name') to AXDataSourceSortOption[] (with 'field')
+            return firstView.sorts.map((sort) => ({
+                field: sort.name,
+                dir: sort.dir,
+            }));
+        }, ...(ngDevMode ? [{ debugName: "defaultSorts" }] : []));
         this.dataSource = computed(() => {
             const entity = this.entityDef();
             if (!entity)
                 return null;
+            const defaultSorts = this.defaultSorts();
             return new AXDataSource({
                 byKey: (key) => {
-                    const func = entity.queries.byKey.execute;
+                    const func = entity.queries?.byKey?.execute;
                     return func();
                 },
                 load: (e) => {
-                    const func = entity.queries.list?.execute;
+                    const func = entity.queries?.list?.execute;
+                    if (!func || typeof func !== 'function') {
+                        throw new Error(`Entity ${entity.name} does not have a list query`);
+                    }
                     this.mergeFilter(e, this.customFilter());
+                    // Apply default sort order if no sort is already specified
+                    if (defaultSorts.length > 0 && (!e.sort || e.sort.length === 0)) {
+                        e.sort = defaultSorts;
+                    }
                     return func(e);
                 },
                 pageSize: 10,
@@ -11155,7 +11386,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             });
         }, ...(ngDevMode ? [{ debugName: "dataSource" }] : []));
         this.searchTerm = signal(null, ...(ngDevMode ? [{ debugName: "searchTerm" }] : []));
-        this.searchPlaceholderText = signal('', ...(ngDevMode ? [{ debugName: "searchPlaceholderText" }] : []));
+        // protected searchPlaceholderText = signal<string>('');
         this.selectedItems = signal([], ...(ngDevMode ? [{ debugName: "selectedItems" }] : []));
         this.textbox = viewChild(AXTagBoxComponent, ...(ngDevMode ? [{ debugName: "textbox" }] : []));
         this.isLoading = signal(false, ...(ngDevMode ? [{ debugName: "isLoading" }] : []));
@@ -11163,7 +11394,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.placeholderUpdateToken = 0;
         this.#efEntity = effect(async () => {
             const [module, entity] = this.entity().split('.');
-            this.entityDef.set(await this.entityResolver.get(module, entity));
+            this.entityDef.set(await this.entityResolver.resolve(module, entity));
         }, ...(ngDevMode ? [{ debugName: "#efEntity" }] : []));
         this.#efValue = effect(() => {
             if (this.getValue()) {
@@ -11173,32 +11404,6 @@ 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
@@ -11242,21 +11447,31 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     }
     #efEntity;
     #efValue;
-    #efSearchPlaceholder;
     async findByValue() {
         this.isLoading.set(true);
         const rawValue = this.getValue();
-        const values = castArray(rawValue);
-        const byKey = this.entityDef()?.queries.byKey?.execute;
+        // When multiple is true, ensure we always work with arrays
+        const values = this.multiple() ? castArray(rawValue) : [rawValue].filter(v => v != null);
+        const byKey = this.entityDef()?.queries?.byKey?.execute;
         if (byKey && values.length) {
             if (this.multiple()) {
-                const items = await Promise.all(values.map((value) => byKey(extractValue(value, this.valueField()))));
-                this.setItems(items);
+                const items = await Promise.all(values
+                    .map((value) => extractValue(value, this.valueField()))
+                    .filter(id => id != null)
+                    .map((id) => byKey(id)));
+                // Filter out null/undefined results
+                const validItems = items.filter(item => item != null);
+                this.setItems(validItems);
             }
             else {
                 const id = extractValue(values[0], this.valueField());
-                const item = await byKey(id);
-                this.setItems(item);
+                if (id != null) {
+                    const item = await byKey(id);
+                    this.setItems(item != null ? [item] : []);
+                }
+                else {
+                    this.setItems([]);
+                }
             }
         }
         else {
@@ -11271,6 +11486,10 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.isOpen.set(true);
         const inlineSearchValue = (this.searchTerm() ?? '').trim();
         const initialSearchTerm = inlineSearchValue.length > 0 ? inlineSearchValue : undefined;
+        // Extract current selected item IDs to pre-select them in the data selector
+        const selectedItemIds = this.selectedItems()
+            .map((item) => get(item, this.valueField()))
+            .filter((id) => id != null);
         try {
             const result = await this.entityDataSelectorService.open({
                 entity: this.entityDef(),
@@ -11281,9 +11500,23 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                 columns: this.columns(),
                 allowCreate: true,
                 initialSearchTerm,
+                selectedItemIds: selectedItemIds.length > 0 ? selectedItemIds : undefined,
             });
             if (result && 'items' in result) {
-                this.setItems(result.items);
+                // If selectedItemIds was provided, the selector returns the final selection
+                // (all currently selected items, including kept initial items and newly added items)
+                // In this case, we should REPLACE the selection (not merge)
+                // Otherwise, if no selectedItemIds, merge with existing items when multiple is true
+                const hadInitialSelection = selectedItemIds && selectedItemIds.length > 0;
+                if (hadInitialSelection) {
+                    // Replace the selection with the final selection from the selector
+                    this.setItems(result.items, false); // false = replace, not merge
+                }
+                else {
+                    // No initial selection, normal merge behavior
+                    const shouldMerge = this.multiple() && this.selectedItems().length > 0;
+                    this.setItems(result.items, shouldMerge);
+                }
             }
         }
         catch (error) {
@@ -11328,7 +11561,9 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             this.isLoading.set(true);
             const result = await this.searchByValue(value);
             if (result?.total == 1) {
-                this.setItems(result.items[0]);
+                // When multiple is true, merge with existing items
+                const shouldMerge = this.multiple() && this.selectedItems().length > 0;
+                this.setItems(result.items[0], shouldMerge);
             }
             else {
                 this.showSelector();
@@ -11339,13 +11574,27 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             this.showSelector();
         }
     }
-    setItems(items) {
-        if (!items || items.length == 0) {
-            this.selectedItems.set([]);
+    setItems(items, mergeWithExisting = false) {
+        // Ensure items is always an array
+        items = castArray(items);
+        // Filter out null/undefined items
+        items = items.filter(item => item != null);
+        if (items.length == 0) {
+            if (!mergeWithExisting) {
+                this.selectedItems.set([]);
+            }
             return;
         }
-        //
-        items = castArray(items);
+        // If merging and multiple is enabled, combine with existing items
+        if (mergeWithExisting && this.multiple()) {
+            const existingItems = this.selectedItems();
+            const existingKeys = new Set(existingItems.map((item) => get(item, this.valueField())));
+            const newItems = items.filter((item) => {
+                const key = get(item, this.valueField());
+                return !existingKeys.has(key);
+            });
+            items = [...existingItems, ...newItems];
+        }
         this.clearInput();
         this.selectedItems.set(items);
         //
@@ -11407,39 +11656,6 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
         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;
@@ -11460,7 +11676,10 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                 });
             });
         }
-        const func = entity.queries.list?.execute;
+        const func = entity.queries?.list?.execute;
+        if (!func || typeof func !== 'function') {
+            throw new Error(`Entity ${entity.name} does not have a list query`);
+        }
         return await func({ filter: inlineFilters, take: 10 });
     }
     mergeFilter(request, filter) {
@@ -11499,6 +11718,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
       @if (look() == 'select') {
         <ax-select-box
           #selectBox
+          [placeholder]="('@general:widgets.lookup.placeholder' | translate | async)!"
           [dataSource]="dataSource()!"
           [ngModel]="selectedItems()"
           [textField]="displayField()"
@@ -11511,7 +11731,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             <ax-clear-button></ax-clear-button>
           }
           <ax-search-box
-            [placeholder]="selectedItems().length ? '' : searchPlaceholderText()"
+            [placeholder]="('@general:widgets.lookup.search.placeholder' | translate | async)!"
             (onValueChanged)="handleSearchInputChange($event)"
           >
             <ax-clear-button></ax-clear-button>
@@ -11535,7 +11755,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
           [textField]="displayField()"
           [valueField]="valueField()"
           (onValueChanged)="handleValueChange($event)"
-          [placeholder]="selectedItems().length ? '' : searchPlaceholderText()"
+          [placeholder]="selectedItems().length ? '' : ('@general:widgets.lookup.placeholder' | translate | async)!"
           [addOnEnter]="false"
           [addOnComma]="false"
           [disabled]="disabled()"
@@ -11580,7 +11800,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     }
   `, 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$2.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 }); }
+                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$2.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"] }, { 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.12", ngImport: i0, type: AXPLookupWidgetEditComponent, decorators: [{
             type: Component,
@@ -11591,6 +11811,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
       @if (look() == 'select') {
         <ax-select-box
           #selectBox
+          [placeholder]="('@general:widgets.lookup.placeholder' | translate | async)!"
           [dataSource]="dataSource()!"
           [ngModel]="selectedItems()"
           [textField]="displayField()"
@@ -11603,7 +11824,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
             <ax-clear-button></ax-clear-button>
           }
           <ax-search-box
-            [placeholder]="selectedItems().length ? '' : searchPlaceholderText()"
+            [placeholder]="('@general:widgets.lookup.search.placeholder' | translate | async)!"
             (onValueChanged)="handleSearchInputChange($event)"
           >
             <ax-clear-button></ax-clear-button>
@@ -11627,7 +11848,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
           [textField]="displayField()"
           [valueField]="valueField()"
           (onValueChanged)="handleValueChange($event)"
-          [placeholder]="selectedItems().length ? '' : searchPlaceholderText()"
+          [placeholder]="selectedItems().length ? '' : ('@general:widgets.lookup.placeholder' | translate | async)!"
           [addOnEnter]="false"
           [addOnComma]="false"
           [disabled]="disabled()"
@@ -11716,6 +11937,9 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
             const template = this.options['displayFormat'];
             return template ? template.replace(/\{/g, '{{').replace(/\}/g, '}}') : undefined;
         }, ...(ngDevMode ? [{ debugName: "displayFormat" }] : []));
+        this.displayField = computed(() => {
+            return this.textField ?? 'title';
+        }, ...(ngDevMode ? [{ debugName: "displayField" }] : []));
         //#endregion
         //#region ----   Signals   ----
         this.isMorePopoverOpen = signal(false, ...(ngDevMode ? [{ debugName: "isMorePopoverOpen" }] : []));
@@ -11805,7 +12029,7 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
                 return formatted;
             }
         }
-        return item?.[this.textField] ?? '';
+        return get(item, this.displayField()) ?? '';
     }
     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 }); }
@@ -11892,153 +12116,6 @@ const AXPLookupWidget = {
     },
 };
 
-class AXPWidgetSelectorWidgetEditComponent extends AXPValueWidgetComponent {
-    constructor() {
-        super(...arguments);
-        this.popupService = inject(AXPopupService);
-        this.widgetRegisteryService = inject(AXPWidgetRegistryService);
-        this.searchTerm = signal(null, ...(ngDevMode ? [{ debugName: "searchTerm" }] : []));
-        this.isOpen = signal(false, ...(ngDevMode ? [{ debugName: "isOpen" }] : []));
-        this.textField = signal('', ...(ngDevMode ? [{ debugName: "textField" }] : []));
-        this.displayText = computed(() => this.getValue()?.title || '', ...(ngDevMode ? [{ debugName: "displayText" }] : []));
-        this.selectedWidgetNode = signal(null, ...(ngDevMode ? [{ debugName: "selectedWidgetNode" }] : []));
-        this.selectedItem = signal(null, ...(ngDevMode ? [{ debugName: "selectedItem" }] : []));
-        this.placeholder = computed(() => this.options()['placeholder'] ?? '', ...(ngDevMode ? [{ debugName: "placeholder" }] : []));
-        this.loading = computed(() => this.options()['loading'] ?? false, ...(ngDevMode ? [{ debugName: "loading" }] : []));
-    }
-    ngAfterViewInit() {
-        if (this.getValue()) {
-            this.selectedWidgetNode.set(this.getValue());
-        }
-    }
-    async showSelector() {
-        const com = await import('@acorex/platform/layout/designer').then((c) => c.AXPDesignerWidgetPickerComponent);
-        const result = await this.popupService.open(com, {
-            title: 'Widget Gallery',
-            size: 'md',
-            closeButton: true,
-            data: {
-                widgets: sortBy(this.widgetRegisteryService.all(), (c) => c.title),
-            },
-        });
-        if ((result.data?.widgets ?? []).length) {
-            const selected = result.data?.widgets;
-            const selectedNode = this.convertWidgetConfigToNode(selected[0]);
-            this.selectedWidgetNode.set(selectedNode);
-        }
-    }
-    convertWidgetConfigToNode(config) {
-        return {
-            type: config.name,
-        };
-    }
-    handleChangeWidget(e) {
-        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.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
-        [rule]="validation.rule"
-        [message]="validation.options?.message"
-        [options]="validation.options"
-      ></ax-validation-rule>
-      }
-      <ax-suffix>
-        <ax-button color="ghost" look="twotone" (onClick)="showSelector()">
-          <ax-icon icon="far fa-search"> </ax-icon>
-        </ax-button>
-      </ax-suffix>
-    </ax-text-box>
-    @if(selectedWidgetNode()){
-    <axp-widget-property-viewer [widget]="selectedWidgetNode()!" (onChanged)="handleChangeWidget($event)">
-    </axp-widget-property-viewer>
-    }
-  `, 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$3.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$2.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.12", ngImport: i0, type: AXPWidgetSelectorWidgetEditComponent, decorators: [{
-            type: Component,
-            args: [{
-                    template: `
-    <ax-text-box [ngModel]="displayText()" [placeholder]="placeholder()" [readonly]="true">
-      @for (validation of validationRules(); track $index) {
-      <ax-validation-rule
-        [rule]="validation.rule"
-        [message]="validation.options?.message"
-        [options]="validation.options"
-      ></ax-validation-rule>
-      }
-      <ax-suffix>
-        <ax-button color="ghost" look="twotone" (onClick)="showSelector()">
-          <ax-icon icon="far fa-search"> </ax-icon>
-        </ax-button>
-      </ax-suffix>
-    </ax-text-box>
-    @if(selectedWidgetNode()){
-    <axp-widget-property-viewer [widget]="selectedWidgetNode()!" (onChanged)="handleChangeWidget($event)">
-    </axp-widget-property-viewer>
-    }
-  `,
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [
-                        FormsModule,
-                        AXSelectBoxModule,
-                        AXTextBoxModule,
-                        AXButtonModule,
-                        AXDecoratorModule,
-                        AXLoadingModule,
-                        AXValidationModule,
-                        AXFormModule,
-                        AXPWidgetPropertyViewerComponent
-                    ]
-                }]
-        }], propDecorators: { textbox: [{
-                type: ViewChild,
-                args: [AXTextBoxComponent]
-            }] } });
-
-var widgetSelectorWidgetEdit_component = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPWidgetSelectorWidgetEditComponent: AXPWidgetSelectorWidgetEditComponent
-});
-
-class AXPWidgetSelectorWidgetViewComponent extends AXPValueWidgetComponent {
-    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.12", ngImport: i0, type: AXPWidgetSelectorWidgetViewComponent, decorators: [{
-            type: Component,
-            args: [{
-                    template: `{{ getValue()?.title }}`,
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: []
-                }]
-        }] });
-
-var widgetSelectorWidgetView_component = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPWidgetSelectorWidgetViewComponent: AXPWidgetSelectorWidgetViewComponent
-});
-
-const AXPWidgetSelectorWidget = {
-    name: 'widget-selector',
-    title: 'Widget Selector',
-    categories: AXP_WIDGETS_EDITOR_CATEGORY,
-    type: 'editor',
-    icon: 'fa-light fa-square',
-    properties: [AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DISABLED_PROPERTY],
-    components: {
-        view: {
-            component: () => Promise.resolve().then(function () { return widgetSelectorWidgetView_component; }).then((c) => c.AXPWidgetSelectorWidgetViewComponent),
-        },
-        edit: {
-            component: () => Promise.resolve().then(function () { return widgetSelectorWidgetEdit_component; }).then((c) => c.AXPWidgetSelectorWidgetEditComponent),
-        },
-    },
-};
-
 const AXPEntityCreateEvent = createWorkFlowEvent('[Entity] Created!');
 class AXPEntityCreatePopupAction extends AXPWorkflowAction {
     constructor() {
@@ -12463,20 +12540,8 @@ function routesFacory() {
     return routes;
 }
 class AXPEntityModule {
-    constructor(appInitService, injector) {
-        const service = injector.get(AXPEntityDefinitionRegistryService);
-        appInitService.registerTask({
-            name: 'layout-theme',
-            statusText: 'Preload entities ...',
-            priority: 100,
-            run: async () => {
-                // load in background
-                service.preload();
-            },
-        });
-    }
-    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$4.AXPWorkflowModule, i3$1.AXPWidgetCoreModule] }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModule, imports: [RouterModule, i1$1.AXPWorkflowModule, i3$1.AXPWidgetCoreModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModule, providers: [
             {
                 provide: ROUTES,
@@ -12500,6 +12565,11 @@ class AXPEntityModule {
                 useValue: columnWidthMiddlewareProvider,
                 multi: true,
             },
+            {
+                provide: AXP_ENTITY_MODIFIER,
+                useValue: AXPCrudModifier,
+                multi: true,
+            },
             // {
             //   provide: AXP_ENTITY_MODIFIER,
             //   useValue: layoutOrderingMiddlewareProvider,
@@ -12558,14 +12628,7 @@ class AXPEntityModule {
                 functions: {},
             }),
             AXPWidgetCoreModule.forChild({
-                widgets: [
-                    AXPLookupWidget,
-                    AXPLookupFilterWidget,
-                    AXPWidgetSelectorWidget,
-                    AXPEntityListWidget,
-                    AXPEntityReferenceWidget,
-                    AXPEntityCategoryWidget,
-                ],
+                widgets: [AXPLookupWidget, AXPLookupFilterWidget, AXPEntityListWidget, AXPEntityCategoryWidget],
             })] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPEntityModule, decorators: [{
@@ -12601,14 +12664,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
                             functions: {},
                         }),
                         AXPWidgetCoreModule.forChild({
-                            widgets: [
-                                AXPLookupWidget,
-                                AXPLookupFilterWidget,
-                                AXPWidgetSelectorWidget,
-                                AXPEntityListWidget,
-                                AXPEntityReferenceWidget,
-                                AXPEntityCategoryWidget,
-                            ],
+                            widgets: [AXPLookupWidget, AXPLookupFilterWidget, AXPEntityListWidget, AXPEntityCategoryWidget],
                         }),
                     ],
                     exports: [],
@@ -12636,6 +12692,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
                             useValue: columnWidthMiddlewareProvider,
                             multi: true,
                         },
+                        {
+                            provide: AXP_ENTITY_MODIFIER,
+                            useValue: AXPCrudModifier,
+                            multi: true,
+                        },
                         // {
                         //   provide: AXP_ENTITY_MODIFIER,
                         //   useValue: layoutOrderingMiddlewareProvider,
@@ -12667,7 +12728,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
                         ]),
                     ],
                 }]
-        }], ctorParameters: () => [{ type: i1$1.AXPAppStartUpService }, { type: i0.Injector }] });
+        }] });
 
 //#endregion
 //#region ----   Get Entity Details Query   ----
@@ -12890,8 +12951,25 @@ function entityOverrideDetailsViewAction() {
         scope: AXPEntityCommandScope.Individual,
     };
 }
-function entityDetailsCrudActions(parentId) {
-    return [entityDetailsCreateActions(parentId), entityDetailsEditAction(), entityOverrideDetailsViewAction()];
+function entityDetailsCrudActions(parentId, options) {
+    const opts = {
+        create: true,
+        delete: true,
+        view: true,
+        edit: true,
+        ...options,
+    };
+    const actions = [];
+    if (opts.create) {
+        actions.push(entityDetailsCreateActions(parentId));
+    }
+    if (opts.edit) {
+        actions.push(entityDetailsEditAction());
+    }
+    if (opts.view) {
+        actions.push(entityOverrideDetailsViewAction());
+    }
+    return actions;
 }
 function entityDetailsReferenceCreateActions(type) {
     return [
@@ -12957,5 +13035,5 @@ function detectEntityChanges(oldObj, newObj) {
  * Generated bundle index. Do not edit.
  */
 
-export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, 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, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, 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, cloneLayoutArrays, columnWidthMiddlewareFactory, columnWidthMiddlewareProvider, createColumnWidthMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider };
+export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListTableService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPGetEntityDetailsQuery, AXPLookupFilterWidget, AXPLookupFilterWidgetEditComponent, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, 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, EntityBuilder, EntityDataAccessor, actionExists, cloneLayoutArrays, columnWidthMiddlewareFactory, columnWidthMiddlewareProvider, createColumnWidthMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider };
 //# sourceMappingURL=acorex-platform-layout-entity.mjs.map