@vertexvis/viewer 0.15.2-testing.3 → 0.15.2

package/dist/cjs/templates-e57b3741.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 'use strict';
 

package/dist/cjs/utils-2c8e2aa3.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 'use strict';
 

package/dist/cjs/utils-ea359796.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 'use strict';
 

package/dist/cjs/vertex-scene-tree-search_3.cjs.entry.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 'use strict';
 

package/dist/cjs/vertex-scene-tree-table-cell.cjs.entry.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 'use strict';
 

package/dist/cjs/vertex-scene-tree-table-column.cjs.entry.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 'use strict';
 

package/dist/cjs/vertex-scene-tree-table-header.cjs.entry.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 'use strict';
 

package/dist/cjs/vertex-scene-tree-table-resize-divider.cjs.entry.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 'use strict';
 

package/dist/cjs/vertex-scene-tree-toolbar-group.cjs.entry.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 'use strict';
 

package/dist/cjs/vertex-scene-tree.cjs.entry.js

@@ -1,5 +1,5 @@
 /**!
- * Copyright (c) 2022 Vertex Software LLC. All rights reserved.
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
  */
 'use strict';
 
@@ -9,10 +9,12 @@ const index = require('./index-70db349e.js');
 const bundle_esm = require('./bundle.esm-22b6f2d6.js');
 const _commonjsHelpers = require('./_commonjsHelpers-dcc4cf71.js');
 const grpcWebClient_umd = require('./grpc-web-client.umd-2af20c1b.js');
-const config = require('./config-6e330a82.js');
+const config = require('./config-3fc1c093.js');
 const browser_esm = require('./browser.esm-5d246754.js');
+const errors = require('./errors-1b37642b.js');
 const dom = require('./dom-92728e58.js');
-require('./streamAttributes-c64aee75.js');
+require('./streamAttributes-cf0c513d.js');
+require('./bundle.esm-b43c197a.js');
 require('./entities-9eb7e608.js');
 
 window.requestIdleCallback =
@@ -6702,7 +6704,7 @@ function isSceneTreeTableCellElement(el) {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const SceneTreeError = ({ details }, children) => {
+const SceneTreeError$1 = ({ details }, children) => {
   return (index.h("div", { class: "error" },
     index.h("div", { class: "error-section error-message" },
       index.h("span", null, details.message),
@@ -6721,9 +6723,11 @@ var SceneTreeErrorCode;
   SceneTreeErrorCode[SceneTreeErrorCode["MISSING_VIEWER"] = 2] = "MISSING_VIEWER";
   SceneTreeErrorCode[SceneTreeErrorCode["DISCONNECTED"] = 3] = "DISCONNECTED";
   SceneTreeErrorCode[SceneTreeErrorCode["SUBSCRIPTION_FAILURE"] = 4] = "SUBSCRIPTION_FAILURE";
+  SceneTreeErrorCode[SceneTreeErrorCode["UNAUTHORIZED"] = 5] = "UNAUTHORIZED";
 })(SceneTreeErrorCode || (SceneTreeErrorCode = {}));
 class SceneTreeErrorDetails {
-  constructor(code, link) {
+  constructor(name, code, link) {
+    this.name = name;
     this.code = code;
     this.link = link;
     this.message = getSceneTreeErrorMessage(code);
@@ -6741,6 +6745,36 @@ function getSceneTreeErrorMessage(code) {
       return 'Disconnected from server.';
     case SceneTreeErrorCode.SUBSCRIPTION_FAILURE:
       return 'The tree was not able to receive subscription events';
+    case SceneTreeErrorCode.UNAUTHORIZED:
+      return 'The tree was unauthorized to connect to the server. The associated Viewer may not be connected.';
+  }
+}
+class SceneTreeError extends errors.CustomError {
+  constructor(message, e) {
+    super(message, e);
+    // Allows for `instanceof` checks.
+    Object.setPrototypeOf(this, SceneTreeError.prototype);
+  }
+}
+class SceneTreeUnauthorizedError extends SceneTreeError {
+  constructor(message, e) {
+    super(message, e);
+    // Allows for `instanceof` checks.
+    Object.setPrototypeOf(this, SceneTreeUnauthorizedError.prototype);
+  }
+}
+class SceneTreeConnectionCancelledError extends SceneTreeError {
+  constructor(message, e) {
+    super(message, e);
+    // Allows for `instanceof` checks.
+    Object.setPrototypeOf(this, SceneTreeConnectionCancelledError.prototype);
+  }
+}
+class SceneTreeOperationFailedError extends SceneTreeError {
+  constructor(message, e) {
+    super(message, e);
+    // Allows for `instanceof` checks.
+    Object.setPrototypeOf(this, SceneTreeOperationFailedError.prototype);
   }
 }
 
@@ -6816,11 +6850,41 @@ class SceneTreeController {
   setDebugLogs(debugLogs) {
     this.debugLogs = debugLogs;
   }
+  async handleSubscriptionHandshakeTimeout(jwtProvider, sceneViewId) {
+    var _a;
+    const connection = this.getState().connection;
+    if (this.isConnectedState(connection) &&
+      ((_a = connection.subscriptionStatusState) === null || _a === void 0 ? void 0 : _a.attempt) != null &&
+      connection.subscriptionStatusState.attempt <
+        SceneTreeController.MAX_SUBSCRIPTION_RETRY_COUNT) {
+      const newAttempt = connection.subscriptionStatusState.attempt + 1;
+      console.warn(`Failed to subscribe within the allotted timeout. Retry attempt={${newAttempt}}`);
+      connection.subscriptionStatusState.stream.cancel();
+      this.clearHandshakeTimer();
+      const stream = await this.subscribe();
+      this.invalidatePage(0);
+      this.updateState(Object.assign(Object.assign({}, this.state), { connection: Object.assign(Object.assign({}, connection), { type: 'connected', subscriptionStatusState: {
+            attempt: newAttempt,
+            stream,
+          } }) }));
+      this.subscriptionHandshakeTimer = window.setTimeout(() => {
+        this.handleSubscriptionHandshakeTimeout(jwtProvider, sceneViewId);
+      }, this.connectOptions.subscriptionHandshakeGracePeriodInMs);
+    }
+    else {
+      this.updateState(Object.assign(Object.assign({}, this.state), { connection: {
+          type: 'failure',
+          jwtProvider,
+          sceneViewId,
+          details: new SceneTreeErrorDetails('SUBSCRIPTION_FAILURE', SceneTreeErrorCode.SUBSCRIPTION_FAILURE),
+        } }));
+    }
+  }
   async connect(jwtProvider) {
     const { connection } = this.state;
     const jwt = jwtProvider();
     if (jwt == null) {
-      throw new Error('Cannot connect scene tree. JWT is undefined');
+      throw new SceneTreeUnauthorizedError('Cannot connect scene tree. JWT is undefined');
     }
     const { view: sceneViewId } = decodeSceneTreeJwt(jwt);
     if (connection.sceneViewId !== sceneViewId) {
@@ -6837,28 +6901,35 @@ class SceneTreeController {
     this.updateState(Object.assign(Object.assign({}, this.state), { connection: connecting }));
     try {
       this.log('Scene tree controller connecting.');
-      await this.fetchPage(0);
+      const [, stream] = await Promise.all([
+        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);
+    }
+    catch (e) {
+      this.ifErrorIsFatal(e, () => {
         this.updateState(Object.assign(Object.assign({}, this.state), { connection: {
             type: 'failure',
             jwtProvider,
             sceneViewId,
-            details: new SceneTreeErrorDetails(SceneTreeErrorCode.SUBSCRIPTION_FAILURE),
+            details: this.getConnectionError(e),
           } }));
-      }, this.connectOptions.subscriptionHandshakeGracePeriodInMs);
-      const stream = await this.subscribe();
-      stream.on('end', () => this.startConnectionLostReconnectTimer());
-      this.updateState(Object.assign(Object.assign({}, this.state), { connection: Object.assign(Object.assign({}, connecting), { type: 'connected', subscription: { dispose: () => stream.cancel() } }) }));
-    }
-    catch (e) {
-      this.updateState(Object.assign(Object.assign({}, this.state), { connection: {
-          type: 'failure',
-          jwtProvider,
-          sceneViewId,
-          details: this.getConnectionError(e),
-        } }));
-      this.clearHandshakeTimer();
-      throw e;
+        this.clearHandshakeTimer();
+        throw e;
+      });
     }
     this.startIdleReconnectTimer();
     if (this.metadataKeys.length > 0) {
@@ -6899,7 +6970,9 @@ class SceneTreeController {
           await this.connect(() => viewer.token);
         }
         catch (e) {
-          console.error('Scene tree controller erred connecting.', e);
+          this.ifErrorIsFatal(e, () => {
+            console.error('Scene tree controller erred connecting.', e);
+          });
         }
       }
     };
@@ -6939,6 +7012,27 @@ class SceneTreeController {
       rows: reset ? [] : this.state.rows,
     });
   }
+  cancel() {
+    this.log(`Scene tree controller cancelled`);
+    this.clearHandshakeTimer();
+    this.clearReconnectTimer();
+    this.pages.clear();
+    this.activeRowRange = [];
+    const { connection } = this.state;
+    if (connection.type === 'connected') {
+      connection.subscription.dispose();
+    }
+    this.updateState({
+      connection: {
+        type: 'cancelled',
+        jwtProvider: connection.jwtProvider,
+        sceneViewId: connection.sceneViewId,
+      },
+      isSearching: false,
+      totalRows: 0,
+      rows: [],
+    });
+  }
   /**
    * Collapses a node with the given node ID.
    *
@@ -7004,7 +7098,7 @@ class SceneTreeController {
         await this.fetchUnloadedPagesInActiveRows();
       }
       if (locatedIndex == null) {
-        throw new Error('Cannot locate node. Location index is undefined.');
+        throw new SceneTreeOperationFailedError('Cannot locate node. Location index is undefined.');
       }
       return locatedIndex.value;
     });
@@ -7252,6 +7346,7 @@ class SceneTreeController {
       });
       stream.on('end', () => {
         this.invalidateAfterOffset(0);
+        this.startConnectionLostReconnectTimer();
       });
       return stream;
     });
@@ -7328,7 +7423,8 @@ class SceneTreeController {
       rows[this.activeRowRange[1]] == null);
   }
   updateState(newState) {
-    if (this.loadingTimer && !this.isViewLoading(newState.rows)) {
+    const updateLoadingTimer = this.loadingTimer && !this.isViewLoading(newState.rows);
+    if (updateLoadingTimer) {
       clearTimeout(this.loadingTimer);
       this.loadingTimer = undefined;
       this.state = Object.assign(Object.assign({}, newState), { shouldShowLoading: false });
@@ -7369,7 +7465,7 @@ class SceneTreeController {
           resolve(res);
         }
         else {
-          reject(new Error('Invalid response. Both error and result are null'));
+          reject(new SceneTreeError('Invalid response. Both error and result are null'));
         }
       });
     });
@@ -7391,24 +7487,38 @@ class SceneTreeController {
         return then(jwt);
       }
       else {
-        throw new Error('SceneTreeController cannot perform request. Viewer JWT is undefined.');
+        throw new SceneTreeUnauthorizedError('SceneTreeController cannot perform request. Viewer JWT is undefined.');
       }
     }
+    else if (connection.type === 'cancelled') {
+      throw new SceneTreeConnectionCancelledError(`Request attempted, but controller was cancelled`);
+    }
     else {
-      throw new Error('SceneTreeController is not in connected state');
+      throw new SceneTreeError('SceneTreeController is not in connected state');
+    }
+  }
+  ifErrorIsFatal(error, then) {
+    if (!(error instanceof SceneTreeConnectionCancelledError)) {
+      then();
     }
   }
   getConnectionError(e) {
     if (isGrpcServiceError(e)) {
       if (e.code === grpcWebClient_umd.grpcWebClient_umd.grpc.Code.FailedPrecondition) {
-        return new SceneTreeErrorDetails(SceneTreeErrorCode.SCENE_TREE_DISABLED);
+        return new SceneTreeErrorDetails('SCENE_TREE_DISABLED', SceneTreeErrorCode.SCENE_TREE_DISABLED);
+      }
+      else if (e.code === grpcWebClient_umd.grpcWebClient_umd.grpc.Code.Unauthenticated) {
+        return new SceneTreeErrorDetails('UNAUTHORIZED', SceneTreeErrorCode.UNAUTHORIZED);
       }
       else {
-        return new SceneTreeErrorDetails(SceneTreeErrorCode.UNKNOWN);
+        return new SceneTreeErrorDetails('UNKNOWN', SceneTreeErrorCode.UNKNOWN);
       }
     }
+    else if (e instanceof SceneTreeUnauthorizedError) {
+      return new SceneTreeErrorDetails('UNAUTHORIZED', SceneTreeErrorCode.UNAUTHORIZED);
+    }
     else {
-      return new SceneTreeErrorDetails(SceneTreeErrorCode.UNKNOWN);
+      return new SceneTreeErrorDetails('UNKNOWN', SceneTreeErrorCode.UNKNOWN);
     }
   }
   constrainPageRange(start, end) {
@@ -7428,9 +7538,13 @@ class SceneTreeController {
       console.debug(message, optionalParams);
     }
   }
+  isConnectedState(connection) {
+    return connection.type === 'connected';
+  }
 }
 SceneTreeController.IDLE_RECONNECT_IN_SECONDS = 4 * 60;
 SceneTreeController.LOST_CONNECTION_RECONNECT_IN_SECONDS = 2;
+SceneTreeController.MAX_SUBSCRIPTION_RETRY_COUNT = 2;
 
 async function showItem(viewer, id, { suppliedCorrelationId } = {}) {
   const scene = await viewer.scene();
@@ -7816,9 +7930,15 @@ const SceneTree = class {
    */
   async selectFilteredItems(term, options) {
     if (this.viewer != null) {
-      const columnsToSearch = this.metadataSearchKeys.length > 0
+      const definedMetadataKeys = this.metadataSearchKeys.length > 0
         ? this.metadataSearchKeys
         : this.metadataKeys;
+      if (definedMetadataKeys.length === 0) {
+        console.warn("No metadata keys were found to perform the selection. Defaulting to ['VERTEX_SCENE_ITEM_NAME']");
+      }
+      const columnsToSearch = definedMetadataKeys.length > 0
+        ? definedMetadataKeys
+        : ['VERTEX_SCENE_ITEM_NAME'];
       await selectFilterResults(this.viewer, term, columnsToSearch, this.metadataSearchExactMatch, Object.assign({ append: false }, options));
     }
   }
@@ -7838,8 +7958,9 @@ const SceneTree = class {
    * @ignore
    */
   disconnectedCallback() {
-    var _a;
+    var _a, _b;
     (_a = this.stateMap.viewerDisposable) === null || _a === void 0 ? void 0 : _a.dispose();
+    (_b = this.controller) === null || _b === void 0 ? void 0 : _b.cancel();
   }
   /**
    * @ignore
@@ -7873,7 +7994,7 @@ const SceneTree = class {
     this.stateMap.componentLoaded = true;
     (_a = this.controller) === null || _a === void 0 ? void 0 : _a.setMetadataKeys(this.metadataKeys);
     if (this.viewer == null) {
-      this.errorDetails = new SceneTreeErrorDetails(SceneTreeErrorCode.MISSING_VIEWER);
+      this.errorDetails = new SceneTreeErrorDetails('MISSING_VIEWER', SceneTreeErrorCode.MISSING_VIEWER);
     }
   }
   componentWillRender() {
@@ -7889,10 +8010,10 @@ const SceneTree = class {
   }
   renderError(details) {
     if (details.code !== SceneTreeErrorCode.SCENE_TREE_DISABLED) {
-      return (index.h(SceneTreeError, { details: details }, index.h("button", { class: "button button-secondary", onClick: () => this.retryConnectToViewer(), disabled: this.attemptingRetry }, "Retry")));
+      return (index.h(SceneTreeError$1, { details: details }, index.h("button", { class: "button button-secondary", onClick: () => this.retryConnectToViewer(), disabled: this.attemptingRetry }, "Retry")));
     }
     else {
-      return index.h(SceneTreeError, { details: details });
+      return index.h(SceneTreeError$1, { details: details });
     }
   }
   /**
@@ -7979,7 +8100,7 @@ const SceneTree = class {
       this.connectionError.emit(state.connection.details);
     }
     else if (state.connection.type === 'disconnected') {
-      this.errorDetails = new SceneTreeErrorDetails(SceneTreeErrorCode.DISCONNECTED);
+      this.errorDetails = new SceneTreeErrorDetails('DISCONNECTED', SceneTreeErrorCode.DISCONNECTED);
     }
     else {
       this.errorDetails = undefined;