@acorex/platform 21.0.0-next.71 → 21.0.0-next.72

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

@@ -2,7 +2,7 @@ import { AXToastService } from '@acorex/components/toast';
 import * as i6 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule, resolveMultiLanguageString, translateSync } from '@acorex/core/translation';
 import * as i4$3 from '@acorex/platform/common';
-import { AXPEntityCommandScope, AXPSettingsService, AXPCommonSettings, AXPFilterOperatorMiddlewareService, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPRefreshEvent, AXPReloadEvent, AXPCleanNestedFilters, AXPFileTypeProviderService, AXPFileStorageService, AXPFileActionsService, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER, AXPMenuItemsDataSourceDefinition } from '@acorex/platform/common';
+import { AXPNotFoundError, AXPEntityCommandScope, axpNavigateAppPath, AXPSettingsService, AXPCommonSettings, normalizeEntityDisplayTemplate, isUnresolvedEntityDisplayTemplate, AXPFilterOperatorMiddlewareService, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPRefreshEvent, AXPReloadEvent, axpRedirectToNotFound, AXPCleanNestedFilters, AXPFileTypeProviderService, AXPFileStorageService, buildEntitySearchTitleContext, resolveEntityRowTitleTemplate, AXPFileActionsService, axpIsEntityRecordNotFound, AXPDefaultMultiLanguageConfigService, withDefaultMultiLanguageOnWidgetNodeTree, AXPEntityQueryType, AXPWorkflowNavigateAction, AXP_NOT_FOUND_ROUTE, AXP_PROTECTED_ROUTE_GUARDS, 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, NgModule, ChangeDetectorRef, effect, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, makeEnvironmentProviders } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
@@ -12,7 +12,7 @@ import { AXPWidgetsCatalog, AXPWidgetCoreModule, AXPPageStatus, AXPWidgetRegistr
 import { AXPSystemActionType, AXPDeviceService, AXPExpressionEvaluatorService, AXPBroadcastEventService, applyFilterArray, applySortArray, resolveActionLook, AXPDistributedEventListenerService, AXPPlatformScope, AXHighlightService, extractValue, setSmart, getChangedPaths, objectKeyValueTransforms, AXPHookService, AXPDataGenerator, AXPComponentSlotModule, AXPContextStore, AXPColumnWidthService, AXPModuleManifestRegistry, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPModuleManifestsDataSourceDefinition } from '@acorex/platform/core';
 import { cloneDeep, merge, get, castArray, set, orderBy, omit, isNil, isEmpty, isEqual as isEqual$1, isArray, isString } from 'lodash-es';
 import { transform, isEqual } from 'lodash';
-import { AXPSessionService, AXPAuthGuard, AXPPermissionDefinitionsDataSourceDefinition } from '@acorex/platform/auth';
+import { AXPSessionService, AXPPermissionDefinitionsDataSourceDefinition } from '@acorex/platform/auth';
 import { Router, ActivatedRoute, RouterModule, ROUTES } from '@angular/router';
 import { defineCommand, AXP_COMMAND_DEFINITION_CATEGORY_ENTITY, AXPCommandService, AXPQueryService, AXPQueryExecutor, AXPCommandExecutor, provideCommandSetups, provideQuerySetups, AXPCommandRegistry, AXPQueryRegistry } from '@acorex/platform/runtime';
 import * as i1 from '@acorex/components/button';
@@ -25,7 +25,7 @@ import { AXFormatService } from '@acorex/core/format';
 import * as i5 from '@angular/common';
 import { CommonModule, AsyncPipe, NgClass } from '@angular/common';
 import { AXPThemeLayoutBlockComponent, AXPPreloadFiltersComponent, AXP_PAGE_COMPONENT_PROVIDER, AXPStateMessageComponent, AXPColumnItemListComponent, AXPDataSelectorService, AXPPageComponentRegistryService } from '@acorex/platform/layout/components';
-import { AXPPageLayoutBaseComponent, AXPPageLayoutComponent, AXPPageComponentRendererDirective, AXPPageComponentInstanceRegistryService } from '@acorex/platform/layout/views';
+import { AXPPageLayoutBaseComponent, AXPPageLayoutComponent, AXPPageComponentRendererDirective, AXPPageComponentInstanceRegistryService, 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';
@@ -823,7 +823,7 @@ class AXPEntityDefinitionRegistryService {
                 throw error; // Rethrow to allow error handling by caller
             }
             if (!config) {
-                throw new Error(`Invalid entity name: ${key}`);
+                throw new AXPNotFoundError(`Invalid entity name: ${key}`);
             }
         }
         return config;
@@ -902,6 +902,7 @@ function entityMasterDeleteAction() {
         type: AXPSystemActionType.Delete,
         scope: AXPEntityCommandScope.Individual,
         order: 100,
+        shortcuts: ['ctrl+shift+delete'],
     };
 }
 function entityMasterCrudActions(options) {
@@ -2498,8 +2499,7 @@ class AXPOpenEntityDetailsCommand {
             };
         }
         const url = `/${this.sessionService.application?.name}/m/${module}/e/${entityName}/${data.id}/view`;
-        // Navigate to the entity details page
-        this.router.navigate([url]);
+        await axpNavigateAppPath(this.router, url);
         return {
             success: true,
         };
@@ -2972,17 +2972,6 @@ var viewEntityDetails_command = /*#__PURE__*/Object.freeze({
 });
 
 //#region ---- Template resolution ----
-/**
- * Normalizes lookup/search display templates for row-based formatting.
- * Converts `context.eval('path')` expressions to `{{ path }}` and single braces to mustache form.
- */
-function normalizeLookupDisplayTemplate(template) {
-    const withContextEval = template.replace(/\{\{\s*context\.eval\(['"]([^'"]+)['"]\)\s*\}\}/g, '{{ $1 }}');
-    if (withContextEval.includes('{{')) {
-        return withContextEval;
-    }
-    return withContextEval.replace(/\{/g, '{{').replace(/\}/g, '}}');
-}
 /**
  * Resolves the display template for a lookup item.
  * Priority: explicit `displayFormat` → entity `formats.lookup` (template) → entity `formats.searchResult.title`.
@@ -2991,18 +2980,18 @@ function normalizeLookupDisplayTemplate(template) {
 function resolveLookupDisplayTemplate(entity, options) {
     const explicit = options.displayFormat?.trim();
     if (explicit) {
-        return normalizeLookupDisplayTemplate(explicit);
+        return normalizeEntityDisplayTemplate(explicit);
     }
     if (options.textField?.trim()) {
         return undefined;
     }
     const lookupFormat = entity?.formats?.lookup?.trim();
     if (lookupFormat && (lookupFormat.includes('{{') || lookupFormat.includes('{'))) {
-        return normalizeLookupDisplayTemplate(lookupFormat);
+        return normalizeEntityDisplayTemplate(lookupFormat);
     }
     const searchTitle = entity?.formats?.searchResult?.title?.trim();
     if (searchTitle) {
-        return normalizeLookupDisplayTemplate(searchTitle);
+        return normalizeEntityDisplayTemplate(searchTitle);
     }
     return undefined;
 }
@@ -3043,7 +3032,7 @@ function formatLookupItemDisplay(item, entity, options, formatService, resolveMu
         const formatted = formatService.format(template, 'string', item);
         if (formatted) {
             const text = String(formatted);
-            if (!isUnresolvedLookupDisplayTemplate(text)) {
+            if (!isUnresolvedEntityDisplayTemplate(text)) {
                 return text;
             }
         }
@@ -3064,10 +3053,6 @@ function formatLookupItemDisplay(item, entity, options, formatService, resolveMu
     }
     return String(raw);
 }
-/** True when a formatted label still contains unresolved template markers. */
-function isUnresolvedLookupDisplayTemplate(value) {
-    return /\{\{/.test(value) || /context\.eval\s*\(/.test(value);
-}
 //#endregion
 
 class AXPEntityDetailPopoverComponent {
@@ -3107,7 +3092,7 @@ class AXPEntityDetailPopoverComponent {
                 }
             }
             const preset = this.displayTitle()?.trim();
-            if (preset && !isUnresolvedLookupDisplayTemplate(preset)) {
+            if (preset && !isUnresolvedEntityDisplayTemplate(preset)) {
                 return preset;
             }
             const fallbackItem = this.item();
@@ -3206,7 +3191,7 @@ class AXPEntityDetailPopoverComponent {
     resolveLookupDisplayLabel(item, entityDefinition) {
         const label = formatLookupItemDisplay(item, entityDefinition, { textField: this.textField() }, this.formatService, (value) => this.translation.resolve(value));
         const resolved = typeof label === 'string' ? label : this.translation.resolve(label);
-        return resolved && !isUnresolvedLookupDisplayTemplate(resolved) ? resolved : '';
+        return resolved && !isUnresolvedEntityDisplayTemplate(resolved) ? resolved : '';
     }
     /**
      * Returns true if a value is meaningful for display (non-empty/non-null).
@@ -4356,6 +4341,7 @@ class AXPEntityCommandTriggerViewModel {
         this.hidden = action.hidden ?? false;
         this.disabled = action.disabled ?? false;
         this.default = action.default ?? false;
+        this.shortcuts = action.shortcuts;
         this.scope = action.scope;
         this.order = action.order ?? 0;
         this.isChild = isChild;
@@ -6642,20 +6628,28 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
-const AXPEntityListViewModelResolver = async (route, state, service = inject(AXPEntityListViewModelFactory)) => {
+const AXPEntityListViewModelResolver = async (route, state, service = inject(AXPEntityListViewModelFactory), router = inject(Router)) => {
     const moduleName = route.parent?.paramMap.get('module');
     const entityName = route.paramMap.get('entity');
-    const vm = await service.create(moduleName, entityName);
-    // Check if filters are provided in query params
-    const filtersParam = route.queryParamMap.get('filters');
-    if (filtersParam) {
-        const applied = vm.applyFiltersFromQueryParams(filtersParam);
-        if (applied) {
-            // Trigger filter and sort application
-            await vm.applyFilterAndSort();
+    try {
+        const vm = await service.create(moduleName, entityName);
+        // Check if filters are provided in query params
+        const filtersParam = route.queryParamMap.get('filters');
+        if (filtersParam) {
+            const applied = vm.applyFiltersFromQueryParams(filtersParam);
+            if (applied) {
+                // Trigger filter and sort application
+                await vm.applyFilterAndSort();
+            }
+        }
+        return vm;
+    }
+    catch (error) {
+        if (error instanceof AXPNotFoundError) {
+            return axpRedirectToNotFound(router);
         }
+        throw error;
     }
-    return vm;
 };
 
 const AXPEntityDeletedEvent = createWorkFlowEvent('[Entity] Deleted');
@@ -6706,7 +6700,7 @@ class AXPEntityPerformDeleteAction extends AXPWorkflowAction {
             dialog = this.loadingDialog.show({
                 title: await this.translationService.translateAsync('@general:workflow.deleting'),
                 mode: 'determinate',
-                status: 'Deleting...',
+                status: await this.translationService.translateAsync('@general:workflow.deleting'),
                 progressValue: 0,
                 text: `0/${idLength}`,
                 buttons: [
@@ -7467,10 +7461,19 @@ class AXPEntityPreloadFiltersViewModel {
 const AXPEntityPreloadFiltersViewModelResolver = async (route, state) => {
     const injector = inject(Injector);
     const entityRegistry = inject(AXPEntityDefinitionRegistryService);
+    const router = inject(Router);
     const moduleName = route.parent?.paramMap.get('module');
     const entityName = route.paramMap.get('entity');
-    const entity = await entityRegistry.resolve(moduleName, entityName);
-    return new AXPEntityPreloadFiltersViewModel(injector, entity);
+    try {
+        const entity = await entityRegistry.resolve(moduleName, entityName);
+        return new AXPEntityPreloadFiltersViewModel(injector, entity);
+    }
+    catch (error) {
+        if (error instanceof AXPNotFoundError) {
+            return axpRedirectToNotFound(router);
+        }
+        throw error;
+    }
 };
 //#endregion
 
@@ -8035,7 +8038,7 @@ class AXMAttachmentsPageComponentProvider {
         return [
             {
                 key: ATTACHMENTS_PAGE_COMPONENT_KEY,
-                loader: () => import('./acorex-platform-layout-entity-attachments-page.component-D8iQnT-R.mjs').then((m) => m.AXMAttachmentsPageComponent),
+                loader: () => import('./acorex-platform-layout-entity-attachments-page.component-B0EkdqvH.mjs').then((m) => m.AXMAttachmentsPageComponent),
             },
         ];
     }
@@ -8354,7 +8357,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         this.noRecordsTitle = signal('', ...(ngDevMode ? [{ debugName: "noRecordsTitle" }] : /* istanbul ignore next */ []));
         this.currentSearchTerm = null;
         this.isRefreshing = false;
-        this.isUpdatingSelection = false; // Flag to prevent recursive updates during batch operations
+        this.isUpdatingSelection = false; // Flag to prevent recursive updates during batch operations (multiple mode)
         /**
          * Computed property to check if we should show the "no search results" empty state.
          * Returns true when search is active, not searching, and no results found.
@@ -8421,9 +8424,8 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                     }
                 });
             }
-            // Mark pre-selected nodes as selected in the child nodes (for visual display)
-            // ONLY do this during initial load, NOT during user selection changes
-            if (!this.isUpdatingSelection) {
+            // Mark pre-selected leaf nodes on loaded children (multiple mode only; single uses controlledSelection)
+            if (!this.isUpdatingSelection && this.allowMultiple()) {
                 const selectedIds = this.selectedNodeIds();
                 childNodes.forEach((node) => {
                     const nodeId = String(node['id'] ?? '');
@@ -8431,38 +8433,6 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                         node['selected'] = true;
                     }
                 });
-                // After children load, programmatically select pre-selected nodes in tree component
-                // This ensures the tree's internal state matches our selectedNodeIds
-                // Skip this if we're in the middle of a selection update (user is selecting/deselecting)
-                const treeComponent = this.tree();
-                if (treeComponent && selectedIds.length > 0) {
-                    // Use setTimeout to ensure nodes are in tree structure before selecting
-                    setTimeout(() => {
-                        // Double-check we're not in a selection update when timeout fires
-                        if (this.isUpdatingSelection) {
-                            return;
-                        }
-                        this.isUpdatingSelection = true;
-                        try {
-                            // Re-check selectedNodeIds at this point (might have changed)
-                            const currentSelectedIds = this.selectedNodeIds();
-                            childNodes.forEach((node) => {
-                                const nodeId = String(node['id'] ?? '');
-                                if (nodeId && currentSelectedIds.includes(nodeId) && nodeId !== 'all') {
-                                    try {
-                                        treeComponent.selectNode(nodeId);
-                                    }
-                                    catch {
-                                        // Node might not be in tree yet
-                                    }
-                                }
-                            });
-                        }
-                        finally {
-                            this.isUpdatingSelection = false;
-                        }
-                    }, 10);
-                }
             }
             return childNodes;
         };
@@ -8488,6 +8458,60 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
     }
     //#endregion
     //#region ----   Private Methods   ----
+    /** Keeps at most one id when {@link allowMultiple} is false. */
+    normalizeSelectedIds(ids) {
+        const filtered = ids.filter((id) => id && id !== 'all');
+        if (this.allowMultiple()) {
+            return [...filtered];
+        }
+        return filtered.length > 0 ? [filtered[filtered.length - 1]] : [];
+    }
+    setSelectedNodeIds(ids) {
+        this.selectedNodeIds.set(this.normalizeSelectedIds(ids));
+    }
+    /** Keeps widget selectedNodeIds in sync when the tree uses controlled single selection. */
+    onControlledSelectedIdsChange(ids) {
+        if (this.allowMultiple()) {
+            return;
+        }
+        this.setSelectedNodeIds(ids);
+    }
+    async waitForTreeComponent(maxWaitMs = 3500) {
+        const deadline = Date.now() + maxWaitMs;
+        while (Date.now() < deadline) {
+            const treeComponent = this.tree();
+            if (treeComponent) {
+                return treeComponent;
+            }
+            await new Promise((resolve) => setTimeout(resolve, 80));
+        }
+        return undefined;
+    }
+    /** Expands ancestor paths and reveals the initial selection via the tree API. */
+    async revealInitialSelection(ids) {
+        const normalizedIds = this.normalizeSelectedIds(ids);
+        if (normalizedIds.length === 0) {
+            return;
+        }
+        const treeComponent = await this.waitForTreeComponent();
+        if (!treeComponent) {
+            return;
+        }
+        try {
+            if (this.allowMultiple()) {
+                await this.restoreMultipleSelectionAfterReload(normalizedIds);
+            }
+            else {
+                const chains = await this.buildAncestorChains(normalizedIds);
+                const ancestorPaths = normalizedIds.map((id) => chains.get(id) ?? []);
+                await treeComponent.selectAndReveal(normalizedIds, { ancestorPaths });
+            }
+        }
+        catch (error) {
+            console.error('Error revealing initial category selection:', error);
+        }
+        this.changeDetectorRef.markForCheck();
+    }
     async initializeTree() {
         if (!this.entityKey()) {
             this.loading.set(false);
@@ -8512,12 +8536,12 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
             // Resolve initial selected IDs from data (popup) or input binding
             const fromData = this.selectedValues().filter((id) => id && id !== 'all');
             const fromInput = (this.selectedValuesInput() ?? []).filter((id) => id && id !== 'all');
-            const initialSelectedIds = fromData.length > 0 ? fromData : fromInput;
+            const initialSelectedIds = this.normalizeSelectedIds(fromData.length > 0 ? fromData : fromInput);
             if (initialSelectedIds.length > 0) {
                 await this.loadMissingNodeData(initialSelectedIds);
                 // Re-fetch any node that has no parent info (batch query may return minimal fields)
                 await this.ensureParentDataInCache(initialSelectedIds);
-                this.selectedNodeIds.set(initialSelectedIds);
+                this.setSelectedNodeIds(initialSelectedIds);
             }
         }
         catch (error) {
@@ -8531,52 +8555,20 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         const selectedIds = this.selectedNodeIds();
         if (selectedIds.length > 0) {
             this.initialExpandSyncDone = true;
-            this.runExpandAndSyncWhenTreeReady(selectedIds);
+            void this.revealInitialSelection(selectedIds);
         }
     }
     /**
      * Called when popup data arrives after ngOnInit: load data, set selection, expand and sync.
      */
     runInitialExpandAndSync(ids) {
-        this.selectedNodeIds.set(ids);
+        this.setSelectedNodeIds(ids);
         Promise.resolve()
             .then(() => this.loadMissingNodeData(ids))
             .then(() => this.ensureParentDataInCache(ids))
-            .then(() => {
-            this.runExpandAndSyncWhenTreeReady(ids);
-        })
+            .then(() => this.revealInitialSelection(ids))
             .catch((err) => console.error('Error in runInitialExpandAndSync:', err));
     }
-    /**
-     * Runs expand path + sync selection once the tree viewChild is available.
-     * Uses retry loop so we don't run before the view has rendered the tree.
-     */
-    runExpandAndSyncWhenTreeReady(selectedIds) {
-        const maxWaitMs = 3500;
-        const pollMs = 80;
-        const start = Date.now();
-        const run = async () => {
-            while (Date.now() - start < maxWaitMs) {
-                const treeComponent = this.tree();
-                if (treeComponent) {
-                    try {
-                        await new Promise((resolve) => setTimeout(resolve, 320));
-                        const ancestorChains = await this.buildAncestorChains(selectedIds);
-                        await this.expandAncestorNodesInOrder(ancestorChains);
-                        await new Promise((resolve) => setTimeout(resolve, 120));
-                        await this.syncSelectionWithTree(selectedIds);
-                    }
-                    catch (error) {
-                        console.error('Error syncing selection after tree render:', error);
-                    }
-                    this.changeDetectorRef.markForCheck();
-                    return;
-                }
-                await new Promise((resolve) => setTimeout(resolve, pollMs));
-            }
-        };
-        run();
-    }
     //#endregion
     //#region ----   Public Methods   ----
     /**
@@ -8981,8 +8973,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
             this.nodesExpandedDuringSearch = [];
             return;
         }
-        // Store current selected IDs before reload
-        const selectedIds = this.selectedNodeIds();
+        const expandTargetIds = [...this.selectedNodeIds()];
         // Reload tree to show all nodes (no filtering)
         await treeComponent.reloadData();
         // Collapse nodes that were expanded during search (in reverse order - leaves first)
@@ -9002,39 +8993,38 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         // Clear the stored expanded nodes
         this.expandedNodesBeforeSearch = [];
         // Restore selection state after tree reload
-        if (selectedIds.length > 0) {
-            // Wait for tree to stabilize after reload
-            await new Promise((resolve) => setTimeout(resolve, 100));
-            // Re-sync selection with tree
-            await this.restoreSelectionAfterReload(selectedIds);
+        if (expandTargetIds.length > 0) {
+            if (!this.allowMultiple()) {
+                await this.revealInitialSelection(expandTargetIds);
+            }
+            else {
+                await this.restoreMultipleSelectionAfterReload(expandTargetIds);
+            }
         }
     }
     /**
-     * Restores selection state after tree reload.
-     * Expands ancestor nodes and selects the previously selected leaf nodes.
+     * Restores multiple-mode leaf selection after search reset.
      */
-    async restoreSelectionAfterReload(selectedIds) {
+    async restoreMultipleSelectionAfterReload(selectedLeafIds) {
         const treeComponent = this.tree();
-        if (!treeComponent || selectedIds.length === 0) {
+        const normalizedIds = this.normalizeSelectedIds(selectedLeafIds);
+        if (!treeComponent || normalizedIds.length === 0) {
             return;
         }
         this.isUpdatingSelection = true;
         try {
-            // Build ancestor chains for selected nodes
-            const ancestorChains = await this.buildAncestorChains(selectedIds);
-            // Expand ancestor nodes to make selected nodes visible
+            const ancestorChains = await this.buildAncestorChains(normalizedIds);
             await this.expandAncestorNodesInOrder(ancestorChains);
-            // Wait for tree to render expanded nodes
-            await new Promise((resolve) => setTimeout(resolve, 50));
-            // Select the nodes visually in the tree
-            for (const id of selectedIds) {
+            for (const id of normalizedIds) {
                 try {
                     treeComponent.selectNode(id);
                 }
                 catch {
-                    // Node might not be in tree yet
+                    // Node might not be loaded yet
                 }
             }
+            await this.updateParentStatesAfterSelection(normalizedIds);
+            treeComponent.refresh();
         }
         finally {
             this.isUpdatingSelection = false;
@@ -9051,10 +9041,6 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         if (!event.isUserInteraction) {
             return;
         }
-        // Don't process if we're already updating selection
-        if (this.isUpdatingSelection) {
-            return;
-        }
         // Cache node data for getSelectedItems (except for 'all' node)
         if (nodeId !== 'all') {
             const nodeData = node['data'];
@@ -9062,72 +9048,64 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                 this.nodeDataCache.set(nodeId, nodeData);
             }
         }
-        // Check if this node is being selected or deselected
+        // Single selection is handled by the tree controlledSelection + selectedIds binding.
+        if (!this.allowMultiple()) {
+            return;
+        }
         const isSelected = node['selected'] === true;
-        if (this.allowMultiple()) {
-            const children = node['children'];
-            const childrenCount = node['childrenCount'];
-            // Determine if this node has children (is a parent node)
-            // A node has children if: childrenCount > 0, or has non-empty children array
-            // Note: childrenCount === undefined means "unknown" - we need to check via datasource
-            const hasLoadedChildren = children && children.length > 0;
-            const hasChildrenCount = childrenCount !== undefined && childrenCount > 0;
-            const isDefinitelyLeaf = childrenCount === 0 && (!children || children.length === 0);
-            if (isSelected) {
-                // SELECTION: Only add LEAF nodes to selectedNodeIds
-                this.isUpdatingSelection = true;
-                try {
-                    if (nodeId === 'all') {
-                        // "All Items" selected - recursively select all leaf descendants
-                        await this.selectAllLeafDescendants(nodeId);
-                    }
-                    else if (isDefinitelyLeaf) {
-                        // This is definitely a leaf node - add it directly
+        const children = node['children'];
+        const childrenCount = node['childrenCount'];
+        // Determine if this node has children (is a parent node)
+        // A node has children if: childrenCount > 0, or has non-empty children array
+        // Note: childrenCount === undefined means "unknown" - we need to check via datasource
+        const hasLoadedChildren = children && children.length > 0;
+        const hasChildrenCount = childrenCount !== undefined && childrenCount > 0;
+        const isDefinitelyLeaf = childrenCount === 0 && (!children || children.length === 0);
+        if (isSelected) {
+            // SELECTION: Only add LEAF nodes to selectedNodeIds
+            this.isUpdatingSelection = true;
+            try {
+                if (nodeId === 'all') {
+                    // "All Items" selected - recursively select all leaf descendants
+                    await this.selectAllLeafDescendants(nodeId);
+                }
+                else if (isDefinitelyLeaf) {
+                    // This is definitely a leaf node - add it directly
+                    const currentSelected = new Set(this.selectedNodeIds());
+                    currentSelected.add(nodeId);
+                    this.setSelectedNodeIds(Array.from(currentSelected));
+                }
+                else if (hasLoadedChildren || hasChildrenCount) {
+                    // This node has children - only add its leaf descendants
+                    await this.selectAllLeafDescendants(nodeId);
+                }
+                else {
+                    // childrenCount is undefined - fetch once and reuse to avoid double datasource call
+                    const childNodes = await this.datasource(nodeId);
+                    if (!childNodes || childNodes.length === 0) {
+                        // No children - this is a leaf node, add it
                         const currentSelected = new Set(this.selectedNodeIds());
                         currentSelected.add(nodeId);
-                        this.selectedNodeIds.set(Array.from(currentSelected));
-                    }
-                    else if (hasLoadedChildren || hasChildrenCount) {
-                        // This node has children - only add its leaf descendants
-                        await this.selectAllLeafDescendants(nodeId);
+                        this.setSelectedNodeIds(Array.from(currentSelected));
                     }
                     else {
-                        // childrenCount is undefined - fetch once and reuse to avoid double datasource call
-                        const childNodes = await this.datasource(nodeId);
-                        if (!childNodes || childNodes.length === 0) {
-                            // No children - this is a leaf node, add it
-                            const currentSelected = new Set(this.selectedNodeIds());
-                            currentSelected.add(nodeId);
-                            this.selectedNodeIds.set(Array.from(currentSelected));
-                        }
-                        else {
-                            // Has children - pass prefetched childNodes to avoid datasource(nodeId) again
-                            await this.selectAllLeafDescendants(nodeId, childNodes);
-                        }
+                        // Has children - pass prefetched childNodes to avoid datasource(nodeId) again
+                        await this.selectAllLeafDescendants(nodeId, childNodes);
                     }
                 }
-                finally {
-                    this.isUpdatingSelection = false;
-                }
             }
-            else {
-                // DESELECTION: Remove node (if leaf) and all leaf descendants from selectedNodeIds
-                this.isUpdatingSelection = true;
-                try {
-                    await this.deselectAllLeafDescendants(nodeId);
-                }
-                finally {
-                    this.isUpdatingSelection = false;
-                }
+            finally {
+                this.isUpdatingSelection = false;
             }
         }
         else {
-            // Single selection mode: just update selectedNodeIds
-            if (isSelected) {
-                this.selectedNodeIds.set([nodeId]);
+            // DESELECTION: Remove node (if leaf) and all leaf descendants from selectedNodeIds
+            this.isUpdatingSelection = true;
+            try {
+                await this.deselectAllLeafDescendants(nodeId);
             }
-            else {
-                this.selectedNodeIds.set([]);
+            finally {
+                this.isUpdatingSelection = false;
             }
         }
     }
@@ -9143,7 +9121,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
      * Clears all selected items
      */
     onClearAll() {
-        this.selectedNodeIds.set([]);
+        this.setSelectedNodeIds([]);
         const treeComponent = this.tree();
         if (treeComponent) {
             treeComponent.deselectAll();
@@ -9194,7 +9172,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
             for (const leafId of leafIds) {
                 currentSelected.add(leafId);
             }
-            this.selectedNodeIds.set(Array.from(currentSelected));
+            this.setSelectedNodeIds(Array.from(currentSelected));
             // Select all leaf nodes visually in the tree
             if (treeComponent) {
                 for (const leafId of leafIds) {
@@ -9223,7 +9201,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         try {
             // Special case: deselecting 'all' clears everything
             if (parentId === 'all') {
-                this.selectedNodeIds.set([]);
+                this.setSelectedNodeIds([]);
                 // Use tree's deselectAll() to clear all visual selections
                 const treeComponent = this.tree();
                 if (treeComponent) {
@@ -9244,7 +9222,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
             // Only update our internal state - tree handles visual state
             const currentSelected = this.selectedNodeIds();
             const newSelected = currentSelected.filter((id) => !leafIds.has(id));
-            this.selectedNodeIds.set(newSelected);
+            this.setSelectedNodeIds(newSelected);
         }
         catch (error) {
             console.error(`Error deselecting leaf descendants for node ${parentId}:`, error);
@@ -9494,60 +9472,6 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
             await new Promise((r) => setTimeout(r, pollMs));
         }
     }
-    /**
-     * Syncs selection state with the tree component.
-     * Selects leaf nodes and manually updates parent states (indeterminate/selected).
-     */
-    async syncSelectionWithTree(selectedIds) {
-        const treeComponent = this.tree();
-        if (!treeComponent || selectedIds.length === 0) {
-            return;
-        }
-        // Wait for tree to be fully initialized after ancestor expansion
-        await new Promise((resolve) => setTimeout(resolve, 200));
-        // Keep track of successfully synced nodes
-        const syncedNodes = new Set();
-        // Try multiple times to sync selection (nodes might load progressively)
-        for (let attempt = 0; attempt < 5; attempt++) {
-            for (const id of selectedIds) {
-                if (id && id !== 'all' && !syncedNodes.has(id)) {
-                    try {
-                        const node = treeComponent.findNode(id);
-                        if (node) {
-                            // Node exists in tree - mark it as selected using both methods
-                            // 1. Direct property assignment for immediate visual feedback
-                            node['selected'] = true;
-                            node['indeterminate'] = false;
-                            // 2. Use selectNode API for tree's internal state tracking
-                            try {
-                                treeComponent.selectNode(id);
-                            }
-                            catch {
-                                // selectNode might fail but direct assignment should work
-                            }
-                            syncedNodes.add(id);
-                        }
-                    }
-                    catch {
-                        // Node not in tree yet
-                    }
-                }
-            }
-            // If all nodes are synced, we're done
-            if (syncedNodes.size === selectedIds.length) {
-                break;
-            }
-            // Wait before next attempt
-            await new Promise((resolve) => setTimeout(resolve, 100));
-        }
-        // Now update parent states (indeterminate/selected) based on children
-        // This uses bottom-up traversal with datasource fallback for loading children
-        await this.updateParentStatesAfterSelection(selectedIds);
-        // Refresh tree to apply changes
-        treeComponent.refresh();
-        // Trigger change detection to update UI
-        this.changeDetectorRef.markForCheck();
-    }
     /**
      * Updates parent node states (selected/indeterminate) based on children selection.
      * Called after leaf nodes are selected to properly show parent states.
@@ -9741,35 +9665,6 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         const id = String(parentIdValue);
         return id && id !== 'all' ? id : null;
     }
-    /**
-     * Marks nodes as selected in the tree structure based on selectedNodeIds.
-     * This ensures pre-selected nodes appear selected when the tree is rendered.
-     */
-    markNodesAsSelected(node) {
-        const selectedIds = this.selectedNodeIds();
-        if (selectedIds.length === 0) {
-            return;
-        }
-        // Mark the node itself if it's selected
-        this.markNodeAsSelectedIfNeeded(node);
-        // Recursively mark children
-        const nodeChildren = node['children'];
-        if (nodeChildren) {
-            nodeChildren.forEach((child) => {
-                this.markNodesAsSelected(child);
-            });
-        }
-    }
-    /**
-     * Marks a single node as selected if it's in the selectedNodeIds list.
-     */
-    markNodeAsSelectedIfNeeded(node) {
-        const selectedIds = this.selectedNodeIds();
-        const nodeId = String(node['id'] ?? '');
-        if (nodeId && selectedIds.includes(nodeId)) {
-            node['selected'] = true;
-        }
-    }
     /**
      * Marks a node and its children as disabled if the node ID matches the excluded ID.
      */
@@ -9778,7 +9673,6 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         if (nodeId === excludedId) {
             node['disabled'] = true;
         }
-        // Recursively mark children
         const nodeChildren = node['children'];
         if (nodeChildren) {
             nodeChildren.forEach((child) => {
@@ -9787,41 +9681,16 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         }
     }
     /**
-     * Processes root node: marks excluded as disabled, marks selected, and syncs selection with tree component
+     * Processes root node: marks excluded nodes as disabled.
      */
     processRootNode(rootNode) {
         const excludedId = this.excludedNodeId();
         if (excludedId) {
             this.markNodeAsDisabled(rootNode, excludedId);
         }
-        this.markNodesAsSelected(rootNode);
-        // Sync selection with tree component after a short delay to ensure tree is rendered
-        const treeComponent = this.tree();
-        if (treeComponent) {
-            setTimeout(() => {
-                this.isUpdatingSelection = true;
-                try {
-                    const selectedIds = this.selectedNodeIds();
-                    selectedIds.forEach((id) => {
-                        if (id && id !== 'all') {
-                            try {
-                                treeComponent.selectNode(id);
-                            }
-                            catch {
-                                // Node might not be in tree yet
-                            }
-                        }
-                    });
-                }
-                finally {
-                    this.isUpdatingSelection = false;
-                }
-            }, 0);
-        }
     }
     /**
      * Processes child nodes: marks excluded as disabled
-     * Selection marking is handled in datasource callback ONLY during initial load
      */
     processChildNodes(childNodes) {
         const excludedId = this.excludedNodeId();
@@ -9967,8 +9836,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         return this.translationService.resolve(raw);
     }
     async getSelectedItems() {
-        // selectedNodeIds now only contains LEAF nodes (already filtered)
-        const selectedIds = this.selectedNodeIds();
+        const selectedIds = this.normalizeSelectedIds(this.selectedNodeIds());
         if (selectedIds.length === 0) {
             return [];
         }
@@ -10061,6 +9929,9 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                 [dragBehavior]="'none'"
                 [selectMode]="allowMultiple() ? 'multiple' : 'single'"
                 [selectionBehavior]="allowMultiple() ? 'intermediate-nested' : 'all'"
+                [controlledSelection]="!allowMultiple()"
+                [selectedIds]="selectedNodeIds()"
+                (selectedIdsChange)="onControlledSelectedIdsChange($event)"
                 [showIcons]="true"
                 [titleField]="textField()"
                 [idField]="valueField()"
@@ -10147,7 +10018,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$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$1.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$1.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: i4.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"], outputs: ["datasourceChange", "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: i6.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$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$1.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$1.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: i4.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: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPEntityCategoryTreeSelectorComponent, decorators: [{
             type: Component,
@@ -10198,6 +10069,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                 [dragBehavior]="'none'"
                 [selectMode]="allowMultiple() ? 'multiple' : 'single'"
                 [selectionBehavior]="allowMultiple() ? 'intermediate-nested' : 'all'"
+                [controlledSelection]="!allowMultiple()"
+                [selectedIds]="selectedNodeIds()"
+                (selectedIdsChange)="onControlledSelectedIdsChange($event)"
                 [showIcons]="true"
                 [titleField]="textField()"
                 [idField]="valueField()"
@@ -11307,9 +11181,7 @@ class AXPEntityCategoryWidgetEditComponent extends AXPValueWidgetComponent {
         this.isOpen.set(true);
         const currentValue = this.getValue();
         const selectedIds = currentValue
-            ? (this.multiple() ? castArray(currentValue) : [currentValue])
-                .map((v) => String(extractValue(v, this.valueField())))
-                .filter((id) => id && id !== 'all')
+            ? this.normalizePopupSelectedIds(currentValue)
             : [];
         // Get current entity ID from context (if editing an entity)
         const currentEntityId = this.contextService.getValue('id');
@@ -11330,9 +11202,7 @@ class AXPEntityCategoryWidgetEditComponent extends AXPValueWidgetComponent {
                 },
             });
             if (result?.data?.selected && Array.isArray(result.data.selected)) {
-                // Use the popup result directly as the source of truth
-                // This ensures that deselected items are properly removed
-                const newItems = result.data.selected;
+                const newItems = this.multiple() ? result.data.selected : result.data.selected.slice(0, 1);
                 if (newItems.length === 0) {
                     // All items were deselected
                     this.clear();
@@ -11482,10 +11352,10 @@ class AXPEntityCategoryWidgetEditComponent extends AXPValueWidgetComponent {
                     }
                 });
                 this.contextService.applyObjectPaths(itemToExpose, { origin: 'user' });
-                this.setUserValue(this.singleOrMultiple(keys));
+                this.setValue(this.singleOrMultiple(keys));
             }
             else {
-                this.setUserValue(this.singleOrMultiple(keys));
+                this.setValue(this.singleOrMultiple(keys));
             }
             // Trigger change detection
             this.cdr.markForCheck();
@@ -11500,6 +11370,12 @@ class AXPEntityCategoryWidgetEditComponent extends AXPValueWidgetComponent {
     singleOrMultiple(values) {
         return this.multiple() ? values : values[0];
     }
+    normalizePopupSelectedIds(currentValue) {
+        const ids = (this.multiple() ? castArray(currentValue) : castArray(currentValue).slice(0, 1))
+            .map((v) => String(extractValue(v, this.valueField())))
+            .filter((id) => id && id !== 'all');
+        return this.multiple() ? ids : ids.slice(0, 1);
+    }
     getItemLabel(item) {
         if (!item) {
             return '';
@@ -12777,11 +12653,10 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             }
             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. */
+        /** Patches data-list `refresh` so reload keeps parent-scoped toolbar filters on the data source. */
         this.#patchDataListRefreshEffect = effect(() => {
             const inst = this.listWidget()?.instance;
-            const opts = this.options();
-            if (!inst?.refresh || inst.__axpEntityListRefreshPatched || !opts['syncRelatedListFiltersFromDialogContext']) {
+            if (!inst?.refresh || inst.__axpEntityListRefreshPatched) {
                 return;
             }
             inst.__axpEntityListRefreshPatched = true;
@@ -12793,6 +12668,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                     if (o['syncRelatedListFiltersFromDialogContext'] && specs?.length) {
                         await this.applyRelatedFiltersFromContextAndDatasource(specs);
                     }
+                    else {
+                        await this.reapplyScopedFiltersToDataSource();
+                    }
                     originalRefresh();
                 })();
             };
@@ -13013,6 +12891,10 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
      * Applies merged route + parent-scope filters to the widget value and data source.
      */
     applyMergedRouteFiltersToList() {
+        void this.reapplyScopedFiltersToDataSource();
+    }
+    /** Syncs toolbar filters to context and AXDataSource (retries until data-list is mounted). */
+    async reapplyScopedFiltersToDataSource() {
         const merged = this.getMergedToolbarFilters();
         const current = this.getValue();
         if (!isEqual$1(current?.toolbar?.filters, merged)) {
@@ -13021,7 +12903,26 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                 toolbar: { ...(current?.toolbar ?? {}), filters: merged },
             });
         }
+        const pushed = await this.ensureToolbarFiltersOnDataSource();
+        if (pushed) {
+            this.triggerInitialLoadIfNeeded();
+        }
+    }
+    /**
+     * Entity lists use `fetchDataMode: 'manual'`; after scoped filters reach the data source,
+     * the grid must be refreshed once (initial #effect may run before the data-list is ready).
+     */
+    triggerInitialLoadIfNeeded() {
+        if (this.isMounted()) {
+            return;
+        }
+        const listInstance = this.listWidget()?.instance;
+        if (!listInstance?.call) {
+            return;
+        }
         this.pushToolbarFiltersToDataSource();
+        listInstance.call('refresh');
+        this.isMounted.set(true);
     }
     /**
      * Re-evaluates related-entity list filters from the live dialog form context (e.g. after create saves the main row id).
@@ -13068,26 +12969,29 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         return true;
     }
     /**
-     * Writes toolbar filters from specs and pushes them onto the data source so refresh/reload keeps the parent scope.
+     * Pushes toolbar filters once the embedded data-list exposes its data source
+     * (listNode is created via deferred setTimeout in ngOnInit).
      */
-    async applyRelatedFiltersFromContextAndDatasource(specs) {
-        await this.applyRelatedFiltersFromContext(specs);
+    async ensureToolbarFiltersOnDataSource() {
         if (this.pushToolbarFiltersToDataSource()) {
-            return;
-        }
-        const opts = this.options();
-        if (!opts['syncRelatedListFiltersFromDialogContext']) {
-            return;
+            return true;
         }
-        /** 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;
+                return true;
             }
         }
+        return false;
+    }
+    /**
+     * 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);
+        await this.ensureToolbarFiltersOnDataSource();
     }
     /**
      * Refreshes the embedded data list (toolbar / workflow). In wizard mode, `refresh` is patched to re-apply scoped filters first.
@@ -13095,7 +12999,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
     refreshGridWithParentScopedFilters() {
         this.listWidget()?.instance?.call('refresh');
     }
-    /** Patches data-list `refresh` so the grid footer / toolbar refresh keeps parent-scoped filters on the data source. */
+    /** Patches data-list `refresh` so reload keeps parent-scoped toolbar filters on the data source. */
     #patchDataListRefreshEffect;
     #effect;
     /**
@@ -13110,7 +13014,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
     handleQueryChanges(queries, dataSource, listInstance, isMounted) {
         const changeTracker = this.analyzeChanges(queries);
         this.previousQueries = queries;
-        this.applyDataSourceChanges(dataSource, queries, changeTracker);
+        this.applyDataSourceChanges(dataSource, queries, changeTracker, isMounted);
         this.handleListRefresh(listInstance, changeTracker, isMounted);
         this.handleColumnChanges(changeTracker);
     }
@@ -13137,8 +13041,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
     /**
      * Applies filter and sort changes to the data source
      */
-    applyDataSourceChanges(dataSource, queries, changeTracker) {
-        if (changeTracker.isFilterChanged) {
+    applyDataSourceChanges(dataSource, queries, changeTracker, isMounted) {
+        const shouldApplyFilters = changeTracker.isFilterChanged || (!isMounted && (queries?.filters?.length ?? 0) > 0);
+        if (shouldApplyFilters) {
             dataSource.filter({
                 filters: queries?.filters,
             });
@@ -13149,16 +13054,16 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         }
     }
     /**
-     * Handles list refresh logic based on changes and mount status
+     * Handles list refresh logic based on changes and mount status.
+     * Initial fetch is owned by {@link triggerInitialLoadIfNeeded} (manual fetchDataMode).
      */
     handleListRefresh(listInstance, changeTracker, isMounted) {
-        const shouldRefresh = changeTracker.isFilterChanged || changeTracker.isSortChanged || !isMounted;
-        if (shouldRefresh) {
+        if (!isMounted) {
+            return;
+        }
+        if (changeTracker.isFilterChanged || changeTracker.isSortChanged) {
+            this.pushToolbarFiltersToDataSource();
             listInstance.call('refresh');
-            // Set mounted flag only on initial load (not when filters/sorts change)
-            if (!changeTracker.isFilterChanged && !changeTracker.isSortChanged) {
-                this.isMounted.set(true);
-            }
         }
     }
     /**
@@ -15597,8 +15502,8 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         this.setLoading = (loading) => {
             this.isLoading.set(loading);
         };
-        this.setItems = (items, options) => {
-            const origin = options?.origin ?? 'system';
+        /** @param syncContext When false, only updates UI (hydration/revert); skips context writes. */
+        this.setItems = (items, syncContext = true) => {
             // Ensure items is always an array
             items = castArray(items);
             // Filter out null/undefined items
@@ -15614,13 +15519,13 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                 return item;
             });
             this.selectedItems.set(items);
-            //
+            if (!syncContext) {
+                return;
+            }
             const keys = items.map((item) => get(item, this.valueField()));
             const text = items.map((item) => this.mlsResolver.resolve(get(item, displayField)));
-            //
-            // extract data from valueField and set context by expose path
             if (this.expose()) {
-                this.expoesItems(origin);
+                this.expoesItems();
             }
             const newValue = this.singleOrMultiple(keys);
             if (this.filterMode()) {
@@ -15630,10 +15535,10 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                     operation: {
                         type: this.multiple() ? 'in' : 'equal',
                     },
-                }, { origin });
+                });
             }
             else {
-                this.setValue(newValue, { origin });
+                this.setValue(newValue);
             }
         };
     }
@@ -15647,7 +15552,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             ? castArray(this.filterMode() ? rawValue.value : rawValue)
             : [rawValue].filter((v) => v != null);
         if (!values.length) {
-            this.setItems([]);
+            this.setItems([], false);
             this.isLoading.set(false);
             return;
         }
@@ -15662,22 +15567,22 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                     .map((id) => entityDataAccessor.byKey(id)));
                 // Filter out null/undefined results
                 const validItems = items.filter((item) => item != null);
-                this.setItems(validItems);
+                this.setItems(validItems, false);
             }
             else {
                 const id = extractValue(this.filterMode() ? values[0].value : values[0], this.valueField());
                 if (id != null) {
                     const item = await entityDataAccessor.byKey(id);
-                    this.setItems(item != null ? [item] : []);
+                    this.setItems(item != null ? [item] : [], false);
                 }
                 else {
-                    this.setItems([]);
+                    this.setItems([], false);
                 }
             }
         }
         catch (error) {
             console.error('[LookupWidget] findByValue() error:', error);
-            this.setItems([]);
+            this.setItems([], false);
         }
         finally {
             this.isLoading.set(false);
@@ -15685,7 +15590,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     }
     //#region ----   Event Handlers from Dumb Components   ----
     handleComponentValueChanged(items) {
-        this.setItems(items ?? [], { origin: 'user' });
+        this.setItems(items ?? []);
     }
     async handleCreateClick(_e) {
         const entity = this.entityDef();
@@ -15710,10 +15615,10 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                 if (this.multiple()) {
                     const exists = currentItems.some((item) => get(item, valueField) === newId);
                     const newItems = exists ? currentItems : [...currentItems, createdItem];
-                    this.setItems(newItems, { origin: 'user' });
+                    this.setItems(newItems);
                 }
                 else {
-                    this.setItems([createdItem], { origin: 'user' });
+                    this.setItems([createdItem]);
                 }
             }
         }
@@ -15730,7 +15635,7 @@ 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(origin = 'system') {
+    expoesItems() {
         const exposeValue = castArray(this.expose());
         const items = this.selectedItems();
         const isEmpty = !items || items.length === 0;
@@ -15743,7 +15648,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                         parentPaths.add(pathParts.slice(0, -1).join('.'));
                     }
                     else {
-                        this.contextService.update(i, null, { origin });
+                        this.contextService.update(i, null);
                     }
                 }
                 else {
@@ -15752,25 +15657,25 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                         parentPaths.add(pathParts.slice(0, -1).join('.'));
                     }
                     else {
-                        this.contextService.update(i.target, null, { origin });
+                        this.contextService.update(i.target, null);
                     }
                 }
             });
             parentPaths.forEach((parentPath) => {
-                this.contextService.update(parentPath, null, { origin });
+                this.contextService.update(parentPath, null);
             });
             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), { origin });
+                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), { origin });
+                this.contextService.update(i.target, this.singleOrMultiple(values));
             }
         });
     }
@@ -16185,7 +16090,7 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         if (!resolvedTitle) {
             const displayTitle = formatLookupItemDisplay(headerItem, this.entityDef(), this.lookupDisplayOptions(), this.formatService, (value) => this.translation.resolve(value));
             resolvedTitle = typeof displayTitle === 'string' ? displayTitle : this.translation.resolve(displayTitle);
-            if (isUnresolvedLookupDisplayTemplate(resolvedTitle)) {
+            if (isUnresolvedEntityDisplayTemplate(resolvedTitle)) {
                 resolvedTitle = '';
             }
         }
@@ -19105,32 +19010,10 @@ function hasFileUploaderTitleOrDescriptionFields(editDialog) {
 }
 //#endregion
 
-//#region ----   Imports   ----
+//#region ---- Imports ----
 //#endregion
-//#region ----   Title template resolution   ----
+//#region ---- Title template resolution ----
 const INVALID_DISPLAY_TEXT = '[object Object]';
-/**
- * Row title template for entity-scoped popovers (e.g. attachment file list).
- * Priority: `interfaces.master.single.title` → `formats.searchResult.title` → `formats.individual`.
- */
-function resolveEntityRowTitleTemplate(entity) {
-    if (!entity) {
-        return undefined;
-    }
-    const singleTitle = entity.interfaces?.master?.single?.title?.trim();
-    if (singleTitle) {
-        return normalizeLookupDisplayTemplate(singleTitle);
-    }
-    const searchTitle = entity.formats?.searchResult?.title?.trim();
-    if (searchTitle) {
-        return normalizeLookupDisplayTemplate(searchTitle);
-    }
-    const individual = entity.formats?.individual?.trim();
-    if (individual) {
-        return normalizeLookupDisplayTemplate(individual);
-    }
-    return undefined;
-}
 /** Resolves a row field or format result to a plain display string for the active locale. */
 function resolveEntityRowDisplayText(value, activeLang) {
     if (value == null || value === '') {
@@ -19138,7 +19021,7 @@ function resolveEntityRowDisplayText(value, activeLang) {
     }
     if (typeof value === 'string') {
         const text = value.trim();
-        if (!text || text === INVALID_DISPLAY_TEXT || isUnresolvedLookupDisplayTemplate(text)) {
+        if (!text || text === INVALID_DISPLAY_TEXT || isUnresolvedEntityDisplayTemplate(text)) {
             return '';
         }
         return text;
@@ -19156,21 +19039,25 @@ function resolveEntityRowDisplayText(value, activeLang) {
     return '';
 }
 /**
- * Formats the entity row title for display using row fields and single-view template.
+ * Formats the entity row title for display using entity-driven templates and property paths.
  */
 function formatEntityRowDisplayTitle(entity, rowData, formatService, activeLang) {
     if (!rowData) {
         return '';
     }
-    for (const field of ['title', 'name', 'code']) {
-        const fromField = resolveEntityRowDisplayText(get(rowData, field), activeLang);
+    const titleContext = buildEntitySearchTitleContext(entity ?? {});
+    for (const path of titleContext.fallbackFields) {
+        const fromField = resolveEntityRowDisplayText(get(rowData, path), activeLang);
         if (fromField) {
             return fromField;
         }
     }
-    const template = resolveEntityRowTitleTemplate(entity);
-    if (template) {
-        const formatted = formatService.format(template, 'string', rowData);
+    const templates = [
+        resolveEntityRowTitleTemplate(entity),
+        ...titleContext.fallbackTemplates,
+    ].filter((template) => !!template?.trim());
+    for (const template of templates) {
+        const formatted = formatService.format(normalizeEntityDisplayTemplate(template), 'string', rowData);
         const fromTemplate = resolveEntityRowDisplayText(formatted, activeLang);
         if (fromTemplate) {
             return fromTemplate;
@@ -21522,7 +21409,7 @@ class AXPLayoutAdapterBuilder {
             load: this.createLoadFunction(),
             pages: this.adapter.pages || [],
             exitUrl: this.adapter.exitUrl,
-            //getPageBadge: (context, isDirty) => this.badgeStatusService.getPageBadge(name, context, isDirty),
+            getPageBadge: (context, isDirty) => this.badgeStatusService.getPageBadge(name, context, isDirty),
             getPageStatus: (context, currentPage) => this.badgeStatusService.getPageStatus(name, context, currentPage),
         };
     }
@@ -22210,6 +22097,8 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
             title: context.rootTitle ?? '',
             label: relatedEntity.title,
             icon: relatedEntity.icon || entityDef.icon,
+            /** List-only page: scoped filters are system state, not user edits. */
+            isReadonly: true,
             actions: this.mergeActions(entityDef, actions)
                 ?.filter((a) => a.priority === 'primary' && !a.isChild)
                 ?.map((a) => {
@@ -22892,6 +22781,7 @@ class AXPMainEntityContentBuilder {
                         icon: 'fa-light fa-rotate-left',
                         color: 'default',
                         visible: '{{context.isDirty()}}',
+                        shortcuts: ['escape'],
                         command: {
                             name: 'discard',
                         },
@@ -22901,6 +22791,7 @@ class AXPMainEntityContentBuilder {
                         icon: 'fa-light fa-floppy-disk',
                         color: 'primary',
                         visible: '{{context.isDirty()}}',
+                        shortcuts: ['ctrl+s'],
                         command: {
                             name: 'update-entity',
                         },
@@ -23194,6 +23085,7 @@ class AXPMainEntityContentBuilder {
                 icon: action.icon,
                 color: action.color,
                 disabled: disabled || false,
+                shortcuts: action.shortcuts,
                 zone: 'header',
                 priority: action.priority,
                 scope: action.scope === AXPEntityCommandScope.Individual ? AXPEntityCommandScope.TypeLevel : action.scope,
@@ -23256,17 +23148,25 @@ class AXPLayoutAdapterFactory {
     async createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies) {
         const entity = await entityResolver.resolve(moduleName, entityName);
         if (!entity) {
-            throw new Error(`Entity ${moduleName}.${entityName} not found`);
+            throw new AXPNotFoundError(`Entity ${moduleName}.${entityName} not found`);
         }
         const rootContext = await this.loadRootContext(entity, id);
-        // Evaluate hidden expressions for related entities once, reuse across building and composing
-        const evaluatedRelatedEntities = await this.evaluateRelatedEntitiesHidden(entity?.relatedEntities ?? [], rootContext, dependencies);
-        // Build main and related pages using evaluated related entities
-        const entityWithEvaluatedRelated = { ...entity, relatedEntities: evaluatedRelatedEntities };
-        const mainPage = await this.buildMainPage(entityWithEvaluatedRelated, rootContext, id, dependencies);
-        const relatedPages = await this.buildRelatedPages(entityWithEvaluatedRelated, rootContext, dependencies);
+        if (axpIsEntityRecordNotFound(rootContext)) {
+            throw new AXPNotFoundError(`Entity record ${moduleName}.${entityName}#${id} not found`);
+        }
+        // Evaluate hidden expressions for related entities and component pages once, reuse across building and composing
+        const evaluatedRelatedEntities = await this.evaluateHiddenFlags(entity?.relatedEntities ?? [], rootContext, dependencies);
+        const evaluatedPages = await this.evaluateHiddenFlags(entity?.pages ?? [], rootContext, dependencies);
+        // Build main and related pages using evaluated related entities and pages
+        const entityWithEvaluatedLayout = {
+            ...entity,
+            relatedEntities: evaluatedRelatedEntities,
+            pages: evaluatedPages,
+        };
+        const mainPage = await this.buildMainPage(entityWithEvaluatedLayout, rootContext, id, dependencies);
+        const relatedPages = await this.buildRelatedPages(entityWithEvaluatedLayout, rootContext, dependencies);
         // Compose ordered pages around the primary page
-        const orderedPages = this.composePagesWithPositions(mainPage, relatedPages, entityWithEvaluatedRelated);
+        const orderedPages = this.composePagesWithPositions(mainPage, relatedPages, entityWithEvaluatedLayout);
         const applicationName = dependencies.session.application?.name ?? 'default';
         const rootTitle = await this.getRootTitle(entity, rootContext, dependencies);
         return this.layoutAdapterBuilder
@@ -23285,15 +23185,15 @@ class AXPLayoutAdapterFactory {
         return this.mainEntityContentBuilder.build(entity, rootContext, { ...dependencies, reloadRootContext: () => this.loadRootContext(entity, id) }, await this.getRootTitle(entity, rootContext, dependencies));
     }
     /**
-     * Evaluates the 'hidden' expression for each related entity using the expression evaluator.
-     * Returns a new array of related entities with the evaluated hidden values.
+     * Evaluates the 'hidden' expression for layout items using the expression evaluator.
+     * Returns a new array with evaluated hidden values.
      */
-    async evaluateRelatedEntitiesHidden(relatedEntities, rootContext, dependencies) {
-        if (!relatedEntities?.length || !dependencies?.expressionEvaluator) {
-            return relatedEntities ?? [];
+    async evaluateHiddenFlags(items, rootContext, dependencies) {
+        if (!items?.length || !dependencies?.expressionEvaluator) {
+            return items ?? [];
         }
-        return Promise.all(relatedEntities.map(async (re) => {
-            let hidden = re.hidden;
+        return Promise.all(items.map(async (item) => {
+            let hidden = item.hidden;
             if (hidden && typeof hidden === 'string') {
                 try {
                     const scope = {
@@ -23308,9 +23208,12 @@ class AXPLayoutAdapterFactory {
                     // Keep original hidden value if evaluation fails
                 }
             }
-            return { ...re, hidden };
+            return { ...item, hidden };
         }));
     }
+    async evaluateRelatedEntitiesHidden(relatedEntities, rootContext, dependencies) {
+        return this.evaluateHiddenFlags(relatedEntities, rootContext, dependencies);
+    }
     async buildRelatedPages(entity, rootContext, dependencies) {
         const pages = [];
         const rootTitle = await this.getRootTitle(entity, rootContext, dependencies);
@@ -23475,7 +23378,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                 }]
         }], ctorParameters: () => [{ type: AXPRelatedEntityConverterFactory }, { type: AXPMainEntityContentBuilder }, { type: AXPLayoutAdapterBuilder }, { type: i4$3.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)) => {
+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');
@@ -23487,8 +23390,15 @@ const AXPLayoutDetailsViewRouteResolver = async (route, state, entityResolver =
         workflowService,
         commandService,
     };
-    const adapter = await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
-    return adapter;
+    try {
+        return await layoutAdapterFactory.createDetailsViewAdapter(entityResolver, moduleName, entityName, id, dependencies);
+    }
+    catch (error) {
+        if (error instanceof AXPNotFoundError) {
+            return axpRedirectToNotFound(router);
+        }
+        throw error;
+    }
 };
 
 class AXPEntityPreloadFilterGuard {
@@ -24262,7 +24172,7 @@ const AXPCrudModifier = {
                 queries.list = {
                     execute: async (e) => {
                         const res = await dataService.query(e);
-                        console.log('query', res, ctx.module.get() + '.' + ctx.name.get(), e);
+                        // console.log('query', res, ctx.module.get() + '.' + ctx.name.get(), e);
                         return res;
                     },
                     type: AXPEntityQueryType.List,
@@ -24305,6 +24215,8 @@ class AXPEntitySearchDefinitionProvider {
         this.entityRegister.getAll().forEach((entity) => {
             const manifest = this.manifestRegistry.get(entity.module);
             const i18nScope = manifest?.i18n ?? moduleNameToI18nScope(entity.module);
+            const searchTitleTemplate = entity.formats.searchResult?.title;
+            const titleContext = buildEntitySearchTitleContext(entity, searchTitleTemplate);
             context.addDefinition(`Module.${entity.module}.${entity.name}`, `@${i18nScope}:module.title`, `Module.${entity.module}`, entity.icon ?? 'fa-solid fa-objects-column', 4, {
                 actions: [
                     {
@@ -24314,9 +24226,11 @@ class AXPEntitySearchDefinitionProvider {
                     },
                 ],
                 format: {
-                    title: entity.formats.searchResult?.title,
+                    title: searchTitleTemplate,
                     description: (entity.formats.searchResult?.description) ?? `${entity.module} / ${entity.title}`,
                     id: '{{data.id}}',
+                    titleFallbackTemplates: titleContext.fallbackTemplates,
+                    titleFallbackFields: titleContext.fallbackFields,
                 },
             });
         });
@@ -25000,7 +24914,7 @@ function routesFacory() {
             loadComponent: () => {
                 return config.viewers.root();
             },
-            canActivate: [AXPAuthGuard],
+            canActivate: [...AXP_PROTECTED_ROUTE_GUARDS],
             children: [
                 {
                     path: ':module',
@@ -25038,6 +24952,7 @@ function routesFacory() {
                             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'];
@@ -25056,8 +24971,16 @@ function routesFacory() {
                             redirectTo: ':entity/list',
                             pathMatch: 'full',
                         },
+                        {
+                            path: '**',
+                            redirectTo: AXP_NOT_FOUND_ROUTE,
+                        },
                     ],
                 },
+                {
+                    path: '**',
+                    redirectTo: AXP_NOT_FOUND_ROUTE,
+                },
             ],
         },
     ];
@@ -25611,5 +25534,5 @@ var getEntityDetails_query = /*#__PURE__*/Object.freeze({
  * Generated bundle index. Do not edit.
  */
 
-export { ATTACHMENTS_PAGE_COMPONENT_KEY, AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEditFileUploaderCommand, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorRowActionsService, AXPEntityDataSelectorService, AXPEntityDefinitionProviderWidget, AXPEntityDefinitionProviderWidgetEditComponent, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListPersistenceModeDefault, AXPEntityListTableService, AXPEntityListToolbarService, AXPEntityListViewCardFieldViewModel, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListCardSelectActionName, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityPreloadFiltersContainerComponent, AXPEntityPreloadFiltersViewModel, AXPEntityPreloadFiltersViewModelResolver, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPFileListComponent, AXPFileUploaderLoadFilesQuery, AXPFileUploaderSaveFilesCommand, AXPFileUploaderWidget, AXPFileUploaderWidgetColumnComponent, AXPFileUploaderWidgetEditComponent, AXPFileUploaderWidgetService, AXPFileUploaderWidgetViewComponent, AXPGetEntityDetailsQuery, AXPLayoutOrderingConfigService, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPMultiSourceDefinitionProviderContext, AXPMultiSourceDefinitionProviderService, AXPMultiSourceFederatedSearchService, AXPMultiSourceSelectorComponent, AXPMultiSourceSelectorService, AXPMultiSourceSelectorWidget, AXPMultiSourceSelectorWidgetColumnComponent, AXPMultiSourceSelectorWidgetEditComponent, AXPMultiSourceSelectorWidgetViewComponent, AXPMultiSourceType, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPRelatedColumnEnrichmentService, AXPRelatedColumnMetadataResolver, AXPSelectorStructureWidget, AXPSelectorStructureWidgetColumnComponent, AXPSelectorStructureWidgetEditComponent, AXPSelectorStructureWidgetViewComponent, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, AXP_CATEGORY_TREE_ROOT_TITLE_I18N_KEY, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_MULTI_SOURCE_DEFINITION_PROVIDER, AXP_RECORD_WORKFLOW_INFO_CORRELATION_ID_FIELD, AXP_RECORD_WORKFLOW_INFO_DEFINITION_ID_FIELD, AXP_RECORD_WORKFLOW_INFO_INSTANCE_ID_FIELD, DEFAULT_COLUMN_ORDER, DEFAULT_PAIR_SPAN_RULES, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, ENTITY_LIST_ROUTE_CONTEXT_SESSION_KEY, EntityBuilder, EntityDataAccessor, actionExists, applyDataSourcePagingWithoutLoad, attachmentFieldCount, attachmentsPlugin, attachmentsSemanticallyEqual, axpCreateEntityAiToolInputDefaults, axpCreateEntityCommandDefinition, buildAXPRecordWorkflowInfo, canPersistEntityListState, cloneLayoutArrays, collectEntityQuickSearchFieldPaths, collectNestedCreateHiddenProperties, collectNestedFieldPathsFromEntityColumns, collectQuickSearchPathsFromSingleEntityDefinition, columnOrderingMiddleware, columnOrderingMiddlewareProvider, columnWidthMiddleware, columnWidthMiddlewareProvider, commandMessageTextForError, committedAttachments, computeEntityAggregates, createColumnOrderingMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, defaultCardLayoutMiddleware, defaultCardLayoutMiddlewareProvider, defaultMultiLanguageMiddleware, defaultMultiLanguageMiddlewareProvider, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCreateActionsDeferredParent, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, filterSortEntityRows, findEntityListRowDataInTree, fingerprintAttachmentItem, fingerprintAttachments, formatLookupItemDisplay, getDataSourcePageIndex, getEntityListRowId, getMasterInterfacePropertySortKey, getRecordWorkflowCorrelationId, getRecordWorkflowInstanceId, hasFileUploaderTitleOrDescriptionFields, isAXPMiddlewareAbortError, isAttachmentListEntry, isCategoryEntity, isCategoryFilter, isFileListItem, isFileUploaderEditDialogAuto, isLegacyEntityDataSelectorOptions, isUnresolvedLookupDisplayTemplate, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider, mapEntityStorageErrorToCommandResult, mapLegacyEntityDataSelectorOptions, mergeForeignKeyFieldIntoCreateActions, normalizeEntityDataSelectorOptions, normalizeEntityFieldToFileList, normalizeEntityListPersistenceMode, normalizeListPaging, normalizeLookupDisplayTemplate, persistedAttachments, provideEntity, resolveEntityPluginDetailPageOrder, resolveFileUploaderEditDialog, resolveFileUploaderEntityScope, resolveLookupDisplayField, resolveLookupDisplayTemplate, restoreEntityListExpandedRows, runEntityQuery, searchResultDescriptionMiddleware, searchResultDescriptionMiddlewareProvider, shouldLoadEntityListStateFromStorage, shouldResetEntityListStateOnRouteEntry };
+export { ATTACHMENTS_PAGE_COMPONENT_KEY, AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEditFileUploaderCommand, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorRowActionsService, AXPEntityDataSelectorService, AXPEntityDefinitionProviderWidget, AXPEntityDefinitionProviderWidgetEditComponent, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListPersistenceModeDefault, AXPEntityListTableService, AXPEntityListToolbarService, AXPEntityListViewCardFieldViewModel, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListCardSelectActionName, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityPreloadFiltersContainerComponent, AXPEntityPreloadFiltersViewModel, AXPEntityPreloadFiltersViewModelResolver, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPFileListComponent, AXPFileUploaderLoadFilesQuery, AXPFileUploaderSaveFilesCommand, AXPFileUploaderWidget, AXPFileUploaderWidgetColumnComponent, AXPFileUploaderWidgetEditComponent, AXPFileUploaderWidgetService, AXPFileUploaderWidgetViewComponent, AXPGetEntityDetailsQuery, AXPLayoutOrderingConfigService, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPMultiSourceDefinitionProviderContext, AXPMultiSourceDefinitionProviderService, AXPMultiSourceFederatedSearchService, AXPMultiSourceSelectorComponent, AXPMultiSourceSelectorService, AXPMultiSourceSelectorWidget, AXPMultiSourceSelectorWidgetColumnComponent, AXPMultiSourceSelectorWidgetEditComponent, AXPMultiSourceSelectorWidgetViewComponent, AXPMultiSourceType, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPRelatedColumnEnrichmentService, AXPRelatedColumnMetadataResolver, AXPSelectorStructureWidget, AXPSelectorStructureWidgetColumnComponent, AXPSelectorStructureWidgetEditComponent, AXPSelectorStructureWidgetViewComponent, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, AXP_CATEGORY_TREE_ROOT_TITLE_I18N_KEY, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_MULTI_SOURCE_DEFINITION_PROVIDER, AXP_RECORD_WORKFLOW_INFO_CORRELATION_ID_FIELD, AXP_RECORD_WORKFLOW_INFO_DEFINITION_ID_FIELD, AXP_RECORD_WORKFLOW_INFO_INSTANCE_ID_FIELD, DEFAULT_COLUMN_ORDER, DEFAULT_PAIR_SPAN_RULES, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, ENTITY_LIST_ROUTE_CONTEXT_SESSION_KEY, EntityBuilder, EntityDataAccessor, actionExists, applyDataSourcePagingWithoutLoad, attachmentFieldCount, attachmentsPlugin, attachmentsSemanticallyEqual, axpCreateEntityAiToolInputDefaults, axpCreateEntityCommandDefinition, buildAXPRecordWorkflowInfo, canPersistEntityListState, cloneLayoutArrays, collectEntityQuickSearchFieldPaths, collectNestedCreateHiddenProperties, collectNestedFieldPathsFromEntityColumns, collectQuickSearchPathsFromSingleEntityDefinition, columnOrderingMiddleware, columnOrderingMiddlewareProvider, columnWidthMiddleware, columnWidthMiddlewareProvider, commandMessageTextForError, committedAttachments, computeEntityAggregates, createColumnOrderingMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, defaultCardLayoutMiddleware, defaultCardLayoutMiddlewareProvider, defaultMultiLanguageMiddleware, defaultMultiLanguageMiddlewareProvider, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCreateActionsDeferredParent, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, filterSortEntityRows, findEntityListRowDataInTree, fingerprintAttachmentItem, fingerprintAttachments, formatLookupItemDisplay, getDataSourcePageIndex, getEntityListRowId, getMasterInterfacePropertySortKey, getRecordWorkflowCorrelationId, getRecordWorkflowInstanceId, hasFileUploaderTitleOrDescriptionFields, isAXPMiddlewareAbortError, isAttachmentListEntry, isCategoryEntity, isCategoryFilter, isFileListItem, isFileUploaderEditDialogAuto, isLegacyEntityDataSelectorOptions, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider, mapEntityStorageErrorToCommandResult, mapLegacyEntityDataSelectorOptions, mergeForeignKeyFieldIntoCreateActions, normalizeEntityDataSelectorOptions, normalizeEntityFieldToFileList, normalizeEntityListPersistenceMode, normalizeListPaging, persistedAttachments, provideEntity, resolveEntityPluginDetailPageOrder, resolveFileUploaderEditDialog, resolveFileUploaderEntityScope, resolveLookupDisplayField, resolveLookupDisplayTemplate, restoreEntityListExpandedRows, runEntityQuery, searchResultDescriptionMiddleware, searchResultDescriptionMiddlewareProvider, shouldLoadEntityListStateFromStorage, shouldResetEntityListStateOnRouteEntry };
 //# sourceMappingURL=acorex-platform-layout-entity.mjs.map