@meshmakers/octo-meshboard 3.5.700 → 3.5.720

package/fesm2022/meshmakers-octo-meshboard.mjs

@@ -4,7 +4,7 @@ import * as i0 from '@angular/core';
 import { Injectable, inject, EventEmitter, forwardRef, Output, Input, ViewChild, ChangeDetectionStrategy, Component, input, Directive, model, computed, ElementRef, Injector, EnvironmentInjector, ApplicationRef, signal, effect, untracked, InjectionToken, isSignal, LOCALE_ID, NgZone, DestroyRef, ChangeDetectorRef, ViewChildren, createEnvironmentInjector, ViewContainerRef, makeEnvironmentProviders, provideAppInitializer, output, viewChild } from '@angular/core';
 import * as i1$1 from '@angular/forms';
 import { NG_VALUE_ACCESSOR, FormsModule, NG_VALIDATORS } from '@angular/forms';
-import { firstValueFrom, from, map, Observable, of, switchMap as switchMap$1, forkJoin, catchError, NEVER, interval, Subject, BehaviorSubject, filter as filter$1, combineLatest, defer, EMPTY } from 'rxjs';
+import { firstValueFrom, from, map, Observable, of, switchMap as switchMap$1, forkJoin, catchError, EMPTY, NEVER, interval, Subject, BehaviorSubject, filter as filter$1, combineLatest, defer } from 'rxjs';
 import * as i1$8 from '@meshmakers/shared-ui';
 import { EntitySelectInputComponent, MM_ACTION_ICONS, WindowStateService, TimeRangeUtils, MmDialogActionsDirective, ListViewComponent, FetchResultTyped, DataSourceBase, ConfirmationService, TimeRangePickerComponent, ImportStrategyDialogService, HAS_UNSAVED_CHANGES, UnsavedChangesDirective } from '@meshmakers/shared-ui';
 import * as i1 from 'apollo-angular';
@@ -10929,6 +10929,12 @@ class TableWidgetDataSourceDirective extends OctoGraphQlDataSource {
     stateService = inject(MeshBoardStateService);
     variableService = inject(MeshBoardVariableService);
     _config = null;
+    /**
+     * Signature of the query inputs outside the grid state (data source, resolved
+     * widget filters, time filter, entity-selector scope) of the last fetch.
+     * `null` until the first fetch. See {@link refetch}.
+     */
+    _lastQueryInputs = null;
     /** Signal for dynamically derived columns from persistent query */
     _queryColumns = signal([], /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "_queryColumns" }] : /* istanbul ignore next */ []));
@@ -10955,7 +10961,43 @@ class TableWidgetDataSourceDirective extends OctoGraphQlDataSource {
         const listViewComponent = inject(ListViewComponent);
         super(listViewComponent);
     }
+    /**
+     * Refetches the widget data (board refresh, auto-refresh, config change).
+     *
+     * When a query input outside the grid state changed since the last fetch — a
+     * MeshBoard variable or widget filter, the time filter, the entity-selector
+     * scope or the data source itself — the result set is a different one, so the
+     * list returns to page 1 before the query is sent (AB#8801). Otherwise the old
+     * page offset could point past the end of the new result (asset repository:
+     * ASSET1002 / INCOMPLETE_SLICE). A plain refresh with unchanged inputs keeps
+     * the current page.
+     */
+    refetch() {
+        const previous = this._lastQueryInputs;
+        const resetSkip = previous !== null && previous !== this.queryInputsSignature();
+        this.fetchAgain(resetSkip ? { resetSkip: true } : undefined);
+    }
+    /**
+     * Page-out-of-range detection for both error shapes: the inherited check reads
+     * `graphQLErrors` (Apollo 3 `ApolloError`); Apollo 4 rejects with
+     * `CombinedGraphQLErrors`, which carries the same entries in `errors`.
+     */
+    isPageOutOfRangeError(error) {
+        if (super.isPageOutOfRangeError(error)) {
+            return true;
+        }
+        const errors = error?.errors;
+        if (!Array.isArray(errors)) {
+            return false;
+        }
+        return errors.some((e) => {
+            const extensions = e?.extensions;
+            const codes = Array.isArray(extensions?.['codes']) ? extensions['codes'] : [];
+            return codes.includes('INCOMPLETE_SLICE') || extensions?.['code'] === 'INCOMPLETE_SLICE';
+        });
+    }
     fetchData(queryOptions) {
+        this._lastQueryInputs = this.queryInputsSignature();
         if (!this._config) {
             return of(new FetchResultTyped([], 0));
         }
@@ -11018,10 +11060,52 @@ class TableWidgetDataSourceDirective extends OctoGraphQlDataSource {
                 return record;
             });
             return new FetchResultTyped(data, totalCount);
-        }), catchError$1(err => {
-            console.error('Error fetching table data:', err);
-            return of(new FetchResultTyped([], 0));
-        }));
+        }), catchError$1(err => this.handleFetchError(err, queryOptions, 'Error fetching table data:')));
+    }
+    /**
+     * Error path of both fetch paths. A page offset beyond the result set
+     * (ASSET1002 / INCOMPLETE_SLICE, e.g. the data shrank since the last load)
+     * is not shown as an empty list: the list returns to page 1 and refetches
+     * once (AB#8801). The refetch runs on a microtask so the list binding's
+     * current subscription has ended first; skip 0 cannot be out of range, so
+     * this cannot loop. Any other error keeps today's behaviour (logged, no rows).
+     */
+    handleFetchError(err, queryOptions, logMessage) {
+        const skip = queryOptions.state.skip ?? 0;
+        if (skip > 0 && this.isPageOutOfRangeError(err)) {
+            console.warn(`octo-meshboard: table widget page offset ${skip} lies beyond the result; returning to page 1`);
+            queueMicrotask(() => this.fetchAgain({ resetSkip: true }));
+            return EMPTY;
+        }
+        console.error(logMessage, err);
+        return of(new FetchResultTyped([], 0));
+    }
+    /**
+     * Signature of every query input outside the grid state (paging, sort, grid
+     * filter): the data source, the widget filters with MeshBoard variables
+     * resolved, the time filter selection and the entity-selector scope. The time
+     * filter enters as its selection, not as resolved instants, so a relative
+     * range ("last 24 hours") does not look changed on every auto-refresh. The
+     * board's time-zone mode enters with an active selection (no host period),
+     * because the selection's window is resolved in that zone.
+     */
+    queryInputsSignature() {
+        const config = this._config;
+        if (!config) {
+            return 'none';
+        }
+        const dataSource = config.dataSource;
+        const filters = this.convertFiltersToDto(config.filters) ?? null;
+        if (dataSource.type !== 'persistentQuery') {
+            return JSON.stringify({ dataSource, filters });
+        }
+        const timeFilter = dataSource.ignoreTimeFilter ? null : (this.stateService.getConfig().timeFilter ?? null);
+        const host = dataSource.ignoreTimeFilter ? null : this.stateService.hostTimeRange();
+        // Host periods are absolute instants (no zone conversion), so the zone only
+        // matters for the board's own selection.
+        const timeZone = timeFilter?.enabled && timeFilter.selection && !host ? this.stateService.timeZoneMode() : null;
+        const scope = this.stateService.resolveStreamDataScope(dataSource.entitySelectorId, dataSource.queryFamily, dataSource.ignoreTimeFilter);
+        return JSON.stringify({ dataSource, filters, timeFilter, timeZone, host, scope });
     }
     /**
      * Recursively flattens attributes into the record using dot notation for nested attributes.
@@ -11103,7 +11187,11 @@ class TableWidgetDataSourceDirective extends OctoGraphQlDataSource {
             fieldFilter: fieldFilter ?? undefined,
             streamDataArgs,
             // Runtime queries: `rtId IN` field filter (AB#7725); stream data: arg.rtIds.
-            scopeRtIds: scope.kind === 'scoped' ? scope.rtIds : undefined
+            scopeRtIds: scope.kind === 'scoped' ? scope.rtIds : undefined,
+            // A refetch (board refresh, changed inputs, page-1 recovery) bypasses the
+            // Apollo cache like the runtime-entity path does, so a cached page with a
+            // stale total count is never shown again (AB#8801).
+            forceRefresh: queryOptions.forceRefresh ?? false
         }).pipe(map$1(result => {
             // Extract columns from query response and update signal.
             // Replace dots with underscores for grid compatibility (Kendo treats dots as nested paths).
@@ -11120,10 +11208,7 @@ class TableWidgetDataSourceDirective extends OctoGraphQlDataSource {
                 .filter(row => TableWidgetDataSourceDirective.SUPPORTED_ROW_TYPES.has(row.__typename ?? ''))
                 .map((row, index) => this.queryRowToRecord(row, columns, hasRtIdColumn, hasCkTypeIdColumn, index));
             return new FetchResultTyped(data, result.totalCount);
-        }), catchError$1(err => {
-            console.error('Error fetching query data:', err);
-            return of(new FetchResultTyped([], 0));
-        }));
+        }), catchError$1(err => this.handleFetchError(err, queryOptions, 'Error fetching query data:')));
     }
     /**
      * Flattens a unified `QueryResultRow` into a Kendo-grid-friendly record.
@@ -12019,7 +12104,8 @@ class TableWidgetComponent {
         if (this.dataSource) {
             // Clear query columns in directive before fetching new data
             this.dataSource.clearQueryColumns();
-            this.dataSource.fetchAgain();
+            // Returns to page 1 when a variable, filter, time filter or scope changed (AB#8801).
+            this.dataSource.refetch();
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.5", ngImport: i0, type: TableWidgetComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });