resolve conflict

.eslintignore

@@ -81,15 +81,18 @@ src/Explorer/Tables/DataTable/DataTableBindingManager.ts
 src/Explorer/Tables/DataTable/DataTableBuilder.ts
 src/Explorer/Tables/DataTable/DataTableContextMenu.ts
 src/Explorer/Tables/DataTable/DataTableOperationManager.ts
+# src/Explorer/Tables/DataTable/DataTableOperations.ts
 src/Explorer/Tables/DataTable/DataTableViewModel.ts
+# src/Explorer/Tables/DataTable/TableCommands.ts
+# src/Explorer/Tables/DataTable/TableEntityCache.ts
 src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
+# src/Explorer/Tables/Entities.ts
 src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.ts
 src/Explorer/Tables/TableDataClient.ts
 src/Explorer/Tables/TableEntityProcessor.ts
 src/Explorer/Tables/Utilities.ts
 src/Explorer/Tabs/ConflictsTab.ts
 src/Explorer/Tabs/DatabaseSettingsTab.ts
-src/Explorer/Tabs/DocumentsTab.test.ts
 src/Explorer/Tabs/DocumentsTab.ts
 src/Explorer/Tabs/GraphTab.ts
 src/Explorer/Tabs/MongoDocumentsTab.ts
@@ -114,8 +117,6 @@ src/Index.ts
 src/Platform/Hosted/Authorization.ts
 src/ReactDevTools.ts
 src/Shared/Constants.ts
-src/Shared/DefaultExperienceUtility.test.ts
-src/Shared/DefaultExperienceUtility.ts
 src/Shared/appInsights.ts
 src/SparkClusterManager/ArcadiaResourceManager.ts
 src/SparkClusterManager/SparkClusterManager.ts
@@ -130,13 +131,20 @@ src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
 src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
 src/Explorer/Controls/TreeComponent/TreeComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
+; src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
+src/Explorer/Graph/GraphExplorerComponent/GraphVizComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/LeftPaneComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/MiddlePaneComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx
 src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
 src/Explorer/Notebook/NotebookComponent/NotebookComponentAdapter.tsx
+; src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx
 src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx
 src/Explorer/Notebook/NotebookComponent/contents/index.tsx
+; src/Explorer/Notebook/NotebookRenderer/NotebookReadOnlyRenderer.tsx
 src/Explorer/Notebook/NotebookRenderer/NotebookRenderer.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx

src/Explorer/Graph/GraphExplorerComponent/LeftPaneComponent.tsx

@@ -58,7 +58,7 @@ export class LeftPaneComponent extends React.Component<LeftPaneComponentProps> {
         className={className}
         as="tr"
         aria-label={node.caption}
-        onActivated={() => this.props.onRootNodeSelected(node.id)}
+        onActivated={(e) => this.props.onRootNodeSelected(node.id)}
         key={node.id}
       >
         <td className="resultItem">

src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.test.tsx

@@ -1,8 +1,8 @@
+import React from "react";
 import { mount, ReactWrapper } from "enzyme";
 import * as Q from "q";
-import React from "react";
+import { NodePropertiesComponent, NodePropertiesComponentProps, Mode } from "./NodePropertiesComponent";
-import { GraphHighlightedNodeData, PossibleVertex } from "./GraphExplorer";
+import { GraphHighlightedNodeData, EditedProperties, EditedEdges, PossibleVertex } from "./GraphExplorer";
-import { Mode, NodePropertiesComponent, NodePropertiesComponentProps } from "./NodePropertiesComponent";
 
 describe("Property pane", () => {
   const title = "My Title";
@@ -37,18 +37,17 @@ describe("Property pane", () => {
     return {
       expandedTitle: title,
       isCollapsed: false,
-      onCollapsedChanged: jest.fn(),
+      onCollapsedChanged: (newValue: boolean): void => {},
       node: highlightedNode,
-      getPkIdFromNodeData: (): string => undefined,
+      getPkIdFromNodeData: (v: GraphHighlightedNodeData): string => null,
-      collectionPartitionKeyProperty: undefined,
+      collectionPartitionKeyProperty: null,
-      updateVertexProperties: (): Q.Promise<void> => Q.resolve(),
+      updateVertexProperties: (editedProperties: EditedProperties): Q.Promise<void> => Q.resolve(),
-      selectNode: jest.fn(),
+      selectNode: (id: string): void => {},
-      updatePossibleVertices: (): Q.Promise<PossibleVertex[]> => Q.resolve(undefined),
+      updatePossibleVertices: (): Q.Promise<PossibleVertex[]> => Q.resolve(null),
-      possibleEdgeLabels: undefined,
+      possibleEdgeLabels: null,
-      //eslint-disable-next-line
+      editGraphEdges: (editedEdges: EditedEdges): Q.Promise<any> => Q.resolve(),
-      editGraphEdges: (): Q.Promise<any> => Q.resolve(),
+      deleteHighlightedNode: (): void => {},
-      deleteHighlightedNode: jest.fn(),
+      onModeChanged: (newMode: Mode): void => {},
-      onModeChanged: jest.fn(),
       viewMode: Mode.READONLY_PROP,
     };
   };

src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx

@@ -72,7 +72,7 @@ export class NodePropertiesComponent extends React.Component<
     super(props);
     this.state = {
       editedProperties: {
-        pkId: undefined,
+        pkId: null,
         readOnlyProperties: [],
         existingProperties: [],
         addedProperties: [],
@@ -98,12 +98,15 @@ export class NodePropertiesComponent extends React.Component<
     };
   }
 
-  public static getDerivedStateFromProps(props: NodePropertiesComponentProps): Partial<NodePropertiesComponentState> {
+  public static getDerivedStateFromProps(
+    props: NodePropertiesComponentProps,
+    state: NodePropertiesComponentState
+  ): Partial<NodePropertiesComponentState> {
     if (props.viewMode !== Mode.READONLY_PROP) {
       return { isDeleteConfirm: false };
     }
 
-    return undefined;
+    return null;
   }
 
   public render(): JSX.Element {
@@ -135,10 +138,10 @@ export class NodePropertiesComponent extends React.Component<
    * @param value
    */
   private static getTypeOption(value: any): ViewModels.InputPropertyValueTypeString {
-    if (value === undefined) {
+    if (value == null) {
       return "null";
     }
-    const type = typeof value;
+    let type = typeof value;
     switch (type) {
       case "number":
       case "boolean":
@@ -169,9 +172,10 @@ export class NodePropertiesComponent extends React.Component<
     ];
 
     const existingProps: ViewModels.InputProperty[] = [];
+
     if (this.props.node.hasOwnProperty("properties")) {
       const hProps = this.props.node["properties"];
-      for (const p in hProps) {
+      for (let p in hProps) {
         const propValues = hProps[p];
         (p === partitionKeyProperty ? readOnlyProps : existingProps).push({
           key: p,
@@ -433,7 +437,7 @@ export class NodePropertiesComponent extends React.Component<
         </div>
       );
     } else {
-      return undefined;
+      return null;
     }
   }
 

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -307,11 +307,18 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
 
 function createNewDatabase(container: Explorer): CommandButtonComponentProps {
   const label = "New " + getDatabaseName();
+  const newDatabaseButton = document.activeElement as HTMLElement;
+
   return {
     iconSrc: AddDatabaseIcon,
     iconAlt: label,
     onCommandClick: () =>
-      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />),
+      useSidePanel
+        .getState()
+        .openSidePanel(
+          "New " + getDatabaseName(),
+          <AddDatabasePanel explorer={container} buttonElement={newDatabaseButton} />
+        ),
     commandButtonLabel: label,
     ariaLabel: label,
     hasPopup: true,

src/Explorer/OpenFullScreen.tsx

@@ -4,8 +4,6 @@ import * as React from "react";
 import { useFullScreenURLs } from "../hooks/useFullScreenURLs";
 
 export const OpenFullScreen: React.FunctionComponent = () => {
-  const [isReadUrlCopy, setIsReadUrlCopy] = React.useState<boolean>(false);
-  const [isReadWriteUrlCopy, setIsReadWriteUrlCopy] = React.useState<boolean>(false);
   const result = useFullScreenURLs();
   if (!result) {
     return <Spinner label="Generating URLs..." ariaLive="assertive" labelPosition="right" />;
@@ -27,9 +25,8 @@ export const OpenFullScreen: React.FunctionComponent = () => {
           <DefaultButton
             onClick={() => {
               copyToClipboard(readWriteUrl);
-              setIsReadWriteUrlCopy(true);
             }}
-            text={isReadWriteUrlCopy ? "Copied" : "Copy"}
+            text="Copy"
             iconProps={{ iconName: "Copy" }}
           />
           <PrimaryButton
@@ -44,10 +41,9 @@ export const OpenFullScreen: React.FunctionComponent = () => {
         <Stack horizontal tokens={{ childrenGap: 10 }}>
           <DefaultButton
             onClick={() => {
-              setIsReadUrlCopy(true);
               copyToClipboard(readUrl);
             }}
-            text={isReadUrlCopy ? "Copied" : "Copy"}
+            text="Copy"
             iconProps={{ iconName: "Copy" }}
           />
           <PrimaryButton

src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx

@@ -23,10 +23,12 @@ import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneFor
 
 export interface AddDatabasePaneProps {
   explorer: Explorer;
+  buttonElement?: HTMLElement;
 }
 
 export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
   explorer: container,
+  buttonElement,
 }: AddDatabasePaneProps) => {
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
   let throughput: number;
@@ -77,6 +79,7 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
       dataExplorerArea: Constants.Areas.ContextualPane,
     };
     TelemetryProcessor.trace(Action.CreateDatabase, ActionModifiers.Open, addDatabasePaneOpenMessage);
+    buttonElement.focus();
   }, []);
 
   const onSubmit = () => {

src/Explorer/Panes/DeleteCollectionConfirmationPane/DeleteCollectionConfirmationPane.tsx

@@ -7,7 +7,7 @@ import { Collection } from "Contracts/ViewModels";
 import { useSidePanel } from "hooks/useSidePanel";
 import { useTabs } from "hooks/useTabs";
 import React, { FunctionComponent, useState } from "react";
-import { DefaultExperienceUtility } from "Shared/DefaultExperienceUtility";
+import * as DefaultExperienceUtility from "Shared/DefaultExperienceUtility";
 import { Action, ActionModifiers } from "Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";

src/Explorer/Panes/DeleteDatabaseConfirmationPanel.tsx

@@ -8,7 +8,7 @@ import { Collection, Database } from "Contracts/ViewModels";
 import { useSidePanel } from "hooks/useSidePanel";
 import { useTabs } from "hooks/useTabs";
 import React, { FunctionComponent, useState } from "react";
-import { DefaultExperienceUtility } from "Shared/DefaultExperienceUtility";
+import * as DefaultExperienceUtility from "Shared/DefaultExperienceUtility";
 import { Action, ActionModifiers } from "Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";

src/Explorer/SplashScreen/SplashScreen.tsx

@@ -307,16 +307,23 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
         iconSrc: AddDatabaseIcon,
         title: "New " + getDatabaseName(),
         description: undefined,
-        onClick: () =>
+        onClick: () => this.openAddDatabasePanel(),
-          useSidePanel
-            .getState()
-            .openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={this.container} />),
       });
     }
 
     return items;
   }
 
+  private openAddDatabasePanel() {
+    const newDatabaseButton = document.activeElement as HTMLElement;
+    useSidePanel
+      .getState()
+      .openSidePanel(
+        "New " + getDatabaseName(),
+        <AddDatabasePanel explorer={this.container} buttonElement={newDatabaseButton} />
+      );
+  }
+
   private decorateOpenCollectionActivity({ databaseId, collectionId }: MostRecentActivity.OpenCollectionItem) {
     return {
       iconSrc: NotebookIcon,

src/Explorer/Tables/TableDataClient.ts

@@ -202,21 +202,14 @@ export class CassandraAPIDataClient extends TableDataClient {
 
       let updateQuery = `UPDATE ${collection.databaseId}.${collection.id()}`;
       let isPropertyUpdated = false;
-      let isFirstPropertyToUpdate = true;
       for (let property in newEntity) {
         if (
           !originalDocument[property] ||
           newEntity[property]._.toString() !== originalDocument[property]._.toString()
         ) {
-          let propertyQuerySegment = this.isStringType(newEntity[property].$)
+          updateQuery += this.isStringType(newEntity[property].$)
-            ? `${property} = '${newEntity[property]._}',`
+            ? ` SET ${property} = '${newEntity[property]._}',`
-            : `${property} = ${newEntity[property]._},`;
+            : ` SET ${property} = ${newEntity[property]._},`;
-          // Only add the "SET" keyword once
-          if (isFirstPropertyToUpdate) {
-            propertyQuerySegment = " SET " + propertyQuerySegment;
-            isFirstPropertyToUpdate = false;
-          }
-          updateQuery += propertyQuerySegment;
           isPropertyUpdated = true;
         }
       }

src/Explorer/Tabs/DocumentsTab.test.ts

@@ -10,7 +10,7 @@ describe("Documents tab", () => {
   describe("buildQuery", () => {
     it("should generate the right select query for SQL API", () => {
       const documentsTab = new DocumentsTab({
-        partitionKey: null,
+        partitionKey: undefined,
         documentIds: ko.observableArray<DocumentId>(),
         tabKind: ViewModels.CollectionTabKind.Documents,
         title: "",
@@ -82,9 +82,9 @@ describe("Documents tab", () => {
       container: mongoExplorer,
     });
 
-    it("should be false for null or undefined collection", () => {
+    it("should be false for undefined or undefined collection", () => {
       const documentsTab = new DocumentsTab({
-        partitionKey: null,
+        partitionKey: undefined,
         documentIds: ko.observableArray<DocumentId>(),
         tabKind: ViewModels.CollectionTabKind.Documents,
         title: "",
@@ -94,10 +94,10 @@ describe("Documents tab", () => {
       expect(documentsTab.showPartitionKey).toBe(false);
     });
 
-    it("should be false for null or undefined partitionKey", () => {
+    it("should be false for undefined or undefined partitionKey", () => {
       const documentsTab = new DocumentsTab({
         collection: collectionWithoutPartitionKey,
-        partitionKey: null,
+        partitionKey: undefined,
         documentIds: ko.observableArray<DocumentId>(),
         tabKind: ViewModels.CollectionTabKind.Documents,
         title: "",
@@ -110,7 +110,7 @@ describe("Documents tab", () => {
     it("should be true for non-Mongo accounts with system partitionKey", () => {
       const documentsTab = new DocumentsTab({
         collection: collectionWithSystemPartitionKey,
-        partitionKey: null,
+        partitionKey: undefined,
         documentIds: ko.observableArray<DocumentId>(),
         tabKind: ViewModels.CollectionTabKind.Documents,
         title: "",
@@ -126,7 +126,7 @@ describe("Documents tab", () => {
       });
       const documentsTab = new DocumentsTab({
         collection: mongoCollectionWithSystemPartitionKey,
-        partitionKey: null,
+        partitionKey: undefined,
         documentIds: ko.observableArray<DocumentId>(),
         tabKind: ViewModels.CollectionTabKind.Documents,
         title: "",
@@ -139,7 +139,7 @@ describe("Documents tab", () => {
     it("should be true for non-system partitionKey", () => {
       const documentsTab = new DocumentsTab({
         collection: collectionWithNonSystemPartitionKey,
-        partitionKey: null,
+        partitionKey: undefined,
         documentIds: ko.observableArray<DocumentId>(),
         tabKind: ViewModels.CollectionTabKind.Documents,
         title: "",

src/Explorer/Tabs/NotebookV2Tab.ts

@@ -118,7 +118,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
     const saveButtonChildren = [];
     if (this.container.notebookManager?.gitHubOAuthService.isLoggedIn()) {
       saveButtonChildren.push({
-        iconName: copyToLabel,
+        iconName: "Copy",
         onCommandClick: () => this.copyNotebook(),
         commandButtonLabel: copyToLabel,
         hasPopup: false,

src/Explorer/WaitsForTemplateViewModel.ts

@@ -1,6 +1,6 @@
 import * as ko from "knockout";
-import * as ViewModels from "../Contracts/ViewModels";
 import * as Constants from "../Common/Constants";
+import * as ViewModels from "../Contracts/ViewModels";
 
 export abstract class WaitsForTemplateViewModel implements ViewModels.WaitsForTemplate {
   public isTemplateReady: ko.Observable<boolean>;
@@ -14,11 +14,11 @@ export abstract class WaitsForTemplateViewModel implements ViewModels.WaitsForTe
       callback(value);
     });
 
-    document.addEventListener("keydown", function (e: KeyboardEvent) {
+    document.addEventListener("keydown", (e: KeyboardEvent) => {
       // To trap keyboard focus in AddCollection pane
-      let firstFocusableElement = document.getElementById("closeBtnAddCollection");
+      const firstFocusableElement = document.getElementById("closeBtnAddCollection");
-      let lastFocusableElement = document.getElementById("submitBtnAddCollection");
+      const lastFocusableElement = document.getElementById("submitBtnAddCollection");
-      var isTabPressed = e.keyCode === Constants.KeyCodes.Tab;
+      const isTabPressed = e.keyCode === Constants.KeyCodes.Tab;
       if (isTabPressed) {
         if (e.shiftKey) {
           /* shift + tab */ if (document.activeElement === firstFocusableElement) {

src/Platform/Hosted/Authorization.ts

@@ -1,31 +1,29 @@
 import * as Constants from "../../Common/Constants";
 import { configContext } from "../../ConfigContext";
 import * as DataModels from "../../Contracts/DataModels";
-import { DefaultExperienceUtility } from "../../Shared/DefaultExperienceUtility";
+import * as DefaultExperienceUtility from "../../Shared/DefaultExperienceUtility";
 import { userContext } from "../../UserContext";
 
-export default class AuthHeadersUtil {
+export const _generateResourceUrl = (): string => {
-  public static async generateEncryptedToken(readOnly: boolean = false): Promise<DataModels.GenerateTokenResponse> {
+  const { databaseAccount, resourceGroup, subscriptionId } = userContext;
-    const url = configContext.BACKEND_ENDPOINT + "/api/tokens/generateToken" + AuthHeadersUtil._generateResourceUrl();
+  const apiKind: DataModels.ApiKind = DefaultExperienceUtility.getApiKindFromDefaultExperience(userContext.apiType);
-    const headers: any = { authorization: userContext.authorizationToken };
+  const accountEndpoint = databaseAccount?.properties?.documentEndpoint || "";
-    headers[Constants.HttpHeaders.getReadOnlyKey] = readOnly;
+  const sid = subscriptionId || "";
+  const rg = resourceGroup || "";
+  const dba = databaseAccount?.name || "";
+  const resourceUrl = encodeURIComponent(accountEndpoint);
+  const rid = "";
+  const rtype = "";
+  return `?resourceUrl=${resourceUrl}&rid=${rid}&rtype=${rtype}&sid=${sid}&rg=${rg}&dba=${dba}&api=${apiKind}`;
+};
 
-    const response = await fetch(url, { method: "POST", headers });
+export const generateEncryptedToken = async (readOnly = false): Promise<DataModels.GenerateTokenResponse> => {
-    const result = await response.json();
+  const url = configContext.BACKEND_ENDPOINT + "/api/tokens/generateToken" + _generateResourceUrl();
-    // This API has a quirk where the response must be parsed to JSON twice
+  const headers: any = { authorization: userContext.authorizationToken };
-    return JSON.parse(result);
+  headers[Constants.HttpHeaders.getReadOnlyKey] = readOnly;
-  }
 
-  private static _generateResourceUrl(): string {
+  const response = await fetch(url, { method: "POST", headers });
-    const { databaseAccount, resourceGroup, subscriptionId } = userContext;
+  const result = await response.json();
-    const apiKind: DataModels.ApiKind = DefaultExperienceUtility.getApiKindFromDefaultExperience(userContext.apiType);
+  // This API has a quirk where the response must be parsed to JSON twice
-    const accountEndpoint = databaseAccount?.properties?.documentEndpoint || "";
+  return JSON.parse(result);
-    const sid = subscriptionId || "";
+};
-    const rg = resourceGroup || "";
-    const dba = databaseAccount?.name || "";
-    const resourceUrl = encodeURIComponent(accountEndpoint);
-    const rid = "";
-    const rtype = "";
-    return `?resourceUrl=${resourceUrl}&rid=${rid}&rtype=${rtype}&sid=${sid}&rg=${rg}&dba=${dba}&api=${apiKind}`;
-  }
-}

src/Platform/Hosted/HostedUtils.ts

@@ -1,6 +1,6 @@
 import { AccountKind, CapabilityNames } from "../../Common/Constants";
 import { AccessInputMetadata, ApiKind } from "../../Contracts/DataModels";
-import { DefaultExperienceUtility } from "../../Shared/DefaultExperienceUtility";
+import * as DefaultExperienceUtility from "../../Shared/DefaultExperienceUtility";
 import { userContext } from "../../UserContext";
 
 export function getDatabaseAccountPropertiesFromMetadata(metadata: AccessInputMetadata): unknown {

src/Shared/DefaultExperienceUtility.test.ts

@@ -1,13 +1,13 @@
 import * as DataModels from "../Contracts/DataModels";
 import { userContext } from "../UserContext";
-import { DefaultExperienceUtility } from "./DefaultExperienceUtility";
+import * as DefaultExperienceUtility from "./DefaultExperienceUtility";
 
 describe("Default Experience Utility", () => {
   describe("getDefaultExperienceFromApiKind()", () => {
-    function runScenario(apiKind: number, expectedExperience: typeof userContext.apiType): void {
+    const runScenario = (apiKind: number, expectedExperience: typeof userContext.apiType): void => {
       const resolvedExperience = DefaultExperienceUtility.getDefaultExperienceFromApiKind(apiKind);
       expect(resolvedExperience).toEqual(expectedExperience);
-    }
+    };
 
     describe("On SQL", () => {
       it("should return SQL", () => runScenario(DataModels.ApiKind.SQL, "SQL"));
@@ -35,10 +35,10 @@ describe("Default Experience Utility", () => {
   });
 
   describe("getApiKindFromDefaultExperience()", () => {
-    function runScenario(defaultExperience: typeof userContext.apiType | null, expectedApiKind: number): void {
+    const runScenario = (defaultExperience: typeof userContext.apiType | null, expectedApiKind: number): void => {
       const resolvedApiKind = DefaultExperienceUtility.getApiKindFromDefaultExperience(defaultExperience);
       expect(resolvedApiKind).toEqual(expectedApiKind);
-    }
+    };
 
     describe("On SQL", () => {
       it("should return SQL", () => runScenario("SQL", DataModels.ApiKind.SQL));
@@ -60,8 +60,8 @@ describe("Default Experience Utility", () => {
       it("should return Graph", () => runScenario("Gremlin", DataModels.ApiKind.Graph));
     });
 
-    describe("On null", () => {
+    describe("On undefined", () => {
-      it("should return SQL", () => runScenario(null, DataModels.ApiKind.SQL));
+      it("should return SQL", () => runScenario(undefined, DataModels.ApiKind.SQL));
     });
   });
 });

src/Shared/DefaultExperienceUtility.ts

@@ -1,47 +1,45 @@
 import * as DataModels from "../Contracts/DataModels";
 import { userContext } from "../UserContext";
 
-export class DefaultExperienceUtility {
+export const getApiKindFromDefaultExperience = (defaultExperience: typeof userContext.apiType): DataModels.ApiKind => {
-  public static getApiKindFromDefaultExperience(defaultExperience: typeof userContext.apiType): DataModels.ApiKind {
+  if (!defaultExperience) {
-    if (!defaultExperience) {
+    return DataModels.ApiKind.SQL;
+  }
+
+  switch (defaultExperience) {
+    case "SQL":
       return DataModels.ApiKind.SQL;
-    }
+    case "Mongo":
+      return DataModels.ApiKind.MongoDB;
+    case "Tables":
+      return DataModels.ApiKind.Table;
+    case "Cassandra":
+      return DataModels.ApiKind.Cassandra;
+    case "Gremlin":
+      return DataModels.ApiKind.Graph;
+    default:
+      return DataModels.ApiKind.SQL;
+  }
+};
 
-    switch (defaultExperience) {
+export const getDefaultExperienceFromApiKind = (apiKind: DataModels.ApiKind): typeof userContext.apiType => {
-      case "SQL":
+  if (apiKind === undefined) {
-        return DataModels.ApiKind.SQL;
+    return "SQL";
-      case "Mongo":
-        return DataModels.ApiKind.MongoDB;
-      case "Tables":
-        return DataModels.ApiKind.Table;
-      case "Cassandra":
-        return DataModels.ApiKind.Cassandra;
-      case "Gremlin":
-        return DataModels.ApiKind.Graph;
-      default:
-        return DataModels.ApiKind.SQL;
-    }
   }
 
-  public static getDefaultExperienceFromApiKind(apiKind: DataModels.ApiKind): typeof userContext.apiType {
+  switch (apiKind) {
-    if (apiKind == null) {
+    case DataModels.ApiKind.SQL:
+      return "SQL";
+    case DataModels.ApiKind.MongoDB:
+    case DataModels.ApiKind.MongoDBCompute:
+      return "Mongo";
+    case DataModels.ApiKind.Table:
+      return "Tables";
+    case DataModels.ApiKind.Cassandra:
+      return "Cassandra";
+    case DataModels.ApiKind.Graph:
+      return "Gremlin";
+    default:
       return "SQL";
-    }
-
-    switch (apiKind) {
-      case DataModels.ApiKind.SQL:
-        return "SQL";
-      case DataModels.ApiKind.MongoDB:
-      case DataModels.ApiKind.MongoDBCompute:
-        return "Mongo";
-      case DataModels.ApiKind.Table:
-        return "Tables";
-      case DataModels.ApiKind.Cassandra:
-        return "Cassandra";
-      case DataModels.ApiKind.Graph:
-        return "Gremlin";
-      default:
-        return "SQL";
-    }
   }
-}
+};

src/Terminal/JupyterLabAppFactory.ts

@@ -5,37 +5,35 @@ import { ServerConnection, TerminalManager } from "@jupyterlab/services";
 import { Terminal } from "@jupyterlab/terminal";
 import { Panel, Widget } from "@phosphor/widgets";
 
-export class JupyterLabAppFactory {
+export const createTerminalApp = async (serverSettings: ServerConnection.ISettings) => {
-  public static async createTerminalApp(serverSettings: ServerConnection.ISettings) {
+  const manager = new TerminalManager({
-    const manager = new TerminalManager({
+    serverSettings: serverSettings,
-      serverSettings: serverSettings,
+  });
-    });
+  const session = await manager.startNew();
-    const session = await manager.startNew();
+  const term = new Terminal(session, { theme: "dark", shutdownOnClose: true });
-    const term = new Terminal(session, { theme: "dark", shutdownOnClose: true });
 
-    if (!term) {
+  if (!term) {
-      console.error("Failed starting terminal");
+    console.error("Failed starting terminal");
-      return;
+    return;
-    }
-
-    term.title.closable = false;
-    term.addClass("terminalWidget");
-
-    let panel = new Panel();
-    panel.addWidget(term as any);
-    panel.id = "main";
-
-    // Attach the widget to the dom.
-    Widget.attach(panel, document.body);
-
-    // Handle resize events.
-    window.addEventListener("resize", () => {
-      panel.update();
-    });
-
-    // Dispose terminal when unloading.
-    window.addEventListener("unload", () => {
-      panel.dispose();
-    });
   }
-}
+
+  term.title.closable = false;
+  term.addClass("terminalWidget");
+
+  const panel = new Panel();
+  panel.addWidget(term as any);
+  panel.id = "main";
+
+  // Attach the widget to the dom.
+  Widget.attach(panel, document.body);
+
+  // Handle resize events.
+  window.addEventListener("resize", () => {
+    panel.update();
+  });
+
+  // Dispose terminal when unloading.
+  window.addEventListener("unload", () => {
+    panel.dispose();
+  });
+};

src/Terminal/index.ts

@@ -6,7 +6,7 @@ import { Action } from "../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
 import { updateUserContext } from "../UserContext";
 import "./index.css";
-import { JupyterLabAppFactory } from "./JupyterLabAppFactory";
+import { createTerminalApp } from "./JupyterLabAppFactory";
 import { TerminalProps } from "./TerminalProps";
 
 const createServerSettings = (props: TerminalProps): ServerConnection.ISettings => {
@@ -54,7 +54,7 @@ const initTerminal = async (props: TerminalProps) => {
   const startTime = TelemetryProcessor.traceStart(Action.OpenTerminal, data);
 
   try {
-    await JupyterLabAppFactory.createTerminalApp(serverSettings);
+    await createTerminalApp(serverSettings);
     TelemetryProcessor.traceSuccess(Action.OpenTerminal, data, startTime);
   } catch (error) {
     TelemetryProcessor.traceFailure(Action.OpenTerminal, data, startTime);

src/hooks/useFullScreenURLs.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { GenerateTokenResponse } from "../Contracts/DataModels";
-import AuthHeadersUtil from "../Platform/Hosted/Authorization";
+import * as AuthHeadersUtil from "../Platform/Hosted/Authorization";
 
 export function useFullScreenURLs(): GenerateTokenResponse | undefined {
   const [state, setState] = useState<GenerateTokenResponse>();

src/hooks/useKnockoutExplorer.ts

@@ -26,7 +26,7 @@ import {
   getDatabaseAccountPropertiesFromMetadata,
 } from "../Platform/Hosted/HostedUtils";
 import { CollectionCreation } from "../Shared/Constants";
-import { DefaultExperienceUtility } from "../Shared/DefaultExperienceUtility";
+import * as DefaultExperienceUtility from "../Shared/DefaultExperienceUtility";
 import { PortalEnv, updateUserContext, userContext } from "../UserContext";
 import { listKeys } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
 import { DatabaseAccountListKeysResult } from "../Utils/arm/generatedClients/cosmos/types";