@meshmakers/shared-ui 3.4.710 → 3.4.740

package/fesm2022/meshmakers-shared-ui.mjs

@@ -1396,8 +1396,18 @@ class DataSourceBase {
     setLoading(loading) {
         this._isLoading$.next(loading);
     }
-    fetchAgain() {
-        this.fetchAgainEvent.emit();
+    fetchAgain(options) {
+        this.fetchAgainEvent.emit(options);
+    }
+    /**
+     * Whether a failed fetch means the requested page offset lies beyond the
+     * (shrunken) result set. MmListViewDataBindingDirective then recovers by
+     * resetting to page 1 and refetching once instead of silently keeping the
+     * previous rows on screen. Protocol-specific subclasses (e.g. the OctoMesh
+     * GraphQL data source) override this; the default cannot tell and says no.
+     */
+    isPageOutOfRangeError(_error) {
+        return false;
     }
 }
 
@@ -1538,9 +1548,18 @@ class MmListViewDataBindingDirective extends DataBindingDirective {
         if (!this.dataSource) {
             return;
         }
-        this._fetchAgainSubscription = this.dataSource.fetchAgainEvent.subscribe(() => {
+        this._fetchAgainSubscription = this.dataSource.fetchAgainEvent.subscribe((options) => {
             this._forceRefresh = true;
+            // A data source refetching because its own (bar/quick-view) filters
+            // changed must return to page 1 — same invariant as notifyFilterChange()
+            // and the text-search path. A plain refresh keeps the current page.
+            if (options?.resetSkip) {
+                this.skip = 0;
+            }
             this.rebind();
+            if (options?.resetSkip) {
+                this.persistState();
+            }
         });
         this._executeFilterSubscription = this.dataSource.listViewComponent.onExecuteFilter.subscribe((value) => {
             this._textSearchValue = value;
@@ -1693,6 +1712,18 @@ class MmListViewDataBindingDirective extends DataBindingDirective {
                 error: (err) => {
                     console.error('[MmListViewDataBinding] fetchData error:', err);
                     this.dataSource.setLoading(false);
+                    // A restored/stale page offset can lie beyond the current result set
+                    // (persisted skip + changed filters, or data shrunk since the last
+                    // visit) — the server rejects the fetch and the grid would silently
+                    // keep showing the PREVIOUS rows under the NEW filters. Recover by
+                    // returning to page 1 once; skip === 0 cannot be out of range, so
+                    // this cannot loop.
+                    if ((this.state.skip ?? 0) > 0 && this.dataSource.isPageOutOfRangeError(err)) {
+                        this.skip = 0;
+                        this._forceRefresh = true;
+                        this.rebind();
+                        this.persistState();
+                    }
                 }
             });
         }