Update Fabric messages with the latest

.npmrc

@@ -1,4 +1,4 @@
 save-exact=true
 
 # Ignore peer dependency conflicts
-force=true # TODO: Remove this when we update to React 17 or higher!
+force=true # TODO: Remove this when we update to React 17 or higher!

src/Contracts/DataExplorerMessagesContract.ts

@@ -1,4 +1,5 @@
 import { FabricMessageTypes } from "./FabricMessageTypes";
+import { MessageTypes } from "./MessageTypes";
 
 // This is the current version of these messages
 export const DATA_EXPLORER_RPC_VERSION = "3";
@@ -19,9 +20,22 @@ export type DataExploreMessageV3 =
       type: FabricMessageTypes.GetAllResourceTokens;
       id: string;
     }
+  | {
+      type: FabricMessageTypes.GetAccessToken;
+      id: string;
+    }
+  | {
+      type: MessageTypes.TelemetryInfo;
+      data: {
+        action: string;
+        actionModifier: string;
+        data: unknown;
+        timestamp: number;
+      };
+    }
   | {
       type: FabricMessageTypes.OpenSettings;
-      settingsId: string;
+      params: [{ settingsId?: "About" | "Connection" }];
     };
 export interface GetCosmosTokenMessageOptions {
   verb: "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace";

src/Explorer/Explorer.tsx

@@ -31,7 +31,6 @@ import { readDatabases } from "../Common/dataAccess/readDatabases";
 import * as DataModels from "../Contracts/DataModels";
 import { ContainerConnectionInfo, IPhoenixServiceInfo, IProvisionData, IResponse } from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
-import { UploadDetailsRecord } from "../Contracts/ViewModels";
 import { GitHubOAuthService } from "../GitHub/GitHubOAuthService";
 import { PhoenixClient } from "../Phoenix/PhoenixClient";
 import * as ExplorerSettings from "../Shared/ExplorerSettings";
@@ -72,6 +71,7 @@ import { ResourceTreeAdapter } from "./Tree/ResourceTreeAdapter";
 import StoredProcedure from "./Tree/StoredProcedure";
 import { useDatabases } from "./useDatabases";
 import { useSelectedNode } from "./useSelectedNode";
+import { UploadDetailsRecord } from "../Contracts/ViewModels";
 
 BindingHandlersRegisterer.registerBindingHandlers();
 
@@ -292,87 +292,32 @@ export default class Explorer {
     const baseUrl = `vscode://ms-azuretools.vscode-cosmosdb?resourceId=${resourceId}`;
     const vscodeUrl = activeTab ? `${baseUrl}&database=${database}&container=${container}` : baseUrl;
 
-    // Detect if VS Code is installed
-    const detectVSCode = () => {
-      return new Promise<boolean>((resolve) => {
-        // Create hidden iframe to detect protocol handler
-        const iframe = document.createElement("iframe");
-        iframe.style.display = "none";
-        document.body.appendChild(iframe);
+    const openVSCodeDialogProps: DialogProps = {
+      linkProps: {
+        linkText: "Download Visual Studio Code",
+        linkUrl: "https://code.visualstudio.com/download",
+      },
+      isModal: true,
+      title: `Open your Azure Cosmos DB account in Visual Studio Code`,
+      subText: `Please ensure Visual Studio Code is installed on your device.
+      If you don't have it installed, please download it from the link below.`,
+      primaryButtonText: "Open in VS Code",
+      secondaryButtonText: "Cancel",
 
-        const timeoutId = setTimeout(() => {
-          if (document.body.contains(iframe)) {
-            document.body.removeChild(iframe);
-          }
-          resolve(false);
-        }, 1000);
-
-        try {
-          // Listen for blur event which might indicate app was launched
-          const onBlur = () => {
-            clearTimeout(timeoutId);
-            window.removeEventListener("blur", onBlur);
-            if (document.body.contains(iframe)) {
-              document.body.removeChild(iframe);
-            }
-            // Window lost focus, likely because VS Code opened
-            resolve(true);
-          };
-          window.addEventListener("blur", onBlur, { once: true });
-          // Use a test URL that won't open a specific resource but will check if the extension is installed
-          iframe.src = "vscode://ms-azuretools.vscode-cosmosdb?test=1";
-        } catch (error) {
-          clearTimeout(timeoutId);
-          if (document.body.contains(iframe)) {
-            document.body.removeChild(iframe);
-          }
-          resolve(false);
-        }
-      });
-    };
-
-    detectVSCode().then((isVSCodeInstalled) => {
-      if (isVSCodeInstalled) {
+      onPrimaryButtonClick: () => {
         try {
           window.location.href = vscodeUrl;
           TelemetryProcessor.traceStart(Action.OpenVSCode);
         } catch (error) {
           logConsoleError(`Failed to open VS Code: ${getErrorMessage(error)}`);
-          showVSCodeDialog();
         }
-      } else {
-        showVSCodeDialog();
-      }
-    });
-
-    const showVSCodeDialog = () => {
-      const openVSCodeDialogProps: DialogProps = {
-        linkProps: {
-          linkText: "Download Visual Studio Code",
-          linkUrl: "https://code.visualstudio.com/download",
-        },
-        isModal: true,
-        title: `Open your Azure Cosmos DB account in Visual Studio Code`,
-        subText: `Please ensure Visual Studio Code is installed on your device.
-        If you don't have it installed, please download it from the link below.`,
-        primaryButtonText: "Open in VS Code",
-        secondaryButtonText: "Cancel",
-
-        onPrimaryButtonClick: () => {
-          try {
-            window.location.href = vscodeUrl;
-            TelemetryProcessor.traceStart(Action.OpenVSCode);
-          } catch (error) {
-            logConsoleError(`Failed to open VS Code: ${getErrorMessage(error)}`);
-          }
-        },
-        onSecondaryButtonClick: () => {
-          useDialog.getState().closeDialog();
-          TelemetryProcessor.traceCancel(Action.OpenVSCode);
-        },
-      };
-      useDialog.getState().openDialog(openVSCodeDialogProps);
+      },
+      onSecondaryButtonClick: () => {
+        useDialog.getState().closeDialog();
+        TelemetryProcessor.traceCancel(Action.OpenVSCode);
+      },
     };
+    useDialog.getState().openDialog(openVSCodeDialogProps);
   }
 
   public async openCESCVAFeedbackBlade(): Promise<void> {