Remove Explorer.databaseAccount (#717)

Co-authored-by: Steve Faulkner <southpolesteve@gmail.com>

src/Explorer/Tabs/MongoShellTab.ts

@@ -23,10 +23,10 @@ export default class MongoShellTab extends TabsBase {
     this._logTraces = new Map();
     this._container = options.collection.container;
     this.url = ko.computed<string>(() => {
-      const account = userContext.databaseAccount;
-      const resourceId = account && account.id;
-      const accountName = account && account.name;
-      const mongoEndpoint = account && (account.properties.mongoEndpoint || account.properties.documentEndpoint);
+      const { databaseAccount: account } = userContext;
+      const resourceId = account?.id;
+      const accountName = account?.name;
+      const mongoEndpoint = account?.properties?.mongoEndpoint || account?.properties?.documentEndpoint;
 
       this._runtimeEndpoint = configContext.platform === Platform.Hosted ? configContext.BACKEND_ENDPOINT : "";
       const extensionEndpoint: string = configContext.BACKEND_ENDPOINT || this._runtimeEndpoint || "";
@@ -86,13 +86,12 @@ export default class MongoShellTab extends TabsBase {
     if (!isReadyMessage(event)) {
       return;
     }
+    const { databaseAccount } = userContext;
 
     const authorization: string = userContext.authorizationToken || "";
-    const resourceId = this._container.databaseAccount().id;
-    const accountName = this._container.databaseAccount().name;
-    const documentEndpoint =
-      this._container.databaseAccount().properties.mongoEndpoint ||
-      this._container.databaseAccount().properties.documentEndpoint;
+    const resourceId = databaseAccount?.id;
+    const accountName = databaseAccount?.name;
+    const documentEndpoint = databaseAccount?.properties.mongoEndpoint || databaseAccount?.properties.documentEndpoint;
     const mongoEndpoint =
       documentEndpoint.substr(
         Constants.MongoDBAccounts.protocol.length + 3,

src/Explorer/Tabs/NotebookTabBase.ts

@@ -29,7 +29,7 @@ export default class NotebookTabBase extends TabsBase {
     if (!NotebookTabBase.clientManager) {
       NotebookTabBase.clientManager = new NotebookClientV2({
         connectionInfo: this.container.notebookServerInfo(),
-        databaseAccountName: this.container.databaseAccount().name,
+        databaseAccountName: userContext?.databaseAccount?.name,
         defaultExperience: userContext.apiType,
         contentProvider: this.container.notebookManager?.notebookContentProvider,
       });

src/Explorer/Tabs/TabsManager.test.ts

@@ -1,6 +1,6 @@
 import * as ko from "knockout";
-import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
+import { updateUserContext } from "../../UserContext";
 import Explorer from "../Explorer";
 import DocumentId from "../Tree/DocumentId";
 import DocumentsTab from "./DocumentsTab";
@@ -17,13 +17,15 @@ describe("Tabs manager tests", () => {
 
   beforeAll(() => {
     explorer = new Explorer();
-    explorer.databaseAccount = ko.observable<DataModels.DatabaseAccount>({
-      id: "test",
-      name: "test",
-      location: "",
-      type: "",
-      kind: "",
-      properties: undefined,
+    updateUserContext({
+      databaseAccount: {
+        id: "test",
+        name: "test",
+        location: "",
+        type: "",
+        kind: "",
+        properties: undefined,
+      },
     });
 
     database = {

src/Explorer/Tabs/TerminalTab.tsx

@@ -3,6 +3,7 @@ import * as React from "react";
 import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
+import { userContext } from "../../UserContext";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
 import { NotebookTerminalComponent } from "../Controls/Notebook/NotebookTerminalComponent";
 import Explorer from "../Explorer";
@@ -47,7 +48,7 @@ export default class TerminalTab extends TabsBase {
     this.container = options.container;
     this.notebookTerminalComponentAdapter = new NotebookTerminalComponentAdapter(
       () => this.getNotebookServerInfo(options),
-      () => this.getContainer().databaseAccount()
+      () => userContext?.databaseAccount
     );
     this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
       if (this.isTemplateReady() && this.container.isNotebookEnabled()) {