@acorex/platform 21.0.0-next.85 → 21.0.0-next.89

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

@@ -1,42 +1,47 @@
+import { mergeForeignKeyFieldIntoCreateActions, collectNestedCreateHiddenProperties, normalizeEntityDisplayTemplate, sanitizeResolvedEntityDisplayTitle, isUnresolvedEntityDisplayTemplate, AXPEntityDataSourceKeys, AXPEntityEventsKeys, collectEntityListSortableFields, collectEntityListFilterDefinitions, parseDottedFieldPath, ENTITY_ROW_POPUP_TITLE_OPTION, buildEntitySearchTitleContext } from '@acorex/platform/layout/entity-contracts';
+export * from '@acorex/platform/layout/entity-contracts';
+export { collectNestedCreateHiddenProperties, entityDetailsCreateActions, entityDetailsCreateActionsDeferredParent, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, mergeForeignKeyFieldIntoCreateActions } from '@acorex/platform/layout/entity-contracts';
 import { AXToastService } from '@acorex/components/toast';
 import * as i3$1 from '@acorex/core/translation';
-import { AXTranslationService, AXTranslationModule, resolveMultiLanguageString, translateSync } from '@acorex/core/translation';
+import { AXTranslationService, resolveMultiLanguageString, AXTranslationModule, translateSync } from '@acorex/core/translation';
 import * as i4$2 from '@acorex/platform/common';
-import { AXPNotFoundError, AXPEntityCommandScope, axpNavigateAppPath, AXPSettingsService, AXPCommonSettings, normalizeEntityDisplayTemplate, isUnresolvedEntityDisplayTemplate, AXPFilterOperatorMiddlewareService, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPRefreshEvent, AXPReloadEvent, axpRedirectToNotFound, ENTITY_ROW_POPUP_TITLE_OPTION, AXPCleanNestedFilters, AXPFileTypeProviderService, AXPFileStorageService, resolveEntityRowDisplayTitle, AXPFileActionsService, axpIsEntityRecordNotFound, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, buildEntitySearchTitleContext, AXPWorkflowNavigateAction, AXP_NOT_FOUND_ROUTE, AXP_PROTECTED_ROUTE_GUARDS, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
+import { AXPNotFoundError, AXPEntityCommandScope, axpNavigateAppPath, AXPSettingsService, AXPCommonSettings, resolveEntityCreateListBehavior, AXPRefreshEvent, resolveEntityModifyPopupTitle, resolveSearchableText, evaluateEntityDisplayTemplate, AXPFilterOperatorMiddlewareService, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPReloadEvent, axpRedirectToNotFound, AXP_ENTITY_DELETED_WORKFLOW_EVENT_TYPE, AXPCleanNestedFilters, AXPFileTypeProviderService, AXPFileStorageService, resolveEntityRowDisplayTitle, AXPFileActionsService, axpIsEntityRecordNotFound, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, AXPWorkflowNavigateAction, AXP_NOT_FOUND_ROUTE, AXP_PROTECTED_ROUTE_GUARDS, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXP_SEARCH_DEFINITION_LAZY_RESOLVER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
+import * as i1$3 from '@acorex/platform/workflow';
+import { AXPWorkflowEventService, AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, ChangeDetectorRef, input, signal, computed, ChangeDetectionStrategy, Component, ElementRef, NgModule, viewChild, effect, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, EnvironmentInjector, makeEnvironmentProviders } from '@angular/core';
+import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, ChangeDetectorRef, input, signal, computed, effect, ChangeDetectionStrategy, Component, ElementRef, NgModule, viewChild, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, EnvironmentInjector, makeEnvironmentProviders } from '@angular/core';
+import { cloneDeep, merge, get, castArray, set, orderBy, isNil, isEmpty, isEqual as isEqual$1, isObjectLike, isArray, has, isString } from 'lodash-es';
 import { Subject, filter, takeUntil } from 'rxjs';
 import { AXPLayoutBuilderService, LayoutBuilderModule } from '@acorex/platform/layout/builder';
-import * as i2 from '@acorex/platform/layout/widget-core';
-import { AXPWidgetsCatalog, AXPWidgetCoreModule, AXPPageStatus, AXPWidgetRegistryService, AXPColumnWidgetComponent, AXPValueWidgetComponent, AXPWidgetGroupEnum, createBooleanProperty, AXPWidgetRendererDirective, AXPBaseWidgetComponent, AXPWidgetStatus, createStringProperty, createNumberProperty, AXP_WIDGETS_ADVANCE_SUB_MEDIA, AXP_WIDGETS_ADVANCE_CATEGORY, createSelectProperty, AXP_WIDGETS_EDITOR_CATEGORY, AXP_WIDGET_DEFINITION_PROVIDER } from '@acorex/platform/layout/widget-core';
-import { AXPSystemActionType, AXPDeviceService, AXPExpressionEvaluatorService, AXPBroadcastEventService, applyFilterArray, applySortArray, resolveActionLook, AXPDistributedEventListenerService, AXPPlatformScope, AXHighlightService, extractValue, setSmart, getChangedPaths, objectKeyValueTransforms, AXPHookService, AXPDataGenerator, AXPComponentSlotModule, AXPContextStore, AXPColumnWidthService, AXPModuleManifestRegistry, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPModuleManifestsDataSourceDefinition } from '@acorex/platform/core';
-import { cloneDeep, merge, get, castArray, set, orderBy, omit, isNil, isEmpty, isEqual as isEqual$1, isArray, isString } from 'lodash-es';
+import { AXPWidgetsCatalog, AXPPlatformScope, AXPDataGenerator, AXPSystemActionType } from '@acorex/platform/contracts';
+import { AXPDeviceService, AXPExpressionEvaluatorService, AXPContextEvalFactory, AXPBroadcastEventService, applyFilterArray, applySortArray, resolveActionLook, AXPDistributedEventListenerService, AXHighlightService, extractValue, setSmart, getChangedPaths, AXPContextStore, isSelectionValueEqual, AXPDebugService, FORM_DIRTY_TRACE_NS, objectKeyValueTransforms, setupPopupFooterKeyboardShortcuts, AXPHookService, AXPComponentSlotModule, AXPColumnWidthService, AXPModuleManifestRegistry, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPModuleManifestsDataSourceDefinition } from '@acorex/platform/core';
 import { transform, isEqual } from 'lodash';
 import { AXPSessionService, AXPPermissionDefinitionsDataSourceDefinition } from '@acorex/platform/auth';
 import { Router, NavigationStart, ActivatedRoute, RouterModule, ROUTES } from '@angular/router';
 import { defineCommand, AXP_COMMAND_DEFINITION_CATEGORY_ENTITY, AXPCommandService, AXPQueryService, AXPQueryExecutor, AXPCommandExecutor, provideCommandSetups, provideQuerySetups, AXPCommandRegistry, AXPQueryRegistry } from '@acorex/platform/runtime';
+import { AXFormatService } from '@acorex/core/format';
 import * as i1 from '@acorex/components/button';
 import { AXButtonModule } from '@acorex/components/button';
 import * as i3 from '@acorex/components/skeleton';
 import { AXSkeletonModule } from '@acorex/components/skeleton';
-import { AXFormatService } from '@acorex/core/format';
+import * as i2 from '@acorex/platform/layout/widget-core';
+import { AXPWidgetCoreModule, AXPPageStatus, AXPWidgetRegistryService, AXPColumnWidgetComponent, AXPValueWidgetComponent, AXPWidgetGroupEnum, createBooleanProperty, AXPWidgetRendererDirective, AXPBaseWidgetComponent, AXPWidgetStatus, createStringProperty, createNumberProperty, AXP_WIDGETS_ADVANCE_SUB_MEDIA, AXP_WIDGETS_ADVANCE_CATEGORY, createSelectProperty, AXP_WIDGETS_EDITOR_CATEGORY, AXP_WIDGET_DEFINITION_PROVIDER } from '@acorex/platform/layout/widget-core';
 import * as i5 from '@angular/common';
 import { CommonModule, DOCUMENT, AsyncPipe, NgClass } from '@angular/common';
 import { AXOverlayService } from '@acorex/cdk/overlay';
 import { AXLocaleService } from '@acorex/core/locale';
 import { AXPlatform } from '@acorex/core/platform';
 import { AXPThemeLayoutBlockComponent, AXPPreloadFiltersComponent, AXP_PAGE_COMPONENT_PROVIDER, AXPStateMessageComponent, AXPColumnItemListComponent, AXPDataSelectorService, AXPPageComponentRegistryService } from '@acorex/platform/layout/components';
-import { AXPPageLayoutBaseComponent, AXPPageLayoutComponent, AXPPageComponentRendererDirective, AXPPageComponentInstanceRegistryService, axpDetailsViewCanDeactivateGuard } from '@acorex/platform/layout/views';
+import { AXPPageLayoutBaseComponent, AXPPageLayoutComponent, AXPPageComponentRendererDirective, AXPPageComponentInstanceRegistryService, AXP_LAYOUT_DETAILS_VIEW_ADAPTER_LOADER, axpDetailsViewCanDeactivateGuard } from '@acorex/platform/layout/views';
 import { AXDataSource } from '@acorex/cdk/common';
 import { AXP_ENTITY_CRUD_SETUP } from '@acorex/platform/domain';
 export { AXP_ENTITY_DEFINITION_CRUD_SERVICE } from '@acorex/platform/domain';
-import * as i1$3 from '@acorex/platform/workflow';
-import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowEventService, AXPWorkflowModule } from '@acorex/platform/workflow';
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
 import { moveItemInArray } from '@angular/cdk/drag-drop';
 import { AXDialogService } from '@acorex/components/dialog';
 import { AXLoadingDialogService } from '@acorex/components/loading-dialog';
 import { AXPopupService } from '@acorex/components/popup';
+import { AXP_DISABLED_PROPERTY, AXP_ALLOW_CLEAR_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DATA_PROPERTY_GROUP, AXP_ALLOW_MULTIPLE_PROPERTY, AXP_NAME_PROPERTY, AXP_READONLY_PROPERTY, AXP_PLACEHOLDER_PROPERTY, AXP_BEHAVIOR_PROPERTY_GROUP, AXPProviderSelectWidgetEditBase, AXP_ROW_EXPR_PREFIX, AXP_DOWNLOADABLE_PROPERTY, AXP_DESCRIPTION_PROPERTY, AXP_REPEATER_ENTITY_BY_KEY_LOOKUP } from '@acorex/platform/layout/widgets';
 import * as i2$1 from '@acorex/components/badge';
 import { AXBadgeModule } from '@acorex/components/badge';
 import { AXCheckBoxModule } from '@acorex/components/check-box';
@@ -57,7 +62,6 @@ import { AXLoadingModule } from '@acorex/components/loading';
 import * as i6 from '@acorex/components/tag-box';
 import { AXTagBoxModule } from '@acorex/components/tag-box';
 import { AXValidationModule } from '@acorex/core/validation';
-import { AXP_DISABLED_PROPERTY, AXP_ALLOW_CLEAR_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DATA_PROPERTY_GROUP, AXP_ALLOW_MULTIPLE_PROPERTY, AXP_NAME_PROPERTY, AXP_READONLY_PROPERTY, AXP_PLACEHOLDER_PROPERTY, AXP_BEHAVIOR_PROPERTY_GROUP, AXPProviderSelectWidgetEditBase, AXP_ROW_EXPR_PREFIX, AXP_DOWNLOADABLE_PROPERTY, AXP_DESCRIPTION_PROPERTY } from '@acorex/platform/layout/widgets';
 import * as i2$2 from '@acorex/components/select-box';
 import { AXSelectBoxModule } from '@acorex/components/select-box';
 import * as i3$4 from '@acorex/components/dropdown';
@@ -854,276 +858,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                 }]
         }] });
 
-// #region Master
-function entityMasterCreateAction() {
-    return {
-        title: '@general:actions.create.title',
-        command: {
-            name: 'Entity:Create',
-        },
-        priority: 'primary',
-        type: AXPSystemActionType.Create,
-        scope: AXPEntityCommandScope.TypeLevel,
-    };
-}
-function entityMasterEditAction() {
-    return {
-        title: '@general:actions.edit.title',
-        command: 'Entity:Update',
-        priority: 'secondary',
-        type: AXPSystemActionType.Update,
-        scope: AXPEntityCommandScope.Individual,
-        default: true,
-    };
-}
-function entityMasterBulkDeleteAction() {
-    return {
-        title: '@general:actions.delete-items.title',
-        command: 'delete-entity',
-        priority: 'primary',
-        type: AXPSystemActionType.Delete,
-        scope: AXPEntityCommandScope.Selected,
-        order: 100,
-    };
-}
-function entityMasterViewAction() {
-    return {
-        title: '@general:actions.view.title',
-        command: 'open-entity',
-        priority: 'secondary',
-        type: AXPSystemActionType.View,
-        scope: AXPEntityCommandScope.Individual,
-        default: true,
-    };
-}
-function entityMasterDeleteAction() {
-    return {
-        title: '@general:actions.delete.title',
-        command: 'delete-entity',
-        priority: 'secondary',
-        type: AXPSystemActionType.Delete,
-        scope: AXPEntityCommandScope.Individual,
-        order: 100,
-        shortcuts: ['ctrl+shift+delete'],
-    };
-}
-function entityMasterCrudActions(options) {
-    const opts = {
-        create: true,
-        delete: true,
-        view: true,
-        edit: false,
-        ...options,
-    };
-    const actions = [];
-    if (opts.create) {
-        actions.push(entityMasterCreateAction());
-    }
-    if (opts.delete) {
-        actions.push(entityMasterBulkDeleteAction());
-        actions.push(entityMasterDeleteAction());
-    }
-    if (opts.view) {
-        actions.push(entityMasterViewAction());
-    }
-    if (opts.edit) {
-        actions.push(entityMasterEditAction());
-    }
-    return actions;
-}
-function entityMasterRecordActions() {
-    return [entityMasterDeleteAction()];
-}
-// #endregion
-// #region Details
-function entityDetailsCreateActions(parentId) {
-    return {
-        title: '@general:actions.create.title',
-        command: {
-            name: 'Entity:Create',
-            options: {
-                process: {
-                    redirect: false,
-                    canCreateNewOne: true,
-                    data: {
-                        [parentId]: '{{context.eval("id")}}',
-                    },
-                },
-            },
-        },
-        priority: 'primary',
-        type: AXPSystemActionType.Create,
-        scope: AXPEntityCommandScope.TypeLevel,
-    };
-}
-/**
- * Type-level Create with empty `process.data`; the FK is supplied from `relatedEntity.persistence.foreignKeyField`
- * when the related list is built (see `mergeForeignKeyFieldIntoCreateActions`).
- */
-function entityDetailsCreateActionsDeferredParent() {
-    return {
-        title: '@general:actions.create.title',
-        command: {
-            name: 'Entity:Create',
-            options: {
-                process: {
-                    redirect: false,
-                    canCreateNewOne: true,
-                    data: {},
-                },
-            },
-        },
-        priority: 'primary',
-        type: AXPSystemActionType.Create,
-        scope: AXPEntityCommandScope.TypeLevel,
-    };
-}
-/**
- * Ensures each type-level `Entity:Create` action includes `process.data[foreignKeyField]` bound to the parent row id.
- */
-function mergeForeignKeyFieldIntoCreateActions(foreignKeyField, actions) {
-    if (!foreignKeyField || !actions?.length) {
-        return actions ?? [];
-    }
-    return actions.map((a) => {
-        const cmd = a.command;
-        if (typeof cmd !== 'object' ||
-            !cmd ||
-            cmd.name !== 'Entity:Create' ||
-            a.scope !== AXPEntityCommandScope.TypeLevel) {
-            return a;
-        }
-        const opts = (cmd.options ?? {});
-        const proc = (opts['process'] ?? {});
-        const data = { ...(proc['data'] ?? {}) };
-        if (data[foreignKeyField] === undefined || data[foreignKeyField] === null || data[foreignKeyField] === '') {
-            data[foreignKeyField] = '{{ context.eval("id") }}';
-        }
-        return {
-            ...a,
-            command: {
-                ...cmd,
-                options: { ...opts, process: { ...proc, data } },
-            },
-        };
-    });
-}
-/** Property names hidden on nested Create from a related list (`excludeProperties` plus `foreignKeyField` when set). */
-function collectNestedCreateHiddenProperties(relatedEntity) {
-    const fk = relatedEntity.persistence?.foreignKeyField;
-    const merged = [...(relatedEntity.excludeProperties ?? [])];
-    if (fk) {
-        merged.push(fk);
-    }
-    const unique = [...new Set(merged)];
-    return unique.length ? unique : undefined;
-}
-function entityDetailsSimpleCondition(fk) {
-    return {
-        name: fk,
-        operator: { type: 'equal' },
-        value: '{{context.eval("id")}}',
-    };
-}
-function entityDetailsReferenceCondition(type) {
-    return [
-        {
-            name: 'reference.id',
-            operator: { type: 'equal' },
-            value: '{{context.eval("id")}}',
-        },
-        {
-            name: 'reference.type',
-            operator: { type: 'equal' },
-            value: type,
-        },
-    ];
-}
-function entityDetailsEditAction() {
-    return {
-        title: '@general:actions.edit.title',
-        // command: 'quick-modify-entity',
-        command: 'Entity:Update',
-        priority: 'secondary',
-        type: AXPSystemActionType.Update,
-        default: true,
-        scope: AXPEntityCommandScope.Individual,
-    };
-}
-function entityDetailsNewEditAction() {
-    return {
-        title: 'New Edit',
-        command: {
-            name: 'Entity:Update',
-        },
-        priority: 'secondary',
-        type: AXPSystemActionType.Update,
-        default: true,
-        scope: AXPEntityCommandScope.Individual,
-    };
-}
-function entityOverrideDetailsViewAction() {
-    return {
-        title: '@general:actions.view.title',
-        command: 'open-entity',
-        priority: 'secondary',
-        hidden: true,
-        type: AXPSystemActionType.View,
-        scope: AXPEntityCommandScope.Individual,
-    };
-}
-function entityDetailsCrudActions(parentId, options) {
-    const opts = {
-        create: true,
-        delete: true,
-        view: true,
-        edit: true,
-        ...options,
-    };
-    const actions = [];
-    if (opts.create) {
-        if (parentId) {
-            actions.push(entityDetailsCreateActions(parentId));
-        }
-        else {
-            actions.push(entityDetailsCreateActionsDeferredParent());
-        }
-    }
-    if (opts.edit) {
-        actions.push(entityDetailsEditAction());
-    }
-    if (opts.view) {
-        actions.push(entityOverrideDetailsViewAction());
-    }
-    return actions;
-}
-function entityDetailsReferenceCreateActions(type) {
-    return [
-        {
-            title: '@general:actions.create.title',
-            command: {
-                name: 'Entity:Create',
-                options: {
-                    process: {
-                        redirect: false,
-                        canCreateNewOne: true,
-                        data: {
-                            reference: {
-                                id: '{{context.eval("id")}}',
-                                type: type,
-                            },
-                        },
-                    },
-                },
-            },
-            priority: 'primary',
-            type: AXPSystemActionType.Create,
-            scope: AXPEntityCommandScope.TypeLevel,
-        },
-        entityDetailsEditAction(),
-        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.
@@ -1481,7 +1215,7 @@ class PropertyFilter {
             const viewLayout = mainViewLayoutMap.get(prop.name);
             const mergedProp = {
                 ...prop,
-                __layout: viewLayout?.layout,
+                __layout: viewLayout?.layout ? cloneDeep(viewLayout.layout) : undefined,
                 __order: viewLayout?.layout?.order,
             };
             if (this.readonlyList?.has(prop.name)) {
@@ -1544,7 +1278,7 @@ class PropertyFilter {
                         const mergedProp = {
                             ...prop,
                             __dataPath: dataPath,
-                            __layout: viewLayout?.layout,
+                            __layout: viewLayout?.layout ? cloneDeep(viewLayout.layout) : undefined,
                             __order: viewLayout?.layout?.order,
                         };
                         // Apply generic propertyOverrides extension (e.g. for identifier defaultValue on nested paths)
@@ -2053,6 +1787,9 @@ const GRID_COLUMNS = 12;
 function getColSpanAt(layout, breakpoint) {
     return layout?.positions?.[breakpoint]?.colSpan ?? GRID_COLUMNS;
 }
+function getColStartAt(layout, breakpoint) {
+    return layout?.positions?.[breakpoint]?.colStart;
+}
 function setColSpanAt(layout, breakpoint, colSpan) {
     if (!layout)
         return;
@@ -2077,23 +1814,56 @@ function normalizeLayoutFillRowGaps(items, getLayout, getItemId) {
     if (items.length === 0)
         return scaleFactors;
     for (const breakpoint of LAYOUT_BREAKPOINTS) {
-        const colSpans = items.map((item) => getColSpanAt(getLayout(item), breakpoint));
         let i = 0;
-        while (i < colSpans.length) {
-            let rowSum = 0;
+        while (i < items.length) {
             const rowStart = i;
-            while (i < colSpans.length && rowSum + colSpans[i] <= GRID_COLUMNS) {
-                rowSum += colSpans[i];
+            let rowHasExplicitColStart = false;
+            let sequentialRowSum = 0;
+            let explicitRowEnd = 0;
+            while (i < items.length) {
+                const layout = getLayout(items[i]);
+                const colStart = getColStartAt(layout, breakpoint);
+                const colSpan = getColSpanAt(layout, breakpoint);
+                // colStart: 1 begins a new row (except for the first item in the current row)
+                if (colStart === 1 && i > rowStart) {
+                    break;
+                }
+                if (colStart != null) {
+                    rowHasExplicitColStart = true;
+                    const end = colStart + colSpan;
+                    if (end - 1 > GRID_COLUMNS) {
+                        i++;
+                        break;
+                    }
+                    explicitRowEnd = Math.max(explicitRowEnd, end);
+                    i++;
+                    if (explicitRowEnd >= GRID_COLUMNS) {
+                        break;
+                    }
+                    continue;
+                }
+                if (sequentialRowSum + colSpan > GRID_COLUMNS && i > rowStart) {
+                    break;
+                }
+                if (sequentialRowSum + colSpan > GRID_COLUMNS && i === rowStart) {
+                    sequentialRowSum = colSpan;
+                    i++;
+                    break;
+                }
+                sequentialRowSum += colSpan;
                 i++;
+                if (sequentialRowSum >= GRID_COLUMNS) {
+                    break;
+                }
             }
-            if (i === rowStart) {
-                rowSum = colSpans[i];
-                i++;
+            // Rows with explicit colStart (e.g. 4+4+4 at columns 1/5/9) keep intentional gaps
+            if (rowHasExplicitColStart) {
+                continue;
             }
-            if (rowSum < GRID_COLUMNS && rowSum > 0 && i > rowStart) {
+            if (sequentialRowSum < GRID_COLUMNS && sequentialRowSum > 0 && i > rowStart) {
                 const lastIdx = i - 1;
-                const oldColSpan = colSpans[lastIdx];
-                const fill = GRID_COLUMNS - rowSum;
+                const oldColSpan = getColSpanAt(getLayout(items[lastIdx]), breakpoint);
+                const fill = GRID_COLUMNS - sequentialRowSum;
                 const newColSpan = Math.min(GRID_COLUMNS, oldColSpan + fill);
                 const layout = getLayout(items[lastIdx]);
                 if (layout) {
@@ -2532,6 +2302,7 @@ class AXPCreateEntityCommand {
         this.translationService = inject(AXTranslationService);
         this.settingsService = inject(AXPSettingsService);
         this.openEntityDetailsCommand = inject(AXPOpenEntityDetailsCommand);
+        this.workflowEventService = inject(AXPWorkflowEventService);
         this.context = {};
     }
     async execute(input) {
@@ -2588,8 +2359,7 @@ class AXPCreateEntityCommand {
             }
             const createFn = entityRef.commands?.create?.execute;
             const updateFn = entityRef.commands?.update?.execute;
-            const context = dialogRef.context();
-            console.log('context', context);
+            const context = merge({}, data, dialogRef.context());
             const hasPersistedId = hasPersistedRootId(context);
             const persistFn = hasPersistedId ? updateFn : createFn;
             const missingPersistHandlerMsg = hasPersistedId
@@ -2647,13 +2417,24 @@ class AXPCreateEntityCommand {
             .show();
         const commandResult = result;
         const redirectOption = options?.process?.redirect;
-        const shouldRedirect = redirectOption !== undefined
-            ? redirectOption
-            : await this.settingsService.get(AXPCommonSettings.RedirectToDetailsAfterCreate);
-        if (commandResult.success && shouldRedirect && commandResult.data) {
+        const { shouldRedirect, shouldHighlight } = await resolveEntityCreateListBehavior(this.settingsService, {
+            redirect: redirectOption,
+        });
+        if (commandResult.success && commandResult.data) {
             const createdItem = commandResult.data?.item ?? commandResult.data;
-            const createdId = createdItem?.id;
-            if (createdId != null) {
+            const createdId = createdItem?.id ?? createdItem?._id;
+            const refreshMeta = { resetPagination: true };
+            if (createdId != null && shouldHighlight) {
+                refreshMeta['highlightRowId'] = createdId;
+            }
+            if (entityRef.parentKey && createdItem?.[entityRef.parentKey]) {
+                refreshMeta['refreshTargetId'] = createdItem[entityRef.parentKey];
+            }
+            this.workflowEventService.dispatch(AXPRefreshEvent({
+                entity: `${moduleName}.${entityName}`,
+                meta: refreshMeta,
+            }));
+            if (shouldRedirect && createdId != null) {
                 await this.openEntityDetailsCommand.execute({
                     entity: `${moduleName}.${entityName}`,
                     data: { id: String(createdId) },
@@ -2744,6 +2525,9 @@ class AXPUpdateEntityCommand {
         this.entityService = inject(AXPEntityDefinitionRegistryService);
         this.toastService = inject(AXToastService);
         this.translationService = inject(AXTranslationService);
+        this.formatService = inject(AXFormatService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.contextEvalFactory = inject(AXPContextEvalFactory);
         this.eventService = inject(AXPBroadcastEventService);
     }
     //#endregion
@@ -2751,7 +2535,7 @@ class AXPUpdateEntityCommand {
     async execute(input) {
         const enableOperationToasts = await this.settingsService.get(AXPCommonSettings.EnableOperationToasts);
         const dialogSize = input['dialogSize'];
-        const { entity, entityInfo, data, options } = input.__context__;
+        const { entity, data, options } = input.__context__;
         const excludeProperties = options?.excludeProperties;
         const includeProperties = options?.includeProperties;
         const decoration = options?.['decoration'];
@@ -2790,10 +2574,17 @@ class AXPUpdateEntityCommand {
             if (headerTitle) {
                 chain = chain.title(headerTitle);
             }
-            else if (entityInfo?.title) {
-                const editText = await this.translationService.translateAsync('@general:actions.edit.title');
-                const translatedTitle = await this.translationService.translateAsync(entityInfo.title);
-                chain = chain.title(`${editText} ${translatedTitle}`);
+            else {
+                let recordData = {};
+                const recordId = typeof data === 'string' ? data : (data?.id ?? data?._id);
+                if (recordId) {
+                    recordData = await this.entityForm.getRecordById(`${moduleName}.${entityName}`, String(recordId));
+                }
+                else if (typeof data === 'object' && data != null) {
+                    recordData = data;
+                }
+                const title = await resolveEntityModifyPopupTitle(entityRef, recordData, this.translationService, this.formatService, this.expressionEvaluator, this.contextEvalFactory, '@general:actions.edit.title');
+                chain = chain.title(title);
             }
             const finalSize = layoutSize || dialogSize;
             if (finalSize) {
@@ -2887,15 +2678,19 @@ var updateEntity_command = /*#__PURE__*/Object.freeze({
 
 class AXPViewEntityDetailsCommand {
     constructor() {
-        //#region ----   Services & Dependencies   ----
+        //#region ---- Services & Dependencies ----
         this.entityForm = inject(AXPEntityFormBuilderService);
         this.entityService = inject(AXPEntityDefinitionRegistryService);
         this.translationService = inject(AXTranslationService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.contextEvalFactory = inject(AXPContextEvalFactory);
     }
     //#endregion
-    //#region ----   Command Execution   ----
+    //#region ---- Command Execution ----
     async execute(input) {
-        const excludeProperties = input['excludeProperties'];
+        const excludeProperties = input['excludeProperties'] ??
+            input?.options?.excludeProperties ??
+            input?.__context__?.options?.excludeProperties;
         const { entity, entityInfo, data } = input.__context__;
         const [moduleName, entityName] = (entity || '').split('.');
         if (!moduleName || !entityName) {
@@ -2906,10 +2701,9 @@ class AXPViewEntityDetailsCommand {
                 },
             };
         }
-        await this.entityService.resolve(moduleName, entityName);
+        const entityDef = await this.entityService.resolve(moduleName, entityName);
         let dialogRef;
         try {
-            // Validate data type
             if (!data || (typeof data !== 'string' && typeof data !== 'object')) {
                 return {
                     success: false,
@@ -2918,22 +2712,18 @@ class AXPViewEntityDetailsCommand {
                     },
                 };
             }
-            // Pass data directly to single() - it handles string | object internally
             let chain = this.entityForm.entity(`${moduleName}.${entityName}`).single(data);
             if (excludeProperties && excludeProperties.length > 0) {
                 chain = chain.exclude(...excludeProperties);
             }
-            if (entityInfo?.title) {
-                const detailText = await this.translationService.translateAsync('@general:actions.detail.title');
-                // const translatedTitle = await this.translationService.translateAsync(entityInfo.title);
-                chain = chain.title(`${detailText}`);
+            const dialogTitle = await this.resolveDialogTitle(entityDef, data);
+            if (dialogTitle) {
+                chain = chain.title(dialogTitle);
             }
             chain = chain.actions((actions) => {
                 actions.submit('@general:actions.ok.title');
             });
             dialogRef = await chain.show();
-            // For single/view mode, only close action is available
-            // No need to show any message when closing a read-only view
             dialogRef.close();
             return {
                 success: true,
@@ -2953,11 +2743,62 @@ class AXPViewEntityDetailsCommand {
             };
         }
         finally {
-            if (dialogRef) {
+            if (dialogRef && typeof dialogRef === 'object' && dialogRef !== null && 'setLoading' in dialogRef) {
                 dialogRef.setLoading(false);
             }
         }
     }
+    //#endregion
+    //#region ---- Title resolution ----
+    async resolveDialogTitle(entityDef, data) {
+        const titleTemplate = entityDef.interfaces?.master?.single?.title ??
+            entityDef.formats?.searchResult?.title ??
+            entityDef.formats?.individual;
+        if (!titleTemplate || typeof titleTemplate !== 'string') {
+            return this.translationService.translateAsync('@general:actions.detail.title');
+        }
+        if (!titleTemplate.includes('{{')) {
+            const translated = await this.translationService.translateAsync(titleTemplate);
+            return resolveMultiLanguageString(translated, this.translationService.getActiveLang()).trim() || translated;
+        }
+        const recordContext = await this.loadRecordContext(`${entityDef.module}.${entityDef.name}`, data);
+        const scope = {
+            context: this.contextEvalFactory.createScope(recordContext),
+        };
+        const evaluated = await this.expressionEvaluator.evaluate(titleTemplate, scope);
+        const locale = this.translationService.getActiveLang();
+        const text = resolveMultiLanguageString(evaluated, locale).trim() || String(evaluated ?? '').trim();
+        if (text) {
+            return text;
+        }
+        return this.translationService.translateAsync('@general:actions.detail.title');
+    }
+    async loadRecordContext(entityFullName, data) {
+        if (typeof data === 'object' && data !== null && !Array.isArray(data)) {
+            const hasNestedFields = get(data, 'subject.title') != null ||
+                get(data, 'recordType.title') != null ||
+                get(data, 'occurredDate') != null;
+            if (hasNestedFields) {
+                return data;
+            }
+        }
+        const recordId = typeof data === 'string' ? data : String(get(data, 'id') ?? '');
+        if (!recordId) {
+            return typeof data === 'object' && data !== null ? data : {};
+        }
+        try {
+            const [moduleName, entityName] = entityFullName.split('.');
+            const entity = await this.entityService.resolve(moduleName, entityName);
+            const byKeyFn = entity?.queries?.byKey?.execute;
+            if (typeof byKeyFn === 'function') {
+                return (await byKeyFn(recordId)) ?? {};
+            }
+        }
+        catch {
+            // Fall back to list row payload below.
+        }
+        return typeof data === 'object' && data !== null ? data : {};
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPViewEntityDetailsCommand, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPViewEntityDetailsCommand, providedIn: 'root' }); }
 }
@@ -2973,55 +2814,39 @@ var viewEntityDetails_command = /*#__PURE__*/Object.freeze({
     AXPViewEntityDetailsCommand: AXPViewEntityDetailsCommand
 });
 
-//#region ---- Datasource keys ----
-/** Platform entity layout datasource registry names. */
-const AXPEntityDataSourceKeys = {
-    Entities: 'entities',
-};
-//#endregion
-
-const AXPEntityEventsKeys = {
-    REFRESH_LAYOUT: 'entity:refresh-layout',
-    REFRESH_DATA: 'entity:refresh-data',
-};
-
-//#endregion
-
-/** Entity query filter field for {@link AXPRecordWorkflowInfo.instanceId}. */
-const AXP_RECORD_WORKFLOW_INFO_INSTANCE_ID_FIELD = 'workflowInfo.instanceId';
-/** Entity query filter field for {@link AXPRecordWorkflowInfo.correlationId}. */
-const AXP_RECORD_WORKFLOW_INFO_CORRELATION_ID_FIELD = 'workflowInfo.correlationId';
-/** Entity query filter field for {@link AXPRecordWorkflowInfo.definitionId}. */
-const AXP_RECORD_WORKFLOW_INFO_DEFINITION_ID_FIELD = 'workflowInfo.definitionId';
-/** Returns a trimmed workflow instance id from a record, if present. */
-function getRecordWorkflowInstanceId(record) {
-    const id = record?.workflowInfo?.instanceId?.trim();
-    return id && id.length > 0 ? id : null;
-}
-/** Returns a trimmed workflow correlation id from a record, if present. */
-function getRecordWorkflowCorrelationId(record) {
-    const id = record?.workflowInfo?.correlationId?.trim();
-    return id && id.length > 0 ? id : null;
+/** Common keys on denormalized expose stubs (e.g. `{ id, displayName }` from lookup expose). */
+const LOOKUP_EXPOSE_STUB_DISPLAY_FIELDS = ['displayName', 'title', 'name', 'fullName', 'code'];
+function resolveLookupItemFieldValue(item, field) {
+    const direct = get(item, field);
+    if (direct != null && direct !== '') {
+        return direct;
+    }
+    if (!field.includes('.')) {
+        return direct;
+    }
+    for (const fallback of LOOKUP_EXPOSE_STUB_DISPLAY_FIELDS) {
+        const candidate = get(item, fallback);
+        if (candidate != null && candidate !== '') {
+            return candidate;
+        }
+    }
+    return direct;
 }
-/** Builds canonical workflow metadata for a domain record (engine / middleware). */
-function buildAXPRecordWorkflowInfo(params) {
-    const instanceId = params.instanceId?.trim();
-    if (!instanceId) {
-        return {};
+function formatLookupFieldValue(raw, locale, translationService, resolveMultiLanguage) {
+    if (raw == null || raw === '') {
+        return '';
     }
-    const definitionId = params.definitionId?.trim();
-    const correlationId = params.correlationId?.trim();
-    return {
-        instanceId,
-        ...(definitionId ? { definitionId } : { definitionId: null }),
-        ...(correlationId ? { correlationId } : { correlationId: null }),
-        ...(params.pinnedVersion != null ? { pinnedVersion: params.pinnedVersion } : {}),
-    };
+    if (typeof raw === 'string' || typeof raw === 'number' || typeof raw === 'boolean') {
+        return String(raw);
+    }
+    if (typeof raw === 'object' && !Array.isArray(raw)) {
+        if (resolveMultiLanguage) {
+            return resolveMultiLanguage(raw);
+        }
+        return resolveSearchableText(raw, locale, translationService);
+    }
+    return String(raw);
 }
-
-//#region ---- Contracts barrel ----
-//#endregion
-
 //#region ---- Template resolution ----
 /**
  * Resolves the display template for a lookup item.
@@ -3063,9 +2888,9 @@ function resolveLookupDisplayField(entity, options) {
     return found ?? 'title';
 }
 /**
- * Formats a lookup row for display using template and/or field resolution.
+ * Formats a lookup row for display using template and/or field resolution (display tier).
  */
-function formatLookupItemDisplay(item, entity, options, formatService, resolveMultiLanguage) {
+async function formatLookupItemDisplayAsync(item, entity, options, formatService, displayDeps, resolveMultiLanguage) {
     if (item == null) {
         return '';
     }
@@ -3080,6 +2905,45 @@ function formatLookupItemDisplay(item, entity, options, formatService, resolveMu
     }
     const template = resolveLookupDisplayTemplate(entity, options);
     if (template) {
+        if (template.includes('{{') || template.includes('context.eval')) {
+            const evaluated = await evaluateEntityDisplayTemplate(template, item, displayDeps.expressionEvaluator, displayDeps.locale, displayDeps.translationService, displayDeps.contextEvalFactory);
+            const text = sanitizeResolvedEntityDisplayTitle(resolveSearchableText(evaluated, displayDeps.locale, displayDeps.translationService));
+            if (text && !isUnresolvedEntityDisplayTemplate(text)) {
+                return text;
+            }
+        }
+        else {
+            const formatted = formatService.format(template, 'string', item);
+            if (formatted) {
+                const text = String(formatted);
+                if (!isUnresolvedEntityDisplayTemplate(text)) {
+                    return text;
+                }
+            }
+        }
+    }
+    const field = resolveLookupDisplayField(entity, options);
+    const raw = typeof item === 'object' && item != null ? resolveLookupItemFieldValue(item, field) : undefined;
+    return formatLookupFieldValue(raw, displayDeps.locale, displayDeps.translationService, resolveMultiLanguage);
+}
+/**
+ * @deprecated Prefer {@link formatLookupItemDisplayAsync} for expression templates with `context.eval`.
+ */
+function formatLookupItemDisplay(item, entity, options, formatService, resolveMultiLanguage) {
+    if (item == null) {
+        return '';
+    }
+    if (typeof item === 'string' || typeof item === 'number' || typeof item === 'boolean') {
+        return String(item);
+    }
+    if (typeof item !== 'object') {
+        return '';
+    }
+    if (options.isMultiLanguage?.(item) && resolveMultiLanguage) {
+        return resolveMultiLanguage(item);
+    }
+    const template = resolveLookupDisplayTemplate(entity, options);
+    if (template && !template.includes('context.eval') && !template.includes('{{')) {
         const formatted = formatService.format(template, 'string', item);
         if (formatted) {
             const text = String(formatted);
@@ -3089,8 +2953,8 @@ function formatLookupItemDisplay(item, entity, options, formatService, resolveMu
         }
     }
     const field = resolveLookupDisplayField(entity, options);
-    const raw = get(item, field);
-    if (raw == null) {
+    const raw = typeof item === 'object' && item != null ? resolveLookupItemFieldValue(item, field) : undefined;
+    if (raw == null || raw === '') {
         return '';
     }
     if (typeof raw === 'string' || typeof raw === 'number' || typeof raw === 'boolean') {
@@ -3113,6 +2977,8 @@ class AXPEntityDetailPopoverComponent {
         this.queryService = inject(AXPQueryService);
         this.formatService = inject(AXFormatService);
         this.translation = inject(AXTranslationService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.contextEvalFactory = inject(AXPContextEvalFactory);
         this.changeDetectorRef = inject(ChangeDetectorRef);
         //#endregion
         //#region ----   Inputs   ----
@@ -3128,31 +2994,10 @@ class AXPEntityDetailPopoverComponent {
         //#region ----   Signals   ----
         this.entityDetails = signal(null, ...(ngDevMode ? [{ debugName: "entityDetails" }] : /* istanbul ignore next */ []));
         this.isLoadingDetails = signal(false, ...(ngDevMode ? [{ debugName: "isLoadingDetails" }] : /* istanbul ignore next */ []));
+        this.headerTitleVersion = 0;
         /** Placeholder rows for the loading skeleton (matches typical property count). */
         this.loadingSkeletonRows = [1, 2, 3, 4, 5];
-        this.headerTitle = computed(() => {
-            const details = this.entityDetails();
-            const entityDefinition = details?.entityDefinition;
-            const data = details?.entityData;
-            if (data && entityDefinition) {
-                const fromDetails = this.resolveLookupDisplayLabel(data, entityDefinition);
-                if (fromDetails) {
-                    return fromDetails;
-                }
-            }
-            const preset = this.displayTitle()?.trim();
-            if (preset && !isUnresolvedEntityDisplayTemplate(preset)) {
-                return preset;
-            }
-            const fallbackItem = this.item();
-            if (fallbackItem) {
-                const fromItem = this.resolveLookupDisplayLabel(fallbackItem, entityDefinition);
-                if (fromItem) {
-                    return fromItem;
-                }
-            }
-            return preset ?? '';
-        }, ...(ngDevMode ? [{ debugName: "headerTitle" }] : /* istanbul ignore next */ []));
+        this.headerTitle = signal('', ...(ngDevMode ? [{ debugName: "headerTitle" }] : /* istanbul ignore next */ []));
         /**
          * Stable list of property widgets for the template. Must be a signal (computed), not a method:
          * calling a method from the template rebuilds nodes every CD cycle and can make the widget renderer loop.
@@ -3165,6 +3010,18 @@ class AXPEntityDetailPopoverComponent {
                 return [];
             return this.buildEntityPropertiesWithWidgets(data, entityDefinition, this.textField(), this.valueField());
         }, ...(ngDevMode ? [{ debugName: "entityPropertiesWithWidgets" }] : /* istanbul ignore next */ []));
+        effect(() => {
+            void this.translation.getActiveLang();
+            const details = this.entityDetails();
+            const preset = this.displayTitle();
+            const fallbackItem = this.item();
+            const version = ++this.headerTitleVersion;
+            void this.resolveHeaderTitle(details?.entityDefinition, details?.entityData, preset, fallbackItem).then((title) => {
+                if (version === this.headerTitleVersion) {
+                    this.headerTitle.set(title);
+                }
+            });
+        });
     }
     //#endregion
     //#region ----   Public Methods   ----
@@ -3201,10 +3058,34 @@ class AXPEntityDetailPopoverComponent {
     }
     //#endregion
     //#region ----   Helper Methods   ----
-    resolveLookupDisplayLabel(item, entityDefinition) {
-        const label = formatLookupItemDisplay(item, entityDefinition, { textField: this.textField() }, this.formatService, (value) => this.translation.resolve(value));
-        const resolved = typeof label === 'string' ? label : this.translation.resolve(label);
-        return resolved && !isUnresolvedEntityDisplayTemplate(resolved) ? resolved : '';
+    async resolveHeaderTitle(entityDefinition, data, preset, fallbackItem) {
+        if (data && entityDefinition) {
+            const fromDetails = await this.resolveLookupDisplayLabelAsync(data, entityDefinition);
+            if (fromDetails) {
+                return fromDetails;
+            }
+        }
+        const presetTrimmed = preset?.trim();
+        if (presetTrimmed && !isUnresolvedEntityDisplayTemplate(presetTrimmed)) {
+            return presetTrimmed;
+        }
+        if (fallbackItem) {
+            const fromItem = await this.resolveLookupDisplayLabelAsync(fallbackItem, entityDefinition);
+            if (fromItem) {
+                return fromItem;
+            }
+        }
+        return presetTrimmed ?? '';
+    }
+    async resolveLookupDisplayLabelAsync(item, entityDefinition) {
+        const locale = this.translation.getActiveLang() ?? 'en-US';
+        const label = await formatLookupItemDisplayAsync(item, entityDefinition ?? null, { textField: this.textField() }, this.formatService, {
+            expressionEvaluator: this.expressionEvaluator,
+            contextEvalFactory: this.contextEvalFactory,
+            translationService: this.translation,
+            locale,
+        }, (value) => this.translation.resolve(value));
+        return label && !isUnresolvedEntityDisplayTemplate(label) ? label : '';
     }
     /**
      * Returns true if a value is meaningful for display (non-empty/non-null).
@@ -3369,14 +3250,24 @@ class AXPEntityDetailPopoverComponent {
     resolveDataPath(prop, data) {
         const iface = prop.schema?.interface;
         const expose = iface?.options?.['expose'];
+        const textField = iface?.options?.['textField']?.trim();
         if (expose?.length) {
-            // Try expanded path first (e.g. personTitle for personTitle.title)
             const textTarget = expose.find((e) => e.source !== 'id');
             if (textTarget) {
                 const expandedPath = textTarget.target.split('.')[0];
                 const expandedValue = get(data, expandedPath);
                 if (expandedValue != null && typeof expandedValue === 'object') {
-                    return expandedPath;
+                    if (textField) {
+                        if (this.hasMeaningfulValue(get(expandedValue, textField))) {
+                            return expandedPath;
+                        }
+                    }
+                    else {
+                        const leaf = textTarget.target.split('.').pop();
+                        if (leaf && this.hasMeaningfulValue(get(expandedValue, leaf))) {
+                            return expandedPath;
+                        }
+                    }
                 }
             }
         }
@@ -3388,7 +3279,7 @@ class AXPEntityDetailPopoverComponent {
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailPopoverComponent, decorators: [{
             type: Component,
             args: [{ selector: 'axp-entity-detail-popover', changeDetection: ChangeDetectionStrategy.OnPush, imports: [CommonModule, AXButtonModule, AXPWidgetCoreModule, AXTranslationModule, AXSkeletonModule], template: "<div\n  class=\"ax-lightest-surface dark:ax-dark-surface ax-p-4 ax-w-[min(600px,calc(100vw-2rem))] ax-rounded-lg ax-shadow-lg\"\n>\n  <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n    <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n      {{ headerTitle() }}\n    </h3>\n    @if (breadcrumb()) {\n      <div class=\"ax-text-xs ax-text-neutral-500 ax-mt-1\">{{ breadcrumb() }}</div>\n    }\n  </div>\n  @if (isLoadingDetails()) {\n    <div class=\"ax-space-y-2 ax-mb-4\">\n      @for (row of loadingSkeletonRows; track row) {\n        <div class=\"ax-grid ax-grid-cols-[minmax(7rem,35%)_1fr] ax-gap-x-4 ax-items-start\">\n          <ax-skeleton [animated]=\"true\" class=\"ax-h-4 ax-w-2/3 ax-rounded\"></ax-skeleton>\n          @if (row === 2) {\n            <ax-skeleton [animated]=\"true\" class=\"ax-h-16 ax-w-full ax-rounded\"></ax-skeleton>\n          } @else {\n            <ax-skeleton [animated]=\"true\" class=\"ax-h-4 ax-w-full ax-rounded\"></ax-skeleton>\n          }\n        </div>\n      }\n    </div>\n    <div class=\"ax-flex ax-justify-end\">\n      <ax-skeleton [animated]=\"true\" class=\"ax-h-9 ax-w-28 ax-rounded\"></ax-skeleton>\n    </div>\n  } @else if (entityDetails()) {\n    <div class=\"ax-space-y-3 ax-mb-4\">\n      @if (entityDetails()?.entityData) {\n        <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n          <div class=\"ax-space-y-2\">\n            @for (item of entityPropertiesWithWidgets(); track item.name) {\n              <div class=\"ax-grid ax-grid-cols-[minmax(7rem,35%)_1fr] ax-gap-x-4 ax-gap-y-1 ax-items-start\">\n                <span class=\"ax-text-sm ax-font-medium ax-shrink-0\">{{ item.title | translate | async }}:</span>\n                <div class=\"ax-min-w-0 ax-text-sm\">\n                  <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                </div>\n              </div>\n            }\n          </div>\n        </axp-widgets-container>\n      }\n    </div>\n    <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n      <ax-button\n        [color]=\"'primary'\"\n        [look]=\"'solid'\"\n        [text]=\"'@general:actions.open-details.title' | translate | async\"\n        (click)=\"navigateToDetails()\"\n      >\n      </ax-button>\n    </div>\n  }\n</div>\n" }]
-        }], propDecorators: { entity: [{ type: i0.Input, args: [{ isSignal: true, alias: "entity", required: true }] }], entityId: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityId", required: true }] }], textField: [{ type: i0.Input, args: [{ isSignal: true, alias: "textField", required: false }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: false }] }], displayTitle: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayTitle", required: false }] }], item: [{ type: i0.Input, args: [{ isSignal: true, alias: "item", required: false }] }], breadcrumb: [{ type: i0.Input, args: [{ isSignal: true, alias: "breadcrumb", required: false }] }], requestClose: [{ type: i0.Input, args: [{ isSignal: true, alias: "requestClose", required: false }] }] } });
+        }], ctorParameters: () => [], propDecorators: { entity: [{ type: i0.Input, args: [{ isSignal: true, alias: "entity", required: true }] }], entityId: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityId", required: true }] }], textField: [{ type: i0.Input, args: [{ isSignal: true, alias: "textField", required: false }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: false }] }], displayTitle: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayTitle", required: false }] }], item: [{ type: i0.Input, args: [{ isSignal: true, alias: "item", required: false }] }], breadcrumb: [{ type: i0.Input, args: [{ isSignal: true, alias: "breadcrumb", required: false }] }], requestClose: [{ type: i0.Input, args: [{ isSignal: true, alias: "requestClose", required: false }] }] } });
 
 class AXPEntityDetailPopoverService {
     constructor() {
@@ -3402,6 +3293,7 @@ class AXPEntityDetailPopoverService {
         //#region ----   Private Properties   ----
         this.overlayRef = null;
         this.componentRef = null;
+        this.anchorElement = null;
         this.outsideClickHandler = null;
         this.keydownHandler = null;
         this.routerSubscription = null;
@@ -3458,6 +3350,7 @@ class AXPEntityDetailPopoverService {
             });
             this.overlayRef = ref;
             this.componentRef = ref.instance;
+            this.anchorElement = anchorElement;
             setTimeout(() => {
                 ref.updatePosition();
                 this.bindDismissHandlers(ref.overlayElement, anchorElement);
@@ -3559,6 +3452,7 @@ class AXPEntityDetailPopoverService {
         this.removeDismissHandlers();
         this.overlayRef = null;
         this.componentRef = null;
+        this.anchorElement = null;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailPopoverService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailPopoverService, providedIn: 'root' }); }
@@ -3817,16 +3711,27 @@ function commandMessageTextForError(value) {
  * 2. Falls back to CRUD service if not defined
  */
 class EntityDataAccessor {
-    constructor(module, entity, entityRegistry, queryExecutor, commandService) {
+    constructor(module, entity, entityRegistry, queryExecutor, commandService, injector) {
         this.module = module;
         this.entity = entity;
         this.entityRegistry = entityRegistry;
         this.queryExecutor = queryExecutor;
         this.commandService = commandService;
+        this.injector = injector;
         this.crudService = null;
         this.entityDef = null;
         this.entityDefPromise = null;
     }
+    /**
+     * Lazily creates the CRUD fallback inside an injection context so {@link AXMEntityCrudServiceImpl}
+     * can resolve {@link AXPEntityStorageService} via `inject()`.
+     */
+    ensureCrudService() {
+        if (!this.crudService) {
+            this.crudService = runInInjectionContext(this.injector, () => new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`));
+        }
+        return this.crudService;
+    }
     /**
      * Resolves the entity definition lazily and caches it.
      * @returns The resolved entity definition
@@ -3859,10 +3764,7 @@ class EntityDataAccessor {
             return await this.queryExecutor.fetch(execute, key);
         }
         // Fallback to CRUD service
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.getOne(key);
+        return await this.ensureCrudService().getOne(key);
     }
     /**
      * Queries a list of entities.
@@ -3885,20 +3787,14 @@ class EntityDataAccessor {
             return result;
         }
         // Fallback to CRUD service
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.query(queryRequest);
+        return await this.ensureCrudService().query(queryRequest);
     }
     /**
      * Queries category entities linked to this entity (`{module}.{entity}Category`).
      * Falls back to CRUD category storage (same as {@link AXMEntityCrudServiceImpl.getCategoriesList}).
      */
     async getCategoriesList(request = { skip: 0, take: 1000 }) {
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.getCategoriesList(request);
+        return await this.ensureCrudService().getCategoriesList(request);
     }
     /**
      * Creates a new entity.
@@ -3920,10 +3816,7 @@ class EntityDataAccessor {
             return result.data?.id || result.data;
         }
         // Fallback to CRUD service
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.insertOne(data);
+        return await this.ensureCrudService().insertOne(data);
     }
     /**
      * Updates an existing entity.
@@ -3946,10 +3839,7 @@ class EntityDataAccessor {
             return result.data;
         }
         // Fallback to CRUD service
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.updateOne(id, data);
+        return await this.ensureCrudService().updateOne(id, data);
     }
     /**
      * Deletes an entity.
@@ -3970,10 +3860,7 @@ class EntityDataAccessor {
             return;
         }
         // Fallback to CRUD service
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.deleteOne(id);
+        return await this.ensureCrudService().deleteOne(id);
     }
 }
 //#endregion
@@ -3983,11 +3870,12 @@ class EntityDataAccessor {
  * Provides methods to create paths and access entity data.
  */
 class EntityBuilder {
-    constructor(module, entity, sessionService, entityRegistry, queryExecutor, commandService) {
+    constructor(module, entity, sessionService, entityRegistry, queryExecutor, commandService, injector) {
         this.sessionService = sessionService;
         this.entityRegistry = entityRegistry;
         this.queryExecutor = queryExecutor;
         this.commandService = commandService;
+        this.injector = injector;
         this.module = module;
         this.entity = entity;
     }
@@ -4005,7 +3893,7 @@ class EntityBuilder {
      * @returns An EntityDataAccessor instance
      */
     data() {
-        return new EntityDataAccessor(this.module, this.entity, this.entityRegistry, this.queryExecutor, this.commandService);
+        return new EntityDataAccessor(this.module, this.entity, this.entityRegistry, this.queryExecutor, this.commandService, this.injector);
     }
 }
 //#endregion
@@ -4015,6 +3903,7 @@ class AXPEntityService {
         this.entityRegistry = inject(AXPEntityDefinitionRegistryService);
         this.queryExecutor = inject(AXPQueryExecutor);
         this.commandService = inject(AXPCommandService);
+        this.injector = inject(Injector);
     }
     /**
      * @deprecated Use `withEntity(module, entity).createPath(path)` instead.
@@ -4040,7 +3929,7 @@ class AXPEntityService {
             module = moduleOrEntityKey.substring(0, dotIndex);
             entityName = moduleOrEntityKey.substring(dotIndex + 1);
         }
-        return new EntityBuilder(module, entityName, this.sessionService, this.entityRegistry, this.queryExecutor, this.commandService);
+        return new EntityBuilder(module, entityName, this.sessionService, this.entityRegistry, this.queryExecutor, this.commandService, this.injector);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityService, providedIn: 'root' }); }
@@ -4055,7 +3944,6 @@ class AXPEntityPreloadFiltersContainerComponent extends AXPPageLayoutBaseCompone
         super(...arguments);
         //#region ----   Services & Dependencies   ----
         this.route = inject(ActivatedRoute);
-        this.router = inject(Router);
         this.entityService = inject(AXPEntityService);
         this.filterOperatorMiddleware = inject(AXPFilterOperatorMiddlewareService);
         //#endregion
@@ -4345,7 +4233,8 @@ const PLUGIN_SLOT_INDEX = {
     attachments: 1,
     documents: 2,
     comments: 3,
-    history: 4,
+    dashboard: 4,
+    history: 5,
 };
 //#endregion
 //#region ---- Helpers ----
@@ -4474,7 +4363,7 @@ class AXPEntityCommandTriggerViewModel {
         this.priority = action.priority;
         this.title = action.title;
         this.separated = action.separated ?? false;
-        this.color = action.color ?? resolvedLook.color;
+        this.color = (action.color ?? resolvedLook.color);
         this.icon = action.icon ?? resolvedLook.icon;
         this.hidden = action.hidden ?? false;
         this.disabled = action.disabled ?? false;
@@ -4566,6 +4455,7 @@ class AXPEntityDetailListViewModel {
         this.settingsService = this.injector.get(AXPSettingsService);
         this.destroyed = new Subject();
         this.showRowIndexColumnEnabled = signal(false, ...(ngDevMode ? [{ debugName: "showRowIndexColumnEnabled" }] : /* istanbul ignore next */ []));
+        this.lastAppliedFilterKey = null;
         /** Whether the row index column is shown (user setting). */
         this.showIndexColumn = computed(() => this.showRowIndexColumnEnabled(), ...(ngDevMode ? [{ debugName: "showIndexColumn" }] : /* istanbul ignore next */ []));
         this.dataSource = new AXDataSource({
@@ -4759,10 +4649,6 @@ class AXPEntityDetailListViewModel {
         this.applyFilterAndSort();
     }
     async applyFilterAndSort() {
-        this.dataSource.clearFilter();
-        //
-        //this.dataSource.sort(...this.detailEntity.().map(s => ({ dir: s.dir, field: s.name } as AXDataSourceSortOption)));
-        //
         const parentFilters = (await Promise.all(this.detailEntityConfig.conditions?.map(async (c) => {
             return {
                 field: c.name,
@@ -4780,22 +4666,30 @@ class AXPEntityDetailListViewModel {
         //
         const inline = this.inlineFilters.filters?.length ?? 0;
         const parent = parentFilterWrapper.filters?.length ?? 0;
-        //
-        if (inline) {
-            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter(this.inlineFilters));
-        }
-        else if (!inline && parent) {
-            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter(parentFilterWrapper));
-        }
-        else if (inline && parent) {
-            this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
+        let effectiveFilter;
+        if (inline && parent) {
+            effectiveFilter = this.filterOperatorMiddleware.transformFilter({
                 field: null,
                 logic: 'and',
                 operator: null,
                 filters: [this.inlineFilters, parentFilterWrapper],
-            }));
+            });
+        }
+        else if (inline) {
+            effectiveFilter = this.filterOperatorMiddleware.transformFilter(this.inlineFilters);
+        }
+        else if (parent) {
+            effectiveFilter = this.filterOperatorMiddleware.transformFilter(parentFilterWrapper);
+        }
+        const filterKey = JSON.stringify(effectiveFilter ?? null);
+        if (filterKey === this.lastAppliedFilterKey) {
+            return;
+        }
+        this.lastAppliedFilterKey = filterKey;
+        this.dataSource.clearFilter();
+        if (effectiveFilter) {
+            this.dataSource.filter(effectiveFilter);
         }
-        //
         this.dataSource.refresh();
     }
     //******************  Commands ******************//
@@ -5344,7 +5238,7 @@ class AXPEntityMasterListViewModel {
         }
     }
     //#endregion
-    createExpressionScope(data) {
+    createLogicExpressionScope(data) {
         return {
             context: {
                 eval: (path) => get(data, path),
@@ -5355,11 +5249,20 @@ class AXPEntityMasterListViewModel {
             },
         };
     }
+    createDisplayExpressionScope(data) {
+        return {
+            context: this.contextEvalFactory.createScope((data ?? {})),
+            list: {
+                view: () => this.view().name,
+                views: () => this.views().map((v) => ({ name: v.name, title: v.title })),
+            },
+        };
+    }
     async resolveCommandNameExpression(commandName, data) {
         if (!commandName || !commandName.includes('{{')) {
             return commandName;
         }
-        const scope = this.createExpressionScope(data);
+        const scope = this.createLogicExpressionScope(data);
         const result = await this.expressionEvaluator.evaluate({ value: commandName }, scope);
         const resolved = result?.value;
         return typeof resolved === 'string' && resolved.trim() !== '' ? resolved : commandName;
@@ -5368,7 +5271,7 @@ class AXPEntityMasterListViewModel {
         if (!title || !title.includes('{{')) {
             return title;
         }
-        const scope = this.createExpressionScope(data);
+        const scope = this.createDisplayExpressionScope(data);
         const result = await this.expressionEvaluator.evaluate({ value: title }, scope);
         const resolved = result?.value;
         return typeof resolved === 'string' && resolved.trim() !== '' ? resolved : title;
@@ -5383,7 +5286,7 @@ class AXPEntityMasterListViewModel {
             return '';
         }
         if (value.includes('{{')) {
-            const scope = this.createExpressionScope(rowData);
+            const scope = this.createDisplayExpressionScope(rowData);
             const result = await this.expressionEvaluator.evaluate(value, scope);
             if (result === false) {
                 return '';
@@ -5421,7 +5324,7 @@ class AXPEntityMasterListViewModel {
         if (color == null || color === '') {
             return 'default';
         }
-        const scope = this.createExpressionScope(rowData);
+        const scope = this.createLogicExpressionScope(rowData);
         const result = await this.expressionEvaluator.evaluate(color, scope);
         if (result === false || result == null) {
             return 'default';
@@ -5469,6 +5372,7 @@ class AXPEntityMasterListViewModel {
         this.settings = this.injector.get(AXPSettingsService);
         this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
         this.expressionEvaluator = this.injector.get(AXPExpressionEvaluatorService);
+        this.contextEvalFactory = this.injector.get(AXPContextEvalFactory);
         this.translation = this.injector.get(AXTranslationService);
         this.commandService = this.injector.get(AXPCommandService);
         this.eventService = this.injector.get(AXPBroadcastEventService);
@@ -5582,8 +5486,11 @@ class AXPEntityMasterListViewModel {
             return this._viewDef.description ?? null;
         }, ...(ngDevMode ? [{ debugName: "description" }] : /* istanbul ignore next */ []));
         //****************** Inline filter ******************//
+        this.filterDefinitions = signal([], ...(ngDevMode ? [{ debugName: "filterDefinitions" }] : /* istanbul ignore next */ []));
         this.inlineFiltersPlaceholders = computed(() => {
-            return this.entityDef.properties.filter((p) => p.options?.filter?.inline?.enabled).map((c) => c.title ?? c.name);
+            return this.filterDefinitions()
+                .filter((f) => f.filterType.inline)
+                .map((c) => c.title ?? c.field);
         }, ...(ngDevMode ? [{ debugName: "inlineFiltersPlaceholders" }] : /* istanbul ignore next */ []));
         this.hasInlineFilters = computed(() => {
             return this.inlineFiltersPlaceholders().length > 0;
@@ -5623,7 +5530,6 @@ class AXPEntityMasterListViewModel {
         this.primaryRowActions = computed(() => this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'primary'), ...(ngDevMode ? [{ debugName: "primaryRowActions" }] : /* istanbul ignore next */ []));
         //****************** Filter ******************//
         this.filterQueries = signal([], ...(ngDevMode ? [{ debugName: "filterQueries" }] : /* istanbul ignore next */ []));
-        //****************** Columns ******************//
         this.allAvailableColumns = () => {
             const { columns = [], properties } = this.entityDef;
             // const visibleProperties = properties.filter(({ schema }) => schema?.visible !== false);
@@ -5631,13 +5537,15 @@ class AXPEntityMasterListViewModel {
             return columns
                 .filter(({ name, showAs, options }) => (propNames.has(name) || showAs) && options?.visible !== false)
                 .map((column) => {
+                const relatedProperty = this.resolveMergeDetailProperty(column.name);
                 if (column.showAs) {
                     const widgetConfig = this.widgetResolver.resolve(column.showAs.type);
                     const { title: _wcTitle, description: _wcDescription, ...widgetRest } = widgetConfig;
                     const property = {
                         ...widgetRest,
                         name: column.name,
-                        title: column.title ?? '',
+                        title: column.title ?? relatedProperty?.title ?? '',
+                        options: relatedProperty?.options,
                         schema: {
                             dataType: 'string',
                             interface: {
@@ -5666,18 +5574,16 @@ class AXPEntityMasterListViewModel {
         };
         this.cardFields = signal([], ...(ngDevMode ? [{ debugName: "cardFields" }] : /* istanbul ignore next */ []));
         //****************** Sort ******************//
+        this.sortableFieldDefinitions = signal([], ...(ngDevMode ? [{ debugName: "sortableFieldDefinitions" }] : /* istanbul ignore next */ []));
         this.sortableFields = () => {
-            const props = this.entityDef.properties.filter((c) => c.options?.sort?.enabled);
-            return props.map((e) => {
-                return {
-                    name: e.name,
-                    title: e.title,
-                    dir: undefined,
-                };
-            });
+            return this.sortableFieldDefinitions().map((field) => ({
+                name: field.name,
+                title: field.title,
+                dir: undefined,
+            }));
         };
         this.sortableFieldsCount = () => {
-            return this.entityDef.properties.filter((c) => c.options?.sort?.enabled).length ?? 0;
+            return this.sortableFieldDefinitions().length;
         };
         this.canSort = () => {
             return this.sortableFieldsCount() > 0;
@@ -5691,7 +5597,7 @@ class AXPEntityMasterListViewModel {
         this.sortedFields = signal([], ...(ngDevMode ? [{ debugName: "sortedFields" }] : /* istanbul ignore next */ []));
         //#endregion
         this.evaluateExpressions = async (options, data) => {
-            const scope = this.createExpressionScope(data);
+            const scope = this.createLogicExpressionScope(data);
             return await this.expressionEvaluator.evaluate(options, scope);
         };
         this.workflow.events$
@@ -6081,7 +5987,7 @@ class AXPEntityMasterListViewModel {
         this.selectedCategory.set(category);
     }
     async getPrimaryActions() {
-        const scope = this.createExpressionScope(null);
+        const scope = this.createLogicExpressionScope(null);
         const actions = await Promise.all(this.allActions()
             .filter((a) => a.priority == 'primary' &&
             ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) ||
@@ -6098,7 +6004,7 @@ class AXPEntityMasterListViewModel {
         return actions.filter(Boolean);
     }
     async getSecondaryActions() {
-        const scope = this.createExpressionScope(null);
+        const scope = this.createLogicExpressionScope(null);
         const actions = await Promise.all(this.allActions()
             .filter((a) => a.priority == 'secondary' &&
             ((a.scope == AXPEntityCommandScope.Selected && this.hasSelectedItems()) ||
@@ -6115,7 +6021,7 @@ class AXPEntityMasterListViewModel {
         return actions.filter(Boolean);
     }
     async secondaryRowActions(rowData) {
-        const scope = this.createExpressionScope(rowData);
+        const scope = this.createLogicExpressionScope(rowData);
         const actions = await Promise.all(this.allActions()
             .filter((a) => a.scope === AXPEntityCommandScope.Individual && a.priority === 'secondary')
             .map(async (a) => {
@@ -6276,38 +6182,27 @@ class AXPEntityMasterListViewModel {
         }
         return false;
     }
-    get filtersDef() {
-        const props = this.entityDef.properties.filter((c) => c.options?.filter?.advance?.enabled ||
-            c.options?.filter?.inline?.enabled ||
-            c.options?.filter?.preload?.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);
-            const iface = e.schema.interface ?? {};
-            return {
-                title: e.title,
-                field: e.name,
-                operator: {
-                    type: 'contains',
-                },
-                widget: { ...omit(iface, 'triggers'), 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,
-                    preload: e.options?.filter?.preload,
-                },
-                // `interface.options.disabled` is for edit forms only; do not gray out advance filters.
-                triggers: e.schema.interface?.triggers,
-            };
+    /**
+     * Loads host and merge-detail related sortable field definitions (async registry resolution).
+     */
+    async loadSortableFields() {
+        const fields = await collectEntityListSortableFields(this.entityDef, (moduleName, entityName) => this.entityDefinitionRegistry.resolve(moduleName, entityName).catch(() => null));
+        this.sortableFieldDefinitions.set(fields);
+    }
+    /**
+     * Loads host and merge-detail related filter definitions (async registry resolution).
+     */
+    async loadFilterDefinitions() {
+        const definitions = await collectEntityListFilterDefinitions(this.entityDef, (moduleName, entityName) => this.entityDefinitionRegistry.resolve(moduleName, entityName).catch(() => null), {
+            resolveWidget: (type) => this.widgetResolver.resolve(type),
         });
+        this.filterDefinitions.set(definitions);
+    }
+    get filtersDef() {
+        return this.filterDefinitions();
     }
     get preloadFiltersDef() {
-        return this.filtersDef.filter((f) => f.filterType.preload?.enabled);
+        return this.filterDefinitions().filter((f) => f.filterType.preload?.enabled);
     }
     // const viewFilters = this.view().conditions.map((f) => ({
     //   field: f.name,
@@ -6337,7 +6232,13 @@ class AXPEntityMasterListViewModel {
             .map((s) => ({ name: s.name, dir: s.dir }));
         const filters = this.filterQueries();
         const sortKey = JSON.stringify(sorts);
-        const filterKey = JSON.stringify(filters);
+        const transformedFilter = this.filterOperatorMiddleware.transformFilter({
+            field: null,
+            logic: 'and',
+            operator: null,
+            filters: filters,
+        });
+        const filterKey = JSON.stringify(transformedFilter);
         if (sortKey === this.lastAppliedSortKey && filterKey === this.lastAppliedFilterKey) {
             return; // No effective change; avoid redundant refresh
         }
@@ -6349,14 +6250,23 @@ class AXPEntityMasterListViewModel {
         }
         this.dataSource.clearFilter();
         this.dataSource.sort(...sorts.map((s) => ({ dir: s.dir, field: s.name })));
-        this.dataSource.filter(this.filterOperatorMiddleware.transformFilter({
-            field: null,
-            logic: 'and',
-            operator: null,
-            filters: filters,
-        }));
+        this.dataSource.filter(transformedFilter);
         this.events$.next({ action: 'refresh', meta: { resetPagination: filtersChanged } });
     }
+    //****************** Columns ******************//
+    resolveMergeDetailProperty(columnName) {
+        const parsed = parseDottedFieldPath(columnName);
+        if (!parsed) {
+            return null;
+        }
+        const { dataPath, propertyName } = parsed;
+        const related = this.entityDef.relatedEntities?.find((entry) => entry.layout?.type === 'merge-detail' && entry.persistence?.dataPath?.trim() === dataPath);
+        if (!related?.entity) {
+            return null;
+        }
+        const relatedDef = this.getRegisteredEntity(related.entity);
+        return relatedDef?.properties?.find((property) => property.name === propertyName) ?? null;
+    }
     resetColumns() {
         this.applyViewColumns();
     }
@@ -6751,6 +6661,8 @@ class AXPEntityListViewModelFactory {
         const config = await this.entityService.resolve(moduleName, entityName);
         this.layout.setNavigationLoading(false);
         const vm = new AXPEntityMasterListViewModel(this.injector, config);
+        await vm.loadFilterDefinitions();
+        await vm.loadSortableFields();
         await vm.initializeListPersistence();
         return vm;
     }
@@ -6785,7 +6697,7 @@ const AXPEntityListViewModelResolver = async (route, state, service = inject(AXP
     }
 };
 
-const AXPEntityDeletedEvent = createWorkFlowEvent('[Entity] Deleted');
+const AXPEntityDeletedEvent = createWorkFlowEvent(AXP_ENTITY_DELETED_WORKFLOW_EVENT_TYPE);
 class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
     constructor() {
         super(...arguments);
@@ -7138,6 +7050,9 @@ class AXPEntityModifySectionPopupAction extends AXPWorkflowAction {
         this.popupService = inject(AXPopupService);
         this.platform = inject(AXPlatform);
         this.translateService = inject(AXTranslationService);
+        this.formatService = inject(AXFormatService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.contextEvalFactory = inject(AXPContextEvalFactory);
         this.entityRegistery = inject(AXPEntityDefinitionRegistryService);
         this.config = inject(AXP_ENTITY_CONFIG_TOKEN);
         this.factory = inject(AXPEntityMasterUpdateViewModelFactory);
@@ -7155,7 +7070,7 @@ class AXPEntityModifySectionPopupAction extends AXPWorkflowAction {
             title: headerTitle
                 ? headerTitle
                 : title ??
-                    `${this.translateService.translateSync('entity.modify')} ${this.translateService.translateSync(entityRef.formats.individual)}`,
+                    (await resolveEntityModifyPopupTitle(entityRef, vm.context(), this.translateService, this.formatService, this.expressionEvaluator, this.contextEvalFactory)),
             size: this.platform.is('Mobile') || this.platform.is('SM') ? 'full' : 'md',
             data: {
                 vm,
@@ -7516,6 +7431,8 @@ class AXPEntityPreloadFiltersViewModel {
         this.config = config;
         this.entityDef = cloneDeep(this.config);
         this.widgetResolver = this.injector.get(AXPWidgetRegistryService);
+        this.entityRegistry = this.injector.get(AXPEntityDefinitionRegistryService);
+        this.filterDefinitions = signal([], ...(ngDevMode ? [{ debugName: "filterDefinitions" }] : /* istanbul ignore next */ []));
         //#endregion
         //#region ----   Computed Properties   ----
         /**
@@ -7534,46 +7451,7 @@ class AXPEntityPreloadFiltersViewModel {
          * All filter definitions for properties with preload enabled
          */
         this.preloadFiltersDef = computed(() => {
-            const props = this.entityDef.properties.filter((c) => c.options?.filter?.preload?.enabled);
-            return props.map((e) => {
-                const widgetConfig = this.widgetResolver.resolve(e.schema.interface?.type);
-                const type = e.schema.interface?.type;
-                // Merge validations with existing options
-                const validations = e.options?.filter?.preload?.required
-                    ? [
-                        {
-                            rule: 'required',
-                            message: 'This field is required',
-                            options: {},
-                        },
-                    ]
-                    : [];
-                const mergedOptions = {
-                    ...e.schema.interface?.options,
-                    validations,
-                };
-                return {
-                    title: e.title,
-                    field: e.name,
-                    operator: {
-                        type: 'contains',
-                    },
-                    widget: {
-                        ...e.schema.interface,
-                        path: e.name,
-                        type,
-                        options: mergedOptions,
-                    },
-                    filters: [],
-                    isParametric: false,
-                    icon: widgetConfig?.icon,
-                    filterType: {
-                        advance: false,
-                        inline: false,
-                        preload: e.options?.filter?.preload,
-                    },
-                };
-            });
+            return this.filterDefinitions().filter((definition) => definition.filterType.preload?.enabled);
         }, ...(ngDevMode ? [{ debugName: "preloadFiltersDef" }] : /* istanbul ignore next */ []));
         /**
          * Required filter definitions only
@@ -7582,7 +7460,14 @@ class AXPEntityPreloadFiltersViewModel {
             return this.preloadFiltersDef().filter((c) => c.filterType.preload?.required);
         }, ...(ngDevMode ? [{ debugName: "requiredFiltersDef" }] : /* istanbul ignore next */ []));
     }
+    //#endregion
     //#region ----   Methods   ----
+    async loadFilterDefinitions() {
+        const definitions = await collectEntityListFilterDefinitions(this.entityDef, (moduleName, entityName) => this.entityRegistry.resolve(moduleName, entityName).catch(() => null), {
+            resolveWidget: (type) => this.widgetResolver.resolve(type),
+        });
+        this.filterDefinitions.set(definitions);
+    }
     /**
      * Serialize filter values to plain objects (remove signals, functions, etc.)
      */
@@ -7599,159 +7484,17 @@ const AXPEntityPreloadFiltersViewModelResolver = async (route, state) => {
     const entityName = route.paramMap.get('entity');
     try {
         const entity = await entityRegistry.resolve(moduleName, entityName);
-        return new AXPEntityPreloadFiltersViewModel(injector, entity);
-    }
-    catch (error) {
-        if (error instanceof AXPNotFoundError) {
-            return axpRedirectToNotFound(router);
-        }
-        throw error;
-    }
-};
-//#endregion
-
-//#endregion
-//#region ---- Quick search: schema-driven field paths ----
-const NON_TEXT_DATATYPES = new Set([
-    'number',
-    'integer',
-    'int',
-    'long',
-    'float',
-    'double',
-    'decimal',
-    'money',
-    'currency',
-    'boolean',
-    'bool',
-    'date',
-    'datetime',
-    'time',
-    'object',
-    'array',
-    'json',
-    'image',
-    'file',
-    'binary',
-]);
-/**
- * Whether an entity property likely stores free text worth a `contains` quick-search clause.
- */
-function isTextLikeDataType(dataType) {
-    const dt = (dataType ?? 'string').toLowerCase().trim();
-    if (!dt || NON_TEXT_DATATYPES.has(dt)) {
-        return false;
-    }
-    return true;
-}
-/**
- * Lodash-get paths for quick search from a single entity definition: string-like property names
- * plus lookup `expose[].target` paths (e.g. `brand.title`).
- */
-function collectQuickSearchPathsFromSingleEntityDefinition(entity) {
-    if (!entity?.properties?.length) {
-        return [];
-    }
-    const paths = new Set();
-    for (const p of entity.properties) {
-        if (isTextLikeDataType(p.schema?.dataType)) {
-            paths.add(p.name);
-        }
-        const opts = p.schema?.interface?.options;
-        const expose = opts?.['expose'];
-        if (!Array.isArray(expose)) {
-            continue;
-        }
-        for (const row of expose) {
-            if (row && typeof row === 'object' && typeof row.target === 'string') {
-                const t = (row.target).trim();
-                if (t) {
-                    paths.add(t);
-                }
-            }
-        }
-    }
-    return [...paths];
-}
-//#endregion
-//#region ---- Column-derived nested paths ----
-/**
- * Adds dotted paths from master columns (`name` or `options.dataPath`), e.g. `person.fullName`, `jobDefinition.title`.
- */
-function collectNestedFieldPathsFromEntityColumns(entity) {
-    if (!entity?.columns?.length) {
-        return [];
-    }
-    const paths = new Set();
-    for (const col of entity.columns) {
-        const name = col.name.trim();
-        if (name.includes('.')) {
-            paths.add(name);
-        }
-        const rawDp = col.options?.['dataPath'];
-        if (typeof rawDp === 'string') {
-            const dp = rawDp.trim();
-            if (dp.includes('.')) {
-                paths.add(dp);
-            }
-        }
-    }
-    return [...paths];
-}
-//#endregion
-//#region ---- Related merge-detail paths ----
-function parseRelatedEntityFullName(fullName) {
-    const t = fullName.trim();
-    const idx = t.indexOf('.');
-    if (idx <= 0 || idx >= t.length - 1) {
-        return null;
-    }
-    return {
-        moduleName: t.slice(0, idx),
-        entityName: t.slice(idx + 1),
-    };
-}
-//#endregion
-//#region ---- Public API ----
-/**
- * Collects lodash-get field paths used for mock/API quick search (`contains` / OR filters):
- * host properties and lookup expose targets, dotted column paths, and merge-detail related entities
- * prefixed with the related entity merge `persistence.dataPath` (e.g. `person.firstName`).
- */
-async function collectEntityQuickSearchFieldPaths(entity, resolveRelatedDefinition) {
-    if (!entity) {
-        return [];
-    }
-    const paths = new Set();
-    for (const p of collectQuickSearchPathsFromSingleEntityDefinition(entity)) {
-        paths.add(p);
-    }
-    for (const p of collectNestedFieldPathsFromEntityColumns(entity)) {
-        paths.add(p);
-    }
-    const related = entity.relatedEntities ?? [];
-    for (const rel of related) {
-        const dataPath = rel.persistence?.dataPath?.trim();
-        if (!dataPath || rel.layout?.type !== 'merge-detail') {
-            continue;
-        }
-        const parsed = rel.entity ? parseRelatedEntityFullName(rel.entity) : null;
-        if (!parsed) {
-            continue;
-        }
-        const relatedDef = await resolveRelatedDefinition(parsed.moduleName, parsed.entityName);
-        if (!relatedDef) {
-            continue;
-        }
-        for (const p of collectQuickSearchPathsFromSingleEntityDefinition(relatedDef)) {
-            paths.add(`${dataPath}.${p}`);
-        }
-        for (const p of collectNestedFieldPathsFromEntityColumns(relatedDef)) {
-            paths.add(`${dataPath}.${p}`);
+        const vm = new AXPEntityPreloadFiltersViewModel(injector, entity);
+        await vm.loadFilterDefinitions();
+        return vm;
+    }
+    catch (error) {
+        if (error instanceof AXPNotFoundError) {
+            return axpRedirectToNotFound(router);
         }
+        throw error;
     }
-    return [...paths];
-}
+};
 //#endregion
 
 //#region ---- Path / numeric helpers ----
@@ -10149,7 +9892,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         ></ax-button>
       </ax-suffix>
     </ax-footer>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.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: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }, { kind: "ngmodule", type: AXCheckBoxModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i4.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type", "autoSearch"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXSkeletonModule }, { kind: "component", type: i3.AXSkeletonComponent, selector: "ax-skeleton", inputs: ["animated"] }, { kind: "component", type: AXTreeViewComponent, selector: "ax-tree-view", inputs: ["datasource", "selectMode", "selectionBehavior", "dragArea", "dragBehavior", "showIcons", "showChildrenBadge", "expandedIcon", "collapsedIcon", "indentSize", "look", "nodeTemplate", "idField", "titleField", "tooltipField", "iconField", "expandedField", "selectedField", "indeterminateField", "disabledField", "hiddenField", "childrenField", "childrenCountField", "dataField", "inheritDisabled", "expandOnDoubleClick", "doubleClickDuration", "tooltipDelay", "controlledSelection", "selectedIds"], outputs: ["datasourceChange", "selectedIdsChange", "onBeforeDrop", "onNodeToggle", "onNodeSelect", "onNodeDoubleClick", "onNodeClick", "onSelectionChange", "onOrderChange", "onMoveChange", "onItemsChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "look"] }, { kind: "ngmodule", type: FormsModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.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: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }, { kind: "ngmodule", type: AXCheckBoxModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i4.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type", "autoSearch"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXSkeletonModule }, { kind: "component", type: i3.AXSkeletonComponent, selector: "ax-skeleton", inputs: ["animated"] }, { kind: "component", type: AXTreeViewComponent, selector: "ax-tree-view", inputs: ["datasource", "selectMode", "selectionBehavior", "dragArea", "dragBehavior", "showIcons", "showChildrenBadge", "expandedIcon", "collapsedIcon", "indentSize", "look", "nodeTemplate", "idField", "titleField", "tooltipField", "iconField", "expandedField", "selectedField", "indeterminateField", "disabledField", "hiddenField", "childrenField", "childrenCountField", "dataField", "inheritDisabled", "expandOnDoubleClick", "doubleClickDuration", "tooltipDelay", "controlledSelection", "selectedIds"], outputs: ["datasourceChange", "selectedIdsChange", "onBeforeDrop", "onNodeToggle", "onNodeSelect", "onNodeDoubleClick", "onNodeClick", "onSelectionChange", "onOrderChange", "onMoveChange", "onItemsChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "titleParams", "descriptionParams", "look"] }, { kind: "ngmodule", type: FormsModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityCategoryTreeSelectorComponent, decorators: [{
             type: Component,
@@ -12392,6 +12135,7 @@ class AXPEntityListTableService {
         const evaluatedOptions = await this.evaluateExpressions(action?.options, data);
         const options = this.mergeRelatedListFormOptions(command, evaluatedOptions, relatedListExcludeProperties);
         if (this.commandService.exists(command)) {
+            const excludeProperties = options['excludeProperties'];
             await this.commandService.execute(command, {
                 __context__: {
                     entity: getEntityInfo(entity).source,
@@ -12408,6 +12152,7 @@ class AXPEntityListTableService {
                 },
                 options,
                 metadata: action?.metadata,
+                ...(excludeProperties?.length ? { excludeProperties } : {}),
             });
         }
         else {
@@ -12433,7 +12178,7 @@ class AXPEntityListTableService {
     mergeRelatedListFormOptions(command, evaluatedOptions, relatedListExcludeProperties) {
         const exclusions = relatedListExcludeProperties?.filter(Boolean);
         if (!exclusions?.length ||
-            (command !== 'Entity:Create' && command !== 'Entity:Update')) {
+            (command !== 'Entity:Create' && command !== 'Entity:Update' && command !== 'Entity:View')) {
             return evaluatedOptions;
         }
         return {
@@ -12484,6 +12229,7 @@ class AXPEntityListToolbarService {
     constructor() {
         //#region ----   Services & Dependencies   ----
         this.widgetResolver = inject(AXPWidgetRegistryService);
+        this.entityRegistry = inject(AXPEntityDefinitionRegistryService);
     }
     //#endregion
     //#region ----   Public Methods   ----
@@ -12491,11 +12237,11 @@ class AXPEntityListToolbarService {
      * Convert Entity to Toolbar Options
      */
     async convertEntityToolbarOptions(entity, options) {
-        const baseFilters = this.createFilterDefinitions(entity);
+        const baseFilters = await this.createFilterDefinitions(entity);
         const toolbarOptions = {
             filterDefinitions: this.mergeFilterDefinitions(baseFilters, options?.customFilterDefinitions),
             columnDefinitions: this.createColumnDefinitions(entity, options),
-            sortDefinitions: this.createSortDefinitions(entity),
+            sortDefinitions: await this.createSortDefinitions(entity),
             canFilter: true,
             canColumns: true,
             canSort: true,
@@ -12571,30 +12317,9 @@ class AXPEntityListToolbarService {
     /**
      * Create Filter Definitions for Toolbar
      */
-    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);
-            const iface = e.schema.interface ?? {};
-            return {
-                title: e.title,
-                field: e.name,
-                operator: {
-                    type: 'contains',
-                },
-                widget: { ...omit(iface, 'triggers'), 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,
-                },
-                triggers: e.schema.interface?.triggers,
-            };
+    async createFilterDefinitions(entity) {
+        return collectEntityListFilterDefinitions(entity, (moduleName, entityName) => this.entityRegistry.resolve(moduleName, entityName).catch(() => null), {
+            resolveWidget: (type) => this.widgetResolver.resolve(type),
         });
     }
     /**
@@ -12642,23 +12367,14 @@ class AXPEntityListToolbarService {
     }
     /**
      * Create Sort Definitions for Toolbar.
-     * Includes entity.properties with sort enabled, plus enriched columns (dotted paths).
+     * Includes host properties and merge-detail related fields with sort enabled.
      */
-    createSortDefinitions(entity) {
-        const fromProperties = entity.properties
-            .filter((c) => c.options?.sort?.enabled)
-            .map((e) => ({ name: e.name, title: e.title }));
-        const columns = entity.columns ?? [];
-        const fromColumns = columns
-            .filter((col) => col.name.includes('.') && col.title)
-            .map((col) => ({ name: col.name, title: col.title ?? col.name }));
-        const seen = new Set();
-        return [...fromProperties, ...fromColumns].filter((s) => {
-            if (seen.has(s.name))
-                return false;
-            seen.add(s.name);
-            return true;
-        });
+    async createSortDefinitions(entity) {
+        const fields = await collectEntityListSortableFields(entity, (moduleName, entityName) => this.entityRegistry.resolve(moduleName, entityName).catch(() => null));
+        return fields.map((field) => ({
+            name: field.name,
+            title: field.title,
+        }));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityListToolbarService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityListToolbarService }); }
@@ -13693,7 +13409,7 @@ class AXPPageComponentWidgetViewComponent extends AXPBaseWidgetComponent {
             return;
         }
         for (const [path, value] of Object.entries(partial)) {
-            this.contextService.update(path, value);
+            this.contextService.update(path, value, { origin: 'user' });
         }
     }
     //#endregion
@@ -13977,6 +13693,8 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
         super(...arguments);
         this.formatService = inject(AXFormatService);
         this.translation = inject(AXTranslationService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.contextEvalFactory = inject(AXPContextEvalFactory);
         this.entityResolver = inject(AXPEntityDefinitionRegistryService);
         this.entity = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entity" }] : /* istanbul ignore next */ []));
         this.multiple = computed(() => this.options()['multiple'], ...(ngDevMode ? [{ debugName: "multiple" }] : /* istanbul ignore next */ []));
@@ -14010,7 +13728,7 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
         if (typeof item == 'object') {
             return {
                 id: item[this.valueField()],
-                text: this.getDisplayRaw(item),
+                text: await this.getDisplayRaw(item),
             };
         }
         const def = this.entityDef();
@@ -14021,7 +13739,7 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
             this.loading.set(false);
             return {
                 id: fetchedItem[this.valueField()],
-                text: this.getDisplayRaw(fetchedItem),
+                text: await this.getDisplayRaw(fetchedItem),
             };
         }
         return {
@@ -14029,12 +13747,17 @@ class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
             text: item,
         };
     }
-    getDisplayRaw(item) {
-        const text = formatLookupItemDisplay(item, this.entityDef(), {
+    async getDisplayRaw(item) {
+        const locale = this.translation.getActiveLang() ?? 'en-US';
+        return formatLookupItemDisplayAsync(item, this.entityDef(), {
             displayFormat: this.options()['displayFormat'],
             textField: this.textField(),
-        }, this.formatService, (value) => this.translation.resolve(value));
-        return text;
+        }, this.formatService, {
+            expressionEvaluator: this.expressionEvaluator,
+            contextEvalFactory: this.contextEvalFactory,
+            translationService: this.translation,
+            locale,
+        }, (value) => this.translation.resolve(value));
     }
     get __class() {
         const cls = {};
@@ -14097,6 +13820,108 @@ var lookupWidgetView_component = /*#__PURE__*/Object.freeze({
     AXPLookupWidgetViewComponent: AXPLookupWidgetViewComponent
 });
 
+//#region ----   Expression Scope   ----
+/**
+ * Builds the expression scope used to evaluate lookup `create.context` templates.
+ * Matches widget-renderer `context.eval` / `context.set` semantics.
+ */
+function buildLookupExpressionScope(contextService, parentPath) {
+    return {
+        context: {
+            eval: (path) => {
+                const fullPath = path.startsWith('>') && parentPath ? `${parentPath}.${path.substring(1)}` : path;
+                return contextService.getValue(fullPath);
+            },
+            set: (path, value) => {
+                contextService.update(path, value, { origin: 'user' });
+            },
+            data: () => contextService.data(),
+            isDirty: () => {
+                if (!contextService.isSavedCommitted()) {
+                    return false;
+                }
+                return contextService.isDirty();
+            },
+            options: (path) => {
+                if (path == null || path === '') {
+                    return contextService.getValue('options');
+                }
+                return contextService.getValue(`options.${path}`);
+            },
+        },
+        events: {},
+        widget: {},
+        methods: {},
+        vars: {},
+    };
+}
+//#endregion
+//#region ----   Create Context Evaluation   ----
+/**
+ * Deep-evaluates expression strings inside lookup `create.context` (e.g. parentId from context).
+ */
+async function evaluateLookupCreateContext(template, expressionEvaluator, scope) {
+    if (!template || !isObjectLike(template)) {
+        return {};
+    }
+    return (await evaluateLookupCreateContextValue(template, expressionEvaluator, scope));
+}
+async function evaluateLookupCreateContextValue(value, expressionEvaluator, scope) {
+    if (typeof value === 'string' && expressionEvaluator.isExpression(value)) {
+        return expressionEvaluator.evaluate(value, scope);
+    }
+    if (isArray(value)) {
+        const results = await Promise.all(value.map((entry) => evaluateLookupCreateContextValue(entry, expressionEvaluator, scope)));
+        return results;
+    }
+    if (isObjectLike(value)) {
+        const result = {};
+        for (const [key, entry] of Object.entries(value)) {
+            result[key] = await evaluateLookupCreateContextValue(entry, expressionEvaluator, scope);
+        }
+        return result;
+    }
+    return value;
+}
+/**
+ * Removes null/undefined entries from resolved create context before Entity:Create.
+ */
+function compactLookupCreateContext(data) {
+    const result = {};
+    for (const [key, value] of Object.entries(cloneDeep(data))) {
+        if (!isNil(value) && value !== '') {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+//#endregion
+
+//#endregion
+//#region ----   Resolution   ----
+/**
+ * Resolves lookup create options from `create` and legacy `allowCreate` (mode).
+ */
+function resolveLookupWidgetCreateOptions(options) {
+    const create = options.create;
+    const legacyMode = options.allowCreate;
+    const context = create?.context;
+    if (create?.enable !== undefined) {
+        if (!create.enable) {
+            return { enabled: false, mode: 'none', context };
+        }
+        const mode = legacyMode && legacyMode !== 'none' ? legacyMode : 'quick';
+        return { enabled: true, mode, context };
+    }
+    const mode = legacyMode ?? 'none';
+    return {
+        enabled: mode !== 'none',
+        mode,
+        context,
+    };
+}
+//#endregion
+
 //#endregion
 class AXPEntityDataSelectorRowActionsService {
     constructor() {
@@ -14373,11 +14198,20 @@ function mapLegacyEntityDataSelectorOptions(legacy) {
         normalized.category = { enabled: legacy.showCategoryFilter };
     }
     if (legacy.allowCreate !== undefined) {
-        normalized.create = { mode: legacy.allowCreate };
+        normalized.create = {
+            ...(legacy.allowCreate !== undefined && {
+                enable: legacy.allowCreate !== 'none',
+                mode: legacy.allowCreate,
+            }),
+            ...normalized.create,
+        };
     }
     if (legacy.rowActions !== undefined) {
         normalized.rowActions = legacy.rowActions;
     }
+    if (legacy.contextStore !== undefined) {
+        normalized.contextStore = legacy.contextStore;
+    }
     return normalized;
 }
 /**
@@ -14413,6 +14247,9 @@ function normalizeEntityDataSelectorOptions(options) {
     if (nested.create) {
         normalized.create = { ...normalized.create, ...nested.create };
     }
+    if (nested.contextStore !== undefined) {
+        normalized.contextStore = nested.contextStore;
+    }
     if (nested.rowActions !== undefined) {
         normalized.rowActions = nested.rowActions;
     }
@@ -14430,9 +14267,21 @@ class AXPEntityDataSelectorService {
         this.categoryTreeService = inject(AXPCategoryTreeService);
         this.translationService = inject(AXTranslationService);
         this.rowActionsService = inject(AXPEntityDataSelectorRowActionsService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
     }
     //#endregion
     //#region ----   Public Methods   ----
+    /**
+     * Resolves lookup `create.context` templates using the provided form context store.
+     */
+    async resolveCreateContext(template, contextStore) {
+        if (!template || !contextStore) {
+            return {};
+        }
+        const scope = buildLookupExpressionScope(contextStore);
+        const resolved = await evaluateLookupCreateContext(template, this.expressionEvaluator, scope);
+        return compactLookupCreateContext(resolved);
+    }
     /**
      * Open entity data selector popup.
      * Accepts nested {@link AXPEntityDataSelectorOpenOptions} or deprecated flat {@link AXPEntityDataSelectorOptions}.
@@ -14448,8 +14297,8 @@ class AXPEntityDataSelectorService {
      * Execute Entity:Create and return created item.
      * Used by lookup widget and data selector for inline create.
      */
-    async executeEntityCreate(entity, mode) {
-        return this.executeCreate(entity, mode);
+    async executeEntityCreate(entity, mode, initialData = {}) {
+        return this.executeCreate(entity, mode, initialData);
     }
     /**
      * Normalize item's phones/emails for expose/display.
@@ -14512,7 +14361,16 @@ class AXPEntityDataSelectorService {
         const dataSource = this.createDataSource(options);
         const columns = this.createColumns(options);
         const searchFields = this.getSearchFields(options);
-        const allowCreate = options.create?.mode ?? this.getAllowCreate(options.entity);
+        const hasCreateConfig = options.create !== undefined;
+        const resolvedCreate = resolveLookupWidgetCreateOptions({
+            create: options.create,
+            allowCreate: options.create?.mode,
+        });
+        const allowCreate = hasCreateConfig
+            ? resolvedCreate.enabled
+                ? resolvedCreate.mode
+                : 'none'
+            : this.getAllowCreate(options.entity);
         const rowActions = options.rowActions
             ? this.rowActionsService.createHandler(options.entity, options.rowActions)
             : undefined;
@@ -14537,7 +14395,12 @@ class AXPEntityDataSelectorService {
             filter: options.filter?.value ? { value: options.filter.value } : undefined,
             create: {
                 mode: allowCreate,
-                onCreate: allowCreate !== 'none' ? (mode) => this.executeCreate(options.entity, mode) : undefined,
+                onCreate: allowCreate !== 'none'
+                    ? async (mode) => {
+                        const data = await this.resolveCreateContext(resolvedCreate.context, options.contextStore);
+                        return this.executeCreate(options.entity, mode, data);
+                    }
+                    : undefined,
             },
             rowActions,
         };
@@ -14685,7 +14548,7 @@ class AXPEntityDataSelectorService {
     /**
      * Execute Entity:Create and return created item
      */
-    async executeCreate(entity, mode) {
+    async executeCreate(entity, mode, initialData = {}) {
         const quickCreate = entity.interfaces?.master?.create?.quickCreate;
         const options = {};
         if (mode === 'quick' && quickCreate) {
@@ -14709,7 +14572,7 @@ class AXPEntityDataSelectorService {
                     title: entity.title,
                     parentKey: entity.parentKey,
                 },
-                data: {},
+                data: initialData,
                 options,
             },
         });
@@ -15184,6 +15047,9 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.formatService = inject(AXFormatService);
         this.translateService = inject(AXTranslationService);
         this.entityDataSelectorService = inject(AXPEntityDataSelectorService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.contextEvalFactory = inject(AXPContextEvalFactory);
+        this.contextStore = inject(AXPContextStore, { optional: true });
         //#endregion
         //#region ----   Inputs   ----
         this.selectedItems = input.required(...(ngDevMode ? [{ debugName: "selectedItems" }] : /* istanbul ignore next */ []));
@@ -15196,7 +15062,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.validationRules = input.required(...(ngDevMode ? [{ debugName: "validationRules" }] : /* istanbul ignore next */ []));
         this.placeholder = input(...(ngDevMode ? [undefined, { debugName: "placeholder" }] : /* istanbul ignore next */ []));
         this.hasClearButton = input(false, ...(ngDevMode ? [{ debugName: "hasClearButton" }] : /* istanbul ignore next */ []));
-        this.allowCreate = input('none', ...(ngDevMode ? [{ debugName: "allowCreate" }] : /* istanbul ignore next */ []));
+        this.resolvedCreate = input({ enabled: false, mode: 'none' }, ...(ngDevMode ? [{ debugName: "resolvedCreate" }] : /* istanbul ignore next */ []));
         this.allowUnselect = input(true, ...(ngDevMode ? [{ debugName: "allowUnselect" }] : /* istanbul ignore next */ []));
         // Entity and configuration data (for showSelector and searchByValue)
         this.entityDef = input.required(...(ngDevMode ? [{ debugName: "entityDef" }] : /* istanbul ignore next */ []));
@@ -15213,6 +15079,8 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         //#region ----   Internal State   ----
         this.searchTerm = signal('', ...(ngDevMode ? [{ debugName: "searchTerm" }] : /* istanbul ignore next */ []));
         this.isOpen = signal(false, ...(ngDevMode ? [{ debugName: "isOpen" }] : /* istanbul ignore next */ []));
+        this.itemLabels = signal({}, ...(ngDevMode ? [{ debugName: "itemLabels" }] : /* istanbul ignore next */ []));
+        this.itemLabelsVersion = 0;
         //#endregion
         //#region ----   View Children   ----
         this.tagBox = viewChild('tagBoxComponent', ...(ngDevMode ? [{ debugName: "tagBox" }] : /* istanbul ignore next */ []));
@@ -15235,6 +15103,31 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
                 }
             }
         }, ...(ngDevMode ? [{ debugName: "#focusEffect" }] : /* istanbul ignore next */ []));
+        this.#itemLabelsEffect = effect(() => {
+            void this.translateService.getActiveLang();
+            const items = this.selectedItemsValue();
+            const entityDef = this.entityDef()();
+            const valueField = this.valueFieldValue();
+            const version = ++this.itemLabelsVersion;
+            void Promise.all(items.map(async (item) => {
+                const id = String(get(item, valueField) ?? '');
+                const label = await formatLookupItemDisplayAsync(item, entityDef, {
+                    displayFormat: this.displayFormatValue(),
+                    textField: this.displayFieldValue(),
+                }, this.formatService, {
+                    expressionEvaluator: this.expressionEvaluator,
+                    contextEvalFactory: this.contextEvalFactory,
+                    translationService: this.translateService,
+                    locale: this.translateService.getActiveLang() ?? 'en-US',
+                }, (value) => this.translateService.resolve(value));
+                return [id, label];
+            })).then((entries) => {
+                if (version !== this.itemLabelsVersion) {
+                    return;
+                }
+                this.itemLabels.set(Object.fromEntries(entries));
+            });
+        }, ...(ngDevMode ? [{ debugName: "#itemLabelsEffect" }] : /* istanbul ignore next */ []));
         //#endregion
         //#region ----   Computed Properties   ----
         this.tagBoxComponent = computed(() => this.tagBox(), ...(ngDevMode ? [{ debugName: "tagBoxComponent" }] : /* istanbul ignore next */ []));
@@ -15250,6 +15143,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.placeholderValue = computed(() => this.placeholder()?.() ?? '', ...(ngDevMode ? [{ debugName: "placeholderValue" }] : /* istanbul ignore next */ []));
     }
     #focusEffect;
+    #itemLabelsEffect;
     focus() {
         this.shouldFocus.set(true);
     }
@@ -15315,11 +15209,9 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
     }
     //#endregion
     //#region ----   Utility Methods   ----
-    getDisplayRaw(item) {
-        return formatLookupItemDisplay(item, this.entityDef()(), {
-            displayFormat: this.displayFormatValue(),
-            textField: this.displayFieldValue(),
-        }, this.formatService, (value) => this.translateService.resolve(value));
+    getItemLabel(item) {
+        const id = String(get(item, this.valueFieldValue()) ?? '');
+        return this.itemLabels()[id] ?? '';
     }
     /**
      * Get current input value from tag box
@@ -15379,6 +15271,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
             .map((item) => get(item, this.valueField()()))
             .filter((id) => id != null);
         try {
+            const createOptions = this.resolvedCreate();
             const result = await this.entityDataSelectorService.open({
                 entity,
                 title: `${this.translateService.translateSync(entity.formats.plural ?? '')}`,
@@ -15387,7 +15280,12 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
                 filters: this.customFilter()(),
                 parentFilters: this.parentFilters(),
                 columns: this.columns()(),
-                allowCreate: this.allowCreate(),
+                create: {
+                    enable: createOptions.enabled,
+                    mode: createOptions.mode,
+                    context: createOptions.context,
+                },
+                contextStore: this.contextStore ?? undefined,
                 initialSearchTerm: searchTerm,
                 selectedItemIds: selectedItemIds.length > 0 ? selectedItemIds : undefined,
                 rowActions: this.rowActions(),
@@ -15413,7 +15311,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.clear();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetTagboxComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetTagboxComponent, isStandalone: true, selector: "axp-lookup-widget-tagbox", inputs: { selectedItems: { classPropertyName: "selectedItems", publicName: "selectedItems", isSignal: true, isRequired: true, transformFunction: null }, displayField: { classPropertyName: "displayField", publicName: "displayField", isSignal: true, isRequired: true, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: true, transformFunction: null }, displayFormat: { classPropertyName: "displayFormat", publicName: "displayFormat", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: true, transformFunction: null }, multiple: { classPropertyName: "multiple", publicName: "multiple", isSignal: true, isRequired: true, transformFunction: null }, isLoading: { classPropertyName: "isLoading", publicName: "isLoading", isSignal: true, isRequired: true, transformFunction: null }, validationRules: { classPropertyName: "validationRules", publicName: "validationRules", isSignal: true, isRequired: true, transformFunction: null }, placeholder: { classPropertyName: "placeholder", publicName: "placeholder", isSignal: true, isRequired: false, transformFunction: null }, hasClearButton: { classPropertyName: "hasClearButton", publicName: "hasClearButton", isSignal: true, isRequired: false, transformFunction: null }, allowCreate: { classPropertyName: "allowCreate", publicName: "allowCreate", isSignal: true, isRequired: false, transformFunction: null }, allowUnselect: { classPropertyName: "allowUnselect", publicName: "allowUnselect", isSignal: true, isRequired: false, transformFunction: null }, entityDef: { classPropertyName: "entityDef", publicName: "entityDef", isSignal: true, isRequired: true, transformFunction: null }, customFilter: { classPropertyName: "customFilter", publicName: "customFilter", isSignal: true, isRequired: true, transformFunction: null }, columns: { classPropertyName: "columns", publicName: "columns", isSignal: true, isRequired: true, transformFunction: null }, parentFilters: { classPropertyName: "parentFilters", publicName: "parentFilters", isSignal: true, isRequired: false, transformFunction: null }, rowActions: { classPropertyName: "rowActions", publicName: "rowActions", isSignal: true, isRequired: false, transformFunction: null }, onSetLoading: { classPropertyName: "onSetLoading", publicName: "onSetLoading", isSignal: true, isRequired: true, transformFunction: null } }, outputs: { valueChanged: "valueChanged" }, providers: [
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetTagboxComponent, isStandalone: true, selector: "axp-lookup-widget-tagbox", inputs: { selectedItems: { classPropertyName: "selectedItems", publicName: "selectedItems", isSignal: true, isRequired: true, transformFunction: null }, displayField: { classPropertyName: "displayField", publicName: "displayField", isSignal: true, isRequired: true, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: true, transformFunction: null }, displayFormat: { classPropertyName: "displayFormat", publicName: "displayFormat", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: true, transformFunction: null }, multiple: { classPropertyName: "multiple", publicName: "multiple", isSignal: true, isRequired: true, transformFunction: null }, isLoading: { classPropertyName: "isLoading", publicName: "isLoading", isSignal: true, isRequired: true, transformFunction: null }, validationRules: { classPropertyName: "validationRules", publicName: "validationRules", isSignal: true, isRequired: true, transformFunction: null }, placeholder: { classPropertyName: "placeholder", publicName: "placeholder", isSignal: true, isRequired: false, transformFunction: null }, hasClearButton: { classPropertyName: "hasClearButton", publicName: "hasClearButton", isSignal: true, isRequired: false, transformFunction: null }, resolvedCreate: { classPropertyName: "resolvedCreate", publicName: "resolvedCreate", isSignal: true, isRequired: false, transformFunction: null }, allowUnselect: { classPropertyName: "allowUnselect", publicName: "allowUnselect", isSignal: true, isRequired: false, transformFunction: null }, entityDef: { classPropertyName: "entityDef", publicName: "entityDef", isSignal: true, isRequired: true, transformFunction: null }, customFilter: { classPropertyName: "customFilter", publicName: "customFilter", isSignal: true, isRequired: true, transformFunction: null }, columns: { classPropertyName: "columns", publicName: "columns", isSignal: true, isRequired: true, transformFunction: null }, parentFilters: { classPropertyName: "parentFilters", publicName: "parentFilters", isSignal: true, isRequired: false, transformFunction: null }, rowActions: { classPropertyName: "rowActions", publicName: "rowActions", isSignal: true, isRequired: false, transformFunction: null }, onSetLoading: { classPropertyName: "onSetLoading", publicName: "onSetLoading", isSignal: true, isRequired: true, transformFunction: null } }, outputs: { valueChanged: "valueChanged" }, providers: [
             {
                 provide: LookupWidgetLookBase,
                 useExisting: AXPLookupWidgetTagboxComponent,
@@ -15466,7 +15364,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
     </ax-tag-box>
     <ng-template #tagTemplate let-item let-index="index">
       <div class="ax-inline-flex ax-items-center ax-gap-1.5 ax-rounded-md ax-px-3 ax-py-1 ax-text-sm ax-surface">
-        <span>{{ getDisplayRaw(item) | translate | async }}</span>
+        <span>{{ getItemLabel(item) }}</span>
         <button type="button" (click)="tagBoxComponent.removeItem(index)">
           <ax-icon class="ax-icon ax-icon-close"></ax-icon>
         </button>
@@ -15526,7 +15424,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
     </ax-tag-box>
     <ng-template #tagTemplate let-item let-index="index">
       <div class="ax-inline-flex ax-items-center ax-gap-1.5 ax-rounded-md ax-px-3 ax-py-1 ax-text-sm ax-surface">
-        <span>{{ getDisplayRaw(item) | translate | async }}</span>
+        <span>{{ getItemLabel(item) }}</span>
         <button type="button" (click)="tagBoxComponent.removeItem(index)">
           <ax-icon class="ax-icon ax-icon-close"></ax-icon>
         </button>
@@ -15552,7 +15450,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         },
                     ],
                 }]
-        }], propDecorators: { selectedItems: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectedItems", required: true }] }], displayField: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayField", required: true }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: true }] }], displayFormat: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayFormat", required: false }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: true }] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: true }] }], isLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "isLoading", required: true }] }], validationRules: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationRules", required: true }] }], placeholder: [{ type: i0.Input, args: [{ isSignal: true, alias: "placeholder", required: false }] }], hasClearButton: [{ type: i0.Input, args: [{ isSignal: true, alias: "hasClearButton", required: false }] }], allowCreate: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowCreate", required: false }] }], allowUnselect: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowUnselect", required: false }] }], entityDef: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityDef", required: true }] }], customFilter: [{ type: i0.Input, args: [{ isSignal: true, alias: "customFilter", required: true }] }], columns: [{ type: i0.Input, args: [{ isSignal: true, alias: "columns", required: true }] }], parentFilters: [{ type: i0.Input, args: [{ isSignal: true, alias: "parentFilters", required: false }] }], rowActions: [{ type: i0.Input, args: [{ isSignal: true, alias: "rowActions", required: false }] }], onSetLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "onSetLoading", required: true }] }], valueChanged: [{ type: i0.Output, args: ["valueChanged"] }], tagBox: [{ type: i0.ViewChild, args: ['tagBoxComponent', { isSignal: true }] }] } });
+        }], propDecorators: { selectedItems: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectedItems", required: true }] }], displayField: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayField", required: true }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: true }] }], displayFormat: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayFormat", required: false }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: true }] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: true }] }], isLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "isLoading", required: true }] }], validationRules: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationRules", required: true }] }], placeholder: [{ type: i0.Input, args: [{ isSignal: true, alias: "placeholder", required: false }] }], hasClearButton: [{ type: i0.Input, args: [{ isSignal: true, alias: "hasClearButton", required: false }] }], resolvedCreate: [{ type: i0.Input, args: [{ isSignal: true, alias: "resolvedCreate", required: false }] }], allowUnselect: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowUnselect", required: false }] }], entityDef: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityDef", required: true }] }], customFilter: [{ type: i0.Input, args: [{ isSignal: true, alias: "customFilter", required: true }] }], columns: [{ type: i0.Input, args: [{ isSignal: true, alias: "columns", required: true }] }], parentFilters: [{ type: i0.Input, args: [{ isSignal: true, alias: "parentFilters", required: false }] }], rowActions: [{ type: i0.Input, args: [{ isSignal: true, alias: "rowActions", required: false }] }], onSetLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "onSetLoading", required: true }] }], valueChanged: [{ type: i0.Output, args: ["valueChanged"] }], tagBox: [{ type: i0.ViewChild, args: ['tagBoxComponent', { isSignal: true }] }] } });
 
 class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     constructor() {
@@ -15595,7 +15493,10 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.allowUnselect = computed(() => this.options()['allowUnselect'] ?? true, ...(ngDevMode ? [{ debugName: "allowUnselect" }] : /* istanbul ignore next */ []));
         this.look = computed(() => this.options()['look'] ?? 'lookup', ...(ngDevMode ? [{ debugName: "look" }] : /* istanbul ignore next */ []));
         this.displayField = computed(() => resolveLookupDisplayField(this.entityDef(), { textField: this.textField() }), ...(ngDevMode ? [{ debugName: "displayField" }] : /* istanbul ignore next */ []));
-        this.allowCreate = computed(() => this.options()['allowCreate'] ?? 'none', ...(ngDevMode ? [{ debugName: "allowCreate" }] : /* istanbul ignore next */ []));
+        this.resolvedCreate = computed(() => resolveLookupWidgetCreateOptions({
+            create: this.options()['create'],
+            allowCreate: this.options()['allowCreate'],
+        }), ...(ngDevMode ? [{ debugName: "resolvedCreate" }] : /* istanbul ignore next */ []));
         this.selectorRowActions = computed(() => this.options()['selectorRowActions'], ...(ngDevMode ? [{ debugName: "selectorRowActions" }] : /* istanbul ignore next */ []));
         this.valueField = computed(() => this.entityDef()?.properties.find((c) => c.name == 'id')?.name ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : /* istanbul ignore next */ []));
         this.displayFormat = computed(() => resolveLookupDisplayTemplate(this.entityDef(), {
@@ -15641,6 +15542,12 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         //#region ----   Business Logic Methods (Passed to Dumb Components)   ----
         this.setLoading = (loading) => {
             this.isLoading.set(loading);
+            if (loading) {
+                this.beginHydration();
+            }
+            else {
+                this.endHydration();
+            }
         };
         /** @param syncContext When false, only updates UI (hydration/revert); skips context writes. */
         this.setItems = (items, syncContext = true) => {
@@ -15650,6 +15557,8 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             items = items.filter((item) => item != null);
             // Normalize phones/emails from repeater nested structure to { value: string }
             items = items.map((item) => this.entityDataSelectorService.normalizeItemContactArrays(item));
+            /** Preserve raw entity fields (e.g. MLS maps) before display-field resolution for expose writes. */
+            const itemsForExpose = cloneDeep(items);
             const displayField = this.displayField();
             items = items.map((item) => {
                 const raw = get(item, displayField);
@@ -15664,10 +15573,32 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             }
             const keys = items.map((item) => get(item, this.valueField()));
             const text = items.map((item) => this.mlsResolver.resolve(get(item, displayField)));
+            const newValue = this.singleOrMultiple(keys);
+            const widgetPath = this.fullPath();
+            const savedWidgetValue = widgetPath ? this.contextService.getSavedValue(widgetPath) : undefined;
+            const selectionMatchesSaved = this.contextService.isSavedCommitted() &&
+                widgetPath != null &&
+                isSelectionValueEqual(newValue, savedWidgetValue);
             if (this.expose()) {
-                this.expoesItems();
+                AXPDebugService.instance?.trace(FORM_DIRTY_TRACE_NS, 'lookup-widget', 'setItems expose', () => ({
+                    path: this.fullPath(),
+                    items: items.map((item) => get(item, this.valueField())),
+                    expose: this.expose(),
+                    selectionMatchesSaved,
+                }));
+                if (selectionMatchesSaved) {
+                    this.syncExposePathsToSavedBaseline();
+                }
+                else {
+                    this.expoesItems(itemsForExpose);
+                }
             }
-            const newValue = this.singleOrMultiple(keys);
+            AXPDebugService.instance?.trace(FORM_DIRTY_TRACE_NS, 'lookup-widget', 'setItems setValue', () => ({
+                path: this.fullPath(),
+                newValue,
+                keys,
+                syncContext,
+            }));
             if (this.filterMode()) {
                 this.setValue({
                     value: newValue,
@@ -15680,12 +15611,16 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             else {
                 this.setValue(newValue);
             }
+            if (this.expose() && selectionMatchesSaved) {
+                this.syncExposePathsToSavedBaseline();
+            }
         };
     }
     #efEntity;
     #efValue;
     async findByValue() {
         this.isLoading.set(true);
+        this.beginHydration();
         const rawValue = this.getValue();
         // When multiple is true, ensure we always work with arrays
         const values = this.multiple()
@@ -15694,6 +15629,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         if (!values.length) {
             this.setItems([], false);
             this.isLoading.set(false);
+            this.endHydration();
             return;
         }
         try {
@@ -15726,6 +15662,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
         finally {
             this.isLoading.set(false);
+            this.endHydration();
         }
     }
     //#region ----   Event Handlers from Dumb Components   ----
@@ -15736,7 +15673,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         const entity = this.entityDef();
         if (!entity || !entity.commands?.create?.execute)
             return;
-        const mode = this.allowCreate();
+        const { mode } = this.resolvedCreate();
         if (mode !== 'full' && mode !== 'quick')
             return;
         await this.executeCreate(mode);
@@ -15746,8 +15683,11 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         if (!entity || !entity.commands?.create?.execute)
             return;
         this.isLoading.set(true);
+        this.beginHydration();
         try {
-            const createdItem = await this.entityDataSelectorService.executeEntityCreate(entity, mode);
+            const { context } = this.resolvedCreate();
+            const createData = await this.entityDataSelectorService.resolveCreateContext(context, this.contextService);
+            const createdItem = await this.entityDataSelectorService.executeEntityCreate(entity, mode, createData);
             if (createdItem) {
                 const currentItems = this.selectedItems();
                 const valueField = this.valueField();
@@ -15767,6 +15707,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
         finally {
             this.isLoading.set(false);
+            this.endHydration();
         }
     }
     /**
@@ -15775,9 +15716,31 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
      * so e.g. `{ person: { educationLevel: { id, title } } }` would replace the entire `person`
      * object and drop sibling fields like `person.educationLevelId`, causing a value/effect loop.
      */
-    expoesItems() {
+    syncExposePathsToSavedBaseline() {
         const exposeValue = castArray(this.expose());
-        const items = this.selectedItems();
+        const parentPaths = new Set();
+        exposeValue.forEach((item) => {
+            const target = typeof item === 'string' ? item : item.target;
+            if (target.includes('.')) {
+                parentPaths.add(target.split('.').slice(0, -1).join('.'));
+            }
+            this.contextService.syncPathToSavedBaseline(target, { origin: 'system' });
+        });
+        const saved = this.contextService.saved();
+        parentPaths.forEach((parentPath) => {
+            if (!has(saved, parentPath)) {
+                this.contextService.syncPathToSavedBaseline(parentPath, { origin: 'system' });
+            }
+        });
+        AXPDebugService.instance?.trace(FORM_DIRTY_TRACE_NS, 'lookup-widget', 'syncExposePathsToSavedBaseline', () => ({
+            path: this.fullPath(),
+            expose: this.expose(),
+            parentPaths: [...parentPaths],
+        }));
+    }
+    expoesItems(sourceItems) {
+        const exposeValue = castArray(this.expose());
+        const items = sourceItems ?? this.selectedItems();
         const isEmpty = !items || items.length === 0;
         if (isEmpty) {
             const parentPaths = new Set();
@@ -15788,7 +15751,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                         parentPaths.add(pathParts.slice(0, -1).join('.'));
                     }
                     else {
-                        this.contextService.update(i, null);
+                        this.contextService.update(i, null, { origin: 'user' });
                     }
                 }
                 else {
@@ -15797,25 +15760,25 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                         parentPaths.add(pathParts.slice(0, -1).join('.'));
                     }
                     else {
-                        this.contextService.update(i.target, null);
+                        this.contextService.update(i.target, null, { origin: 'user' });
                     }
                 }
             });
             parentPaths.forEach((parentPath) => {
-                this.contextService.update(parentPath, null);
+                this.contextService.update(parentPath, null, { origin: 'user' });
             });
             return;
         }
         exposeValue.forEach((i) => {
             if (typeof i === 'string') {
                 const values = items.map((item) => set({}, i, get(item, i)));
-                this.contextService.update(i, this.singleOrMultiple(values));
+                this.contextService.update(i, this.singleOrMultiple(values), { origin: 'user' });
             }
             else {
                 const values = this.multiple()
                     ? items.map((item) => set({}, i.source, get(item, i.source)))
                     : items.map((item) => get(item, i.source));
-                this.contextService.update(i.target, this.singleOrMultiple(values));
+                this.contextService.update(i.target, this.singleOrMultiple(values), { origin: 'user' });
             }
         });
     }
@@ -15858,7 +15821,6 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
               [placeholder]="placeholder"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
-              [allowCreate]="allowCreate()"
               [showItemTooltip]="showItemTooltip()"
               [isItemTruncated]="isItemTruncated()"
               (valueChanged)="handleComponentValueChanged($event)"
@@ -15877,7 +15839,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
               [isLoading]="isLoading"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
-              [allowCreate]="allowCreate()"
+              [resolvedCreate]="resolvedCreate()"
               [allowUnselect]="allowUnselect()"
               [entityDef]="entityDef"
               [customFilter]="customFilter"
@@ -15889,7 +15851,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             />
           }
         }
-        @if (allowCreate() === 'quick' || allowCreate() === 'full') {
+        @if (resolvedCreate().enabled) {
           <div class="ax-sm">
             <ax-button
               color="primary"
@@ -15904,7 +15866,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
       </div>
     }
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPLookupWidgetSelectComponent, selector: "axp-lookup-widget-select", inputs: ["entityDef", "customFilter", "selectedItems", "displayField", "valueField", "disabled", "multiple", "validationRules", "placeholder", "hasClearButton", "allowCreate", "showItemTooltip", "isItemTruncated"], outputs: ["valueChanged"] }, { kind: "component", type: AXPLookupWidgetTagboxComponent, selector: "axp-lookup-widget-tagbox", inputs: ["selectedItems", "displayField", "valueField", "displayFormat", "disabled", "multiple", "isLoading", "validationRules", "placeholder", "hasClearButton", "allowCreate", "allowUnselect", "entityDef", "customFilter", "columns", "parentFilters", "rowActions", "onSetLoading"], outputs: ["valueChanged"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPLookupWidgetSelectComponent, selector: "axp-lookup-widget-select", inputs: ["entityDef", "customFilter", "selectedItems", "displayField", "valueField", "disabled", "multiple", "validationRules", "placeholder", "hasClearButton", "allowCreate", "showItemTooltip", "isItemTruncated"], outputs: ["valueChanged"] }, { kind: "component", type: AXPLookupWidgetTagboxComponent, selector: "axp-lookup-widget-tagbox", inputs: ["selectedItems", "displayField", "valueField", "displayFormat", "disabled", "multiple", "isLoading", "validationRules", "placeholder", "hasClearButton", "resolvedCreate", "allowUnselect", "entityDef", "customFilter", "columns", "parentFilters", "rowActions", "onSetLoading"], outputs: ["valueChanged"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetEditComponent, decorators: [{
             type: Component,
@@ -15927,7 +15889,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
               [placeholder]="placeholder"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
-              [allowCreate]="allowCreate()"
               [showItemTooltip]="showItemTooltip()"
               [isItemTruncated]="isItemTruncated()"
               (valueChanged)="handleComponentValueChanged($event)"
@@ -15946,7 +15907,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
               [isLoading]="isLoading"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
-              [allowCreate]="allowCreate()"
+              [resolvedCreate]="resolvedCreate()"
               [allowUnselect]="allowUnselect()"
               [entityDef]="entityDef"
               [customFilter]="customFilter"
@@ -15958,7 +15919,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             />
           }
         }
-        @if (allowCreate() === 'quick' || allowCreate() === 'full') {
+        @if (resolvedCreate().enabled) {
           <div class="ax-sm">
             <ax-button
               color="primary"
@@ -16004,6 +15965,8 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         this.entityService = inject(AXPEntityService);
         this.entityResolver = inject(AXPEntityDefinitionRegistryService);
         this.queryExecutor = inject(AXPQueryExecutor);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.contextEvalFactory = inject(AXPContextEvalFactory);
         //#endregion
         //#region ---- View Children ----
         this.moreButton = viewChild('moreButton', ...(ngDevMode ? [{ debugName: "moreButton" }] : /* istanbul ignore next */ []));
@@ -16041,11 +16004,16 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         this.resolveError = signal(null, ...(ngDevMode ? [{ debugName: "resolveError" }] : /* istanbul ignore next */ []));
         this.summaryLabel = signal('', ...(ngDevMode ? [{ debugName: "summaryLabel" }] : /* istanbul ignore next */ []));
         this.popoverHeader = signal('', ...(ngDevMode ? [{ debugName: "popoverHeader" }] : /* istanbul ignore next */ []));
+        this.mainItemLabels = signal([], ...(ngDevMode ? [{ debugName: "mainItemLabels" }] : /* istanbul ignore next */ []));
+        this.lazyPopoverItemLabels = signal([], ...(ngDevMode ? [{ debugName: "lazyPopoverItemLabels" }] : /* istanbul ignore next */ []));
         this.entityDef = signal(null, ...(ngDevMode ? [{ debugName: "entityDef" }] : /* istanbul ignore next */ []));
         this.hydratedDisplayItems = signal(null, ...(ngDevMode ? [{ debugName: "hydratedDisplayItems" }] : /* istanbul ignore next */ []));
         this.hydrateRequestId = 0;
+        this.mainLabelsVersion = 0;
+        this.lazyPopoverLabelsVersion = 0;
         //#endregion
         //#region ---- Computed ----
+        this.popoverItemLabels = computed(() => this.isHydratedStrategy() ? this.mainItemLabels() : this.lazyPopoverItemLabels(), ...(ngDevMode ? [{ debugName: "popoverItemLabels" }] : /* istanbul ignore next */ []));
         this.displayItems = computed(() => isNil(this.rawValue)
             ? []
             : castArray(this.rawValue)
@@ -16165,6 +16133,36 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
             }
             void this.hydrateScalarIds(entityKey, values);
         });
+        effect(() => {
+            void this.translation.getActiveLang();
+            this.entityDef();
+            const items = this.allItems();
+            const version = ++this.mainLabelsVersion;
+            void this.resolveLabelsForItems(items).then((labels) => {
+                if (version === this.mainLabelsVersion) {
+                    this.mainItemLabels.set(labels);
+                }
+            });
+        });
+        effect(() => {
+            if (this.isHydratedStrategy()) {
+                return;
+            }
+            void this.translation.getActiveLang();
+            this.entityDef();
+            const status = this.resolveStatus();
+            const items = this.resolvedPopoverItems();
+            if (status !== 'ready') {
+                this.lazyPopoverItemLabels.set([]);
+                return;
+            }
+            const version = ++this.lazyPopoverLabelsVersion;
+            void this.resolveLabelsForItems(items).then((labels) => {
+                if (version === this.lazyPopoverLabelsVersion) {
+                    this.lazyPopoverItemLabels.set(labels);
+                }
+            });
+        });
     }
     //#endregion
     //#region ---- Public methods ----
@@ -16220,7 +16218,9 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         let resolvedTitle = '';
         if (headerItem != null && this.hasDisplayTextOnLookupValue(headerItem)) {
             resolvedTitle =
-                typeof headerItem === 'object' ? this.renderLookupLabel(headerItem) : this.formatDisplayValue(headerItem);
+                typeof headerItem === 'object'
+                    ? await this.resolveItemLabel(headerItem)
+                    : this.formatDisplayValue(headerItem);
         }
         else if (!this.isMultiValueLookup()) {
             const rowText = this.getRowDisplayTextFromTextField();
@@ -16229,8 +16229,7 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
             }
         }
         if (!resolvedTitle) {
-            const displayTitle = formatLookupItemDisplay(headerItem, this.entityDef(), this.lookupDisplayOptions(), this.formatService, (value) => this.translation.resolve(value));
-            resolvedTitle = typeof displayTitle === 'string' ? displayTitle : this.translation.resolve(displayTitle);
+            resolvedTitle = await this.resolveItemLabel(headerItem);
             if (isUnresolvedEntityDisplayTemplate(resolvedTitle)) {
                 resolvedTitle = '';
             }
@@ -16296,8 +16295,22 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         const values = castArray(raw).filter((value) => value != null && value !== '');
         return values.length > 0 && values.every((value) => this.hasDisplayTextOnLookupValue(value));
     }
-    getDisplayRaw(item) {
-        if (item != null && typeof item === 'object' && this.translation.isValidMultiLanguageObject(item)) {
+    getItemLabel(index) {
+        return this.mainItemLabels()[index] ?? '';
+    }
+    getPopoverItemLabel(index) {
+        return this.popoverItemLabels()[index] ?? '';
+    }
+    //#endregion
+    //#region ---- Private methods ----
+    async resolveLabelsForItems(items) {
+        return Promise.all(items.map((item) => this.resolveItemLabel(item)));
+    }
+    async resolveItemLabel(item) {
+        if (item == null) {
+            return '';
+        }
+        if (typeof item === 'object' && this.translation.isValidMultiLanguageObject(item)) {
             return this.translation.resolve(item);
         }
         if (!this.isMultiValueLookup()) {
@@ -16306,16 +16319,19 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
                 return this.formatDisplayValue(rowText);
             }
         }
-        if (item != null && this.hasDisplayTextOnLookupValue(item)) {
-            if (typeof item === 'object') {
-                return this.renderLookupLabel(item);
+        if (this.hasDisplayTextOnLookupValue(item)) {
+            if (typeof item !== 'object') {
+                return this.formatDisplayValue(item);
             }
-            return this.formatDisplayValue(item);
         }
-        return this.renderLookupLabel(item);
+        const locale = this.translation.getActiveLang() ?? 'en-US';
+        return formatLookupItemDisplayAsync(item, this.entityDef(), this.lookupDisplayOptions(), this.formatService, {
+            expressionEvaluator: this.expressionEvaluator,
+            contextEvalFactory: this.contextEvalFactory,
+            translationService: this.translation,
+            locale,
+        }, (value) => this.translation.resolve(value));
     }
-    //#endregion
-    //#region ---- Private methods ----
     async refreshSummaryLabel(count) {
         const text = await this.translation.translateAsync('@general:widgets.lookup.column.items-count', {
             params: { count: String(count) },
@@ -16639,10 +16655,6 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
             return !isNil(candidate) && candidate !== '' && !this.isLikelyEntityId(candidate);
         });
     }
-    renderLookupLabel(value) {
-        const label = formatLookupItemDisplay(value, this.entityDef(), this.lookupDisplayOptions(), this.formatService, (item) => this.translation.resolve(item));
-        return typeof label === 'string' ? label : this.translation.resolve(label);
-    }
     formatDisplayValue(value) {
         if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
             return String(value);
@@ -16663,11 +16675,11 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value) || /^\d+$/.test(value);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetColumnComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetColumnComponent, isStandalone: true, selector: "ng-component", inputs: { rawValue: "rawValue", rowData: "rowData" }, viewQueries: [{ propertyName: "moreButton", first: true, predicate: ["moreButton"], descendants: true, isSignal: true }, { propertyName: "lazyTrigger", first: true, predicate: ["lazyTrigger"], descendants: true, isSignal: true }, { propertyName: "morePopover", first: true, predicate: ["morePopover"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: "@if (isHydratedStrategy()) {\n<div class=\"ax-relative ax-flex ax-min-w-0 ax-items-center ax-gap-1\">\n  @for (item of visibleItems(); track $index) {\n  @let label = getDisplayRaw(item);\n  <span [class.ax-cursor-pointer]=\"detailPopoverEnabled()\" [class.hover:ax-text-primary]=\"detailPopoverEnabled()\"\n    [class.hover:ax-underline]=\"detailPopoverEnabled()\" (click)=\"handleItemClick($index, $event)\">\n    {{ label }}\n  </span>\n  @if ($index < visibleItems().length - 1) { <span class=\"ax-text-muted\">\u2022</span>\n    }\n    } @empty {\n    <span class=\"ax-text-muted\">---</span>\n    }\n    @if (hasMoreItems()) {\n    <span\n      class=\"ax-absolute ax-end-0 ax-flex ax-h-full ax-cursor-pointer ax-items-center ax-px-1 hover:ax-primary-lighter\"\n      (click)=\"showMoreItems(); $event.stopPropagation()\" #moreButton>\n      <i class=\"fa-light fa-ellipsis-vertical\"></i>\n    </span>\n    }\n</div>\n} @else {\n<div class=\"ax-flex ax-min-w-0 ax-items-center ax-gap-1\">\n  @if (displayCount() > 0) {\n  <span class=\"ax-cursor-pointer ax-text-primary hover:ax-underline\"\n    (click)=\"openLazyPopover(); $event.stopPropagation()\" #lazyTrigger>\n    {{ summaryLabel() }}\n  </span>\n  } @else {\n  <span class=\"ax-text-muted\">---</span>\n  }\n</div>\n}\n\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface dark:ax-dark-surface ax-min-w-[280px] ax-rounded-lg ax-p-4 ax-shadow-lg\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">{{ popoverHeader() }}</h3>\n    </div>\n\n    @if (!isHydratedStrategy() && resolveStatus() === 'loading') {\n    <div class=\"ax-flex ax-min-h-[120px] ax-items-center ax-justify-center\">\n      <ax-loading></ax-loading>\n    </div>\n    } @else if (!isHydratedStrategy() && resolveStatus() === 'error') {\n    <div class=\"ax-text-danger ax-text-sm\">{{ resolveError() }}</div>\n    } @else {\n    <div class=\"ax-flex ax-max-h-64 ax-flex-col ax-gap-3\">\n      @for (item of popoverListItems(); track $index) {\n      @let label = getDisplayRaw(item);\n      <span [class.ax-cursor-pointer]=\"detailPopoverEnabled()\" [class.hover:ax-text-primary]=\"detailPopoverEnabled()\"\n        [class.hover:ax-underline]=\"detailPopoverEnabled()\" (click)=\"handlePopoverItemClick($index, $event)\">\n        {{ label }}\n      </span>\n      } @empty {\n      <span class=\"ax-text-muted\">---</span>\n      }\n    </div>\n    }\n  </div>\n</ax-popover>", dependencies: [{ kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i1$2.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2$3.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disablePanelClass", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "closeOnScroll", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetColumnComponent, isStandalone: true, selector: "ng-component", inputs: { rawValue: "rawValue", rowData: "rowData" }, viewQueries: [{ propertyName: "moreButton", first: true, predicate: ["moreButton"], descendants: true, isSignal: true }, { propertyName: "lazyTrigger", first: true, predicate: ["lazyTrigger"], descendants: true, isSignal: true }, { propertyName: "morePopover", first: true, predicate: ["morePopover"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: "@if (isHydratedStrategy()) {\n  <div class=\"ax-relative ax-flex ax-min-w-0 ax-items-center ax-gap-1\">\n    @for (item of visibleItems(); track $index) {\n      <span\n        [class.ax-cursor-pointer]=\"detailPopoverEnabled()\"\n        [class.hover:ax-text-primary]=\"detailPopoverEnabled()\"\n        [class.hover:ax-underline]=\"detailPopoverEnabled()\"\n        (click)=\"handleItemClick($index, $event)\"\n      >\n        {{ getItemLabel($index) }}\n      </span>\n      @if ($index < visibleItems().length - 1) {\n        <span class=\"ax-text-muted\">\u2022</span>\n      }\n    } @empty {\n      <span class=\"ax-text-muted\">---</span>\n    }\n    @if (hasMoreItems()) {\n      <span\n        class=\"ax-absolute ax-end-0 ax-flex ax-h-full ax-cursor-pointer ax-items-center ax-px-1 hover:ax-primary-lighter\"\n        (click)=\"showMoreItems(); $event.stopPropagation()\"\n        #moreButton\n      >\n        <i class=\"fa-light fa-ellipsis-vertical\"></i>\n      </span>\n    }\n  </div>\n} @else {\n  <div class=\"ax-flex ax-min-w-0 ax-items-center ax-gap-1\">\n    @if (displayCount() > 0) {\n      <span\n        class=\"ax-cursor-pointer ax-text-primary hover:ax-underline\"\n        (click)=\"openLazyPopover(); $event.stopPropagation()\"\n        #lazyTrigger\n      >\n        {{ summaryLabel() }}\n      </span>\n    } @else {\n      <span class=\"ax-text-muted\">---</span>\n    }\n  </div>\n}\n\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface dark:ax-dark-surface ax-min-w-[280px] ax-rounded-lg ax-p-4 ax-shadow-lg\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">{{ popoverHeader() }}</h3>\n    </div>\n\n    @if (!isHydratedStrategy() && resolveStatus() === 'loading') {\n      <div class=\"ax-flex ax-min-h-[120px] ax-items-center ax-justify-center\">\n        <ax-loading></ax-loading>\n      </div>\n    } @else if (!isHydratedStrategy() && resolveStatus() === 'error') {\n      <div class=\"ax-text-danger ax-text-sm\">{{ resolveError() }}</div>\n    } @else {\n      <div class=\"ax-flex ax-max-h-64 ax-flex-col ax-gap-3\">\n        @for (item of popoverListItems(); track $index) {\n          <span\n            [class.ax-cursor-pointer]=\"detailPopoverEnabled()\"\n            [class.hover:ax-text-primary]=\"detailPopoverEnabled()\"\n            [class.hover:ax-underline]=\"detailPopoverEnabled()\"\n            (click)=\"handlePopoverItemClick($index, $event)\"\n          >\n            {{ getPopoverItemLabel($index) }}\n          </span>\n        } @empty {\n          <span class=\"ax-text-muted\">---</span>\n        }\n      </div>\n    }\n  </div>\n</ax-popover>\n", dependencies: [{ kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i1$2.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2$3.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disablePanelClass", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "closeOnScroll", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetColumnComponent, decorators: [{
             type: Component,
-            args: [{ changeDetection: ChangeDetectionStrategy.OnPush, imports: [AXLoadingModule, AXPopoverModule], inputs: ['rawValue', 'rowData'], template: "@if (isHydratedStrategy()) {\n<div class=\"ax-relative ax-flex ax-min-w-0 ax-items-center ax-gap-1\">\n  @for (item of visibleItems(); track $index) {\n  @let label = getDisplayRaw(item);\n  <span [class.ax-cursor-pointer]=\"detailPopoverEnabled()\" [class.hover:ax-text-primary]=\"detailPopoverEnabled()\"\n    [class.hover:ax-underline]=\"detailPopoverEnabled()\" (click)=\"handleItemClick($index, $event)\">\n    {{ label }}\n  </span>\n  @if ($index < visibleItems().length - 1) { <span class=\"ax-text-muted\">\u2022</span>\n    }\n    } @empty {\n    <span class=\"ax-text-muted\">---</span>\n    }\n    @if (hasMoreItems()) {\n    <span\n      class=\"ax-absolute ax-end-0 ax-flex ax-h-full ax-cursor-pointer ax-items-center ax-px-1 hover:ax-primary-lighter\"\n      (click)=\"showMoreItems(); $event.stopPropagation()\" #moreButton>\n      <i class=\"fa-light fa-ellipsis-vertical\"></i>\n    </span>\n    }\n</div>\n} @else {\n<div class=\"ax-flex ax-min-w-0 ax-items-center ax-gap-1\">\n  @if (displayCount() > 0) {\n  <span class=\"ax-cursor-pointer ax-text-primary hover:ax-underline\"\n    (click)=\"openLazyPopover(); $event.stopPropagation()\" #lazyTrigger>\n    {{ summaryLabel() }}\n  </span>\n  } @else {\n  <span class=\"ax-text-muted\">---</span>\n  }\n</div>\n}\n\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface dark:ax-dark-surface ax-min-w-[280px] ax-rounded-lg ax-p-4 ax-shadow-lg\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">{{ popoverHeader() }}</h3>\n    </div>\n\n    @if (!isHydratedStrategy() && resolveStatus() === 'loading') {\n    <div class=\"ax-flex ax-min-h-[120px] ax-items-center ax-justify-center\">\n      <ax-loading></ax-loading>\n    </div>\n    } @else if (!isHydratedStrategy() && resolveStatus() === 'error') {\n    <div class=\"ax-text-danger ax-text-sm\">{{ resolveError() }}</div>\n    } @else {\n    <div class=\"ax-flex ax-max-h-64 ax-flex-col ax-gap-3\">\n      @for (item of popoverListItems(); track $index) {\n      @let label = getDisplayRaw(item);\n      <span [class.ax-cursor-pointer]=\"detailPopoverEnabled()\" [class.hover:ax-text-primary]=\"detailPopoverEnabled()\"\n        [class.hover:ax-underline]=\"detailPopoverEnabled()\" (click)=\"handlePopoverItemClick($index, $event)\">\n        {{ label }}\n      </span>\n      } @empty {\n      <span class=\"ax-text-muted\">---</span>\n      }\n    </div>\n    }\n  </div>\n</ax-popover>" }]
+            args: [{ changeDetection: ChangeDetectionStrategy.OnPush, imports: [AXLoadingModule, AXPopoverModule], inputs: ['rawValue', 'rowData'], template: "@if (isHydratedStrategy()) {\n  <div class=\"ax-relative ax-flex ax-min-w-0 ax-items-center ax-gap-1\">\n    @for (item of visibleItems(); track $index) {\n      <span\n        [class.ax-cursor-pointer]=\"detailPopoverEnabled()\"\n        [class.hover:ax-text-primary]=\"detailPopoverEnabled()\"\n        [class.hover:ax-underline]=\"detailPopoverEnabled()\"\n        (click)=\"handleItemClick($index, $event)\"\n      >\n        {{ getItemLabel($index) }}\n      </span>\n      @if ($index < visibleItems().length - 1) {\n        <span class=\"ax-text-muted\">\u2022</span>\n      }\n    } @empty {\n      <span class=\"ax-text-muted\">---</span>\n    }\n    @if (hasMoreItems()) {\n      <span\n        class=\"ax-absolute ax-end-0 ax-flex ax-h-full ax-cursor-pointer ax-items-center ax-px-1 hover:ax-primary-lighter\"\n        (click)=\"showMoreItems(); $event.stopPropagation()\"\n        #moreButton\n      >\n        <i class=\"fa-light fa-ellipsis-vertical\"></i>\n      </span>\n    }\n  </div>\n} @else {\n  <div class=\"ax-flex ax-min-w-0 ax-items-center ax-gap-1\">\n    @if (displayCount() > 0) {\n      <span\n        class=\"ax-cursor-pointer ax-text-primary hover:ax-underline\"\n        (click)=\"openLazyPopover(); $event.stopPropagation()\"\n        #lazyTrigger\n      >\n        {{ summaryLabel() }}\n      </span>\n    } @else {\n      <span class=\"ax-text-muted\">---</span>\n    }\n  </div>\n}\n\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface dark:ax-dark-surface ax-min-w-[280px] ax-rounded-lg ax-p-4 ax-shadow-lg\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">{{ popoverHeader() }}</h3>\n    </div>\n\n    @if (!isHydratedStrategy() && resolveStatus() === 'loading') {\n      <div class=\"ax-flex ax-min-h-[120px] ax-items-center ax-justify-center\">\n        <ax-loading></ax-loading>\n      </div>\n    } @else if (!isHydratedStrategy() && resolveStatus() === 'error') {\n      <div class=\"ax-text-danger ax-text-sm\">{{ resolveError() }}</div>\n    } @else {\n      <div class=\"ax-flex ax-max-h-64 ax-flex-col ax-gap-3\">\n        @for (item of popoverListItems(); track $index) {\n          <span\n            [class.ax-cursor-pointer]=\"detailPopoverEnabled()\"\n            [class.hover:ax-text-primary]=\"detailPopoverEnabled()\"\n            [class.hover:ax-underline]=\"detailPopoverEnabled()\"\n            (click)=\"handlePopoverItemClick($index, $event)\"\n          >\n            {{ getPopoverItemLabel($index) }}\n          </span>\n        } @empty {\n          <span class=\"ax-text-muted\">---</span>\n        }\n      </div>\n    }\n  </div>\n</ax-popover>\n" }]
         }], ctorParameters: () => [], propDecorators: { moreButton: [{ type: i0.ViewChild, args: ['moreButton', { isSignal: true }] }], lazyTrigger: [{ type: i0.ViewChild, args: ['lazyTrigger', { isSignal: true }] }], morePopover: [{ type: i0.ViewChild, args: ['morePopover', { isSignal: true }] }] } });
 
 var lookupWidgetColumn_component = /*#__PURE__*/Object.freeze({
@@ -17220,8 +17232,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
  * Multi-source selector popup component
  */
 class AXPMultiSourceSelectorComponent extends AXBasePageComponent {
+    //#endregion
     constructor() {
-        super(...arguments);
+        super();
         //#region ----   Services & Dependencies   ----
         this.entityDataSelectorService = inject(AXPEntityDataSelectorService);
         this.entityResolver = inject(AXPEntityDefinitionRegistryService);
@@ -17244,8 +17257,20 @@ class AXPMultiSourceSelectorComponent extends AXBasePageComponent {
         }, ...(ngDevMode ? [{ debugName: "activeSource" }] : /* istanbul ignore next */ []));
         this.selectedItems = signal([], ...(ngDevMode ? [{ debugName: "selectedItems" }] : /* istanbul ignore next */ []));
         this.AXPMultiSourceType = AXPMultiSourceType;
+        setupPopupFooterKeyboardShortcuts(() => [
+            {
+                title: '@general:actions.cancel.title',
+                command: 'cancel',
+                handler: () => this.handleCancel(),
+            },
+            {
+                title: '@general:actions.select.title',
+                command: 'select',
+                disabled: () => this.selectedItems().length === 0,
+                handler: () => this.handleConfirm(),
+            },
+        ], { id: 'multi-source-selector-popup' });
     }
-    //#endregion
     //#region ----   Lifecycle   ----
     ngOnInit() {
         super.ngOnInit();
@@ -17322,7 +17347,7 @@ class AXPMultiSourceSelectorComponent extends AXBasePageComponent {
             items: this.selectedItems(),
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPMultiSourceSelectorComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPMultiSourceSelectorComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPMultiSourceSelectorComponent, isStandalone: true, selector: "axp-multi-source-selector", usesInheritance: true, ngImport: i0, template: `
     <div class="ax-flex ax-flex-col ax-h-full ax-overflow-hidden">
       @if (definition().searchStrategy === 'tabs') {
@@ -17471,7 +17496,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                     changeDetection: ChangeDetectionStrategy.OnPush,
                     imports: [CommonModule, AXButtonModule, AXTabsModule, AXDecoratorModule, AXTranslationModule],
                 }]
-        }] });
+        }], ctorParameters: () => [] });
 
 var multiSourceSelector_component = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -18906,7 +18931,7 @@ class AXPFileListComponent {
                 // ACoreX
                 AXFormModule }, { kind: "ngmodule", type: AXTextBoxModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.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: AXLabelModule }, { kind: "ngmodule", type: AXCheckBoxModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: 
                 // Platform
-                AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "look"] }, { kind: "pipe", type: 
+                AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "titleParams", "descriptionParams", "look"] }, { kind: "pipe", type: 
                 // Angular
                 AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }] }); }
 }
@@ -21930,13 +21955,20 @@ class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
         const p = relatedEntity?.persistence || {};
         const strategy = p.strategy || 'embedded';
         const mappedTargets = Object.keys(p.map || {}).map((k) => (k || '').split('.')[0]);
+        const excludeProperties = relatedEntity.excludeProperties && relatedEntity.excludeProperties.length > 0
+            ? new Set(relatedEntity.excludeProperties)
+            : undefined;
         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));
+                let props = baseHelpers.getPropertyByGroupId(groupId) ?? [];
+                if (strategy === 'referenced' && mappedTargets.length > 0) {
+                    props = props.filter((prop) => !mappedTargets.includes(prop?.name ?? ''));
+                }
+                if (excludeProperties) {
+                    props = props.filter((prop) => !excludeProperties.has(prop.name ?? ''));
+                }
+                return props;
             },
         };
         const evaluateExpressions = async (actionData) => {
@@ -22054,18 +22086,70 @@ class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
     }
     createLoadFunction(entityDef, relatedEntity, evaluateExpressions) {
         return async (context) => {
-            const fn = entityDef?.queries.byKey?.execute;
+            const conditions = relatedEntity.conditions ?? [];
+            if (conditions.length > 0) {
+                const evaluatedFilters = await Promise.all(conditions.map(async (c) => ({
+                    field: c.name,
+                    operator: c.operator,
+                    value: await evaluateExpressions(c.value),
+                })));
+                if (conditions.length === 1 && conditions[0].name === 'id') {
+                    const byKeyFn = entityDef?.queries?.byKey?.execute;
+                    const id = evaluatedFilters[0]?.value;
+                    const result = id ? await byKeyFn(id) : null;
+                    return { success: true, data: result ?? {} };
+                }
+                const listFn = entityDef?.queries?.list?.execute;
+                const filter = evaluatedFilters.length === 1
+                    ? evaluatedFilters[0]
+                    : { logic: 'and', filters: evaluatedFilters };
+                const page = await listFn({ skip: 0, take: 1, filter });
+                const item = page?.items?.[0];
+                const data = item ? { ...item } : {};
+                if (!item) {
+                    for (const evaluated of evaluatedFilters) {
+                        if (evaluated.field) {
+                            set(data, evaluated.field, evaluated.value);
+                        }
+                    }
+                }
+                return { success: true, data };
+            }
+            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, data: result };
+            const result = id ? await fn(id) : null;
+            return { success: true, data: result ?? {} };
         };
     }
     createExecuteFunction(entityDef, actions, evaluateExpressions, converterContext) {
         return async (e, context) => {
             try {
                 if (e.name === 'update-entity') {
+                    const recordId = context?.['id'];
+                    if (!recordId) {
+                        const createFn = entityDef?.commands?.create?.execute;
+                        const created = await createFn(context);
+                        if (created && typeof created === 'object' && 'success' in created) {
+                            const cmd = created;
+                            if (!cmd.success) {
+                                const errorText = commandMessageTextForError(cmd.message?.text) || 'Failed to create entity';
+                                return {
+                                    success: false,
+                                    message: cmd.message ?? { text: errorText },
+                                };
+                            }
+                            return {
+                                success: true,
+                                data: cmd.data ?? created,
+                            };
+                        }
+                        return {
+                            success: true,
+                            data: created,
+                        };
+                    }
                     const fn = entityDef?.commands?.update?.execute;
                     const result = await fn(context);
                     if (result && typeof result === 'object' && 'success' in result) {
@@ -22327,11 +22411,16 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                     const excludeForUpdate = commandName === 'Entity:Update' &&
                         relatedEntity.excludeProperties &&
                         relatedEntity.excludeProperties.length > 0;
+                    const excludeForView = commandName === 'Entity:View' &&
+                        relatedEntity.excludeProperties &&
+                        relatedEntity.excludeProperties.length > 0;
                     const mergedOptions = excludeForCreate
                         ? { ...evaluatedOptions, excludeProperties: createExcludes }
                         : excludeForUpdate
                             ? { ...evaluatedOptions, excludeProperties: relatedEntity.excludeProperties }
-                            : evaluatedOptions;
+                            : excludeForView
+                                ? { ...evaluatedOptions, excludeProperties: relatedEntity.excludeProperties }
+                                : evaluatedOptions;
                     if (context.commandService.exists(commandName)) {
                         // check options for evaluation
                         await context.commandService.execute(commandName, {
@@ -22350,6 +22439,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                             },
                             options: mergedOptions,
                             metadata: action.metadata,
+                            ...(excludeForView ? { excludeProperties: relatedEntity.excludeProperties } : {}),
                         });
                     }
                     else {
@@ -22880,6 +22970,7 @@ class AXPMainEntityContentBuilder {
         const tabListTabs = await this.buildTabLists(tabListEntities ?? [], rootContext, dependencies);
         // Build actions from single interface
         const actions = this.buildActions(entity, singleInterface);
+        let cachedRootContext = rootContext;
         //console.log({ rootContext, dependencies });
         return {
             id: entity?.name ?? '',
@@ -22916,14 +23007,15 @@ class AXPMainEntityContentBuilder {
             },
             load: async (params) => {
                 if (params?.forceRefresh) {
+                    cachedRootContext = await dependencies.reloadRootContext();
                     return {
                         success: true,
-                        data: await dependencies.reloadRootContext(),
+                        data: cachedRootContext,
                     };
                 }
                 return {
                     success: true,
-                    data: rootContext,
+                    data: cachedRootContext,
                 };
             },
             execute: async (e, context) => {
@@ -23260,6 +23352,7 @@ class AXPLayoutAdapterFactory {
         this.layoutAdapterBuilder = layoutAdapterBuilder;
         this.filterOperatorMiddleware = filterOperatorMiddleware;
         this.pageComponentConverter = inject(AXPPageComponentConverter);
+        this.contextEvalFactory = inject(AXPContextEvalFactory);
     }
     async createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies) {
         const entity = await entityResolver.resolve(moduleName, entityName);
@@ -23313,9 +23406,7 @@ class AXPLayoutAdapterFactory {
             if (hidden && typeof hidden === 'string') {
                 try {
                     const scope = {
-                        context: {
-                            eval: (path) => get(rootContext, path),
-                        },
+                        context: this.contextEvalFactory.createScope(rootContext),
                     };
                     const result = await dependencies.expressionEvaluator.evaluate({ hidden }, scope);
                     hidden = result.hidden;
@@ -23477,9 +23568,7 @@ class AXPLayoutAdapterFactory {
         }
         const scope = {
             ...rootContext,
-            context: {
-                eval: (path) => get(rootContext, path),
-            },
+            context: this.contextEvalFactory.createScope(rootContext),
         };
         const title = await dependencies.expressionEvaluator.evaluate(titleTemplate, scope);
         return title;
@@ -23494,27 +23583,44 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                 }]
         }], ctorParameters: () => [{ type: AXPRelatedEntityConverterFactory }, { type: AXPMainEntityContentBuilder }, { type: AXPLayoutAdapterBuilder }, { type: i4$2.AXPFilterOperatorMiddlewareService }] });
 
-const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver = inject(AXPEntityDefinitionRegistryService), expressionEvaluator = inject(AXPExpressionEvaluatorService), session = inject(AXPSessionService), formatService = inject(AXFormatService), workflowService = inject(AXPWorkflowService), commandService = inject(AXPCommandService), layoutAdapterFactory = inject(AXPLayoutAdapterFactory), router = inject(Router)) => {
-    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,
-        commandService,
-    };
-    try {
-        return await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
+//#region ---- Entity Details View Adapter Loader ----
+class AXPEntityDetailsViewAdapterLoader {
+    constructor() {
+        //#region ---- Services & Dependencies ----
+        this.entityResolver = inject(AXPEntityDefinitionRegistryService);
+        this.layoutAdapterFactory = inject(AXPLayoutAdapterFactory);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.session = inject(AXPSessionService);
+        this.formatService = inject(AXFormatService);
+        this.workflowService = inject(AXPWorkflowService);
+        this.commandService = inject(AXPCommandService);
     }
-    catch (error) {
-        if (error instanceof AXPNotFoundError) {
-            return axpRedirectToNotFound(router);
-        }
-        throw error;
+    //#endregion
+    /**
+     * Builds the details-view adapter for an entity record (definition, layout pages, root context).
+     */
+    async load(params) {
+        const { moduleName, entityName, id } = params;
+        const dependencies = {
+            entityResolver: this.entityResolver,
+            expressionEvaluator: this.expressionEvaluator,
+            session: this.session,
+            formatService: this.formatService,
+            workflowService: this.workflowService,
+            commandService: this.commandService,
+        };
+        return this.layoutAdapterFactory.createDetailsViewAdapter(this.entityResolver, moduleName, entityName, id, dependencies);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailsViewAdapterLoader, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailsViewAdapterLoader, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailsViewAdapterLoader, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+const AXP_ENTITY_DETAILS_VIEW_ADAPTER_LOADER_PROVIDER = {
+    provide: AXP_LAYOUT_DETAILS_VIEW_ADAPTER_LOADER,
+    useExisting: AXPEntityDetailsViewAdapterLoader,
 };
 
 class AXPEntityPreloadFilterGuard {
@@ -23577,9 +23683,7 @@ const eventDispatchMiddleware = {
             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 });
-                workflowEventService.dispatch(AXPRefreshEvent({
-                    entity: ctx.entityName,
-                }));
+                // List refresh is dispatched after create UI closes (Entity:Create command / create-entity workflow).
             }
             else if (ctx.op === 'update') {
                 await dispatcher.dispatchUpdated(ctx.entityName, {
@@ -24244,8 +24348,8 @@ const AXPCrudModifier = {
             if (!command?.create) {
                 command.create = {
                     execute: async (data) => {
-                        console.log('create', ctx.module.get() + '.' + ctx.name.get(), data);
                         const res = await dataService.insertOne(data);
+                        //await delay(2000);
                         return { id: res };
                     },
                 };
@@ -24265,7 +24369,9 @@ const AXPCrudModifier = {
                         if (id == null || id === '') {
                             throw new Error(`Update requires entity id (${entityKey})`);
                         }
-                        return await dataService.updateOne(id, patch);
+                        const updated = await dataService.updateOne(id, patch);
+                        //await delay(2000);
+                        return updated;
                     },
                 };
             }
@@ -24279,6 +24385,7 @@ const AXPCrudModifier = {
                 queries.byKey = {
                     execute: async (id) => {
                         const data = await dataService.getOne(id);
+                        //await delay(1000);
                         return data;
                     },
                     type: AXPEntityQueryType.Single,
@@ -24288,7 +24395,7 @@ const AXPCrudModifier = {
                 queries.list = {
                     execute: async (e) => {
                         const res = await dataService.query(e);
-                        // console.log('query', res, ctx.module.get() + '.' + ctx.name.get(), e);
+                        //console.log('query', res, ctx.module.get() + '.' + ctx.name.get(), e);
                         return res;
                     },
                     type: AXPEntityQueryType.List,
@@ -24321,6 +24428,68 @@ class AXPEntityCommandSearchDefinitionProvider {
 function moduleNameToI18nScope(moduleName) {
     return moduleName.replace(/([A-Z])/g, '-$1').toLowerCase().replace(/^-/, '');
 }
+//#region ----   Entity search definition builder   ----
+function buildEntitySearchDefinition(entity, manifestRegistry) {
+    const manifest = manifestRegistry.get(entity.module);
+    const i18nScope = manifest?.i18n ?? moduleNameToI18nScope(entity.module);
+    const searchTitleTemplate = entity.formats.searchResult?.title;
+    const titleContext = buildEntitySearchTitleContext(entity, searchTitleTemplate);
+    return {
+        name: `Module.${entity.module}.${entity.name}`,
+        title: `@${i18nScope}:module.title`,
+        group: `Module.${entity.module}`,
+        icon: entity.icon ?? 'fa-solid fa-objects-column',
+        order: 4,
+        format: {
+            title: searchTitleTemplate,
+            description: entity.formats.searchResult?.description ?? `${entity.module} / ${entity.title}`,
+            id: '{{data.id}}',
+            titleFallbackTemplates: titleContext.fallbackTemplates,
+            titleFallbackFields: titleContext.fallbackFields,
+        },
+        actions: [
+            {
+                name: 'open-entity',
+                type: AXPSystemActionType.View,
+                priority: 'primary',
+            },
+        ],
+    };
+}
+//#endregion
+//#region ----   Lazy resolver   ----
+class AXPEntitySearchDefinitionLazyResolver {
+    constructor() {
+        this.entityResolver = inject(AXPEntityResolver);
+        this.manifestRegistry = inject(AXPModuleManifestRegistry);
+        this.resolved = new Map();
+    }
+    async resolve(definitionName) {
+        const cached = this.resolved.get(definitionName);
+        if (cached) {
+            return cached;
+        }
+        const match = definitionName.match(/^Module\.([^.]+)\.(.+)$/);
+        if (!match) {
+            return null;
+        }
+        const [, moduleName, entityName] = match;
+        await this.manifestRegistry.initialize();
+        const entity = await this.entityResolver.get(moduleName, entityName);
+        if (!entity) {
+            return null;
+        }
+        const definition = buildEntitySearchDefinition(entity, this.manifestRegistry);
+        this.resolved.set(definitionName, definition);
+        return definition;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntitySearchDefinitionLazyResolver, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntitySearchDefinitionLazyResolver }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntitySearchDefinitionLazyResolver, decorators: [{
+            type: Injectable
+        }] });
+
 class AXPEntitySearchDefinitionProvider {
     constructor() {
         this.entityRegister = inject(AXPEntityDefinitionRegistryService);
@@ -24328,28 +24497,13 @@ class AXPEntitySearchDefinitionProvider {
     }
     async provide(context) {
         await this.manifestRegistry.initialize();
-        this.entityRegister.getAll().forEach((entity) => {
-            const manifest = this.manifestRegistry.get(entity.module);
-            const i18nScope = manifest?.i18n ?? moduleNameToI18nScope(entity.module);
-            const searchTitleTemplate = entity.formats.searchResult?.title;
-            const titleContext = buildEntitySearchTitleContext(entity, searchTitleTemplate);
-            context.addDefinition(`Module.${entity.module}.${entity.name}`, `@${i18nScope}:module.title`, `Module.${entity.module}`, entity.icon ?? 'fa-solid fa-objects-column', 4, {
-                actions: [
-                    {
-                        name: 'open-entity',
-                        type: 'view',
-                        priority: 'primary',
-                    },
-                ],
-                format: {
-                    title: searchTitleTemplate,
-                    description: (entity.formats.searchResult?.description) ?? `${entity.module} / ${entity.title}`,
-                    id: '{{data.id}}',
-                    titleFallbackTemplates: titleContext.fallbackTemplates,
-                    titleFallbackFields: titleContext.fallbackFields,
-                },
+        for (const entity of this.entityRegister.getAll()) {
+            const definition = buildEntitySearchDefinition(entity, this.manifestRegistry);
+            context.addDefinition(definition.name, definition.title, definition.group, definition.icon, definition.order, {
+                actions: definition.actions,
+                format: definition.format,
             });
-        });
+        }
     }
 }
 
@@ -24455,9 +24609,9 @@ class AXPMiddlewareEntityStorageService extends AXPEntityStorageService {
             ...init,
         };
     }
-    async initial(entityName, collection, options) {
+    async initial(entityName, collection) {
         const ctx = this.createCtx('initial', entityName, { data: collection });
-        return this.run(ctx, () => this.backend.initial(ctx.entityName, ctx.data, options));
+        return this.run(ctx, () => this.backend.initial(ctx.entityName, ctx.data));
     }
     async getOne(entityName, id) {
         const key = getDedupKey('getOne', entityName, { id });
@@ -24641,6 +24795,7 @@ class AXPEntityCreatePopupAction extends AXPWorkflowAction {
         this.factory = inject(AXPEntityCreateViewModelFactory);
         this.config = inject(AXP_ENTITY_CONFIG_TOKEN);
         this.translateService = inject(AXTranslationService);
+        this.settingsService = inject(AXPSettingsService);
     }
     async execute(context) {
         const [module, entity] = context.getVariable('entity').split('.');
@@ -24672,8 +24827,22 @@ class AXPEntityCreatePopupAction extends AXPWorkflowAction {
             const prevData = context.getVariable('data');
             const prevMeta = context.getVariable('meta');
             context.setVariable('data', { ...prevData, ...result.data.item });
-            if (entityRef.parentKey && result.data.item[entityRef.parentKey]) {
-                context.setVariable('meta', { ...prevMeta, refreshTargetId: result.data.item[entityRef.parentKey] });
+            const createdItem = result.data.item;
+            const highlightRowId = createdItem?.id ?? createdItem?._id;
+            const { shouldRedirect, shouldHighlight } = await resolveEntityCreateListBehavior(this.settingsService, {
+                redirect: process?.redirect,
+            });
+            context.setVariable('shouldRedirect', shouldRedirect);
+            const meta = {
+                ...prevMeta,
+                resetPagination: true,
+                ...(shouldHighlight && highlightRowId != null ? { highlightRowId } : {}),
+                ...(entityRef.parentKey && createdItem[entityRef.parentKey]
+                    ? { refreshTargetId: createdItem[entityRef.parentKey] }
+                    : {}),
+            };
+            if (Object.keys(meta).length > 0) {
+                context.setVariable('meta', meta);
             }
         }
     }
@@ -24724,7 +24893,7 @@ const AXPCreateEntityWorkflow = {
             action: 'AXPEntityCreateSubmittedAction',
             nextSteps: [
                 {
-                    conditions: [{ type: 'SINGLE', expression: 'context.getVariable("options")?.process?.redirect != false' }],
+                    conditions: [{ type: 'SINGLE', expression: 'context.getVariable("shouldRedirect") == true' }],
                     nextStepId: 'show-entity',
                 },
             ],
@@ -24741,6 +24910,9 @@ class AXPQuickEntityModifyPopupAction extends AXPWorkflowAction {
         this.popupService = inject(AXPopupService);
         this.platform = inject(AXPlatform);
         this.translateService = inject(AXTranslationService);
+        this.formatService = inject(AXFormatService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.contextEvalFactory = inject(AXPContextEvalFactory);
         this.entityRegistery = inject(AXPEntityDefinitionRegistryService);
         this.config = inject(AXP_ENTITY_CONFIG_TOKEN);
         this.factory = inject(AXPEntityMasterUpdateViewModelFactory);
@@ -24750,10 +24922,8 @@ class AXPQuickEntityModifyPopupAction extends AXPWorkflowAction {
         const data = context.getVariable('data');
         const entityRef = await this.entityRegistery.resolve(moduleName, entityName);
         const { parentKey } = entityRef;
-        console.log(data);
         const { id } = data;
-        const { interfaces, title } = entityRef;
-        const properties = interfaces?.master?.update?.properties?.map((p) => p.name) || [];
+        const properties = entityRef.interfaces?.master?.update?.properties?.map((p) => p.name) || [];
         const vm = await this.factory.create(moduleName, entityName, id, properties);
         const options = context.getVariable('options');
         const decoration = options?.['decoration'];
@@ -24763,12 +24933,11 @@ class AXPQuickEntityModifyPopupAction extends AXPWorkflowAction {
         if (parentKey) {
             context.setVariable('parentKey', parentKey);
         }
-        console.log(`${this.translateService.translateSync('entity.modify')}`);
         const com = await this.config.viewers.master.modify();
         const popup = await this.popupService.open(com, {
             title: headerTitle
                 ? headerTitle
-                : `${this.translateService.translateSync('@general:actions.modify.title')} ${this.translateService.translateSync(entityRef.formats.individual)}`,
+                : await resolveEntityModifyPopupTitle(entityRef, vm.context(), this.translateService, this.formatService, this.expressionEvaluator, this.contextEvalFactory),
             size: this.platform.is('Mobile') || this.platform.is('SM') ? 'full' : size ? size : 'md',
             data: {
                 vm,
@@ -25031,6 +25200,7 @@ function routesFacory() {
                 return config.viewers.root();
             },
             canActivate: [...AXP_PROTECTED_ROUTE_GUARDS],
+            data: { rootLayout: true },
             children: [
                 {
                     path: ':module',
@@ -25064,18 +25234,11 @@ function routesFacory() {
                         // },
                         {
                             path: 'e/:entity/:id/view',
-                            resolve: { adapter: AXPLayoutDetailsViewRouteResolver },
                             loadComponent: () => {
                                 return config.viewers.master.details();
                             },
                             canDeactivate: [axpDetailsViewCanDeactivateGuard],
-                            runGuardsAndResolvers: (from, to) => {
-                                const entityChanged = from.params['module'] !== to.params['module'] || from.params['entity'] !== to.params['entity'];
-                                const idChanged = from.params['id'] !== to.params['id'];
-                                const refreshChanged = from.queryParams['_ts'] !== to.queryParams['_ts'];
-                                return entityChanged || idChanged || refreshChanged;
-                            },
-                            data: { reuse: false },
+                            data: { reuse: 'queryParamsChange' },
                         },
                         {
                             path: 'e/:entity/:id',
@@ -25108,6 +25271,16 @@ class AXPEntityModule {
             AXPAttachmentsPluginModule, i1$3.AXPWorkflowModule, AXPWidgetCoreModule,
             LayoutBuilderModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityModule, providers: [
+            AXP_ENTITY_DETAILS_VIEW_ADAPTER_LOADER_PROVIDER,
+            {
+                provide: AXP_REPEATER_ENTITY_BY_KEY_LOOKUP,
+                useFactory: () => {
+                    const entityService = inject(AXPEntityService);
+                    return {
+                        byKey: (entityKey, id) => entityService.withEntity(entityKey).data().byKey(id),
+                    };
+                },
+            },
             { provide: AXP_WIDGET_DEFINITION_PROVIDER, useClass: AXPEntityWidgetsProvider, multi: true },
             {
                 provide: ROUTES,
@@ -25124,6 +25297,10 @@ class AXPEntityModule {
                 useClass: AXPEntityCommandSearchDefinitionProvider,
                 multi: true,
             },
+            {
+                provide: AXP_SEARCH_DEFINITION_LAZY_RESOLVER,
+                useClass: AXPEntitySearchDefinitionLazyResolver,
+            },
             // Bind the middleware wrapper as the public storage service
             { provide: AXPEntityStorageService, useClass: AXPMiddlewareEntityStorageService },
             {
@@ -25295,6 +25472,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                     exports: [],
                     declarations: [],
                     providers: [
+                        AXP_ENTITY_DETAILS_VIEW_ADAPTER_LOADER_PROVIDER,
+                        {
+                            provide: AXP_REPEATER_ENTITY_BY_KEY_LOOKUP,
+                            useFactory: () => {
+                                const entityService = inject(AXPEntityService);
+                                return {
+                                    byKey: (entityKey, id) => entityService.withEntity(entityKey).data().byKey(id),
+                                };
+                            },
+                        },
                         { provide: AXP_WIDGET_DEFINITION_PROVIDER, useClass: AXPEntityWidgetsProvider, multi: true },
                         {
                             provide: ROUTES,
@@ -25311,6 +25498,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                             useClass: AXPEntityCommandSearchDefinitionProvider,
                             multi: true,
                         },
+                        {
+                            provide: AXP_SEARCH_DEFINITION_LAZY_RESOLVER,
+                            useClass: AXPEntitySearchDefinitionLazyResolver,
+                        },
                         // Bind the middleware wrapper as the public storage service
                         { provide: AXPEntityStorageService, useClass: AXPMiddlewareEntityStorageService },
                         {
@@ -25618,5 +25809,5 @@ var getEntityDetails_query = /*#__PURE__*/Object.freeze({
  * Generated bundle index. Do not edit.
  */
 
-export { ATTACHMENTS_PAGE_COMPONENT_KEY, AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEditFileUploaderCommand, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorRowActionsService, AXPEntityDataSelectorService, AXPEntityDataSourceKeys, AXPEntityDefinitionProviderWidget, AXPEntityDefinitionProviderWidgetEditComponent, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListPersistenceModeDefault, AXPEntityListTableService, AXPEntityListToolbarService, AXPEntityListViewCardFieldViewModel, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListCardSelectActionName, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityPreloadFiltersContainerComponent, AXPEntityPreloadFiltersViewModel, AXPEntityPreloadFiltersViewModelResolver, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPFileListComponent, AXPFileUploaderLoadFilesQuery, AXPFileUploaderSaveFilesCommand, AXPFileUploaderWidget, AXPFileUploaderWidgetColumnComponent, AXPFileUploaderWidgetEditComponent, AXPFileUploaderWidgetService, AXPFileUploaderWidgetViewComponent, AXPGetEntityDetailsQuery, AXPLayoutOrderingConfigService, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPMultiSourceDefinitionProviderContext, AXPMultiSourceDefinitionProviderService, AXPMultiSourceFederatedSearchService, AXPMultiSourceSelectorComponent, AXPMultiSourceSelectorService, AXPMultiSourceSelectorWidget, AXPMultiSourceSelectorWidgetColumnComponent, AXPMultiSourceSelectorWidgetEditComponent, AXPMultiSourceSelectorWidgetViewComponent, AXPMultiSourceType, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPRelatedColumnEnrichmentService, AXPRelatedColumnMetadataResolver, AXPSelectorStructureWidget, AXPSelectorStructureWidgetColumnComponent, AXPSelectorStructureWidgetEditComponent, AXPSelectorStructureWidgetViewComponent, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, AXP_CATEGORY_TREE_ROOT_TITLE_I18N_KEY, 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, AXP_MULTI_SOURCE_DEFINITION_PROVIDER, AXP_RECORD_WORKFLOW_INFO_CORRELATION_ID_FIELD, AXP_RECORD_WORKFLOW_INFO_DEFINITION_ID_FIELD, AXP_RECORD_WORKFLOW_INFO_INSTANCE_ID_FIELD, DEFAULT_COLUMN_ORDER, DEFAULT_PAIR_SPAN_RULES, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, ENTITY_LIST_ROUTE_CONTEXT_SESSION_KEY, EntityBuilder, EntityDataAccessor, actionExists, applyDataSourcePagingWithoutLoad, attachmentFieldCount, attachmentsPlugin, attachmentsSemanticallyEqual, axpCreateEntityAiToolInputDefaults, axpCreateEntityCommandDefinition, buildAXPRecordWorkflowInfo, canPersistEntityListState, cloneLayoutArrays, collectEntityQuickSearchFieldPaths, collectNestedCreateHiddenProperties, collectNestedFieldPathsFromEntityColumns, collectQuickSearchPathsFromSingleEntityDefinition, columnOrderingMiddleware, columnOrderingMiddlewareProvider, columnWidthMiddleware, columnWidthMiddlewareProvider, commandMessageTextForError, committedAttachments, computeEntityAggregates, createColumnOrderingMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, defaultCardLayoutMiddleware, defaultCardLayoutMiddlewareProvider, defaultMultiLanguageMiddleware, defaultMultiLanguageMiddlewareProvider, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCreateActionsDeferredParent, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, filterSortEntityRows, findEntityListRowDataInTree, fingerprintAttachmentItem, fingerprintAttachments, formatLookupItemDisplay, getDataSourcePageIndex, getEntityListRowId, getMasterInterfacePropertySortKey, getRecordWorkflowCorrelationId, getRecordWorkflowInstanceId, hasFileUploaderTitleOrDescriptionFields, isAXPMiddlewareAbortError, isAttachmentListEntry, isCategoryEntity, isCategoryFilter, isFileListItem, isFileUploaderEditDialogAuto, isLegacyEntityDataSelectorOptions, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider, mapEntityStorageErrorToCommandResult, mapLegacyEntityDataSelectorOptions, mergeForeignKeyFieldIntoCreateActions, normalizeEntityDataSelectorOptions, normalizeEntityFieldToFileList, normalizeEntityListPersistenceMode, normalizeListPaging, persistedAttachments, provideEntity, resolveEntityPluginDetailPageOrder, resolveFileUploaderEditDialog, resolveFileUploaderEntityScope, resolveLookupDisplayField, resolveLookupDisplayTemplate, restoreEntityListExpandedRows, runEntityQuery, searchResultDescriptionMiddleware, searchResultDescriptionMiddlewareProvider, shouldLoadEntityListStateFromStorage, shouldResetEntityListStateOnRouteEntry };
+export { ATTACHMENTS_PAGE_COMPONENT_KEY, AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEditFileUploaderCommand, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorRowActionsService, AXPEntityDataSelectorService, AXPEntityDefinitionProviderWidget, AXPEntityDefinitionProviderWidgetEditComponent, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityFormBuilderService, AXPEntityListPersistenceModeDefault, AXPEntityListTableService, AXPEntityListToolbarService, AXPEntityListViewCardFieldViewModel, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListCardSelectActionName, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityPreloadFiltersContainerComponent, AXPEntityPreloadFiltersViewModel, AXPEntityPreloadFiltersViewModelResolver, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPFileListComponent, AXPFileUploaderLoadFilesQuery, AXPFileUploaderSaveFilesCommand, AXPFileUploaderWidget, AXPFileUploaderWidgetColumnComponent, AXPFileUploaderWidgetEditComponent, AXPFileUploaderWidgetService, AXPFileUploaderWidgetViewComponent, AXPGetEntityDetailsQuery, AXPLayoutOrderingConfigService, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPMultiSourceDefinitionProviderContext, AXPMultiSourceDefinitionProviderService, AXPMultiSourceFederatedSearchService, AXPMultiSourceSelectorComponent, AXPMultiSourceSelectorService, AXPMultiSourceSelectorWidget, AXPMultiSourceSelectorWidgetColumnComponent, AXPMultiSourceSelectorWidgetEditComponent, AXPMultiSourceSelectorWidgetViewComponent, AXPMultiSourceType, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPRelatedColumnEnrichmentService, AXPRelatedColumnMetadataResolver, AXPSelectorStructureWidget, AXPSelectorStructureWidgetColumnComponent, AXPSelectorStructureWidgetEditComponent, AXPSelectorStructureWidgetViewComponent, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, AXP_CATEGORY_TREE_ROOT_TITLE_I18N_KEY, 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, AXP_MULTI_SOURCE_DEFINITION_PROVIDER, DEFAULT_COLUMN_ORDER, DEFAULT_PAIR_SPAN_RULES, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, ENTITY_LIST_ROUTE_CONTEXT_SESSION_KEY, EntityBuilder, EntityDataAccessor, actionExists, applyDataSourcePagingWithoutLoad, attachmentFieldCount, attachmentsPlugin, attachmentsSemanticallyEqual, axpCreateEntityAiToolInputDefaults, axpCreateEntityCommandDefinition, canPersistEntityListState, cloneLayoutArrays, columnOrderingMiddleware, columnOrderingMiddlewareProvider, columnWidthMiddleware, columnWidthMiddlewareProvider, commandMessageTextForError, committedAttachments, computeEntityAggregates, createColumnOrderingMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, defaultCardLayoutMiddleware, defaultCardLayoutMiddlewareProvider, defaultMultiLanguageMiddleware, defaultMultiLanguageMiddlewareProvider, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, eventDispatchMiddleware, filterSortEntityRows, findEntityListRowDataInTree, fingerprintAttachmentItem, fingerprintAttachments, formatLookupItemDisplay, formatLookupItemDisplayAsync, getDataSourcePageIndex, getEntityListRowId, getMasterInterfacePropertySortKey, hasFileUploaderTitleOrDescriptionFields, isAXPMiddlewareAbortError, isAttachmentListEntry, isCategoryEntity, isCategoryFilter, isFileListItem, isFileUploaderEditDialogAuto, isLegacyEntityDataSelectorOptions, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider, mapEntityStorageErrorToCommandResult, mapLegacyEntityDataSelectorOptions, normalizeEntityDataSelectorOptions, normalizeEntityFieldToFileList, normalizeEntityListPersistenceMode, normalizeListPaging, persistedAttachments, provideEntity, resolveEntityPluginDetailPageOrder, resolveFileUploaderEditDialog, resolveFileUploaderEntityScope, resolveLookupDisplayField, resolveLookupDisplayTemplate, restoreEntityListExpandedRows, runEntityQuery, searchResultDescriptionMiddleware, searchResultDescriptionMiddlewareProvider, shouldLoadEntityListStateFromStorage, shouldResetEntityListStateOnRouteEntry };
 //# sourceMappingURL=acorex-platform-layout-entity.mjs.map