rename setLoading to setLoadingCallback for consistency

elefeint · elefeint · commit 2ba3081b0ebb · 2023-03-02T15:27:10.000-05:00
diff --git a/packages/tadviewer/src/PivotRequester.ts b/packages/tadviewer/src/PivotRequester.ts
@@ -217,7 +217,7 @@ function getObjectDiff(obj1: any, obj2: any) {
   return diff;
 }
 
-const noopSetLoading = (loading: boolean) => {};
+const noopSetLoadingCallback = (loading: boolean) => {};
 
 /**
  * A PivotRequester listens for changes on the appState and viewport and
@@ -241,12 +241,12 @@ export class PivotRequester {
   pendingOffset: number;
   pendingLimit: number;
   errorCallback?: (e: Error) => void;
-  setLoading: (loading: boolean) => void;
+  setLoadingCallback: (loading: boolean) => void;
 
   constructor(
     stateRef: oneref.StateRef<AppState>,
     errorCallback?: (e: Error) => void,
-    setLoading?: (loading: boolean) => void
+    setLoadingCallback?: (loading: boolean) => void
   ) {
     this.pendingQueryRequest = null;
     this.currentQueryView = null;
@@ -255,7 +255,7 @@ export class PivotRequester {
     this.pendingOffset = 0;
     this.pendingLimit = 0;
     this.errorCallback = errorCallback;
-    this.setLoading = setLoading || noopSetLoading;
+    this.setLoadingCallback = setLoadingCallback || noopSetLoadingCallback;
 
     addStateChangeListener(stateRef, (_) => {
       this.onStateChange(stateRef);
@@ -270,7 +270,7 @@ export class PivotRequester {
     stateRef: oneref.StateRef<AppState>,
     queryView: QueryView
   ): Promise<PagedDataView> {
-    this.setLoading(true);
+    this.setLoadingCallback(true);
     const appState: AppState = mutableGet(stateRef);
     const viewState = appState.viewState;
     const viewParams = viewState.viewParams;
@@ -299,7 +299,7 @@ export class PivotRequester {
               .set("dataView", dataView) as ViewState
         )
       );
-      this.setLoading(false);
+      this.setLoadingCallback(false);
       return dataView;
     });
     return dreq;
@@ -377,7 +377,7 @@ export class PivotRequester {
             err.message,
             err.stack
           );
-          this.setLoading(false);
+          this.setLoadingCallback(false);
           // TODO:
           // remoteErrorDialog("Error constructing view", err.message); // Now let's try and restore to previous view params:
           oneref.update(
@@ -388,6 +388,10 @@ export class PivotRequester {
                   .update("loadingTimer", (lt) => lt.stop())
             )
           );
+          if (this.errorCallback) {
+            this.errorCallback(err instanceof Error ? err : new Error(err));
+          }
+
         });
       const ltUpdater = util.pathUpdater<AppState, Timer>(stateRef, [
         "viewState",
diff --git a/packages/tadviewer/src/components/TadViewerPane.tsx b/packages/tadviewer/src/components/TadViewerPane.tsx
@@ -54,14 +54,14 @@ export interface TadViewerPaneProps {
   baseSqlQuery: string;
   dsConn: DataSourceConnection;
   errorCallback?: (e: Error) => void;
-  setLoading: (loading: boolean) => void;
+  setLoadingCallback: (loading: boolean) => void;
 }
 
 export function TadViewerPane({
   baseSqlQuery,
   dsConn,
   errorCallback,
-  setLoading,
+  setLoadingCallback,
 }: TadViewerPaneProps): JSX.Element | null {
   const [appStateRef, setAppStateRef] = useState<StateRef<AppState> | null>(
     null
@@ -88,7 +88,7 @@ export function TadViewerPane({
         log.debug("*** initializing app state:");
         await initAppState(rtc, stateRef);
         log.debug("*** initialized Tad App state");
-        const preq = new PivotRequester(stateRef, errorCallback, setLoading);
+        const preq = new PivotRequester(stateRef, errorCallback, setLoadingCallback);
         log.debug("*** created pivotRequester");
         setPivotRequester(preq);
         log.debug("*** App component created and pivotrequester initialized");
