From 2e1665f0938b845883b875dcd82a33d24e4685cc Mon Sep 17 00:00:00 2001
From: Steve Faulkner <southpolesteve@gmail.com>
Date: Sun, 3 Jan 2021 21:49:50 -0600
Subject: [PATCH] WIP

---
 src/Explorer/Explorer.ts               | 20 --------------------
 src/Main.tsx                           | 26 ++++----------------------
 src/Platform/Hosted/extractFeatures.ts |  4 +---
 3 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/src/Explorer/Explorer.ts b/src/Explorer/Explorer.ts
index 631638e65..1daf65f57 100644
--- a/src/Explorer/Explorer.ts
+++ b/src/Explorer/Explorer.ts
@@ -1260,16 +1260,6 @@ export default class Explorer {
     $("#contextSwitchPrompt").dialog("open");
   }
 
-  public displayConnectExplorerForm(): void {
-    $("#divExplorer").hide();
-    $("#connectExplorer").css("display", "flex");
-  }
-
-  public hideConnectExplorerForm(): void {
-    $("#connectExplorer").hide();
-    $("#divExplorer").show();
-  }
-
   public isReadWriteToggled: () => boolean = (): boolean => {
     return this.shareAccessToggleState() === ShareAccessToggleState.ReadWrite;
   };
@@ -1878,16 +1868,6 @@ export default class Explorer {
         subscriptionType: inputs.subscriptionType,
         quotaId: inputs.quotaId
       });
-      TelemetryProcessor.traceSuccess(
-        Action.LoadDatabaseAccount,
-        {
-          resourceId: this.databaseAccount && this.databaseAccount().id,
-          dataExplorerArea: Constants.Areas.ResourceTree,
-          databaseAccount: this.databaseAccount && this.databaseAccount()
-        },
-        inputs.loadDatabaseAccountTimestamp
-      );
-
       this.isAccountReady(true);
     }
   }
diff --git a/src/Main.tsx b/src/Main.tsx
index a06fb8478..16dc8bb4f 100644
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -70,32 +70,15 @@ import hdeConnectImage from "../images/HdeConnectCosmosDB.svg";
 import refreshImg from "../images/refresh-cosmos.svg";
 import arrowLeftImg from "../images/imgarrowlefticon.svg";
 import { KOCommentEnd, KOCommentIfStart } from "./koComment";
-import { AccountKind, DefaultAccountExperience, TagNames } from "./Common/Constants";
 import { updateUserContext } from "./UserContext";
 import AuthHeadersUtil from "./Platform/Hosted/Authorization";
 import { CollectionCreation } from "./Shared/Constants";
 import { extractFeatures } from "./Platform/Hosted/extractFeatures";
+import { emulatorAccount } from "./Platform/Emulator/emulatorAccount";
 
 // TODO: Encapsulate and reuse all global variables as environment variables
 window.authType = AuthType.AAD;
 
-const emulatorAccount = {
-  name: "",
-  id: "",
-  location: "",
-  type: "",
-  kind: AccountKind.DocumentDB,
-  tags: {
-    [TagNames.defaultExperience]: DefaultAccountExperience.DocumentDB
-  },
-  properties: {
-    documentEndpoint: "",
-    tableEndpoint: "",
-    gremlinEndpoint: "",
-    cassandraEndpoint: ""
-  }
-};
-
 const App: React.FunctionComponent = () => {
   useEffect(() => {
     initializeConfiguration().then(config => {
@@ -114,7 +97,7 @@ const App: React.FunctionComponent = () => {
           const accountResourceId = account.id;
           const subscriptionId = accountResourceId && accountResourceId.split("subscriptions/")[1].split("/")[0];
           const resourceGroup = accountResourceId && accountResourceId.split("resourceGroups/")[1].split("/")[0];
-          const inputs: DataExplorerInputsFrame = {
+          explorer.initDataExplorerWithFrameInputs({
             databaseAccount: account,
             subscriptionId,
             resourceGroup,
@@ -130,8 +113,7 @@ const App: React.FunctionComponent = () => {
             quotaId: undefined,
             addCollectionDefaultFlight: explorer.flight(),
             isTryCosmosDBSubscription: explorer.isTryCosmosDBSubscription()
-          };
-          explorer.initDataExplorerWithFrameInputs(inputs);
+          });
           explorer.isAccountReady(true);
         }
       } else if (config.platform === Platform.Emulator) {
@@ -154,7 +136,7 @@ const App: React.FunctionComponent = () => {
           }
         }
 
-        window.addEventListener("message", message => explorer.handleMessage(message), false);
+        window.addEventListener("message", explorer.handleMessage.bind(explorer), false);
       }
       applyExplorerBindings(explorer);
     });
diff --git a/src/Platform/Hosted/extractFeatures.ts b/src/Platform/Hosted/extractFeatures.ts
index f5138d392..05581c27b 100644
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -1,7 +1,5 @@
-const parentParams = new URLSearchParams(window.parent.location.search);
-
 export function extractFeatures(params?: URLSearchParams): { [key: string]: string } {
-  params = params || parentParams;
+  params = params || new URLSearchParams(window.parent.location.search);
   const featureParamRegex = /feature.(.*)/i;
   const features: { [key: string]: string } = {};
   params.forEach((value: string, param: string) => {