@acorex/platform 20.9.37 → 20.9.38

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

@@ -12818,6 +12818,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 +12936,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(() => {
@@ -13156,14 +13162,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 +13193,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 +13268,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 +13300,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 +13322,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 +13337,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 +13467,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 +13482,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 +13515,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                 },
             });
             queueMicrotask(() => {
-                this.applyMergedRouteFiltersToList();
+                if (!this.isViewDestroyed) {
+                    this.applyMergedRouteFiltersToList();
+                }
             });
         }, 100);
     }
@@ -13435,6 +13542,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 +13555,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();