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

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

@@ -1,18 +1,20 @@
+import { mergeForeignKeyFieldIntoCreateActions, collectNestedCreateHiddenProperties, normalizeEntityDisplayTemplate, sanitizeResolvedEntityDisplayTitle, isUnresolvedEntityDisplayTemplate, AXPEntityDataSourceKeys, AXPEntityEventsKeys, collectEntityListSortableFields, collectEntityListFilterDefinitions, parseDottedFieldPath, ENTITY_ROW_POPUP_TITLE_OPTION, buildEntitySearchTitleContext } from '@acorex/platform/layout/entity-contracts';
+export * from '@acorex/platform/layout/entity-contracts';
+export { collectNestedCreateHiddenProperties, entityDetailsCreateActions, entityDetailsCreateActionsDeferredParent, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, mergeForeignKeyFieldIntoCreateActions } from '@acorex/platform/layout/entity-contracts';
 import { AXToastService } from '@acorex/components/toast';
 import * as i3$1 from '@acorex/core/translation';
 import { AXTranslationService, resolveMultiLanguageString, AXTranslationModule, translateSync } from '@acorex/core/translation';
 import * as i4$2 from '@acorex/platform/common';
-import { AXPNotFoundError, AXPEntityCommandScope, axpNavigateAppPath, AXPSettingsService, AXPCommonSettings, resolveEntityModifyPopupTitle, resolveSearchableText, evaluateEntityDisplayTemplate, AXPFilterOperatorMiddlewareService, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPRefreshEvent, AXPReloadEvent, axpRedirectToNotFound, AXPCleanNestedFilters, AXPFileTypeProviderService, AXPFileStorageService, resolveEntityRowDisplayTitle, AXPFileActionsService, axpIsEntityRecordNotFound, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, AXPWorkflowNavigateAction, AXP_NOT_FOUND_ROUTE, AXP_PROTECTED_ROUTE_GUARDS, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXP_SEARCH_DEFINITION_LAZY_RESOLVER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
+import { AXPNotFoundError, AXPEntityCommandScope, axpNavigateAppPath, AXPSettingsService, AXPCommonSettings, resolveEntityCreateListBehavior, AXPRefreshEvent, resolveEntityModifyPopupTitle, resolveSearchableText, evaluateEntityDisplayTemplate, AXPFilterOperatorMiddlewareService, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPReloadEvent, axpRedirectToNotFound, AXP_ENTITY_DELETED_WORKFLOW_EVENT_TYPE, AXPCleanNestedFilters, AXPFileTypeProviderService, AXPFileStorageService, resolveEntityRowDisplayTitle, AXPFileActionsService, axpIsEntityRecordNotFound, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, AXPWorkflowNavigateAction, AXP_NOT_FOUND_ROUTE, AXP_PROTECTED_ROUTE_GUARDS, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXP_SEARCH_DEFINITION_LAZY_RESOLVER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
+import * as i1$3 from '@acorex/platform/workflow';
+import { AXPWorkflowEventService, AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, ChangeDetectorRef, input, signal, computed, effect, ChangeDetectionStrategy, Component, ElementRef, NgModule, viewChild, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, EnvironmentInjector, makeEnvironmentProviders } from '@angular/core';
-import { cloneDeep, merge, get, castArray, set, orderBy, isNil, isEmpty, isEqual as isEqual$1, isArray, isString } from 'lodash-es';
+import { cloneDeep, merge, get, castArray, set, orderBy, isNil, isEmpty, isEqual as isEqual$1, isObjectLike, isArray, has, isString } from 'lodash-es';
 import { Subject, filter, takeUntil } from 'rxjs';
 import { AXPLayoutBuilderService, LayoutBuilderModule } from '@acorex/platform/layout/builder';
 import { AXPWidgetsCatalog, AXPPlatformScope, AXPDataGenerator, AXPSystemActionType } from '@acorex/platform/contracts';
-import { AXPDeviceService, AXPExpressionEvaluatorService, AXPContextEvalFactory, AXPBroadcastEventService, applyFilterArray, applySortArray, resolveActionLook, AXPDistributedEventListenerService, AXHighlightService, extractValue, setSmart, getChangedPaths, objectKeyValueTransforms, AXPHookService, AXPComponentSlotModule, AXPContextStore, AXPColumnWidthService, AXPModuleManifestRegistry, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPModuleManifestsDataSourceDefinition } from '@acorex/platform/core';
-import { mergeForeignKeyFieldIntoCreateActions, collectNestedCreateHiddenProperties, normalizeEntityDisplayTemplate, sanitizeResolvedEntityDisplayTitle, isUnresolvedEntityDisplayTemplate, AXPEntityDataSourceKeys, AXPEntityEventsKeys, collectEntityListFilterDefinitions, ENTITY_ROW_POPUP_TITLE_OPTION, buildEntitySearchTitleContext } from '@acorex/platform/layout/entity-contracts';
-export * from '@acorex/platform/layout/entity-contracts';
-export { collectNestedCreateHiddenProperties, entityDetailsCreateActions, entityDetailsCreateActionsDeferredParent, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, mergeForeignKeyFieldIntoCreateActions } from '@acorex/platform/layout/entity-contracts';
+import { AXPDeviceService, AXPExpressionEvaluatorService, AXPContextEvalFactory, AXPBroadcastEventService, applyFilterArray, applySortArray, resolveActionLook, AXPDistributedEventListenerService, AXHighlightService, extractValue, setSmart, getChangedPaths, AXPContextStore, isSelectionValueEqual, AXPDebugService, FORM_DIRTY_TRACE_NS, objectKeyValueTransforms, setupPopupFooterKeyboardShortcuts, AXPHookService, AXPComponentSlotModule, AXPColumnWidthService, AXPModuleManifestRegistry, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPModuleManifestsDataSourceDefinition } from '@acorex/platform/core';
 import { transform, isEqual } from 'lodash';
 import { AXPSessionService, AXPPermissionDefinitionsDataSourceDefinition } from '@acorex/platform/auth';
 import { Router, NavigationStart, ActivatedRoute, RouterModule, ROUTES } from '@angular/router';
@@ -30,12 +32,10 @@ import { AXOverlayService } from '@acorex/cdk/overlay';
 import { AXLocaleService } from '@acorex/core/locale';
 import { AXPlatform } from '@acorex/core/platform';
 import { AXPThemeLayoutBlockComponent, AXPPreloadFiltersComponent, AXP_PAGE_COMPONENT_PROVIDER, AXPStateMessageComponent, AXPColumnItemListComponent, AXPDataSelectorService, AXPPageComponentRegistryService } from '@acorex/platform/layout/components';
-import { AXPPageLayoutBaseComponent, AXPPageLayoutComponent, AXPPageComponentRendererDirective, AXPPageComponentInstanceRegistryService, axpDetailsViewCanDeactivateGuard } from '@acorex/platform/layout/views';
+import { AXPPageLayoutBaseComponent, AXPPageLayoutComponent, AXPPageComponentRendererDirective, AXPPageComponentInstanceRegistryService, AXP_LAYOUT_DETAILS_VIEW_ADAPTER_LOADER, axpDetailsViewCanDeactivateGuard } from '@acorex/platform/layout/views';
 import { AXDataSource } from '@acorex/cdk/common';
 import { AXP_ENTITY_CRUD_SETUP } from '@acorex/platform/domain';
 export { AXP_ENTITY_DEFINITION_CRUD_SERVICE } from '@acorex/platform/domain';
-import * as i1$3 from '@acorex/platform/workflow';
-import { AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowEventService, AXPWorkflowModule } from '@acorex/platform/workflow';
 import { AXPLayoutThemeService } from '@acorex/platform/themes/shared';
 import { moveItemInArray } from '@angular/cdk/drag-drop';
 import { AXDialogService } from '@acorex/components/dialog';
@@ -2302,6 +2302,7 @@ class AXPCreateEntityCommand {
         this.translationService = inject(AXTranslationService);
         this.settingsService = inject(AXPSettingsService);
         this.openEntityDetailsCommand = inject(AXPOpenEntityDetailsCommand);
+        this.workflowEventService = inject(AXPWorkflowEventService);
         this.context = {};
     }
     async execute(input) {
@@ -2359,7 +2360,6 @@ class AXPCreateEntityCommand {
             const createFn = entityRef.commands?.create?.execute;
             const updateFn = entityRef.commands?.update?.execute;
             const context = merge({}, data, dialogRef.context());
-            console.log('context', context);
             const hasPersistedId = hasPersistedRootId(context);
             const persistFn = hasPersistedId ? updateFn : createFn;
             const missingPersistHandlerMsg = hasPersistedId
@@ -2417,13 +2417,24 @@ class AXPCreateEntityCommand {
             .show();
         const commandResult = result;
         const redirectOption = options?.process?.redirect;
-        const shouldRedirect = redirectOption !== undefined
-            ? redirectOption
-            : await this.settingsService.get(AXPCommonSettings.RedirectToDetailsAfterCreate);
-        if (commandResult.success && shouldRedirect && commandResult.data) {
+        const { shouldRedirect, shouldHighlight } = await resolveEntityCreateListBehavior(this.settingsService, {
+            redirect: redirectOption,
+        });
+        if (commandResult.success && commandResult.data) {
             const createdItem = commandResult.data?.item ?? commandResult.data;
-            const createdId = createdItem?.id;
-            if (createdId != null) {
+            const createdId = createdItem?.id ?? createdItem?._id;
+            const refreshMeta = { resetPagination: true };
+            if (createdId != null && shouldHighlight) {
+                refreshMeta['highlightRowId'] = createdId;
+            }
+            if (entityRef.parentKey && createdItem?.[entityRef.parentKey]) {
+                refreshMeta['refreshTargetId'] = createdItem[entityRef.parentKey];
+            }
+            this.workflowEventService.dispatch(AXPRefreshEvent({
+                entity: `${moduleName}.${entityName}`,
+                meta: refreshMeta,
+            }));
+            if (shouldRedirect && createdId != null) {
                 await this.openEntityDetailsCommand.execute({
                     entity: `${moduleName}.${entityName}`,
                     data: { id: String(createdId) },
@@ -3700,16 +3711,27 @@ function commandMessageTextForError(value) {
  * 2. Falls back to CRUD service if not defined
  */
 class EntityDataAccessor {
-    constructor(module, entity, entityRegistry, queryExecutor, commandService) {
+    constructor(module, entity, entityRegistry, queryExecutor, commandService, injector) {
         this.module = module;
         this.entity = entity;
         this.entityRegistry = entityRegistry;
         this.queryExecutor = queryExecutor;
         this.commandService = commandService;
+        this.injector = injector;
         this.crudService = null;
         this.entityDef = null;
         this.entityDefPromise = null;
     }
+    /**
+     * Lazily creates the CRUD fallback inside an injection context so {@link AXMEntityCrudServiceImpl}
+     * can resolve {@link AXPEntityStorageService} via `inject()`.
+     */
+    ensureCrudService() {
+        if (!this.crudService) {
+            this.crudService = runInInjectionContext(this.injector, () => new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`));
+        }
+        return this.crudService;
+    }
     /**
      * Resolves the entity definition lazily and caches it.
      * @returns The resolved entity definition
@@ -3742,10 +3764,7 @@ class EntityDataAccessor {
             return await this.queryExecutor.fetch(execute, key);
         }
         // Fallback to CRUD service
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.getOne(key);
+        return await this.ensureCrudService().getOne(key);
     }
     /**
      * Queries a list of entities.
@@ -3768,20 +3787,14 @@ class EntityDataAccessor {
             return result;
         }
         // Fallback to CRUD service
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.query(queryRequest);
+        return await this.ensureCrudService().query(queryRequest);
     }
     /**
      * Queries category entities linked to this entity (`{module}.{entity}Category`).
      * Falls back to CRUD category storage (same as {@link AXMEntityCrudServiceImpl.getCategoriesList}).
      */
     async getCategoriesList(request = { skip: 0, take: 1000 }) {
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.getCategoriesList(request);
+        return await this.ensureCrudService().getCategoriesList(request);
     }
     /**
      * Creates a new entity.
@@ -3803,10 +3816,7 @@ class EntityDataAccessor {
             return result.data?.id || result.data;
         }
         // Fallback to CRUD service
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.insertOne(data);
+        return await this.ensureCrudService().insertOne(data);
     }
     /**
      * Updates an existing entity.
@@ -3829,10 +3839,7 @@ class EntityDataAccessor {
             return result.data;
         }
         // Fallback to CRUD service
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.updateOne(id, data);
+        return await this.ensureCrudService().updateOne(id, data);
     }
     /**
      * Deletes an entity.
@@ -3853,10 +3860,7 @@ class EntityDataAccessor {
             return;
         }
         // Fallback to CRUD service
-        if (!this.crudService) {
-            this.crudService = new AXMEntityCrudServiceImpl(`${this.module}.${this.entity}`);
-        }
-        return await this.crudService.deleteOne(id);
+        return await this.ensureCrudService().deleteOne(id);
     }
 }
 //#endregion
@@ -3866,11 +3870,12 @@ class EntityDataAccessor {
  * Provides methods to create paths and access entity data.
  */
 class EntityBuilder {
-    constructor(module, entity, sessionService, entityRegistry, queryExecutor, commandService) {
+    constructor(module, entity, sessionService, entityRegistry, queryExecutor, commandService, injector) {
         this.sessionService = sessionService;
         this.entityRegistry = entityRegistry;
         this.queryExecutor = queryExecutor;
         this.commandService = commandService;
+        this.injector = injector;
         this.module = module;
         this.entity = entity;
     }
@@ -3888,7 +3893,7 @@ class EntityBuilder {
      * @returns An EntityDataAccessor instance
      */
     data() {
-        return new EntityDataAccessor(this.module, this.entity, this.entityRegistry, this.queryExecutor, this.commandService);
+        return new EntityDataAccessor(this.module, this.entity, this.entityRegistry, this.queryExecutor, this.commandService, this.injector);
     }
 }
 //#endregion
@@ -3898,6 +3903,7 @@ class AXPEntityService {
         this.entityRegistry = inject(AXPEntityDefinitionRegistryService);
         this.queryExecutor = inject(AXPQueryExecutor);
         this.commandService = inject(AXPCommandService);
+        this.injector = inject(Injector);
     }
     /**
      * @deprecated Use `withEntity(module, entity).createPath(path)` instead.
@@ -3923,7 +3929,7 @@ class AXPEntityService {
             module = moduleOrEntityKey.substring(0, dotIndex);
             entityName = moduleOrEntityKey.substring(dotIndex + 1);
         }
-        return new EntityBuilder(module, entityName, this.sessionService, this.entityRegistry, this.queryExecutor, this.commandService);
+        return new EntityBuilder(module, entityName, this.sessionService, this.entityRegistry, this.queryExecutor, this.commandService, this.injector);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityService, providedIn: 'root' }); }
@@ -4227,7 +4233,8 @@ const PLUGIN_SLOT_INDEX = {
     attachments: 1,
     documents: 2,
     comments: 3,
-    history: 4,
+    dashboard: 4,
+    history: 5,
 };
 //#endregion
 //#region ---- Helpers ----
@@ -5523,7 +5530,6 @@ class AXPEntityMasterListViewModel {
         this.primaryRowActions = computed(() => this.allActions().filter((a) => a.scope == AXPEntityCommandScope.Individual && a.priority === 'primary'), ...(ngDevMode ? [{ debugName: "primaryRowActions" }] : /* istanbul ignore next */ []));
         //****************** Filter ******************//
         this.filterQueries = signal([], ...(ngDevMode ? [{ debugName: "filterQueries" }] : /* istanbul ignore next */ []));
-        //****************** Columns ******************//
         this.allAvailableColumns = () => {
             const { columns = [], properties } = this.entityDef;
             // const visibleProperties = properties.filter(({ schema }) => schema?.visible !== false);
@@ -5531,13 +5537,15 @@ class AXPEntityMasterListViewModel {
             return columns
                 .filter(({ name, showAs, options }) => (propNames.has(name) || showAs) && options?.visible !== false)
                 .map((column) => {
+                const relatedProperty = this.resolveMergeDetailProperty(column.name);
                 if (column.showAs) {
                     const widgetConfig = this.widgetResolver.resolve(column.showAs.type);
                     const { title: _wcTitle, description: _wcDescription, ...widgetRest } = widgetConfig;
                     const property = {
                         ...widgetRest,
                         name: column.name,
-                        title: column.title ?? '',
+                        title: column.title ?? relatedProperty?.title ?? '',
+                        options: relatedProperty?.options,
                         schema: {
                             dataType: 'string',
                             interface: {
@@ -5566,18 +5574,16 @@ class AXPEntityMasterListViewModel {
         };
         this.cardFields = signal([], ...(ngDevMode ? [{ debugName: "cardFields" }] : /* istanbul ignore next */ []));
         //****************** Sort ******************//
+        this.sortableFieldDefinitions = signal([], ...(ngDevMode ? [{ debugName: "sortableFieldDefinitions" }] : /* istanbul ignore next */ []));
         this.sortableFields = () => {
-            const props = this.entityDef.properties.filter((c) => c.options?.sort?.enabled);
-            return props.map((e) => {
-                return {
-                    name: e.name,
-                    title: e.title,
-                    dir: undefined,
-                };
-            });
+            return this.sortableFieldDefinitions().map((field) => ({
+                name: field.name,
+                title: field.title,
+                dir: undefined,
+            }));
         };
         this.sortableFieldsCount = () => {
-            return this.entityDef.properties.filter((c) => c.options?.sort?.enabled).length ?? 0;
+            return this.sortableFieldDefinitions().length;
         };
         this.canSort = () => {
             return this.sortableFieldsCount() > 0;
@@ -6176,6 +6182,13 @@ class AXPEntityMasterListViewModel {
         }
         return false;
     }
+    /**
+     * Loads host and merge-detail related sortable field definitions (async registry resolution).
+     */
+    async loadSortableFields() {
+        const fields = await collectEntityListSortableFields(this.entityDef, (moduleName, entityName) => this.entityDefinitionRegistry.resolve(moduleName, entityName).catch(() => null));
+        this.sortableFieldDefinitions.set(fields);
+    }
     /**
      * Loads host and merge-detail related filter definitions (async registry resolution).
      */
@@ -6240,6 +6253,20 @@ class AXPEntityMasterListViewModel {
         this.dataSource.filter(transformedFilter);
         this.events$.next({ action: 'refresh', meta: { resetPagination: filtersChanged } });
     }
+    //****************** Columns ******************//
+    resolveMergeDetailProperty(columnName) {
+        const parsed = parseDottedFieldPath(columnName);
+        if (!parsed) {
+            return null;
+        }
+        const { dataPath, propertyName } = parsed;
+        const related = this.entityDef.relatedEntities?.find((entry) => entry.layout?.type === 'merge-detail' && entry.persistence?.dataPath?.trim() === dataPath);
+        if (!related?.entity) {
+            return null;
+        }
+        const relatedDef = this.getRegisteredEntity(related.entity);
+        return relatedDef?.properties?.find((property) => property.name === propertyName) ?? null;
+    }
     resetColumns() {
         this.applyViewColumns();
     }
@@ -6635,6 +6662,7 @@ class AXPEntityListViewModelFactory {
         this.layout.setNavigationLoading(false);
         const vm = new AXPEntityMasterListViewModel(this.injector, config);
         await vm.loadFilterDefinitions();
+        await vm.loadSortableFields();
         await vm.initializeListPersistence();
         return vm;
     }
@@ -6669,7 +6697,7 @@ const AXPEntityListViewModelResolver = async (route, state, service = inject(AXP
     }
 };
 
-const AXPEntityDeletedEvent = createWorkFlowEvent('[Entity] Deleted');
+const AXPEntityDeletedEvent = createWorkFlowEvent(AXP_ENTITY_DELETED_WORKFLOW_EVENT_TYPE);
 class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
     constructor() {
         super(...arguments);
@@ -9864,7 +9892,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         ></ax-button>
       </ax-suffix>
     </ax-footer>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }, { kind: "ngmodule", type: AXCheckBoxModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i4.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type", "autoSearch"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXSkeletonModule }, { kind: "component", type: i3.AXSkeletonComponent, selector: "ax-skeleton", inputs: ["animated"] }, { kind: "component", type: AXTreeViewComponent, selector: "ax-tree-view", inputs: ["datasource", "selectMode", "selectionBehavior", "dragArea", "dragBehavior", "showIcons", "showChildrenBadge", "expandedIcon", "collapsedIcon", "indentSize", "look", "nodeTemplate", "idField", "titleField", "tooltipField", "iconField", "expandedField", "selectedField", "indeterminateField", "disabledField", "hiddenField", "childrenField", "childrenCountField", "dataField", "inheritDisabled", "expandOnDoubleClick", "doubleClickDuration", "tooltipDelay", "controlledSelection", "selectedIds"], outputs: ["datasourceChange", "selectedIdsChange", "onBeforeDrop", "onNodeToggle", "onNodeSelect", "onNodeDoubleClick", "onNodeClick", "onSelectionChange", "onOrderChange", "onMoveChange", "onItemsChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "look"] }, { kind: "ngmodule", type: FormsModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "component", type: i2$1.AXBadgeComponent, selector: "ax-badge", inputs: ["color", "look", "text"] }, { kind: "ngmodule", type: AXCheckBoxModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i4.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type", "autoSearch"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXSkeletonModule }, { kind: "component", type: i3.AXSkeletonComponent, selector: "ax-skeleton", inputs: ["animated"] }, { kind: "component", type: AXTreeViewComponent, selector: "ax-tree-view", inputs: ["datasource", "selectMode", "selectionBehavior", "dragArea", "dragBehavior", "showIcons", "showChildrenBadge", "expandedIcon", "collapsedIcon", "indentSize", "look", "nodeTemplate", "idField", "titleField", "tooltipField", "iconField", "expandedField", "selectedField", "indeterminateField", "disabledField", "hiddenField", "childrenField", "childrenCountField", "dataField", "inheritDisabled", "expandOnDoubleClick", "doubleClickDuration", "tooltipDelay", "controlledSelection", "selectedIds"], outputs: ["datasourceChange", "selectedIdsChange", "onBeforeDrop", "onNodeToggle", "onNodeSelect", "onNodeDoubleClick", "onNodeClick", "onSelectionChange", "onOrderChange", "onMoveChange", "onItemsChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "titleParams", "descriptionParams", "look"] }, { kind: "ngmodule", type: FormsModule }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityCategoryTreeSelectorComponent, decorators: [{
             type: Component,
@@ -12213,7 +12241,7 @@ class AXPEntityListToolbarService {
         const toolbarOptions = {
             filterDefinitions: this.mergeFilterDefinitions(baseFilters, options?.customFilterDefinitions),
             columnDefinitions: this.createColumnDefinitions(entity, options),
-            sortDefinitions: this.createSortDefinitions(entity),
+            sortDefinitions: await this.createSortDefinitions(entity),
             canFilter: true,
             canColumns: true,
             canSort: true,
@@ -12339,23 +12367,14 @@ class AXPEntityListToolbarService {
     }
     /**
      * Create Sort Definitions for Toolbar.
-     * Includes entity.properties with sort enabled, plus enriched columns (dotted paths).
+     * Includes host properties and merge-detail related fields with sort enabled.
      */
-    createSortDefinitions(entity) {
-        const fromProperties = entity.properties
-            .filter((c) => c.options?.sort?.enabled)
-            .map((e) => ({ name: e.name, title: e.title }));
-        const columns = entity.columns ?? [];
-        const fromColumns = columns
-            .filter((col) => col.name.includes('.') && col.title)
-            .map((col) => ({ name: col.name, title: col.title ?? col.name }));
-        const seen = new Set();
-        return [...fromProperties, ...fromColumns].filter((s) => {
-            if (seen.has(s.name))
-                return false;
-            seen.add(s.name);
-            return true;
-        });
+    async createSortDefinitions(entity) {
+        const fields = await collectEntityListSortableFields(entity, (moduleName, entityName) => this.entityRegistry.resolve(moduleName, entityName).catch(() => null));
+        return fields.map((field) => ({
+            name: field.name,
+            title: field.title,
+        }));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityListToolbarService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityListToolbarService }); }
@@ -13390,7 +13409,7 @@ class AXPPageComponentWidgetViewComponent extends AXPBaseWidgetComponent {
             return;
         }
         for (const [path, value] of Object.entries(partial)) {
-            this.contextService.update(path, value);
+            this.contextService.update(path, value, { origin: 'user' });
         }
     }
     //#endregion
@@ -13801,6 +13820,108 @@ var lookupWidgetView_component = /*#__PURE__*/Object.freeze({
     AXPLookupWidgetViewComponent: AXPLookupWidgetViewComponent
 });
 
+//#region ----   Expression Scope   ----
+/**
+ * Builds the expression scope used to evaluate lookup `create.context` templates.
+ * Matches widget-renderer `context.eval` / `context.set` semantics.
+ */
+function buildLookupExpressionScope(contextService, parentPath) {
+    return {
+        context: {
+            eval: (path) => {
+                const fullPath = path.startsWith('>') && parentPath ? `${parentPath}.${path.substring(1)}` : path;
+                return contextService.getValue(fullPath);
+            },
+            set: (path, value) => {
+                contextService.update(path, value, { origin: 'user' });
+            },
+            data: () => contextService.data(),
+            isDirty: () => {
+                if (!contextService.isSavedCommitted()) {
+                    return false;
+                }
+                return contextService.isDirty();
+            },
+            options: (path) => {
+                if (path == null || path === '') {
+                    return contextService.getValue('options');
+                }
+                return contextService.getValue(`options.${path}`);
+            },
+        },
+        events: {},
+        widget: {},
+        methods: {},
+        vars: {},
+    };
+}
+//#endregion
+//#region ----   Create Context Evaluation   ----
+/**
+ * Deep-evaluates expression strings inside lookup `create.context` (e.g. parentId from context).
+ */
+async function evaluateLookupCreateContext(template, expressionEvaluator, scope) {
+    if (!template || !isObjectLike(template)) {
+        return {};
+    }
+    return (await evaluateLookupCreateContextValue(template, expressionEvaluator, scope));
+}
+async function evaluateLookupCreateContextValue(value, expressionEvaluator, scope) {
+    if (typeof value === 'string' && expressionEvaluator.isExpression(value)) {
+        return expressionEvaluator.evaluate(value, scope);
+    }
+    if (isArray(value)) {
+        const results = await Promise.all(value.map((entry) => evaluateLookupCreateContextValue(entry, expressionEvaluator, scope)));
+        return results;
+    }
+    if (isObjectLike(value)) {
+        const result = {};
+        for (const [key, entry] of Object.entries(value)) {
+            result[key] = await evaluateLookupCreateContextValue(entry, expressionEvaluator, scope);
+        }
+        return result;
+    }
+    return value;
+}
+/**
+ * Removes null/undefined entries from resolved create context before Entity:Create.
+ */
+function compactLookupCreateContext(data) {
+    const result = {};
+    for (const [key, value] of Object.entries(cloneDeep(data))) {
+        if (!isNil(value) && value !== '') {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+//#endregion
+
+//#endregion
+//#region ----   Resolution   ----
+/**
+ * Resolves lookup create options from `create` and legacy `allowCreate` (mode).
+ */
+function resolveLookupWidgetCreateOptions(options) {
+    const create = options.create;
+    const legacyMode = options.allowCreate;
+    const context = create?.context;
+    if (create?.enable !== undefined) {
+        if (!create.enable) {
+            return { enabled: false, mode: 'none', context };
+        }
+        const mode = legacyMode && legacyMode !== 'none' ? legacyMode : 'quick';
+        return { enabled: true, mode, context };
+    }
+    const mode = legacyMode ?? 'none';
+    return {
+        enabled: mode !== 'none',
+        mode,
+        context,
+    };
+}
+//#endregion
+
 //#endregion
 class AXPEntityDataSelectorRowActionsService {
     constructor() {
@@ -14077,11 +14198,20 @@ function mapLegacyEntityDataSelectorOptions(legacy) {
         normalized.category = { enabled: legacy.showCategoryFilter };
     }
     if (legacy.allowCreate !== undefined) {
-        normalized.create = { mode: legacy.allowCreate };
+        normalized.create = {
+            ...(legacy.allowCreate !== undefined && {
+                enable: legacy.allowCreate !== 'none',
+                mode: legacy.allowCreate,
+            }),
+            ...normalized.create,
+        };
     }
     if (legacy.rowActions !== undefined) {
         normalized.rowActions = legacy.rowActions;
     }
+    if (legacy.contextStore !== undefined) {
+        normalized.contextStore = legacy.contextStore;
+    }
     return normalized;
 }
 /**
@@ -14117,6 +14247,9 @@ function normalizeEntityDataSelectorOptions(options) {
     if (nested.create) {
         normalized.create = { ...normalized.create, ...nested.create };
     }
+    if (nested.contextStore !== undefined) {
+        normalized.contextStore = nested.contextStore;
+    }
     if (nested.rowActions !== undefined) {
         normalized.rowActions = nested.rowActions;
     }
@@ -14134,9 +14267,21 @@ class AXPEntityDataSelectorService {
         this.categoryTreeService = inject(AXPCategoryTreeService);
         this.translationService = inject(AXTranslationService);
         this.rowActionsService = inject(AXPEntityDataSelectorRowActionsService);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
     }
     //#endregion
     //#region ----   Public Methods   ----
+    /**
+     * Resolves lookup `create.context` templates using the provided form context store.
+     */
+    async resolveCreateContext(template, contextStore) {
+        if (!template || !contextStore) {
+            return {};
+        }
+        const scope = buildLookupExpressionScope(contextStore);
+        const resolved = await evaluateLookupCreateContext(template, this.expressionEvaluator, scope);
+        return compactLookupCreateContext(resolved);
+    }
     /**
      * Open entity data selector popup.
      * Accepts nested {@link AXPEntityDataSelectorOpenOptions} or deprecated flat {@link AXPEntityDataSelectorOptions}.
@@ -14152,8 +14297,8 @@ class AXPEntityDataSelectorService {
      * Execute Entity:Create and return created item.
      * Used by lookup widget and data selector for inline create.
      */
-    async executeEntityCreate(entity, mode) {
-        return this.executeCreate(entity, mode);
+    async executeEntityCreate(entity, mode, initialData = {}) {
+        return this.executeCreate(entity, mode, initialData);
     }
     /**
      * Normalize item's phones/emails for expose/display.
@@ -14216,7 +14361,16 @@ class AXPEntityDataSelectorService {
         const dataSource = this.createDataSource(options);
         const columns = this.createColumns(options);
         const searchFields = this.getSearchFields(options);
-        const allowCreate = options.create?.mode ?? this.getAllowCreate(options.entity);
+        const hasCreateConfig = options.create !== undefined;
+        const resolvedCreate = resolveLookupWidgetCreateOptions({
+            create: options.create,
+            allowCreate: options.create?.mode,
+        });
+        const allowCreate = hasCreateConfig
+            ? resolvedCreate.enabled
+                ? resolvedCreate.mode
+                : 'none'
+            : this.getAllowCreate(options.entity);
         const rowActions = options.rowActions
             ? this.rowActionsService.createHandler(options.entity, options.rowActions)
             : undefined;
@@ -14241,7 +14395,12 @@ class AXPEntityDataSelectorService {
             filter: options.filter?.value ? { value: options.filter.value } : undefined,
             create: {
                 mode: allowCreate,
-                onCreate: allowCreate !== 'none' ? (mode) => this.executeCreate(options.entity, mode) : undefined,
+                onCreate: allowCreate !== 'none'
+                    ? async (mode) => {
+                        const data = await this.resolveCreateContext(resolvedCreate.context, options.contextStore);
+                        return this.executeCreate(options.entity, mode, data);
+                    }
+                    : undefined,
             },
             rowActions,
         };
@@ -14389,7 +14548,7 @@ class AXPEntityDataSelectorService {
     /**
      * Execute Entity:Create and return created item
      */
-    async executeCreate(entity, mode) {
+    async executeCreate(entity, mode, initialData = {}) {
         const quickCreate = entity.interfaces?.master?.create?.quickCreate;
         const options = {};
         if (mode === 'quick' && quickCreate) {
@@ -14413,7 +14572,7 @@ class AXPEntityDataSelectorService {
                     title: entity.title,
                     parentKey: entity.parentKey,
                 },
-                data: {},
+                data: initialData,
                 options,
             },
         });
@@ -14890,6 +15049,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.entityDataSelectorService = inject(AXPEntityDataSelectorService);
         this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
         this.contextEvalFactory = inject(AXPContextEvalFactory);
+        this.contextStore = inject(AXPContextStore, { optional: true });
         //#endregion
         //#region ----   Inputs   ----
         this.selectedItems = input.required(...(ngDevMode ? [{ debugName: "selectedItems" }] : /* istanbul ignore next */ []));
@@ -14902,7 +15062,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.validationRules = input.required(...(ngDevMode ? [{ debugName: "validationRules" }] : /* istanbul ignore next */ []));
         this.placeholder = input(...(ngDevMode ? [undefined, { debugName: "placeholder" }] : /* istanbul ignore next */ []));
         this.hasClearButton = input(false, ...(ngDevMode ? [{ debugName: "hasClearButton" }] : /* istanbul ignore next */ []));
-        this.allowCreate = input('none', ...(ngDevMode ? [{ debugName: "allowCreate" }] : /* istanbul ignore next */ []));
+        this.resolvedCreate = input({ enabled: false, mode: 'none' }, ...(ngDevMode ? [{ debugName: "resolvedCreate" }] : /* istanbul ignore next */ []));
         this.allowUnselect = input(true, ...(ngDevMode ? [{ debugName: "allowUnselect" }] : /* istanbul ignore next */ []));
         // Entity and configuration data (for showSelector and searchByValue)
         this.entityDef = input.required(...(ngDevMode ? [{ debugName: "entityDef" }] : /* istanbul ignore next */ []));
@@ -15111,6 +15271,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
             .map((item) => get(item, this.valueField()()))
             .filter((id) => id != null);
         try {
+            const createOptions = this.resolvedCreate();
             const result = await this.entityDataSelectorService.open({
                 entity,
                 title: `${this.translateService.translateSync(entity.formats.plural ?? '')}`,
@@ -15119,7 +15280,12 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
                 filters: this.customFilter()(),
                 parentFilters: this.parentFilters(),
                 columns: this.columns()(),
-                allowCreate: this.allowCreate(),
+                create: {
+                    enable: createOptions.enabled,
+                    mode: createOptions.mode,
+                    context: createOptions.context,
+                },
+                contextStore: this.contextStore ?? undefined,
                 initialSearchTerm: searchTerm,
                 selectedItemIds: selectedItemIds.length > 0 ? selectedItemIds : undefined,
                 rowActions: this.rowActions(),
@@ -15145,7 +15311,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.clear();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetTagboxComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetTagboxComponent, isStandalone: true, selector: "axp-lookup-widget-tagbox", inputs: { selectedItems: { classPropertyName: "selectedItems", publicName: "selectedItems", isSignal: true, isRequired: true, transformFunction: null }, displayField: { classPropertyName: "displayField", publicName: "displayField", isSignal: true, isRequired: true, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: true, transformFunction: null }, displayFormat: { classPropertyName: "displayFormat", publicName: "displayFormat", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: true, transformFunction: null }, multiple: { classPropertyName: "multiple", publicName: "multiple", isSignal: true, isRequired: true, transformFunction: null }, isLoading: { classPropertyName: "isLoading", publicName: "isLoading", isSignal: true, isRequired: true, transformFunction: null }, validationRules: { classPropertyName: "validationRules", publicName: "validationRules", isSignal: true, isRequired: true, transformFunction: null }, placeholder: { classPropertyName: "placeholder", publicName: "placeholder", isSignal: true, isRequired: false, transformFunction: null }, hasClearButton: { classPropertyName: "hasClearButton", publicName: "hasClearButton", isSignal: true, isRequired: false, transformFunction: null }, allowCreate: { classPropertyName: "allowCreate", publicName: "allowCreate", isSignal: true, isRequired: false, transformFunction: null }, allowUnselect: { classPropertyName: "allowUnselect", publicName: "allowUnselect", isSignal: true, isRequired: false, transformFunction: null }, entityDef: { classPropertyName: "entityDef", publicName: "entityDef", isSignal: true, isRequired: true, transformFunction: null }, customFilter: { classPropertyName: "customFilter", publicName: "customFilter", isSignal: true, isRequired: true, transformFunction: null }, columns: { classPropertyName: "columns", publicName: "columns", isSignal: true, isRequired: true, transformFunction: null }, parentFilters: { classPropertyName: "parentFilters", publicName: "parentFilters", isSignal: true, isRequired: false, transformFunction: null }, rowActions: { classPropertyName: "rowActions", publicName: "rowActions", isSignal: true, isRequired: false, transformFunction: null }, onSetLoading: { classPropertyName: "onSetLoading", publicName: "onSetLoading", isSignal: true, isRequired: true, transformFunction: null } }, outputs: { valueChanged: "valueChanged" }, providers: [
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupWidgetTagboxComponent, isStandalone: true, selector: "axp-lookup-widget-tagbox", inputs: { selectedItems: { classPropertyName: "selectedItems", publicName: "selectedItems", isSignal: true, isRequired: true, transformFunction: null }, displayField: { classPropertyName: "displayField", publicName: "displayField", isSignal: true, isRequired: true, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: true, transformFunction: null }, displayFormat: { classPropertyName: "displayFormat", publicName: "displayFormat", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: true, transformFunction: null }, multiple: { classPropertyName: "multiple", publicName: "multiple", isSignal: true, isRequired: true, transformFunction: null }, isLoading: { classPropertyName: "isLoading", publicName: "isLoading", isSignal: true, isRequired: true, transformFunction: null }, validationRules: { classPropertyName: "validationRules", publicName: "validationRules", isSignal: true, isRequired: true, transformFunction: null }, placeholder: { classPropertyName: "placeholder", publicName: "placeholder", isSignal: true, isRequired: false, transformFunction: null }, hasClearButton: { classPropertyName: "hasClearButton", publicName: "hasClearButton", isSignal: true, isRequired: false, transformFunction: null }, resolvedCreate: { classPropertyName: "resolvedCreate", publicName: "resolvedCreate", isSignal: true, isRequired: false, transformFunction: null }, allowUnselect: { classPropertyName: "allowUnselect", publicName: "allowUnselect", isSignal: true, isRequired: false, transformFunction: null }, entityDef: { classPropertyName: "entityDef", publicName: "entityDef", isSignal: true, isRequired: true, transformFunction: null }, customFilter: { classPropertyName: "customFilter", publicName: "customFilter", isSignal: true, isRequired: true, transformFunction: null }, columns: { classPropertyName: "columns", publicName: "columns", isSignal: true, isRequired: true, transformFunction: null }, parentFilters: { classPropertyName: "parentFilters", publicName: "parentFilters", isSignal: true, isRequired: false, transformFunction: null }, rowActions: { classPropertyName: "rowActions", publicName: "rowActions", isSignal: true, isRequired: false, transformFunction: null }, onSetLoading: { classPropertyName: "onSetLoading", publicName: "onSetLoading", isSignal: true, isRequired: true, transformFunction: null } }, outputs: { valueChanged: "valueChanged" }, providers: [
             {
                 provide: LookupWidgetLookBase,
                 useExisting: AXPLookupWidgetTagboxComponent,
@@ -15284,7 +15450,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         },
                     ],
                 }]
-        }], propDecorators: { selectedItems: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectedItems", required: true }] }], displayField: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayField", required: true }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: true }] }], displayFormat: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayFormat", required: false }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: true }] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: true }] }], isLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "isLoading", required: true }] }], validationRules: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationRules", required: true }] }], placeholder: [{ type: i0.Input, args: [{ isSignal: true, alias: "placeholder", required: false }] }], hasClearButton: [{ type: i0.Input, args: [{ isSignal: true, alias: "hasClearButton", required: false }] }], allowCreate: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowCreate", required: false }] }], allowUnselect: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowUnselect", required: false }] }], entityDef: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityDef", required: true }] }], customFilter: [{ type: i0.Input, args: [{ isSignal: true, alias: "customFilter", required: true }] }], columns: [{ type: i0.Input, args: [{ isSignal: true, alias: "columns", required: true }] }], parentFilters: [{ type: i0.Input, args: [{ isSignal: true, alias: "parentFilters", required: false }] }], rowActions: [{ type: i0.Input, args: [{ isSignal: true, alias: "rowActions", required: false }] }], onSetLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "onSetLoading", required: true }] }], valueChanged: [{ type: i0.Output, args: ["valueChanged"] }], tagBox: [{ type: i0.ViewChild, args: ['tagBoxComponent', { isSignal: true }] }] } });
+        }], propDecorators: { selectedItems: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectedItems", required: true }] }], displayField: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayField", required: true }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: true }] }], displayFormat: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayFormat", required: false }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: true }] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: true }] }], isLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "isLoading", required: true }] }], validationRules: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationRules", required: true }] }], placeholder: [{ type: i0.Input, args: [{ isSignal: true, alias: "placeholder", required: false }] }], hasClearButton: [{ type: i0.Input, args: [{ isSignal: true, alias: "hasClearButton", required: false }] }], resolvedCreate: [{ type: i0.Input, args: [{ isSignal: true, alias: "resolvedCreate", required: false }] }], allowUnselect: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowUnselect", required: false }] }], entityDef: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityDef", required: true }] }], customFilter: [{ type: i0.Input, args: [{ isSignal: true, alias: "customFilter", required: true }] }], columns: [{ type: i0.Input, args: [{ isSignal: true, alias: "columns", required: true }] }], parentFilters: [{ type: i0.Input, args: [{ isSignal: true, alias: "parentFilters", required: false }] }], rowActions: [{ type: i0.Input, args: [{ isSignal: true, alias: "rowActions", required: false }] }], onSetLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "onSetLoading", required: true }] }], valueChanged: [{ type: i0.Output, args: ["valueChanged"] }], tagBox: [{ type: i0.ViewChild, args: ['tagBoxComponent', { isSignal: true }] }] } });
 
 class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     constructor() {
@@ -15327,7 +15493,10 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.allowUnselect = computed(() => this.options()['allowUnselect'] ?? true, ...(ngDevMode ? [{ debugName: "allowUnselect" }] : /* istanbul ignore next */ []));
         this.look = computed(() => this.options()['look'] ?? 'lookup', ...(ngDevMode ? [{ debugName: "look" }] : /* istanbul ignore next */ []));
         this.displayField = computed(() => resolveLookupDisplayField(this.entityDef(), { textField: this.textField() }), ...(ngDevMode ? [{ debugName: "displayField" }] : /* istanbul ignore next */ []));
-        this.allowCreate = computed(() => this.options()['allowCreate'] ?? 'none', ...(ngDevMode ? [{ debugName: "allowCreate" }] : /* istanbul ignore next */ []));
+        this.resolvedCreate = computed(() => resolveLookupWidgetCreateOptions({
+            create: this.options()['create'],
+            allowCreate: this.options()['allowCreate'],
+        }), ...(ngDevMode ? [{ debugName: "resolvedCreate" }] : /* istanbul ignore next */ []));
         this.selectorRowActions = computed(() => this.options()['selectorRowActions'], ...(ngDevMode ? [{ debugName: "selectorRowActions" }] : /* istanbul ignore next */ []));
         this.valueField = computed(() => this.entityDef()?.properties.find((c) => c.name == 'id')?.name ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : /* istanbul ignore next */ []));
         this.displayFormat = computed(() => resolveLookupDisplayTemplate(this.entityDef(), {
@@ -15373,6 +15542,12 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         //#region ----   Business Logic Methods (Passed to Dumb Components)   ----
         this.setLoading = (loading) => {
             this.isLoading.set(loading);
+            if (loading) {
+                this.beginHydration();
+            }
+            else {
+                this.endHydration();
+            }
         };
         /** @param syncContext When false, only updates UI (hydration/revert); skips context writes. */
         this.setItems = (items, syncContext = true) => {
@@ -15382,6 +15557,8 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             items = items.filter((item) => item != null);
             // Normalize phones/emails from repeater nested structure to { value: string }
             items = items.map((item) => this.entityDataSelectorService.normalizeItemContactArrays(item));
+            /** Preserve raw entity fields (e.g. MLS maps) before display-field resolution for expose writes. */
+            const itemsForExpose = cloneDeep(items);
             const displayField = this.displayField();
             items = items.map((item) => {
                 const raw = get(item, displayField);
@@ -15396,10 +15573,32 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             }
             const keys = items.map((item) => get(item, this.valueField()));
             const text = items.map((item) => this.mlsResolver.resolve(get(item, displayField)));
+            const newValue = this.singleOrMultiple(keys);
+            const widgetPath = this.fullPath();
+            const savedWidgetValue = widgetPath ? this.contextService.getSavedValue(widgetPath) : undefined;
+            const selectionMatchesSaved = this.contextService.isSavedCommitted() &&
+                widgetPath != null &&
+                isSelectionValueEqual(newValue, savedWidgetValue);
             if (this.expose()) {
-                this.expoesItems();
+                AXPDebugService.instance?.trace(FORM_DIRTY_TRACE_NS, 'lookup-widget', 'setItems expose', () => ({
+                    path: this.fullPath(),
+                    items: items.map((item) => get(item, this.valueField())),
+                    expose: this.expose(),
+                    selectionMatchesSaved,
+                }));
+                if (selectionMatchesSaved) {
+                    this.syncExposePathsToSavedBaseline();
+                }
+                else {
+                    this.expoesItems(itemsForExpose);
+                }
             }
-            const newValue = this.singleOrMultiple(keys);
+            AXPDebugService.instance?.trace(FORM_DIRTY_TRACE_NS, 'lookup-widget', 'setItems setValue', () => ({
+                path: this.fullPath(),
+                newValue,
+                keys,
+                syncContext,
+            }));
             if (this.filterMode()) {
                 this.setValue({
                     value: newValue,
@@ -15412,12 +15611,16 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             else {
                 this.setValue(newValue);
             }
+            if (this.expose() && selectionMatchesSaved) {
+                this.syncExposePathsToSavedBaseline();
+            }
         };
     }
     #efEntity;
     #efValue;
     async findByValue() {
         this.isLoading.set(true);
+        this.beginHydration();
         const rawValue = this.getValue();
         // When multiple is true, ensure we always work with arrays
         const values = this.multiple()
@@ -15426,6 +15629,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         if (!values.length) {
             this.setItems([], false);
             this.isLoading.set(false);
+            this.endHydration();
             return;
         }
         try {
@@ -15458,6 +15662,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
         finally {
             this.isLoading.set(false);
+            this.endHydration();
         }
     }
     //#region ----   Event Handlers from Dumb Components   ----
@@ -15468,7 +15673,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         const entity = this.entityDef();
         if (!entity || !entity.commands?.create?.execute)
             return;
-        const mode = this.allowCreate();
+        const { mode } = this.resolvedCreate();
         if (mode !== 'full' && mode !== 'quick')
             return;
         await this.executeCreate(mode);
@@ -15478,8 +15683,11 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         if (!entity || !entity.commands?.create?.execute)
             return;
         this.isLoading.set(true);
+        this.beginHydration();
         try {
-            const createdItem = await this.entityDataSelectorService.executeEntityCreate(entity, mode);
+            const { context } = this.resolvedCreate();
+            const createData = await this.entityDataSelectorService.resolveCreateContext(context, this.contextService);
+            const createdItem = await this.entityDataSelectorService.executeEntityCreate(entity, mode, createData);
             if (createdItem) {
                 const currentItems = this.selectedItems();
                 const valueField = this.valueField();
@@ -15499,6 +15707,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
         finally {
             this.isLoading.set(false);
+            this.endHydration();
         }
     }
     /**
@@ -15507,9 +15716,31 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
      * so e.g. `{ person: { educationLevel: { id, title } } }` would replace the entire `person`
      * object and drop sibling fields like `person.educationLevelId`, causing a value/effect loop.
      */
-    expoesItems() {
+    syncExposePathsToSavedBaseline() {
+        const exposeValue = castArray(this.expose());
+        const parentPaths = new Set();
+        exposeValue.forEach((item) => {
+            const target = typeof item === 'string' ? item : item.target;
+            if (target.includes('.')) {
+                parentPaths.add(target.split('.').slice(0, -1).join('.'));
+            }
+            this.contextService.syncPathToSavedBaseline(target, { origin: 'system' });
+        });
+        const saved = this.contextService.saved();
+        parentPaths.forEach((parentPath) => {
+            if (!has(saved, parentPath)) {
+                this.contextService.syncPathToSavedBaseline(parentPath, { origin: 'system' });
+            }
+        });
+        AXPDebugService.instance?.trace(FORM_DIRTY_TRACE_NS, 'lookup-widget', 'syncExposePathsToSavedBaseline', () => ({
+            path: this.fullPath(),
+            expose: this.expose(),
+            parentPaths: [...parentPaths],
+        }));
+    }
+    expoesItems(sourceItems) {
         const exposeValue = castArray(this.expose());
-        const items = this.selectedItems();
+        const items = sourceItems ?? this.selectedItems();
         const isEmpty = !items || items.length === 0;
         if (isEmpty) {
             const parentPaths = new Set();
@@ -15520,7 +15751,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                         parentPaths.add(pathParts.slice(0, -1).join('.'));
                     }
                     else {
-                        this.contextService.update(i, null);
+                        this.contextService.update(i, null, { origin: 'user' });
                     }
                 }
                 else {
@@ -15529,25 +15760,25 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                         parentPaths.add(pathParts.slice(0, -1).join('.'));
                     }
                     else {
-                        this.contextService.update(i.target, null);
+                        this.contextService.update(i.target, null, { origin: 'user' });
                     }
                 }
             });
             parentPaths.forEach((parentPath) => {
-                this.contextService.update(parentPath, null);
+                this.contextService.update(parentPath, null, { origin: 'user' });
             });
             return;
         }
         exposeValue.forEach((i) => {
             if (typeof i === 'string') {
                 const values = items.map((item) => set({}, i, get(item, i)));
-                this.contextService.update(i, this.singleOrMultiple(values));
+                this.contextService.update(i, this.singleOrMultiple(values), { origin: 'user' });
             }
             else {
                 const values = this.multiple()
                     ? items.map((item) => set({}, i.source, get(item, i.source)))
                     : items.map((item) => get(item, i.source));
-                this.contextService.update(i.target, this.singleOrMultiple(values));
+                this.contextService.update(i.target, this.singleOrMultiple(values), { origin: 'user' });
             }
         });
     }
@@ -15590,7 +15821,6 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
               [placeholder]="placeholder"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
-              [allowCreate]="allowCreate()"
               [showItemTooltip]="showItemTooltip()"
               [isItemTruncated]="isItemTruncated()"
               (valueChanged)="handleComponentValueChanged($event)"
@@ -15609,7 +15839,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
               [isLoading]="isLoading"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
-              [allowCreate]="allowCreate()"
+              [resolvedCreate]="resolvedCreate()"
               [allowUnselect]="allowUnselect()"
               [entityDef]="entityDef"
               [customFilter]="customFilter"
@@ -15621,7 +15851,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             />
           }
         }
-        @if (allowCreate() === 'quick' || allowCreate() === 'full') {
+        @if (resolvedCreate().enabled) {
           <div class="ax-sm">
             <ax-button
               color="primary"
@@ -15636,7 +15866,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
       </div>
     }
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPLookupWidgetSelectComponent, selector: "axp-lookup-widget-select", inputs: ["entityDef", "customFilter", "selectedItems", "displayField", "valueField", "disabled", "multiple", "validationRules", "placeholder", "hasClearButton", "allowCreate", "showItemTooltip", "isItemTruncated"], outputs: ["valueChanged"] }, { kind: "component", type: AXPLookupWidgetTagboxComponent, selector: "axp-lookup-widget-tagbox", inputs: ["selectedItems", "displayField", "valueField", "displayFormat", "disabled", "multiple", "isLoading", "validationRules", "placeholder", "hasClearButton", "allowCreate", "allowUnselect", "entityDef", "customFilter", "columns", "parentFilters", "rowActions", "onSetLoading"], outputs: ["valueChanged"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: AXPLookupWidgetSelectComponent, selector: "axp-lookup-widget-select", inputs: ["entityDef", "customFilter", "selectedItems", "displayField", "valueField", "disabled", "multiple", "validationRules", "placeholder", "hasClearButton", "allowCreate", "showItemTooltip", "isItemTruncated"], outputs: ["valueChanged"] }, { kind: "component", type: AXPLookupWidgetTagboxComponent, selector: "axp-lookup-widget-tagbox", inputs: ["selectedItems", "displayField", "valueField", "displayFormat", "disabled", "multiple", "isLoading", "validationRules", "placeholder", "hasClearButton", "resolvedCreate", "allowUnselect", "entityDef", "customFilter", "columns", "parentFilters", "rowActions", "onSetLoading"], outputs: ["valueChanged"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupWidgetEditComponent, decorators: [{
             type: Component,
@@ -15659,7 +15889,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
               [placeholder]="placeholder"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
-              [allowCreate]="allowCreate()"
               [showItemTooltip]="showItemTooltip()"
               [isItemTruncated]="isItemTruncated()"
               (valueChanged)="handleComponentValueChanged($event)"
@@ -15678,7 +15907,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
               [isLoading]="isLoading"
               [validationRules]="validationRules"
               [hasClearButton]="hasClearButton()"
-              [allowCreate]="allowCreate()"
+              [resolvedCreate]="resolvedCreate()"
               [allowUnselect]="allowUnselect()"
               [entityDef]="entityDef"
               [customFilter]="customFilter"
@@ -15690,7 +15919,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             />
           }
         }
-        @if (allowCreate() === 'quick' || allowCreate() === 'full') {
+        @if (resolvedCreate().enabled) {
           <div class="ax-sm">
             <ax-button
               color="primary"
@@ -17003,8 +17232,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
  * Multi-source selector popup component
  */
 class AXPMultiSourceSelectorComponent extends AXBasePageComponent {
+    //#endregion
     constructor() {
-        super(...arguments);
+        super();
         //#region ----   Services & Dependencies   ----
         this.entityDataSelectorService = inject(AXPEntityDataSelectorService);
         this.entityResolver = inject(AXPEntityDefinitionRegistryService);
@@ -17027,8 +17257,20 @@ class AXPMultiSourceSelectorComponent extends AXBasePageComponent {
         }, ...(ngDevMode ? [{ debugName: "activeSource" }] : /* istanbul ignore next */ []));
         this.selectedItems = signal([], ...(ngDevMode ? [{ debugName: "selectedItems" }] : /* istanbul ignore next */ []));
         this.AXPMultiSourceType = AXPMultiSourceType;
+        setupPopupFooterKeyboardShortcuts(() => [
+            {
+                title: '@general:actions.cancel.title',
+                command: 'cancel',
+                handler: () => this.handleCancel(),
+            },
+            {
+                title: '@general:actions.select.title',
+                command: 'select',
+                disabled: () => this.selectedItems().length === 0,
+                handler: () => this.handleConfirm(),
+            },
+        ], { id: 'multi-source-selector-popup' });
     }
-    //#endregion
     //#region ----   Lifecycle   ----
     ngOnInit() {
         super.ngOnInit();
@@ -17105,7 +17347,7 @@ class AXPMultiSourceSelectorComponent extends AXBasePageComponent {
             items: this.selectedItems(),
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPMultiSourceSelectorComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPMultiSourceSelectorComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPMultiSourceSelectorComponent, isStandalone: true, selector: "axp-multi-source-selector", usesInheritance: true, ngImport: i0, template: `
     <div class="ax-flex ax-flex-col ax-h-full ax-overflow-hidden">
       @if (definition().searchStrategy === 'tabs') {
@@ -17254,7 +17496,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                     changeDetection: ChangeDetectionStrategy.OnPush,
                     imports: [CommonModule, AXButtonModule, AXTabsModule, AXDecoratorModule, AXTranslationModule],
                 }]
-        }] });
+        }], ctorParameters: () => [] });
 
 var multiSourceSelector_component = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -18689,7 +18931,7 @@ class AXPFileListComponent {
                 // ACoreX
                 AXFormModule }, { kind: "ngmodule", type: AXTextBoxModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXLabelModule }, { kind: "ngmodule", type: AXCheckBoxModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "component", type: 
                 // Platform
-                AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "look"] }, { kind: "pipe", type: 
+                AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "titleParams", "descriptionParams", "look"] }, { kind: "pipe", type: 
                 // Angular
                 AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }] }); }
 }
@@ -22728,6 +22970,7 @@ class AXPMainEntityContentBuilder {
         const tabListTabs = await this.buildTabLists(tabListEntities ?? [], rootContext, dependencies);
         // Build actions from single interface
         const actions = this.buildActions(entity, singleInterface);
+        let cachedRootContext = rootContext;
         //console.log({ rootContext, dependencies });
         return {
             id: entity?.name ?? '',
@@ -22764,14 +23007,15 @@ class AXPMainEntityContentBuilder {
             },
             load: async (params) => {
                 if (params?.forceRefresh) {
+                    cachedRootContext = await dependencies.reloadRootContext();
                     return {
                         success: true,
-                        data: await dependencies.reloadRootContext(),
+                        data: cachedRootContext,
                     };
                 }
                 return {
                     success: true,
-                    data: rootContext,
+                    data: cachedRootContext,
                 };
             },
             execute: async (e, context) => {
@@ -23339,27 +23583,44 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                 }]
         }], ctorParameters: () => [{ type: AXPRelatedEntityConverterFactory }, { type: AXPMainEntityContentBuilder }, { type: AXPLayoutAdapterBuilder }, { type: i4$2.AXPFilterOperatorMiddlewareService }] });
 
-const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver = inject(AXPEntityDefinitionRegistryService), expressionEvaluator = inject(AXPExpressionEvaluatorService), session = inject(AXPSessionService), formatService = inject(AXFormatService), workflowService = inject(AXPWorkflowService), commandService = inject(AXPCommandService), layoutAdapterFactory = inject(AXPLayoutAdapterFactory), router = inject(Router)) => {
-    const moduleName = route.parent?.paramMap.get('module');
-    const entityName = route.paramMap.get('entity');
-    const id = route.paramMap.get('id');
-    const dependencies = {
-        entityResolver,
-        expressionEvaluator,
-        session,
-        formatService,
-        workflowService,
-        commandService,
-    };
-    try {
-        return await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
+//#region ---- Entity Details View Adapter Loader ----
+class AXPEntityDetailsViewAdapterLoader {
+    constructor() {
+        //#region ---- Services & Dependencies ----
+        this.entityResolver = inject(AXPEntityDefinitionRegistryService);
+        this.layoutAdapterFactory = inject(AXPLayoutAdapterFactory);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.session = inject(AXPSessionService);
+        this.formatService = inject(AXFormatService);
+        this.workflowService = inject(AXPWorkflowService);
+        this.commandService = inject(AXPCommandService);
     }
-    catch (error) {
-        if (error instanceof AXPNotFoundError) {
-            return axpRedirectToNotFound(router);
-        }
-        throw error;
+    //#endregion
+    /**
+     * Builds the details-view adapter for an entity record (definition, layout pages, root context).
+     */
+    async load(params) {
+        const { moduleName, entityName, id } = params;
+        const dependencies = {
+            entityResolver: this.entityResolver,
+            expressionEvaluator: this.expressionEvaluator,
+            session: this.session,
+            formatService: this.formatService,
+            workflowService: this.workflowService,
+            commandService: this.commandService,
+        };
+        return this.layoutAdapterFactory.createDetailsViewAdapter(this.entityResolver, moduleName, entityName, id, dependencies);
     }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailsViewAdapterLoader, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailsViewAdapterLoader, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityDetailsViewAdapterLoader, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+const AXP_ENTITY_DETAILS_VIEW_ADAPTER_LOADER_PROVIDER = {
+    provide: AXP_LAYOUT_DETAILS_VIEW_ADAPTER_LOADER,
+    useExisting: AXPEntityDetailsViewAdapterLoader,
 };
 
 class AXPEntityPreloadFilterGuard {
@@ -23422,9 +23683,7 @@ const eventDispatchMiddleware = {
             if (ctx.op === 'create') {
                 const createdData = ctx.result ? { ...ctx.data, id: ctx.result } : ctx.data;
                 await dispatcher.dispatchInserted(ctx.entityName, { refType: ctx.entityName, data: createdData });
-                workflowEventService.dispatch(AXPRefreshEvent({
-                    entity: ctx.entityName,
-                }));
+                // List refresh is dispatched after create UI closes (Entity:Create command / create-entity workflow).
             }
             else if (ctx.op === 'update') {
                 await dispatcher.dispatchUpdated(ctx.entityName, {
@@ -24089,8 +24348,8 @@ const AXPCrudModifier = {
             if (!command?.create) {
                 command.create = {
                     execute: async (data) => {
-                        console.log('create', ctx.module.get() + '.' + ctx.name.get(), data);
                         const res = await dataService.insertOne(data);
+                        //await delay(2000);
                         return { id: res };
                     },
                 };
@@ -24110,7 +24369,9 @@ const AXPCrudModifier = {
                         if (id == null || id === '') {
                             throw new Error(`Update requires entity id (${entityKey})`);
                         }
-                        return await dataService.updateOne(id, patch);
+                        const updated = await dataService.updateOne(id, patch);
+                        //await delay(2000);
+                        return updated;
                     },
                 };
             }
@@ -24124,6 +24385,7 @@ const AXPCrudModifier = {
                 queries.byKey = {
                     execute: async (id) => {
                         const data = await dataService.getOne(id);
+                        //await delay(1000);
                         return data;
                     },
                     type: AXPEntityQueryType.Single,
@@ -24533,6 +24795,7 @@ class AXPEntityCreatePopupAction extends AXPWorkflowAction {
         this.factory = inject(AXPEntityCreateViewModelFactory);
         this.config = inject(AXP_ENTITY_CONFIG_TOKEN);
         this.translateService = inject(AXTranslationService);
+        this.settingsService = inject(AXPSettingsService);
     }
     async execute(context) {
         const [module, entity] = context.getVariable('entity').split('.');
@@ -24564,8 +24827,22 @@ class AXPEntityCreatePopupAction extends AXPWorkflowAction {
             const prevData = context.getVariable('data');
             const prevMeta = context.getVariable('meta');
             context.setVariable('data', { ...prevData, ...result.data.item });
-            if (entityRef.parentKey && result.data.item[entityRef.parentKey]) {
-                context.setVariable('meta', { ...prevMeta, refreshTargetId: result.data.item[entityRef.parentKey] });
+            const createdItem = result.data.item;
+            const highlightRowId = createdItem?.id ?? createdItem?._id;
+            const { shouldRedirect, shouldHighlight } = await resolveEntityCreateListBehavior(this.settingsService, {
+                redirect: process?.redirect,
+            });
+            context.setVariable('shouldRedirect', shouldRedirect);
+            const meta = {
+                ...prevMeta,
+                resetPagination: true,
+                ...(shouldHighlight && highlightRowId != null ? { highlightRowId } : {}),
+                ...(entityRef.parentKey && createdItem[entityRef.parentKey]
+                    ? { refreshTargetId: createdItem[entityRef.parentKey] }
+                    : {}),
+            };
+            if (Object.keys(meta).length > 0) {
+                context.setVariable('meta', meta);
             }
         }
     }
@@ -24616,7 +24893,7 @@ const AXPCreateEntityWorkflow = {
             action: 'AXPEntityCreateSubmittedAction',
             nextSteps: [
                 {
-                    conditions: [{ type: 'SINGLE', expression: 'context.getVariable("options")?.process?.redirect != false' }],
+                    conditions: [{ type: 'SINGLE', expression: 'context.getVariable("shouldRedirect") == true' }],
                     nextStepId: 'show-entity',
                 },
             ],
@@ -24957,17 +25234,10 @@ function routesFacory() {
                         // },
                         {
                             path: 'e/:entity/:id/view',
-                            resolve: { adapter: AXPLayoutDetailsViewRouteResolver },
                             loadComponent: () => {
                                 return config.viewers.master.details();
                             },
                             canDeactivate: [axpDetailsViewCanDeactivateGuard],
-                            runGuardsAndResolvers: (from, to) => {
-                                const entityChanged = from.params['module'] !== to.params['module'] || from.params['entity'] !== to.params['entity'];
-                                const idChanged = from.params['id'] !== to.params['id'];
-                                const refreshChanged = from.queryParams['_ts'] !== to.queryParams['_ts'];
-                                return entityChanged || idChanged || refreshChanged;
-                            },
                             data: { reuse: 'queryParamsChange' },
                         },
                         {
@@ -25001,6 +25271,7 @@ class AXPEntityModule {
             AXPAttachmentsPluginModule, i1$3.AXPWorkflowModule, AXPWidgetCoreModule,
             LayoutBuilderModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityModule, providers: [
+            AXP_ENTITY_DETAILS_VIEW_ADAPTER_LOADER_PROVIDER,
             {
                 provide: AXP_REPEATER_ENTITY_BY_KEY_LOOKUP,
                 useFactory: () => {
@@ -25201,6 +25472,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                     exports: [],
                     declarations: [],
                     providers: [
+                        AXP_ENTITY_DETAILS_VIEW_ADAPTER_LOADER_PROVIDER,
                         {
                             provide: AXP_REPEATER_ENTITY_BY_KEY_LOOKUP,
                             useFactory: () => {