Merge branch 'master'

src/Platform/Hosted/Components/ConnectExplorer.tsx

@@ -1,9 +1,11 @@
-import * as React from "react";
 import { useBoolean } from "@fluentui/react-hooks";
-import { HttpHeaders } from "../../../Common/Constants";
-import { GenerateTokenResponse } from "../../../Contracts/DataModels";
-import { configContext } from "../../../ConfigContext";
+import * as React from "react";
+import ErrorImage from "../../../../images/error.svg";
+import ConnectImage from "../../../../images/HdeConnectCosmosDB.svg";
 import { AuthType } from "../../../AuthType";
+import { HttpHeaders } from "../../../Common/Constants";
+import { configContext } from "../../../ConfigContext";
+import { GenerateTokenResponse } from "../../../Contracts/DataModels";
 import { isResourceTokenConnectionString } from "../Helpers/ResourceTokenUtils";
 
 interface Props {
@@ -28,7 +30,7 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
       <div className="connectExplorerFormContainer">
         <div className="connectExplorer">
           <p className="connectExplorerContent">
-            <img src="images/HdeConnectCosmosDB.svg" alt="Azure Cosmos DB" />
+            <img src={ConnectImage} alt="Azure Cosmos DB" />
           </p>
           <p className="welcomeText">Welcome to Azure Cosmos DB</p>
           {isFormVisible ? (
@@ -68,7 +70,7 @@ export const ConnectExplorer: React.FunctionComponent<Props> = ({
                   }}
                 />
                 <span className="errorDetailsInfoTooltip" style={{ display: "none" }}>
-                  <img className="errorImg" src="images/error.svg" alt="Error notification" />
+                  <img className="errorImg" src={ErrorImage} alt="Error notification" />
                   <span className="errorDetails"></span>
                 </span>
               </p>

src/Platform/Hosted/Components/MeControl.test.tsx

@@ -1,12 +1,12 @@
 jest.mock("../../../hooks/useDirectories");
+import { AccountInfo } from "@azure/msal-browser";
 import "@testing-library/jest-dom";
 import { fireEvent, render, screen } from "@testing-library/react";
 import React from "react";
 import { MeControl } from "./MeControl";
-import { Account } from "msal";
 
 it("renders", () => {
-  const account = {} as Account;
+  const account = {} as AccountInfo;
   const logout = jest.fn();
   const openPanel = jest.fn();
 

src/Platform/Hosted/Components/MeControl.tsx

@@ -1,11 +1,11 @@
-import { FocusZone, DefaultButton, DirectionalHint, Persona, PersonaInitialsColor, PersonaSize } from "@fluentui/react";
+import { AccountInfo } from "@azure/msal-browser";
+import { DefaultButton, DirectionalHint, FocusZone, Persona, PersonaInitialsColor, PersonaSize } from "@fluentui/react";
 import * as React from "react";
-import { Account } from "msal";
 import { useGraphPhoto } from "../../../hooks/useGraphPhoto";
 
 interface Props {
   graphToken: string;
-  account: Account;
+  account: AccountInfo;
   openPanel: () => void;
   logout: () => void;
 }
@@ -48,7 +48,7 @@ export const MeControl: React.FunctionComponent<Props> = ({ openPanel, logout, a
         <Persona
           imageUrl={photo}
           text={account?.name}
-          secondaryText={account?.userName}
+          secondaryText={account?.username}
           showSecondaryText={true}
           showInitialsUntilImageLoads={true}
           initialsColor={PersonaInitialsColor.teal}

src/Platform/Hosted/Components/SwitchAccount.tsx

@@ -26,7 +26,7 @@ export const SwitchAccount: FunctionComponent<Props> = ({
         data: account,
       }))}
       onChange={(_, option) => {
-        setSelectedAccountName(String(option.key));
+        setSelectedAccountName(String(option?.key));
         dismissMenu();
       }}
       defaultSelectedKey={selectedAccount?.name}

src/Platform/Hosted/Components/SwitchSubscription.tsx

@@ -26,7 +26,7 @@ export const SwitchSubscription: FunctionComponent<Props> = ({
         };
       })}
       onChange={(_, option) => {
-        setSelectedSubscriptionId(String(option.key));
+        setSelectedSubscriptionId(String(option?.key));
       }}
       defaultSelectedKey={selectedSubscription?.subscriptionId}
       placeholder={subscriptions && subscriptions.length === 0 ? "No Subscriptions Found" : "Select a Subscription"}

src/Platform/Hosted/Helpers/ConnectionStringParser.test.ts

@@ -2,8 +2,8 @@ import * as DataModels from "../../../Contracts/DataModels";
 import { parseConnectionString } from "./ConnectionStringParser";
 
 describe("ConnectionStringParser", () => {
-  const mockAccountName: string = "Test";
-  const mockMasterKey: string = "some-key";
+  const mockAccountName = "Test";
+  const mockMasterKey = "some-key";
 
   it("should parse a valid sql account connection string", () => {
     const metadata = parseConnectionString(

src/Platform/Hosted/HostedUtils.ts

@@ -40,7 +40,7 @@ export function getDatabaseAccountKindFromExperience(apiExperience: typeof userC
   return AccountKind.GlobalDocumentDB;
 }
 
-export function extractMasterKeyfromConnectionString(connectionString: string): string {
+export function extractMasterKeyfromConnectionString(connectionString: string): string | undefined {
   // Only Gremlin uses the actual master key for connection to cosmos
   const matchedParts = connectionString.match("AccountKey=(.*);ApiKind=Gremlin;$");
   return (matchedParts && matchedParts.length > 1 && matchedParts[1]) || undefined;

src/Platform/Hosted/extractFeatures.ts

@@ -8,11 +8,14 @@ export type Features = {
   readonly enableReactPane: boolean;
   readonly enableRightPanelV2: boolean;
   readonly enableSchema: boolean;
-  enableSchemaAnalyzer: boolean;
+  autoscaleDefault: boolean;
+  partitionKeyDefault: boolean;
   readonly enableSDKoperations: boolean;
   readonly enableSpark: boolean;
   readonly enableTtl: boolean;
   readonly executeSproc: boolean;
+  readonly enableAadDataPlane: boolean;
+  readonly enableKOResourceTree: boolean;
   readonly hostedDataExplorer: boolean;
   readonly junoEndpoint?: string;
   readonly livyEndpoint?: string;
@@ -43,6 +46,7 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
   return {
     canExceedMaximumValue: "true" === get("canexceedmaximumvalue"),
     cosmosdb: "true" === get("cosmosdb"),
+    enableAadDataPlane: "true" === get("enableaaddataplane"),
     enableChangeFeedPolicy: "true" === get("enablechangefeedpolicy"),
     enableFixedCollectionWithSharedThroughput: "true" === get("enablefixedcollectionwithsharedthroughput"),
     enableKOPanel: "true" === get("enablekopanel"),
@@ -50,10 +54,10 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     enableReactPane: "true" === get("enablereactpane"),
     enableRightPanelV2: "true" === get("enablerightpanelv2"),
     enableSchema: "true" === get("enableschema"),
-    enableSchemaAnalyzer: "true" === get("enableschemaanalyzer"),
     enableSDKoperations: "true" === get("enablesdkoperations"),
     enableSpark: "true" === get("enablespark"),
     enableTtl: "true" === get("enablettl"),
+    enableKOResourceTree: "true" === get("enablekoresourcetree"),
     executeSproc: "true" === get("dataexplorerexecutesproc"),
     hostedDataExplorer: "true" === get("hosteddataexplorerenabled"),
     junoEndpoint: get("junoendpoint"),
@@ -66,5 +70,7 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     pr: get("pr"),
     showMinRUSurvey: "true" === get("showminrusurvey"),
     ttl90Days: "true" === get("ttl90days"),
+    autoscaleDefault: "true" === get("autoscaledefault"),
+    partitionKeyDefault: "true" === get("partitionkeytest"),
   };
 }