@acorex/platform 20.9.37 → 20.9.39

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

@@ -1,4 +1,4 @@
-import { mergeForeignKeyFieldIntoCreateActions, collectNestedCreateHiddenProperties, AXPEntityCommandScope, normalizeEntityDisplayTemplate, sanitizeResolvedEntityDisplayTitle, isUnresolvedEntityDisplayTemplate, resolveEntityListFilterContextField, resolveEntityListFilterQueryField, AXPEntityDataSourceKeys, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, isEntityActionPermitted, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPEntityEventsKeys, collectEntityListSortableFields, collectEntityListFilterDefinitions, parseDottedFieldPath, ENTITY_ROW_POPUP_TITLE_OPTION, resolveLookupWidgetCreateOptions, buildPageListWidgetName, AXPEntityQueryType, buildEntitySearchTitleContext } from '@acorex/platform/layout/entity-contracts';
+import { mergeForeignKeyFieldIntoCreateActions, collectNestedCreateHiddenProperties, AXPEntityCommandScope, normalizeEntityDisplayTemplate, sanitizeResolvedEntityDisplayTitle, isUnresolvedEntityDisplayTemplate, resolveEntityListFilterContextField, resolveEntityListFilterQueryField, AXPEntityDataSourceKeys, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, isEntityActionPermitted, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPEntityEventsKeys, collectEntityListSortableFields, collectEntityListFilterDefinitions, parseDottedFieldPath, ENTITY_ROW_POPUP_TITLE_OPTION, buildPageListWidgetName, resolveLookupWidgetCreateOptions, AXPEntityQueryType, buildEntitySearchTitleContext } from '@acorex/platform/layout/entity-contracts';
 export * from '@acorex/platform/layout/entity-contracts';
 export { collectNestedCreateHiddenProperties, entityDetailsCreateActions, entityDetailsCreateActionsDeferredParent, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, mergeForeignKeyFieldIntoCreateActions } from '@acorex/platform/layout/entity-contracts';
 import { AXToastService } from '@acorex/components/toast';
@@ -4552,12 +4552,14 @@ class AXPEntityListViewColumnViewModel {
         this.width = this.column?.options?.width;
         this.node = computed(() => {
             const widget = this.property.schema.interface;
+            // Column `visible` is resolved by the list viewmodel; do not forward expressions into widget options.
+            const { visible: _columnVisible, ...columnOptions } = this.column?.options ?? {};
             return {
                 path: this.column.options?.dataPath ?? this.name,
                 type: widget.type,
                 options: {
                     ...widget?.options,
-                    ...this.column?.options,
+                    ...columnOptions,
                     columnName: this.name,
                     // Include children from widget interface so column components can access them
                     ...(widget.children ? { children: widget.children } : {}),
@@ -5587,7 +5589,7 @@ class AXPEntityMasterListViewModel {
         if (shouldApplyViewState) {
             this.view.set(nextView);
             this.applyViewSorts();
-            this.applyViewColumns();
+            await this.applyViewColumns();
             this.applyCardFields();
             this.applyViewFilters();
             this.resolvedListPaging.set(null);
@@ -5971,7 +5973,12 @@ class AXPEntityMasterListViewModel {
                     for (const column of next) {
                         const columnKey = column.column?.options?.dataPath ?? column.name;
                         column.width = defaultTo(columnWidthsMap.get(columnKey), column.column?.options?.width);
-                        column.visible = columnVisibilityMap.get(columnKey) ?? column.visible;
+                        // Definition visibility (view.columns whitelist + options.visible) always wins for "hide".
+                        // Persisted settings may only further hide an already-allowed column.
+                        const definitionVisible = column.visible === true;
+                        const persistedVisible = columnVisibilityMap.get(columnKey);
+                        column.visible =
+                            definitionVisible && (persistedVisible === undefined ? true : persistedVisible !== false);
                     }
                     return next;
                 });
@@ -6107,7 +6114,7 @@ class AXPEntityMasterListViewModel {
                     const existingColumns = prev?.list?.views?.[this.view().name]?.columns;
                     const baseColumns = Array.isArray(existingColumns) && existingColumns.length
                         ? existingColumns
-                        : this.allAvailableColumns().map((c) => ({
+                        : this.columns().map((c) => ({
                             name: c.column?.options?.dataPath ?? c.name,
                             visible: c.visible,
                             width: c.width,
@@ -6116,11 +6123,6 @@ class AXPEntityMasterListViewModel {
                         ...c,
                         width: c.name === field ? columnSizeData.width : c.width,
                     }));
-                    const x = this.allAvailableColumns().map((c) => ({
-                        name: c.column?.options?.dataPath ?? c.name,
-                        visible: c.visible,
-                        width: c.width,
-                    }));
                     set(newSettings, `list.views.${this.view().name}.columns`, updatedColumns);
                     return newSettings;
                 });
@@ -6638,22 +6640,59 @@ class AXPEntityMasterListViewModel {
         const relatedDef = this.getRegisteredEntity(related.entity);
         return relatedDef?.properties?.find((property) => property.name === propertyName) ?? null;
     }
-    resetColumns() {
-        this.applyViewColumns();
+    async resetColumns() {
+        await this.applyViewColumns();
     }
     async onColumnsChanged(columns) {
         this.saveSettings('columnOrders', columns);
     }
-    applyViewColumns() {
-        const cols = this.view().columns;
-        const cloned = this.allAvailableColumns().map((c) => {
+    /**
+     * Builds list columns for the active view:
+     * - `view.columns` is a whitelist (empty = all columns)
+     * - string `options.visible` is evaluated against the master-list scope
+     */
+    async applyViewColumns() {
+        const viewColumnNames = this.view().columns ?? [];
+        const scope = this.createLogicExpressionScope(null);
+        const cloned = await Promise.all(this.allAvailableColumns().map(async (c) => {
             const column = this.entityDef.columns?.find((cc) => cc.name == c.name);
             const col = new AXPEntityListViewColumnViewModel(c.property, column);
-            col.visible = !cols.some((c) => c == col.name) && col.visible != false;
+            const expressionVisible = await this.resolveColumnVisibleExpression(col.visible, scope);
+            const includedInView = viewColumnNames.length === 0 || viewColumnNames.some((name) => name === col.name);
+            col.visible = includedInView && expressionVisible;
             return col;
-        });
+        }));
+        if (viewColumnNames.length > 0) {
+            cloned.sort((a, b) => {
+                const aIndex = viewColumnNames.indexOf(a.name);
+                const bIndex = viewColumnNames.indexOf(b.name);
+                const aOrder = aIndex === -1 ? Number.MAX_SAFE_INTEGER : aIndex;
+                const bOrder = bIndex === -1 ? Number.MAX_SAFE_INTEGER : bIndex;
+                return aOrder - bOrder;
+            });
+        }
         this.columns.set(cloned);
     }
+    /**
+     * Resolves column `options.visible` (boolean or expression) to a boolean for the current list scope.
+     */
+    async resolveColumnVisibleExpression(visible, scope) {
+        if (visible === false) {
+            return false;
+        }
+        if (visible === true || visible == null || visible === '') {
+            return true;
+        }
+        if (typeof visible === 'string') {
+            if (!visible.includes('{{')) {
+                const normalized = visible.trim().toLowerCase();
+                return normalized !== 'false' && normalized !== '0';
+            }
+            const result = await this.expressionEvaluator.evaluate(visible, scope);
+            return result !== false;
+        }
+        return Boolean(visible);
+    }
     onColumnsOrderChanged(event) {
         const columns = [...this.columns()];
         moveItemInArray(columns, event.previousIndex - 1, event.currentIndex - 1);
@@ -12818,6 +12857,12 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         this.selectedItems = signal([], ...(ngDevMode ? [{ debugName: "selectedItems" }] : /* istanbul ignore next */ []));
         this.toolbarNode = signal(null, ...(ngDevMode ? [{ debugName: "toolbarNode" }] : /* istanbul ignore next */ []));
         this.destroyed = new Subject();
+        /** Invalidates in-flight filter/refresh work on remount, rapid page switches, or destroy. */
+        this.opGeneration = 0;
+        this.isViewDestroyed = false;
+        this.initListTimeoutId = null;
+        /** Unpatched data-list refresh (hits the grid). Prefer this over the scoped patch to avoid recursion. */
+        this.boundDataListRefresh = null;
         //options
         this.entitySource = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entitySource" }] : /* istanbul ignore next */ []));
         this.excludeColumns = computed(() => this.options()['excludeColumns'], ...(ngDevMode ? [{ debugName: "excludeColumns" }] : /* istanbul ignore next */ []));
@@ -12930,20 +12975,20 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             }
             inst.__axpEntityListRefreshPatched = true;
             const originalRefresh = inst.refresh.bind(inst);
+            this.boundDataListRefresh = originalRefresh;
             inst.refresh = () => {
-                void (async () => {
-                    const o = this.options();
-                    const specs = o['relatedFilterConditionSpecs'];
-                    if (o['syncRelatedListFiltersFromDialogContext'] && specs?.length) {
-                        await this.applyRelatedFiltersFromContextAndDatasource(specs);
-                    }
-                    else {
-                        await this.reapplyScopedFiltersToDataSource();
-                    }
-                    originalRefresh();
-                })();
+                void this.runScopedDataListRefresh(originalRefresh);
+                // Patched refresh is async; callers that need a boolean should use boundDataListRefresh.
+                return false;
             };
+            // If the initial filter apply raced ahead of the grid, retry load now that refresh is bound.
+            untracked(() => {
+                if (!this.isMounted() && !this.isViewDestroyed) {
+                    void this.reapplyScopedFiltersToDataSource({ triggerInitialLoad: true });
+                }
+            });
         }, ...(ngDevMode ? [{ debugName: "#patchDataListRefreshEffect" }] : /* istanbul ignore next */ []));
+        //#endregion
         //#region ----   Query Change Handler   ----
         this.queries = undefined;
         this.#effect = effect(() => {
@@ -13125,6 +13170,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
     /**
      * Route `filters` apply only when the active details `page` matches this list's entity
      * (e.g. WorkOrder filters must not affect FailureRegister on the same asset layout).
+     * page-list sidebar pages use `page-list-{module.entity}` as their page id.
      */
     shouldApplyRouteFilters() {
         const pageId = this.route.snapshot.queryParamMap.get('page');
@@ -13136,7 +13182,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             return false;
         }
         const [, entityName] = entitySource.split('.');
-        return !!entityName && pageId === entityName;
+        return ((!!entityName && pageId === entityName) || pageId === buildPageListWidgetName(entitySource));
     }
     /**
      * Merges route filters into related-entity toolbar filters (route wins per field).
@@ -13156,14 +13202,29 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         const routeFilters = this.parseFiltersFromRoute();
         return routeFilters.length ? this.mergeToolbarFilters(base, routeFilters) : base;
     }
+    //#region ---- Scoped filter / initial load (race-safe) ----
+    beginOp() {
+        return ++this.opGeneration;
+    }
+    isOpStale(generation) {
+        return this.isViewDestroyed || generation !== this.opGeneration;
+    }
+    delay(ms) {
+        return new Promise((resolve) => setTimeout(resolve, ms));
+    }
     /**
      * Applies merged route + parent-scope filters to the widget value and data source.
      */
     applyMergedRouteFiltersToList() {
-        void this.reapplyScopedFiltersToDataSource();
+        void this.reapplyScopedFiltersToDataSource({ triggerInitialLoad: true });
     }
-    /** Syncs toolbar filters to context and AXDataSource (retries until data-list is mounted). */
-    async reapplyScopedFiltersToDataSource() {
+    /**
+     * Syncs toolbar filters to context and AXDataSource (retries until data-list is mounted).
+     * Stale generations (destroy / newer op) exit without touching the grid.
+     */
+    async reapplyScopedFiltersToDataSource(options) {
+        const generation = options?.generation ?? this.beginOp();
+        const triggerInitialLoad = options?.triggerInitialLoad !== false;
         const merged = this.getMergedToolbarFilters();
         const current = this.getValue();
         if (!isEqual(current?.toolbar?.filters, merged)) {
@@ -13172,26 +13233,64 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                 toolbar: { ...(current?.toolbar ?? {}), filters: merged },
             });
         }
-        const pushed = await this.ensureToolbarFiltersOnDataSource();
-        if (pushed) {
-            this.triggerInitialLoadIfNeeded();
+        if (this.isOpStale(generation)) {
+            return;
+        }
+        const pushed = await this.ensureToolbarFiltersOnDataSource(generation);
+        if (!pushed || this.isOpStale(generation)) {
+            return;
+        }
+        if (triggerInitialLoad) {
+            await this.triggerInitialLoadIfNeeded(generation);
         }
     }
     /**
      * 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).
+     * the grid must be refreshed once. Retries until the data-table view child accepts refresh
+     * so rapid relatedEntity page switches cannot leave the table on "no data loaded yet".
      */
-    triggerInitialLoadIfNeeded() {
-        if (this.isMounted()) {
+    async triggerInitialLoadIfNeeded(generation) {
+        if (this.isMounted() || this.isOpStale(generation)) {
             return;
         }
-        const listInstance = this.listWidget()?.instance;
-        if (!listInstance?.call) {
-            return;
+        const refreshed = await this.refreshWhenGridReady(generation);
+        if (refreshed && !this.isOpStale(generation)) {
+            this.isMounted.set(true);
+        }
+    }
+    /**
+     * Calls the unpatched data-list refresh until the grid is ready or the op is stale.
+     */
+    async refreshWhenGridReady(generation) {
+        return this.refreshWhenGridReadyWith(generation, () => this.resolveDataListRefresh()?.() ?? false);
+    }
+    /**
+     * Prefer the bound original refresh (pre-patch). Falls back to an unpatched instance refresh.
+     */
+    resolveDataListRefresh() {
+        if (this.boundDataListRefresh) {
+            return this.boundDataListRefresh;
+        }
+        const inst = this.listWidget()?.instance;
+        if (!inst?.refresh || inst.__axpEntityListRefreshPatched) {
+            return null;
+        }
+        return () => inst.refresh?.() ?? false;
+    }
+    async refreshWhenGridReadyWith(generation, refreshFn) {
+        const maxAttempts = 60;
+        const delayMs = 50;
+        for (let i = 0; i < maxAttempts; i++) {
+            if (this.isOpStale(generation)) {
+                return false;
+            }
+            this.pushToolbarFiltersToDataSource();
+            if (refreshFn()) {
+                return true;
+            }
+            await this.delay(delayMs);
         }
-        this.pushToolbarFiltersToDataSource();
-        listInstance.call('refresh');
-        this.isMounted.set(true);
+        return false;
     }
     /**
      * Re-evaluates related-entity list filters from the live dialog form context (e.g. after create saves the main row id).
@@ -13209,7 +13308,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             value: await this.expressionEvaluator.evaluate(c.value, scope),
             hidden: true,
         })));
-        if (!this.fullPath()) {
+        if (this.isViewDestroyed || !this.fullPath()) {
             return;
         }
         const current = this.getValue();
@@ -13241,14 +13340,18 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
      * Pushes toolbar filters once the embedded data-list exposes its data source
      * (listNode is created via deferred setTimeout in ngOnInit).
      */
-    async ensureToolbarFiltersOnDataSource() {
+    async ensureToolbarFiltersOnDataSource(generation) {
+        const opGeneration = generation ?? this.opGeneration;
         if (this.pushToolbarFiltersToDataSource()) {
             return true;
         }
         const maxAttempts = 40;
         const delayMs = 50;
         for (let i = 0; i < maxAttempts; i++) {
-            await new Promise((resolve) => setTimeout(resolve, delayMs));
+            await this.delay(delayMs);
+            if (this.isOpStale(opGeneration)) {
+                return false;
+            }
             if (this.pushToolbarFiltersToDataSource()) {
                 return true;
             }
@@ -13259,8 +13362,12 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
      * Writes toolbar filters from specs and pushes them onto the data source so refresh/reload keeps the parent scope.
      */
     async applyRelatedFiltersFromContextAndDatasource(specs) {
+        const generation = this.beginOp();
         await this.applyRelatedFiltersFromContext(specs);
-        await this.ensureToolbarFiltersOnDataSource();
+        if (this.isOpStale(generation)) {
+            return;
+        }
+        await this.ensureToolbarFiltersOnDataSource(generation);
     }
     /**
      * Refreshes the embedded data list (toolbar / workflow). In wizard mode, `refresh` is patched to re-apply scoped filters first.
@@ -13270,6 +13377,31 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
     }
     /** Patches data-list `refresh` so reload keeps parent-scoped toolbar filters on the data source. */
     #patchDataListRefreshEffect;
+    /**
+     * Re-applies parent-scoped filters then refreshes the grid, ignoring stale overlapping calls.
+     */
+    async runScopedDataListRefresh(originalRefresh) {
+        const generation = this.beginOp();
+        const o = this.options();
+        const specs = o['relatedFilterConditionSpecs'];
+        if (o['syncRelatedListFiltersFromDialogContext'] && specs?.length) {
+            await this.applyRelatedFiltersFromContext(specs);
+            if (this.isOpStale(generation)) {
+                return;
+            }
+            await this.ensureToolbarFiltersOnDataSource(generation);
+        }
+        else {
+            await this.reapplyScopedFiltersToDataSource({ triggerInitialLoad: false, generation });
+        }
+        if (this.isOpStale(generation)) {
+            return;
+        }
+        const refreshed = await this.refreshWhenGridReadyWith(generation, originalRefresh);
+        if (refreshed && !this.isOpStale(generation) && !this.isMounted()) {
+            this.isMounted.set(true);
+        }
+    }
     #effect;
     /**
      * Validates that all required dependencies are available
@@ -13375,6 +13507,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         }
         // Resolve entity and set it in the signal
         const resolvedEntity = await this.entityService.resolve(moduleName, entityName);
+        if (this.isViewDestroyed) {
+            return;
+        }
         if (!resolvedEntity) {
             throw new Error(`Entity not found: ${this.entitySource()}`);
         }
@@ -13387,8 +13522,18 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             excludeProperties: this.options()['excludeProperties'],
         };
         const listOptions = await this.entityListTableService.convertEntityToListOptions(resolvedEntity, options, this.allActions());
+        if (this.isViewDestroyed) {
+            return;
+        }
         const toolbarOptions = await this.entityListToolbarService.convertEntityToolbarOptions(resolvedEntity, options);
-        setTimeout(() => {
+        if (this.isViewDestroyed) {
+            return;
+        }
+        this.initListTimeoutId = setTimeout(() => {
+            this.initListTimeoutId = null;
+            if (this.isViewDestroyed) {
+                return;
+            }
             this.listNode.set({
                 type: AXPWidgetsCatalog.dataList,
                 options: listOptions,
@@ -13410,7 +13555,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                 },
             });
             queueMicrotask(() => {
-                this.applyMergedRouteFiltersToList();
+                if (!this.isViewDestroyed) {
+                    this.applyMergedRouteFiltersToList();
+                }
             });
         }, 100);
     }
@@ -13435,6 +13582,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             }
         });
         const listWidget = (await this.layoutService.waitForWidget(`${this.entitySource()}-tab-list_table`, 500));
+        if (this.isViewDestroyed) {
+            return;
+        }
         if (listWidget?.api && typeof listWidget.api === 'function') {
             const onSelectionChange = listWidget.api()['onSelectionChange'];
             if (onSelectionChange) {
@@ -13445,6 +13595,13 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         }
     }
     ngOnDestroy() {
+        this.isViewDestroyed = true;
+        this.beginOp();
+        if (this.initListTimeoutId != null) {
+            clearTimeout(this.initListTimeoutId);
+            this.initListTimeoutId = null;
+        }
+        this.boundDataListRefresh = null;
         this.listWidget.set(undefined);
         this.destroyed.next();
         this.destroyed.complete();
@@ -23289,8 +23446,10 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                 hidden: true,
             };
         }) ?? []);
+        // Unique from host overview page id (`entity.name`) so self-referential related lists navigate correctly.
+        const pageId = buildPageListWidgetName(relatedEntity.entity);
         return {
-            id: entityDef?.name ?? '',
+            id: pageId,
             title: context.rootTitle ?? '',
             label: relatedEntity.title,
             icon: relatedEntity.icon || entityDef.icon,
@@ -24521,11 +24680,14 @@ class AXPLayoutAdapterFactory {
     composePagesWithPositions(mainPage, relatedPages, entity) {
         // Only consider related entities with layout types page-detail or page-list
         const pageEntities = (entity?.relatedEntities || []).filter((re) => !re.hidden && (re.layout?.type === 'page-detail' || re.layout?.type === 'page-list'));
-        // Build a map from entity name to its layout config (order/position)
+        // Build a map from page id to its layout config (order/position).
+        // page-list ids use `page-list-{module.entity}` so they never collide with the host overview page.
         const layoutConfigByEntity = {};
         for (const re of pageEntities) {
             const [, entityName] = (re.entity || '').split('.');
-            const key = entityName || re.entity;
+            const key = re.layout?.type === 'page-list'
+                ? buildPageListWidgetName(re.entity)
+                : entityName || re.entity;
             layoutConfigByEntity[key] = { order: re.layout?.order, position: re.layout?.position };
         }
         // Nested pages from merge-detail (e.g. PartyContact from Party) have no layout config.