@acorex/platform 20.2.4-next.9 → 20.3.0-next.1

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

@@ -1,20 +1,19 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, Injectable, computed, signal, Injector, runInInjectionContext, EnvironmentInjector, viewChild, viewChildren, linkedSignal, effect, untracked, ChangeDetectionStrategy, Component, HostBinding, ViewChild, NgModule } from '@angular/core';
+import { InjectionToken, inject, Injectable, computed, signal, Injector, EnvironmentInjector, runInInjectionContext, makeEnvironmentProviders, effect, HostBinding, ChangeDetectionStrategy, Component, viewChild, ViewChild, NgModule } from '@angular/core';
 import { castArray, get, cloneDeep, set, merge, isNil, isEmpty, sortBy } from 'lodash-es';
 import * as i1$2 from '@acorex/cdk/common';
 import { AXDataSource, AXCommonModule } from '@acorex/cdk/common';
 import { AXFormatService } from '@acorex/core/format';
-import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingService, AXPRefreshEvent, AXPReloadEvent, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
+import { resolveActionLook, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPSettingService, AXPRefreshEvent, AXPLockService, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
 import * as i1$4 from '@acorex/platform/core';
-import { AXPExpressionEvaluatorService, AXPPlatformScope, AXPDistributedEventListenerService, getChangedPaths, extractValue, setSmart } from '@acorex/platform/core';
+import { AXPExpressionEvaluatorService, AXPPlatformScope, extractValue, setSmart } from '@acorex/platform/core';
 import * as i2$2 from '@acorex/platform/workflow';
 import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
-import * as i2 from '@acorex/platform/layout/builder';
-import { AXPPageStatus, AXPWidgetRegistryService, AXPWidgetsCatalog, AXPValueWidgetComponent, AXPWidgetRendererDirective, AXPLayoutBuilderModule, AXPWidgetGroupEnum, AXPLayoutBaseWidgetComponent, AXPColumnWidgetComponent, AXP_WIDGETS_EDITOR_CATEGORY } from '@acorex/platform/layout/builder';
+import * as i6 from '@acorex/platform/layout/builder';
+import { AXPPageStatus, AXPWidgetRegistryService, AXPValueWidgetComponent, AXPLayoutBuilderModule, AXPColumnWidgetComponent, AXPWidgetsCatalog, AXPWidgetGroupEnum, AXP_WIDGETS_EDITOR_CATEGORY, AXPLayoutWidgetComponent } from '@acorex/platform/layout/builder';
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
-import { Subject, takeUntil } from 'rxjs';
 import { AXPSessionService, AXPAuthGuard } from '@acorex/platform/auth';
-import { AXPCommandService } from '@acorex/platform/runtime';
+import { Subject, takeUntil } from 'rxjs';
 import * as i8 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
 import { AXDialogService } from '@acorex/components/dialog';
@@ -22,38 +21,35 @@ import { AXLoadingDialogService } from '@acorex/components/loading-dialog';
 import { AXPopupService } from '@acorex/components/popup';
 import { AXPlatform } from '@acorex/core/platform';
 import { RouterModule, ROUTES } from '@angular/router';
-import * as i3$1 from '@acorex/components/button';
-import { AXButtonModule } from '@acorex/components/button';
-import * as i3 from '@acorex/components/decorators';
-import { AXDecoratorModule } from '@acorex/components/decorators';
-import * as i4 from '@acorex/components/dropdown';
-import { AXDropdownModule } from '@acorex/components/dropdown';
-import * as i7 from '@angular/common';
-import { CommonModule } from '@angular/common';
-import { AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DISABLED_PROPERTY, AXP_ALLOW_CLEAR_PROPERTY, AXP_DATA_PROPERTY_GROUP, AXP_ALLOW_MULTIPLE_PROPERTY, AXPFileUploaderWidgetService } from '@acorex/platform/widgets';
-import * as i1$3 from '@angular/forms';
-import { FormsModule } from '@angular/forms';
 import * as i1 from '@acorex/components/loading';
 import { AXLoadingModule } from '@acorex/components/loading';
 import * as i1$1 from '@acorex/components/badge';
 import { AXBadgeModule } from '@acorex/components/badge';
+import * as i2 from '@acorex/components/button';
+import { AXButtonModule } from '@acorex/components/button';
+import * as i3 from '@acorex/components/decorators';
+import { AXDecoratorModule } from '@acorex/components/decorators';
 import * as i5$1 from '@acorex/components/form';
 import { AXFormModule } from '@acorex/components/form';
-import * as i5 from '@acorex/components/search-box';
-import { AXSearchBoxModule, AXSearchBoxComponent } from '@acorex/components/search-box';
-import * as i7$1 from '@acorex/components/select-box';
-import { AXSelectBoxModule } from '@acorex/components/select-box';
-import * as i6 from '@acorex/components/tag-box';
+import * as i6$1 from '@acorex/components/tag-box';
 import { AXTagBoxComponent, AXTagBoxModule } from '@acorex/components/tag-box';
 import { AXValidationModule } from '@acorex/core/validation';
-import * as i4$1 from '@acorex/components/data-table';
+import * as i7 from '@angular/common';
+import { CommonModule } from '@angular/common';
+import * as i1$3 from '@angular/forms';
+import { FormsModule } from '@angular/forms';
+import * as i4 from '@acorex/components/data-table';
 import { AXDataTableModule } from '@acorex/components/data-table';
 import { AXDropdownButtonModule } from '@acorex/components/dropdown-button';
 import { AXBasePageComponent } from '@acorex/components/page';
+import * as i5 from '@acorex/components/search-box';
+import { AXSearchBoxModule, AXSearchBoxComponent } from '@acorex/components/search-box';
+import * as i7$1 from '@acorex/components/select-box';
+import { AXSelectBoxModule } from '@acorex/components/select-box';
+import { AXP_DISABLED_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DATA_PROPERTY_GROUP, AXP_ALLOW_MULTIPLE_PROPERTY, AXP_NAME_PROPERTY, AXPFileUploaderWidgetService } from '@acorex/platform/widgets';
 import * as i2$1 from '@acorex/components/text-box';
 import { AXTextBoxModule, AXTextBoxComponent } from '@acorex/components/text-box';
-import { AXPWidgetPropertyViewerComponent } from '@acorex/platform/layout/components';
-import { transform, isEqual } from 'lodash';
+import { AXPWidgetPropertyViewerComponent } from '@acorex/platform/layout/designer';
 
 const AXP_DATA_SEEDER_TOKEN = new InjectionToken('AXP_DATA_SEEDER_TOKEN');
 class AXPDataSeederService {
@@ -383,6 +379,7 @@ class AXPEntityDetailListViewModel {
                 (a.scope == AXPEntityCommandScope.TypeLevel && !this.hasSelectedItems())))
             .map(async (a) => {
             const isHidden = await this.evaluateExpressions(a.hidden);
+            debugger;
             if (isHidden)
                 return null;
             const disabled = await this.evaluateExpressions(a.disabled);
@@ -564,15 +561,6 @@ function createModifierContext(entity) {
                     entity.interfaces.master = updater(entity.interfaces.master);
                     return ctx;
                 },
-                list: {
-                    get: () => entity.interfaces?.master?.list,
-                    update: (updater) => {
-                        entity.interfaces ??= {};
-                        entity.interfaces.master ??= {};
-                        entity.interfaces.master.list = updater(entity.interfaces.master.list);
-                        return ctx;
-                    },
-                },
                 create: {
                     get: () => entity.interfaces?.master?.create,
                     update: (updater) => {
@@ -626,98 +614,25 @@ function createModifierContext(entity) {
 
 const AXP_ENTITY_MODIFIER = new InjectionToken('AXP_ENTITY_MODIFIER');
 
-function ensureListActions(ctx) {
-    ctx.interfaces.update((i) => {
-        const next = i ?? {};
-        next.master = next.master ?? {};
-        next.master.list = next.master.list ?? { actions: [], views: [] };
-        next.master.list.actions = next.master.list.actions ?? [];
-        return next;
-    });
-}
-function actionExists(actions, commandName, name) {
-    if (!actions)
-        return false;
-    return actions.some((a) => {
-        const cmd = typeof a.command === 'object' ? a.command?.name : a.command;
-        if (name && a.name) {
-            return a.name === name;
-        }
-        return cmd === commandName;
-    });
-}
-
-const AXP_ENTITY_ACTION_PLUGIN = new InjectionToken('AXP_ENTITY_ACTION_PLUGIN');
-
 class AXPEntityMiddleware {
-    //#endregion
-    //#region ----   Constructor   ----
     constructor() {
-        //#region ----   Fields   ----
-        this.exactModifiers = new Map();
-        this.patternModifiers = [];
+        this.modifiers = new Map();
         this.providedModifiers = inject(AXP_ENTITY_MODIFIER, { optional: true }) || [];
-        this.providedActionPlugins = inject(AXP_ENTITY_ACTION_PLUGIN, { optional: true }) || [];
-        this.injector = inject(Injector);
         for (const { entityName, modifier } of this.providedModifiers) {
             this.register(entityName, modifier);
         }
     }
-    //#endregion
-    //#region ----   Registration Methods   ----
     register(entityName, modifier) {
-        if (entityName instanceof RegExp) {
-            this.patternModifiers.push({ pattern: this.normalizeRegExp(entityName), modifier });
-            return;
-        }
-        if (entityName.includes('*')) {
-            const pattern = this.wildcardToRegExp(entityName);
-            this.patternModifiers.push({ pattern, modifier });
-            return;
-        }
-        this.exactModifiers.set(entityName, modifier);
+        this.modifiers.set(entityName, modifier);
     }
-    //#endregion
-    //#region ----   Processing   ----
-    async process(entity) {
-        // First, expand action plugins if entity.plugins exists
+    process(entity) {
+        const modifier = this.modifiers.get(entity.name);
+        if (!modifier)
+            return entity;
         const context = createModifierContext(entity);
-        const plugins = entity.plugins;
-        if (plugins && plugins.length) {
-            const sorted = [...this.providedActionPlugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
-            for (const p of plugins) {
-                const contrib = sorted.find((x) => x.name === p.name);
-                if (contrib) {
-                    try {
-                        await runInInjectionContext(this.injector, () => contrib.apply(context, p.options));
-                    }
-                    catch (err) {
-                        console.error('[AXPEntityMiddleware] action plugin failed:', p.name, err);
-                    }
-                }
-            }
-        }
-        // Then apply entity-specific modifiers
-        // Exact match first
-        const exact = this.exactModifiers.get(entity.name);
-        const modifier = exact ?? this.patternModifiers.find((x) => x.pattern.test(entity.name))?.modifier;
-        if (!modifier) {
-            return context.toEntity();
-        }
         modifier(context);
         return context.toEntity();
     }
-    //#endregion
-    //#region ----   Helpers   ----
-    wildcardToRegExp(pattern) {
-        const escaped = pattern.replace(/[.+?^${}()|\[\]\\]/g, '\\$&');
-        const regexStr = `^${escaped.replace(/\*/g, '.*')}$`;
-        return new RegExp(regexStr);
-    }
-    normalizeRegExp(rx) {
-        const flags = rx.flags.replace('g', '');
-        return new RegExp(rx.source, flags);
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityMiddleware, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityMiddleware, providedIn: 'root' }); }
 }
@@ -731,15 +646,11 @@ class AXPEntityDefinitionRegistryService {
         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.
         this.entities = new Map();
         // Entity resolver service for dynamically loading entity configurations.
         this.entityResolver = inject(AXPEntityResolver); // Assuming AXPEntityLoader is the correct type
     }
-    get onChanged$() {
-        return this.onChanged.asObservable();
-    }
     async preload() {
         const providers = Array.isArray(this.providers)
             ? this.providers
@@ -760,14 +671,14 @@ class AXPEntityDefinitionRegistryService {
                     .catch(err => {
                     console.error(`[AXPEntityDefinitionRegistryService] Failed to load entity ${item.module}.${item.entity}:`, err);
                     return null;
-                }), 10000, `${item.module}.${item.entity}`));
+                }), 3000, `${item.module}.${item.entity}`));
             });
         });
         const results = await Promise.allSettled(promises);
         const loadedEntities = [];
-        results.forEach(async (result, idx) => {
+        results.forEach((result, idx) => {
             if (result.status === 'fulfilled' && result.value != null) {
-                this.register(await this.middleware.process(result.value));
+                this.register(this.middleware.process(result.value));
                 loadedEntities.push(result.value);
             }
             else if (result.status === 'rejected') {
@@ -776,43 +687,6 @@ class AXPEntityDefinitionRegistryService {
         });
         //console.log('[AXPEntityDefinitionRegistryService] Loaded entities:', loadedEntities);
     }
-    async refresh(arg1, arg2) {
-        // No parameters: refresh all currently registered entities
-        if (typeof arg1 === 'undefined' && typeof arg2 === 'undefined') {
-            const keys = Array.from(this.entities.keys());
-            for (const key of keys) {
-                const [m, e] = key.split('.');
-                if (m && e) {
-                    await this.refreshOne(m, e);
-                }
-            }
-            return;
-        }
-        // One parameter: treat as fully-qualified name
-        if (typeof arg1 === 'string' && typeof arg2 === 'undefined') {
-            const [moduleName, entityName] = arg1.split('.');
-            if (!moduleName || !entityName) {
-                throw new Error(`Invalid entity full name: ${arg1}`);
-            }
-            await this.refreshOne(moduleName, entityName);
-            return;
-        }
-        // Two parameters: module + entity
-        if (typeof arg1 === 'string' && typeof arg2 === 'string') {
-            await this.refreshOne(arg1, arg2);
-            return;
-        }
-    }
-    /** Executes the actual refresh for a single entity */
-    async refreshOne(moduleName, entityName) {
-        const config = await this.entityResolver.get(moduleName, entityName);
-        if (!config) {
-            throw new Error(`Invalid entity name: ${moduleName}.${entityName}`);
-        }
-        const processedConfig = await this.middleware.process(config);
-        this.register(processedConfig);
-    }
-    //#endregion
     /**
      * Registers a new entity configuration. Entities are identified uniquely by a combination
      * of their module and name.
@@ -822,7 +696,6 @@ class AXPEntityDefinitionRegistryService {
     register(config) {
         const key = this.createEntityKey(config.module, config.name);
         this.entities.set(key, config);
-        this.onChanged.next({ name: key });
     }
     /**
      * Returns an array of all registered entity configurations.
@@ -849,7 +722,7 @@ class AXPEntityDefinitionRegistryService {
             try {
                 config = await this.entityResolver.get(moduleName, entityName);
                 if (config) {
-                    const processedConfig = await this.middleware.process(config);
+                    const processedConfig = this.middleware.process(config);
                     this.register(processedConfig);
                     return processedConfig;
                 }
@@ -943,7 +816,6 @@ class AXPEntityCreateViewElementViewModel {
                 children: widget.children,
                 formula: widget.formula,
                 triggers: widget.triggers,
-                defaultValue: schema.defaultValue,
                 valueTransforms: widget.valueTransforms,
                 options: merge(schema.interface?.options, {
                     validations: this.property.validations?.map((c) => ({ rule: c.rule, message: c.message, options: c.options })),
@@ -971,7 +843,6 @@ class AXPEntityMasterCreateViewModel {
             const createProps = interfaces?.master?.create?.properties?.map(({ name }) => name) ?? [];
             const visibleProperties = properties.filter(({ groupId, schema, name }) => groupId && !schema.hidden && createProps.includes(name));
             const sections = interfaces?.master?.create?.sections?.filter(({ id }) => visibleProperties.some(({ groupId }) => groupId === id)) ?? [];
-            console.log({ sections, visibleProperties });
             return sections.map((section) => new AXPEntityCreateViewSectionViewModel(this.entityDef, section));
         }, ...(ngDevMode ? [{ debugName: "sections" }] : []));
         if (!initialData)
@@ -987,6 +858,22 @@ class AXPEntityMasterCreateViewModel {
                 },
             },
         };
+        const processDefault = async (value) => {
+            if (typeof value == 'function') {
+                return value();
+            }
+            else if (typeof value == 'string' && value.startsWith('{{')) {
+                return await this.expressionEvaluator.evaluate(value, scope);
+            }
+            return value;
+        };
+        this.config.properties
+            .filter((c) => !isNil(c.schema.defaultValue))
+            .forEach(async (p) => {
+            const value = await processDefault(p.schema.defaultValue);
+            set(initialData, p.name, value);
+        });
+        //
         this.context.set(initialData);
         this.options.set(commandOptions);
         //
@@ -1069,7 +956,7 @@ class AXPEntityMasterListViewModel {
             this.applyViewColumns();
             this.applyViewFilters();
             // this.applyFilterAndSort();
-            await this.applySettings();
+            this.applySettings();
         }
     }
     constructor(injector, config) {
@@ -1083,12 +970,9 @@ class AXPEntityMasterListViewModel {
         this.settings = this.injector.get(AXPSettingService);
         this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
         this.expressionEvaluator = this.injector.get(AXPExpressionEvaluatorService);
-        this.commandService = this.injector.get(AXPCommandService);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
         this.settingEntityKey = `${this.config.module}:${this.config.name}`;
         this.destroyed = new Subject();
-        this.lastAppliedSortKey = null;
-        this.lastAppliedFilterKey = null;
         this.events$ = new Subject();
         //****************** Views ******************//
         this.views = computed(() => {
@@ -1157,28 +1041,10 @@ class AXPEntityMasterListViewModel {
             const visibleProperties = properties.filter(({ schema }) => !schema?.hidden);
             const visiblePropNames = new Set(visibleProperties.map(({ name }) => name));
             return columns
-                .filter(({ name, showAs }) => visiblePropNames.has(name) || showAs)
+                .filter(({ name }) => visiblePropNames.has(name))
                 .map((column) => {
-                if (column.showAs) {
-                    const widgetConfig = this.widgetResolver.resolve(column.showAs.type);
-                    const property = {
-                        ...widgetConfig,
-                        name: column.name,
-                        title: column.title ?? '',
-                        schema: {
-                            dataType: 'string',
-                            interface: {
-                                type: column.showAs.type,
-                                options: column.showAs.options,
-                            },
-                        },
-                    };
-                    return new AXPEntityListViewColumnViewModel(property, column);
-                }
-                else {
-                    const property = visibleProperties.find(({ name }) => name === column.name);
-                    return new AXPEntityListViewColumnViewModel(property, column);
-                }
+                const property = visibleProperties.find(({ name }) => name === column.name);
+                return new AXPEntityListViewColumnViewModel(property, column);
             });
         };
         this.visibleColumnCount = () => {
@@ -1220,7 +1086,7 @@ class AXPEntityMasterListViewModel {
             return await this.expressionEvaluator.evaluate(options, scope);
         };
         this.workflow.events$
-            .pipe(ofType(AXPRefreshEvent, AXPReloadEvent))
+            .pipe(ofType(AXPRefreshEvent))
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
             if (event.payload.entity == getEntityInfo(this.entityDef).source) {
@@ -1234,37 +1100,19 @@ class AXPEntityMasterListViewModel {
         this.saveSettings('view');
         const listViewSetting = await this.settings.get(this.settingEntityKey);
         if (listViewSetting) {
-            const columns = listViewSetting.list?.views?.[this.view().name]?.columns;
-            const pageSize = listViewSetting.list?.views?.[this.view().name]?.pageSize;
-            const sorts = listViewSetting.list?.views?.[this.view().name]?.sorts;
-            const filters = listViewSetting.list?.views?.[this.view().name]?.filters;
-            let columnVisibilityMap;
-            let columnWidthsMap;
-            if (columns) {
-                columnVisibilityMap = new Map(columns.map((col) => [col.name, col.visible]));
-                columnWidthsMap = new Map(columns.map((col) => [col.name, col.width]));
-            }
-            // Do not set pageSize here to avoid triggering an extra load
-            if (columns && columnVisibilityMap && columnWidthsMap) {
-                this.columns.update((prev) => prev
-                    .map((c) => {
-                    return {
-                        ...c,
-                        width: columnWidthsMap.get(c.name),
-                        visible: columnVisibilityMap.get(c.name) ?? c.visible,
-                    };
-                }) // Update visibility
-                    .sort((a, b) => columns.findIndex((col) => col.name === a.name) -
-                    columns.findIndex((col) => col.name === b.name)));
-            }
-            if (Array.isArray(sorts)) {
-                // sorts are AXPSortQuery[]; ensure we map by name
-                const sortsMap = new Map(sorts.map((s) => [s.name, s.dir]));
-                this.sortedFields.update((prev) => prev.map((sf) => ({ ...sf, dir: sortsMap.get(sf.name) || sf.dir })));
-            }
-            if (Array.isArray(filters)) {
-                this.filterQueries.set(filters);
-            }
+            const columns = listViewSetting.list.views[this.view().name].columns;
+            const pageSize = listViewSetting.list.views[this.view().name].pageSize;
+            const columnVisibilityMap = new Map(columns.map((col) => [col.name, col.visible]));
+            const columnWidthsMap = new Map(columns.map((col) => [col.name, col.width]));
+            // if (pageSize) {
+            //   this.dataSource.setPageSize(pageSize);
+            // }
+            this.columns.update((prev) => prev
+                .map((c) => {
+                return { ...c, width: columnWidthsMap.get(c.name), visible: columnVisibilityMap.get(c.name) ?? c.visible };
+            }) // Update visibility
+                .sort((a, b) => columns.findIndex((col) => col.name === a.name) -
+                columns.findIndex((col) => col.name === b.name)));
         }
     }
     async saveSettings(changesType, data) {
@@ -1318,36 +1166,6 @@ class AXPEntityMasterListViewModel {
                     },
                 }));
                 break;
-            case 'filters':
-                updateSettings((prev) => ({
-                    ...prev,
-                    list: {
-                        ...prev?.list,
-                        views: {
-                            ...prev?.list?.views,
-                            [this.view().name]: {
-                                ...prev?.list?.views?.[this.view().name],
-                                filters: data,
-                            },
-                        },
-                    },
-                }));
-                break;
-            case 'sorts':
-                updateSettings((prev) => ({
-                    ...prev,
-                    list: {
-                        ...prev?.list,
-                        views: {
-                            ...prev?.list?.views,
-                            [this.view().name]: {
-                                ...prev?.list?.views?.[this.view().name],
-                                sorts: data,
-                            },
-                        },
-                    },
-                }));
-                break;
             default:
                 break;
         }
@@ -1440,30 +1258,21 @@ class AXPEntityMasterListViewModel {
             operator: f.operator,
             value: f.value,
         }));
-        this.filterQueries.set(viewFilters);
+        this.filterQueries.update((prev) => ({ ...prev, filters: viewFilters }));
     }
     resetFilters() {
         this.applyViewFilters();
     }
     async applyFilterAndSort() {
-        const sorts = this.sortedFields()
-            .filter((sf) => sf.dir)
-            .map((s) => ({ name: s.name, dir: s.dir }));
-        const filters = this.filterQueries();
-        const sortKey = JSON.stringify(sorts);
-        const filterKey = JSON.stringify(filters);
-        if (sortKey === this.lastAppliedSortKey && filterKey === this.lastAppliedFilterKey) {
-            return; // No effective change; avoid redundant refresh
-        }
-        this.lastAppliedSortKey = sortKey;
-        this.lastAppliedFilterKey = filterKey;
         this.dataSource.clearFilter();
-        this.dataSource.sort(...sorts.map((s) => ({ dir: s.dir, field: s.name })));
+        this.dataSource.sort(...this.sortedFields()
+            .filter((sf) => sf.dir)
+            .map((s) => ({ dir: s.dir, field: s.name })));
         this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
             field: null,
             logic: 'and',
             operator: null,
-            filters: filters,
+            filters: this.filterQueries(),
         }));
         this.dataSource.refresh();
     }
@@ -1477,7 +1286,8 @@ class AXPEntityMasterListViewModel {
         const cols = this.view().columns;
         const cloned = this.allAvailableColumns().map((c) => {
             const column = this.entityDef.columns?.find((cc) => cc.name == c.name);
-            const col = new AXPEntityListViewColumnViewModel(c.property, column);
+            const prop = this.entityDef.properties.find((p) => p.name == c.name);
+            const col = new AXPEntityListViewColumnViewModel(prop, column);
             col.visible = !cols.some((c) => c == col.name) && col.visible != false;
             return col;
         });
@@ -1510,24 +1320,19 @@ class AXPEntityMasterListViewModel {
         });
         const command = commandName.split('&')[0];
         const options = await this.evaluateExpressions(action?.options, data);
-        if (this.workflow.exists(command)) {
-            await this.workflow.execute(command, {
-                entity: getEntityInfo(this.entityDef).source,
-                entityInfo: {
-                    name: this.entityDef.name,
-                    module: this.entityDef.module,
-                    title: this.entityDef.title,
-                    parentKey: this.entityDef.parentKey,
-                    source: this.entityDef.source,
-                },
-                data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
-                options: options,
-                metadata: action?.metadata,
-            });
-        }
-        else {
-            this.commandService.execute(command, options);
-        }
+        await this.workflow.execute(command, {
+            entity: getEntityInfo(this.entityDef).source,
+            entityInfo: {
+                name: this.entityDef.name,
+                module: this.entityDef.module,
+                title: this.entityDef.title,
+                parentKey: this.entityDef.parentKey,
+                source: this.entityDef.source,
+            },
+            data: action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data,
+            options: options,
+            metadata: action?.metadata,
+        });
     }
     async execute(command) {
         switch (command?.name) {
@@ -1829,6 +1634,7 @@ class AXPEntityMasterUpdateViewModel {
         this.props = props;
         this.entityDef = cloneDeep(this.config);
         this.workflow = this.injector.get(AXPWorkflowService);
+        this.lockService = this.injector.get(AXPLockService);
         this.sessionService = this.injector.get(AXPSessionService);
         this.isInProgress = signal(false, ...(ngDevMode ? [{ debugName: "isInProgress" }] : []));
         this.context = signal(cloneDeep(this.entityData), ...(ngDevMode ? [{ debugName: "context" }] : []));
@@ -1838,6 +1644,19 @@ class AXPEntityMasterUpdateViewModel {
                 return new AXPEntityMasterUpdateElementViewModel(this.entityDef, e);
             });
         }, ...(ngDevMode ? [{ debugName: "elements" }] : []));
+        // Lock the record on creation
+        if (this.entityId) {
+            this.lockService.lock({
+                refId: this.entityId,
+                refType: `${this.moduleName}.${this.entityName}`,
+                type: 'user',
+                date: new Date().toISOString(),
+                lockedBy: {
+                    id: this.sessionService.user?.id ?? 'system',
+                    type: 'oidc.users',
+                },
+            });
+        }
     }
     async save() {
         this.isInProgress.set(true);
@@ -1862,6 +1681,15 @@ class AXPEntityMasterUpdateViewModel {
     reset() {
         this.context.set(cloneDeep(this.entityData));
     }
+    async unlock() {
+        if (this.entityId) {
+            await this.lockService.unlock({
+                refId: this.entityId,
+                refType: `${this.moduleName}.${this.entityName}`,
+                type: 'user',
+            });
+        }
+    }
 }
 class AXPEntityMasterUpdateViewModelFactory {
     constructor() {
@@ -1993,6 +1821,7 @@ class AXPEntityMasterSingleViewGroupViewModel {
         this.group = this.entity.groups?.find((c) => c.id == this.section.id);
         this.name = signal(this.group.id, ...(ngDevMode ? [{ debugName: "name" }] : []));
         this.isLoading = signal(false, ...(ngDevMode ? [{ debugName: "isLoading" }] : []));
+        this.type = signal(this.section.type ?? 'section', ...(ngDevMode ? [{ debugName: "type" }] : []));
         this.title = computed(() => {
             return this.group.title ?? this.group.id;
         }, ...(ngDevMode ? [{ debugName: "title" }] : []));
@@ -2065,14 +1894,10 @@ class AXPEntityMasterSingleViewModel {
         this.session = this.injector.get(AXPSessionService);
         this.formatService = this.injector.get(AXFormatService);
         this.workflow = this.injector.get(AXPWorkflowService);
-        this.commandService = this.injector.get(AXPCommandService);
         this.destroyed = new Subject();
         this.translateService = this.injector.get(AXTranslationService);
         this.entityService = this.injector.get(AXPEntityService);
         this.expressionEvaluator = this.injector.get(AXPExpressionEvaluatorService);
-        this.entityDefinitionRegistryService = this.injector.get(AXPEntityDefinitionRegistryService);
-        this._updateTrigger = signal(1, ...(ngDevMode ? [{ debugName: "_updateTrigger" }] : []));
-        this.updateTrigger = this._updateTrigger.asReadonly();
         this.context = signal(cloneDeep(this.entityData), ...(ngDevMode ? [{ debugName: "context" }] : []));
         this.actions = computed(() => {
             return (this.entityDef.interfaces?.master?.single?.actions?.map((tr) => new AXPEntityCommandTriggerViewModel(this.entityDef, tr)) ?? []);
@@ -2156,13 +1981,6 @@ class AXPEntityMasterSingleViewModel {
                 this.context.set(event.payload.values);
             }
         });
-        this.entityDefinitionRegistryService.onChanged$
-            .pipe(takeUntil(this.destroyed))
-            .subscribe((event) => {
-            if (event.name == getEntityInfo(this.entityDef).source) {
-                this._updateTrigger.set(this._updateTrigger() + 1);
-            }
-        });
     }
     navigateToUp() {
         this.workflow.execute('navigate', {
@@ -2172,7 +1990,7 @@ class AXPEntityMasterSingleViewModel {
         });
     }
     async executeCommand(commandName, data = null) {
-        //TODO: syntax for workflow
+        //TODO: syntact for workflow
         const command = commandName.split('&')[0];
         switch (command) {
             case 'modify-entity-section': {
@@ -2188,17 +2006,11 @@ class AXPEntityMasterSingleViewModel {
             default: {
                 const action = this.actions().find((c) => c.name == commandName);
                 const options = await this.evaluateExpressions(action?.options, this.context());
-                //
-                if (this.workflow.exists(command)) {
-                    this.workflow.execute(command, {
-                        entity: getEntityInfo(this.entityDef).source,
-                        data: this.context(),
-                        options,
-                    });
-                }
-                else {
-                    this.commandService.execute(command, data);
-                }
+                this.workflow.execute(command, {
+                    entity: getEntityInfo(this.entityDef).source,
+                    data: this.context(),
+                    options,
+                });
             }
         }
     }
@@ -2256,9 +2068,6 @@ const AXPEntityDetailViewModelResolver = (route, state, service = inject(AXPEnti
     return service.create(moduleName, entityName, id);
 };
 
-const AXP_ENTITY_STORAGE_BACKEND = new InjectionToken('AXP_ENTITY_STORAGE_BACKEND');
-const AXP_ENTITY_STORAGE_MIDDLEWARE = new InjectionToken('AXP_ENTITY_STORAGE_MIDDLEWARE');
-
 class AXPEntityStorageService {
 }
 class AXPEntityDataProvider {
@@ -2382,2573 +2191,776 @@ class AXMEntityCrudServiceImpl {
     }
 }
 
-class AXPMiddlewareEntityStorageService extends AXPEntityStorageService {
-    constructor() {
-        super(...arguments);
-        this.backend = inject(AXP_ENTITY_STORAGE_BACKEND);
-        this.allMiddlewares = (inject(AXP_ENTITY_STORAGE_MIDDLEWARE, { optional: true }) || []).slice();
-        this.injector = inject(EnvironmentInjector);
-    }
-    get dbName() {
-        return this.backend.dbName;
-    }
-    filterMiddlewares(ctx) {
-        return this.allMiddlewares
-            .filter((mw) => {
-            const t = mw.target;
-            if (!t)
-                return true;
-            if (t.ops && !t.ops.includes(ctx.op))
-                return false;
-            if (t.entity) {
-                if (typeof t.entity === 'string' && t.entity !== ctx.entityName)
-                    return false;
-                if (t.entity instanceof RegExp && !t.entity.test(ctx.entityName))
-                    return false;
-            }
-            if (t.predicate && !t.predicate(ctx))
-                return false;
-            return true;
-        })
-            .sort((a, b) => (a.target?.order ?? 0) - (b.target?.order ?? 0));
-    }
-    compose(mws, leaf, ctx) {
-        return mws
-            .slice()
-            .reverse()
-            .reduce((next, mw) => {
-            return async () => runInInjectionContext(this.injector, () => mw.execute(ctx, next));
-        }, leaf);
-    }
-    async run(ctx, delegate) {
-        const chain = this.compose(this.filterMiddlewares(ctx), async () => {
-            ctx.result = await delegate();
-        }, ctx);
-        await chain();
-        return ctx.result;
-    }
-    createCtx(op, entityName, init) {
-        return {
-            op,
-            entityName,
-            locals: new Map(),
-            backend: {
-                getOneRaw: (name, id) => this.backend.getOne(name, id),
-                insertOneRaw: (name, e) => this.backend.insertOne(name, e),
-            },
-            ...init,
-        };
-    }
-    async initial(entityName, collection, options) {
-        const ctx = this.createCtx('initial', entityName, { data: collection });
-        return this.run(ctx, () => this.backend.initial(entityName, ctx.data, options));
-    }
-    async getOne(entityName, id) {
-        const ctx = this.createCtx('getOne', entityName, { id });
-        return this.run(ctx, () => this.backend.getOne(entityName, id));
-    }
-    async updateOne(entityName, id, keyValues) {
-        const ctx = this.createCtx('update', entityName, { id, data: keyValues });
-        return this.run(ctx, () => this.backend.updateOne(entityName, id, ctx.data));
-    }
-    async deleteOne(entityName, id) {
-        const ctx = this.createCtx('delete', entityName, { id });
-        return this.run(ctx, () => this.backend.deleteOne(entityName, id));
-    }
-    async insertOne(entityName, entity) {
-        const ctx = this.createCtx('create', entityName, { data: entity });
-        return this.run(ctx, () => this.backend.insertOne(entityName, ctx.data));
-    }
-    async getAll(entityName) {
-        const ctx = this.createCtx('getAll', entityName);
-        return this.run(ctx, () => this.backend.getAll(entityName));
-    }
-    async query(entityName, request) {
-        const ctx = this.createCtx('query', entityName, { request });
-        return this.run(ctx, () => this.backend.query(entityName, request));
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPMiddlewareEntityStorageService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPMiddlewareEntityStorageService }); }
+/**
+ * Compose entity storage middlewares into a pipeline
+ */
+function composeEntityStorageMiddlewares(middlewares) {
+    return (handler) => {
+        let composed = handler;
+        // Reverse order composition for proper middleware chain
+        for (let i = middlewares.length - 1; i >= 0; i--) {
+            const mw = middlewares[i];
+            const next = composed;
+            composed = (context) => mw(context, next);
+        }
+        return composed;
+    };
+}
+/**
+ * Helper function to generate unique request ID
+ */
+function generateRequestId() {
+    return `req_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPMiddlewareEntityStorageService, decorators: [{
-            type: Injectable
-        }] });
 
 /**
- * Entity Event Dispatcher - A wrapper for entity-specific events
- * Handles pattern-based dispatching for entity operations with wildcard support
+ * Registry for managing entity storage middlewares
  */
-class AXPEntityEventDispatcherService {
+class AXPEntityStorageRegistry {
     constructor() {
-        this.eventService = inject(AXPDistributedEventListenerService);
+        this.globalMiddlewares = [];
+        this.entitySpecificMiddlewares = new Map();
+        this.operationSpecificMiddlewares = new Map();
     }
-    async dispatchEntityEvent(operation, entityName, data) {
-        const enhancedData = {
-            ...data,
-            entityName,
-            operation,
-            timestamp: new Date(),
-            source: 'entity-dispatcher',
-        };
-        const eventKeysToDispatch = await this.getAllMatchingEventKeys(operation, entityName);
-        const dispatchPromises = eventKeysToDispatch.map((key) => this.eventService.dispatch(key, enhancedData));
-        await Promise.all(dispatchPromises);
-    }
-    async getAllMatchingEventKeys(operation, entityName) {
-        const eventKeys = new Set();
-        const exactKeys = this.generateEventKeys(operation, entityName);
-        exactKeys.forEach((key) => eventKeys.add(key));
-        const wildcardKeys = await this.findMatchingWildcardKeys(operation, entityName);
-        wildcardKeys.forEach((key) => eventKeys.add(key));
-        return Array.from(eventKeys);
-    }
-    async findMatchingWildcardKeys(operation, entityName) {
-        const matchingKeys = [];
-        const allListenerKeys = await this.eventService.getRegisteredKeys();
-        const actualEventKey = `entity.${operation}.${entityName}`;
-        for (const listenerKey of allListenerKeys) {
-            if (listenerKey.includes('*') && this.matchesEntityPattern(actualEventKey, listenerKey)) {
-                matchingKeys.push(listenerKey);
-            }
+    /**
+     * Add a global middleware that applies to all operations
+     */
+    useGlobal(middleware) {
+        this.globalMiddlewares.push(middleware);
+    }
+    /**
+     * Add middleware for specific entity
+     */
+    useForEntity(entityName, middleware) {
+        if (!this.entitySpecificMiddlewares.has(entityName)) {
+            this.entitySpecificMiddlewares.set(entityName, []);
         }
-        return matchingKeys;
+        this.entitySpecificMiddlewares.get(entityName).push(middleware);
     }
-    matchesEntityPattern(eventKey, pattern) {
-        if (!pattern.startsWith('entity.') || !pattern.includes('*')) {
-            return false;
+    /**
+     * Add middleware for specific operation (getOne, insertOne, etc.)
+     */
+    useForOperation(operation, middleware) {
+        if (!this.operationSpecificMiddlewares.has(operation)) {
+            this.operationSpecificMiddlewares.set(operation, []);
         }
-        const regexPattern = pattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
-        const regex = new RegExp(`^${regexPattern}$`);
-        return regex.test(eventKey);
-    }
-    generateEventKeys(operation, entityName) {
-        const keys = [];
-        keys.push(`entity.${operation}`);
-        keys.push(`entity.${operation}.${entityName}`);
-        const entityParts = entityName.split('.');
-        if (entityParts.length > 1) {
-            const moduleName = entityParts[0];
-            keys.push(`entity.${operation}.${moduleName}`);
+        this.operationSpecificMiddlewares.get(operation).push(middleware);
+    }
+    /**
+     * Get all applicable middlewares for a given context
+     */
+    getMiddlewares(entityName, operation) {
+        const middlewares = [];
+        // Add global middlewares
+        middlewares.push(...this.globalMiddlewares);
+        // Add entity-specific middlewares
+        const entityMiddlewares = this.entitySpecificMiddlewares.get(entityName);
+        if (entityMiddlewares) {
+            middlewares.push(...entityMiddlewares);
+        }
+        // Add operation-specific middlewares
+        const operationMiddlewares = this.operationSpecificMiddlewares.get(operation);
+        if (operationMiddlewares) {
+            middlewares.push(...operationMiddlewares);
+        }
+        return middlewares;
+    }
+    /**
+     * Get all global middlewares
+     */
+    getGlobalMiddlewares() {
+        return [...this.globalMiddlewares];
+    }
+    /**
+     * Remove middleware from global middlewares
+     */
+    removeGlobalMiddleware(middleware) {
+        const index = this.globalMiddlewares.indexOf(middleware);
+        if (index > -1) {
+            this.globalMiddlewares.splice(index, 1);
+            return true;
         }
-        return keys;
+        return false;
     }
-    async dispatchInserted(entityName, data) {
-        await this.dispatchEntityEvent('inserted', entityName, data);
+    /**
+     * Clear all middlewares
+     */
+    clear() {
+        this.globalMiddlewares.length = 0;
+        this.entitySpecificMiddlewares.clear();
+        this.operationSpecificMiddlewares.clear();
     }
-    async dispatchUpdated(entityName, data) {
-        await this.dispatchEntityEvent('updated', entityName, data);
+    /**
+     * Get registered entity names that have specific middlewares
+     */
+    getRegisteredEntityNames() {
+        return Array.from(this.entitySpecificMiddlewares.keys());
     }
-    async dispatchDeleted(entityName, data) {
-        await this.dispatchEntityEvent('deleted', entityName, data);
+    /**
+     * Get registered operation names that have specific middlewares
+     */
+    getRegisteredOperations() {
+        return Array.from(this.operationSpecificMiddlewares.keys());
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityEventDispatcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityEventDispatcherService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityStorageRegistry, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityStorageRegistry, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityEventDispatcherService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityStorageRegistry, decorators: [{
             type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
+            args: [{ providedIn: 'root' }]
         }] });
 
-class AXPLayoutAdapterBuilder {
-    constructor() {
-        this.adapter = {};
-    }
-    setEntity(entity, rootContext) {
-        this.entity = entity;
-        this.rootContext = rootContext;
-        return this;
-    }
-    setDependencies(dependencies) {
-        this.dependencies = dependencies;
-        return this;
-    }
-    setMainPage(mainPage) {
-        this.adapter.pages = [mainPage];
-        return this;
-    }
-    setRelatedPages(relatedPages) {
-        this.adapter.pages = [...(this.adapter.pages || []), ...relatedPages];
-        return this;
-    }
-    setPages(pages) {
-        this.adapter.pages = pages;
-        return this;
+/**
+ * Executor that wraps entity storage operations with middleware pipeline
+ */
+class AXPEntityStorageExecutor {
+    constructor(storageService) {
+        this.storageService = storageService;
+        this.injector = inject(EnvironmentInjector);
+        this.registry = inject(AXPEntityStorageRegistry);
     }
-    build() {
-        return {
-            name: `${this.entity?.module}.${this.entity?.name}`,
-            title: `${this.entity?.interfaces?.master?.single?.title}`,
-            label: this.entity?.formats.plural,
-            actions: [],
-            breadcrumbs: this.createBreadcrumbs(),
-            execute: this.createExecuteFunction(),
-            load: this.createLoadFunction(),
-            pages: this.adapter.pages || [],
+    /**
+     * Execute getOne operation with middleware pipeline
+     */
+    async getOne(entityName, id) {
+        const context = {
+            operation: 'getOne',
+            entityName,
+            dbName: this.storageService.dbName,
+            input: { id },
+            metadata: {
+                startTime: Date.now(),
+                requestId: generateRequestId(),
+            },
         };
+        const handler = async (ctx) => {
+            return this.storageService.getOne(ctx.entityName, ctx.input.id);
+        };
+        return this.executeWithMiddleware(context, handler);
     }
-    createBreadcrumbs() {
-        const session = this.dependencies.session;
-        const moduleName = this.entity?.module;
-        const entityName = this.entity?.name;
-        return [
-            {
-                title: this.entity?.formats.plural ?? '',
-                command: {
-                    name: 'navigate',
-                    options: {
-                        path: `/${session.application?.name}/m/${moduleName}/e/${entityName}/list`,
-                    },
-                },
-            },
-            {
-                title: this.entity?.interfaces?.master?.single?.title ?? '',
-                command: {
-                    name: 'navigate',
-                    options: {
-                        path: `/${session.application?.name}/m/${moduleName}/e/${entityName}/${this.rootContext.id}/new-view`,
-                    },
-                },
+    /**
+     * Execute getAll operation with middleware pipeline
+     */
+    async getAll(entityName) {
+        const context = {
+            operation: 'getAll',
+            entityName,
+            dbName: this.storageService.dbName,
+            input: {},
+            metadata: {
+                startTime: Date.now(),
+                requestId: generateRequestId(),
             },
-        ];
-    }
-    createExecuteFunction() {
-        return (command, context) => {
-            console.log('layout execute', command, context);
-            return Promise.resolve({ success: true });
         };
+        const handler = async (ctx) => {
+            return this.storageService.getAll(ctx.entityName);
+        };
+        return this.executeWithMiddleware(context, handler);
     }
-    createLoadFunction() {
-        return async () => {
-            return {
-                success: true,
-                result: this.rootContext,
-            };
+    /**
+     * Execute insertOne operation with middleware pipeline
+     */
+    async insertOne(entityName, entity) {
+        const context = {
+            operation: 'insertOne',
+            entityName,
+            dbName: this.storageService.dbName,
+            input: { entity },
+            metadata: {
+                startTime: Date.now(),
+                requestId: generateRequestId(),
+            },
+        };
+        const handler = async (ctx) => {
+            return this.storageService.insertOne(ctx.entityName, ctx.input.entity);
         };
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLayoutAdapterBuilder, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLayoutAdapterBuilder, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLayoutAdapterBuilder, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }] });
-
-class AXPBaseRelatedEntityConverter {
-    async getEntityDefinition(relatedEntity, entityResolver) {
-        const [moduleName, entityName] = relatedEntity.entity.split('.');
-        const entityDef = await entityResolver.resolve(moduleName, entityName);
-        if (!entityDef) {
-            throw new Error(`Entity ${relatedEntity.entity} not found`);
-        }
-        return { entityDef, moduleName, entityName };
-    }
-    createExpressionEvaluator(context, expressionEvaluator) {
-        return async (actionData) => {
-            const scope = {
-                context: {
-                    eval: (path) => get(context, path),
-                },
-            };
-            return await expressionEvaluator.evaluate(actionData, scope);
-        };
-    }
-    async createFilters(relatedEntity, evaluateExpressions) {
-        return (relatedEntity.conditions?.map(async (c) => {
-            const value = await evaluateExpressions(c.value);
-            return {
-                field: c.name,
-                operator: c.operator,
-                value: value,
-            };
-        }) ?? []);
-    }
-    createEntityHelpers(entityDef) {
-        const groups = entityDef?.groups ?? [];
-        const singleInterface = entityDef?.interfaces?.master?.single;
-        return {
-            getGroupById: (id) => groups.find((s) => s.id === id),
-            getPropertyByGroupId: (groupId) => entityDef?.properties.filter((p) => p.groupId === groupId) ?? [],
-            getPropertyLayout: (name) => singleInterface?.properties?.find((p) => p.name === name)?.layout,
-            singleInterface,
-            groups,
-        };
-    }
-    async createGridLayoutStructure(singleInterface, helpers, evaluateExpressions) {
-        return await this.createGridLayoutStructureInternal(singleInterface, helpers, evaluateExpressions);
-    }
-    //#region ----   Hidden Evaluation Helpers   ----
-    async getVisiblePropertiesByGroupId(sectionId, helpers, evaluateExpressions) {
-        const properties = helpers.getPropertyByGroupId(sectionId) ?? [];
-        const evaluated = await Promise.all(properties.map(async (property) => {
-            let hidden = property?.schema?.hidden;
-            if (typeof hidden === 'string' && evaluateExpressions) {
-                try {
-                    const result = await evaluateExpressions({ hidden });
-                    hidden = result.hidden;
-                }
-                catch {
-                    hidden = false;
-                }
-            }
-            return { property, hidden: !!hidden };
-        }));
-        return evaluated.filter((x) => !x.hidden).map((x) => x.property);
-    }
-    async createPropertyGrid(sectionId, helpers, evaluateExpressions) {
-        const visibleProperties = await this.getVisiblePropertiesByGroupId(sectionId, helpers, evaluateExpressions);
-        return {
-            type: 'grid-layout',
-            mode: 'edit',
-            options: {
-                grid: {
-                    default: {
-                        columns: 'repeat(12, 1fr)',
-                        rows: 'repeat(1, 1fr)',
-                        gap: '20px',
-                    },
-                },
-            },
-            children: visibleProperties.map((p) => {
-                const layout = helpers.getPropertyLayout(p.name);
-                return {
-                    type: 'grid-item-layout',
-                    name: p.name,
-                    options: {
-                        colSpan: layout?.positions?.lg?.colSpan ?? 12,
-                        colStart: layout?.positions?.lg?.colStart,
-                        colEnd: layout?.positions?.lg?.colEnd,
-                    },
-                    children: [
-                        {
-                            type: 'form-field',
-                            options: {
-                                label: p.title,
-                                showLabel: layout?.label?.visible ?? true,
-                            },
-                            children: [
-                                {
-                                    type: p.schema.interface?.type ?? '',
-                                    path: p.name,
-                                    name: p.name,
-                                    defaultValue: p.schema.defaultValue,
-                                    children: p.schema.interface?.children,
-                                    options: p.schema.interface?.options,
-                                    triggers: p.schema.interface?.triggers,
-                                    valueTransforms: p.schema.interface?.valueTransforms,
-                                },
-                            ],
-                        },
-                    ],
-                };
-            }),
-        };
-    }
-    async createGridLayoutStructureInternal(singleInterface, helpers, evaluateExpressions) {
-        return {
-            type: 'grid-layout',
-            options: {
-                grid: {
-                    default: {
-                        columns: 'repeat(12, 1fr)',
-                        rows: 'repeat(1, 1fr)',
-                        gap: '20px',
-                    },
-                },
-            },
-            children: await Promise.all(singleInterface?.sections.map(async (s) => ({
-                type: 'grid-item-layout',
-                name: s.id,
-                options: {
-                    colSpan: s.layout?.positions?.lg?.colSpan ?? 12,
-                    colStart: s.layout?.positions?.lg?.colStart,
-                    colEnd: s.layout?.positions?.lg?.colEnd,
-                },
-                children: [
-                    {
-                        type: 'fieldset-layout',
-                        options: {
-                            title: helpers.getGroupById(s.id)?.title ?? '',
-                            collapsible: true,
-                        },
-                        children: [await this.createPropertyGrid(s.id, helpers, evaluateExpressions)],
-                    },
-                ],
-            }))),
-        };
-    }
-}
-
-class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
-    async convert(relatedEntity, context) {
-        const { entityDef } = await this.getEntityDefinition(relatedEntity, context.entityResolver);
-        const baseHelpers = this.createEntityHelpers(entityDef);
-        // If referenced strategy with mapping and detail type, exclude mapped properties from UI
-        const p = relatedEntity?.persistence || {};
-        const strategy = p.strategy || 'embedded';
-        const mappedTargets = Object.keys(p.map || {}).map((k) => (k || '').split('.')[0]);
-        const helpers = {
-            ...baseHelpers,
-            getPropertyByGroupId: (groupId) => {
-                const props = baseHelpers.getPropertyByGroupId(groupId) ?? [];
-                if (strategy !== 'referenced' || mappedTargets.length === 0)
-                    return props;
-                return props.filter((prop) => !mappedTargets.includes(prop?.name));
-            },
-        };
-        const evaluateExpressions = async (actionData) => {
-            const scope = {
-                context: {
-                    eval: (path) => {
-                        return get(context.context, path);
-                    },
-                },
-            };
-            return await context.expressionEvaluator.evaluate(actionData, scope);
-        };
-        // Build related tabs for the related entity page (mirrors main-entity tab building)
-        const tabDetailEntities = entityDef?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'tab-detail');
-        const tabListEntities = entityDef?.relatedEntities?.filter((re) => !re.hidden && (!re.layout?.type || re.layout?.type === 'tab-list'));
-        const factory = new AXPRelatedEntityConverterFactory();
-        const tabDetailTabs = await this.buildTabDetails(factory, tabDetailEntities ?? [], context);
-        const tabListTabs = await this.buildTabLists(factory, tabListEntities ?? [], context);
-        return {
-            id: entityDef?.name ?? '',
-            title: `${context.rootTitle}`,
-            label: relatedEntity.title ?? entityDef?.formats.displayName ?? '',
-            icon: relatedEntity.icon || entityDef.icon,
-            settings: this.createPageSettings(),
-            load: this.createLoadFunction(entityDef, relatedEntity, evaluateExpressions),
-            execute: this.createExecuteFunction(entityDef),
-            // tabs: [...tabDetailTabs, ...tabListTabs],
-            content: [await this.createGridLayoutStructure(helpers.singleInterface, helpers, evaluateExpressions)],
-        };
-    }
-    //#region ----   Utility Methods   ----
-    createPageSettings() {
-        return {
-            commands: {
-                reject: {
-                    title: 't("discard")',
-                    color: 'default',
-                    visible: '{{context.isDirty()}}',
-                    command: { name: 'discard' },
-                },
-                accept: {
-                    title: 't("confirm")',
-                    color: 'secondary',
-                    visible: '{{context.isDirty()}}',
-                    command: { name: 'update-entity' },
-                },
-            },
-        };
-    }
-    createLoadFunction(entityDef, relatedEntity, evaluateExpressions) {
-        return async (context) => {
-            const fn = entityDef?.queries.byKey?.execute;
-            const conditionValues = relatedEntity.conditions?.map((c) => c.value) ?? [];
-            const evaluatedConditionValues = await Promise.all(conditionValues.map((c) => evaluateExpressions(c)));
-            const id = evaluatedConditionValues[0];
-            const result = await fn(id);
-            return { success: true, result };
-        };
-    }
-    createExecuteFunction(entityDef) {
-        return async (e, context) => {
-            if (e.name === 'update-entity') {
-                const fn = entityDef?.commands?.update?.execute;
-                const result = await fn(context);
-                return { success: true, result };
-            }
-            else {
-                return {
-                    success: false,
-                    error: { code: 'invalid_command', message: 'Invalid command' },
-                };
-            }
-        };
-    }
-    //#endregion
-    //#region ----   Tab Builders   ----
-    /**
-     * Builds tab-detail items for a related entity page using the shared converters.
-     */
-    async buildTabDetails(factory, tabDetailEntities, ctx) {
-        if (!ctx?.entityResolver || !tabDetailEntities?.length) {
-            return [];
-        }
-        const tabs = [];
-        for (const re of tabDetailEntities) {
-            const converter = factory.createTabDetailsConverter();
-            tabs.push(await converter.convert(re, {
-                entityResolver: ctx.entityResolver,
-            }));
-        }
-        return tabs;
-    }
-    /**
-     * Builds tab-list items for a related entity page using the shared converters with context-aware filters/actions.
-     */
-    async buildTabLists(factory, tabListEntities, ctx) {
-        if (!ctx?.entityResolver || !tabListEntities?.length) {
-            return [];
-        }
-        const tabs = [];
-        for (const re of tabListEntities) {
-            const converter = factory.createTabListConverter();
-            tabs.push(await converter.convert(re, {
-                entityResolver: ctx.entityResolver,
-                expressionEvaluator: ctx.expressionEvaluator,
-                context: ctx.context,
-            }));
-        }
-        return tabs;
-    }
-}
-
-class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
-    async convert(relatedEntity, context) {
-        const { entityDef } = await this.getEntityDefinition(relatedEntity, context.entityResolver);
-        const evaluateExpressions = async (actionData) => {
-            const scope = {
-                context: {
-                    eval: (path) => {
-                        return get(context.context, path);
-                    },
-                },
-            };
-            return await context.expressionEvaluator.evaluate(actionData, scope);
-        };
-        const evaluatedActions = await evaluateExpressions(relatedEntity?.actions);
-        const filters = relatedEntity.conditions?.map(async (c) => {
-            const value = await evaluateExpressions(c.value);
-            return {
-                field: c.name,
-                operator: c.operator,
-                value: value,
-                hidden: true,
-            };
-        }) ?? [];
-        return {
-            id: entityDef?.name ?? '',
-            title: `${context.rootTitle}`,
-            label: relatedEntity.title,
-            icon: relatedEntity.icon || entityDef.icon,
-            actions: this.mergeActions(entityDef, evaluatedActions)
-                ?.filter((a) => a.priority === 'primary')
-                ?.map((a) => {
-                return {
-                    ...a,
-                    zone: 'header',
-                    visible: !a.hidden,
-                    priority: 'primary',
-                    name: a.name,
-                    title: a.title,
-                    scope: a.scope,
-                    icon: a.icon,
-                    color: a.color,
-                    disabled: a.disabled,
-                    command: {
-                        name: a.name,
-                        options: a.options,
-                        metadata: a.metadata,
-                    },
-                };
-            }),
-            execute: async (command, executeContext) => {
-                try {
-                    const commandName = command.name.split('&')[0];
-                    const mergedActions = this.mergeActions(entityDef, evaluatedActions);
-                    const action = mergedActions.find((a) => {
-                        return a.name === commandName || a.name.split('&')[0] === commandName;
-                    });
-                    if (!action) {
-                        console.warn(`Action ${commandName} not found in entity definition`);
-                        return {
-                            success: false,
-                            error: {
-                                code: 'ACTION_NOT_FOUND',
-                                message: `Action ${commandName} not found`,
-                                details: command,
-                            },
-                        };
-                    }
-                    await context.workflowService.execute(commandName, {
-                        entity: getEntityInfo(entityDef).source,
-                        entityInfo: {
-                            name: entityDef.name,
-                            module: entityDef.module,
-                            title: entityDef.title,
-                            parentKey: entityDef.parentKey,
-                            source: entityDef.source,
-                        },
-                        data: action.scope == AXPEntityCommandScope.Selected
-                            ? executeContext
-                            : action.options?.['process']?.data || null,
-                        options: action.options,
-                        metadata: action.metadata,
-                    });
-                    return { success: true };
-                }
-                catch (error) {
-                    console.error('Error executing command:', error);
-                    return {
-                        success: false,
-                        error: {
-                            code: 'EXECUTION_ERROR',
-                            message: error instanceof Error ? error.message : 'Unknown error occurred',
-                            details: error,
-                        },
-                    };
-                }
-            },
-            content: [
-                {
-                    type: AXPWidgetsCatalog.entityList,
-                    name: 'page-list',
-                    defaultValue: {
-                        toolbar: {
-                            filters: await Promise.all(filters),
-                        },
-                    },
-                    options: {
-                        entity: relatedEntity.entity,
-                        showEntityActions: false,
-                        actions: evaluatedActions,
-                    },
-                },
-            ],
-        };
-    }
-    mergeActions(entityDef, relatedEntityActions) {
-        const originalList = entityDef?.interfaces?.master?.list?.actions ?? [];
-        const relatedEntityActionList = relatedEntityActions ?? [];
-        // Create a map to track which actions from relatedEntityActionList have been used
-        const usedOverrideActions = new Set();
-        // Start with original actions, applying overrides where they exist
-        const mergedActions = originalList.map((originalAction) => {
-            const originalCommandName = typeof originalAction.command === 'string' ? originalAction.command : originalAction.command.name;
-            const overrideAction = relatedEntityActionList.find((action) => {
-                const actionCommandName = typeof action.command === 'string' ? action.command : action.command.name;
-                return actionCommandName === originalCommandName && action.name === originalAction.name;
-            });
-            if (overrideAction) {
-                // Mark this override action as used
-                const overrideKey = `${typeof overrideAction.command === 'string' ? overrideAction.command : overrideAction.command.name}_${overrideAction.name}`;
-                usedOverrideActions.add(overrideKey);
-                return new AXPEntityCommandTriggerViewModel(entityDef, overrideAction);
-            }
-            return new AXPEntityCommandTriggerViewModel(entityDef, originalAction);
-        });
-        // Add any remaining actions from relatedEntityActionList that weren't used as overrides
-        const additionalActions = relatedEntityActionList
-            .filter((action) => {
-            const actionKey = `${typeof action.command === 'string' ? action.command : action.command.name}_${action.name}`;
-            return !usedOverrideActions.has(actionKey);
-        })
-            .map((action) => new AXPEntityCommandTriggerViewModel(entityDef, action));
-        return [...additionalActions, ...mergedActions].filter((a) => !a.hidden);
-    }
-}
-
-class AXPTabDetailsConverter extends AXPBaseRelatedEntityConverter {
-    async convert(relatedEntity, context) {
-        const { entityDef } = await this.getEntityDefinition(relatedEntity, context.entityResolver);
-        const baseHelpers = this.createEntityHelpers(entityDef);
-        // If referenced strategy with mapping and detail type, exclude mapped properties from UI
-        const p = relatedEntity?.persistence || {};
-        const strategy = p.strategy || 'embedded';
-        const mappedTargets = Object.keys(p.map || {}).map((k) => (k || '').split('.')[0]);
-        const helpers = {
-            ...baseHelpers,
-            getPropertyByGroupId: (groupId) => {
-                const props = baseHelpers.getPropertyByGroupId(groupId) ?? [];
-                if (strategy !== 'referenced' || mappedTargets.length === 0)
-                    return props;
-                return props.filter((prop) => !mappedTargets.includes(prop?.name));
-            },
-        };
-        return {
-            id: entityDef?.name ?? '',
-            title: relatedEntity.title ?? entityDef?.title ?? '',
-            icon: relatedEntity.icon || entityDef.icon,
-            content: [await this.createGridLayoutStructure(helpers.singleInterface, helpers)],
-        };
-    }
-}
-
-class AXPTabListConverter extends AXPBaseRelatedEntityConverter {
-    async convert(relatedEntity, context) {
-        const { entityDef } = await this.getEntityDefinition(relatedEntity, context.entityResolver);
-        const evaluateExpressions = async (actionData) => {
-            const scope = {
-                context: {
-                    eval: (path) => {
-                        return get(context.context, path);
-                    },
-                },
-            };
-            return await context.expressionEvaluator.evaluate(actionData, scope);
-        };
-        // console.log({ relatedEntity });
-        const filters = relatedEntity.conditions?.map(async (c) => {
-            const value = await evaluateExpressions(c.value);
-            return {
-                field: c.name,
-                operator: c.operator,
-                value: value,
-                hidden: true,
-            };
-        }) ?? [];
-        const actions = await evaluateExpressions(relatedEntity.actions);
-        return {
-            id: entityDef?.name ?? '',
-            title: relatedEntity.title ?? entityDef?.title ?? '',
-            icon: relatedEntity.icon || entityDef.icon,
-            content: [
-                {
-                    type: AXPWidgetsCatalog.entityList,
-                    name: `${relatedEntity.entity}-tab-list`,
-                    defaultValue: {
-                        toolbar: {
-                            filters: await Promise.all(filters),
-                        },
-                    },
-                    options: {
-                        entity: relatedEntity.entity,
-                        showEntityActions: true,
-                        showToolbar: false,
-                        actions: actions,
-                    },
-                },
-            ],
-        };
-    }
-}
-
-class AXPRelatedEntityConverterFactory {
-    createConverter(type) {
-        switch (type) {
-            case 'page-detail':
-                return new AXPPageDetailsConverter();
-            case 'page-list':
-                return new AXPPageListConverter();
-            case 'tab-detail':
-                return new AXPTabDetailsConverter();
-            case 'tab-list':
-                return new AXPTabListConverter();
-            default:
-                throw new Error(`Unsupported converter type: ${type}`);
-        }
-    }
-    createPageDetailsConverter() {
-        return this.createConverter('page-detail');
-    }
-    createPageListConverter() {
-        return this.createConverter('page-list');
-    }
-    createTabDetailsConverter() {
-        return this.createConverter('tab-detail');
-    }
-    createTabListConverter() {
-        return this.createConverter('tab-list');
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPRelatedEntityConverterFactory, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPRelatedEntityConverterFactory, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPRelatedEntityConverterFactory, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }] });
-
-class AXPMainEntityContentBuilder {
-    constructor(relatedEntityConverterFactory) {
-        this.relatedEntityConverterFactory = relatedEntityConverterFactory;
-        this.workflowService = inject(AXPWorkflowService);
-        this.commandService = inject(AXPCommandService);
-    }
-    async build(entity, rootContext, dependencies, rootTitle) {
-        const groups = entity?.groups ?? [];
-        const singleInterface = entity?.interfaces?.master?.single;
-        // Accumulate groups from main and merge-detail related entities for validation/title lookup
-        const allGroups = [...groups];
-        // Prepare merge-details structures (sections and properties per section)
-        const mergeDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'merge-detail');
-        const mainPropsByGroup = (entity?.properties ?? []).reduce((acc, p) => {
-            if (!acc[p.groupId])
-                acc[p.groupId] = [];
-            acc[p.groupId].push(p);
-            return acc;
-        }, {});
-        // Will hold merged properties per group (section)
-        const mergedPropsByGroup = { ...mainPropsByGroup };
-        // Collect sections from main interface (validated later) and related ones for ordering
-        const mainSections = singleInterface?.sections ?? [];
-        // Track extra sections with entity-level ordering context
-        const beforeExtraSections = [];
-        const middleExtraSections = [];
-        const afterExtraSections = [];
-        const beforeExtraIds = new Set();
-        const middleExtraIds = new Set();
-        const afterExtraIds = new Set();
-        // Effective order overrides for main sections when merged with BEFORE related entities
-        let beforeOverrideSectionOrders = {};
-        // Collect tab-list tabs from merge-detail related entities to merge with main tabs
-        const nestedTabListTabs = [];
-        // Helper to append related-only sections into before/after buckets
-        const queueRelatedSection = (section, position, entityOrder) => {
-            if (!section)
-                return;
-            if (position === 'before') {
-                if (!beforeExtraIds.has(section.id)) {
-                    beforeExtraIds.add(section.id);
-                    beforeExtraSections.push({ section, entityOrder });
-                }
-            }
-            else if (position === 'middle') {
-                if (!middleExtraIds.has(section.id)) {
-                    middleExtraIds.add(section.id);
-                    middleExtraSections.push({ section });
-                }
-            }
-            else {
-                if (!afterExtraIds.has(section.id)) {
-                    afterExtraIds.add(section.id);
-                    afterExtraSections.push({ section, entityOrder });
-                }
-            }
-        };
-        // Resolve and merge merge-detail entities
-        // Sort related entities by position group then by layout.order
-        if (mergeDetailEntities?.length && dependencies?.entityResolver) {
-            const beforeEntities = (mergeDetailEntities || [])
-                .filter((re) => (re.layout?.position ?? 'middle') === 'before')
-                .sort((a, b) => (a.layout?.order ?? Number.MAX_SAFE_INTEGER) - (b.layout?.order ?? Number.MAX_SAFE_INTEGER));
-            const middleEntities = (mergeDetailEntities || []).filter((re) => (re.layout?.position ?? 'middle') === 'middle');
-            const afterEntities = (mergeDetailEntities || [])
-                .filter((re) => (re.layout?.position ?? 'middle') === 'after')
-                .sort((a, b) => (a.layout?.order ?? Number.MAX_SAFE_INTEGER) - (b.layout?.order ?? Number.MAX_SAFE_INTEGER));
-            const processRelated = async (relatedEntity) => {
-                try {
-                    const [moduleName, entityName] = relatedEntity.entity.split('.');
-                    const entityDef = await dependencies.entityResolver.resolve(moduleName, entityName);
-                    if (!entityDef) {
-                        return;
-                    }
-                    const relSingle = entityDef?.interfaces?.master?.single;
-                    const relGroups = entityDef?.groups ?? [];
-                    // Merge related groups into allGroups (avoid duplicates by id)
-                    for (const rg of relGroups) {
-                        if (!allGroups.some((g) => g.id === rg.id)) {
-                            allGroups.push(rg);
-                        }
-                    }
-                    // Collect nested tab-list related entities from this merge-detail entity and convert to tabs
-                    try {
-                        const nestedTabListEntities = entityDef?.relatedEntities?.filter((re) => !re.hidden && (!re.layout?.type || re.layout?.type === 'tab-list'));
-                        if (nestedTabListEntities?.length) {
-                            const converter = this.relatedEntityConverterFactory.createTabListConverter();
-                            const nestedDataPath = relatedEntity?.persistence?.dataPath || entityName;
-                            const nestedContext = get(rootContext, nestedDataPath) ?? rootContext;
-                            for (const nre of nestedTabListEntities) {
-                                try {
-                                    const tab = await converter.convert(nre, {
-                                        entityResolver: dependencies.entityResolver,
-                                        expressionEvaluator: dependencies.expressionEvaluator,
-                                        // Evaluate conditions relative to the merge-detail entity's dataPath
-                                        context: nestedContext,
-                                    });
-                                    nestedTabListTabs.push(tab);
-                                }
-                                catch { }
-                            }
-                        }
-                    }
-                    catch { }
-                    // Build related props map per group with metadata: __dataPath and __layout
-                    // If referenced strategy with mapping, exclude mapped target property names from UI props
-                    const p = relatedEntity?.persistence || {};
-                    const strategy = p.strategy || 'embedded';
-                    const mappedTargets = Object.keys(p.map || {}).map((k) => (k || '').split('.')[0]);
-                    const relPropsByGroup = (entityDef?.properties ?? []).reduce((acc, p) => {
-                        if (strategy === 'referenced' &&
-                            (relatedEntity?.layout?.type === 'merge-detail' ||
-                                relatedEntity?.layout?.type === 'page-detail' ||
-                                relatedEntity?.layout?.type === 'tab-detail') &&
-                            mappedTargets.includes(p.name)) {
-                            return acc; // skip mapped properties
-                        }
-                        if (!acc[p.groupId])
-                            acc[p.groupId] = [];
-                        // Clone shallow to not mutate original definitions
-                        const propClone = { ...p };
-                        propClone.__dataPath = relatedEntity?.persistence?.dataPath || entityName;
-                        propClone.__layout = relSingle?.properties?.find((x) => x.name === p.name)?.layout;
-                        acc[p.groupId].push(propClone);
-                        return acc;
-                    }, {});
-                    // Merge properties by section id
-                    const position = relatedEntity.layout?.position ?? 'middle';
-                    const entityOrder = relatedEntity.layout?.order ?? Number.MAX_SAFE_INTEGER;
-                    const relSections = (relSingle?.sections ?? []).filter((s) => relGroups.some((g) => g.id === s.id));
-                    for (const rs of relSections) {
-                        const sectionId = rs.id;
-                        const mainHasSection = !!mainSections?.some((s) => s.id === sectionId);
-                        const relProps = relPropsByGroup[sectionId] ?? [];
-                        if (mainHasSection) {
-                            const current = mergedPropsByGroup[sectionId] ?? [];
-                            mergedPropsByGroup[sectionId] =
-                                position === 'before' ? [...relProps, ...current] : [...current, ...relProps];
-                            // Capture override order for main section when position is 'before'
-                            if (position === 'before') {
-                                const order = rs?.order ?? 0;
-                                const prev = beforeOverrideSectionOrders[sectionId] ?? Number.MAX_SAFE_INTEGER;
-                                beforeOverrideSectionOrders[sectionId] = Math.min(prev, order);
-                            }
-                        }
-                        else {
-                            // Section isn't in main; queue section for rendering and set its props
-                            if (!mergedPropsByGroup[sectionId]) {
-                                mergedPropsByGroup[sectionId] = [];
-                            }
-                            mergedPropsByGroup[sectionId] =
-                                position === 'before'
-                                    ? [...(relProps ?? []), ...(mergedPropsByGroup[sectionId] ?? [])]
-                                    : [...(mergedPropsByGroup[sectionId] ?? []), ...(relProps ?? [])];
-                            queueRelatedSection(rs, position, entityOrder);
-                        }
-                    }
-                }
-                catch {
-                    // Silently ignore failures to resolve or merge
-                }
-            };
-            // Process BEFORE entities first (sorted), then AFTER entities
-            for (const re of beforeEntities) {
-                await processRelated(re);
-            }
-            for (const re of middleEntities) {
-                await processRelated(re);
-            }
-            for (const re of afterEntities) {
-                await processRelated(re);
-            }
-        }
-        const getGroupById = (id) => {
-            return groups.find((s) => s.id === id);
-        };
-        const filterValidSections = (sections) => {
-            return (sections?.filter((section) => {
-                return allGroups.some((group) => group.id === section.id);
-            }) ?? []);
-        };
-        // Utility: sort related-only sections by entity order then section order
-        const sortRelatedSections = (sections) => [...(sections ?? [])]
-            .filter((e) => !!e?.section)
-            .sort((a, b) => {
-            const ae = a.entityOrder ?? Number.MAX_SAFE_INTEGER;
-            const be = b.entityOrder ?? Number.MAX_SAFE_INTEGER;
-            if (ae !== be)
-                return ae - be;
-            const ao = a.section?.order ?? 0;
-            const bo = b.section?.order ?? 0;
-            return ao - bo;
-        })
-            .map((e) => e.section);
-        // Determine effective order for main sections: if any BEFORE related merged that section, use its order; otherwise keep main order
-        const computeEffectiveMainOrder = (s) => {
-            const defaultOrder = s?.order ?? 0;
-            const beforeOverride = beforeOverrideSectionOrders?.[s?.id ?? ''];
-            return beforeOverride != null ? beforeOverride : defaultOrder;
-        };
-        // Build combined section list:
-        // 1) related-before (entity-sorted)
-        // 2) middle block: main sections + related-middle-only sections sorted by their section.order (with effective order for main)
-        // 3) related-after (entity-sorted)
-        const beforeSections = sortRelatedSections(beforeExtraSections);
-        const mainSectionsList = [...filterValidSections(mainSections)];
-        const middleOnlySections = middleExtraSections.map((e) => e.section);
-        const middleBlock = [...mainSectionsList, ...middleOnlySections].sort((a, b) => {
-            const ao = computeEffectiveMainOrder(a);
-            const bo = computeEffectiveMainOrder(b);
-            return ao - bo;
-        });
-        const afterSections = sortRelatedSections(afterExtraSections);
-        const combinedSections = [...beforeSections, ...middleBlock, ...afterSections];
-        // Debug: Log final sorted sections for verification
-        try {
-            const beforeEntityOrderMap = new Map(beforeExtraSections.map((e) => [e.section?.id, e.entityOrder ?? Number.MAX_SAFE_INTEGER]));
-            const afterEntityOrderMap = new Map(afterExtraSections.map((e) => [e.section?.id, e.entityOrder ?? Number.MAX_SAFE_INTEGER]));
-            const debugSections = [
-                ...beforeSections.map((s) => ({
-                    bucket: 'before',
-                    id: s?.id,
-                    sectionOrder: s?.order ?? 0,
-                    entityOrder: beforeEntityOrderMap.get(s?.id) ?? Number.MAX_SAFE_INTEGER,
-                })),
-                ...middleBlock.map((s) => ({
-                    bucket: 'middle',
-                    id: s?.id,
-                    sectionOrder: s?.order ?? 0,
-                    effectiveOrder: computeEffectiveMainOrder(s),
-                })),
-                ...afterSections.map((s) => ({
-                    bucket: 'after',
-                    id: s?.id,
-                    sectionOrder: s?.order ?? 0,
-                    entityOrder: afterEntityOrderMap.get(s?.id) ?? Number.MAX_SAFE_INTEGER,
-                })),
-            ];
-            // eslint-disable-next-line no-console
-            console.debug('[AXP] merge-details sorted sections', debugSections);
-        }
-        catch { }
-        // Create expression evaluator for actions
-        const evaluateExpressions = dependencies?.expressionEvaluator
-            ? this.createExpressionEvaluator(rootContext, dependencies.expressionEvaluator)
-            : null;
-        const getVisiblePropertyByGroupId = async (groupId) => {
-            return (mergedPropsByGroup[groupId] ?? []);
-        };
-        const getPropertyLayout = (name, prop) => {
-            // Prefer per-property layout (for merged related props), fallback to main entity layout
-            return prop?.__layout ?? singleInterface?.properties?.find((p) => p.name === name)?.layout;
-        };
-        // Get related entities for tabs
-        const tabDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'tab-detail');
-        const tabListEntities = entity?.relatedEntities?.filter((re) => !re.hidden && (!re.layout?.type || re.layout?.type === 'tab-list'));
-        // Build related tabs if dependencies are provided
-        const tabDetailTabs = await this.buildTabDetails(tabDetailEntities ?? [], dependencies);
-        const tabListTabs = await this.buildTabLists(tabListEntities ?? [], rootContext, dependencies);
-        // Build actions from single interface
-        const actions = this.buildActions(entity, singleInterface);
-        console.log({ rootContext, dependencies });
-        return {
-            id: entity?.name ?? '',
-            // title: singleInterface?.title ?? entity?.formats.individual ?? '',
-            title: rootTitle ?? entity?.formats.individual,
-            label: entity?.formats.displayName ?? singleInterface?.title ?? '',
-            icon: entity?.icon,
-            actions: await this.buildEvaluatedActions(actions, evaluateExpressions),
-            isPrimary: true,
-            settings: {
-                commands: {
-                    reject: {
-                        title: 't("discard")',
-                        color: 'default',
-                        visible: '{{context.isDirty()}}',
-                        command: {
-                            name: 'discard',
-                        },
-                    },
-                    accept: {
-                        title: 't("confirm")',
-                        color: 'secondary',
-                        visible: '{{context.isDirty()}}',
-                        command: {
-                            name: 'update-entity',
-                        },
-                    },
-                },
-            },
-            load: async () => {
-                return {
-                    success: true,
-                    result: rootContext,
-                };
-            },
-            execute: async (e, context) => {
-                if (e.name == 'update-entity') {
-                    const fn = entity?.commands?.update?.execute;
-                    const result = await fn(context);
-                    return {
-                        success: true,
-                        result: result,
-                    };
-                }
-                else {
-                    // Find action in single interface actions
-                    const action = actions.find((a) => a.name === e.name);
-                    if (action && dependencies?.workflowService) {
-                        // Evaluate action options with current context
-                        let evaluatedOptions = action.options;
-                        if (evaluateExpressions && action.options) {
-                            try {
-                                evaluatedOptions = await evaluateExpressions(action.options);
-                            }
-                            catch {
-                                // Keep original options if evaluation fails
-                            }
-                        }
-                        const commandName = e.name.split('&')[0];
-                        if (this.workflowService.exists(commandName)) {
-                            await this.workflowService.execute(commandName, {
-                                entity: getEntityInfo(entity).source,
-                                data: context,
-                                entityInfo: {
-                                    name: entity.name,
-                                    module: entity.module,
-                                    title: entity.title,
-                                    parentKey: entity.parentKey,
-                                    source: entity.source,
-                                },
-                                options: evaluatedOptions,
-                                metadata: action.metadata,
-                            });
-                            return {
-                                success: true,
-                            };
-                        }
-                        if (this.commandService.exists(commandName)) {
-                            // check options for evaluation
-                            await this.commandService.execute(commandName, e.options);
-                        }
-                    }
-                    return {
-                        success: false,
-                        error: {
-                            code: 'invalid_command',
-                            message: 'Invalid command',
-                        },
-                    };
-                }
-            },
-            tabs: [...tabDetailTabs, ...tabListTabs, ...nestedTabListTabs],
-            content: [
-                {
-                    type: 'grid-layout',
-                    mode: 'edit',
-                    options: {
-                        grid: {
-                            default: {
-                                columns: 12,
-                                rows: 1,
-                                gap: '20px',
-                            },
-                        },
-                    },
-                    children: await Promise.all(combinedSections.map(async (s) => ({
-                        type: 'grid-item-layout',
-                        name: s.id,
-                        options: {
-                            colSpan: s.layout?.positions?.lg?.colSpan ?? 12,
-                            colStart: s.layout?.positions?.lg?.colStart ?? 1,
-                            colEnd: s.layout?.positions?.lg?.colEnd ?? 13,
-                        },
-                        children: [
-                            {
-                                type: 'fieldset-layout',
-                                options: {
-                                    title: allGroups.find((g) => g.id === s.id)?.title ?? '',
-                                    collapsible: true,
-                                    isOpen: !s.collapsed,
-                                    look: 'card'
-                                },
-                                children: [
-                                    {
-                                        type: 'grid-layout',
-                                        options: {
-                                            grid: {
-                                                default: {
-                                                    columns: 12,
-                                                    rows: 1,
-                                                    gap: '20px',
-                                                },
-                                            },
-                                        },
-                                        children: (await getVisiblePropertyByGroupId(s.id)).map((p) => {
-                                            const layout = getPropertyLayout(p.name, p);
-                                            const prefixed = p.__dataPath ? `${p.__dataPath}.${p.name}` : p.name;
-                                            return {
-                                                type: 'grid-item-layout',
-                                                name: prefixed,
-                                                options: {
-                                                    colSpan: layout?.positions?.lg?.colSpan,
-                                                    colStart: layout?.positions?.lg?.colStart,
-                                                    colEnd: layout?.positions?.lg?.colEnd,
-                                                    hidden: p.schema.hidden,
-                                                },
-                                                children: [
-                                                    {
-                                                        type: 'form-field',
-                                                        options: {
-                                                            label: p.title,
-                                                            showLabel: layout?.label?.visible ?? true,
-                                                        },
-                                                        children: [
-                                                            {
-                                                                type: p.schema.interface?.type ?? '',
-                                                                path: prefixed,
-                                                                name: prefixed,
-                                                                defaultValue: p.schema.defaultValue,
-                                                                children: p.schema.interface?.children,
-                                                                triggers: p.schema.interface?.triggers,
-                                                                valueTransforms: p.schema.interface?.valueTransforms,
-                                                                options: merge(p.schema.interface?.options, {
-                                                                    validations: p.validations?.map((c) => ({
-                                                                        rule: c.rule,
-                                                                        message: c.message,
-                                                                        options: c.options,
-                                                                    })),
-                                                                    // Attach dataPath for merged properties to be available in widgets/options if needed
-                                                                    dataPath: p.__dataPath,
-                                                                }),
-                                                            },
-                                                        ],
-                                                    },
-                                                ],
-                                            };
-                                        }),
-                                    },
-                                ],
-                            },
-                        ],
-                    }))),
-                },
-            ],
-        };
-    }
-    buildActions(entity, singleInterface) {
-        const actions = singleInterface?.actions ?? [];
-        return actions.map((action) => new AXPEntityCommandTriggerViewModel(entity, action));
-    }
-    createExpressionEvaluator(context, expressionEvaluator) {
-        return async (actionData) => {
-            const scope = {
-                context: {
-                    eval: (path) => {
-                        const value = get(context, path);
-                        return value;
-                    },
-                },
-            };
-            return await expressionEvaluator.evaluate(actionData, scope);
-        };
-    }
-    async buildEvaluatedActions(actions, evaluateExpressions) {
-        const evaluatedActions = [];
-        for (const action of actions) {
-            // Evaluate disabled condition
-            let disabled = action.disabled;
-            if (disabled && typeof disabled === 'string' && evaluateExpressions) {
-                try {
-                    const result = await evaluateExpressions({ disabled: disabled });
-                    disabled = result.disabled;
-                }
-                catch {
-                    disabled = false;
-                }
-            }
-            // Evaluate hidden condition
-            let hidden = action.hidden;
-            if (hidden && typeof hidden === 'string' && evaluateExpressions) {
-                try {
-                    const result = await evaluateExpressions({ hidden: hidden });
-                    hidden = result.hidden;
-                }
-                catch {
-                    hidden = false;
-                }
-            }
-            // Skip if hidden
-            if (hidden)
-                continue;
-            // Evaluate options
-            let options = action.options;
-            if (options && evaluateExpressions) {
-                try {
-                    options = await evaluateExpressions(options);
-                }
-                catch {
-                    // Keep original options if evaluation fails
-                }
-            }
-            evaluatedActions.push({
-                name: action.name,
-                title: action.title,
-                icon: action.icon,
-                color: action.color,
-                disabled: disabled || false,
-                zone: 'header',
-                priority: action.priority,
-                command: {
-                    name: action.name,
-                    options: options,
-                    metadata: action.metadata,
-                },
-            });
-        }
-        return evaluatedActions;
-    }
-    async buildTabDetails(tabDetailEntities, dependencies) {
-        if (!dependencies?.entityResolver || !tabDetailEntities?.length) {
-            return [];
-        }
-        const tabs = [];
-        for (const relatedEntity of tabDetailEntities) {
-            const converter = this.relatedEntityConverterFactory.createTabDetailsConverter();
-            tabs.push(await converter.convert(relatedEntity, {
-                entityResolver: dependencies.entityResolver,
-            }));
-        }
-        return tabs;
-    }
-    async buildTabLists(tabListEntities, rootContext, dependencies) {
-        if (!dependencies?.entityResolver || !tabListEntities?.length) {
-            return [];
-        }
-        const tabs = [];
-        for (const relatedEntity of tabListEntities) {
-            const converter = this.relatedEntityConverterFactory.createTabListConverter();
-            tabs.push(await converter.convert(relatedEntity, {
-                entityResolver: dependencies.entityResolver,
-                expressionEvaluator: dependencies.expressionEvaluator,
-                context: rootContext,
-            }));
-        }
-        return tabs;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPMainEntityContentBuilder, deps: [{ token: AXPRelatedEntityConverterFactory }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPMainEntityContentBuilder, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPMainEntityContentBuilder, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: AXPRelatedEntityConverterFactory }] });
-
-class AXPLayoutAdapterFactory {
-    constructor(relatedEntityConverterFactory, mainEntityContentBuilder, layoutAdapterBuilder) {
-        this.relatedEntityConverterFactory = relatedEntityConverterFactory;
-        this.mainEntityContentBuilder = mainEntityContentBuilder;
-        this.layoutAdapterBuilder = layoutAdapterBuilder;
-    }
-    async createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies) {
-        const entity = await entityResolver.resolve(moduleName, entityName);
-        if (!entity) {
-            throw new Error(`Entity ${moduleName}.${entityName} not found`);
-        }
-        const rootContext = await this.loadRootContext(entity, id);
-        // Build main and related pages
-        const mainPage = await this.buildMainPage(entity, rootContext, dependencies);
-        const relatedPages = await this.buildRelatedPages(entity, rootContext, dependencies);
-        // Compose ordered pages around the primary page
-        const orderedPages = this.composePagesWithPositions(mainPage, relatedPages, entity);
-        return this.layoutAdapterBuilder
-            .setEntity(entity, rootContext)
-            .setDependencies(dependencies)
-            .setPages(orderedPages)
-            .build();
-    }
-    async loadRootContext(entity, id) {
-        const fn = entity?.queries.byKey?.execute;
-        return await fn(id);
-    }
-    async buildMainPage(entity, rootContext, dependencies) {
-        return this.mainEntityContentBuilder.build(entity, rootContext, dependencies, await this.getRootTitle(entity, rootContext, dependencies));
-    }
-    async buildRelatedPages(entity, rootContext, dependencies) {
-        const pages = [];
-        const rootTitle = await this.getRootTitle(entity, rootContext, dependencies);
-        // Page Details
-        const pageDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-detail');
-        for (const relatedEntity of pageDetailEntities || []) {
-            const converter = this.relatedEntityConverterFactory.createPageDetailsConverter();
-            pages.push(await converter.convert(relatedEntity, {
-                ...dependencies,
-                context: rootContext,
-                rootTitle: rootTitle,
-            }));
-        }
-        // Page Lists
-        const pageListEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-list');
-        for (const relatedEntity of pageListEntities || []) {
-            const converter = this.relatedEntityConverterFactory.createPageListConverter();
-            pages.push(await converter.convert(relatedEntity, {
-                ...dependencies,
-                context: rootContext,
-                rootTitle: rootTitle,
-            }));
-        }
-        // Include nested page-related entities from merge-detail related entities
-        const mergeDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'merge-detail');
-        for (const mergeRelated of mergeDetailEntities || []) {
-            try {
-                const [moduleName, childEntityName] = (mergeRelated.entity || '').split('.');
-                const childEntity = await dependencies.entityResolver.resolve(moduleName, childEntityName);
-                if (!childEntity) {
-                    continue;
-                }
-                const nestedDataPath = mergeRelated?.persistence?.dataPath || childEntityName;
-                const nestedContext = get(rootContext, nestedDataPath) ?? rootContext;
-                const nestedPageDetailEntities = childEntity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-detail');
-                for (const nestedRelated of nestedPageDetailEntities || []) {
-                    const converter = this.relatedEntityConverterFactory.createPageDetailsConverter();
-                    pages.push(await converter.convert(nestedRelated, {
-                        ...dependencies,
-                        context: nestedContext,
-                        rootTitle: rootTitle,
-                    }));
-                }
-                const nestedPageListEntities = childEntity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-list');
-                for (const nestedRelated of nestedPageListEntities || []) {
-                    const converter = this.relatedEntityConverterFactory.createPageListConverter();
-                    pages.push(await converter.convert(nestedRelated, {
-                        ...dependencies,
-                        context: nestedContext,
-                        rootTitle: rootTitle,
-                    }));
-                }
-            }
-            catch {
-                // Silently ignore failures for nested page inclusions
-            }
-        }
-        return pages;
-    }
-    composePagesWithPositions(mainPage, relatedPages, entity) {
-        // Only consider related entities with layout types page-detail or page-list
-        const pageEntities = (entity?.relatedEntities || []).filter((re) => !re.hidden && (re.layout?.type === 'page-detail' || re.layout?.type === 'page-list'));
-        // Build a map from entity name to its layout config (order/position)
-        const layoutConfigByEntity = {};
-        for (const re of pageEntities) {
-            const [, entityName] = (re.entity || '').split('.');
-            const key = entityName || re.entity;
-            layoutConfigByEntity[key] = { order: re.layout?.order, position: re.layout?.position };
-        }
-        // Split related pages into before/after buckets based on their relatedEntity layout
-        const before = [];
-        const after = [];
-        for (const page of relatedPages) {
-            const conf = layoutConfigByEntity[page.id];
-            const position = conf?.position ?? 'after';
-            if (position === 'before') {
-                before.push(page);
-            }
-            else {
-                after.push(page);
-            }
-        }
-        // Sort by order within each bucket (undefined orders go last)
-        const sortByOrder = (a, b) => {
-            const ao = layoutConfigByEntity[a.id]?.order ?? Number.POSITIVE_INFINITY;
-            const bo = layoutConfigByEntity[b.id]?.order ?? Number.POSITIVE_INFINITY;
-            return ao - bo;
-        };
-        before.sort(sortByOrder);
-        after.sort(sortByOrder);
-        // Ensure the main page is primary
-        mainPage.isPrimary = true;
-        // Compose final pages: before -> main -> after
-        return [...before, mainPage, ...after];
-    }
-    async getRootTitle(entity, rootContext, dependencies) {
-        // Logic for getting root title
-        const title = await dependencies.expressionEvaluator.evaluate(entity.interfaces?.master?.single?.title, rootContext);
-        return title;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLayoutAdapterFactory, deps: [{ token: AXPRelatedEntityConverterFactory }, { token: AXPMainEntityContentBuilder }, { token: AXPLayoutAdapterBuilder }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLayoutAdapterFactory, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLayoutAdapterFactory, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: () => [{ type: AXPRelatedEntityConverterFactory }, { type: AXPMainEntityContentBuilder }, { type: AXPLayoutAdapterBuilder }] });
-
-const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver = inject(AXPEntityDefinitionRegistryService), expressionEvaluator = inject(AXPExpressionEvaluatorService), session = inject(AXPSessionService), formatService = inject(AXFormatService), workflowService = inject(AXPWorkflowService), layoutAdapterFactory = inject(AXPLayoutAdapterFactory)) => {
-    const moduleName = route.parent?.paramMap.get('module');
-    const entityName = route.paramMap.get('entity');
-    const id = route.paramMap.get('id');
-    const dependencies = {
-        entityResolver,
-        expressionEvaluator,
-        session,
-        formatService,
-        workflowService,
-    };
-    return await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
-};
-
-class AXPEntityCommandSearchDefinitionProvider {
-    async provide(context) {
-        context.addDefinition('command', 'Commands', 'command', 'fa-solid fa-command', 1, {
-            format: {
-                id: '{{id}}',
-            },
-            actions: [
-                {
-                    name: 'open-entity',
-                    type: 'view',
-                    priority: 'primary',
-                },
-            ],
-        });
-    }
-}
-
-class AXPEntitySearchDefinitionProvider {
-    constructor() {
-        this.entityRegister = inject(AXPEntityDefinitionRegistryService);
-    }
-    async provide(context) {
-        console.log("AXPEntitySearchDefinitionProvider", this.entityRegister.getAll());
-        this.entityRegister.getAll().forEach((entity) => {
-            context.addDefinition(`Module.${entity.module}.${entity.name}`, entity.formats.searchResult?.description ?? entity.module, `Module.${entity.module}`, 'fa-solid fa-objects-column', 4, {
-                actions: [
-                    {
-                        name: 'open-entity',
-                        type: 'view',
-                        priority: 'primary',
-                    },
-                ],
-                format: {
-                    title: entity.formats.searchResult?.title,
-                    description: (entity.formats.searchResult?.description ?? entity.module) + ' / ' + entity.title,
-                    id: '{{data.id}}',
-                },
-            });
-        });
-    }
-}
-
-//#region ----   Column Mapping Helpers   ----
-/**
- * Maps an entity property to a list widget column configuration.
- * Preserves readonly behavior and leverages the property's interface options when available.
- */
-function mapPropertyToWidgetColumn(property) {
-    return {
-        name: property.name,
-        title: property.title,
-        visible: true,
-        widget: property.schema?.interface
-            ? {
-                type: property.schema.interface.type || 'text-editor',
-                path: property.name,
-                options: {
-                    readonly: true,
-                    ...property.schema.interface.options,
-                },
-            }
-            : {
-                type: 'text-editor',
-                path: property.name,
-                options: { readonly: true },
-            },
-    };
-}
-/**
- * Maps an entity column metadata (and its related property) to a list widget column configuration.
- */
-function mapEntityColumnToWidgetColumn(entity, column) {
-    const property = entity.properties.find((p) => p.name === column.name);
-    return {
-        name: column.name,
-        title: column.title || property?.title || column.name,
-        width: column.options?.width,
-        visible: column.options?.visible !== false,
-        widget: property?.schema?.interface
-            ? {
-                type: property.schema.interface.type || 'text-editor',
-                path: column.options?.dataPath || column.name,
-                options: {
-                    readonly: true,
-                    ...property.schema.interface.options,
-                },
-            }
-            : {
-                type: 'text-editor',
-                path: column.options?.dataPath || column.name,
-                options: { readonly: true },
-            },
-    };
-}
-//#endregion
-//#region ----   Include/Exclude Utilities   ----
-/**
- * Applies include and exclude filters to a named collection while preserving order.
- */
-function applyIncludeExclude(items, include = [], exclude = []) {
-    let result = items;
-    if (include.length > 0) {
-        result = result.filter((i) => include.includes(i.name));
-    }
-    if (exclude.length > 0) {
-        result = result.filter((i) => !exclude.includes(i.name));
-    }
-    return result;
-}
-/**
- * Returns only visible (non-hidden) properties of an entity.
- */
-function getVisibleProperties(entity) {
-    return entity.properties.filter((prop) => !prop.schema?.hidden);
-}
-//#endregion
-
-class AXPEntityListTableService {
-    constructor() {
-        //#region ----   Services & Dependencies   ----
-        this.entityResolver = inject(AXPEntityResolver);
-        this.workflow = inject(AXPWorkflowService);
-        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
-        this.evaluateExpressions = async (options, data) => {
-            if (!options) {
-                return {};
-            }
-            const scope = {
-                context: {
-                    eval: (path) => {
-                        return get(data, path);
-                    },
-                },
-            };
-            return await this.expressionEvaluator.evaluate(options, scope);
-        };
-    }
-    //#endregion
-    //#region ----   Public Methods   ----
-    /**
-     * Convert Entity to List Widget Options
-     */
-    async convertEntityToListOptions(entity, options, allActions) {
-        const listOptions = {
-            // 📊 Data Source
-            dataSource: this.createDataSource(entity),
-            // 📋 Columns from Properties
-            columns: this.createColumnsFromProperties(entity, options),
-            // 🎯 Row Commands from Actions
-            primaryCommands: this.createRowCommands(allActions, 'primary'),
-            secondaryCommands: this.createRowCommands(allActions, 'secondary'),
-            // ⚙️ Table Features
-            showIndex: entity.interfaces?.master?.list?.views?.[0]?.indexCol ?? false,
-            allowSelection: this.hasSelectedScopeActions(entity),
-            paging: true,
-            showHeader: true,
-            showFooter: false,
-            // 🔗 Entity Configuration
-            parentField: entity.parentKey,
-            fetchDataMode: 'manual',
-            minHeight: 250,
-            // 🎪 Events
-            ...this.createDefaultEvents(entity, allActions),
-        };
-        return listOptions;
-    }
-    //#endregion
-    //#region ----   Private Methods   ----
-    /**
-     * Create DataSource for Entity
-     */
-    createDataSource(entity) {
-        return new AXDataSource({
-            byKey: (key) => {
-                const func = entity.queries.byKey.execute;
-                return func(key);
-            },
-            load: (e) => {
-                const func = entity.queries.list?.execute;
-                if (!func) {
-                    throw new Error(`Entity ${entity.name} does not have a list query`);
-                }
-                return func(e);
-            },
-            pageSize: entity.interfaces?.master?.list?.views?.[0]?.pageSize || 10,
-            key: 'id',
-        });
-    }
-    /**
-     * Convert Properties to Columns
-     */
-    createColumnsFromProperties(entity, options) {
-        const excludeColumns = options?.excludeColumns || [];
-        const includeColumns = options?.includeColumns || [];
-        // If columns are defined, use them; otherwise use visible properties
-        const baseColumns = entity.columns && entity.columns.length > 0
-            ? entity.columns.map((col) => this.mapEntityColumnToWidgetColumn(entity, col))
-            : getVisibleProperties(entity).map((prop) => mapPropertyToWidgetColumn(prop));
-        return applyIncludeExclude(baseColumns, includeColumns, excludeColumns);
+        return this.executeWithMiddleware(context, handler);
     }
     /**
-     * Map EntityTableColumn to ListWidgetColumn
+     * Execute updateOne operation with middleware pipeline
      */
-    mapEntityColumnToWidgetColumn(entity, column) {
-        return mapEntityColumnToWidgetColumn(entity, column);
+    async updateOne(entityName, id, keyValues) {
+        const context = {
+            operation: 'updateOne',
+            entityName,
+            dbName: this.storageService.dbName,
+            input: { id, keyValues },
+            metadata: {
+                startTime: Date.now(),
+                requestId: generateRequestId(),
+            },
+        };
+        const handler = async (ctx) => {
+            return this.storageService.updateOne(ctx.entityName, ctx.input.id, ctx.input.keyValues);
+        };
+        return this.executeWithMiddleware(context, handler);
     }
     /**
-     * Convert Entity Actions to Row Commands
+     * Execute deleteOne operation with middleware pipeline
      */
-    createRowCommands(actions, priority) {
-        return actions
-            .filter((action) => action.scope === AXPEntityCommandScope.Individual && // Only individual actions
-            action.priority === priority && // Matching priority
-            !action.hidden)
-            .map((action) => ({
-            name: action.name,
-            text: action.title,
-            icon: action.icon,
-            color: action.color,
-            look: 'outline',
-            visible: !action.hidden,
-            disabled: action.disabled,
-        }));
+    async deleteOne(entityName, id) {
+        const context = {
+            operation: 'deleteOne',
+            entityName,
+            dbName: this.storageService.dbName,
+            input: { id },
+            metadata: {
+                startTime: Date.now(),
+                requestId: generateRequestId(),
+            },
+        };
+        const handler = async (ctx) => {
+            return this.storageService.deleteOne(ctx.entityName, ctx.input.id);
+        };
+        return this.executeWithMiddleware(context, handler);
     }
     /**
-     * Check if entity has Selected Scope Actions
+     * Execute query operation with middleware pipeline
      */
-    hasSelectedScopeActions(entity) {
-        const actions = entity.interfaces?.master?.list?.actions || [];
-        return actions.some((action) => action.scope === AXPEntityCommandScope.Selected);
+    async query(entityName, request) {
+        const context = {
+            operation: 'query',
+            entityName,
+            dbName: this.storageService.dbName,
+            input: { request },
+            metadata: {
+                startTime: Date.now(),
+                requestId: generateRequestId(),
+            },
+        };
+        const handler = async (ctx) => {
+            return this.storageService.query(ctx.entityName, ctx.input.request);
+        };
+        return this.executeWithMiddleware(context, handler);
     }
     /**
-     * Handle execution of a row command (shared by double-click and command handlers)
+     * Execute initial operation with middleware pipeline
      */
-    async handleRowCommand(e, selectedRows, entity, allActions) {
-        const data = e.data;
-        const commandName = e.name;
-        const action = allActions.find((c) => {
-            return (c.name == e.name &&
-                ((selectedRows?.length
-                    ? c.scope == AXPEntityCommandScope.Selected
-                    : c.scope == AXPEntityCommandScope.Individual) ||
-                    c.scope == AXPEntityCommandScope.TypeLevel));
-        });
-        const command = commandName.split('&')[0];
-        const options = await this.evaluateExpressions(action?.options, data);
-        await this.workflow.execute(command, {
-            entity: getEntityInfo(entity).source,
-            entityInfo: {
-                name: entity.name,
-                module: entity.module,
-                title: entity.title,
-                parentKey: entity.parentKey,
-                source: entity.source,
+    async initial(entityName, collection, options) {
+        const context = {
+            operation: 'initial',
+            entityName,
+            dbName: this.storageService.dbName,
+            input: { collection, options },
+            metadata: {
+                startTime: Date.now(),
+                requestId: generateRequestId(),
             },
-            data: action?.scope == AXPEntityCommandScope.Selected ? selectedRows : data,
-            options: options,
-            metadata: action?.metadata,
-        });
-        console.log('Entity List - Row command:', e.name, e.data);
+        };
+        const handler = async (ctx) => {
+            return this.storageService.initial(ctx.entityName, ctx.input.collection, ctx.input.options);
+        };
+        return this.executeWithMiddleware(context, handler);
     }
     /**
-     * Create default events
+     * Execute operation with middleware pipeline
      */
-    createDefaultEvents(entity, allActions) {
-        return {
-            onRowClick: (row) => {
-                console.log('Entity List - Row clicked:', row);
-            },
-            onRowDoubleClick: (e) => {
-                console.log('Entity List - Row double clicked:', e);
-                const defaultAction = allActions.find((c) => {
-                    const commandName = c.name.split('&')[0];
-                    return (c.default || commandName === 'open-entity') && !c.hidden;
-                });
-                if (!defaultAction) {
-                    return;
-                }
-                const d = {
-                    component: e.component,
-                    name: defaultAction.name,
-                    data: e.data,
-                };
-                this.handleRowCommand(d, undefined, entity, allActions);
-            },
-            onSelectionChange: (selectedRows) => {
-                console.log('Entity List - Selection changed:', selectedRows);
-            },
-            onRowCommand: async (e, selectedRows) => {
-                await this.handleRowCommand(e, selectedRows, entity, allActions);
-            },
-        };
+    async executeWithMiddleware(context, handler) {
+        const middlewares = this.registry.getMiddlewares(context.entityName, context.operation);
+        // Wrap middlewares with injection context
+        const wrappedMiddlewares = middlewares.map(middleware => {
+            return (ctx, next) => runInInjectionContext(this.injector, () => middleware(ctx, next));
+        });
+        const composed = composeEntityStorageMiddlewares(wrappedMiddlewares)(handler);
+        return composed(context);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityListTableService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityListTableService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityStorageExecutor, deps: [{ token: AXPEntityStorageService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityStorageExecutor, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityListTableService, decorators: [{
-            type: Injectable
-        }] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityStorageExecutor, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }], ctorParameters: () => [{ type: AXPEntityStorageService }] });
 
-class AXPEntityListToolbarService {
-    constructor() {
-        //#region ----   Services & Dependencies   ----
-        this.widgetResolver = inject(AXPWidgetRegistryService);
+/**
+ * Entity Storage Service with middleware support
+ *
+ * This service wraps the original AXPEntityStorageService and adds middleware pipeline support.
+ * It delegates all operations to the middleware executor which applies the middleware chain.
+ */
+class AXPEntityStorageWithMiddlewareService extends AXPEntityStorageService {
+    constructor(originalStorageService, registry) {
+        super();
+        this.originalStorageService = originalStorageService;
+        this.registry = registry;
+        this.executor = new AXPEntityStorageExecutor(originalStorageService);
     }
-    //#endregion
-    //#region ----   Public Methods   ----
-    /**
-     * Convert Entity to Toolbar Options
-     */
-    async convertEntityToolbarOptions(entity, options) {
-        const toolbarOptions = {
-            filterDefinitions: this.createFilterDefinitions(entity),
-            columnDefinitions: this.createColumnDefinitions(entity, options),
-            sortDefinitions: this.createSortDefinitions(entity),
-        };
-        return toolbarOptions;
+    get dbName() {
+        return this.originalStorageService.dbName;
     }
-    //#endregion
-    //#region ----   Private Methods   ----
+    // Middleware Management Methods
     /**
-     * Create Filter Definitions for Toolbar
+     * Add a global middleware that applies to all operations
      */
-    createFilterDefinitions(entity) {
-        const props = entity.properties.filter((c) => c.options?.filter?.advance?.enabled || c.options?.filter?.inline?.enabled);
-        return props.map((e) => {
-            const widgetConfig = this.widgetResolver.resolve(e.schema.interface?.type);
-            const type = (e.options?.filter?.advance?.widgetType ||
-                widgetConfig?.defaultFilterWidgetName ||
-                e.schema.interface?.type);
-            return {
-                title: e.title,
-                field: e.name,
-                operator: {
-                    type: 'contains',
-                },
-                widget: { ...e.schema.interface, path: e.name, type },
-                filters: [],
-                isParametric: false,
-                icon: widgetConfig?.icon,
-                filterType: {
-                    advance: e.options?.filter?.advance?.enabled ?? false,
-                    inline: e.options?.filter?.inline?.enabled ?? false,
-                },
-            };
-        });
+    useGlobal(middleware) {
+        this.registry.useGlobal(middleware);
     }
     /**
-     * Create Column Definitions for Toolbar
+     * Add middleware for specific entity
      */
-    createColumnDefinitions(entity, options) {
-        const { columns = [] } = entity;
-        const excludeColumns = options?.excludeColumns || [];
-        const includeColumns = options?.includeColumns || [];
-        const visibleProperties = getVisibleProperties(entity);
-        const visiblePropNames = new Set(visibleProperties.map(({ name }) => name));
-        // Prefer explicit entity.columns if present; fallback to visible properties
-        const baseColumns = columns.length > 0
-            ? columns
-                .filter(({ name }) => visiblePropNames.has(name))
-                .map((column) => {
-                const property = visibleProperties.find(({ name }) => name === column.name);
-                return {
-                    name: column.name,
-                    title: property?.title,
-                    visible: column?.options?.visible ?? true,
-                };
-            })
-            : visibleProperties.map((property) => ({
-                name: property.name,
-                title: property.title,
-                visible: true,
-            }));
-        return applyIncludeExclude(baseColumns, includeColumns, excludeColumns);
+    useForEntity(entityName, middleware) {
+        this.registry.useForEntity(entityName, middleware);
     }
     /**
-     * Create Sort Definitions for Toolbar
+     * Add middleware for specific operation
      */
-    createSortDefinitions(entity) {
-        const props = entity.properties.filter((c) => c.options?.sort?.enabled);
-        return props.map((e) => {
-            return {
-                name: e.name,
-                title: e.title,
-            };
-        });
+    useForOperation(operation, middleware) {
+        this.registry.useForOperation(operation, middleware);
+    }
+    // Storage Operations with Middleware Pipeline
+    async initial(entityName, collection, options) {
+        return this.executor.initial(entityName, collection, options);
+    }
+    async getOne(entityName, id) {
+        return this.executor.getOne(entityName, id);
+    }
+    async updateOne(entityName, id, keyValues) {
+        return this.executor.updateOne(entityName, id, keyValues);
+    }
+    async deleteOne(entityName, id) {
+        return this.executor.deleteOne(entityName, id);
+    }
+    async insertOne(entityName, entity) {
+        return this.executor.insertOne(entityName, entity);
+    }
+    async getAll(entityName) {
+        return this.executor.getAll(entityName);
+    }
+    async query(entityName, request) {
+        return this.executor.query(entityName, request);
+    }
+    // Direct access to original service (bypass middleware)
+    get originalService() {
+        return this.originalStorageService;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityListToolbarService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityListToolbarService }); }
+    // Access to registry for advanced middleware management
+    get middlewareRegistry() {
+        return this.registry;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityStorageWithMiddlewareService, deps: [{ token: AXPEntityStorageService }, { token: AXPEntityStorageRegistry }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityStorageWithMiddlewareService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityListToolbarService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityStorageWithMiddlewareService, decorators: [{
             type: Injectable
-        }] });
+        }], ctorParameters: () => [{ type: AXPEntityStorageService }, { type: AXPEntityStorageRegistry }] });
 
-class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
-    constructor() {
-        super(...arguments);
-        this.entityResolver = inject(AXPEntityResolver);
-        this.workflow = inject(AXPWorkflowService);
-        this.entityListTableService = inject(AXPEntityListTableService);
-        this.entityListToolbarService = inject(AXPEntityListToolbarService);
-        this.layoutThemeService = inject(AXPLayoutThemeService);
-        this.isMounted = signal(false, ...(ngDevMode ? [{ debugName: "isMounted" }] : []));
-        this.entity = signal(null, ...(ngDevMode ? [{ debugName: "entity" }] : []));
-        this.listNode = signal(null, ...(ngDevMode ? [{ debugName: "listNode" }] : []));
-        this.list = viewChild('list', ...(ngDevMode ? [{ debugName: "list" }] : []));
-        this.allWidgets = viewChildren(AXPWidgetRendererDirective, ...(ngDevMode ? [{ debugName: "allWidgets" }] : []));
-        this.listWidget = linkedSignal(() => this.allWidgets().find((widget) => widget.node()?.type === AXPWidgetsCatalog.list));
-        this.toolbarWidget = computed(() => this.allWidgets().find((widget) => widget.node()?.type === AXPWidgetsCatalog.listToolbar), ...(ngDevMode ? [{ debugName: "toolbarWidget" }] : []));
-        this.selectedItems = signal([], ...(ngDevMode ? [{ debugName: "selectedItems" }] : []));
-        this.toolbarNode = signal(null, ...(ngDevMode ? [{ debugName: "toolbarNode" }] : []));
-        this.destroyed = new Subject();
-        //options
-        this.entitySource = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entitySource" }] : []));
-        this.excludeColumns = computed(() => this.options()['excludeColumns'], ...(ngDevMode ? [{ debugName: "excludeColumns" }] : []));
-        this.includeColumns = computed(() => this.options()['includeColumns'], ...(ngDevMode ? [{ debugName: "includeColumns" }] : []));
-        this.externalActions = computed(() => this.options()['actions'], ...(ngDevMode ? [{ debugName: "externalActions" }] : []));
-        this.showEntityActions = computed(() => this.options()['showEntityActions'] ?? true, ...(ngDevMode ? [{ debugName: "showEntityActions" }] : []));
-        this.showToolbar = computed(() => this.options()['showToolbar'] ?? true, ...(ngDevMode ? [{ debugName: "showToolbar" }] : []));
-        //actions
-        this.allActions = computed(() => {
-            const originalList = this.entity()?.interfaces?.master?.list?.actions ?? [];
-            const externalActionList = this.externalActions() ?? [];
-            const usedOverrideActions = new Set();
-            const mergedActions = originalList.map((originalAction) => {
-                const originalCommandName = typeof originalAction.command === 'string' ? originalAction.command : originalAction.command?.name;
-                const overrideAction = externalActionList.find((action) => {
-                    const actionCommandName = typeof action?.command === 'string' ? action.command : action?.command?.name;
-                    return actionCommandName === originalCommandName;
-                });
-                if (overrideAction) {
-                    const overrideKey = `${typeof overrideAction.command === 'string' ? overrideAction.command : overrideAction.command?.name}`;
-                    usedOverrideActions.add(overrideKey);
-                    return new AXPEntityCommandTriggerViewModel(this.entity(), overrideAction);
+/**
+ * Injection token for entity storage middleware setup
+ */
+const AXP_ENTITY_STORAGE_MIDDLEWARE_SETUP = new InjectionToken('AXP_ENTITY_STORAGE_MIDDLEWARE_SETUP');
+/**
+ * Injection token for entity storage middleware extensions
+ */
+const AXP_ENTITY_STORAGE_EXTENSION = new InjectionToken('AXP_ENTITY_STORAGE_EXTENSION');
+/**
+ * Provide entity storage middleware configuration
+ */
+function provideEntityStorageMiddleware(config) {
+    const providers = [];
+    // Register extension middlewares
+    if (config.extensions) {
+        providers.push(...config.extensions.map(ext => ({
+            provide: AXP_ENTITY_STORAGE_EXTENSION,
+            useValue: ext,
+            multi: true,
+        })));
+    }
+    // Main setup provider
+    providers.push({
+        provide: AXP_ENTITY_STORAGE_MIDDLEWARE_SETUP,
+        useFactory: () => {
+            const registry = inject(AXPEntityStorageRegistry);
+            // Register global middlewares
+            if (config.global) {
+                for (const middleware of config.global) {
+                    registry.useGlobal(middleware);
                 }
-                return new AXPEntityCommandTriggerViewModel(this.entity(), originalAction);
-            });
-            const additionalActions = externalActionList
-                .filter((action) => {
-                const actionKey = `${typeof action?.command === 'string' ? action.command : action?.command?.name}`;
-                return !usedOverrideActions.has(actionKey);
-            })
-                .map((action) => new AXPEntityCommandTriggerViewModel(this.entity(), action));
-            return [...additionalActions, ...mergedActions];
-        }, ...(ngDevMode ? [{ debugName: "allActions" }] : []));
-        this.primaryActions = computed(() => {
-            const actions = this.allActions()
-                .filter((a) => a.priority == 'primary' &&
-                ((a.scope == AXPEntityCommandScope.Selected && this.selectedItems().length) ||
-                    (a.scope == AXPEntityCommandScope.TypeLevel && !this.selectedItems().length)))
-                .map((tr) => ({
-                name: tr.name,
-                title: tr.title,
-                icon: tr.icon,
-                color: tr.color,
-                disabled: tr.disabled,
-                command: {
-                    name: tr.name,
-                    options: tr.options,
-                    metadata: tr.metadata,
-                },
-            }));
-            return actions;
-        }, ...(ngDevMode ? [{ debugName: "primaryActions" }] : []));
-        this.secondaryActions = computed(() => {
-            const actions = this.allActions()
-                .filter((a) => a.priority == 'secondary' && a.scope == AXPEntityCommandScope.TypeLevel)
-                .map((tr) => ({
-                name: tr.name,
-                title: tr.title,
-                icon: tr.icon,
-                color: tr.color,
-                disabled: tr.disabled,
-                separated: tr.separated,
-                command: {
-                    name: tr.name,
-                    options: tr.options,
-                    metadata: tr.metadata,
-                },
-            }));
-            return actions;
-        }, ...(ngDevMode ? [{ debugName: "secondaryActions" }] : []));
-        //#region ----   Query Change Handler   ----
-        this.#effect = effect(() => {
-            const queries = this.getValue()?.toolbar;
-            const listInstance = this.listWidget()?.instance;
-            const dataSource = this.listWidget()?.options()['dataSource'];
-            const isMounted = this.isMounted();
-            if (!this.hasRequiredDependencies(dataSource, queries, listInstance)) {
-                return;
             }
-            untracked(() => {
-                this.handleQueryChanges(queries, dataSource, listInstance, isMounted);
-            });
-        }, ...(ngDevMode ? [{ debugName: "#effect" }] : []));
-        //#endregion
-        this.context = {};
-        this.previousQueries = null;
-    }
-    handleActionClick(item) {
-        if (item.command && (item.items?.length ?? 0) == 0) {
-            this.execute(item.command.name, null);
-        }
-    }
-    handleSecondaryActionClick(item) {
-        if (item.command) {
-            this.execute(item.command.name, null);
-        }
-    }
-    // ngDoCheck(): void {
-    //   console.log(this.listWidget()?.instance.output('selectedRows'));
-    // }
-    async execute(commandName, data) {
-        const action = this.allActions().find((c) => {
-            return (c.name == commandName &&
-                ((this.selectedItems().length
-                    ? c.scope == AXPEntityCommandScope.Selected
-                    : c.scope == AXPEntityCommandScope.Individual) ||
-                    c.scope == AXPEntityCommandScope.TypeLevel));
-        });
-        const command = commandName.split('&')[0];
-        // const options = await this.evaluateExpressions(action?.options, data);
-        await this.workflow.execute(command, {
-            entity: this.entitySource(),
-            entityInfo: {
-                name: this.entity()?.name,
-                module: this.entity()?.module,
-                title: this.entity()?.title,
-                parentKey: this.entity()?.parentKey,
-                source: this.entity()?.source,
-            },
-            data: action?.scope == AXPEntityCommandScope.Selected
-                ? this.selectedItems()
-                : action?.options?.['process']?.data || null,
-            options: action?.options,
-            metadata: action?.metadata,
-        });
-    }
-    //#region ----   Query Change Handler   ----
-    #effect;
-    /**
-     * Validates that all required dependencies are available
-     */
-    hasRequiredDependencies(dataSource, queries, listInstance) {
-        return !!(dataSource && queries && listInstance);
+            // Register entity-specific middlewares
+            if (config.entities) {
+                for (const [entityName, middlewares] of Object.entries(config.entities)) {
+                    for (const middleware of middlewares) {
+                        registry.useForEntity(entityName, middleware);
+                    }
+                }
+            }
+            // Register operation-specific middlewares
+            if (config.operations) {
+                for (const [operation, middlewares] of Object.entries(config.operations)) {
+                    for (const middleware of middlewares) {
+                        registry.useForOperation(operation, middleware);
+                    }
+                }
+            }
+            return true;
+        },
+        multi: true,
+    });
+    return makeEnvironmentProviders(providers);
+}
+/**
+ * Simplified provider for global middleware only
+ */
+function provideGlobalEntityStorageMiddleware(middlewares) {
+    return provideEntityStorageMiddleware({ global: middlewares });
+}
+/**
+ * Provider for entity-specific middlewares
+ */
+function provideEntitySpecificMiddleware(entityName, middlewares) {
+    return provideEntityStorageMiddleware({
+        entities: { [entityName]: middlewares }
+    });
+}
+/**
+ * Provider for operation-specific middlewares
+ */
+function provideOperationSpecificMiddleware(operation, middlewares) {
+    return provideEntityStorageMiddleware({
+        operations: { [operation]: middlewares }
+    });
+}
+
+/**
+ * Logging middleware for entity storage operations
+ */
+const loggingMiddleware = async (context, next) => {
+    const startTime = Date.now();
+    console.group(`🔄 Entity Storage Operation: ${context.operation}`);
+    console.log('📋 Entity:', context.entityName);
+    console.log('🗄️ Database:', context.dbName);
+    console.log('📨 Input:', context.input);
+    console.log('🆔 Request ID:', context.metadata.requestId);
+    try {
+        const result = await next(context);
+        const duration = Date.now() - startTime;
+        console.log('✅ Success');
+        console.log('⏱️ Duration:', `${duration}ms`);
+        console.log('📤 Result:', result);
+        console.groupEnd();
+        return result;
     }
-    /**
-     * Handles all query-related changes (filters, sorts, columns)
-     */
-    handleQueryChanges(queries, dataSource, listInstance, isMounted) {
-        const changeTracker = this.analyzeChanges(queries);
-        this.previousQueries = queries;
-        this.applyDataSourceChanges(dataSource, queries, changeTracker);
-        this.handleListRefresh(listInstance, changeTracker, isMounted);
-        this.handleColumnChanges(changeTracker);
+    catch (error) {
+        const duration = Date.now() - startTime;
+        console.error('❌ Error');
+        console.error('⏱️ Duration:', `${duration}ms`);
+        console.error('💥 Error:', error);
+        console.groupEnd();
+        throw error;
     }
-    /**
-     * Analyzes what has changed between current and previous queries
-     */
-    analyzeChanges(queries) {
-        const changes = getChangedPaths(queries, this.previousQueries);
-        return {
-            isFilterChanged: changes.includes('filters'),
-            isSortChanged: changes.includes('sorts'),
-            isColumnsChanged: changes.includes('columns'),
-            hasAnyChange: changes.length > 0,
+};
+/**
+ * Performance monitoring middleware
+ */
+const performanceMiddleware = async (context, next) => {
+    const startTime = performance.now();
+    try {
+        const result = await next(context);
+        const duration = performance.now() - startTime;
+        // Log slow operations (> 1000ms)
+        if (duration > 1000) {
+            console.warn(`⚠️ Slow operation detected: ${context.operation} on ${context.entityName} took ${duration.toFixed(2)}ms`);
+        }
+        // Add performance metrics to context
+        context.metadata['performanceMetrics'] = {
+            duration,
+            operation: context.operation,
+            entityName: context.entityName,
         };
+        return result;
     }
-    /**
-     * Applies filter and sort changes to the data source
-     */
-    applyDataSourceChanges(dataSource, queries, changeTracker) {
-        if (changeTracker.isFilterChanged) {
-            dataSource.filter({
-                filters: queries?.filters,
-            });
-        }
-        if (changeTracker.isSortChanged) {
-            dataSource.sort(...(queries.sorts || []));
-        }
+    catch (error) {
+        const duration = performance.now() - startTime;
+        console.error(`❌ Failed operation: ${context.operation} on ${context.entityName} failed after ${duration.toFixed(2)}ms`);
+        throw error;
     }
-    /**
-     * Handles list refresh logic based on changes and mount status
-     */
-    handleListRefresh(listInstance, changeTracker, isMounted) {
-        const shouldRefresh = changeTracker.isFilterChanged || changeTracker.isSortChanged || !isMounted;
-        if (shouldRefresh) {
-            listInstance.call('refresh');
-            // Set mounted flag only on initial load (not when filters/sorts change)
-            if (!changeTracker.isFilterChanged && !changeTracker.isSortChanged) {
-                this.isMounted.set(true);
+};
+/**
+ * Error handling middleware with retry logic
+ */
+const errorHandlingMiddleware = async (context, next) => {
+    const maxRetries = 3;
+    let attempt = 0;
+    while (attempt < maxRetries) {
+        try {
+            const result = await next(context);
+            if (attempt > 0) {
+                console.log(`✅ Operation succeeded on retry ${attempt}/${maxRetries}`);
             }
+            return result;
         }
-    }
-    /**
-     * Handles column-related changes
-     * TODO: Implement column change logic
-     */
-    handleColumnChanges(changeTracker) {
-        if (!changeTracker.isColumnsChanged) {
-            return;
-        }
-        const listInstance = this.listWidget()?.instance;
-        const toolbarState = this.getValue()?.toolbar;
-        if (!listInstance || !toolbarState?.columns) {
-            return;
-        }
-        // Current columns from list options
-        const currentColumns = (listInstance.options()['columns'] || []);
-        const columnByName = new Map(currentColumns.map((c) => [c.name, c]));
-        // Build new ordered columns array based on toolbar order/visibility
-        const updatedColumns = toolbarState.columns
-            .map((q) => {
-            const base = columnByName.get(q.name);
-            if (!base) {
-                return null;
+        catch (error) {
+            attempt++;
+            // Don't retry for certain operations or error types
+            if (context.operation === 'deleteOne' ||
+                error?.code === 'VALIDATION_ERROR' ||
+                attempt >= maxRetries) {
+                console.error(`❌ Operation failed after ${attempt} attempts:`, error);
+                throw error;
             }
-            // Preserve all existing column config but update visibility
-            return { ...base, visible: q.visible };
-        })
-            .filter((c) => c != null);
-        // Apply updated columns to the list widget and refresh
-        listInstance.setOptions({ columns: updatedColumns });
-    }
-    async ngOnInit() {
-        super.ngOnInit();
-        const [moduleName, entityName] = this.entitySource().split('.');
-        if (!moduleName || !entityName) {
-            throw new Error('Invalid entity source');
+            console.warn(`⚠️ Attempt ${attempt}/${maxRetries} failed, retrying...`, error.message);
+            // Wait before retry (exponential backoff)
+            await new Promise(resolve => setTimeout(resolve, Math.pow(2, attempt) * 1000));
         }
-        // Resolve entity and set it in the signal
-        const resolvedEntity = await this.entityResolver.get(moduleName, entityName);
-        if (!resolvedEntity) {
-            throw new Error(`Entity not found: ${this.entitySource()}`);
-        }
-        this.entity.set(resolvedEntity);
-        const options = {
-            excludeColumns: this.excludeColumns(),
-            includeColumns: this.includeColumns(),
-        };
-        const listOptions = await this.entityListTableService.convertEntityToListOptions(resolvedEntity, options, this.allActions());
-        const toolbarOptions = await this.entityListToolbarService.convertEntityToolbarOptions(resolvedEntity, options);
-        this.listNode.set({
-            type: AXPWidgetsCatalog.list,
-            options: listOptions,
-            path: `table`,
-            name: 'table',
-            mode: 'view',
-            defaultValue: this.getValue()?.table,
-        });
-        this.toolbarNode.set({
-            type: AXPWidgetsCatalog.listToolbar,
-            path: `toolbar`,
-            options: toolbarOptions,
-            mode: 'view',
-            defaultValue: {
-                filters: this.getValue()?.toolbar?.filters,
-                sorts: this.getValue()?.toolbar?.sorts,
-                columns: this.getValue()?.toolbar?.columns,
-            },
-        });
     }
-    async ngAfterViewInit() {
-        this.workflow.events$
-            .pipe(ofType(AXPRefreshEvent))
-            .pipe(takeUntil(this.destroyed))
-            .subscribe((event) => {
-            if (event.payload.entity == this.entitySource()) {
-                this.listWidget()?.instance.call('refresh');
+    throw new Error('Max retries exceeded');
+};
+/**
+ * Validation middleware
+ */
+const validationMiddleware = async (context, next) => {
+    // Validate input based on operation
+    switch (context.operation) {
+        case 'insertOne':
+            if (!context.input.entity) {
+                throw new Error('Entity is required for insertOne operation');
             }
-        });
-        const listWidget = (await this.layoutService.waitForWidget(`${this.entitySource()}-tab-list_table`, 500));
-        if (listWidget?.api && typeof listWidget.api === 'function') {
-            const onSelectionChange = listWidget.api()['onSelectionChange'];
-            if (onSelectionChange) {
-                onSelectionChange.pipe(takeUntil(this.destroyed)).subscribe((e) => {
-                    this.selectedItems.set(e);
-                });
+            break;
+        case 'updateOne':
+            if (!context.input.id) {
+                throw new Error('ID is required for updateOne operation');
+            }
+            if (!context.input.keyValues) {
+                throw new Error('Key values are required for updateOne operation');
+            }
+            break;
+        case 'deleteOne':
+        case 'getOne':
+            if (!context.input.id) {
+                throw new Error(`ID is required for ${context.operation} operation`);
             }
+            break;
+        case 'query':
+            if (!context.input.request) {
+                throw new Error('Request is required for query operation');
+            }
+            break;
+        case 'initial':
+            if (!context.input.collection || !Array.isArray(context.input.collection)) {
+                throw new Error('Collection array is required for initial operation');
+            }
+            break;
+    }
+    return next(context);
+};
+/**
+ * Caching middleware (simple in-memory cache)
+ */
+const cachingMiddleware = (() => {
+    const cache = new Map();
+    const DEFAULT_TTL = 5 * 60 * 1000; // 5 minutes
+    return async (context, next) => {
+        // Only cache read operations
+        if (!['getOne', 'getAll', 'query'].includes(context.operation)) {
+            // Clear cache for write operations on the same entity
+            const keysToDelete = Array.from(cache.keys()).filter(key => key.includes(`${context.entityName}:`));
+            keysToDelete.forEach(key => cache.delete(key));
+            return next(context);
+        }
+        // Generate cache key
+        const cacheKey = `${context.entityName}:${context.operation}:${JSON.stringify(context.input)}`;
+        // Check cache
+        const cached = cache.get(cacheKey);
+        if (cached && Date.now() - cached.timestamp < cached.ttl) {
+            console.log(`💾 Cache hit for ${cacheKey}`);
+            return cached.data;
+        }
+        // Execute and cache result
+        const result = await next(context);
+        cache.set(cacheKey, {
+            data: result,
+            timestamp: Date.now(),
+            ttl: DEFAULT_TTL,
+        });
+        console.log(`💾 Cached result for ${cacheKey}`);
+        return result;
+    };
+})();
+
+/**
+ * Simple in-memory audit storage (for demo purposes)
+ */
+class InMemoryAuditStorage {
+    constructor() {
+        this.entries = [];
+    }
+    async save(entry) {
+        this.entries.push(entry);
+        console.log('📋 Audit entry saved:', entry);
+    }
+    getEntries() {
+        return [...this.entries];
+    }
+    getEntriesForEntity(entityName) {
+        return this.entries.filter(entry => entry.entityName === entityName);
+    }
+    clear() {
+        this.entries.length = 0;
+    }
+}
+// Global audit storage instance
+const auditStorage = new InMemoryAuditStorage();
+/**
+ * Audit middleware that tracks all entity operations
+ */
+const auditMiddleware = async (context, next) => {
+    const auditEntry = {
+        id: `audit_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
+        entityName: context.entityName,
+        operation: context.operation,
+        user: context.metadata.user?.id || 'system',
+        timestamp: new Date(),
+        requestId: context.metadata.requestId,
+    };
+    // Add operation-specific data
+    switch (context.operation) {
+        case 'insertOne':
+            auditEntry.changes = { created: context.input.entity };
+            break;
+        case 'updateOne':
+            auditEntry.entityId = context.input.id;
+            auditEntry.changes = { updated: context.input.keyValues };
+            break;
+        case 'deleteOne':
+            auditEntry.entityId = context.input.id;
+            auditEntry.changes = { deleted: true };
+            break;
+        case 'getOne':
+            auditEntry.entityId = context.input.id;
+            break;
+        case 'query':
+            auditEntry.metadata = { queryRequest: context.input.request };
+            break;
+        case 'initial':
+            auditEntry.metadata = {
+                collectionSize: context.input.collection?.length,
+                options: context.input.options
+            };
+            break;
+    }
+    try {
+        const result = await next(context);
+        // For insert operations, capture the generated ID
+        if (context.operation === 'insertOne' && result) {
+            auditEntry.entityId = result;
         }
+        // Save audit entry
+        await auditStorage.save(auditEntry);
+        return result;
     }
-    ngOnDestroy() {
-        this.listWidget.set(undefined);
-        this.destroyed.next();
-        this.destroyed.complete();
+    catch (error) {
+        // Save audit entry even for failed operations
+        auditEntry.metadata = {
+            ...auditEntry.metadata,
+            error: error instanceof Error ? error.message : 'Unknown error'
+        };
+        await auditStorage.save(auditEntry);
+        throw error;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityListWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.1.6", type: AXPEntityListWidgetViewComponent, isStandalone: true, selector: "ng-component", host: { properties: { "class": "\"ax-h-full\"" } }, providers: [AXPEntityListTableService, AXPEntityListToolbarService], viewQueries: [{ propertyName: "list", first: true, predicate: ["list"], descendants: true, isSignal: true }, { propertyName: "allWidgets", predicate: AXPWidgetRendererDirective, descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
-    @if (showEntityActions()) {
-      <div class="ax-flex ax-gap-2 ax-justify-end ax-mb-4">
-        @for (action of primaryActions(); track $index) {
-          @if (action.visible != false) {
-            <ax-button
-              [class.ax-sm]="layoutThemeService.isSmall()"
-              [iconOnly]="layoutThemeService.isSmall()"
-              [disabled]="action.disabled"
-              [text]="action.title"
-              [look]="'solid'"
-              [color]="action.color"
-              (onClick)="handleActionClick(action)"
-            >
-              <ax-prefix>
-                <i class="{{ action.icon }}"></i>
-              </ax-prefix>
-              @if (action?.items) {
-                <ax-dropdown-panel #panel>
-                  <ax-button-item-list>
-                    @for (sub of action?.items; track $index) {
-                      @if (sub.visible != false) {
-                        <ax-button-item
-                          [text]="sub.title"
-                          [color]="sub.color"
-                          [disabled]="sub.disabled"
-                          (onClick)="handleActionClick(sub)"
-                        >
-                          <ax-prefix>
-                            <ax-icon icon="fa-light {{ sub.icon }}"></ax-icon>
-                          </ax-prefix>
-                        </ax-button-item>
-                        @if (sub.break) {
-                          <ax-divider></ax-divider>
-                        }
-                      }
-                    }
-                  </ax-button-item-list>
-                </ax-dropdown-panel>
-              }
-            </ax-button>
-          }
+};
+/**
+ * User context middleware - adds user information to context
+ */
+const userContextMiddleware = async (context, next) => {
+    // In a real application, you would inject your auth service here
+    // const authService = inject(AuthService);
+    // const user = authService.getCurrentUser();
+    // For demo purposes, we'll use a mock user
+    const mockUser = {
+        id: 'user123',
+        name: 'John Doe',
+        role: 'admin',
+    };
+    context.metadata.user = mockUser;
+    return next(context);
+};
+/**
+ * Data sanitization middleware - removes sensitive data from logs
+ */
+const dataSanitizationMiddleware = async (context, next) => {
+    const sensitiveFields = ['password', 'ssn', 'creditCard', 'apiKey', 'token'];
+    // Sanitize input data
+    if (context.input.entity) {
+        context.input.entity = sanitizeObject(context.input.entity, sensitiveFields);
+    }
+    if (context.input.keyValues) {
+        context.input.keyValues = sanitizeObject(context.input.keyValues, sensitiveFields);
+    }
+    const result = await next(context);
+    // Sanitize result data if needed
+    if (result && typeof result === 'object') {
+        return sanitizeObject(result, sensitiveFields);
+    }
+    return result;
+};
+/**
+ * Helper function to sanitize objects by removing sensitive fields
+ */
+function sanitizeObject(obj, sensitiveFields) {
+    if (!obj || typeof obj !== 'object') {
+        return obj;
+    }
+    if (Array.isArray(obj)) {
+        return obj.map(item => sanitizeObject(item, sensitiveFields));
+    }
+    const sanitized = { ...obj };
+    for (const field of sensitiveFields) {
+        if (field in sanitized) {
+            sanitized[field] = '[REDACTED]';
         }
-        @if (secondaryActions().length) {
-          <ax-button
-            [class.ax-sm]="layoutThemeService.isSmall()"
-            [iconOnly]="layoutThemeService.isSmall()"
-            [text]="'actions'"
-            [look]="layoutThemeService.isSmall() ? 'blank' : 'solid'"
-            [color]="'default'"
-          >
-            <ax-prefix>
-              <i class="fa-solid fa-ellipsis-vertical"></i>
-            </ax-prefix>
-            <ax-dropdown-panel #panel>
-              <ax-button-item-list>
-                @for (item of secondaryActions(); track $index) {
-                  @if (item.visible != false) {
-                    <ax-button-item
-                      [text]="item.title"
-                      [color]="item.color"
-                      [disabled]="item.disabled"
-                      (onClick)="handleSecondaryActionClick(item)"
-                    >
-                      <ax-prefix>
-                        <ax-icon icon="fa-light {{ item.icon }}"></ax-icon>
-                      </ax-prefix>
-                    </ax-button-item>
-                    @if (item.break) {
-                      <ax-divider></ax-divider>
-                    }
-                  }
-                }
-              </ax-button-item-list>
-            </ax-dropdown-panel>
-          </ax-button>
+    }
+    // Recursively sanitize nested objects
+    for (const [key, value] of Object.entries(sanitized)) {
+        if (value && typeof value === 'object') {
+            sanitized[key] = sanitizeObject(value, sensitiveFields);
         }
-      </div>
-    }
-    <div class="ax-flex ax-flex-col ax-gap-2 ax-h-full">
-      @if (toolbarNode() != null && showToolbar()) {
-        <ng-container
-          #toolbar
-          axp-widget-renderer
-          [node]="toolbarNode()!"
-          [parentNode]="this"
-          [index]="index"
-          [mode]="this.mode"
-        ></ng-container>
-      }
-      @if (listNode() != null) {
-        <ng-container
-          #list
-          axp-widget-renderer
-          [node]="listNode()!"
-          [parentNode]="this"
-          [index]="index"
-          [mode]="this.mode"
-        ></ng-container>
-      }
-    </div>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXPLayoutBuilderModule }, { kind: "directive", type: i2.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3$1.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$1.AXButtonItemComponent, selector: "ax-button-item", inputs: ["color", "disabled", "text", "selected", "divided", "data", "name"], outputs: ["onClick", "onFocus", "onBlur", "disabledChange"] }, { kind: "component", type: i3$1.AXButtonItemListComponent, selector: "ax-button-item-list", inputs: ["items"], outputs: ["onItemClick"] }, { kind: "ngmodule", type: AXDropdownModule }, { kind: "component", type: i4.AXDropdownPanelComponent, selector: "ax-dropdown-panel", inputs: ["isOpen", "fitParent", "dropdownWidth", "position", "placement", "_target", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    }
+    return sanitized;
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityListWidgetViewComponent, decorators: [{
-            type: Component,
-            args: [{
-                    template: `
-    @if (showEntityActions()) {
-      <div class="ax-flex ax-gap-2 ax-justify-end ax-mb-4">
-        @for (action of primaryActions(); track $index) {
-          @if (action.visible != false) {
-            <ax-button
-              [class.ax-sm]="layoutThemeService.isSmall()"
-              [iconOnly]="layoutThemeService.isSmall()"
-              [disabled]="action.disabled"
-              [text]="action.title"
-              [look]="'solid'"
-              [color]="action.color"
-              (onClick)="handleActionClick(action)"
-            >
-              <ax-prefix>
-                <i class="{{ action.icon }}"></i>
-              </ax-prefix>
-              @if (action?.items) {
-                <ax-dropdown-panel #panel>
-                  <ax-button-item-list>
-                    @for (sub of action?.items; track $index) {
-                      @if (sub.visible != false) {
-                        <ax-button-item
-                          [text]="sub.title"
-                          [color]="sub.color"
-                          [disabled]="sub.disabled"
-                          (onClick)="handleActionClick(sub)"
-                        >
-                          <ax-prefix>
-                            <ax-icon icon="fa-light {{ sub.icon }}"></ax-icon>
-                          </ax-prefix>
-                        </ax-button-item>
-                        @if (sub.break) {
-                          <ax-divider></ax-divider>
-                        }
-                      }
-                    }
-                  </ax-button-item-list>
-                </ax-dropdown-panel>
-              }
-            </ax-button>
-          }
-        }
-        @if (secondaryActions().length) {
-          <ax-button
-            [class.ax-sm]="layoutThemeService.isSmall()"
-            [iconOnly]="layoutThemeService.isSmall()"
-            [text]="'actions'"
-            [look]="layoutThemeService.isSmall() ? 'blank' : 'solid'"
-            [color]="'default'"
-          >
-            <ax-prefix>
-              <i class="fa-solid fa-ellipsis-vertical"></i>
-            </ax-prefix>
-            <ax-dropdown-panel #panel>
-              <ax-button-item-list>
-                @for (item of secondaryActions(); track $index) {
-                  @if (item.visible != false) {
-                    <ax-button-item
-                      [text]="item.title"
-                      [color]="item.color"
-                      [disabled]="item.disabled"
-                      (onClick)="handleSecondaryActionClick(item)"
-                    >
-                      <ax-prefix>
-                        <ax-icon icon="fa-light {{ item.icon }}"></ax-icon>
-                      </ax-prefix>
-                    </ax-button-item>
-                    @if (item.break) {
-                      <ax-divider></ax-divider>
-                    }
-                  }
-                }
-              </ax-button-item-list>
-            </ax-dropdown-panel>
-          </ax-button>
-        }
-      </div>
-    }
-    <div class="ax-flex ax-flex-col ax-gap-2 ax-h-full">
-      @if (toolbarNode() != null && showToolbar()) {
-        <ng-container
-          #toolbar
-          axp-widget-renderer
-          [node]="toolbarNode()!"
-          [parentNode]="this"
-          [index]="index"
-          [mode]="this.mode"
-        ></ng-container>
-      }
-      @if (listNode() != null) {
-        <ng-container
-          #list
-          axp-widget-renderer
-          [node]="listNode()!"
-          [parentNode]="this"
-          [index]="index"
-          [mode]="this.mode"
-        ></ng-container>
-      }
-    </div>
-  `,
-                    standalone: true,
-                    host: {
-                        '[class]': '"ax-h-full"',
-                    },
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                    providers: [AXPEntityListTableService, AXPEntityListToolbarService],
-                    imports: [CommonModule, AXDecoratorModule, AXPLayoutBuilderModule, AXButtonModule, AXDropdownModule],
-                }]
-        }] });
-
-var entityListWidgetView_component = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPEntityListWidgetViewComponent: AXPEntityListWidgetViewComponent
-});
 
-const AXPEntityListWidget = {
-    name: 'entity-list',
-    title: 'Entity List',
-    description: 'Displays entity data in a table format',
-    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 entityListWidgetView_component; }).then((c) => c.AXPEntityListWidgetViewComponent),
-        },
-        edit: {
-            component: () => Promise.resolve().then(function () { return entityListWidgetView_component; }).then((c) => c.AXPEntityListWidgetViewComponent),
-        },
-        print: {
-            component: () => Promise.resolve().then(function () { return entityListWidgetView_component; }).then((c) => c.AXPEntityListWidgetViewComponent),
-        },
-        designer: {
-            component: () => Promise.resolve().then(function () { return entityListWidgetView_component; }).then((c) => c.AXPEntityListWidgetViewComponent),
-        },
-    },
-};
+// Core middleware types and utilities
 
-class AXPEntityReferenceWidgetViewComponent extends AXPLayoutBaseWidgetComponent {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityReferenceWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.6", type: AXPEntityReferenceWidgetViewComponent, isStandalone: true, selector: "ng-component", usesInheritance: true, ngImport: i0, template: ``, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+class AXPEntityCommandSearchDefinitionProvider {
+    async provide(context) {
+        context.addDefinition('command', 'Commands', 'command', 'fa-solid fa-command', 1, {
+            format: {
+                id: '{{id}}',
+            },
+            actions: [
+                {
+                    name: 'open-entity',
+                    type: 'view',
+                    priority: 'primary',
+                },
+            ],
+        });
+    }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", 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 {
+class AXPEntitySearchDefinitionProvider {
     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" }] : []));
+        this.entityRegister = inject(AXPEntityDefinitionRegistryService);
+    }
+    async provide(context) {
+        console.log("AXPEntitySearchDefinitionProvider", this.entityRegister.getAll());
+        this.entityRegister.getAll().forEach((entity) => {
+            context.addDefinition(`Module.${entity.module}.${entity.name}`, entity.formats.searchResult?.description ?? entity.module, `Module.${entity.module}`, 'fa-solid fa-objects-column', 4, {
+                actions: [
+                    {
+                        name: 'open-entity',
+                        type: 'view',
+                        priority: 'primary',
+                    },
+                ],
+                format: {
+                    title: entity.formats.searchResult?.title,
+                    description: (entity.formats.searchResult?.description ?? entity.module) + ' / ' + entity.title,
+                    id: '{{data.id}}',
+                },
+            });
+        });
     }
-    #efEntity;
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityReferenceWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.6", 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.1.6", 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.1.6", ngImport: i0, type: AXPEntityReferenceWidgetColumnComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.6", 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.1.6", 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.1.6", ngImport: i0, type: AXPEntityReferenceWidgetPrintComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.6", 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.1.6", 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.1.6", ngImport: i0, type: AXPEntityReferenceWidgetDesignerComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.6", 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.1.6", 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 AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
     constructor() {
@@ -5195,7 +3207,7 @@ class AXPLookupWidgetSelectorComponent extends AXBasePageComponent {
         }
       </ax-suffix>
     </ax-footer>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXCommonModule }, { kind: "directive", type: i1$2.AXAutoFocusDirective, selector: "[axAutoFocus]", inputs: ["axAutoFocus", "axAutoFocusTime"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3$1.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: AXFormModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXDropdownButtonModule }, { kind: "ngmodule", type: AXDataTableModule }, { kind: "component", type: i4$1.AXDataTableComponent, selector: "ax-data-table", inputs: ["dataSource", "selectedRows", "parentField", "rowTemplate", "emptyTemplate", "noDataTemplate", "alternative", "showHeader", "fixedHeader", "showFooter", "fixedFooter", "itemHeight", "allowReordering", "paging", "fetchDataMode", "loading", "focusedRow"], outputs: ["selectedRowsChange", "focusedRowChange", "onRowClick", "onRowDbClick", "onColumnsOrderChanged", "onColumnSizeChanged", "onPageChanged"] }, { kind: "component", type: i4$1.AXRowSelectColumnComponent, selector: "ax-select-column", inputs: ["width", "caption", "fixed"] }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i5.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXPLayoutBuilderModule }, { kind: "component", type: i2.AXPWidgetColumnRendererComponent, selector: "axp-widget-column-renderer", inputs: ["caption", "customExpandIcon", "customCollapseIcon", "customWidth", "node", "footerTemplate", "expandHandler", "cellTemplate", "headerTemplate"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i7.AsyncPipe, name: "async" }, { kind: "pipe", type: i8.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXCommonModule }, { kind: "directive", type: i1$2.AXAutoFocusDirective, selector: "[axAutoFocus]", inputs: ["axAutoFocus", "axAutoFocusTime"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i2.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXDropdownButtonModule }, { kind: "ngmodule", type: AXDataTableModule }, { kind: "component", type: i4.AXDataTableComponent, selector: "ax-data-table", inputs: ["dataSource", "selectedRows", "parentField", "rowTemplate", "emptyTemplate", "noDataTemplate", "alternative", "showHeader", "fixedHeader", "showFooter", "fixedFooter", "itemHeight", "allowReordering", "paging", "fetchDataMode", "loading", "focusedRow"], outputs: ["selectedRowsChange", "focusedRowChange", "onRowClick", "onRowDbClick", "onColumnsOrderChanged", "onColumnSizeChanged", "onPageChanged"] }, { kind: "component", type: i4.AXRowSelectColumnComponent, selector: "ax-select-column", inputs: ["width", "caption", "fixed"] }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i5.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXPLayoutBuilderModule }, { kind: "component", type: i6.AXPWidgetColumnRendererComponent, selector: "axp-widget-column-renderer", inputs: ["caption", "customExpandIcon", "customCollapseIcon", "customWidth", "node", "footerTemplate", "expandHandler", "cellTemplate", "headerTemplate"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: i7.AsyncPipe, name: "async" }, { kind: "pipe", type: i8.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLookupWidgetSelectorComponent, decorators: [{
             type: Component,
@@ -5295,7 +3307,6 @@ class AXPLookupWidgetSelectorViewModel {
         this.options = options;
         this.workflow = this.injector.get(AXPWorkflowService);
         this.filterOperatorMiddleware = this.injector.get(AXPFilterOperatorMiddlewareService);
-        this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
         this.dataSource = new AXDataSource({
             byKey: (key) => {
                 const func = this.entityDef.queries.byKey.execute;
@@ -5317,41 +3328,23 @@ class AXPLookupWidgetSelectorViewModel {
         }, ...(ngDevMode ? [{ debugName: "parentKey" }] : []));
         this.allowMultiple = computed(() => {
             return this.options.allowMultiple ?? false;
-        }, ...(ngDevMode ? [{ debugName: "allowMultiple" }] : []));
-        this.inlineFiltersPlaceholders = computed(() => {
-            return (this.entityDef?.properties.filter((p) => p.options?.filter?.inline?.enabled).map((c) => c.title ?? c.name) ?? []);
-        }, ...(ngDevMode ? [{ debugName: "inlineFiltersPlaceholders" }] : []));
-        this.hasInlineFilters = computed(() => {
-            return this.inlineFiltersPlaceholders().length > 0;
-        }, ...(ngDevMode ? [{ debugName: "hasInlineFilters" }] : []));
-        this.columns = () => {
-            const { columns = [], properties } = this.entityDef;
-            const visibleProperties = properties.filter(({ schema }) => !schema?.hidden);
-            const visiblePropNames = new Set(visibleProperties.map(({ name }) => name));
-            return columns
-                .filter(({ name, showAs }) => visiblePropNames.has(name) || showAs)
-                .filter(({ name }) => ((this.options.columns?.length ?? 0) == 0) || this.options.columns?.includes(name))
-                .map((column) => {
-                if (column.showAs) {
-                    const widgetConfig = this.widgetResolver.resolve(column.showAs.type);
-                    const property = {
-                        ...widgetConfig,
-                        name: column.name,
-                        title: column.title ?? '',
-                        schema: {
-                            dataType: 'string',
-                            interface: {
-                                type: column.showAs.type,
-                                options: column.showAs.options,
-                            },
-                        },
-                    };
-                    return new AXPEntityListViewColumnViewModel(property, column);
-                }
-                else {
-                    const property = visibleProperties.find(({ name }) => name === column.name);
-                    return new AXPEntityListViewColumnViewModel(property, column);
-                }
+        }, ...(ngDevMode ? [{ debugName: "allowMultiple" }] : []));
+        this.inlineFiltersPlaceholders = computed(() => {
+            return (this.entityDef?.properties.filter((p) => p.options?.filter?.inline?.enabled).map((c) => c.title ?? c.name) ?? []);
+        }, ...(ngDevMode ? [{ debugName: "inlineFiltersPlaceholders" }] : []));
+        this.hasInlineFilters = computed(() => {
+            return this.inlineFiltersPlaceholders().length > 0;
+        }, ...(ngDevMode ? [{ debugName: "hasInlineFilters" }] : []));
+        this.columns = () => {
+            const listColumns = this.entityDef.columns ?? [];
+            const columns = listColumns?.map((c) => c.name) ?? [];
+            const props = this.entityDef.properties.filter((p) => p.schema.hidden != true);
+            const displayColumns = props.filter((p) => (this.options.columns?.length ?? 0) > 0
+                ? this.options.columns.some((c) => c == p.name)
+                : columns.some((c) => c == p.name));
+            //
+            return displayColumns.map((p) => {
+                return new AXPEntityListViewColumnViewModel(p, listColumns?.find((c) => c.name == p.name));
             });
         };
         this.inlineFilters = {
@@ -5460,24 +3453,12 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.entity = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entity" }] : []));
         this.disabled = computed(() => this.options()['disabled'], ...(ngDevMode ? [{ debugName: "disabled" }] : []));
         this.columns = computed(() => this.options()['columns'] ?? [], ...(ngDevMode ? [{ debugName: "columns" }] : []));
-        this.textField = computed(() => this.options()['textField'] ?? '', ...(ngDevMode ? [{ debugName: "textField" }] : []));
         this.customFilter = computed(() => this.options()['filter'], ...(ngDevMode ? [{ debugName: "customFilter" }] : []));
         this.multiple = computed(() => (this.options()['multiple'] ?? false), ...(ngDevMode ? [{ debugName: "multiple" }] : []));
         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';
-            return textField;
-        }, ...(ngDevMode ? [{ debugName: "defaultTextField" }] : []));
-        this.displayField = computed(() => {
-            if (this.textField()) {
-                return this.textField();
-            }
-            return this.defaultTextField();
-        }, ...(ngDevMode ? [{ debugName: "displayField" }] : []));
-        this.selectedItemsText = computed(() => {
-            return this.selectedItems().map((item) => get(item, this.displayField())).join(', ');
-        }, ...(ngDevMode ? [{ debugName: "selectedItemsText" }] : []));
+        this.textField = computed(() => {
+            return (this.entityDef()?.formats.lookup ?? this.entityDef()?.properties.find((c) => c.name != 'id')?.name ?? 'title');
+        }, ...(ngDevMode ? [{ debugName: "textField" }] : []));
         this.valueField = computed(() => this.entityDef()?.properties.find((c) => c.name == 'id')?.name ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : []));
         this.entityDef = signal(null, ...(ngDevMode ? [{ debugName: "entityDef" }] : []));
         this.searchTerm = signal(null, ...(ngDevMode ? [{ debugName: "searchTerm" }] : []));
@@ -5542,11 +3523,11 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     }
     showSelector() {
         this.isOpen.set(true);
-        const columnsCount = this.columns().length > 0 ? this.columns().length : (this.vm()?.columns().length ?? 0);
+        const columnsCount = this.columns().length > 0 ? this.columns().length : this.vm()?.columns().length ?? 0;
         this.popupService
             .open(AXPLookupWidgetSelectorComponent, {
             title: `${this.translateService.translateSync('widget.lookup.search')} ${this.translateService.translateSync(this.entityDef()?.formats.plural ?? '')}`,
-            size: columnsCount < 3 ? 'md' : 'lg',
+            size: columnsCount < 4 ? 'md' : 'lg',
             data: {
                 vm: new AXPLookupWidgetSelectorViewModel(this.injector, this.entityDef(), {
                     customFilter: this.customFilter(),
@@ -5617,7 +3598,6 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.selectedItems.set(items);
         //
         const keys = items.map((item) => get(item, this.valueField()));
-        const text = items.map((item) => get(item, this.displayField()));
         //
         // extract data from valueField and set context by expose path
         if (this.expose()) {
@@ -5669,132 +3649,110 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLookupWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.1.6", type: AXPLookupWidgetEditComponent, isStandalone: true, selector: "axp-lookup-widget-edit", viewQueries: [{ propertyName: "textbox", first: true, predicate: AXTagBoxComponent, descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
-  @if(vm()) {
     @if (look() == 'select') {
       <ax-select-box
         [dataSource]="vm()?.dataSource!"
         [ngModel]="selectedItems()"
-        [textField]="displayField()"
+        [textField]="textField()"
         [valueField]="valueField()"
         [disabled]="disabled()"
         [multiple]="multiple()"
         (onValueChanged)="selectBoxValueChange($event)"
       >
-        <ax-search-box>
-          <ax-clear-button></ax-clear-button>
-        </ax-search-box>
-        @if (allowClear()) {
-          <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
-        }
-      </ax-select-box>
+      <ax-search-box>
+      </ax-search-box>
+    </ax-select-box>
     } @else {
-      <ax-tag-box
-        [ngModel]="selectedItems()"
-        [textField]="displayField()"
-        [valueField]="valueField()"
-        (onValueChanged)="handleValueChange($event)"
-        [placeholder]="placeholder() | translate | async"
-        [addOnEnter]="false"
-        [addOnComma]="false"
-        [disabled]="disabled()"
-        (onKeyUp)="handleKeyUp($event)"
-        (onBlur)="handleOnBlur($event)"
-      >
-        @for (validation of validationRules(); track $index) {
-          <ax-validation-rule
-            [rule]="validation.rule"
-            [message]="validation.options?.message"
-            [options]="validation.options"
-          ></ax-validation-rule>
-        }
-        @if (selectedItems().length > 1 || allowClear()) {
-          <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
-        }
+    <ax-tag-box
+      [ngModel]="selectedItems()"
+      [textField]="textField()"
+      [valueField]="valueField()"
+      (onValueChanged)="handleValueChange($event)"
+      [placeholder]="placeholder() | translate | async"
+      [addOnEnter]="false"
+      [addOnComma]="false"
+      [disabled]="disabled()"
+      (onKeyUp)="handleKeyUp($event)"
+      (onBlur)="handleOnBlur($event)"
+    >
+      @for (validation of validationRules(); track $index) {
+        <ax-validation-rule
+          [rule]="validation.rule"
+          [message]="validation.options?.message"
+          [options]="validation.options"
+        ></ax-validation-rule>
+      }
+      @if (selectedItems().length > 1) {
+        <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
+      }
 
-        <ax-suffix>
-          <ax-button
-            color="ghost"
-            look="blank"
-            [disabled]="isLoading() || disabled()"
-            (onClick)="handleOnClick($event)"
-          >
-            @if (isLoading()) {
-              <ax-loading></ax-loading>
-            } @else {
-              <ax-icon icon="far fa-search"> </ax-icon>
-            }
-          </ax-button>
-        </ax-suffix>
-      </ax-tag-box>
-    }
+      <ax-suffix>
+        <ax-button color="ghost" look="blank" [disabled]="isLoading() || disabled()" (onClick)="handleOnClick($event)">
+          @if (isLoading()) {
+            <ax-loading></ax-loading>
+          } @else {
+            <ax-icon icon="far fa-search"> </ax-icon>
+          }
+        </ax-button>
+      </ax-suffix>
+    </ax-tag-box>
   }
   `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: 
                 //
-                AXButtonModule }, { kind: "component", type: i3$1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i1.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXTagBoxModule }, { kind: "component", type: i6.AXTagBoxComponent, selector: "ax-tag-box", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "id", "placeholder", "allowNull", "type", "look", "addOnComma", "addOnEnter", "valueField", "textField", "readonlyField", "allowDuplicateValues"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i7$1.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed", "onItemSelected", "onItemClick"] }, { kind: "component", type: AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "pipe", type: i7.AsyncPipe, name: "async" }, { kind: "pipe", type: i8.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+                AXButtonModule }, { kind: "component", type: i2.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i1.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXTagBoxModule }, { kind: "component", type: i6$1.AXTagBoxComponent, selector: "ax-tag-box", inputs: ["disabled", "tabIndex", "readonly", "value", "state", "name", "id", "placeholder", "allowNull", "type", "look", "addOnComma", "addOnEnter", "valueField", "textField", "readonlyField", "allowDuplicateValues"], outputs: ["onBlur", "onFocus", "valueChange", "stateChange", "onValueChanged", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i7$1.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed"] }, { kind: "component", type: AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "pipe", type: i7.AsyncPipe, name: "async" }, { kind: "pipe", type: i8.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPLookupWidgetEditComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'axp-lookup-widget-edit',
                     template: `
-  @if(vm()) {
     @if (look() == 'select') {
       <ax-select-box
         [dataSource]="vm()?.dataSource!"
         [ngModel]="selectedItems()"
-        [textField]="displayField()"
+        [textField]="textField()"
         [valueField]="valueField()"
         [disabled]="disabled()"
         [multiple]="multiple()"
         (onValueChanged)="selectBoxValueChange($event)"
       >
-        <ax-search-box>
-          <ax-clear-button></ax-clear-button>
-        </ax-search-box>
-        @if (allowClear()) {
-          <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
-        }
-      </ax-select-box>
+      <ax-search-box>
+      </ax-search-box>
+    </ax-select-box>
     } @else {
-      <ax-tag-box
-        [ngModel]="selectedItems()"
-        [textField]="displayField()"
-        [valueField]="valueField()"
-        (onValueChanged)="handleValueChange($event)"
-        [placeholder]="placeholder() | translate | async"
-        [addOnEnter]="false"
-        [addOnComma]="false"
-        [disabled]="disabled()"
-        (onKeyUp)="handleKeyUp($event)"
-        (onBlur)="handleOnBlur($event)"
-      >
-        @for (validation of validationRules(); track $index) {
-          <ax-validation-rule
-            [rule]="validation.rule"
-            [message]="validation.options?.message"
-            [options]="validation.options"
-          ></ax-validation-rule>
-        }
-        @if (selectedItems().length > 1 || allowClear()) {
-          <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
-        }
+    <ax-tag-box
+      [ngModel]="selectedItems()"
+      [textField]="textField()"
+      [valueField]="valueField()"
+      (onValueChanged)="handleValueChange($event)"
+      [placeholder]="placeholder() | translate | async"
+      [addOnEnter]="false"
+      [addOnComma]="false"
+      [disabled]="disabled()"
+      (onKeyUp)="handleKeyUp($event)"
+      (onBlur)="handleOnBlur($event)"
+    >
+      @for (validation of validationRules(); track $index) {
+        <ax-validation-rule
+          [rule]="validation.rule"
+          [message]="validation.options?.message"
+          [options]="validation.options"
+        ></ax-validation-rule>
+      }
+      @if (selectedItems().length > 1) {
+        <ax-clear-button (click)="handleClearClick()"></ax-clear-button>
+      }
 
-        <ax-suffix>
-          <ax-button
-            color="ghost"
-            look="blank"
-            [disabled]="isLoading() || disabled()"
-            (onClick)="handleOnClick($event)"
-          >
-            @if (isLoading()) {
-              <ax-loading></ax-loading>
-            } @else {
-              <ax-icon icon="far fa-search"> </ax-icon>
-            }
-          </ax-button>
-        </ax-suffix>
-      </ax-tag-box>
-    }
+      <ax-suffix>
+        <ax-button color="ghost" look="blank" [disabled]="isLoading() || disabled()" (onClick)="handleOnClick($event)">
+          @if (isLoading()) {
+            <ax-loading></ax-loading>
+          } @else {
+            <ax-icon icon="far fa-search"> </ax-icon>
+          }
+        </ax-button>
+      </ax-suffix>
+    </ax-tag-box>
   }
   `,
                     changeDetection: ChangeDetectionStrategy.OnPush,
@@ -5810,7 +3768,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
                         AXTagBoxModule,
                         AXTranslationModule,
                         AXSelectBoxModule,
-                        AXSearchBoxComponent,
+                        AXSearchBoxComponent
                     ],
                 }]
         }] });
@@ -5889,7 +3847,6 @@ const AXPLookupWidget = {
     type: 'editor',
     properties: [
         AXP_DISABLED_PROPERTY,
-        AXP_ALLOW_CLEAR_PROPERTY,
         AXP_DATA_PATH_PROPERTY,
         {
             name: 'expose',
@@ -6073,7 +4030,7 @@ class AXPTagableBoxWidgetEditComponent extends AXPValueWidgetComponent {
         </ax-prefix>
       </ax-button>
     </div>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXTextBoxModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3$1.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: AXSelectBoxModule }, { kind: "component", type: i7$1.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed", "onItemSelected", "onItemClick"] }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i5.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: AXTextBoxModule }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i2.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i7$1.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed"] }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i5.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPTagableBoxWidgetEditComponent, decorators: [{
             type: Component,
@@ -6281,7 +4238,6 @@ const AXPTagableBoxWidget = {
     description: 'Inputs text with tags',
     categories: AXP_WIDGETS_EDITOR_CATEGORY,
     type: 'editor',
-    groups: [AXPWidgetGroupEnum.EntityWidget],
     defaultFilterWidgetName: 'string-filter',
     properties: [AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY],
     components: {
@@ -6370,7 +4326,7 @@ class AXPWidgetSelectorWidgetEditComponent extends AXPValueWidgetComponent {
     <axp-widget-property-viewer [widget]="selectedWidgetNode()!" (onChanged)="handleChangeWidget($event)">
     </axp-widget-property-viewer>
     }
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "ngmodule", type: AXTextBoxModule }, { kind: "component", type: i2$1.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$1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "component", type: AXPWidgetPropertyViewerComponent, selector: "axp-widget-property-viewer", inputs: ["widget", "mode"], outputs: ["onChanged"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "ngmodule", type: AXTextBoxModule }, { kind: "component", type: i2$1.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: i2.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "directive", type: i5$1.AXValidationRuleDirective, selector: "ax-validation-rule", inputs: ["rule", "options", "message", "disabled"] }, { kind: "component", type: AXPWidgetPropertyViewerComponent, selector: "axp-widget-property-viewer", inputs: ["widget", "mode"], outputs: ["onChanged"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPWidgetSelectorWidgetEditComponent, decorators: [{
             type: Component,
@@ -6678,10 +4634,10 @@ class AXPShowDetailViewAction extends AXPWorkflowAction {
         this.sessionService = inject(AXPSessionService);
     }
     async execute(context) {
-        const [module, entity] = context.getVariable('entity').split('.');
+        const [module, entity] = context.getVariable('entity').split(".");
         const { id } = context.getVariable('data');
         const newPayload = {
-            commands: `/${this.sessionService.application?.name}/m/${module}/e/${entity}/${id}/new-view`,
+            commands: `/${this.sessionService.application?.name}/m/${module}/e/${entity}/${id}/view`,
         };
         context.setVariable('payload', newPayload);
         this.navigation.execute(context);
@@ -6723,7 +4679,6 @@ class AXPShowFileUploaderPopupAction extends AXPWorkflowAction {
             multiple: multiple,
             accept: accept,
             fileEditable: fileEditable,
-            // maxFileSize: maxFileSize,
         });
         // Handle case when result is undefined or empty array
         if (!res || res.length === 0) {
@@ -6813,56 +4768,146 @@ const AXPShowListViewWorkflow = {
     },
 };
 
-/**
- * Default widths for common text columns
- */
-const DEFAULT_COLUMN_WIDTHS = {
-    title: '250px',
-    description: '500px',
-    note: '350px',
-    notes: '350px',
-    content: '500px'
-};
-/**
- * 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 columnWidthMiddlewareFactory = (widths) => {
-    return (context) => {
-        const columns = context.columns.list();
-        if (!columns) {
-            return;
-        }
-        columns.forEach((column) => {
-            const desiredWidth = widths[column.name];
-            if (desiredWidth && !column.options?.width) {
-                const normalizedWidth = typeof desiredWidth === 'number' ? `${desiredWidth}px` : desiredWidth;
-                context.columns.find(column.name).update((col) => ({
-                    ...col,
-                    options: {
-                        ...col.options,
-                        width: normalizedWidth
-                    }
-                }));
-            }
-        });
-    };
-};
-//#endregion
-//#region ----   Provider Registration   ----
-/**
- * Helper to create a provider for the column width middleware.
- * By default it applies to all entities using the '*' pattern.
- */
-const createColumnWidthMiddlewareProvider = (widths, entityName = '*') => ({
-    entityName,
-    modifier: columnWidthMiddlewareFactory(widths)
+class AXPEntityReferenceWidgetViewComponent extends AXPLayoutWidgetComponent {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityReferenceWidgetViewComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.6", 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.1.6", 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
 });
-/**
- * Default provider registered with the default map.
- */
-const columnWidthMiddlewareProvider = createColumnWidthMiddlewareProvider(DEFAULT_COLUMN_WIDTHS);
-//#endregion
+
+class AXPEntityReferenceWidgetEditComponent extends AXPLayoutWidgetComponent {
+    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.1.6", ngImport: i0, type: AXPEntityReferenceWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.6", 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.1.6", 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.1.6", ngImport: i0, type: AXPEntityReferenceWidgetColumnComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.6", 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.1.6", 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 AXPLayoutWidgetComponent {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityReferenceWidgetPrintComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.6", 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.1.6", 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 AXPLayoutWidgetComponent {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityReferenceWidgetDesignerComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.6", 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.1.6", 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.FormElement],
+    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),
+        },
+    }
+};
 
 function routesFacory() {
     const config = inject(AXP_ENTITY_CONFIG_TOKEN);
@@ -6896,14 +4941,6 @@ function routesFacory() {
                             },
                             data: { reuse: false },
                         },
-                        {
-                            path: 'e/:entity/:id/new-view',
-                            resolve: { adapter: AXPLayoutDetailsViewRouteResolver },
-                            loadComponent: () => {
-                                return config.viewers.master.details();
-                            },
-                            data: { reuse: false },
-                        },
                         {
                             path: 'e/:entity/:id',
                             redirectTo: 'e/:entity/:id/view',
@@ -6935,7 +4972,7 @@ class AXPEntityModule {
         });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityModule, deps: [{ token: i1$4.AXPAppStartUpService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityModule, imports: [RouterModule, i2$2.AXPWorkflowModule, i2.AXPLayoutBuilderModule] }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityModule, imports: [RouterModule, i2$2.AXPWorkflowModule, i6.AXPLayoutBuilderModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityModule, providers: [
             {
                 provide: ROUTES,
@@ -6952,11 +4989,6 @@ class AXPEntityModule {
                 useClass: AXPEntityCommandSearchDefinitionProvider,
                 multi: true,
             },
-            {
-                provide: AXP_ENTITY_MODIFIER,
-                useValue: columnWidthMiddlewareProvider,
-                multi: true,
-            },
         ], imports: [RouterModule,
             AXPWorkflowModule.forChild({
                 actions: {
@@ -6986,13 +5018,7 @@ class AXPEntityModule {
                 functions: {},
             }),
             AXPLayoutBuilderModule.forChild({
-                widgets: [
-                    AXPLookupWidget,
-                    AXPWidgetSelectorWidget,
-                    AXPTagableBoxWidget,
-                    AXPEntityListWidget,
-                    AXPEntityReferenceWidget,
-                ],
+                widgets: [AXPLookupWidget, AXPWidgetSelectorWidget, AXPTagableBoxWidget, AXPEntityReferenceWidget],
             })] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: AXPEntityModule, decorators: [{
@@ -7028,13 +5054,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
                             functions: {},
                         }),
                         AXPLayoutBuilderModule.forChild({
-                            widgets: [
-                                AXPLookupWidget,
-                                AXPWidgetSelectorWidget,
-                                AXPTagableBoxWidget,
-                                AXPEntityListWidget,
-                                AXPEntityReferenceWidget,
-                            ],
+                            widgets: [AXPLookupWidget, AXPWidgetSelectorWidget, AXPTagableBoxWidget, AXPEntityReferenceWidget],
                         }),
                     ],
                     exports: [],
@@ -7055,11 +5075,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.6", ngImpor
                             useClass: AXPEntityCommandSearchDefinitionProvider,
                             multi: true,
                         },
-                        {
-                            provide: AXP_ENTITY_MODIFIER,
-                            useValue: columnWidthMiddlewareProvider,
-                            multi: true,
-                        },
                     ],
                 }]
         }], ctorParameters: () => [{ type: i1$4.AXPAppStartUpService }, { type: i0.Injector }] });
@@ -7090,7 +5105,6 @@ function entityMasterViewAction() {
         priority: 'secondary',
         type: 'view',
         scope: AXPEntityCommandScope.Individual,
-        default: true,
     };
 }
 function entityMasterDeleteAction() {
@@ -7111,7 +5125,9 @@ function entityMasterCrudActions() {
     ];
 }
 function entityMasterRecordActions() {
-    return [entityMasterDeleteAction()];
+    return [
+        entityMasterDeleteAction(),
+    ];
 }
 // #endregion
 // #region Details
@@ -7142,9 +5158,8 @@ function entityDetailsSimpleCondition(fk) {
         value: '{{context.eval("id")}}',
     };
 }
-function entityDetailsReferenceCondition(type) {
-    return [
-        {
+function entityDetailsReferenceCondition() {
+    return [{
             name: 'reference.id',
             operator: { type: 'equal' },
             value: '{{context.eval("id")}}',
@@ -7152,8 +5167,8 @@ function entityDetailsReferenceCondition(type) {
         {
             name: 'reference.type',
             operator: { type: 'equal' },
-            value: type,
-        },
+            value: '{{context.eval("entityName")}}',
+        }
     ];
 }
 function entityDetailsEditAction() {
@@ -7162,7 +5177,6 @@ function entityDetailsEditAction() {
         command: 'quick-modify-entity',
         priority: 'secondary',
         type: 'update',
-        default: true,
         scope: AXPEntityCommandScope.Individual,
     };
 }
@@ -7177,9 +5191,13 @@ function entityOverrideDetailsViewAction() {
     };
 }
 function entityDetailsCrudActions(parentId) {
-    return [entityDetailsCreateActions(parentId), entityDetailsEditAction(), entityOverrideDetailsViewAction()];
+    return [
+        entityDetailsCreateActions(parentId),
+        entityDetailsEditAction(),
+        entityOverrideDetailsViewAction(),
+    ];
 }
-function entityDetailsReferenceCreateActions(type) {
+function entityDetailsReferenceCreateActions() {
     return [
         {
             title: '@general:actions.create.title',
@@ -7190,10 +5208,10 @@ function entityDetailsReferenceCreateActions(type) {
                         redirect: false,
                         canCreateNewOne: true,
                         data: {
-                            reference: {
-                                id: '{{context.eval("id")}}',
-                                type: type,
-                            },
+                            'reference': {
+                                'id': '{{context.eval("id")}}',
+                                'type': '{{context.eval("entityName")}}'
+                            }
                         },
                     },
                 },
@@ -7206,65 +5224,11 @@ function entityDetailsReferenceCreateActions(type) {
         entityOverrideDetailsViewAction(),
     ];
 }
-/**
- * Computes a diff between two plain objects with array-aware semantics.
- * - For arrays of objects with an id field, computes added/removed by id.
- * - For arrays of primitives or objects without id, uses deep equality.
- * - For scalars/objects, reports oldValue/newValue when changed.
- */
-function detectEntityChanges(oldObj, newObj) {
-    return transform(newObj, (result, value, key) => {
-        if (!isEqual(value, oldObj[key])) {
-            const oldValue = oldObj[key];
-            if (Array.isArray(value) || Array.isArray(oldValue)) {
-                const oldArray = Array.isArray(oldValue) ? oldValue : [];
-                const newArray = Array.isArray(value) ? value : [];
-                const hasId = newArray.length > 0 && typeof newArray[0] === 'object' && newArray[0] !== null && 'id' in newArray[0];
-                if (hasId) {
-                    const added = newArray.filter((item) => !oldArray.some((oldItem) => oldItem.id === item.id));
-                    const removed = oldArray.filter((item) => !newArray.some((newItem) => newItem.id === item.id));
-                    result[key] = { oldValue, newValue: value, added, removed };
-                }
-                else {
-                    const added = newArray.filter((item) => !oldArray.some((oldItem) => isEqual(item, oldItem)));
-                    const removed = oldArray.filter((item) => !newArray.some((newItem) => isEqual(item, newItem)));
-                    result[key] = { oldValue, newValue: value, added, removed };
-                }
-            }
-            else {
-                result[key] = { oldValue, newValue: value };
-            }
-        }
-    }, {});
-}
-//#endregion
-
-const eventDispatchMiddleware = {
-    target: { ops: ['create', 'update', 'delete'], order: 90 },
-    execute: async (ctx, next) => {
-        const dispatcher = inject(AXPEntityEventDispatcherService);
-        await next();
-        if (ctx.op === 'create') {
-            const createdData = ctx.result ? { ...ctx.data, id: ctx.result } : ctx.data;
-            await dispatcher.dispatchInserted(ctx.entityName, { refType: ctx.entityName, data: createdData });
-        }
-        else if (ctx.op === 'update') {
-            await dispatcher.dispatchUpdated(ctx.entityName, {
-                refType: ctx.entityName,
-                data: ctx.result,
-                changes: ctx.locals.get('changes'),
-            });
-        }
-        else if (ctx.op === 'delete') {
-            // For delete, prefer previous entity if available
-            await dispatcher.dispatchDeleted(ctx.entityName, { refType: ctx.entityName, data: ctx.result ?? ctx.previous });
-        }
-    },
-};
+// #endregion
 
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntityApplyUpdatesAction, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, DEFAULT_COLUMN_WIDTHS, actionExists, columnWidthMiddlewareFactory, columnWidthMiddlewareProvider, createColumnWidthMiddlewareProvider, createModifierContext, detectEntityChanges, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware };
+export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntityApplyUpdatesAction, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityResolver, AXPEntityService, AXPEntityStorageExecutor, AXPEntityStorageRegistry, AXPEntityStorageService, AXPEntityStorageWithMiddlewareService, AXPModifyEntitySectionWorkflow, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_EXTENSION, AXP_ENTITY_STORAGE_MIDDLEWARE_SETUP, auditMiddleware, auditStorage, cachingMiddleware, composeEntityStorageMiddlewares, createModifierContext, dataSanitizationMiddleware, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, errorHandlingMiddleware, generateRequestId, loggingMiddleware, performanceMiddleware, provideEntitySpecificMiddleware, provideEntityStorageMiddleware, provideGlobalEntityStorageMiddleware, provideOperationSpecificMiddleware, userContextMiddleware, validationMiddleware };
 //# sourceMappingURL=acorex-platform-layout-entity.mjs.map