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

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

@@ -2,13 +2,16 @@ 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, 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, objectKeyValueTransforms, 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, AXP_COMMAND_DEFINITION_CATEGORY_ENTITY, AXPCommandService, AXPQueryService, AXPQueryExecutor, provideCommandSetups, provideQuerySetups, AXPCommandRegistry, AXPQueryRegistry } from '@acorex/platform/runtime';
@@ -18,8 +21,6 @@ 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) => {
@@ -803,6 +803,308 @@ 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.
@@ -818,6 +1120,88 @@ function hintFormFieldOptionsFromDescription(description) {
 }
 //#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() {
@@ -825,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.
@@ -863,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);
         }
@@ -887,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);
         }
@@ -903,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);
         }
@@ -911,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;
@@ -971,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).
@@ -1000,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
@@ -1025,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
@@ -1198,118 +1589,270 @@ 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);
-                            // Section label visibility (fieldset title/legend)
-                            // Prefer current interface (create/update/single) section layout, fallback to master.single section layout.
-                            const sectionLabelVisible = section?.layout?.label?.visible ??
-                                entity?.interfaces?.master?.single?.sections?.find((s) => s?.id === groupId)?.layout?.label
-                                    ?.visible;
-                            if (sectionLabelVisible === false) {
-                                // Different parts of the system refer to this concept with different keys.
-                                // - Fieldset view renderer currently uses `showTitle`
-                                // - Fieldset designer/property system uses `showHeader`
-                                fs.setOptions({ showTitle: false, showHeader: false });
-                            }
-                            // 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 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);
+                        });
+                        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));
+                }
+            });
+            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') {
+                d.setActions((a) => a.submit('@general:actions.close.title'));
+            }
+            else {
+                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));
+            }
+            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);
+                    });
+                }
             });
-            // Actions: external if provided, otherwise default based on kind
-            if (this.externalActionsDelegate) {
-                d.setActions(this.externalActionsDelegate);
-            }
-            else if (this.kind === 'single') {
-                // For single (read-only view), only show cancel/close button
-                d.setActions((a) => a.cancel());
+        }
+    }
+    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;
             }
-            else {
-                // For create/update, show cancel + submit
-                d.setActions((a) => a.cancel().submit());
+            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 (this.onActionHandler) {
-                d.onAction(this.onActionHandler);
+            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 dialog;
+            return await userHandler(ref);
+        };
     }
     computeAllowedNames(allNames) {
         if (this.includeList && this.includeList.size > 0) {
@@ -1591,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;
@@ -1779,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);
@@ -1812,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) {
@@ -1837,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,
@@ -1869,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',
@@ -2013,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,
@@ -2024,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) {
@@ -2048,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');
@@ -2071,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
@@ -2117,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' }); }
@@ -3326,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;
@@ -4302,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;
@@ -10441,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(() => {
@@ -10491,12 +11048,32 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         const commandData = action?.scope == AXPEntityCommandScope.Selected
             ? this.selectedItems()
             : action?.options?.['process']?.data || null;
-        const evaluatedToolbarOptions = await this.evaluateToolbarExpressions(action?.options, commandData);
-        const relatedExcludes = this.options()['excludeProperties'];
-        const exclusions = relatedExcludes?.filter(Boolean);
-        const options = exclusions?.length && (command === 'Entity:Create' || command === 'Entity:Update')
-            ? { ...evaluatedToolbarOptions, excludeProperties: exclusions }
-            : evaluatedToolbarOptions;
+        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__: {
@@ -10536,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
@@ -10669,6 +11321,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                     columns: this.getValue()?.toolbar?.columns,
                 },
             });
+            queueMicrotask(() => {
+                void this.pushToolbarFiltersToDataSource();
+            });
         }, 100);
     }
     async ngAfterViewInit() {
@@ -10677,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
@@ -10685,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));
@@ -12262,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
@@ -12413,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);
-                    }
-                    else {
-                        // Single level path, set directly to null
-                        setSmart(itemToExpose, 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));
+                    if (pathParts.length > 1) {
+                        parentPaths.add(pathParts.slice(0, -1).join('.'));
+                    }
+                    else {
+                        this.contextService.update(i.target, null);
+                    }
                 }
             });
+            parentPaths.forEach((parentPath) => {
+                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) {
@@ -16676,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, {
@@ -18443,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 };
                     },
@@ -18458,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);
                     },
                 };
@@ -18472,7 +19133,6 @@ const AXPCrudModifier = {
                 queries.byKey = {
                     execute: async (id) => {
                         const data = await dataService.getOne(id);
-                        // debugger;
                         return data;
                     },
                     type: AXPEntityQueryType.Single,
@@ -18481,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,
@@ -19076,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);
     }
@@ -19646,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