@acorex/platform 21.0.0-next.39 → 21.0.0-next.41

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

@@ -2,24 +2,25 @@ import { AXToastService } from '@acorex/components/toast';
 import * as i6 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule, resolveMultiLanguageString } from '@acorex/core/translation';
 import * as i4$4 from '@acorex/platform/common';
-import { AXPSettingsService, AXPCommonSettings, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, AXPCleanNestedFilters, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
+import { AXPEntityCommandScope, AXPSettingsService, AXPCommonSettings, AXPFilterOperatorMiddlewareService, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, AXPCleanNestedFilters, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, input, viewChild, signal, ElementRef, ChangeDetectionStrategy, Component, ApplicationRef, EnvironmentInjector, createComponent, computed, ChangeDetectorRef, effect, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, NgModule, makeEnvironmentProviders } from '@angular/core';
+import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, input, viewChild, signal, computed, ElementRef, ChangeDetectionStrategy, Component, ApplicationRef, EnvironmentInjector, createComponent, ChangeDetectorRef, effect, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, NgModule, makeEnvironmentProviders } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
 import { AXPLayoutBuilderService, LayoutBuilderModule } from '@acorex/platform/layout/builder';
-import { AXPDeviceService, AXPBroadcastEventService, applyFilterArray, applySortArray, resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPPlatformScope, AXHighlightService, extractValue, setSmart, getChangedPaths, AXPColumnWidthService, AXPModuleManifestRegistry, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPModuleManifestsDataSourceDefinition, AXPSystemActionType } from '@acorex/platform/core';
-import { merge, get, castArray, cloneDeep, set, orderBy, omit, isNil, isEmpty, isEqual } from 'lodash-es';
+import * as i3 from '@acorex/platform/layout/widget-core';
+import { AXPWidgetsCatalog, AXPWidgetCoreModule, AXPPageStatus, AXPWidgetRegistryService, AXPColumnWidgetComponent, AXPValueWidgetComponent, AXPWidgetGroupEnum, createBooleanProperty, AXPWidgetRendererDirective, createSelectProperty, createStringProperty, 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, 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 } from 'lodash-es';
+import { transform, isEqual } from 'lodash';
 import { AXPSessionService, AXPAuthGuard, AXPPermissionDefinitionsDataSourceDefinition } from '@acorex/platform/auth';
 import { Router, ActivatedRoute, RouterModule, ROUTES } from '@angular/router';
-import { defineCommand, AXPCommandService, AXPQueryService, AXPQueryExecutor, provideCommandSetups, provideQuerySetups, AXPCommandRegistry, AXPQueryRegistry } from '@acorex/platform/runtime';
+import { defineCommand, AXP_COMMAND_DEFINITION_CATEGORY_ENTITY, AXPCommandService, AXPQueryService, AXPQueryExecutor, provideCommandSetups, provideQuerySetups, AXPCommandRegistry, AXPQueryRegistry } from '@acorex/platform/runtime';
 import * as i1 from '@acorex/components/button';
 import { AXButtonModule } from '@acorex/components/button';
 import * as i4 from '@acorex/components/loading';
 import { AXLoadingModule } from '@acorex/components/loading';
 import * as i2 from '@acorex/components/popover';
 import { AXPopoverModule } from '@acorex/components/popover';
-import * as i3 from '@acorex/platform/layout/widget-core';
-import { AXPWidgetsCatalog, AXPWidgetCoreModule, AXPPageStatus, AXPWidgetRegistryService, AXPColumnWidgetComponent, AXPValueWidgetComponent, AXPWidgetGroupEnum, createBooleanProperty, AXPWidgetRendererDirective, createSelectProperty, createStringProperty, AXP_WIDGETS_EDITOR_CATEGORY, AXP_WIDGET_DEFINITION_PROVIDER } from '@acorex/platform/layout/widget-core';
 import * as i5 from '@angular/common';
 import { CommonModule, AsyncPipe } from '@angular/common';
 import { AXPThemeLayoutBlockComponent, AXPPreloadFiltersComponent, AXPStateMessageComponent, AXPColumnItemListComponent, AXPDataSelectorService, AXPPageComponentRegistryService } from '@acorex/platform/layout/components';
@@ -69,7 +70,6 @@ import * as i5$3 from '@acorex/components/label';
 import { AXLabelModule } from '@acorex/components/label';
 import * as i7 from '@acorex/components/text-box';
 import { AXTextBoxModule } from '@acorex/components/text-box';
-import { transform, isEqual as isEqual$1 } from 'lodash';
 
 function ensureListActions(ctx) {
     ctx.interfaces.update((i) => {
@@ -119,6 +119,28 @@ const AXP_ENTITY_ACTION_PLUGIN = new InjectionToken('AXP_ENTITY_ACTION_PLUGIN');
 function createModifierContext(entity) {
     const ctx = {
         entity,
+        plugins: {
+            list: () => entity.plugins ?? [],
+            add: (...items) => {
+                entity.plugins ??= [];
+                entity.plugins.push(...items);
+                return ctx;
+            },
+            remove: (predicate) => {
+                if (entity.plugins)
+                    entity.plugins = entity.plugins.filter((p) => !predicate(p));
+                return ctx;
+            },
+            find: (name) => ({
+                get: () => entity.plugins?.find((p) => p.name === name),
+                update: (updater) => {
+                    const index = entity.plugins?.findIndex((p) => p.name === name);
+                    if (index !== undefined && index !== -1 && entity.plugins)
+                        entity.plugins[index] = updater(entity.plugins[index]);
+                    return ctx;
+                },
+            }),
+        },
         title: {
             get: () => entity.title,
             set: (newTitle) => {
@@ -781,6 +803,405 @@ 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,
+    };
+}
+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.
+ * - For arrays of primitives or objects without id, uses deep equality.
+ * - For scalars/objects, reports oldValue/newValue when changed.
+ */
+function detectEntityChanges(oldObj, newObj) {
+    return transform(newObj, (result, value, key) => {
+        if (!isEqual(value, oldObj[key])) {
+            const oldValue = oldObj[key];
+            if (Array.isArray(value) || Array.isArray(oldValue)) {
+                const oldArray = Array.isArray(oldValue) ? oldValue : [];
+                const newArray = Array.isArray(value) ? value : [];
+                const hasId = newArray.length > 0 && typeof newArray[0] === 'object' && newArray[0] !== null && 'id' in newArray[0];
+                if (hasId) {
+                    const added = newArray.filter((item) => !oldArray.some((oldItem) => oldItem.id === item.id));
+                    const removed = oldArray.filter((item) => !newArray.some((newItem) => newItem.id === item.id));
+                    result[key] = { oldValue, newValue: value, added, removed };
+                }
+                else {
+                    const added = newArray.filter((item) => !oldArray.some((oldItem) => isEqual(item, oldItem)));
+                    const removed = oldArray.filter((item) => !newArray.some((newItem) => isEqual(item, newItem)));
+                    result[key] = { oldValue, newValue: value, added, removed };
+                }
+            }
+            else {
+                result[key] = { oldValue, newValue: value };
+            }
+        }
+    }, {});
+}
+//#endregion
+
+/**
+ * Maps entity property `description` (or any i18n key / multi-language payload) to `form-field`
+ * widget options. Returns `undefined` when there is nothing to show.
+ */
+function hintFormFieldOptionsFromDescription(description) {
+    if (description == null) {
+        return undefined;
+    }
+    if (typeof description === 'string' && description.trim() === '') {
+        return undefined;
+    }
+    return { hint: description, hintDisplayMode: 'icon' };
+}
+//#endregion
+
+//#endregion
+//#region ---- Helpers ----
+function isRelatedEntityStringColumns(columns) {
+    return columns.length === 0 || typeof columns[0] === 'string';
+}
+/**
+ * Property names from `AXPRelatedEntity.columns` (no expression evaluation).
+ * Empty array means caller can treat as “no name filter” (show all allowed by entity).
+ */
+function getRelatedEntityColumnNames(columns) {
+    if (!columns?.length) {
+        return [];
+    }
+    if (isRelatedEntityStringColumns(columns)) {
+        return [...columns];
+    }
+    return columns.map((c) => c.name);
+}
+function isTruthyVisible(value) {
+    if (value === true) {
+        return true;
+    }
+    if (value === false || value === null || value === undefined) {
+        return false;
+    }
+    if (typeof value === 'string') {
+        const t = value.trim().toLowerCase();
+        return t !== '' && t !== 'false' && t !== '0';
+    }
+    if (typeof value === 'number') {
+        return value !== 0 && !Number.isNaN(value);
+    }
+    return Boolean(value);
+}
+//#endregion
+//#region ---- Public API ----
+/**
+ * Resolves `AXPRelatedEntity.columns` for `entity-list`:
+ * - `string[]` → `includeColumns` only (legacy).
+ * - `AXPEntityTableColumn[]` → evaluates `options.visible` when it is a string (parent detail context),
+ *   drops hidden / invisible columns, and returns `relatedTableColumns` + matching `includeColumns`.
+ */
+async function resolveRelatedEntityColumns(columns, expressionEvaluator, scope) {
+    if (!columns?.length) {
+        return {};
+    }
+    if (isRelatedEntityStringColumns(columns)) {
+        return { includeColumns: getRelatedEntityColumnNames(columns) };
+    }
+    const relatedTableColumns = [];
+    for (const raw of columns) {
+        const col = cloneDeep(raw);
+        if (col.hidden === true) {
+            continue;
+        }
+        let visible = col.options?.visible;
+        if (visible === undefined) {
+            visible = true;
+        }
+        else if (typeof visible === 'string') {
+            const evaluated = await expressionEvaluator.evaluate(visible, scope);
+            visible = isTruthyVisible(evaluated);
+        }
+        if (visible === false) {
+            continue;
+        }
+        col.options = { ...col.options, visible: true };
+        relatedTableColumns.push(col);
+    }
+    return {
+        relatedTableColumns,
+        includeColumns: relatedTableColumns.map((c) => c.name),
+    };
+}
+//#endregion
+
+/** Registered widget name for entity create/update step wizard (dialog footer uses `widget:${name}.next`). */
+const ENTITY_FORM_STEP_WIZARD_NAME = 'entityFormStepWizard';
+/** Footer command: validate, persist main entity, merge context, advance wizard. */
+const ENTITY_FORM_ACTION_FIRST_STEP_CONTINUE = 'entity-form-first-step-continue';
+/** Footer command: close dialog (data already saved per step). */
+const ENTITY_FORM_ACTION_DONE = 'entity-form-done';
 //#endregion
 class AXPEntityFormBuilderService {
     constructor() {
@@ -788,11 +1209,12 @@ class AXPEntityFormBuilderService {
         this.entityRegistry = inject(AXPEntityDefinitionRegistryService);
         this.layoutBuilder = inject(AXPLayoutBuilderService);
         this.deviceService = inject(AXPDeviceService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
     }
     //#endregion
     //#region ----   Public API   ----
     entity(fullName) {
-        return new InterfaceSelector(this.entityRegistry, this.layoutBuilder, this.deviceService, fullName, this);
+        return new InterfaceSelector(this.entityRegistry, this.layoutBuilder, this.deviceService, this.expressionEvaluator, fullName, this);
     }
     /**
      * Fetches a record by ID for the specified entity.
@@ -826,15 +1248,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
         }] });
 //#region ----   Builders   ----
 class InterfaceSelector {
-    constructor(entityRegistry, layoutBuilder, deviceService, fullName, formBuilderService) {
+    constructor(entityRegistry, layoutBuilder, deviceService, expressionEvaluator, fullName, formBuilderService) {
         this.entityRegistry = entityRegistry;
         this.layoutBuilder = layoutBuilder;
         this.deviceService = deviceService;
+        this.expressionEvaluator = expressionEvaluator;
         this.fullName = fullName;
         this.formBuilderService = formBuilderService;
     }
     create(initialData) {
-        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'create', undefined, this.formBuilderService);
+        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.expressionEvaluator, this.fullName, 'create', undefined, this.formBuilderService);
         if (initialData) {
             filter.context(initialData);
         }
@@ -850,7 +1273,7 @@ class InterfaceSelector {
             initialData = data;
             recordId = data['id'] || data['_id'];
         }
-        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'update', recordId, this.formBuilderService);
+        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.expressionEvaluator, this.fullName, 'update', recordId, this.formBuilderService);
         if (Object.keys(initialData).length > 0) {
             filter.context(initialData);
         }
@@ -866,7 +1289,7 @@ class InterfaceSelector {
             initialData = data;
             recordId = data['id'] || data['_id'];
         }
-        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.fullName, 'single', recordId, this.formBuilderService);
+        const filter = new PropertyFilter(this.entityRegistry, this.layoutBuilder, this.deviceService, this.expressionEvaluator, this.fullName, 'single', recordId, this.formBuilderService);
         if (Object.keys(initialData).length > 0) {
             filter.context(initialData);
         }
@@ -874,10 +1297,11 @@ class InterfaceSelector {
     }
 }
 class PropertyFilter {
-    constructor(entityRegistry, layoutBuilder, deviceService, fullName, kind, recordId, formBuilderService) {
+    constructor(entityRegistry, layoutBuilder, deviceService, expressionEvaluator, fullName, kind, recordId, formBuilderService) {
         this.entityRegistry = entityRegistry;
         this.layoutBuilder = layoutBuilder;
         this.deviceService = deviceService;
+        this.expressionEvaluator = expressionEvaluator;
         this.fullName = fullName;
         this.kind = kind;
         this.formBuilderService = formBuilderService;
@@ -934,11 +1358,10 @@ class PropertyFilter {
         return this;
     }
     async build() {
-        const dialog = await this.buildDialog();
+        const dialog = await this.buildDialog({});
         return dialog.build();
     }
     async show() {
-        const dialog = await this.buildDialog();
         // Context: always load by key when we have a record id (authoritative full row), then merge any
         // caller/list row context. Skipping fetch when initialContext was non-empty left dialogs without
         // fields not present on the passed row (e.g. Entity:View single() with partial list payload).
@@ -963,14 +1386,17 @@ class PropertyFilter {
             }
         }
         const effectiveContext = merge({}, this.initialContext, baseContext);
+        const dialog = await this.buildDialog(effectiveContext);
         dialog.setContext(effectiveContext);
         return await dialog.show();
     }
     /**
      * Builds the dialog node structure without showing it.
      * This method is shared by both build() and show() methods.
+     *
+     * @param modelForRelatedEval Merged root model used to evaluate related list filters (show() passes full row).
      */
-    async buildDialog() {
+    async buildDialog(modelForRelatedEval) {
         const { moduleName, entityName } = parseEntityFullName(this.fullName);
         const entity = await this.entityRegistry.resolve(moduleName, entityName);
         // Select the appropriate interface based on kind
@@ -988,7 +1414,9 @@ class PropertyFilter {
         // Collect all groups for title lookup (main + merged)
         const allGroups = [...(entity.groups ?? [])];
         // Process merge-detail related entities
-        const mergeDetailEntities = (entity.relatedEntities ?? []).filter((re) => !re.hidden && re.layout?.type === 'merge-detail');
+        const mergeDetailEntities = (entity.relatedEntities ?? []).filter((re) => !re.hidden &&
+            re.layout?.type === 'merge-detail' &&
+            isRelatedEntityIncludedOnMasterForm(re, this.kind, 'merge-detail'));
         // Build merged properties map by section
         const mergedPropsBySection = new Map();
         // Initialize with main entity properties
@@ -1161,104 +1589,271 @@ class PropertyFilter {
             return sectionProps.length > 0 || extraFields.length > 0;
         });
         const sectionScaleFactors = normalizeLayoutFillRowGaps(renderedSections, (s) => s.layout, (s) => s.id);
+        const filterEvalRoot = merge({}, this.initialContext, modelForRelatedEval);
+        const listRelatedEntities = collectListRelatedEntitiesForFormWizard(entity, this.kind);
+        const useListWizard = listRelatedEntities.length > 0 && (this.kind === 'create' || this.kind === 'update');
+        const listWizardSteps = [];
+        for (const re of listRelatedEntities) {
+            const [rm, en] = re.entity.split('.');
+            const relDef = await this.entityRegistry.resolve(rm, en);
+            listWizardSteps.push({
+                stepId: buildEntityFormRelatedStepId(re),
+                title: (re.title ?? relDef?.title ?? re.entity),
+                rel: re,
+            });
+        }
+        const prebuiltRelatedListConfigs = useListWizard
+            ? await Promise.all(listWizardSteps.map((s) => this.buildRelatedEntityListWidgetOptions(s.rel, filterEvalRoot)))
+            : [];
+        const mainFormGridArgs = {
+            entity,
+            finalSections,
+            mergedPropsBySection,
+            allGroups,
+            extraFieldsByGroup: this.extraFieldsByGroup,
+            sectionScaleFactors,
+        };
         const dialog = this.layoutBuilder.create().dialog((d) => {
             d.setTitle(title);
-            d.setSize(this.externalSize ?? calculatedSize);
+            d.setSize(this.externalSize ?? (useListWizard ? 'lg' : calculatedSize));
             d.setCloseButton(true);
             d.content((layout) => {
-                // Default mode: 'view' for single, 'edit' for create/update
                 const defaultMode = this.kind === 'single' ? 'view' : 'edit';
                 layout.mode(this.externalMode ?? defaultMode);
-                // Wrap content in a grid container to support colSpan layouts
-                layout.grid((grid) => {
-                    // Configure grid with 12 columns (like Bootstrap)
-                    grid.setColumns(12);
-                    grid.setGap('1rem');
-                    for (const section of finalSections) {
-                        const groupId = section.id;
-                        const sectionProps = mergedPropsBySection.get(groupId) ?? [];
-                        const extraFields = this.extraFieldsByGroup.get(groupId) ?? [];
-                        if (sectionProps.length === 0 && extraFields.length === 0) {
-                            continue;
-                        }
-                        const sectionLayout = section.layout ?? undefined;
-                        grid.item(sectionLayout, (fs) => {
-                            const sectionVisible = section.layout?.visible;
-                            if (sectionVisible !== undefined && sectionVisible !== null) {
-                                fs.visible(sectionVisible);
-                            }
-                            fs.setLook('fieldset');
-                            fs.setTitle((getGroupTitleFromList(allGroups, groupId) || groupId));
-                            fs.setCols(12);
-                            // Sort properties by order within section
-                            const orderedProps = [...sectionProps].sort((a, b) => {
-                                const aOrder = a.__order ?? Infinity;
-                                const bOrder = b.__order ?? Infinity;
-                                return aOrder - bOrder;
+                if (useListWizard) {
+                    layout.stepWizard((w) => {
+                        w.name(ENTITY_FORM_STEP_WIZARD_NAME);
+                        w.setLook('circular');
+                        w.setShowActions(false);
+                        const mainStepTitle = (entity.formats?.individual ||
+                            entity.title ||
+                            `${entity.module}.${entity.name}`);
+                        w.step('main', mainStepTitle, (step) => {
+                            step.content((inner) => {
+                                inner.grid((grid) => this.fillMainEntityFormGrid(grid, mainFormGridArgs));
                             });
-                            applySectionScaleToProperties(orderedProps, sectionScaleFactors.get(groupId));
-                            normalizeLayoutFillRowGaps(orderedProps, (p) => p.__layout);
-                            for (const prop of orderedProps) {
-                                const mergedProp = prop;
-                                const dataPath = mergedProp.__dataPath;
-                                const fieldPath = dataPath ? `${dataPath}.${prop.name}` : prop.name;
-                                fs.formField(prop.title, (field) => {
-                                    field.path(fieldPath);
-                                    if (prop.schema?.visible !== undefined) {
-                                        field.visible(prop.schema?.visible);
-                                    }
-                                    if (prop.schema?.readonly !== undefined) {
-                                        field.readonly(prop.schema.readonly);
-                                    }
-                                    if (prop.schema?.defaultValue !== undefined) {
-                                        field.defaultValue(prop.schema.defaultValue);
-                                    }
-                                    const fieldLayout = toFieldLayout(mergedProp.__layout);
-                                    if (fieldLayout) {
-                                        field.layout(fieldLayout);
-                                    }
-                                    if (fieldLayout?.label?.visible === false) {
-                                        field.setShowLabel(false);
-                                    }
-                                    const widgetType = prop.schema?.interface?.type || '';
-                                    const widgetOptions = buildWidgetOptions(prop);
-                                    const extendedProperties = buildWidgetExtendedProperties(prop);
-                                    const finalExtendedProps = dataPath
-                                        ? prefixExpressions(extendedProperties, dataPath)
-                                        : extendedProperties;
-                                    field.customWidget(widgetType, { ...widgetOptions, ...finalExtendedProps });
-                                });
-                            }
-                            for (const extra of extraFields) {
-                                const label = extra.path?.split('.').slice(-1)[0] || extra.path;
-                                fs.formField(label, (f) => {
-                                    const legacy = toCompatFormFieldBuilder(f);
-                                    legacy.path(extra.path);
-                                    extra.delegate?.(legacy);
+                        });
+                        listWizardSteps.forEach((step, idx) => {
+                            const built = prebuiltRelatedListConfigs[idx];
+                            w.step(step.stepId, step.title, (st) => {
+                                st.content((inner) => {
+                                    // Step content uses root LayoutBuilder (no customWidget); wrap in flex like other roots.
+                                    inner.flex((flex) => {
+                                        flex.customWidget(AXPWidgetsCatalog.entityList, (iw) => {
+                                            iw.name(built.name);
+                                            if (built.defaultValue) {
+                                                iw.defaultValue(built.defaultValue);
+                                            }
+                                            iw.options(built.options);
+                                        });
+                                    });
                                 });
-                            }
+                            });
                         });
-                    }
-                });
+                    });
+                }
+                else {
+                    layout.grid((grid) => this.fillMainEntityFormGrid(grid, mainFormGridArgs));
+                }
             });
-            // Actions: external if provided, otherwise default based on kind
-            if (this.externalActionsDelegate) {
+            if (this.externalActionsDelegate && !useListWizard) {
                 d.setActions(this.externalActionsDelegate);
             }
+            else if (useListWizard) {
+                d.setActions((ab) => configureEntityFormWizardFooterActions(ab, ENTITY_FORM_STEP_WIZARD_NAME, this.kind === 'create'
+                    ? '{{ ((typeof context.id === "string" && context.id.length > 0) || (typeof context.id === "number" && !isNaN(context.id)) || (typeof context._id === "string" && context._id.length > 0) || (typeof context._id === "number" && !isNaN(context._id))) ? "@general:entity-form.update-and-continue.title" : "@general:entity-form.create-and-continue.title" }}'
+                    : '@general:entity-form.save-and-continue.title'));
+            }
             else if (this.kind === 'single') {
-                // For single (read-only view), only show cancel/close button
-                d.setActions((a) => a.cancel());
+                d.setActions((a) => a.submit('@general:actions.close.title'));
             }
             else {
-                // For create/update, show cancel + submit
-                d.setActions((a) => a.cancel().submit());
+                d.setActions((a) => a.submit(this.kind === 'create' ? '@general:actions.create.title' : '@general:actions.apply.title'));
+            }
+            if (useListWizard && this.onActionHandler) {
+                d.onAction(this.createWizardOnActionWrapper(this.onActionHandler));
             }
-            if (this.onActionHandler) {
+            else if (this.onActionHandler) {
                 d.onAction(this.onActionHandler);
             }
+            else if (this.kind === 'single') {
+                d.onAction(async () => ({ success: true, skipValidate: true }));
+            }
         });
         return dialog;
     }
+    /**
+     * Renders main entity fieldsets and fields into a grid container (step 1 or non-wizard form).
+     */
+    fillMainEntityFormGrid(grid, args) {
+        grid.setColumns(12);
+        grid.setGap('1rem');
+        for (const section of args.finalSections) {
+            const groupId = section.id;
+            const sectionProps = args.mergedPropsBySection.get(groupId) ?? [];
+            const extraFields = args.extraFieldsByGroup.get(groupId) ?? [];
+            if (sectionProps.length === 0 && extraFields.length === 0) {
+                continue;
+            }
+            const sectionLayout = section.layout ?? undefined;
+            grid.item(sectionLayout, (fs) => {
+                const sectionVisible = section.layout?.visible;
+                if (sectionVisible !== undefined && sectionVisible !== null) {
+                    fs.visible(sectionVisible);
+                }
+                fs.setLook('fieldset');
+                fs.setTitle((getGroupTitleFromList(args.allGroups, groupId) || groupId));
+                fs.setCols(12);
+                const sectionLabelVisible = section.layout?.label?.visible ??
+                    args.entity.interfaces?.master?.single?.sections?.find((s) => s?.id === groupId)?.layout?.label?.visible;
+                if (sectionLabelVisible === false) {
+                    const legendHidden = { showTitle: false, showHeader: false };
+                    fs.setOptions(legendHidden);
+                }
+                const orderedProps = [...sectionProps].sort((a, b) => {
+                    const aOrder = a.__order ?? Infinity;
+                    const bOrder = b.__order ?? Infinity;
+                    return aOrder - bOrder;
+                });
+                applySectionScaleToProperties(orderedProps, args.sectionScaleFactors.get(groupId));
+                normalizeLayoutFillRowGaps(orderedProps, (p) => p.__layout);
+                for (const prop of orderedProps) {
+                    const mergedProp = prop;
+                    const dataPath = mergedProp.__dataPath;
+                    const fieldPath = dataPath ? `${dataPath}.${prop.name}` : prop.name;
+                    fs.formField(prop.title, (field) => {
+                        field.path(fieldPath);
+                        if (prop.schema?.visible !== undefined) {
+                            field.visible(prop.schema?.visible);
+                        }
+                        if (prop.schema?.readonly !== undefined) {
+                            field.readonly(prop.schema.readonly);
+                        }
+                        if (prop.schema?.defaultValue !== undefined) {
+                            field.defaultValue(prop.schema.defaultValue);
+                        }
+                        const fieldLayout = toFieldLayout(mergedProp.__layout);
+                        if (fieldLayout) {
+                            field.layout(fieldLayout);
+                        }
+                        if (fieldLayout?.label?.visible === false) {
+                            field.setShowLabel(false);
+                        }
+                        const hintOpts = hintFormFieldOptionsFromDescription(prop.description);
+                        if (hintOpts) {
+                            field.setOptions(hintOpts);
+                        }
+                        const widgetType = prop.schema?.interface?.type || '';
+                        const widgetOptions = buildWidgetOptions(prop);
+                        const extendedProperties = buildWidgetExtendedProperties(prop);
+                        const finalExtendedProps = dataPath ? prefixExpressions(extendedProperties, dataPath) : extendedProperties;
+                        field.customWidget(widgetType, { ...widgetOptions, ...finalExtendedProps });
+                    });
+                }
+                for (const extra of extraFields) {
+                    const label = extra.path?.split('.').slice(-1)[0] || extra.path;
+                    fs.formField(label, (f) => {
+                        const legacy = toCompatFormFieldBuilder(f);
+                        legacy.path(extra.path);
+                        extra.delegate?.(legacy);
+                    });
+                }
+            });
+        }
+    }
+    async buildRelatedEntityListWidgetOptions(relatedEntity, filterEvalRoot) {
+        const evaluateExpressions = async (actionData) => {
+            const scope = {
+                context: {
+                    eval: (path) => get(filterEvalRoot, path),
+                },
+            };
+            return await this.expressionEvaluator.evaluate(actionData, scope);
+        };
+        const syncRelatedFromRoot = this.kind === 'create';
+        const foreignKeyField = relatedEntity.persistence?.foreignKeyField;
+        const filters = syncRelatedFromRoot
+            ? []
+            : await Promise.all(relatedEntity.conditions?.map(async (c) => {
+                const value = await evaluateExpressions(c.value);
+                return {
+                    field: c.name,
+                    operator: c.operator,
+                    value,
+                    hidden: true,
+                };
+            }) ?? []);
+        const rawOrEvaluatedActions = syncRelatedFromRoot
+            ? (relatedEntity.actions ?? [])
+            : await this.evaluateRelatedEntityActionsForFormWizard(relatedEntity.actions, filterEvalRoot);
+        const evaluatedActions = mergeForeignKeyFieldIntoCreateActions(foreignKeyField, rawOrEvaluatedActions);
+        const columnScope = {
+            context: {
+                eval: (path) => get(filterEvalRoot, path),
+            },
+        };
+        const { includeColumns, relatedTableColumns } = await resolveRelatedEntityColumns(relatedEntity.columns, this.expressionEvaluator, columnScope);
+        const nestedCreateHiddenProperties = collectNestedCreateHiddenProperties(relatedEntity);
+        return {
+            name: `${relatedEntity.entity}-entity-form-step`,
+            defaultValue: {
+                toolbar: {
+                    filters,
+                },
+            },
+            options: {
+                entity: relatedEntity.entity,
+                showEntityActions: true,
+                showToolbar: false,
+                actions: evaluatedActions,
+                maxHeight: '400px',
+                includeColumns,
+                relatedTableColumns,
+                customFilterDefinitions: relatedEntity.customFilterDefinitions,
+                ...(foreignKeyField ? { foreignKeyField } : {}),
+                ...(nestedCreateHiddenProperties?.length ? { nestedCreateHiddenProperties } : {}),
+                ...(syncRelatedFromRoot && relatedEntity.conditions?.length
+                    ? {
+                        relatedFilterConditionSpecs: cloneDeep(relatedEntity.conditions),
+                        syncRelatedListFiltersFromDialogContext: true,
+                    }
+                    : {}),
+            },
+        };
+    }
+    async evaluateRelatedEntityActionsForFormWizard(actions, filterEvalRoot) {
+        const list = actions ?? [];
+        const scope = {
+            context: {
+                eval: (path) => get(filterEvalRoot, path),
+            },
+        };
+        return Promise.all(list.map(async (action) => {
+            if (action.scope === AXPEntityCommandScope.Individual) {
+                return action;
+            }
+            return (await this.expressionEvaluator.evaluate(action, scope));
+        }));
+    }
+    createWizardOnActionWrapper(userHandler) {
+        return async (ref) => {
+            const action = ref.action();
+            if (action === ENTITY_FORM_ACTION_DONE) {
+                return { success: true, data: ref.context(), skipValidate: true };
+            }
+            if (action === ENTITY_FORM_ACTION_FIRST_STEP_CONTINUE) {
+                const out = (await userHandler(ref));
+                if (out?.success === false) {
+                    return out;
+                }
+                const item = out?.data?.item ?? out?.data ?? {};
+                ref.patchContext?.(merge({}, ref.context(), item));
+                await ref.invokeWidget?.(ENTITY_FORM_STEP_WIZARD_NAME, 'next', { setLoading: ref.setLoading });
+                return merge({}, out, { keepDialogOpen: true });
+            }
+            return await userHandler(ref);
+        };
+    }
     computeAllowedNames(allNames) {
         if (this.includeList && this.includeList.size > 0) {
             return new Set(allNames.filter((n) => this.includeList.has(n)));
@@ -1539,6 +2134,62 @@ function buildWidgetExtendedProperties(prop) {
     }
     return extended;
 }
+function isRelatedEntityIncludedOnMasterForm(related, kind, placementKind) {
+    if (kind !== 'create' && kind !== 'update') {
+        return true;
+    }
+    const defaultInclusive = placementKind === 'merge-detail';
+    if (kind === 'create') {
+        const flag = related.appearOn?.create;
+        return defaultInclusive ? flag !== false : flag === true;
+    }
+    const flag = related.appearOn?.update;
+    return defaultInclusive ? flag !== false : flag === true;
+}
+function collectListRelatedEntitiesForFormWizard(entity, kind) {
+    return (entity.relatedEntities ?? [])
+        .filter((re) => !re.hidden &&
+        (re.layout?.type === 'tab-list' || re.layout?.type === 'page-list') &&
+        isRelatedEntityIncludedOnMasterForm(re, kind, 'list'))
+        .sort((a, b) => (a.layout?.order ?? 0) - (b.layout?.order ?? 0));
+}
+function buildEntityFormRelatedStepId(re) {
+    const safe = re.entity.replace(/[^a-zA-Z0-9._-]/g, '_');
+    return `related-${safe}-${re.layout?.order ?? 0}`;
+}
+function configureEntityFormWizardFooterActions(ab, wizardName, firstStepContinueTitleKey) {
+    ab.custom({
+        title: '@general:actions.previous.title',
+        command: `widget:${wizardName}.previous`,
+        icon: 'fa-regular fa-arrow-left',
+        color: 'primary',
+        position: 'suffix',
+        disabled: '{{api.getStatus().isFirst}}',
+    });
+    ab.custom({
+        title: firstStepContinueTitleKey,
+        command: { name: ENTITY_FORM_ACTION_FIRST_STEP_CONTINUE },
+        color: 'primary',
+        position: 'suffix',
+        hidden: '{{!api.getStatus().isFirst}}',
+        predicateApiWidgetName: wizardName,
+    });
+    ab.custom({
+        title: '@general:actions.next.title',
+        command: `widget:${wizardName}.next`,
+        color: 'primary',
+        position: 'suffix',
+        hidden: '{{api.getStatus().isFirst || api.getStatus().isLast}}',
+    });
+    ab.custom({
+        title: '@general:entity-form.done.title',
+        command: { name: ENTITY_FORM_ACTION_DONE },
+        color: 'primary',
+        position: 'suffix',
+        hidden: '{{!api.getStatus().isLast}}',
+        predicateApiWidgetName: wizardName,
+    });
+}
 function getGroupTitle(entity, groupId) {
     const g = (entity.groups || []).find((x) => x.id === groupId);
     return g?.title;
@@ -1727,6 +2378,11 @@ var openEntityDetails_command = /*#__PURE__*/Object.freeze({
     AXPOpenEntityDetailsCommand: AXPOpenEntityDetailsCommand
 });
 
+/** Matches persisted PK checks used for choose update vs create (strict types only). */
+function hasPersistedRootId(context) {
+    const raw = context?.id ?? context?._id;
+    return (typeof raw === 'string' && raw.length > 0) || (typeof raw === 'number' && !Number.isNaN(raw));
+}
 class AXPCreateEntityCommand {
     constructor() {
         this.entityForm = inject(AXPEntityFormBuilderService);
@@ -1760,7 +2416,6 @@ class AXPCreateEntityCommand {
         const entityRef = await this.entityService.resolve(moduleName, entityName);
         let chain = this.entityForm.entity(`${moduleName}.${entityName}`).create(data);
         chain.actions((actions) => {
-            actions.cancel('@general:actions.cancel.title');
             actions.submit('@general:actions.create.title');
         });
         if (excludeProperties && excludeProperties.length > 0) {
@@ -1785,25 +2440,31 @@ class AXPCreateEntityCommand {
         }
         const result = await chain
             .onAction(async (dialogRef) => {
-            if (dialogRef.action() === 'cancel') {
-                return { success: false };
-            }
             const createFn = entityRef.commands?.create?.execute;
-            if (!createFn) {
-                const msg = await this.translationService.translateAsync('@general:messages.entity.create-command-unavailable');
+            const updateFn = entityRef.commands?.update?.execute;
+            const context = dialogRef.context();
+            console.log('context', context);
+            const hasPersistedId = hasPersistedRootId(context);
+            const persistFn = hasPersistedId ? updateFn : createFn;
+            const missingPersistHandlerMsg = hasPersistedId
+                ? await this.translationService.translateAsync('@general:messages.entity.update-command-unavailable')
+                : await this.translationService.translateAsync('@general:messages.entity.create-command-unavailable');
+            const failedMsgKey = hasPersistedId
+                ? '@general:messages.entity.update-failed'
+                : '@general:messages.entity.create-failed';
+            if (!persistFn) {
                 if (enableOperationToasts) {
                     this.toastService.show({
                         color: 'danger',
                         title: await this.translationService.translateAsync('@general:messages.generic.error.title'),
-                        content: msg,
+                        content: missingPersistHandlerMsg,
                     });
                 }
-                throw new Error(msg);
+                throw new Error(missingPersistHandlerMsg);
             }
             dialogRef.setLoading(true);
             try {
-                const context = dialogRef.context();
-                const result = await createFn(context);
+                const result = await persistFn(context);
                 if (result) {
                     return {
                         success: true,
@@ -1817,13 +2478,13 @@ class AXPCreateEntityCommand {
                     return {
                         success: false,
                         message: {
-                            text: await this.translationService.translateAsync('@general:messages.entity.create-failed'),
+                            text: await this.translationService.translateAsync(failedMsgKey),
                         },
                     };
                 }
             }
             catch (e) {
-                const errorMsg = e.message ?? (await this.translationService.translateAsync('@general:messages.entity.create-failed'));
+                const errorMsg = e.message ?? (await this.translationService.translateAsync(failedMsgKey));
                 if (enableOperationToasts) {
                     this.toastService.show({
                         color: 'danger',
@@ -1911,6 +2572,7 @@ const axpCreateEntityCommandDefinition = defineCommand({
         summary: 'Dialog submit persists entity; navigation/toast behavior per entity form builder and settings.',
         derivesFrom: 'AXPExecuteCommandResult<any> from entity form chain and AXPOpenEntityDetailsCommand',
     },
+    capabilities: ['ai'],
     ai: {
         shortDescription: 'Opens create dialog with pre-filled data; execution waits until the user submits or cancels, then returns—use for human-confirmed inserts into mock storage.',
         usage: {
@@ -1925,6 +2587,7 @@ const axpCreateEntityCommandDefinition = defineCommand({
         tags: ['entity', 'create', 'form', 'dialog', 'human-in-the-loop', 'mock', 'entity-storage', 'wait-user'],
         toolInputDefaults: { ...axpCreateEntityAiToolInputDefaults },
     },
+    categories: [AXP_COMMAND_DEFINITION_CATEGORY_ENTITY],
 });
 
 class AXPUpdateEntityCommand {
@@ -1959,9 +2622,7 @@ class AXPUpdateEntityCommand {
             };
         }
         const entityRef = await this.entityService.resolve(moduleName, entityName);
-        let dialogRef;
         try {
-            // Validate data type
             if (!data || (typeof data !== 'string' && typeof data !== 'object')) {
                 return {
                     success: false,
@@ -1970,10 +2631,8 @@ class AXPUpdateEntityCommand {
                     },
                 };
             }
-            // Pass data directly to update() - it handles string | object internally
             let chain = this.entityForm.entity(`${moduleName}.${entityName}`).update(data);
             chain.actions((actions) => {
-                actions.cancel('@general:actions.cancel.title');
                 actions.submit('@general:actions.apply.title');
             });
             if (excludeProperties && excludeProperties.length > 0) {
@@ -1994,19 +2653,8 @@ class AXPUpdateEntityCommand {
             if (finalSize) {
                 chain.size(finalSize);
             }
-            dialogRef = await chain.show();
-            if (dialogRef.action() === 'cancel') {
-                dialogRef.close();
-                return {
-                    success: false,
-                    //   message: {
-                    //     text: await this.translationService.translateAsync('@general:messages.generic.cancel.description'),
-                    //   },
-                };
-            }
-            else if (dialogRef.action() === 'submit') {
-                dialogRef.setLoading(true);
-                const context = dialogRef.context();
+            return (await chain
+                .onAction(async (dialogRef) => {
                 const updateFn = entityRef.commands?.update?.execute;
                 if (!updateFn) {
                     const msg = await this.translationService.translateAsync('@general:messages.entity.update-command-unavailable');
@@ -2017,35 +2665,44 @@ class AXPUpdateEntityCommand {
                             content: msg,
                         });
                     }
-                    return {
-                        success: false,
-                        message: { text: msg },
-                    };
+                    throw new Error(msg);
                 }
-                const result = await updateFn(context);
-                if (result) {
-                    dialogRef.close();
+                dialogRef.setLoading(true);
+                try {
+                    const context = dialogRef.context();
+                    const result = await updateFn(context);
+                    if (result) {
+                        return {
+                            success: true,
+                            data: result.data ?? result,
+                            message: {
+                                text: await this.translationService.translateAsync('@general:messages.generic.success.description'),
+                            },
+                        };
+                    }
                     return {
-                        success: true,
-                        data: result,
+                        success: false,
                         message: {
-                            text: await this.translationService.translateAsync('@general:messages.generic.success.description'),
+                            text: await this.translationService.translateAsync('@general:messages.entity.command-no-result'),
                         },
                     };
                 }
-                return (result ?? {
-                    success: false,
-                    message: {
-                        text: await this.translationService.translateAsync('@general:messages.entity.command-no-result'),
-                    },
-                });
-            }
-            return {
-                success: false,
-                message: {
-                    text: await this.translationService.translateAsync('@general:messages.entity.invalid-action'),
-                },
-            };
+                catch (e) {
+                    const errorMsg = e.message ?? (await this.translationService.translateAsync('@general:messages.entity.update-failed'));
+                    if (enableOperationToasts) {
+                        this.toastService.show({
+                            color: 'danger',
+                            title: await this.translationService.translateAsync('@general:messages.generic.error.title'),
+                            content: errorMsg,
+                        });
+                    }
+                    throw e;
+                }
+                finally {
+                    dialogRef.setLoading(false);
+                }
+            })
+                .show());
         }
         catch (error) {
             const text = error instanceof Error
@@ -2063,11 +2720,6 @@ class AXPUpdateEntityCommand {
                 message: { text },
             };
         }
-        finally {
-            if (dialogRef) {
-                dialogRef.setLoading(false);
-            }
-        }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPUpdateEntityCommand, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPUpdateEntityCommand, providedIn: 'root' }); }
@@ -2193,6 +2845,18 @@ class AXPEntityDetailPopoverComponent {
         this.entityDetails = signal(null, ...(ngDevMode ? [{ debugName: "entityDetails" }] : /* istanbul ignore next */ []));
         this.isLoadingDetails = signal(false, ...(ngDevMode ? [{ debugName: "isLoadingDetails" }] : /* istanbul ignore next */ []));
         this.isDetailPopoverOpen = signal(false, ...(ngDevMode ? [{ debugName: "isDetailPopoverOpen" }] : /* 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.
+         */
+        this.entityPropertiesWithWidgets = computed(() => {
+            const details = this.entityDetails();
+            const data = details?.entityData;
+            const entityDefinition = details?.entityDefinition;
+            if (!data || !entityDefinition?.properties)
+                return [];
+            return this.buildEntityPropertiesWithWidgets(data, entityDefinition, this.textField(), this.valueField());
+        }, ...(ngDevMode ? [{ debugName: "entityPropertiesWithWidgets" }] : /* istanbul ignore next */ []));
     }
     //#endregion
     //#region ----   Public Methods   ----
@@ -2347,16 +3011,12 @@ class AXPEntityDetailPopoverComponent {
         }
         return 0;
     }
-    getEntityPropertiesWithWidgets() {
-        const data = this.entityDetails()?.entityData;
-        const entityDefinition = this.entityDetails()?.entityDefinition;
-        if (!data || !entityDefinition?.properties)
-            return [];
+    buildEntityPropertiesWithWidgets(data, entityDefinition, textFieldValue, valueFieldValue) {
         // Use properties (not columns) for correct titles and schema; columns may have dataPath that doesn't match
-        const importantProperties = entityDefinition.properties
+        return entityDefinition.properties
             .filter((prop) => {
             // Exclude technical fields
-            if (prop.name === 'id' || prop.name === this.textField() || prop.name === this.valueField()) {
+            if (prop.name === 'id' || prop.name === textFieldValue || prop.name === valueFieldValue) {
                 return false;
             }
             // Only include properties that have a meaningful value (using get for dotted paths)
@@ -2424,7 +3084,6 @@ class AXPEntityDetailPopoverComponent {
                 node: widgetNode,
             };
         });
-        return importantProperties;
     }
     /**
      * Resolves the data path for a property. For lookups with expose, returns the expanded path
@@ -2447,11 +3106,11 @@ class AXPEntityDetailPopoverComponent {
         return prop.name;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailPopoverComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPEntityDetailPopoverComponent, isStandalone: true, selector: "axp-entity-detail-popover", inputs: { entity: { classPropertyName: "entity", publicName: "entity", isSignal: true, isRequired: true, transformFunction: null }, entityId: { classPropertyName: "entityId", publicName: "entityId", isSignal: true, isRequired: true, transformFunction: null }, textField: { classPropertyName: "textField", publicName: "textField", isSignal: true, isRequired: false, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: false, transformFunction: null }, item: { classPropertyName: "item", publicName: "item", isSignal: true, isRequired: false, transformFunction: null }, breadcrumb: { classPropertyName: "breadcrumb", publicName: "breadcrumb", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "detailPopover", first: true, predicate: ["detailPopover"], descendants: true, isSignal: true }], ngImport: i0, template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        {{ entityDetails()?.entityData?.[textField()] ?? item()?.[textField()] | translate | async }}\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-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button\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</ax-popover>\n", 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: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disablePanelClass", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "repositionOnScroll", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i3.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i3.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPEntityDetailPopoverComponent, isStandalone: true, selector: "axp-entity-detail-popover", inputs: { entity: { classPropertyName: "entity", publicName: "entity", isSignal: true, isRequired: true, transformFunction: null }, entityId: { classPropertyName: "entityId", publicName: "entityId", isSignal: true, isRequired: true, transformFunction: null }, textField: { classPropertyName: "textField", publicName: "textField", isSignal: true, isRequired: false, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: false, transformFunction: null }, item: { classPropertyName: "item", publicName: "item", isSignal: true, isRequired: false, transformFunction: null }, breadcrumb: { classPropertyName: "breadcrumb", publicName: "breadcrumb", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "detailPopover", first: true, predicate: ["detailPopover"], descendants: true, isSignal: true }], ngImport: i0, template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        {{ entityDetails()?.entityData?.[textField()] ?? item()?.[textField()] | translate | async }}\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-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of entityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button\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</ax-popover>\n", 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: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disablePanelClass", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "repositionOnScroll", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i3.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i3.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailPopoverComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'axp-entity-detail-popover', changeDetection: ChangeDetectionStrategy.OnPush, imports: [CommonModule, AXButtonModule, AXPopoverModule, AXPWidgetCoreModule, AXTranslationModule, AXLoadingModule], template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        {{ entityDetails()?.entityData?.[textField()] ?? item()?.[textField()] | translate | async }}\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-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button\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</ax-popover>\n" }]
+            args: [{ selector: 'axp-entity-detail-popover', changeDetection: ChangeDetectionStrategy.OnPush, imports: [CommonModule, AXButtonModule, AXPopoverModule, AXPWidgetCoreModule, AXTranslationModule, AXLoadingModule], template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        {{ entityDetails()?.entityData?.[textField()] ?? item()?.[textField()] | translate | async }}\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-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of entityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button\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</ax-popover>\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 }] }], item: [{ type: i0.Input, args: [{ isSignal: true, alias: "item", required: false }] }], breadcrumb: [{ type: i0.Input, args: [{ isSignal: true, alias: "breadcrumb", required: false }] }], detailPopover: [{ type: i0.ViewChild, args: ['detailPopover', { isSignal: true }] }] } });
 
 class AXPEntityDetailPopoverService {
@@ -3265,82 +3924,6 @@ class AXPEntityListViewColumnViewModel {
     }
 }
 
-//#endregion
-//#region ---- Helpers ----
-function isRelatedEntityStringColumns(columns) {
-    return columns.length === 0 || typeof columns[0] === 'string';
-}
-/**
- * Property names from `AXPRelatedEntity.columns` (no expression evaluation).
- * Empty array means caller can treat as “no name filter” (show all allowed by entity).
- */
-function getRelatedEntityColumnNames(columns) {
-    if (!columns?.length) {
-        return [];
-    }
-    if (isRelatedEntityStringColumns(columns)) {
-        return [...columns];
-    }
-    return columns.map((c) => c.name);
-}
-function isTruthyVisible(value) {
-    if (value === true) {
-        return true;
-    }
-    if (value === false || value === null || value === undefined) {
-        return false;
-    }
-    if (typeof value === 'string') {
-        const t = value.trim().toLowerCase();
-        return t !== '' && t !== 'false' && t !== '0';
-    }
-    if (typeof value === 'number') {
-        return value !== 0 && !Number.isNaN(value);
-    }
-    return Boolean(value);
-}
-//#endregion
-//#region ---- Public API ----
-/**
- * Resolves `AXPRelatedEntity.columns` for `entity-list`:
- * - `string[]` → `includeColumns` only (legacy).
- * - `AXPEntityTableColumn[]` → evaluates `options.visible` when it is a string (parent detail context),
- *   drops hidden / invisible columns, and returns `relatedTableColumns` + matching `includeColumns`.
- */
-async function resolveRelatedEntityColumns(columns, expressionEvaluator, scope) {
-    if (!columns?.length) {
-        return {};
-    }
-    if (isRelatedEntityStringColumns(columns)) {
-        return { includeColumns: getRelatedEntityColumnNames(columns) };
-    }
-    const relatedTableColumns = [];
-    for (const raw of columns) {
-        const col = cloneDeep(raw);
-        if (col.hidden === true) {
-            continue;
-        }
-        let visible = col.options?.visible;
-        if (visible === undefined) {
-            visible = true;
-        }
-        else if (typeof visible === 'string') {
-            const evaluated = await expressionEvaluator.evaluate(visible, scope);
-            visible = isTruthyVisible(evaluated);
-        }
-        if (visible === false) {
-            continue;
-        }
-        col.options = { ...col.options, visible: true };
-        relatedTableColumns.push(col);
-    }
-    return {
-        relatedTableColumns,
-        includeColumns: relatedTableColumns.map((c) => c.name),
-    };
-}
-//#endregion
-
 class AXPEntityDetailListViewModel {
     constructor(injector, detailEntityConfig, parent) {
         this.injector = injector;
@@ -4151,6 +4734,7 @@ class AXPEntityMasterListViewModel {
             return this.sortedFields().filter((i) => i.dir).length;
         };
         this.sortedFields = signal([], ...(ngDevMode ? [{ debugName: "sortedFields" }] : /* istanbul ignore next */ []));
+        //#endregion
         this.evaluateExpressions = async (options, data) => {
             const scope = this.createExpressionScope(data);
             return await this.expressionEvaluator.evaluate(options, scope);
@@ -4240,7 +4824,6 @@ class AXPEntityMasterListViewModel {
                         width: c.width,
                     }));
                     set(newSettings, `list.views.${this.view().name}.columns`, updatedColumns);
-                    console.log(newSettings, `list.views.${this.view().name}.columns`);
                     return newSettings;
                 });
                 break;
@@ -4623,7 +5206,8 @@ class AXPEntityMasterListViewModel {
         const command = resolvedTriggerName.split('&')[0];
         const options = await this.evaluateExpressions(action?.options, data);
         const baseData = action?.scope == AXPEntityCommandScope.Selected ? this.selectedItems() : data;
-        const commandData = this.mergeDefaultCategoryForCreate(command, baseData);
+        let commandData = this.mergeViewConditionsForCreate(command, baseData);
+        commandData = this.mergeDefaultCategoryForCreate(command, commandData);
         if (this.workflow.exists(command)) {
             await this.workflow.execute(command, {
                 entity: getEntityInfo(this.entityDef).source,
@@ -4705,6 +5289,38 @@ class AXPEntityMasterListViewModel {
         }
         return baseData;
     }
+    //#region ----   Create command defaults from list view   ----
+    /**
+     * Seeds create payloads with fixed list-view conditions (e.g. scope=T on the tenant dashboards view)
+     * so new rows match the view context and downstream queries (such as home dashboard) can find them.
+     */
+    mergeViewConditionsForCreate(command, baseData) {
+        const isCreateCommand = command === 'Entity:Create' || command === 'create-entity';
+        if (!isCreateCommand) {
+            return baseData;
+        }
+        const conditions = this.view()?.conditions ?? [];
+        if (conditions.length === 0) {
+            return baseData;
+        }
+        const seed = {};
+        for (const c of conditions) {
+            if (!c?.name || c.operator?.type !== 'equal' || c.value === undefined) {
+                continue;
+            }
+            seed[c.name] = c.value;
+        }
+        if (Object.keys(seed).length === 0) {
+            return baseData;
+        }
+        if (baseData == null) {
+            return seed;
+        }
+        if (typeof baseData === 'object' && !Array.isArray(baseData)) {
+            return { ...seed, ...baseData };
+        }
+        return baseData;
+    }
     async execute(command) {
         switch (command?.name) {
             case 'navigate':
@@ -9858,7 +10474,7 @@ class AXPEntityListTableService {
                 animation: true,
             },
             // 🎪 Events
-            ...this.createDefaultEvents(entity, allActions),
+            ...this.createDefaultEvents(entity, allActions, options?.excludeProperties),
         };
         console.log('listOptions', listOptions);
         return listOptions;
@@ -9948,7 +10564,7 @@ class AXPEntityListTableService {
     /**
      * Handle execution of a row command (shared by double-click and command handlers)
      */
-    async handleRowCommand(e, selectedRows, entity, allActions) {
+    async handleRowCommand(e, selectedRows, entity, allActions, relatedListExcludeProperties) {
         const data = e.data;
         const commandName = e.name;
         const action = allActions.find((c) => {
@@ -9959,7 +10575,8 @@ class AXPEntityListTableService {
                     c.scope == AXPEntityCommandScope.TypeLevel));
         });
         const command = commandName.split('&')[0];
-        const options = await this.evaluateExpressions(action?.options, data);
+        const evaluatedOptions = await this.evaluateExpressions(action?.options, data);
+        const options = this.mergeRelatedListFormOptions(command, evaluatedOptions, relatedListExcludeProperties);
         if (this.commandService.exists(command)) {
             await this.commandService.execute(command, {
                 __context__: {
@@ -9995,10 +10612,25 @@ class AXPEntityListTableService {
             });
         }
     }
+    /**
+     * When a related entity list declares `excludeProperties`, row commands bypass the details page
+     * `execute()` merge — apply the same exclusions for embedded create/update commands.
+     */
+    mergeRelatedListFormOptions(command, evaluatedOptions, relatedListExcludeProperties) {
+        const exclusions = relatedListExcludeProperties?.filter(Boolean);
+        if (!exclusions?.length ||
+            (command !== 'Entity:Create' && command !== 'Entity:Update')) {
+            return evaluatedOptions;
+        }
+        return {
+            ...evaluatedOptions,
+            excludeProperties: exclusions,
+        };
+    }
     /**
      * Create default events
      */
-    createDefaultEvents(entity, allActions) {
+    createDefaultEvents(entity, allActions, relatedListExcludeProperties) {
         return {
             onRowClick: (row) => {
                 console.log('Entity List - Row clicked:', row);
@@ -10017,13 +10649,13 @@ class AXPEntityListTableService {
                     name: defaultAction.name,
                     data: e.data,
                 };
-                this.handleRowCommand(d, undefined, entity, allActions);
+                this.handleRowCommand(d, undefined, entity, allActions, relatedListExcludeProperties);
             },
             onSelectionChange: (selectedRows) => {
                 console.log('Entity List - Selection changed:', selectedRows);
             },
             onRowCommand: async (e, selectedRows) => {
-                await this.handleRowCommand(e, selectedRows, entity, allActions);
+                await this.handleRowCommand(e, selectedRows, entity, allActions, relatedListExcludeProperties);
             },
         };
     }
@@ -10330,6 +10962,42 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             }));
             return actions;
         }, ...(ngDevMode ? [{ debugName: "secondaryActions" }] : /* istanbul ignore next */ []));
+        /** Keeps related-list filters in sync with dialog context for create wizards (main id appears after first-step save). */
+        this.#relatedFilterSyncEffect = effect(() => {
+            const opts = this.options();
+            if (!opts['syncRelatedListFiltersFromDialogContext']) {
+                return;
+            }
+            const specs = opts['relatedFilterConditionSpecs'];
+            if (!specs?.length) {
+                return;
+            }
+            this.contextService.data();
+            if (!this.fullPath()) {
+                return;
+            }
+            untracked(() => void this.applyRelatedFiltersFromContextAndDatasource(specs));
+        }, ...(ngDevMode ? [{ debugName: "#relatedFilterSyncEffect" }] : /* istanbul ignore next */ []));
+        /** Patches data-list `refresh` so the grid footer / toolbar refresh keeps parent-scoped filters on the data source. */
+        this.#patchDataListRefreshEffect = effect(() => {
+            const inst = this.listWidget()?.instance;
+            const opts = this.options();
+            if (!inst?.refresh || inst.__axpEntityListRefreshPatched || !opts['syncRelatedListFiltersFromDialogContext']) {
+                return;
+            }
+            inst.__axpEntityListRefreshPatched = true;
+            const originalRefresh = inst.refresh.bind(inst);
+            inst.refresh = () => {
+                void (async () => {
+                    const o = this.options();
+                    const specs = o['relatedFilterConditionSpecs'];
+                    if (o['syncRelatedListFiltersFromDialogContext'] && specs?.length) {
+                        await this.applyRelatedFiltersFromContextAndDatasource(specs);
+                    }
+                    originalRefresh();
+                })();
+            };
+        }, ...(ngDevMode ? [{ debugName: "#patchDataListRefreshEffect" }] : /* istanbul ignore next */ []));
         //#region ----   Query Change Handler   ----
         this.queries = undefined;
         this.#effect = effect(() => {
@@ -10380,7 +11048,32 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         const commandData = action?.scope == AXPEntityCommandScope.Selected
             ? this.selectedItems()
             : action?.options?.['process']?.data || null;
-        const options = await this.evaluateToolbarExpressions(action?.options, commandData);
+        let options = await this.evaluateToolbarExpressions(action?.options, commandData);
+        const listOpts = this.options();
+        const foreignKeyFieldName = listOpts['foreignKeyField'];
+        const createExcludes = listOpts['nestedCreateHiddenProperties'] ?? [];
+        if (command === 'Entity:Create' && foreignKeyFieldName) {
+            const root = this.contextService.snapshot();
+            const idVal = get(root, 'id');
+            options = merge({}, options);
+            options['process'] = merge({}, options['process'], {
+                data: merge({}, options['process']?.data ?? {}, {
+                    ...(idVal !== undefined && idVal !== null && idVal !== '' ? { [foreignKeyFieldName]: idVal } : {}),
+                }),
+            });
+        }
+        if (command === 'Entity:Create' && createExcludes.length) {
+            const existing = (options['excludeProperties'] ?? []).slice();
+            options = merge({}, options);
+            options['excludeProperties'] = [...new Set([...createExcludes, ...existing])];
+        }
+        const relatedExcludes = listOpts['excludeProperties'];
+        const exclusionsFromList = relatedExcludes?.filter(Boolean) ?? [];
+        if (exclusionsFromList.length && (command === 'Entity:Create' || command === 'Entity:Update')) {
+            const existing = (options['excludeProperties'] ?? []).slice();
+            options = merge({}, options);
+            options['excludeProperties'] = [...new Set([...existing, ...exclusionsFromList])];
+        }
         if (this.commandService.exists(command)) {
             await this.commandService.execute(command, {
                 __context__: {
@@ -10420,13 +11113,88 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         if (!opts) {
             return {};
         }
+        const root = this.contextService.snapshot();
         const scope = {
             context: {
-                eval: (path) => get(expressionData, path),
+                eval: (path) => get(root, path) ?? get(expressionData, path),
             },
         };
         return (await this.expressionEvaluator.evaluate(opts, scope));
     }
+    /**
+     * Re-evaluates related-entity list filters from the live dialog form context (e.g. after create saves the main row id).
+     */
+    async applyRelatedFiltersFromContext(specs) {
+        const root = this.contextService.snapshot();
+        const scope = {
+            context: {
+                eval: (path) => get(root, path),
+            },
+        };
+        const filters = await Promise.all(specs.map(async (c) => ({
+            field: c.name,
+            operator: c.operator,
+            value: await this.expressionEvaluator.evaluate(c.value, scope),
+            hidden: true,
+        })));
+        if (!this.fullPath()) {
+            return;
+        }
+        const current = this.getValue();
+        if (isEqual$1(current?.toolbar?.filters, filters)) {
+            return;
+        }
+        this.setValue({
+            ...current,
+            toolbar: { ...(current?.toolbar ?? {}), filters },
+        });
+    }
+    /** Keeps related-list filters in sync with dialog context for create wizards (main id appears after first-step save). */
+    #relatedFilterSyncEffect;
+    /**
+     * Pushes current toolbar filters to the embedded list data source when both exist.
+     * Returns false while data-list is still mounting (see deferred listNode.set in ngOnInit).
+     */
+    pushToolbarFiltersToDataSource() {
+        const listInstance = this.listWidget()?.instance;
+        const dataSource = listInstance?.options?.()?.['dataSource'];
+        const toolbar = this.getValue()?.toolbar;
+        if (!dataSource?.filter || !toolbar?.filters?.length) {
+            return false;
+        }
+        dataSource.filter({ filters: toolbar.filters });
+        return true;
+    }
+    /**
+     * Writes toolbar filters from specs and pushes them onto the data source so refresh/reload keeps the parent scope.
+     */
+    async applyRelatedFiltersFromContextAndDatasource(specs) {
+        await this.applyRelatedFiltersFromContext(specs);
+        if (this.pushToolbarFiltersToDataSource()) {
+            return;
+        }
+        const opts = this.options();
+        if (!opts['syncRelatedListFiltersFromDialogContext']) {
+            return;
+        }
+        /** Data-list is created in ngOnInit via deferred listNode.set; retry briefly until instance exposes dataSource. */
+        const maxAttempts = 40;
+        const delayMs = 50;
+        for (let i = 0; i < maxAttempts; i++) {
+            await new Promise((resolve) => setTimeout(resolve, delayMs));
+            if (this.pushToolbarFiltersToDataSource()) {
+                return;
+            }
+        }
+    }
+    /**
+     * Refreshes the embedded data list (toolbar / workflow). In wizard mode, `refresh` is patched to re-apply scoped filters first.
+     */
+    refreshGridWithParentScopedFilters() {
+        this.listWidget()?.instance?.call('refresh');
+    }
+    /** Patches data-list `refresh` so the grid footer / toolbar refresh keeps parent-scoped filters on the data source. */
+    #patchDataListRefreshEffect;
     #effect;
     /**
      * Validates that all required dependencies are available
@@ -10529,6 +11297,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             includeColumns: this.includeColumns(),
             relatedTableColumns: this.relatedTableColumns(),
             customFilterDefinitions: this.customFilterDefinitions(),
+            excludeProperties: this.options()['excludeProperties'],
         };
         const listOptions = await this.entityListTableService.convertEntityToListOptions(resolvedEntity, options, this.allActions());
         const toolbarOptions = await this.entityListToolbarService.convertEntityToolbarOptions(resolvedEntity, options);
@@ -10552,6 +11321,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                     columns: this.getValue()?.toolbar?.columns,
                 },
             });
+            queueMicrotask(() => {
+                void this.pushToolbarFiltersToDataSource();
+            });
         }, 100);
     }
     async ngAfterViewInit() {
@@ -10560,7 +11332,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
             if (event.payload.entity == this.entitySource()) {
-                this.listWidget()?.instance.call('refresh');
+                this.refreshGridWithParentScopedFilters();
             }
         });
         this.eventService
@@ -10568,7 +11340,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             .pipe(takeUntil(this.destroyed))
             .subscribe((e) => {
             if (e.data.name == `${this.entity()?.module}.${this.entity()?.name}`) {
-                this.listWidget()?.instance.call('refresh');
+                this.refreshGridWithParentScopedFilters();
             }
         });
         const listWidget = (await this.layoutService.waitForWidget(`${this.entitySource()}-tab-list_table`, 500));
@@ -10846,7 +11618,7 @@ const AXPEntityListWidget = {
     type: 'view',
     categories: [],
     groups: [AXPWidgetGroupEnum.EntityWidget],
-    icon: 'fa-solid fa-square',
+    icon: 'fa-light fa-square',
     properties: [AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY],
     components: {
         view: {
@@ -12145,7 +12917,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             const prevValue = this.previousValue();
             const isInitialized = this.initialized();
             // Check if value has actually changed
-            const valueChanged = !isEqual(currentValue, prevValue);
+            const valueChanged = !isEqual$1(currentValue, prevValue);
             // Determine if we should update:
             // 1. First initialization with a value
             // 2. Value becomes empty after initialization
@@ -12296,67 +13068,53 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
     }
     /**
-     * Update expose data for empty state
+     * Writes expose targets into context using per-path updates.
+     * Avoids `contextService.patch()` with nested objects: patch shallow-merges top-level keys only,
+     * 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() {
         const exposeValue = castArray(this.expose());
-        const itemToExpose = {};
         const items = this.selectedItems();
         const isEmpty = !items || items.length === 0;
-        // If items are empty, group expose configs by parent path and set parent to null
         if (isEmpty) {
             const parentPaths = new Set();
             exposeValue.forEach((i) => {
                 if (typeof i === 'string') {
-                    // For string expose, the path itself is the target
                     const pathParts = i.split('.');
                     if (pathParts.length > 1) {
-                        // Extract parent path (everything except the last part)
-                        const parentPath = pathParts.slice(0, -1).join('.');
-                        parentPaths.add(parentPath);
+                        parentPaths.add(pathParts.slice(0, -1).join('.'));
                     }
                     else {
-                        // Single level path, set directly to null
-                        setSmart(itemToExpose, i, null);
+                        this.contextService.update(i, null);
                     }
                 }
                 else {
-                    // For object expose, extract parent path from target
                     const pathParts = i.target.split('.');
                     if (pathParts.length > 1) {
-                        // Extract parent path (everything except the last part)
-                        const parentPath = pathParts.slice(0, -1).join('.');
-                        parentPaths.add(parentPath);
+                        parentPaths.add(pathParts.slice(0, -1).join('.'));
                     }
                     else {
-                        // Single level path, set directly to null
-                        setSmart(itemToExpose, i.target, null);
+                        this.contextService.update(i.target, null);
                     }
                 }
             });
-            // Set all parent paths to null
             parentPaths.forEach((parentPath) => {
-                setSmart(itemToExpose, parentPath, null);
-            });
-        }
-        else {
-            // Normal processing when items exist
-            exposeValue.forEach((i) => {
-                if (typeof i == 'string') {
-                    const values = items.map((item) => set({}, i, get(item, i)));
-                    setSmart(itemToExpose, i, this.singleOrMultiple(values));
-                }
-                else {
-                    // extract data from item by source path and set context by target path
-                    const values = this.multiple()
-                        ? items.map((item) => set({}, i.source, get(item, i.source)))
-                        : items.map((item) => get(item, i.source));
-                    setSmart(itemToExpose, i.target, this.singleOrMultiple(values));
-                }
+                this.contextService.update(parentPath, null);
             });
+            return;
         }
-        setTimeout(() => {
-            this.contextService.patch(itemToExpose, true);
+        exposeValue.forEach((i) => {
+            if (typeof i === 'string') {
+                const values = items.map((item) => set({}, i, get(item, i)));
+                this.contextService.update(i, this.singleOrMultiple(values));
+            }
+            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));
+            }
         });
     }
     singleOrMultiple(values) {
@@ -12517,36 +13275,47 @@ var lookupWidgetEdit_component = /*#__PURE__*/Object.freeze({
 
 class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
     constructor() {
-        super(...arguments);
-        //#region ----   Dependencies   ----
+        super();
+        //#region ---- Dependencies ----
         this.entityDetailPopoverService = inject(AXPEntityDetailPopoverService);
-        this.mlResolver = inject(AXTranslationService);
+        this.translation = inject(AXTranslationService);
         this.formatService = inject(AXFormatService);
+        this.entityService = inject(AXPEntityService);
+        this.queryExecutor = inject(AXPQueryExecutor);
         //#endregion
-        //#region ----   View Children   ----
+        //#region ---- View Children ----
         this.moreButton = viewChild('moreButton', ...(ngDevMode ? [{ debugName: "moreButton" }] : /* istanbul ignore next */ []));
+        this.lazyTrigger = viewChild('lazyTrigger', ...(ngDevMode ? [{ debugName: "lazyTrigger" }] : /* istanbul ignore next */ []));
         this.morePopover = viewChild('morePopover', ...(ngDevMode ? [{ debugName: "morePopover" }] : /* istanbul ignore next */ []));
         //#endregion
-        //#region ----   Properties   ----
+        //#region ---- Properties ----
         this.host = inject(ElementRef);
         this.valueField = this.options['valueField'] ?? 'id';
         this.textField = this.options['textField'] ?? 'title';
-        this.entity = this.options['entity'] ?? 'title';
+        this.entity = this.options['entity'] ?? '';
         this.columnName = this.options['columnName'] ?? 'title';
         this.maxVisible = this.options['maxVisible'] ?? 2;
         this.displayFormat = computed(() => {
             const template = this.options['displayFormat'];
             return template ? template.replace(/\{/g, '{{').replace(/\}/g, '}}') : undefined;
         }, ...(ngDevMode ? [{ debugName: "displayFormat" }] : /* istanbul ignore next */ []));
-        this.displayField = computed(() => {
-            return this.textField ?? 'title';
-        }, ...(ngDevMode ? [{ debugName: "displayField" }] : /* istanbul ignore next */ []));
+        this.displayField = computed(() => this.textField ?? 'title', ...(ngDevMode ? [{ debugName: "displayField" }] : /* istanbul ignore next */ []));
+        this.columnResolve = computed(() => this.options['columnResolve'], ...(ngDevMode ? [{ debugName: "columnResolve" }] : /* istanbul ignore next */ []));
+        this.resolveStrategy = computed(() => {
+            return this.columnResolve()?.strategy ?? 'hydrated';
+        }, ...(ngDevMode ? [{ debugName: "resolveStrategy" }] : /* istanbul ignore next */ []));
+        this.isHydratedStrategy = computed(() => this.resolveStrategy() === 'hydrated', ...(ngDevMode ? [{ debugName: "isHydratedStrategy" }] : /* istanbul ignore next */ []));
         //#endregion
-        //#region ----   Signals   ----
+        //#region ---- Signals ----
         this.isMorePopoverOpen = signal(false, ...(ngDevMode ? [{ debugName: "isMorePopoverOpen" }] : /* istanbul ignore next */ []));
         this.selectedItemIndex = signal(-1, ...(ngDevMode ? [{ debugName: "selectedItemIndex" }] : /* istanbul ignore next */ []));
+        this.resolvedPopoverItems = signal([], ...(ngDevMode ? [{ debugName: "resolvedPopoverItems" }] : /* istanbul ignore next */ []));
+        this.resolveStatus = signal('idle', ...(ngDevMode ? [{ debugName: "resolveStatus" }] : /* istanbul ignore next */ []));
+        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 */ []));
         //#endregion
-        //#region ----   Computed Properties   ----
+        //#region ---- Computed ----
         this.displayItems = computed(() => isNil(this.rawValue)
             ? []
             : castArray(this.rawValue)
@@ -12557,34 +13326,127 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
             const items = this.allItems();
             return items.slice(0, this.maxVisible);
         }, ...(ngDevMode ? [{ debugName: "visibleItems" }] : /* istanbul ignore next */ []));
-        this.hasMoreItems = computed(() => {
-            return this.allItems().length > this.maxVisible;
-        }, ...(ngDevMode ? [{ debugName: "hasMoreItems" }] : /* istanbul ignore next */ []));
-        this.remainingItemsCount = computed(() => {
-            return this.allItems().length - this.maxVisible;
-        }, ...(ngDevMode ? [{ debugName: "remainingItemsCount" }] : /* istanbul ignore next */ []));
+        this.hasMoreItems = computed(() => this.allItems().length > this.maxVisible, ...(ngDevMode ? [{ debugName: "hasMoreItems" }] : /* istanbul ignore next */ []));
+        this.idsFromRow = computed(() => {
+            const cr = this.columnResolve();
+            const path = cr?.idsPath;
+            const source = path ? get(this.rowData, path) : this.rawValue;
+            if (isNil(source)) {
+                return [];
+            }
+            return castArray(source)
+                .map((x) => (typeof x === 'object' && x != null ? get(x, this.valueField) : x))
+                .filter((id) => id != null && id !== '');
+        }, ...(ngDevMode ? [{ debugName: "idsFromRow" }] : /* istanbul ignore next */ []));
+        this.displayCount = computed(() => {
+            const cr = this.columnResolve();
+            const countPath = cr?.countFieldPath;
+            if (countPath) {
+                const v = get(this.rowData, countPath);
+                if (typeof v === 'number' && !Number.isNaN(v)) {
+                    return v;
+                }
+                if (typeof v === 'string' && v !== '') {
+                    const n = Number(v);
+                    return Number.isNaN(n) ? 0 : n;
+                }
+                return 0;
+            }
+            if (this.resolveStrategy() === 'idsWithCount') {
+                return this.idsFromRow().length;
+            }
+            if (this.resolveStrategy() === 'countOnly') {
+                return 0;
+            }
+            return 0;
+        }, ...(ngDevMode ? [{ debugName: "displayCount" }] : /* istanbul ignore next */ []));
+        this.popoverListItems = computed(() => {
+            if (this.isHydratedStrategy()) {
+                return this.allItems();
+            }
+            return this.resolvedPopoverItems();
+        }, ...(ngDevMode ? [{ debugName: "popoverListItems" }] : /* istanbul ignore next */ []));
+        //#endregion
+        //#region ---- Constructor effects ----
+        /** Avoid resetting lazy cache on every CD when `rowData` is a new object reference for the same row. */
+        this.previousLazyRowId = undefined;
+        effect(() => {
+            const id = this.rowData?.['id'];
+            const key = id != null && id !== '' ? String(id) : undefined;
+            if (key === this.previousLazyRowId) {
+                return;
+            }
+            this.previousLazyRowId = key;
+            this.resetLazyState();
+        });
+        effect(() => {
+            if (!this.isHydratedStrategy()) {
+                const count = this.displayCount();
+                void this.refreshSummaryLabel(count);
+            }
+        });
+        effect(() => {
+            const hydrated = this.isHydratedStrategy();
+            const count = hydrated
+                ? this.allItems().length
+                : this.resolveStatus() === 'ready'
+                    ? this.resolvedPopoverItems().length
+                    : this.displayCount();
+            void this.refreshPopoverHeader(count);
+        });
     }
     //#endregion
-    //#region ----   Public Methods   ----
+    //#region ---- Public methods ----
     showMoreItems() {
         this.entityDetailPopoverService.hide();
-        this.openMorePopover();
+        this.openPopoverFromRef(this.moreButton());
+    }
+    openLazyPopover() {
+        this.entityDetailPopoverService.hide();
+        this.openPopoverFromRef(this.lazyTrigger());
+        if (!this.isHydratedStrategy()) {
+            void this.ensureLazyItemsLoaded();
+        }
     }
-    onMorePopoverOpenChange(event) {
-        this.isMorePopoverOpen.set(event);
+    onPopoverOpenChange(event) {
+        const open = this.coercePopoverOpenEvent(event);
+        this.isMorePopoverOpen.set(open);
+        if (open && !this.isHydratedStrategy()) {
+            void this.ensureLazyItemsLoaded();
+        }
     }
     async showItemDetail(item, index) {
         if (this.options['disableDetailPopover']) {
             return;
         }
-        const columnData = this.rowData[this.columnName];
-        const id = Array.isArray(columnData) ? columnData[index] : columnData;
         this.selectedItemIndex.set(index);
         this.closeMorePopover();
-        // Show entity detail popover using the service
+        // Prefer the row's FK / stored value (columnName) first. List columns often use options.dataPath so
+        // rawValue (and thus `item`) is only display text (e.g. manager.person.fullName) while managerId holds the real id.
+        const columnData = this.rowData?.[this.columnName];
+        let id;
+        if (Array.isArray(columnData)) {
+            const cell = columnData[index];
+            id =
+                typeof cell === 'object' && cell != null
+                    ? get(cell, this.valueField)
+                    : cell;
+        }
+        else if (!isNil(columnData) && columnData !== '') {
+            id =
+                typeof columnData === 'object' && columnData != null
+                    ? get(columnData, this.valueField)
+                    : columnData;
+        }
+        if (isNil(id) || id === '') {
+            id = get(item, this.valueField);
+        }
+        if (isNil(id) || id === '') {
+            return;
+        }
         await this.entityDetailPopoverService.show(this.host, {
             entity: this.entity,
-            id: id,
+            id,
             textField: this.textField,
             valueField: this.valueField,
             item,
@@ -12596,36 +13458,25 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         }
         const items = this.allItems();
         if (index < items.length) {
-            const item = items[index];
-            this.showItemDetail(item, index);
+            this.showItemDetail(items[index], index);
         }
     }
-    //#endregion
-    //#region ----   Private Methods   ----
-    openMorePopover() {
-        if (this.morePopover() && this.moreButton()) {
-            this.morePopover().target = this.moreButton().nativeElement;
-            this.morePopover().open();
-            this.isMorePopoverOpen.set(true);
+    handleResolvedItemClick(index) {
+        if (this.options['disableDetailPopover']) {
+            return;
         }
-    }
-    closeMorePopover() {
-        if (this.morePopover()) {
-            this.morePopover().close();
-            this.isMorePopoverOpen.set(false);
+        const items = this.resolvedPopoverItems();
+        if (index < items.length) {
+            this.showItemDetail(items[index], index);
         }
     }
-    extractItem(item) {
-        if (isNil(item)) {
-            return null;
+    handlePopoverItemClick(index) {
+        if (this.isHydratedStrategy()) {
+            this.handleItemClick(index);
         }
-        if (typeof item === 'object') {
-            return item;
+        else {
+            this.handleResolvedItemClick(index);
         }
-        return {
-            [this.valueField]: item,
-            [this.textField]: item,
-        };
     }
     getDisplayRaw(item) {
         if (isNil(item)) {
@@ -12643,6 +13494,178 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         }
         return resolved ?? '';
     }
+    //#endregion
+    //#region ---- Private methods ----
+    async refreshSummaryLabel(count) {
+        const text = await this.translation.translateAsync('@general:widgets.lookup.column.items-count', {
+            params: { count: String(count) },
+        });
+        this.summaryLabel.set(text);
+    }
+    async refreshPopoverHeader(count) {
+        const text = await this.translation.translateAsync('@general:widgets.lookup.column.popover-title', {
+            params: { count: String(count) },
+        });
+        this.popoverHeader.set(text);
+    }
+    resetLazyState() {
+        this.resolvedPopoverItems.set([]);
+        this.resolveStatus.set('idle');
+        this.resolveError.set(null);
+    }
+    openPopoverFromRef(ref) {
+        const popover = this.morePopover();
+        if (popover && ref) {
+            popover.target = ref.nativeElement;
+            popover.open();
+            this.isMorePopoverOpen.set(true);
+        }
+    }
+    closeMorePopover() {
+        const popover = this.morePopover();
+        if (popover) {
+            popover.close();
+            this.isMorePopoverOpen.set(false);
+        }
+    }
+    async ensureLazyItemsLoaded() {
+        if (this.resolveStatus() === 'loading') {
+            return;
+        }
+        const strategy = this.resolveStrategy();
+        if (strategy === 'idsWithCount') {
+            await this.loadByIds();
+            return;
+        }
+        if (strategy === 'countOnly') {
+            await this.loadByNamedQuery();
+        }
+    }
+    /**
+     * ax-popover may emit a boolean, CustomEvent with detail, or a DOM Event depending on version.
+     */
+    coercePopoverOpenEvent(event) {
+        if (typeof event === 'boolean') {
+            return event;
+        }
+        if (event && typeof event === 'object') {
+            const o = event;
+            if ('detail' in o) {
+                return Boolean(o['detail']);
+            }
+            if ('open' in o) {
+                return Boolean(o['open']);
+            }
+        }
+        return false;
+    }
+    async loadByIds() {
+        const ids = this.idsFromRow();
+        if (!ids.length) {
+            this.resolvedPopoverItems.set([]);
+            this.resolveStatus.set('ready');
+            return;
+        }
+        if (!this.entity?.includes('.')) {
+            const msg = await this.translation.translateAsync('@general:widgets.lookup.column.load-failed');
+            this.resolveError.set(msg);
+            this.resolveStatus.set('error');
+            return;
+        }
+        this.resolveStatus.set('loading');
+        this.resolveError.set(null);
+        try {
+            const accessor = this.entityService.withEntity(this.entity).data();
+            const results = await Promise.all(ids.map((id) => accessor.byKey(id)));
+            this.resolvedPopoverItems.set(results.filter((item) => item != null));
+            this.resolveStatus.set('ready');
+        }
+        catch {
+            const msg = await this.translation.translateAsync('@general:widgets.lookup.column.load-failed');
+            this.resolveError.set(msg);
+            this.resolveStatus.set('error');
+            this.resolvedPopoverItems.set([]);
+        }
+    }
+    async loadByNamedQuery() {
+        const cr = this.columnResolve();
+        const key = cr?.queryKey;
+        if (!key?.trim()) {
+            const msg = await this.translation.translateAsync('@general:widgets.lookup.column.load-failed');
+            this.resolveError.set(msg);
+            this.resolveStatus.set('error');
+            return;
+        }
+        this.resolveStatus.set('loading');
+        this.resolveError.set(null);
+        try {
+            const input = this.buildNamedQueryInput();
+            const result = await this.queryExecutor.fetch(key, input);
+            const items = this.extractItemsFromQueryResult(result);
+            this.resolvedPopoverItems.set(items);
+            this.resolveStatus.set('ready');
+        }
+        catch {
+            const msg = await this.translation.translateAsync('@general:widgets.lookup.column.load-failed');
+            this.resolveError.set(msg);
+            this.resolveStatus.set('error');
+            this.resolvedPopoverItems.set([]);
+        }
+    }
+    buildNamedQueryInput() {
+        const map = this.parseQueryParamsMap();
+        const row = this.rowData ?? {};
+        if (!map) {
+            return {};
+        }
+        const out = {};
+        for (const [param, path] of Object.entries(map)) {
+            out[param] = get(row, path);
+        }
+        return out;
+    }
+    parseQueryParamsMap() {
+        const raw = this.columnResolve()?.queryParams;
+        if (raw == null) {
+            return null;
+        }
+        if (typeof raw === 'string') {
+            try {
+                const parsed = JSON.parse(raw);
+                return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+                    ? parsed
+                    : null;
+            }
+            catch {
+                return null;
+            }
+        }
+        return raw;
+    }
+    extractItemsFromQueryResult(result) {
+        if (result == null) {
+            return [];
+        }
+        if (Array.isArray(result)) {
+            return result;
+        }
+        const cr = this.columnResolve();
+        const path = cr?.queryResultItemsPath ?? 'items';
+        const nested = get(result, path);
+        return Array.isArray(nested) ? nested : [];
+    }
+    extractItem(item) {
+        if (isNil(item)) {
+            return null;
+        }
+        if (typeof item === 'object') {
+            return item;
+        }
+        return {
+            [this.valueField]: item,
+            [this.textField]: item,
+        };
+    }
     resolveDisplayValue(item) {
         if (isNil(item)) {
             return '';
@@ -12657,18 +13680,18 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         if (!isNil(rawDisplayValue)) {
             return this.resolveDisplayValue(rawDisplayValue);
         }
-        if (this.mlResolver.isValidMultiLanguageObject(item)) {
-            return this.mlResolver.resolve(item);
+        if (this.translation.isValidMultiLanguageObject(item)) {
+            return this.translation.resolve(item);
         }
         return '';
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetColumnComponent, deps: null, 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: "morePopover", first: true, predicate: ["morePopover"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"ax-flex ax-gap-1 ax-items-center\">\n  <!-- Visible lookup chips (first N items) -->\n  @for (item of visibleItems(); track $index) {\n  @let label = getDisplayRaw(item);\n  <span [class.ax-cursor-pointer]=\"!options['disableDetailPopover']\"\n    [class.hover:ax-text-primary]=\"!options['disableDetailPopover']\"\n    [class.hover:ax-underline]=\"!options['disableDetailPopover']\" (click)=\"handleItemClick($index)\">\n    {{ label }}\n  </span>\n  <!-- Separator between chips -->\n  @if ($index < visibleItems().length - 1) { <span class=\"ax-text-muted\">\u2022</span>\n    }\n    }\n    <!-- No items -->\n    @empty {\n    <span class=\"ax-text-muted\">---</span>\n    }\n\n    <!-- Overflow: open popover with full list -->\n    @if (hasMoreItems()) {\n    <span\n      class=\"ax-absolute ax-flex ax-items-center ax-end-0 ax-px-1 ax-cursor-pointer ax-h-full hover:ax-primary-lighter\"\n      (click)=\"showMoreItems()\" #moreButton>\n      <i class=\"fa-light fa-ellipsis-vertical\"></i>\n    </span>\n    }\n</div>\n\n<!-- Full list when user expands overflow -->\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onMorePopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[280px]\">\n    <!-- Popover header -->\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">All {{ allItems().length }} Items</h3>\n    </div>\n    <!-- All items (scrollable) -->\n    <div class=\"ax-max-h-64 ax-flex ax-flex-col ax-gap-3\">\n      @for (item of allItems(); track $index) {\n      @let label = getDisplayRaw(item);\n      <span [class.ax-cursor-pointer]=\"!options['disableDetailPopover']\"\n        [class.hover:ax-text-primary]=\"!options['disableDetailPopover']\"\n        [class.hover:ax-underline]=\"!options['disableDetailPopover']\" (click)=\"showItemDetail(item, $index)\">\n        {{ label }}\n      </span>\n      }\n    </div>\n  </div>\n</ax-popover>", dependencies: [{ kind: "ngmodule", type: AXBadgeModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disablePanelClass", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "repositionOnScroll", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    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\n    [class.ax-cursor-pointer]=\"!options['disableDetailPopover']\"\n    [class.hover:ax-text-primary]=\"!options['disableDetailPopover']\"\n    [class.hover:ax-underline]=\"!options['disableDetailPopover']\"\n    (click)=\"handleItemClick($index)\"\n  >\n    {{ label }}\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 ax-min-w-[280px] ax-rounded-lg ax-border 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\n        [class.ax-cursor-pointer]=\"!options['disableDetailPopover']\"\n        [class.hover:ax-text-primary]=\"!options['disableDetailPopover']\"\n        [class.hover:ax-underline]=\"!options['disableDetailPopover']\"\n        (click)=\"handlePopoverItemClick($index)\"\n      >\n        {{ label }}\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: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disablePanelClass", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "repositionOnScroll", "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: [AXBadgeModule, AXButtonModule, AXPopoverModule], inputs: ['rawValue', 'rowData'], template: "<div class=\"ax-flex ax-gap-1 ax-items-center\">\n  <!-- Visible lookup chips (first N items) -->\n  @for (item of visibleItems(); track $index) {\n  @let label = getDisplayRaw(item);\n  <span [class.ax-cursor-pointer]=\"!options['disableDetailPopover']\"\n    [class.hover:ax-text-primary]=\"!options['disableDetailPopover']\"\n    [class.hover:ax-underline]=\"!options['disableDetailPopover']\" (click)=\"handleItemClick($index)\">\n    {{ label }}\n  </span>\n  <!-- Separator between chips -->\n  @if ($index < visibleItems().length - 1) { <span class=\"ax-text-muted\">\u2022</span>\n    }\n    }\n    <!-- No items -->\n    @empty {\n    <span class=\"ax-text-muted\">---</span>\n    }\n\n    <!-- Overflow: open popover with full list -->\n    @if (hasMoreItems()) {\n    <span\n      class=\"ax-absolute ax-flex ax-items-center ax-end-0 ax-px-1 ax-cursor-pointer ax-h-full hover:ax-primary-lighter\"\n      (click)=\"showMoreItems()\" #moreButton>\n      <i class=\"fa-light fa-ellipsis-vertical\"></i>\n    </span>\n    }\n</div>\n\n<!-- Full list when user expands overflow -->\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onMorePopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[280px]\">\n    <!-- Popover header -->\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">All {{ allItems().length }} Items</h3>\n    </div>\n    <!-- All items (scrollable) -->\n    <div class=\"ax-max-h-64 ax-flex ax-flex-col ax-gap-3\">\n      @for (item of allItems(); track $index) {\n      @let label = getDisplayRaw(item);\n      <span [class.ax-cursor-pointer]=\"!options['disableDetailPopover']\"\n        [class.hover:ax-text-primary]=\"!options['disableDetailPopover']\"\n        [class.hover:ax-underline]=\"!options['disableDetailPopover']\" (click)=\"showItemDetail(item, $index)\">\n        {{ label }}\n      </span>\n      }\n    </div>\n  </div>\n</ax-popover>" }]
-        }], propDecorators: { moreButton: [{ type: i0.ViewChild, args: ['moreButton', { isSignal: true }] }], morePopover: [{ type: i0.ViewChild, args: ['morePopover', { isSignal: true }] }] } });
+            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\n    [class.ax-cursor-pointer]=\"!options['disableDetailPopover']\"\n    [class.hover:ax-text-primary]=\"!options['disableDetailPopover']\"\n    [class.hover:ax-underline]=\"!options['disableDetailPopover']\"\n    (click)=\"handleItemClick($index)\"\n  >\n    {{ label }}\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 ax-min-w-[280px] ax-rounded-lg ax-border 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\n        [class.ax-cursor-pointer]=\"!options['disableDetailPopover']\"\n        [class.hover:ax-text-primary]=\"!options['disableDetailPopover']\"\n        [class.hover:ax-underline]=\"!options['disableDetailPopover']\"\n        (click)=\"handlePopoverItemClick($index)\"\n      >\n        {{ label }}\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({
     __proto__: null,
@@ -12730,6 +13753,100 @@ const AXPLookupWidget = {
             },
             visible: true,
         },
+        {
+            name: 'columnResolveStrategy',
+            title: 'Column resolve strategy',
+            group: AXP_DATA_PROPERTY_GROUP,
+            schema: {
+                dataType: 'string',
+                defaultValue: 'hydrated',
+                interface: {
+                    name: 'columnResolveStrategy',
+                    path: 'options.columnResolve.strategy',
+                    type: AXPWidgetsCatalog.select,
+                    valueTransforms: objectKeyValueTransforms('id'),
+                    options: {
+                        dataSource: [
+                            { id: 'hydrated', title: 'Hydrated (titles on row)' },
+                            { id: 'idsWithCount', title: 'Ids + count on row (load titles on open)' },
+                            { id: 'countOnly', title: 'Count on row (named query on open)' },
+                        ],
+                    },
+                },
+            },
+            visible: true,
+        },
+        {
+            name: 'columnResolveCountFieldPath',
+            title: 'Column resolve — count field path',
+            group: AXP_DATA_PROPERTY_GROUP,
+            schema: {
+                dataType: 'string',
+                interface: {
+                    name: 'columnResolveCountFieldPath',
+                    path: 'options.columnResolve.countFieldPath',
+                    type: AXPWidgetsCatalog.text,
+                },
+            },
+            visible: true,
+        },
+        {
+            name: 'columnResolveIdsPath',
+            title: 'Column resolve — ids path',
+            group: AXP_DATA_PROPERTY_GROUP,
+            schema: {
+                dataType: 'string',
+                interface: {
+                    name: 'columnResolveIdsPath',
+                    path: 'options.columnResolve.idsPath',
+                    type: AXPWidgetsCatalog.text,
+                },
+            },
+            visible: true,
+        },
+        {
+            name: 'columnResolveQueryKey',
+            title: 'Column resolve — query key (countOnly)',
+            group: AXP_DATA_PROPERTY_GROUP,
+            schema: {
+                dataType: 'string',
+                interface: {
+                    name: 'columnResolveQueryKey',
+                    path: 'options.columnResolve.queryKey',
+                    type: AXPWidgetsCatalog.text,
+                },
+            },
+            visible: true,
+        },
+        {
+            name: 'columnResolveQueryParams',
+            title: 'Column resolve — query params (JSON: param → row path)',
+            group: AXP_DATA_PROPERTY_GROUP,
+            schema: {
+                dataType: 'string',
+                interface: {
+                    name: 'columnResolveQueryParams',
+                    path: 'options.columnResolve.queryParams',
+                    type: AXPWidgetsCatalog.text,
+                },
+            },
+            visible: true,
+        },
+        {
+            name: 'columnResolveQueryResultItemsPath',
+            title: 'Column resolve — query result items path',
+            group: AXP_DATA_PROPERTY_GROUP,
+            schema: {
+                dataType: 'string',
+                defaultValue: 'items',
+                interface: {
+                    name: 'columnResolveQueryResultItemsPath',
+                    path: 'options.columnResolve.queryResultItemsPath',
+                    type: AXPWidgetsCatalog.text,
+                },
+            },
+            visible: true,
+        },
     ],
     components: {
         view: {
@@ -12747,6 +13864,8 @@ const AXPLookupWidget = {
     },
 };
 
+//#endregion
+
 /**
  * Source type
  */
@@ -15336,13 +16455,18 @@ class AXPDetailsViewBadgeStatusService {
             if (!entityDefinition) {
                 return null;
             }
-            const statusPlugin = entityDefinition.plugins?.find((p) => p.name === 'status');
-            if (!statusPlugin?.options) {
+            const statusPlugins = (entityDefinition.plugins ?? []).filter((p) => p.name === 'status');
+            if (statusPlugins.length === 0) {
                 return null;
             }
-            const statusOptions = statusPlugin.options;
+            const explicitPrimary = statusPlugins.find((p) => p.options?.isPrimary === true);
+            const primaryPlugin = explicitPrimary ??
+                statusPlugins.find((p) => p.options?.isPrimary !== false) ??
+                statusPlugins[0];
+            const statusOptions = primaryPlugin.options;
             const statusField = statusOptions.field ?? 'statusId';
             const statusDefinitionKey = statusOptions.definition;
+            const pluginReadonly = statusOptions.readonly === true;
             let definitionKey = typeof statusDefinitionKey === 'string' ? statusDefinitionKey : undefined;
             if (!definitionKey) {
                 const statusProperty = entityDefinition.properties?.find((p) => p.name === statusField);
@@ -15363,7 +16487,7 @@ class AXPDetailsViewBadgeStatusService {
                 definitionKey,
                 value: String(value),
                 dataPath: statusField,
-                readonly: currentPage?.isReadonly ?? false,
+                readonly: pluginReadonly || (currentPage?.isReadonly ?? false),
             };
         }
         catch (error) {
@@ -15546,34 +16670,35 @@ class AXPBaseRelatedEntityConverter {
             groups,
         };
     }
-    async createGridLayoutStructure(singleInterface, helpers, evaluateExpressions, includeProperties) {
-        return await this.createGridLayoutStructureInternal(singleInterface, helpers, evaluateExpressions, includeProperties);
+    createGridLayoutStructure(singleInterface, helpers, includeProperties) {
+        return this.createGridLayoutStructureInternal(singleInterface, helpers, includeProperties);
     }
-    //#region ----   Visible Evaluation Helpers   ----
-    async getVisiblePropertiesByGroupId(sectionId, helpers, evaluateExpressions, includeProperties) {
+    //#region ----   Property visibility (layout)   ----
+    /**
+     * Chooses which properties appear in the related-entity grid layout.
+     * Boolean `schema.visible === false` excludes a property. String templates are kept in the layout
+     * and passed on `form-field.options.visible`; `AXPWidgetRendererDirective` uses
+     * `AXPExpressionEvaluatorService` in `updateVisibility()` to evaluate them when context updates.
+     */
+    getVisiblePropertiesByGroupId(sectionId, helpers, includeProperties) {
         let properties = helpers.getPropertyByGroupId(sectionId) ?? [];
         // Filter by includeProperties if provided
         if (includeProperties && includeProperties.length > 0) {
             const includeSet = new Set(includeProperties);
             properties = properties.filter((p) => includeSet.has(p.name));
         }
-        const evaluated = await Promise.all(properties.map(async (property) => {
-            let visible = property?.schema?.visible;
-            if (typeof visible === 'string' && evaluateExpressions) {
-                try {
-                    const result = await evaluateExpressions({ visible });
-                    visible = result.visible;
-                }
-                catch {
-                    visible = true;
-                }
+        const evaluated = properties.map((property) => {
+            const visible = property?.schema?.visible;
+            if (typeof visible === 'string') {
+                // Include in layout; runtime evaluation via `AXPExpressionEvaluatorService` (widget renderer).
+                return { property, visible: true };
             }
             return { property, visible: visible ?? true };
-        }));
+        });
         return evaluated.filter((x) => x.visible !== false).map((x) => x.property);
     }
-    async createPropertyGrid(sectionId, helpers, evaluateExpressions, includeProperties) {
-        const visibleProperties = await this.getVisiblePropertiesByGroupId(sectionId, helpers, evaluateExpressions, includeProperties);
+    createPropertyGrid(sectionId, helpers, includeProperties) {
+        const visibleProperties = this.getVisiblePropertiesByGroupId(sectionId, helpers, includeProperties);
         return {
             type: 'grid-layout',
             mode: 'edit',
@@ -15588,6 +16713,15 @@ class AXPBaseRelatedEntityConverter {
             },
             children: visibleProperties.map((p) => {
                 const layout = helpers.getPropertyLayout(p.name);
+                const sv = p.schema?.visible;
+                let formFieldVisible;
+                if (typeof sv === 'string') {
+                    // Evaluated by `AXPExpressionEvaluatorService` in `AXPWidgetRendererDirective.updateVisibility()`.
+                    formFieldVisible = sv;
+                }
+                else if (sv === false) {
+                    formFieldVisible = false;
+                }
                 return {
                     type: 'grid-item-layout',
                     name: p.name,
@@ -15602,6 +16736,8 @@ class AXPBaseRelatedEntityConverter {
                             options: {
                                 label: p.title,
                                 showLabel: layout?.label?.visible ?? true,
+                                ...(formFieldVisible !== undefined ? { visible: formFieldVisible } : {}),
+                                ...(hintFormFieldOptionsFromDescription(p.description) ?? {}),
                             },
                             children: [
                                 {
@@ -15621,13 +16757,15 @@ class AXPBaseRelatedEntityConverter {
             }),
         };
     }
-    async createGridLayoutStructureInternal(singleInterface, helpers, evaluateExpressions, includeProperties) {
+    createGridLayoutStructureInternal(singleInterface, helpers, includeProperties) {
         // Filter out empty sections (sections with no visible properties)
-        const sectionsWithProperties = await Promise.all((singleInterface?.sections ?? []).map(async (s) => {
-            const visibleProperties = await this.getVisiblePropertiesByGroupId(s.id, helpers, evaluateExpressions, includeProperties);
+        const sectionsWithProperties = (singleInterface?.sections ?? []).map((s) => {
+            const visibleProperties = this.getVisiblePropertiesByGroupId(s.id, helpers, includeProperties);
             return { section: s, hasProperties: visibleProperties.length > 0 };
-        }));
-        const validSections = sectionsWithProperties.filter((item) => item.hasProperties).map((item) => item.section);
+        });
+        const validSections = sectionsWithProperties
+            .filter((item) => item.hasProperties)
+            .map((item) => item.section);
         return {
             type: 'grid-layout',
             options: {
@@ -15639,7 +16777,7 @@ class AXPBaseRelatedEntityConverter {
                     },
                 },
             },
-            children: await Promise.all(validSections.map(async (s) => ({
+            children: validSections.map((s) => ({
                 type: 'grid-item-layout',
                 name: s.id,
                 options: {
@@ -15653,11 +16791,12 @@ class AXPBaseRelatedEntityConverter {
                         options: {
                             title: helpers.getGroupById(s.id)?.title ?? '',
                             collapsible: true,
+                            showTitle: s.layout?.label?.visible ?? true,
                         },
-                        children: [await this.createPropertyGrid(s.id, helpers, evaluateExpressions, includeProperties)],
+                        children: [this.createPropertyGrid(s.id, helpers, includeProperties)],
                     },
                 ],
-            }))),
+            })),
         };
     }
 }
@@ -15860,7 +16999,7 @@ class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
             execute: this.createExecuteFunction(entityDef, actions, evaluateExpressions, context),
             actions: await this.buildEvaluatedActions(actions, evaluateExpressions),
             // tabs: [...tabDetailTabs, ...tabListTabs],
-            content: [await this.createGridLayoutStructure(helpers.singleInterface, helpers, evaluateExpressions, relatedEntity.properties)],
+            content: [this.createGridLayoutStructure(helpers.singleInterface, helpers, relatedEntity.properties)],
         };
     }
     //#region ----   Utility Methods   ----
@@ -16178,16 +17317,34 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                             evaluatedOptions = action.options;
                         }
                     }
-                    const actionData = action.scope == AXPEntityCommandScope.Selected
+                    let actionData = action.scope == AXPEntityCommandScope.Selected
                         ? executeContext
                         : evaluatedOptions?.['process']?.data || null;
-                    //TODO: This is a temporary solution to exclude properties from the related entity.
-                    // We need to find a better way to handle this.
-                    const excludeForCreateOrUpdate = (commandName === 'Entity:Create' || commandName === 'Entity:Update') &&
-                        relatedEntity.excludeProperties?.length;
-                    const mergedOptions = excludeForCreateOrUpdate
-                        ? { ...evaluatedOptions, excludeProperties: relatedEntity.excludeProperties }
-                        : evaluatedOptions;
+                    const foreignKeyField = relatedEntity.persistence?.foreignKeyField;
+                    if (commandName === 'Entity:Create' && foreignKeyField && context.context) {
+                        const parentId = get(context.context, 'id');
+                        actionData = {
+                            ...(typeof actionData === 'object' && actionData !== null ? actionData : {}),
+                            ...(parentId !== undefined && parentId !== null && parentId !== ''
+                                ? { [foreignKeyField]: parentId }
+                                : {}),
+                        };
+                    }
+                    const createExcludes = [
+                        ...new Set([
+                            ...(relatedEntity.excludeProperties ?? []),
+                            ...(commandName === 'Entity:Create' && foreignKeyField ? [foreignKeyField] : []),
+                        ]),
+                    ];
+                    const excludeForCreate = commandName === 'Entity:Create' && createExcludes.length > 0;
+                    const excludeForUpdate = commandName === 'Entity:Update' &&
+                        relatedEntity.excludeProperties &&
+                        relatedEntity.excludeProperties.length > 0;
+                    const mergedOptions = excludeForCreate
+                        ? { ...evaluatedOptions, excludeProperties: createExcludes }
+                        : excludeForUpdate
+                            ? { ...evaluatedOptions, excludeProperties: relatedEntity.excludeProperties }
+                            : evaluatedOptions;
                     if (context.commandService.exists(commandName)) {
                         // check options for evaluation
                         await context.commandService.execute(commandName, {
@@ -16252,6 +17409,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                         includeColumns,
                         relatedTableColumns,
                         customFilterDefinitions: relatedEntity.customFilterDefinitions,
+                        excludeProperties: relatedEntity.excludeProperties,
                     },
                 },
             ],
@@ -16310,7 +17468,7 @@ class AXPTabDetailsConverter extends AXPBaseRelatedEntityConverter {
             title: relatedEntity.title ?? entityDef?.title ?? '',
             icon: relatedEntity.icon || entityDef.icon,
             content: [
-                await this.createGridLayoutStructure(helpers.singleInterface, helpers, undefined, relatedEntity.properties),
+                this.createGridLayoutStructure(helpers.singleInterface, helpers, relatedEntity.properties),
             ],
         };
     }
@@ -16370,6 +17528,7 @@ class AXPTabListConverter extends AXPBaseRelatedEntityConverter {
                         includeColumns,
                         relatedTableColumns,
                         customFilterDefinitions: relatedEntity.customFilterDefinitions,
+                        excludeProperties: relatedEntity.excludeProperties,
                     },
                 },
             ],
@@ -16866,20 +18025,18 @@ class AXPMainEntityContentBuilder {
                             const visibleInRelated = isFromRelated ? !!p.__layout : false;
                             return visibleInMain || visibleInRelated;
                         });
-                        const visibilityEvaluated = await Promise.all(inView.map(async (p) => {
-                            let visible = p.schema?.visible;
-                            if (typeof visible === 'string' && evaluateExpressions) {
-                                try {
-                                    const result = await evaluateExpressions({ visible });
-                                    visible = result.visible;
-                                }
-                                catch {
-                                    visible = true;
-                                }
+                        // String `schema.visible` is not evaluated here (no `dependencies.expressionEvaluator` call).
+                        // The template is placed on `form-field.options.visible` below; at render time
+                        // `AXPWidgetRendererDirective` injects `AXPExpressionEvaluatorService` and evaluates it in
+                        // `updateVisibility()` (and on context changes via `hasVisibilityDependency`). Evaluating once
+                        // at build time would freeze visibility and break detail/edit when data changes.
+                        const visibilityEvaluated = inView.map((p) => {
+                            const v = p.schema?.visible;
+                            if (typeof v === 'string') {
+                                return { property: p, resolvedVisible: true };
                             }
-                            const resolved = visible !== false;
-                            return { property: p, resolvedVisible: resolved };
-                        }));
+                            return { property: p, resolvedVisible: v !== false };
+                        });
                         const visibleProperties = visibilityEvaluated
                             .filter((x) => x.resolvedVisible)
                             .map((x) => x.property);
@@ -16903,6 +18060,7 @@ class AXPMainEntityContentBuilder {
                                     collapsible: true,
                                     isOpen: !s.collapsed,
                                     look: 'card',
+                                    showTitle: s.layout?.label?.visible !== false,
                                 },
                                 children: [
                                     {
@@ -16927,8 +18085,9 @@ class AXPMainEntityContentBuilder {
                                             const hasOwnDisabled = p.schema.interface?.options?.disabled !== undefined;
                                             let formFieldVisible;
                                             const sv = p.schema?.visible;
+                                            // Template strings are evaluated by `AXPExpressionEvaluatorService` in the widget renderer, not here.
                                             if (typeof sv === 'string') {
-                                                formFieldVisible = true;
+                                                formFieldVisible = sv;
                                             }
                                             else if (sv === false) {
                                                 formFieldVisible = false;
@@ -16945,6 +18104,7 @@ class AXPMainEntityContentBuilder {
                                                     rowStart: layout?.positions?.lg?.rowStart,
                                                     rowEnd: layout?.positions?.lg?.rowEnd,
                                                     ...(formFieldVisible !== undefined ? { visible: formFieldVisible } : {}),
+                                                    ...(hintFormFieldOptionsFromDescription(p.description) ?? {}),
                                                 },
                                                 children: [
                                                     {
@@ -17942,6 +19102,7 @@ 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);
                         return { id: res };
                     },
@@ -17957,6 +19118,7 @@ const AXPCrudModifier = {
             if (!command?.update) {
                 command.update = {
                     execute: async (data) => {
+                        console.log('update', ctx.module.get() + '.' + ctx.name.get(), data);
                         return await dataService.updateOne(data.id, data);
                     },
                 };
@@ -17971,7 +19133,6 @@ const AXPCrudModifier = {
                 queries.byKey = {
                     execute: async (id) => {
                         const data = await dataService.getOne(id);
-                        // debugger;
                         return data;
                     },
                     type: AXPEntityQueryType.Single,
@@ -17980,6 +19141,7 @@ const AXPCrudModifier = {
             if (!queries?.list) {
                 queries.list = {
                     execute: async (e) => {
+                        console.log('query', ctx.module.get() + '.' + ctx.name.get(), e);
                         return await dataService.query(e);
                     },
                     type: AXPEntityQueryType.List,
@@ -18575,10 +19737,34 @@ class AXPShowListViewAction extends AXPWorkflowAction {
         this.sessionService = inject(AXPSessionService);
     }
     async execute(context) {
-        const [moduleName, entityName] = context.getVariable('entity').split(".");
+        const entity = context.getVariable('entity');
+        const [moduleName, entityName] = entity.split('.');
         const newPayload = {
             commands: `/${this.sessionService.application?.name}/m/${moduleName}/e/${entityName}/list`,
         };
+        const conditions = context.getVariable('conditions');
+        if (Array.isArray(conditions) && conditions.length > 0) {
+            const filterQueries = conditions
+                .map((c) => {
+                const field = c.name ?? c.field;
+                if (!field || c.value === undefined || c.value === null || c.value === '') {
+                    return null;
+                }
+                return {
+                    field,
+                    operator: c.operator ?? { type: 'equal' },
+                    value: c.value,
+                };
+            })
+                .filter((entry) => entry !== null);
+            if (filterQueries.length > 0) {
+                newPayload.extras = {
+                    queryParams: {
+                        filters: JSON.stringify(filterQueries),
+                    },
+                };
+            }
+        }
         context.setVariable('payload', newPayload);
         this.navigation.execute(context);
     }
@@ -19145,244 +20331,9 @@ var getEntityDetails_query = /*#__PURE__*/Object.freeze({
     AXPGetEntityDetailsQuery: AXPGetEntityDetailsQuery
 });
 
-// #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,
-    };
-}
-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,
-    };
-}
-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) {
-        actions.push(entityDetailsCreateActions(parentId));
-    }
-    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.
- * - For arrays of primitives or objects without id, uses deep equality.
- * - For scalars/objects, reports oldValue/newValue when changed.
- */
-function detectEntityChanges(oldObj, newObj) {
-    return transform(newObj, (result, value, key) => {
-        if (!isEqual$1(value, oldObj[key])) {
-            const oldValue = oldObj[key];
-            if (Array.isArray(value) || Array.isArray(oldValue)) {
-                const oldArray = Array.isArray(oldValue) ? oldValue : [];
-                const newArray = Array.isArray(value) ? value : [];
-                const hasId = newArray.length > 0 && typeof newArray[0] === 'object' && newArray[0] !== null && 'id' in newArray[0];
-                if (hasId) {
-                    const added = newArray.filter((item) => !oldArray.some((oldItem) => oldItem.id === item.id));
-                    const removed = oldArray.filter((item) => !newArray.some((newItem) => newItem.id === item.id));
-                    result[key] = { oldValue, newValue: value, added, removed };
-                }
-                else {
-                    const added = newArray.filter((item) => !oldArray.some((oldItem) => isEqual$1(item, oldItem)));
-                    const removed = oldArray.filter((item) => !newArray.some((newItem) => isEqual$1(item, newItem)));
-                    result[key] = { oldValue, newValue: value, added, removed };
-                }
-            }
-            else {
-                result[key] = { oldValue, newValue: value };
-            }
-        }
-    }, {});
-}
-//#endregion
-
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionProviderWidget, AXPEntityDefinitionProviderWidgetEditComponent, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListTableService, AXPEntityListToolbarService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityPreloadFiltersContainerComponent, AXPEntityPreloadFiltersViewModel, AXPEntityPreloadFiltersViewModelResolver, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, 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, EntityBuilder, EntityDataAccessor, actionExists, axpCreateEntityAiToolInputDefaults, axpCreateEntityCommandDefinition, cloneLayoutArrays, columnOrderingMiddleware, columnOrderingMiddlewareProvider, columnWidthMiddleware, columnWidthMiddlewareProvider, createColumnOrderingMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, defaultMultiLanguageMiddleware, defaultMultiLanguageMiddlewareProvider, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, getMasterInterfacePropertySortKey, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider, provideEntity, resolveEntityPluginDetailPageOrder, searchResultDescriptionMiddleware, searchResultDescriptionMiddlewareProvider };
+export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionProviderWidget, AXPEntityDefinitionProviderWidgetEditComponent, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListTableService, AXPEntityListToolbarService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityPreloadFiltersContainerComponent, AXPEntityPreloadFiltersViewModel, AXPEntityPreloadFiltersViewModelResolver, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, 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, EntityBuilder, EntityDataAccessor, actionExists, axpCreateEntityAiToolInputDefaults, axpCreateEntityCommandDefinition, cloneLayoutArrays, collectNestedCreateHiddenProperties, columnOrderingMiddleware, columnOrderingMiddlewareProvider, columnWidthMiddleware, columnWidthMiddlewareProvider, createColumnOrderingMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, defaultMultiLanguageMiddleware, defaultMultiLanguageMiddlewareProvider, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCreateActionsDeferredParent, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, getMasterInterfacePropertySortKey, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider, mergeForeignKeyFieldIntoCreateActions, provideEntity, resolveEntityPluginDetailPageOrder, searchResultDescriptionMiddleware, searchResultDescriptionMiddlewareProvider };
 //# sourceMappingURL=acorex-platform-layout-entity.mjs.map