@vertexvis/viewer 0.17.4 → 0.17.5-testing.0

package/dist/cjs/{controller-029b37d6.js → controller-4e9ef328.js}

@@ -6877,7 +6877,8 @@ class SceneTreeController {
       connection.subscriptionStatusState.stream.cancel();
       this.clearHandshakeTimer();
       const stream = await this.subscribe();
-      this.invalidatePage(0);
+      this.invalidateAfterOffset(0);
+      this.fetchUnloadedPagesInActiveRows();
       this.updateState(Object.assign(Object.assign({}, this.state), { connection: Object.assign(Object.assign({}, connection), { type: 'connected', subscription: {
             dispose: () => stream.cancel(),
           }, subscriptionStatusState: {
@@ -6922,19 +6923,21 @@ class SceneTreeController {
         this.fetchPage(0),
         this.subscribe(),
       ]);
-      this.updateState(Object.assign(Object.assign({}, this.state), { connection: {
-          jwtProvider,
-          sceneViewId,
-          type: 'connected',
-          subscription: { dispose: () => stream.cancel() },
-          subscriptionStatusState: {
-            attempt: 0,
-            stream,
-          },
-        } }));
-      this.subscriptionHandshakeTimer = window.setTimeout(() => {
-        this.handleSubscriptionHandshakeTimeout(jwtProvider, sceneViewId);
-      }, this.connectOptions.subscriptionHandshakeGracePeriodInMs);
+      if (this.state.connection.type !== 'cancelled') {
+        this.updateState(Object.assign(Object.assign({}, this.state), { connection: {
+            jwtProvider,
+            sceneViewId,
+            type: 'connected',
+            subscription: { dispose: () => stream.cancel() },
+            subscriptionStatusState: {
+              attempt: 0,
+              stream,
+            },
+          } }));
+        this.subscriptionHandshakeTimer = window.setTimeout(() => {
+          this.handleSubscriptionHandshakeTimeout(jwtProvider, sceneViewId);
+        }, this.connectOptions.subscriptionHandshakeGracePeriodInMs);
+      }
     }
     catch (e) {
       this.ifErrorIsFatal(e, () => {
@@ -6949,9 +6952,6 @@ class SceneTreeController {
       });
     }
     this.startIdleReconnectTimer();
-    if (this.metadataKeys.length > 0) {
-      this.setMetadataKeys(this.metadataKeys);
-    }
   }
   clearReconnectTimer() {
     if (this.reconnectTimer != null) {
@@ -7015,6 +7015,9 @@ class SceneTreeController {
       this.activeRowRange = [];
     }
     const { connection } = this.state;
+    if (connection.type === 'connected') {
+      connection.subscription.dispose();
+    }
     this.updateState({
       connection: {
         type: 'disconnected',
@@ -7024,6 +7027,11 @@ class SceneTreeController {
       isSearching: false,
       totalRows: reset ? 0 : this.state.totalRows,
       rows: reset ? [] : this.state.rows,
+      filterTerm: reset ? undefined : this.state.filterTerm,
+      totalFilteredRows: reset ? undefined : this.state.totalFilteredRows,
+      shouldShowEmptyResults: reset
+        ? undefined
+        : this.state.shouldShowEmptyResults,
     });
   }
   cancel() {
@@ -7198,7 +7206,7 @@ class SceneTreeController {
    */
   async filter(term, options = {}) {
     return this.ifConnectionHasJwt(async (jwt) => {
-      this.updateState(Object.assign(Object.assign({}, this.state), { isSearching: true }));
+      this.updateState(Object.assign(Object.assign({}, this.state), { isSearching: true, filterTerm: term !== '' ? term : undefined }));
       try {
         const res = await this.requestUnary(jwt, (metadata, handler) => {
           var _a;
@@ -7299,6 +7307,7 @@ class SceneTreeController {
    */
   async updateActiveRowRange(start, end) {
     this.activeRowRange = this.constrainRowOffsets(start, end);
+    this.tryClearLoadingTimer(this.state);
     await this.fetchUnloadedPagesInActiveRows();
   }
   /**
@@ -7360,7 +7369,9 @@ class SceneTreeController {
       });
       stream.on('end', () => {
         this.invalidateAfterOffset(0);
-        this.startConnectionLostReconnectTimer();
+        if (this.state.connection.type === 'connected') {
+          this.startConnectionLostReconnectTimer();
+        }
       });
       return stream;
     });
@@ -7397,13 +7408,13 @@ class SceneTreeController {
         const fill = new Array(Math.max(0, totalRows - start.length - fetchedRows.length - end.length));
         const rows = [...start, ...fetchedRows, ...end, ...fill];
         if (this.isViewLoading(rows) && this.loadingTimer == null) {
-          this.loadingTimer = window.setTimeout(() => {
-            this.updateState(Object.assign(Object.assign({}, this.getState()), { shouldShowLoading: true }));
-          }, this.connectOptions.spinnerDelay);
-          this.updateState(Object.assign(Object.assign({}, this.state), { totalRows: totalRows, rows: rows }));
+          this.restartLoadingTimer();
+          this.updateState(Object.assign(Object.assign({}, this.state), { totalRows: totalRows, rows: rows, shouldShowEmptyResults: this.state.filterTerm != null &&
+              (rows.length === 0 || this.state.totalFilteredRows === 0) }));
         }
         else {
-          this.updateState(Object.assign(Object.assign({}, this.state), { totalRows: totalRows, rows: rows }));
+          this.updateState(Object.assign(Object.assign({}, this.state), { totalRows: totalRows, rows: rows, shouldShowEmptyResults: this.state.filterTerm != null &&
+              (rows.length === 0 || this.state.totalFilteredRows === 0) }));
         }
       }
     }
@@ -7433,19 +7444,39 @@ class SceneTreeController {
     return this.state;
   }
   isViewLoading(rows) {
-    return (rows[this.activeRowRange[0]] == null &&
+    return (this.state.filterTerm == null &&
+      rows[this.activeRowRange[0]] == null &&
       rows[this.activeRowRange[1]] == null);
   }
-  updateState(newState) {
-    const updateLoadingTimer = this.loadingTimer && !this.isViewLoading(newState.rows);
-    if (updateLoadingTimer) {
+  restartLoadingTimer() {
+    if (this.loadingTimer != null) {
+      this.clearLoadingTimer();
+    }
+    this.loadingTimer = window.setTimeout(() => {
+      this.loadingTimer = undefined;
+      this.updateState(Object.assign(Object.assign({}, this.getState()), { shouldShowLoading: true }));
+    }, this.connectOptions.spinnerDelay);
+  }
+  clearLoadingTimer() {
+    if (this.loadingTimer != null) {
       clearTimeout(this.loadingTimer);
       this.loadingTimer = undefined;
-      this.state = Object.assign(Object.assign({}, newState), { shouldShowLoading: false });
     }
-    else {
-      this.state = Object.assign({}, newState);
+  }
+  tryClearLoadingTimer(state) {
+    const loadingShowingOrTimerStarted = this.state.shouldShowLoading || this.loadingTimer != null;
+    const updateLoadingTimer = loadingShowingOrTimerStarted && !this.isViewLoading(state.rows);
+    if (updateLoadingTimer) {
+      this.clearLoadingTimer();
+      return true;
     }
+    return false;
+  }
+  updateState(newState) {
+    const didClearLoadingTimer = this.tryClearLoadingTimer(newState);
+    this.state = Object.assign(Object.assign({}, newState), { shouldShowLoading: didClearLoadingTimer
+        ? false
+        : newState.shouldShowLoading });
     this.onStateChange.emit(this.state);
   }
   getPageForOffset(offset) {
@@ -7559,7 +7590,7 @@ class SceneTreeController {
     return connection.type === 'connected';
   }
 }
-SceneTreeController.IDLE_RECONNECT_IN_SECONDS = 4 * 60;
+SceneTreeController.IDLE_RECONNECT_IN_SECONDS = 4 * 1;
 SceneTreeController.LOST_CONNECTION_RECONNECT_IN_SECONDS = 2;
 SceneTreeController.MAX_SUBSCRIPTION_RETRY_COUNT = 2;
 
@@ -7568,4 +7599,4 @@ exports.SceneTreeController = SceneTreeController;
 exports.SceneTreeErrorDetails = SceneTreeErrorDetails;
 exports.webSocketSubscriptionTransportFactory = webSocketSubscriptionTransportFactory;
 
-//# sourceMappingURL=controller-029b37d6.js.map
+//# sourceMappingURL=controller-4e9ef328.js.map