@acorex/platform 20.7.20 → 20.7.21

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

@@ -380,7 +380,6 @@ class AXPEntityMiddleware {
         }
         // Apply all matching modifiers in order
         for (const modifier of modifiers) {
-            //TODO Check side EFFECTS
             runInInjectionContext(this.injector, () => modifier(context));
         }
         return context.toEntity();
@@ -4532,8 +4531,82 @@ const AXPEntityDetailViewModelResolver = (route, state, service = inject(AXPEnti
     return service.create(moduleName, entityName, id);
 };
 
+class AXPDetailsViewBadgeStatusService {
+    constructor() {
+        this.entityRegistry = inject(AXPEntityDefinitionRegistryService);
+        this.translateService = inject(AXTranslationService);
+    }
+    async getPageBadge(entityName, _context, isDirty) {
+        if (!isDirty) {
+            return null;
+        }
+        return {
+            title: await this.translateService.translateAsync('@general:terms.interface.save-status.not-saved.title'),
+            color: 'warning',
+            description: await this.translateService.translateAsync('@general:terms.interface.save-status.not-saved.description'),
+        };
+    }
+    async getPageStatus(entityName, context, currentPage) {
+        if (!entityName) {
+            return null;
+        }
+        const [moduleName, entityNamePart] = entityName.split('.');
+        if (!moduleName || !entityNamePart) {
+            return null;
+        }
+        try {
+            const entityDefinition = await this.entityRegistry.resolve(moduleName, entityNamePart);
+            if (!entityDefinition) {
+                return null;
+            }
+            const statusPlugin = entityDefinition.plugins?.find((p) => p.name === 'status');
+            if (!statusPlugin?.options) {
+                return null;
+            }
+            const statusOptions = statusPlugin.options;
+            const statusField = statusOptions.field ?? 'statusId';
+            const statusDefinitionKey = statusOptions.definition;
+            let definitionKey = typeof statusDefinitionKey === 'string' ? statusDefinitionKey : undefined;
+            if (!definitionKey) {
+                const statusProperty = entityDefinition.properties?.find((p) => p.name === statusField);
+                const widgetOptions = statusProperty?.schema?.interface?.options;
+                if (widgetOptions?.definitionKey) {
+                    definitionKey = widgetOptions.definitionKey;
+                }
+            }
+            if (!definitionKey) {
+                return null;
+            }
+            const statusValue = context?.[statusField];
+            if (statusValue == null) {
+                return null;
+            }
+            const value = typeof statusValue === 'string' ? statusValue : statusValue?.name ?? statusValue;
+            return {
+                definitionKey,
+                value: String(value),
+                dataPath: statusField,
+                readonly: currentPage?.isReadonly ?? false,
+            };
+        }
+        catch (error) {
+            console.warn('Failed to get page status:', error);
+            return null;
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPDetailsViewBadgeStatusService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPDetailsViewBadgeStatusService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPDetailsViewBadgeStatusService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
 class AXPLayoutAdapterBuilder {
     constructor() {
+        this.badgeStatusService = inject(AXPDetailsViewBadgeStatusService);
         this.adapter = {};
     }
     setEntity(entity, rootContext) {
@@ -4562,8 +4635,9 @@ class AXPLayoutAdapterBuilder {
         return this;
     }
     build() {
+        const name = `${this.entity?.module}.${this.entity?.name}`;
         return {
-            name: `${this.entity?.module}.${this.entity?.name}`,
+            name,
             title: `${this.entity?.interfaces?.master?.single?.title}`,
             label: this.entity?.formats.plural,
             actions: [],
@@ -4572,6 +4646,8 @@ class AXPLayoutAdapterBuilder {
             load: this.createLoadFunction(),
             pages: this.adapter.pages || [],
             exitUrl: this.adapter.exitUrl,
+            getPageBadge: (context, isDirty) => this.badgeStatusService.getPageBadge(name, context, isDirty),
+            getPageStatus: (context, currentPage) => this.badgeStatusService.getPageStatus(name, context, currentPage),
         };
     }
     createBreadcrumbs() {
@@ -5989,11 +6065,14 @@ class AXPLayoutAdapterFactory {
             throw new Error(`Entity ${moduleName}.${entityName} not found`);
         }
         const rootContext = await this.loadRootContext(entity, id);
-        // Build main and related pages
-        const mainPage = await this.buildMainPage(entity, rootContext, id, dependencies);
-        const relatedPages = await this.buildRelatedPages(entity, rootContext, dependencies);
+        // 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);
         // Compose ordered pages around the primary page
-        const orderedPages = this.composePagesWithPositions(mainPage, relatedPages, entity);
+        const orderedPages = this.composePagesWithPositions(mainPage, relatedPages, entityWithEvaluatedRelated);
         const applicationName = dependencies.session.application?.name ?? 'default';
         return this.layoutAdapterBuilder
             .setEntity(entity, rootContext)
@@ -6009,11 +6088,40 @@ class AXPLayoutAdapterFactory {
     async buildMainPage(entity, rootContext, id, dependencies) {
         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.
+     */
+    async evaluateRelatedEntitiesHidden(relatedEntities, rootContext, dependencies) {
+        if (!relatedEntities?.length || !dependencies?.expressionEvaluator) {
+            return relatedEntities ?? [];
+        }
+        return Promise.all(relatedEntities.map(async (re) => {
+            let hidden = re.hidden;
+            if (hidden && typeof hidden === 'string') {
+                try {
+                    const scope = {
+                        context: {
+                            eval: (path) => get(rootContext, path),
+                        },
+                    };
+                    const result = await dependencies.expressionEvaluator.evaluate({ hidden }, scope);
+                    hidden = result.hidden;
+                }
+                catch {
+                    // Keep original hidden value if evaluation fails
+                }
+            }
+            return { ...re, hidden };
+        }));
+    }
     async buildRelatedPages(entity, rootContext, dependencies) {
         const pages = [];
         const rootTitle = await this.getRootTitle(entity, rootContext, dependencies);
+        // Evaluate hidden expressions before filtering related entities
+        const evaluatedRelatedEntities = await this.evaluateRelatedEntitiesHidden(entity?.relatedEntities ?? [], rootContext, dependencies);
         // Page Details
-        const pageDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-detail');
+        const pageDetailEntities = evaluatedRelatedEntities.filter((re) => !re.hidden && re.layout?.type === 'page-detail');
         for (const relatedEntity of pageDetailEntities || []) {
             const converter = this.relatedEntityConverterFactory.createPageDetailsConverter();
             pages.push(await converter.convert(relatedEntity, {
@@ -6023,7 +6131,7 @@ class AXPLayoutAdapterFactory {
             }));
         }
         // Page Lists
-        const pageListEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-list');
+        const pageListEntities = evaluatedRelatedEntities.filter((re) => !re.hidden && re.layout?.type === 'page-list');
         for (const relatedEntity of pageListEntities || []) {
             const converter = this.relatedEntityConverterFactory.createPageListConverter();
             pages.push(await converter.convert(relatedEntity, {
@@ -6034,7 +6142,7 @@ class AXPLayoutAdapterFactory {
             }));
         }
         // Include nested page-related entities from merge-detail related entities
-        const mergeDetailEntities = entity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'merge-detail');
+        const mergeDetailEntities = evaluatedRelatedEntities.filter((re) => !re.hidden && re.layout?.type === 'merge-detail');
         for (const mergeRelated of mergeDetailEntities || []) {
             try {
                 const [moduleName, childEntityName] = (mergeRelated.entity || '').split('.');
@@ -6044,7 +6152,9 @@ class AXPLayoutAdapterFactory {
                 }
                 const nestedDataPath = mergeRelated?.persistence?.dataPath || childEntityName;
                 const nestedContext = get(rootContext, nestedDataPath) ?? rootContext;
-                const nestedPageDetailEntities = childEntity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-detail');
+                // Evaluate hidden expressions for nested related entities
+                const evaluatedNestedEntities = await this.evaluateRelatedEntitiesHidden(childEntity?.relatedEntities ?? [], nestedContext, dependencies);
+                const nestedPageDetailEntities = evaluatedNestedEntities.filter((re) => !re.hidden && re.layout?.type === 'page-detail');
                 for (const nestedRelated of nestedPageDetailEntities || []) {
                     const converter = this.relatedEntityConverterFactory.createPageDetailsConverter();
                     pages.push(await converter.convert(nestedRelated, {
@@ -6053,7 +6163,7 @@ class AXPLayoutAdapterFactory {
                         rootTitle: rootTitle,
                     }));
                 }
-                const nestedPageListEntities = childEntity?.relatedEntities?.filter((re) => !re.hidden && re.layout?.type === 'page-list');
+                const nestedPageListEntities = evaluatedNestedEntities.filter((re) => !re.hidden && re.layout?.type === 'page-list');
                 for (const nestedRelated of nestedPageListEntities || []) {
                     const converter = this.relatedEntityConverterFactory.createPageListConverter();
                     pages.push(await converter.convert(nestedRelated, {
@@ -6219,6 +6329,47 @@ const columnWidthMiddlewareProvider = {
 };
 //#endregion
 
+const DEFAULT_APPLY_ORDERING = true;
+/**
+ * Provides synchronous access to the ApplyLayoutOrdering setting.
+ * Used by layout ordering middleware to avoid async in the modifier and prevent startup deadlocks.
+ * Value is updated on onLoaded/onChanged; first read can trigger a one-time background get (no await).
+ */
+class AXPLayoutOrderingConfigService {
+    constructor() {
+        this.settingsService = inject(AXPSettingsService);
+        this._applyOrdering = signal(DEFAULT_APPLY_ORDERING, ...(ngDevMode ? [{ debugName: "_applyOrdering" }] : []));
+        this.syncScheduled = false;
+        this.settingsService.onLoaded.subscribe(() => this.syncFromSettings());
+        this.settingsService.onChanged.subscribe(() => this.syncFromSettings());
+    }
+    getApplyOrdering() {
+        if (!this.syncScheduled) {
+            this.syncScheduled = true;
+            this.settingsService
+                .get(AXPCommonSettings.ApplyLayoutOrdering)
+                .then((value) => this._applyOrdering.set(value ?? DEFAULT_APPLY_ORDERING))
+                .catch(() => this._applyOrdering.set(DEFAULT_APPLY_ORDERING));
+        }
+        return this._applyOrdering();
+    }
+    async syncFromSettings() {
+        try {
+            const value = await this.settingsService.get(AXPCommonSettings.ApplyLayoutOrdering);
+            this._applyOrdering.set(value ?? DEFAULT_APPLY_ORDERING);
+        }
+        catch {
+            this._applyOrdering.set(DEFAULT_APPLY_ORDERING);
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPLayoutOrderingConfigService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPLayoutOrderingConfigService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPLayoutOrderingConfigService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }], ctorParameters: () => [] });
+
 /**
  * Default order for common sections
  */
@@ -6289,6 +6440,10 @@ const getPropertyOrder = (sectionId, propertyName, orderConfig) => {
  */
 const layoutOrderingMiddlewareFactory = (config) => {
     return (context) => {
+        const configService = inject(AXPLayoutOrderingConfigService);
+        if (!configService.getApplyOrdering()) {
+            return;
+        }
         const { sections: sectionOrder, properties: propertyOrder } = config;
         //#region ----   Order Sections   ----
         const orderSections = (layout) => {
@@ -6438,7 +6593,9 @@ const AXPCrudModifier = {
             if (!queries?.byKey) {
                 queries.byKey = {
                     execute: async (id) => {
-                        return await dataService.getOne(id);
+                        const data = await dataService.getOne(id);
+                        // debugger;
+                        return data;
                     },
                     type: AXPEntityQueryType.Single,
                 };
@@ -7683,7 +7840,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                         await this.selectAllLeafDescendants(nodeId);
                     }
                     else {
-                        // childrenCount is undefined - need to check if it has children
+                        // 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
@@ -7692,8 +7849,8 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                             this.selectedNodeIds.set(Array.from(currentSelected));
                         }
                         else {
-                            // Has children - only add leaf descendants
-                            await this.selectAllLeafDescendants(nodeId);
+                            // Has children - pass prefetched childNodes to avoid datasource(nodeId) again
+                            await this.selectAllLeafDescendants(nodeId, childNodes);
                         }
                     }
                 }
@@ -7759,16 +7916,17 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
     /**
      * Expands parent nodes, collects all LEAF descendants, and selects them visually.
      * If the parent itself is a leaf (no children), it will be added.
+     * When prefetchedChildren is provided, avoids an extra datasource(parentId) call.
      */
-    async selectAllLeafDescendants(parentId) {
+    async selectAllLeafDescendants(parentId, prefetchedChildren) {
         if (!this.treeData || !this.treeConfig) {
             return;
         }
         const treeComponent = this.tree();
         try {
             const leafIds = new Set();
-            // Expand and collect leaf nodes simultaneously
-            await this.collectLeafNodes(parentId, leafIds, treeComponent);
+            // Expand and collect leaf nodes; pass prefetchedChildren to avoid duplicate API call
+            await this.collectLeafNodes(parentId, leafIds, treeComponent, prefetchedChildren);
             // Also check if the parent itself is a leaf (has no children)
             if (parentId !== 'all') {
                 const isLeaf = await this.isLeafNodeCheck(parentId);
@@ -7843,14 +8001,19 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
     /**
      * Recursively expands parent nodes and collects LEAF node IDs.
      * When treeComponent is provided, expands each parent node before loading children.
+     * When prefetchedChildren is provided, uses it instead of calling datasource(parentId) (one less API call).
+     * Fetches each node's children at most once by passing grandchildren when recursing.
      */
-    async collectLeafNodes(parentId, collection, treeComponent) {
+    async collectLeafNodes(parentId, collection, treeComponent, prefetchedChildren) {
         if (!this.treeData || !this.treeConfig) {
             return;
         }
         try {
             let childNodes;
-            if (parentId === 'all') {
+            if (prefetchedChildren !== undefined) {
+                childNodes = prefetchedChildren;
+            }
+            else if (parentId === 'all') {
                 // Expand 'all' node if tree component provided
                 if (treeComponent) {
                     try {
@@ -7860,7 +8023,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                         // Ignore expand errors
                     }
                 }
-                // Get root node's children
+                // Get root node's children (single datasource call)
                 const rootNodes = await this.datasource();
                 if (!rootNodes || rootNodes.length === 0) {
                     return;
@@ -7878,13 +8041,13 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                         // Ignore expand errors
                     }
                 }
-                // Load children via datasource
+                // Load children via datasource (single call per parent)
                 childNodes = await this.datasource(parentId);
             }
             if (!childNodes || childNodes.length === 0) {
                 return;
             }
-            // Process each child
+            // Process each child: fetch grandchildren once, then recurse with them to avoid double datasource call
             for (const childNode of childNodes) {
                 const childId = String(childNode['id'] ?? '');
                 if (!childId || childId === 'all' || collection.has(childId)) {
@@ -7892,15 +8055,13 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                 }
                 // Cache node data
                 this.cacheNodeFromTreeNode(childNode);
-                // Check if this child has children
-                const hasChildren = await this.nodeHasChildren(childId, childNode);
-                if (!hasChildren) {
-                    // This is a LEAF node - add it
+                // Fetch children once; use result to decide leaf vs recurse (avoids nodeHasChildren -> extra datasource)
+                const grandchildNodes = await this.datasource(childId);
+                if (!grandchildNodes || grandchildNodes.length === 0) {
                     collection.add(childId);
                 }
                 else {
-                    // Has children - expand and recurse (pass tree component to expand children too)
-                    await this.collectLeafNodes(childId, collection, treeComponent);
+                    await this.collectLeafNodes(childId, collection, treeComponent, grandchildNodes);
                 }
             }
         }
@@ -7961,6 +8122,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
     /**
      * Builds complete ancestor chains for all selected node IDs.
      * Returns a Map where key is the selected node ID and value is array of ancestor IDs from root to parent.
+     * Batch-fetches missing node and ancestor data in parallel to minimize API calls.
      */
     async buildAncestorChains(selectedIds) {
         const ancestorChains = new Map();
@@ -7968,18 +8130,44 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
             return ancestorChains;
         if (!this.treeData.categoryEntityDef?.parentKey)
             return ancestorChains;
+        // Collect and batch-fetch all missing IDs (selected nodes without parent + ancestors) in rounds
+        let toFetch = new Set();
+        for (const nodeId of selectedIds) {
+            const cached = this.nodeDataCache.get(nodeId);
+            if (!cached || this.getParentIdFromNodeData(cached) === null) {
+                toFetch.add(nodeId);
+            }
+        }
+        while (toFetch.size > 0) {
+            const results = await Promise.all(Array.from(toFetch).map((id) => this.fetchItemById(id)));
+            const idsArr = Array.from(toFetch);
+            results.forEach((item, i) => {
+                if (item)
+                    this.nodeDataCache.set(idsArr[i], item);
+            });
+            toFetch = new Set();
+            for (const nodeId of selectedIds) {
+                let currentData = this.nodeDataCache.get(nodeId) ?? null;
+                const visited = new Set();
+                while (currentData) {
+                    const parentId = this.getParentIdFromNodeData(currentData);
+                    if (!parentId || visited.has(parentId))
+                        break;
+                    visited.add(parentId);
+                    if (!this.nodeDataCache.has(parentId)) {
+                        toFetch.add(parentId);
+                        break;
+                    }
+                    currentData = this.nodeDataCache.get(parentId) ?? null;
+                }
+            }
+        }
+        // Build chains from cache (no further API calls)
         for (const nodeId of selectedIds) {
             const chain = [];
             let currentData = this.nodeDataCache.get(nodeId) ?? null;
             if (!currentData)
                 continue;
-            if (!this.getParentIdFromNodeData(currentData)) {
-                const refetched = await this.fetchItemById(nodeId);
-                if (refetched) {
-                    currentData = refetched;
-                    this.nodeDataCache.set(nodeId, refetched);
-                }
-            }
             const visited = new Set();
             while (currentData) {
                 const parentId = this.getParentIdFromNodeData(currentData);
@@ -7987,19 +8175,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
                     break;
                 visited.add(parentId);
                 chain.unshift(parentId);
-                if (!this.nodeDataCache.has(parentId)) {
-                    const parentData = await this.fetchItemById(parentId);
-                    if (parentData) {
-                        this.nodeDataCache.set(parentId, parentData);
-                        currentData = parentData;
-                    }
-                    else {
-                        break;
-                    }
-                }
-                else {
-                    currentData = this.nodeDataCache.get(parentId) ?? null;
-                }
+                currentData = this.nodeDataCache.get(parentId) ?? null;
             }
             ancestorChains.set(nodeId, chain);
         }
@@ -8163,27 +8339,34 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         // Sort parents by depth (deepest first so we update bottom-up)
         const sortedParents = await this.sortParentsByDepth(Array.from(parentsToUpdate));
         const reversedParents = [...sortedParents].reverse(); // Deepest first
+        // Batch-load children for parents that don't have them in tree (parallel instead of sequential)
+        const parentIdsNeedingLoad = reversedParents.filter((parentId) => {
+            const parentNode = treeComponent.findNode(parentId);
+            const treeChildren = parentNode?.['children'];
+            return !treeChildren || treeChildren.length === 0;
+        });
+        const childrenByParentId = new Map();
+        if (parentIdsNeedingLoad.length > 0) {
+            const results = await Promise.all(parentIdsNeedingLoad.map((id) => this.datasource(id)));
+            results.forEach((dsChildren, index) => {
+                if (dsChildren && dsChildren.length > 0) {
+                    childrenByParentId.set(parentIdsNeedingLoad[index], dsChildren.map((c) => ({ id: String(c['id'] ?? '') })));
+                }
+            });
+        }
         for (const parentId of reversedParents) {
             try {
                 const parentNode = treeComponent.findNode(parentId);
-                // Get all direct children of this parent
-                // First try from tree node, then fall back to datasource
+                // Get all direct children: from tree node, or from batch-loaded map
                 let childrenList = [];
                 const treeChildren = parentNode?.['children'];
                 if (treeChildren && treeChildren.length > 0) {
                     childrenList = treeChildren.map((c) => ({ id: String(c['id'] ?? '') }));
                 }
                 else {
-                    // Children not in tree node - load via datasource
-                    try {
-                        const dsChildren = await this.datasource(parentId);
-                        if (dsChildren && dsChildren.length > 0) {
-                            childrenList = dsChildren.map((c) => ({ id: String(c['id'] ?? '') }));
-                        }
-                    }
-                    catch {
-                        // Datasource failed, skip this parent
-                        continue;
+                    const loaded = childrenByParentId.get(parentId);
+                    if (loaded && loaded.length > 0) {
+                        childrenList = loaded;
                     }
                 }
                 if (childrenList.length === 0) {
@@ -8244,6 +8427,7 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
     /**
      * Loads node data for IDs that are selected but not yet in the cache.
      * This is critical for pre-selected values in collapsed branches.
+     * Fetches all missing IDs in parallel to minimize API calls and latency.
      */
     async loadMissingNodeData(selectedIds) {
         if (!this.treeData || !this.treeConfig || selectedIds.length === 0) {
@@ -8253,13 +8437,14 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
         if (missingIds.length === 0)
             return;
         try {
-            // Prefer fetching each id via service (uses byKey when available = full item with parent)
             const valueField = this.treeConfig.valueField || 'id';
-            for (const id of missingIds) {
-                const item = await this.fetchItemById(id);
-                if (item)
+            const results = await Promise.all(missingIds.map((id) => this.fetchItemById(id)));
+            results.forEach((item, index) => {
+                if (item) {
+                    const id = missingIds[index];
                     this.nodeDataCache.set(String(item[valueField] ?? id), item);
-            }
+                }
+            });
         }
         catch (error) {
             console.error('Error loading missing node data:', error);
@@ -8268,18 +8453,22 @@ class AXPEntityCategoryTreeSelectorComponent extends AXBasePageComponent {
     /**
      * For each selected id, if cached item has no parent (e.g. batch query returned minimal fields),
      * re-fetch by id so we have parent/parentId for building ancestor chains.
+     * Fetches all needing refresh in parallel.
      */
     async ensureParentDataInCache(selectedIds) {
         if (!this.treeConfig)
             return;
-        for (const id of selectedIds) {
+        const idsNeedingFetch = selectedIds.filter((id) => {
             const cached = this.nodeDataCache.get(id);
-            if (cached && this.getParentIdFromNodeData(cached) === null) {
-                const full = await this.fetchItemById(id);
-                if (full)
-                    this.nodeDataCache.set(id, full);
-            }
-        }
+            return cached && this.getParentIdFromNodeData(cached) === null;
+        });
+        if (idsNeedingFetch.length === 0)
+            return;
+        const results = await Promise.all(idsNeedingFetch.map((id) => this.fetchItemById(id)));
+        results.forEach((full, index) => {
+            if (full)
+                this.nodeDataCache.set(idsNeedingFetch[index], full);
+        });
     }
     /**
      * Resolves parent ID from node data: supports nested `parent` object or flat parentId/parentKey.
@@ -15332,5 +15521,5 @@ function detectEntityChanges(oldObj, newObj) {
  * Generated bundle index. Do not edit.
  */
 
-export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListTableService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPGetEntityDetailsQuery, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPMultiSourceDefinitionProviderContext, AXPMultiSourceDefinitionProviderService, AXPMultiSourceFederatedSearchService, AXPMultiSourceSelectorComponent, AXPMultiSourceSelectorService, AXPMultiSourceSelectorWidget, AXPMultiSourceSelectorWidgetColumnComponent, AXPMultiSourceSelectorWidgetEditComponent, AXPMultiSourceSelectorWidgetViewComponent, AXPMultiSourceType, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_MULTI_SOURCE_DEFINITION_PROVIDER, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, EntityBuilder, EntityDataAccessor, actionExists, cloneLayoutArrays, columnWidthMiddleware, columnWidthMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider };
+export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListTableService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPGetEntityDetailsQuery, AXPLayoutOrderingConfigService, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPMultiSourceDefinitionProviderContext, AXPMultiSourceDefinitionProviderService, AXPMultiSourceFederatedSearchService, AXPMultiSourceSelectorComponent, AXPMultiSourceSelectorService, AXPMultiSourceSelectorWidget, AXPMultiSourceSelectorWidgetColumnComponent, AXPMultiSourceSelectorWidgetEditComponent, AXPMultiSourceSelectorWidgetViewComponent, AXPMultiSourceType, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_MULTI_SOURCE_DEFINITION_PROVIDER, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, EntityBuilder, EntityDataAccessor, actionExists, cloneLayoutArrays, columnWidthMiddleware, columnWidthMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider };
 //# sourceMappingURL=acorex-platform-layout-entity.mjs.map