@theseam/ui-common 1.0.2-beta.63 → 1.0.2-beta.67

package/fesm2022/theseam-ui-common-graphql.mjs

@@ -6,6 +6,7 @@ import { isDevMode, InjectionToken, Optional, Inject, Injectable, EventEmitter }
 import { hasProperty, notNullOrUndefined, isNullOrUndefined, withoutProperty, wrapIntoObservable, withoutProperties } from '@theseam/ui-common/utils';
 import { Observable, EMPTY, from, defer, of, combineLatest, Subscription, Subject, BehaviorSubject, isObservable } from 'rxjs';
 import { switchMap, tap, take, concatMap, filter, toArray, map, auditTime, distinctUntilChanged, finalize, catchError, shareReplay, startWith, skip } from 'rxjs/operators';
+import { outputToObservable } from '@angular/core/rxjs-interop';
 import * as i1 from 'apollo-angular';
 import { gql, provideApollo } from 'apollo-angular';
 import { THESEAM_COLUMNS_DATA_FILTER_DATE_TEXT_SEARCH_TYPES, getFormattedDateForComparison, THESEAM_COLUMNS_DATA_FILTER_DATE_RANGE_SEARCH_TYPES, THESEAM_COLUMNS_DATA_FILTER_NUMERIC_TEXT_SEARCH_TYPES, THESEAM_COLUMNS_DATA_FILTER_NUMERIC_RANGE_SEARCH_TYPES, THESEAM_COLUMNS_DATA_FILTER_TEXT_TEXT_SEARCH_TYPES } from '@theseam/ui-common/datatable';
@@ -879,16 +880,12 @@ function observeRowsWithGqlInputsHandling(queryRef, rows, datatable, extraVariab
         });
     }));
     return defer(() => {
-        // Observe the optional refresh-button patch attached externally to the
-        // datatable instance. When the user triggers a refresh, refetch the data.
+        // Observe the datatable's refreshRequested output. When the user clicks the
+        // refresh button (or any other consumer triggers DatatableRefreshService),
+        // refetch the data.
         let refreshBtnSub = Subscription.EMPTY;
         refreshBtnSub = datatable$
-            .pipe(switchMap((dt) => {
-            if (!dt || !dt.__refreshPatch) {
-                return EMPTY;
-            }
-            return dt.__refreshPatch.refreshTriggered.pipe(tap(() => queryRef.refetch(undefined, true)));
-        }))
+            .pipe(switchMap((dt) => dt ? outputToObservable(dt.refreshRequested) : EMPTY), tap(() => queryRef.refetch(undefined, true)))
             .subscribe();
         // Bridge query-input changes to row emissions via a Subject so that the
         // rows observable is only subscribed once (on the first input change) and
@@ -2061,6 +2058,20 @@ class MockDatatable {
     _columnsSubject = new BehaviorSubject([]);
     columns$ = this._columnsSubject.asObservable();
     _filterStatesSubject = new BehaviorSubject([]);
+    _refreshSubject = new Subject();
+    // Hand-rolled OutputRef so MockDatatable can be constructed outside an
+    // injection context (outputFromObservable requires one). outputToObservable
+    // tolerates a missing destroyRef via an optional chain.
+    refreshRequested = {
+        subscribe: (cb) => {
+            const sub = this._refreshSubject.subscribe(() => cb(undefined));
+            return { unsubscribe: () => sub.unsubscribe() };
+        },
+    };
+    /** Test helper: simulate the refresh button being clicked. */
+    triggerRefresh() {
+        this._refreshSubject.next();
+    }
     _sorts = [];
     _rows = [];
     _offset = 0;