Bump dns-packet from 1.3.1 to 1.3.4

Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4. - [Release notes](https://github.com/mafintosh/dns-packet/releases) - [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md) - [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4) Signed-off-by: dependabot[bot] <support@github.com>
2025-12-23 02:41:39 +00:00 · 2021-05-28 19:00:53 +00:00
357 changed files with 20719 additions and 18576 deletions
--- a/.env.example
+++ b/.env.example
@@ -1 +1,16 @@
+PORTAL_RUNNER_USERNAME=
+PORTAL_RUNNER_PASSWORD=
+PORTAL_RUNNER_SUBSCRIPTION=
+PORTAL_RUNNER_RESOURCE_GROUP=
+PORTAL_RUNNER_DATABASE_ACCOUNT=
+PORTAL_RUNNER_DATABASE_ACCOUNT_KEY=
+PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT=
+PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT_KEY=
+PORTAL_RUNNER_CONNECTION_STRING=
+NOTEBOOKS_TEST_RUNNER_TENANT_ID=
+NOTEBOOKS_TEST_RUNNER_CLIENT_ID=
+NOTEBOOKS_TEST_RUNNER_CLIENT_SECRET=
+CASSANDRA_CONNECTION_STRING=
+MONGO_CONNECTION_STRING=
+TABLES_CONNECTION_STRING=
 DATA_EXPLORER_ENDPOINT=https://localhost:1234/hostedExplorer.html
--- a/.eslintignore
+++ b/.eslintignore
@@ -21,8 +21,16 @@ src/Common/MongoUtility.ts
 src/Common/NotificationsClientBase.ts
 src/Common/QueriesClient.ts
 src/Common/Splitter.ts
+src/Config.ts
+src/Contracts/ActionContracts.ts
+src/Contracts/DataModels.ts
+src/Contracts/Diagnostics.ts
+src/Contracts/ExplorerContracts.ts
+src/Contracts/Versions.ts
+src/Contracts/ViewModels.ts
 src/Controls/Heatmap/Heatmap.test.ts
 src/Controls/Heatmap/Heatmap.ts
+src/Controls/Heatmap/HeatmapDatatypes.ts
 src/Definitions/datatables.d.ts
 src/Definitions/gif.d.ts
 src/Definitions/globals.d.ts
@@ -36,14 +44,35 @@ src/Definitions/png.d.ts
 src/Definitions/svg.d.ts
 src/Explorer/ComponentRegisterer.test.ts
 src/Explorer/ComponentRegisterer.ts
+src/Explorer/ContextMenuButtonFactory.ts
+src/Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.ts
 src/Explorer/Controls/DiffEditor/DiffEditorComponent.ts
-
+src/Explorer/Controls/DynamicList/DynamicList.test.ts
+src/Explorer/Controls/DynamicList/DynamicListComponent.ts
 src/Explorer/Controls/Editor/EditorComponent.ts
+src/Explorer/Controls/ErrorDisplayComponent/ErrorDisplayComponent.ts
+src/Explorer/Controls/InputTypeahead/InputTypeahead.ts
 src/Explorer/Controls/JsonEditor/JsonEditorComponent.ts
+src/Explorer/Controls/Notebook/NotebookAppMessageHandler.ts
+src/Explorer/Controls/ThroughputInput/ThroughputInputComponent.ts
+src/Explorer/Controls/ThroughputInput/ThroughputInputComponentAutoPilotV3.ts
+src/Explorer/Controls/Toolbar/IToolbarAction.ts
+src/Explorer/Controls/Toolbar/IToolbarDisplayable.ts
+src/Explorer/Controls/Toolbar/IToolbarDropDown.ts
+src/Explorer/Controls/Toolbar/IToolbarItem.ts
+src/Explorer/Controls/Toolbar/IToolbarSeperator.ts
+src/Explorer/Controls/Toolbar/IToolbarToggle.ts
+src/Explorer/Controls/Toolbar/KeyCodes.ts
+src/Explorer/Controls/Toolbar/Toolbar.ts
+src/Explorer/Controls/Toolbar/ToolbarAction.ts
+src/Explorer/Controls/Toolbar/ToolbarDropDown.ts
+src/Explorer/Controls/Toolbar/ToolbarToggle.ts
+src/Explorer/Controls/Toolbar/Utilities.ts
 src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
 src/Explorer/DataSamples/ContainerSampleGenerator.ts
 src/Explorer/DataSamples/DataSamplesUtil.test.ts
 src/Explorer/DataSamples/DataSamplesUtil.ts
+src/Explorer/Explorer.tsx
 src/Explorer/Graph/GraphExplorerComponent/ArraysByKeyCache.test.ts
 src/Explorer/Graph/GraphExplorerComponent/ArraysByKeyCache.ts
 src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.test.ts
@@ -55,6 +84,11 @@ src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.test.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts
+# src/Explorer/Graph/GraphStyleComponent/GraphStyle.test.ts
+# src/Explorer/Graph/GraphStyleComponent/GraphStyleComponent.ts
+
+src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts
+src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.ts
 src/Explorer/Menus/ContextMenu.ts
 src/Explorer/MostRecentActivity/MostRecentActivity.ts
 src/Explorer/Notebook/NotebookClientV2.ts
@@ -71,11 +105,20 @@ src/Explorer/Notebook/NotebookContainerClient.ts
 src/Explorer/Notebook/NotebookContentClient.ts
 src/Explorer/Notebook/NotebookContentItem.ts
 src/Explorer/Notebook/NotebookUtil.ts
+src/Explorer/OpenActions.test.ts
+src/Explorer/OpenActions.ts
 src/Explorer/OpenActionsStubs.ts
+src/Explorer/Panes/AddDatabasePane.ts
+src/Explorer/Panes/AddDatabasePane.test.ts
+src/Explorer/Panes/BrowseQueriesPane.ts
+src/Explorer/Panes/RenewAdHocAccessPane.ts
+src/Explorer/Panes/SetupNotebooksPane.ts
+src/Explorer/Panes/SwitchDirectoryPane.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyNameValidator.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyValidationCommon.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyValueValidator.ts
 src/Explorer/SplashScreen/SplashScreen.test.ts
+src/Explorer/Tables/Constants.ts
 src/Explorer/Tables/DataTable/CacheBase.ts
 src/Explorer/Tables/DataTable/DataTableBindingManager.ts
 src/Explorer/Tables/DataTable/DataTableBuilder.ts
@@ -87,11 +130,12 @@ 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/ClauseGroup.ts
-# src/Explorer/Tables/QueryBuilder/ClauseGroupViewModel.ts
+src/Explorer/Tables/QueryBuilder/ClauseGroup.ts
+src/Explorer/Tables/QueryBuilder/ClauseGroupViewModel.ts
 src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.ts
-# src/Explorer/Tables/QueryBuilder/QueryBuilderViewModel.ts
-# src/Explorer/Tables/QueryBuilder/QueryClauseViewModel.ts
+src/Explorer/Tables/QueryBuilder/QueryBuilderViewModel.ts
+src/Explorer/Tables/QueryBuilder/QueryClauseViewModel.ts
+src/Explorer/Tables/QueryBuilder/QueryViewModel.ts
 src/Explorer/Tables/TableDataClient.ts
 src/Explorer/Tables/TableEntityProcessor.ts
 src/Explorer/Tables/Utilities.ts
@@ -101,59 +145,170 @@ src/Explorer/Tabs/DocumentsTab.test.ts
 src/Explorer/Tabs/DocumentsTab.ts
 src/Explorer/Tabs/GraphTab.ts
 src/Explorer/Tabs/MongoDocumentsTab.ts
+src/Explorer/Tabs/MongoQueryTab.ts
+src/Explorer/Tabs/MongoShellTab.ts
 src/Explorer/Tabs/NotebookV2Tab.ts
+src/Explorer/Tabs/QueryTab.test.ts
+src/Explorer/Tabs/QueryTab.ts
+src/Explorer/Tabs/QueryTablesTab.ts
 src/Explorer/Tabs/ScriptTabBase.ts
+src/Explorer/Tabs/StoredProcedureTab.ts
 src/Explorer/Tabs/TabComponents.ts
 src/Explorer/Tabs/TabsBase.ts
 src/Explorer/Tabs/TriggerTab.ts
 src/Explorer/Tabs/UserDefinedFunctionTab.ts
 src/Explorer/Tree/AccessibleVerticalList.ts
+src/Explorer/Tree/Collection.test.ts
 src/Explorer/Tree/Collection.ts
 src/Explorer/Tree/ConflictId.ts
+src/Explorer/Tree/Database.ts
 src/Explorer/Tree/DocumentId.ts
 src/Explorer/Tree/ObjectId.ts
 src/Explorer/Tree/ResourceTokenCollection.ts
+src/Explorer/Tree/StoredProcedure.ts
+src/Explorer/Tree/TreeComponents.ts
+src/Explorer/Tree/Trigger.ts
+src/Explorer/Tree/UserDefinedFunction.ts
 src/Explorer/WaitsForTemplateViewModel.ts
 src/GitHub/GitHubClient.test.ts
 src/GitHub/GitHubClient.ts
+src/GitHub/GitHubConnector.ts
+src/GitHub/GitHubContentProvider.test.ts
+src/GitHub/GitHubContentProvider.ts
+src/GitHub/GitHubOAuthService.ts
+src/HostedExplorer.ts
 src/Index.ts
+src/Juno/JunoClient.test.ts
+src/Juno/JunoClient.ts
+src/Main.ts
+src/NotebookWorkspaceManager/NotebookWorkspaceManager.ts
+src/NotebookWorkspaceManager/NotebookWorkspaceResourceProviderMockClients.ts
+src/Platform/Emulator/DataAccessUtility.ts
+src/Platform/Emulator/ExplorerFactory.ts
+src/Platform/Emulator/Main.ts
+src/Platform/Emulator/NotificationsClient.ts
+src/Platform/Hosted/ArmResourceUtils.ts
+src/Platform/Hosted/Authorization.ts
+src/Platform/Hosted/DataAccessUtility.ts
+src/Platform/Hosted/ExplorerFactory.ts
+src/Platform/Hosted/Helpers/ConnectionStringParser.test.ts
+src/Platform/Hosted/Main.ts
+src/Platform/Hosted/Maint.test.ts
+src/Platform/Hosted/NotificationsClient.ts
+src/Platform/Portal/DataAccessUtility.ts
+src/Platform/Portal/ExplorerFactory.ts
+src/Platform/Portal/Main.ts
+src/Platform/Portal/NotificationsClient.ts
+src/PlatformType.ts
 src/ReactDevTools.ts
+src/ResourceProvider/IResourceProviderClient.test.ts
+src/ResourceProvider/IResourceProviderClient.ts
+src/ResourceProvider/ResourceProviderClient.ts
+src/ResourceProvider/ResourceProviderClientFactory.ts
+src/RouteHandlers/RouteHandler.ts
+src/RouteHandlers/TabRouteHandler.test.ts
+src/RouteHandlers/TabRouteHandler.ts
 src/Shared/Constants.ts
 src/Shared/DefaultExperienceUtility.test.ts
 src/Shared/DefaultExperienceUtility.ts
+src/Shared/ExplorerSettings.ts
+src/Shared/PriceEstimateCalculator.ts
+src/Shared/StorageUtility.test.ts
+src/Shared/StorageUtility.ts
 src/Shared/appInsights.ts
 src/SparkClusterManager/ArcadiaResourceManager.ts
 src/SparkClusterManager/SparkClusterManager.ts
 src/Terminal/JupyterLabAppFactory.ts
 src/Terminal/NotebookAppContracts.d.ts
+src/Terminal/index.ts
+src/TokenProviders/PortalTokenProvider.ts
+src/TokenProviders/TokenProviderFactory.ts
+src/Utils/PricingUtils.test.ts
+src/Utils/QueryUtils.test.ts
 src/applyExplorerBindings.ts
 src/global.d.ts
 src/setupTests.ts
+src/Explorer/Controls/AccessibleElement/AccessibleElement.tsx
+src/Explorer/Controls/Accordion/AccordionComponent.tsx
+src/Explorer/Controls/AccountSwitch/AccountSwitchComponent.test.tsx
+src/Explorer/Controls/AccountSwitch/AccountSwitchComponent.tsx
+src/Explorer/Controls/AccountSwitch/AccountSwitchComponentAdapter.tsx
+src/Explorer/Controls/Arcadia/ArcadiaMenuPicker.tsx
+src/Explorer/Controls/CollapsiblePanel/CollapsiblePanel.tsx
+src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx
+src/Explorer/Controls/DialogReactComponent/DialogComponent.tsx
+src/Explorer/Controls/DialogReactComponent/DialogComponentAdapter.tsx
+src/Explorer/Controls/Directory/DefaultDirectoryDropdownComponent.test.tsx
+src/Explorer/Controls/Directory/DefaultDirectoryDropdownComponent.tsx
+src/Explorer/Controls/Directory/DirectoryComponentAdapter.tsx
+src/Explorer/Controls/Directory/DirectoryListComponent.test.tsx
+src/Explorer/Controls/Directory/DirectoryListComponent.tsx
+src/Explorer/Controls/Editor/EditorReact.tsx
 src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
 src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx
 src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
+src/Explorer/Controls/NotebookViewer/NotebookMetadataComponent.tsx
+src/NotebookViewer/NotebookViewer.tsx
 src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
+src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx
+src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponentAdapter.tsx
+src/Explorer/Controls/ResizeSensorReactComponent/ResizeSensorComponent.tsx
+src/Explorer/Controls/Spark/ClusterSettingsComponent.tsx
+src/Explorer/Controls/Spark/ClusterSettingsComponentAdapter.tsx
+src/Explorer/Controls/Tabs/TabComponent.tsx
+src/Explorer/Controls/TreeComponent/TreeComponent.test.tsx
 src/Explorer/Controls/TreeComponent/TreeComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/EditorNeighborsComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.test.tsx
+src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
-; src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
+src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
+src/Explorer/Graph/GraphExplorerComponent/GraphExplorerAdapter.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/QueryContainerComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNeighborsComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx
 src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
+src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.test.tsx
+src/Explorer/Notebook/NotebookComponent/NotebookComponent.tsx
 src/Explorer/Notebook/NotebookComponent/NotebookComponentAdapter.tsx
-; src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx
+src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx
 src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx
+src/Explorer/Notebook/NotebookComponent/contents/file/index.tsx
+src/Explorer/Notebook/NotebookComponent/contents/file/text-file.tsx
 src/Explorer/Notebook/NotebookComponent/contents/index.tsx
-; src/Explorer/Notebook/NotebookRenderer/NotebookReadOnlyRenderer.tsx
+src/Explorer/Notebook/NotebookRenderer/AzureTheme.tsx
+src/Explorer/Notebook/NotebookRenderer/NotebookReadOnlyRenderer.tsx
 src/Explorer/Notebook/NotebookRenderer/NotebookRenderer.tsx
+src/Explorer/Notebook/NotebookRenderer/Prompt.tsx
+src/Explorer/Notebook/NotebookRenderer/PromptContent.tsx
+src/Explorer/Notebook/NotebookRenderer/StatusBar.test.tsx
+src/Explorer/Notebook/NotebookRenderer/StatusBar.tsx
+src/Explorer/Notebook/NotebookRenderer/Toolbar.tsx
+src/Explorer/Notebook/NotebookRenderer/decorators/CellCreator.tsx
+src/Explorer/Notebook/NotebookRenderer/decorators/CellLabeler.tsx
+src/Explorer/Notebook/NotebookRenderer/decorators/HoverableCell.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/kbd-shortcuts/index.tsx
 src/Explorer/Notebook/temp/inputs/connected-editors/codemirror.tsx
+src/Explorer/Notebook/temp/inputs/editor.tsx
+src/Explorer/Notebook/temp/markdown-cell.tsx
+src/Explorer/Notebook/temp/source.tsx
+src/Explorer/Notebook/temp/syntax-highlighter/index.tsx
+src/Explorer/SplashScreen/SplashScreen.tsx
+src/Explorer/Tabs/GalleryTab.tsx
+src/Explorer/Tabs/NotebookViewerTab.tsx
+src/Explorer/Tabs/TerminalTab.tsx
 src/Explorer/Tree/ResourceTreeAdapter.tsx
+src/Explorer/Tree/ResourceTreeAdapterForResourceToken.tsx
+src/GalleryViewer/Cards/GalleryCardComponent.tsx
+src/GalleryViewer/GalleryViewer.tsx
+src/GalleryViewer/GalleryViewerComponent.tsx
 __mocks__/monaco-editor.ts
-src/Explorer/Tree/ResourceTree.tsx
+src/Explorer/Tree/ResourceTreeAdapterForResourceToken.test.tsx
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -39,6 +39,7 @@ module.exports = {
    "@typescript-eslint/switch-exhaustiveness-check": "error",
    "@typescript-eslint/no-unused-vars": "error",
    "@typescript-eslint/no-extraneous-class": "error",
+    "no-null/no-null": "error",
    "@typescript-eslint/no-explicit-any": "error",
    "prefer-arrow/prefer-arrow-functions": ["error", { allowStandaloneDeclarations: true }],
    eqeqeq: "error",
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -143,7 +143,7 @@ jobs:
          - ./test/mongo/container.spec.ts
          - ./test/mongo/container32.spec.ts
          - ./test/selfServe/selfServeExample.spec.ts
-          # - ./test/notebooks/upload.spec.ts // TEMP disabled since notebooks service is off
+          - ./test/notebooks/upload.spec.ts
          - ./test/sql/resourceToken.spec.ts
          - ./test/tables/container.spec.ts
    steps:
--- a/configs/mpac.json
+++ b/configs/mpac.json
@@ -1,3 +1,4 @@
 {
-  "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com"
+  "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com",
+  "enableSchemaAnalyzer": true
 }
--- a/images/Clear-1.svg
+++ b/images/Clear-1.svg
--- a/images/check-1.svg
+++ b/images/check-1.svg
--- a/images/close-black.svg
+++ b/images/close-black.svg
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"
+<svg
+    width="16" 
+    height="16"
+     version="1.1" 
+    viewBox="0 0 16 16" 
+    xmlns="http://www.w3.org/2000/svg" 
    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <path
-        d="M14,2.691l-5.301,5.309l5.301,5.309l-0.691,0.691l-5.309,-5.301l-5.309,5.301l-0.691,-0.691l5.301,-5.309l-5.301,-5.309l0.691,-0.691l5.309,5.301l5.309,-5.301l0.691,0.691Z"
-        transform="scale(0.5)" fill="#000" stroke="#000">
+    <path 
+        d="M14,2.691l-5.301,5.309l5.301,5.309l-0.691,0.691l-5.309,-5.301l-5.309,5.301l-0.691,-0.691l5.301,-5.309l-5.301,-5.309l0.691,-0.691l5.309,5.301l5.309,-5.301l0.691,0.691Z" 
+        transform="scale(0.5)" 
+        fill="#000"
+        stroke="#CCC" 
+        >
    </path>
 </svg>
--- a/images/edit-1.svg
+++ b/images/edit-1.svg
--- a/jest.config.js
+++ b/jest.config.js
@@ -37,8 +37,8 @@ module.exports = {
    global: {
      branches: 25,
      functions: 25,
-      lines: 29,
-      statements: 29,
+      lines: 30,
+      statements: 30,
    },
  },

--- a/less/Common/Constants.less
+++ b/less/Common/Constants.less
@@ -9,7 +9,6 @@

@DataExplorerFont: wf_segoe-ui_normal, "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif;
@SemiboldFont: "Segoe UI Semibold", "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif;
-@GrayScale: "grayscale()";

@xSmallFontSize: 4px;
@smallFontSize: 8px;
--- a/less/documentDB.less
+++ b/less/documentDB.less
@@ -724,24 +724,45 @@ execute-sproc-params-pane {

  .results-container,
  .errors-container {
+    padding: @MediumSpace 0px 0px @MediumSpace;
    height: 100%;
    .flex-display();
    .flex-direction();
    overflow: hidden;

-    .enterInputParameters {
-      padding: @LargeSpace @MediumSpace;
+    .toggles {
+      height: @ToggleHeight;
+      width: @ToggleWidth;
+      margin-left: @MediumSpace;
+
+      &:focus {
+        .focus();
+      }
+
+      .tab {
+        margin-right: @MediumSpace;
+      }
+
+      .toggleSwitch {
+        .toggleSwitch();
+      }
+
+      .selectedToggle {
+        .selectedToggle();
+      }
+
+      .unselectedToggle {
+        .unselectedToggle();
+      }
    }

-    div[role="tabpanel"] {
-      height: 100%;
-      padding-bottom: 50px;
+    .enterInputParameters {
+      padding: @LargeSpace @MediumSpace;
    }
  }

  .errors-container {
    padding-left: (2 * @MediumSpace);
-    padding: @MediumSpace 0px 0px @MediumSpace;
    .errors-header {
      font-weight: 700;
      font-size: @DefaultFontSize;
@@ -2357,8 +2378,6 @@ a:link {
  height: 100%;
  flex-grow: 1;
  overflow: hidden;
-  min-height: 300px;
-  overflow-y: scroll;
 }

 .tabs {
@@ -2834,8 +2853,6 @@ a:link {

 #explorerNotificationConsole {
  z-index: 1000;
-  overflow-y: auto;
-  overflow-x: clip;
 }

 .uniqueIndexesContainer {
@@ -3071,11 +3088,4 @@ settings-pane {
 .hiddenMain {
  display: none;
  height: 0px;
-}
-.spinner {
-  width: 100%;
-  position: absolute;
-  z-index: 1;
-  background: white;
-  height: 100%;
-}
+}
--- a/less/forms.less
+++ b/less/forms.less
@@ -200,12 +200,4 @@

 .migration:disabled {
    background-color: #ccc;
-}
-
-.trigger-field {
-    width: 40%;
-    margin-top: 10px
-}
-.trigger-form {
-    padding: 10px 30px 10px 30px;
 }
--- a/less/resourceTree.less
+++ b/less/resourceTree.less
@@ -2,7 +2,6 @@

 .dataResourceTree {
  margin-left: @MediumSpace;
-  overflow: auto;

  .databaseHeader {
    font-size: 14px;
@@ -19,10 +18,6 @@
  .notebookHeader {
    font-size: 12px;
  }
-
-  .clickDisabled {
-    pointer-events: none;
-  }
 }


--- a/less/tree.less
+++ b/less/tree.less
@@ -1,270 +1,273 @@
@import "./Common/Constants";

+
 .resourceTree {
-  height: 100%;
-  flex: 0 0 auto;
-  .main {
    height: 100%;
-  }
+    width: 20%;
+    flex: 0 0 auto;
+    .main {
+        height: 100%;
+    }
 }

 .resourceTreeScroll {
-  height: 100%;
-  display: flex;
-  overflow-y: auto;
-  overflow-x: hidden;
-  padding-right: 10px;
+    height: 100%;
+    display: flex;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-right: 10px;
 }

 .userSelectNone {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
 }

 .treeHovermargin {
-  margin-left: 16px;
+    margin-left: 16px;
 }

 .highlight {
-  padding: @SmallSpace 2px;
-  outline: 0;
+    padding: @SmallSpace 2px;
+    outline: 0;

-  &:hover {
-    .hover();
-  }
+    &:hover {
+        .hover();
+    }

-  &:active {
-    .active();
-  }
+    &:active {
+        .active();
+    }

-  &:focus {
-    .focus();
-  }
+    &:focus {
+        .focus();
+    }
 }

 .contextmenushowing {
-  background-color: #eee;
+    background-color: #EEE;
 }

 .collectionstree {
-  width: 100%;
-  margin-top: @DefaultSpace;
+    width: 100%;
+    margin-top: @DefaultSpace;

-  .databaseList {
-    list-style-type: none;
-    padding-left: 0px;

-    .collectionList {
-      padding-left: (2 * @MediumSpace);
+    .databaseList {
+        list-style-type: none;
+        padding-left: 0px;
+
+        .collectionList {
+            padding-left:(2 * @MediumSpace);
+        }
+
+        .collectionChildList {
+            padding-left: @LargeSpace;
+        }
+
+        .databaseDocuments {
+            padding-left: (5 * @MediumSpace);
+        }
    }
-
-    .collectionChildList {
-      padding-left: @LargeSpace;
-    }
-
-    .databaseDocuments {
-      padding-left: (5 * @MediumSpace);
-    }
-  }
 }

 .pointerCursor {
-  cursor: pointer;
+    cursor: pointer;
 }

 .menuEllipsis {
-  padding-right: 6px;
-  font-weight: bold;
-  font-size: 18px;
-  position: relative;
-  top: -5px;
-  left: 0px;
-  float: right;
-  display: none;
-  padding-left: 6px !important;
-  line-height: @TreeLineHeight;
+    padding-right: 6px;
+    font-weight: bold;
+    font-size: 18px;
+    position: relative;
+    top: -5px;
+    left: 0px;
+    float: right;
+    display: none;
+    padding-left: 6px!important;
+    line-height: @TreeLineHeight;
 }

 .databaseMenu {
-  .flex-display();
+    .flex-display();
 }

 .databaseMenu:hover .menuEllipsis,
 .databaseMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }

 .databaseCollChildTextOverflow {
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  flex: 1;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    flex: 1;
 }

 .collectionMenu {
-  .flex-display();
+    .flex-display();
 }

 .collectionMenu:hover .menuEllipsis,
 .collectionMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }

 .documentsMenu:hover .menuEllipsis,
 .documentsMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }

 .treeChildMenu {
-  display: flex;
+    display: flex;
 }

 .storedProcedureMenu:hover .menuEllipsis,
 .storedProcedureMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }

 .childMenu {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  padding-left: (6 * @MediumSpace);
-  width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    padding-left: (6 * @MediumSpace);
+    width: 100%;
 }

 .storedChildMenu:hover .menuEllipsis,
 .storedChildMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }

 .contextmenu6 {
-  top: -29px;
+    top: -29px;
 }

 .userDefinedMenu:hover .contextmenu6 {
-  display: block;
+    display: block;
 }

 .userDefinedchildMenu:hover .menuEllipsis,
 .userDefinedchildMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }

 .triggersMenu:hover .menuEllipsis,
 .triggersMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }

 .triggersChildMenu:hover .menuEllipsis,
 .triggersChildMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }

 .databaseId {
-  font-size: 14px;
+    font-size: 14px;
 }

 .storedUdfTriggerMenu {
-  padding-left: 0px;
+    padding-left: 0px;
 }

 .collectionstree img {
-  width: 16px;
-  height: 16px;
-  vertical-align: text-top;
+    width: 16px;
+    height: 16px;
+    vertical-align: text-top;
 }

 img.collectionsTreeCollapseExpand {
-  width: 10px;
-  height: 10px;
-  vertical-align: middle;
-  margin-bottom: 5px;
+    width: 10px;
+    height: 10px;
+    vertical-align: middle;
+    margin-bottom: 5px;
 }

 .collapsed::before {
-  content: "\23F5";
-  margin-left: 0px;
-  font-size: 15px;
+    content: "\23F5";
+    margin-left: 0px;
+    font-size: 15px;
 }

 .expanded::before {
-  content: "\23F7";
-  margin-left: 0px;
-  font-size: 15px;
+    content: '\23F7';
+    margin-left: 0px;
+    font-size: 15px;
 }

 .collectionMenuChildren {
-  padding-left: 42px;
+    padding-left: 42px;
 }

 .main-nav {
-  width: 100vh;
-  height: 40px;
-  background: white;
-  transform-origin: left top;
-  -webkit-transform-origin: left top;
-  -ms-transform-origin: left top;
-  transform: rotate(-90deg) translateX(-100%);
-  -webkit-transform: rotate(-90deg) translateX(-100%);
-  -ms-transform: rotate(-90deg) translateX(-100%);
-  border-bottom: 1px solid #ccc;
+    width: 100vh;
+    height: 40px;
+    background: white;
+    transform-origin: left top;
+    -webkit-transform-origin: left top;
+    -ms-transform-origin: left top;
+    transform: rotate(-90deg) translateX(-100%);
+    -webkit-transform: rotate(-90deg) translateX(-100%);
+    -ms-transform: rotate(-90deg) translateX(-100%);
+    border-bottom: 1px solid #CCC;
 }

 .main-nav-img {
-  width: 16px;
-  height: 16px;
-  margin: -32px 0 0 0;
-  transform: rotate(-90deg) translateX(-100%);
-  -webkit-transform: rotate(-90deg) translateX(-100%);
-  -ms-transform: rotate(-90deg) translateX(-100%);
+    width: 16px;
+    height: 16px;
+    margin: -32px 0 0 0;
+    transform: rotate(-90deg) translateX(-100%);
+    -webkit-transform: rotate(-90deg) translateX(-100%);
+    -ms-transform: rotate(-90deg) translateX(-100%);
 }

 .main-nav-img.main-nav-sub-img {
-  width: 16px;
-  height: 16px;
-  margin: 0px 0px 0 0;
-  transform: rotate(180deg) translateX(0%);
-  -webkit-transform: rotate(180deg) translateX(0%);
-  -ms-transform: rotate(180deg) translateX(0%);
-  position: absolute;
-  right: -8px;
-  top: 16px;
+    width: 16px;
+    height: 16px;
+    margin: 0px 0px 0 0;
+    transform: rotate(180deg) translateX(0%);
+    -webkit-transform: rotate(180deg) translateX(0%);
+    -ms-transform: rotate(180deg) translateX(0%);
+    position: absolute;
+    right: -8px;
+    top: 16px;
 }

 ul.nav {
-  margin: 0 auto;
-  margin-top: 0px;
-  margin-left: 0px;
+    margin: 0 auto;
+    margin-top: 0px;
+    margin-left: 0px;
 }

 .mini ul.nav li {
-  float: right;
-  line-height: 25px;
-  height: auto;
-  margin-top: 3px;
+    float: right;
+    line-height: 25px;
+    height: auto;
+    margin-top: 3px;
 }

 .spancolchildstyle {
-  padding: 4px;
+    padding: 4px;
 }

 .contextmenubutton {
-  float: right;
-  display: none;
+    float: right;
+    display: none;
 }

-.highlight:hover > .contextmenubutton {
-  display: unset;
+.highlight:hover>.contextmenubutton {
+    display: unset;
 }

-.highlight:hover > .contextmenubutton::after {
-  content: "\2026";
-  font-size: 12px;
+.highlight:hover>.contextmenubutton::after {
+    content: "\2026";
+    font-size: 12px;
 }

 .showEllipsis {
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
    "@nteract/data-explorer": "8.0.3",
    "@nteract/directory-listing": "2.0.6",
    "@nteract/dropdown-menu": "1.0.1",
-    "@nteract/editor": "10.1.12",
+    "@nteract/editor": "10.1.2",
    "@nteract/fixtures": "2.3.0",
    "@nteract/iron-icons": "1.0.0",
    "@nteract/jupyter-widgets": "2.0.0",
@@ -42,15 +42,14 @@
    "@octokit/rest": "17.9.2",
    "@phosphor/widgets": "1.9.3",
    "@testing-library/jest-dom": "5.11.9",
-    "@types/lodash": "4.14.171",
    "@types/mkdirp": "1.0.1",
    "@types/node-fetch": "2.5.7",
    "applicationinsights": "1.8.0",
    "bootstrap": "3.4.1",
    "canvas": "file:./canvas",
-    "clean-webpack-plugin": "3.0.0",
+    "clean-webpack-plugin": "0.1.19",
    "clipboard-copy": "4.0.1",
-    "copy-webpack-plugin": "9.0.1",
+    "copy-webpack-plugin": "6.0.2",
    "crossroads": "0.12.2",
    "css-element-queries": "1.1.1",
    "d3": "6.1.1",
@@ -75,22 +74,21 @@
    "jquery-ui-dist": "1.12.1",
    "knockout": "3.5.1",
    "mkdirp": "1.0.4",
-    "monaco-editor": "0.18.1",
+    "monaco-editor": "0.24.0",
    "ms": "2.1.3",
    "p-retry": "4.2.0",
    "plotly.js-cartesian-dist-min": "1.52.3",
    "post-robot": "10.0.42",
    "q": "1.5.1",
-    "react": "16.14.0",
+    "react": "16.13.1",
    "react-animate-height": "2.0.8",
-    "react-dnd": "14.0.2",
-    "react-dnd-html5-backend": "14.0.0",
+    "react-dnd": "9.4.0",
+    "react-dnd-html5-backend": "9.4.0",
    "react-dom": "16.13.1",
    "react-hotkeys": "2.0.0",
    "react-i18next": "11.8.5",
    "react-notification-system": "0.2.17",
    "react-redux": "7.1.3",
-    "react-splitter-layout": "4.0.0",
    "redux": "4.0.4",
    "reflect-metadata": "0.1.13",
    "rx-jupyter": "5.5.12",
@@ -98,7 +96,7 @@
    "sanitize-html": "2.3.3",
    "styled-components": "4.3.2",
    "swr": "0.4.0",
-    "terser-webpack-plugin": "5.1.4",
+    "terser-webpack-plugin": "3.1.0",
    "underscore": "1.9.1",
    "utility-types": "3.10.0",
    "zustand": "3.5.0"
@@ -125,14 +123,12 @@
    "@types/react-dom": "17.0.3",
    "@types/react-notification-system": "0.2.39",
    "@types/react-redux": "7.1.7",
-    "@types/react-splitter-layout": "3.0.1",
    "@types/sanitize-html": "1.27.2",
    "@types/sinon": "2.3.3",
    "@types/styled-components": "5.1.1",
    "@types/underscore": "1.7.36",
    "@typescript-eslint/eslint-plugin": "4.22.0",
    "@typescript-eslint/parser": "4.22.0",
-    "@webpack-cli/serve": "1.5.2",
    "babel-jest": "24.9.0",
    "babel-loader": "8.1.0",
    "buffer": "5.1.0",
@@ -154,45 +150,44 @@
    "html-inline-css-webpack-plugin": "1.11.0",
    "html-loader": "0.5.5",
    "html-loader-jest": "0.2.1",
-    "html-webpack-plugin": "5.3.2",
-    "jest": "26.6.3",
-    "jest-canvas-mock": "2.3.1",
+    "html-webpack-plugin": "4.5.2",
+    "jest": "25.5.4",
+    "jest-canvas-mock": "2.1.0",
    "jest-playwright-preset": "1.5.1",
    "jest-trx-results-processor": "0.0.7",
    "less": "3.8.1",
    "less-loader": "4.1.0",
    "less-vars-loader": "1.1.0",
-    "mini-css-extract-plugin": "2.1.0",
-    "monaco-editor-webpack-plugin": "1.7.0",
+    "mini-css-extract-plugin": "0.4.3",
+    "monaco-editor-webpack-plugin": "3.1.0",
    "node-fetch": "2.6.1",
-    "playwright": "1.13.0",
+    "playwright": "1.10.0",
    "prettier": "2.2.1",
-    "process": "0.11.10",
    "raw-loader": "0.5.1",
    "react-dev-utils": "11.0.4",
    "rimraf": "3.0.0",
    "sinon": "3.2.1",
    "style-loader": "0.23.0",
-    "ts-loader": "9.2.4",
+    "ts-loader": "6.2.2",
    "tslint": "5.11.0",
    "tslint-microsoft-contrib": "6.0.0",
    "typedoc": "0.20.36",
-    "typescript": "4.3.4",
+    "typescript": "4.2.4",
    "url-loader": "1.1.1",
    "wait-on": "4.0.2",
-    "webpack": "5.47.0",
-    "webpack-bundle-analyzer": "4.4.2",
-    "webpack-cli": "4.7.2",
-    "webpack-dev-server": "3.11.2"
+    "webpack": "4.46.0",
+    "webpack-bundle-analyzer": "3.6.1",
+    "webpack-cli": "3.3.10",
+    "webpack-dev-server": "3.11.0"
  },
  "scripts": {
-    "start": "webpack serve --mode development",
+    "start": "node --max-old-space-size=10196 node_modules/webpack-dev-server/bin/webpack-dev-server.js",
    "dev": "echo \"WARNING: npm run dev has been deprecated\" && npm run build",
    "build:dataExplorer:ci": "npm run build:ci",
    "build": "npm run format:check && npm run lint && npm run compile && npm run compile:strict && npm run pack:prod && npm run copyToConsumers",
    "build:ci": "npm run format:check && npm run lint && npm run compile && npm run compile:strict && npm run pack:fast",
-    "pack:prod": "webpack  --mode production",
-    "pack:fast": "webpack  --mode development --progress",
+    "pack:prod": "node --max_old_space_size=10196 ./node_modules/webpack/bin/webpack.js  --mode production",
+    "pack:fast": "node --max_old_space_size=10196 ./node_modules/webpack/bin/webpack.js  --mode development --progress",
    "copyToConsumers": "node copyToConsumers",
    "test": "rimraf coverage && jest",
    "test:e2e": "jest -c ./jest.config.playwright.js --detectOpenHandles",
--- a/src/Common/CollapsedResourceTree.tsx
+++ b/src/Common/CollapsedResourceTree.tsx
@@ -1,7 +1,6 @@
-import React, { FunctionComponent, MutableRefObject, useEffect, useRef } from "react";
+import React, { FunctionComponent } from "react";
 import arrowLeftImg from "../../images/imgarrowlefticon.svg";
 import { userContext } from "../UserContext";
-import { NormalizedEventKey } from "./Constants";

 export interface CollapsedResourceTreeProps {
  toggleLeftPaneExpanded: () => void;
@@ -12,21 +11,6 @@ export const CollapsedResourceTree: FunctionComponent<CollapsedResourceTreeProps
  toggleLeftPaneExpanded,
  isLeftPaneExpanded,
 }: CollapsedResourceTreeProps): JSX.Element => {
-  const focusButton = useRef<HTMLLIElement>() as MutableRefObject<HTMLLIElement>;
-
-  useEffect(() => {
-    if (focusButton.current) {
-      focusButton.current.focus();
-    }
-  });
-
-  const onKeyPressToggleLeftPaneExpanded = (event: React.KeyboardEvent) => {
-    if (event.key === NormalizedEventKey.Space || event.key === NormalizedEventKey.Enter) {
-      toggleLeftPaneExpanded();
-      event.stopPropagation();
-    }
-  };
-
  return (
    <div id="mini" className={!isLeftPaneExpanded ? "mini toggle-mini" : "hiddenMain"}>
      <div className="main-nav nav">
@@ -37,14 +21,11 @@ export const CollapsedResourceTree: FunctionComponent<CollapsedResourceTreeProps
            role="button"
            tabIndex={0}
            aria-label="Expand Tree"
-            onClick={toggleLeftPaneExpanded}
-            onKeyPress={onKeyPressToggleLeftPaneExpanded}
-            ref={focusButton}
          >
-            <span className="leftarrowCollapsed">
+            <span className="leftarrowCollapsed" onClick={toggleLeftPaneExpanded}>
              <img className="arrowCollapsed" src={arrowLeftImg} alt="Expand" />
            </span>
-            <span className="collectionCollapsed">
+            <span className="collectionCollapsed" onClick={toggleLeftPaneExpanded}>
              <span>{userContext.apiType} API</span>
            </span>
          </li>
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -94,9 +94,7 @@ export class Flights {
  public static readonly MongoIndexEditor = "mongoindexeditor";
  public static readonly MongoIndexing = "mongoindexing";
  public static readonly AutoscaleTest = "autoscaletest";
-  public static readonly PartitionKeyTest = "partitionkeytest";
-  public static readonly PKPartitionKeyTest = "pkpartitionkeytest";
-  public static readonly Phoenix = "phoenix";
+  public static readonly SchemaAnalyzer = "schemaanalyzer";
 }

 export class AfecFeatures {
@@ -160,6 +158,16 @@ export class DocumentsGridMetrics {
  public static DocumentEditorMaxWidthRatio: number = 0.4;
 }

+export class ExplorerMetrics {
+  public static SplitterMinWidth: number = 240;
+  public static SplitterMaxWidth: number = 400;
+  public static CollapsedResourceTreeWidth: number = 36;
+}
+
+export class SplitterMetrics {
+  public static CollapsedPositionLeft: number = ExplorerMetrics.CollapsedResourceTreeWidth;
+}
+
 export class Areas {
  public static ResourceTree: string = "Resource Tree";
  public static ContextualPane: string = "Contextual Pane";
@@ -338,14 +346,6 @@ export enum ConflictOperationType {
  Delete = "delete",
 }

-export enum ConnectionStatusType {
-  Connect = "Connect",
-  Connecting = "Connecting",
-  Connected = "Connected",
-  Failed = "Connection Failed",
-  ReConnect = "Reconnect",
-}
-
 export const EmulatorMasterKey =
  //[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")]
  "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
@@ -355,32 +355,10 @@ export const StyleConstants = require("less-vars-loader!../../less/Common/Consta

 export class Notebook {
  public static readonly defaultBasePath = "./notebooks";
-  public static readonly heartbeatDelayMs = 60000;
+  public static readonly heartbeatDelayMs = 5000;
  public static readonly kernelRestartInitialDelayMs = 1000;
  public static readonly kernelRestartMaxDelayMs = 20000;
  public static readonly autoSaveIntervalMs = 120000;
-  public static readonly memoryGuageToGB = 1048576;
-  public static readonly temporarilyDownMsg = "Notebooks is currently not available. We are working on it.";
-  public static readonly mongoShellTemporarilyDownMsg =
-    "We have identified an issue with the Mongo Shell and it is unavailable right now. We are actively working on the mitigation.";
-  public static readonly cassandraShellTemporarilyDownMsg =
-    "We have identified an issue with the Cassandra Shell and it is unavailable right now. We are actively working on the mitigation.";
-  public static saveNotebookModalTitle = "Save Notebook in temporary workspace";
-  public static saveNotebookModalContent =
-    "This notebook will be saved in the temporary workspace and will be removed when the session expires. To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends.";
-  public static newNotebookModalTitle = "Create Notebook in temporary workspace";
-  public static newNotebookUploadModalTitle = "Upload Notebook in temporary workspace";
-  public static newNotebookModalContent1 =
-    "A temporary workspace will be created to enable you to work with notebooks. When the session expires, any notebooks in the workspace will be removed.";
-  public static newNotebookModalContent2 =
-    "To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends. ";
-  public static galleryNotebookDownloadContent1 =
-    "To download, run, and make changes to this sample notebook, a temporary workspace will be created. When the session expires, any notebooks in the workspace will be removed.";
-  public static galleryNotebookDownloadContent2 =
-    "To save your work permanently, save your notebooks to a GitHub repository or download the Notebooks to your local machine before the session ends. ";
-  public static cosmosNotebookHomePageUrl = "https://aka.ms/cosmos-notebooks-limits";
-  public static cosmosNotebookGitDocumentationUrl = "https://aka.ms/cosmos-notebooks-github";
-  public static learnMore = "Learn more.";
 }

 export class SparkLibrary {
--- a/src/Common/HeadersUtility.test.ts
+++ b/src/Common/HeadersUtility.test.ts
@@ -1,6 +1,6 @@
-import * as ExplorerSettings from "../Shared/ExplorerSettings";
-import { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility";
 import * as HeadersUtility from "./HeadersUtility";
+import { ExplorerSettings } from "../Shared/ExplorerSettings";
+import { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility";

 describe("Headers Utility", () => {
  describe("shouldEnableCrossPartitionKeyForResourceWithPartitionKey()", () => {
--- a/src/Common/MongoProxyClient.test.ts
+++ b/src/Common/MongoProxyClient.test.ts
@@ -3,16 +3,9 @@ import { resetConfigContext, updateConfigContext } from "../ConfigContext";
 import { DatabaseAccount } from "../Contracts/DataModels";
 import { Collection } from "../Contracts/ViewModels";
 import DocumentId from "../Explorer/Tree/DocumentId";
-import { extractFeatures } from "../Platform/Hosted/extractFeatures";
 import { updateUserContext } from "../UserContext";
-import {
-  deleteDocument,
-  getEndpoint,
-  getFeatureEndpointOrDefault,
-  queryDocuments,
-  readDocument,
-  updateDocument,
-} from "./MongoProxyClient";
+import { deleteDocument, getEndpoint, queryDocuments, readDocument, updateDocument } from "./MongoProxyClient";
+jest.mock("../ResourceProvider/ResourceProviderClient.ts");

 const databaseId = "testDB";

@@ -254,31 +247,4 @@ describe("MongoProxyClient", () => {
      expect(endpoint).toEqual("https://main.documentdb.ext.azure.com/api/guest/mongo/explorer");
    });
  });
-  describe("getFeatureEndpointOrDefault", () => {
-    beforeEach(() => {
-      resetConfigContext();
-      updateConfigContext({
-        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
-      });
-      const params = new URLSearchParams({
-        "feature.mongoProxyEndpoint": "https://localhost:12901",
-        "feature.mongoProxyAPIs": "readDocument|createDocument",
-      });
-      const features = extractFeatures(params);
-      updateUserContext({
-        authType: AuthType.AAD,
-        features: features,
-      });
-    });
-
-    it("returns a local endpoint", () => {
-      const endpoint = getFeatureEndpointOrDefault("readDocument");
-      expect(endpoint).toEqual("https://localhost:12901/api/mongo/explorer");
-    });
-
-    it("returns a production endpoint", () => {
-      const endpoint = getFeatureEndpointOrDefault("deleteDocument");
-      expect(endpoint).toEqual("https://main.documentdb.ext.azure.com/api/mongo/explorer");
-    });
-  });
 });
--- a/src/Common/MongoProxyClient.ts
+++ b/src/Common/MongoProxyClient.ts
@@ -6,7 +6,6 @@ import * as DataModels from "../Contracts/DataModels";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { Collection } from "../Contracts/ViewModels";
 import DocumentId from "../Explorer/Tree/DocumentId";
-import { hasFlag } from "../Platform/Hosted/extractFeatures";
 import { userContext } from "../UserContext";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
 import { ApiType, HttpHeaders, HttpStatusCodes } from "./Constants";
@@ -79,7 +78,7 @@ export function queryDocuments(
        : "",
  };

-  const endpoint = getFeatureEndpointOrDefault("resourcelist") || "";
+  const endpoint = getEndpoint() || "";

  const headers = {
    ...defaultHeaders,
@@ -112,7 +111,7 @@ export function queryDocuments(
          headers: response.headers,
        };
      }
-      await errorHandling(response, "querying documents", params);
+      errorHandling(response, "querying documents", params);
      return undefined;
    });
 }
@@ -142,8 +141,7 @@ export function readDocument(
        : "",
  };

-  const endpoint = getFeatureEndpointOrDefault("readDocument");
-
+  const endpoint = getEndpoint();
  return window
    .fetch(`${endpoint}?${queryString.stringify(params)}`, {
      method: "GET",
@@ -155,11 +153,11 @@ export function readDocument(
        ),
      },
    })
-    .then(async (response) => {
+    .then((response) => {
      if (response.ok) {
        return response.json();
      }
-      return await errorHandling(response, "reading document", params);
+      return errorHandling(response, "reading document", params);
    });
 }

@@ -183,7 +181,7 @@ export function createDocument(
    pk: collection && collection.partitionKey && !collection.partitionKey.systemKey ? partitionKeyProperty : "",
  };

-  const endpoint = getFeatureEndpointOrDefault("createDocument");
+  const endpoint = getEndpoint();

  return window
    .fetch(`${endpoint}/resourcelist?${queryString.stringify(params)}`, {
@@ -194,11 +192,11 @@ export function createDocument(
        ...authHeaders(),
      },
    })
-    .then(async (response) => {
+    .then((response) => {
      if (response.ok) {
        return response.json();
      }
-      return await errorHandling(response, "creating document", params);
+      return errorHandling(response, "creating document", params);
    });
 }

@@ -227,7 +225,7 @@ export function updateDocument(
        ? documentId.partitionKeyProperty
        : "",
  };
-  const endpoint = getFeatureEndpointOrDefault("updateDocument");
+  const endpoint = getEndpoint();

  return window
    .fetch(`${endpoint}?${queryString.stringify(params)}`, {
@@ -240,11 +238,11 @@ export function updateDocument(
        [CosmosSDKConstants.HttpHeaders.PartitionKey]: JSON.stringify(documentId.partitionKeyHeader()),
      },
    })
-    .then(async (response) => {
+    .then((response) => {
      if (response.ok) {
        return response.json();
      }
-      return await errorHandling(response, "updating document", params);
+      return errorHandling(response, "updating document", params);
    });
 }

@@ -268,7 +266,7 @@ export function deleteDocument(databaseId: string, collection: Collection, docum
        ? documentId.partitionKeyProperty
        : "",
  };
-  const endpoint = getFeatureEndpointOrDefault("deleteDocument");
+  const endpoint = getEndpoint();

  return window
    .fetch(`${endpoint}?${queryString.stringify(params)}`, {
@@ -280,11 +278,11 @@ export function deleteDocument(databaseId: string, collection: Collection, docum
        [CosmosSDKConstants.HttpHeaders.PartitionKey]: JSON.stringify(documentId.partitionKeyHeader()),
      },
    })
-    .then(async (response) => {
+    .then((response) => {
      if (response.ok) {
        return undefined;
      }
-      return await errorHandling(response, "deleting document", params);
+      return errorHandling(response, "deleting document", params);
    });
 }

@@ -311,7 +309,7 @@ export function createMongoCollectionWithProxy(
    autoPilotThroughput: params.autoPilotMaxThroughput?.toString(),
  };

-  const endpoint = getFeatureEndpointOrDefault("createCollectionWithProxy");
+  const endpoint = getEndpoint();

  return window
    .fetch(
@@ -327,23 +325,16 @@ export function createMongoCollectionWithProxy(
        },
      }
    )
-    .then(async (response) => {
+    .then((response) => {
      if (response.ok) {
        return response.json();
      }
-      return await errorHandling(response, "creating collection", mongoParams);
+      return errorHandling(response, "creating collection", mongoParams);
    });
 }

-export function getFeatureEndpointOrDefault(feature: string): string {
-  return hasFlag(userContext.features.mongoProxyAPIs, feature)
-    ? getEndpoint(userContext.features.mongoProxyEndpoint)
-    : getEndpoint();
-}
-
-export function getEndpoint(customEndpoint?: string): string {
-  let url = customEndpoint ? customEndpoint : configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT;
-  url += "/api/mongo/explorer";
+export function getEndpoint(): string {
+  let url = (configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT) + "/api/mongo/explorer";

  if (userContext.authType === AuthType.EncryptedToken) {
    url = url.replace("api/mongo", "api/guest/mongo");
--- a/src/Common/QueriesClient.ts
+++ b/src/Common/QueriesClient.ts
@@ -1,17 +1,19 @@
+import { ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import * as _ from "underscore";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import Explorer from "../Explorer/Explorer";
 import DocumentsTab from "../Explorer/Tabs/DocumentsTab";
 import DocumentId from "../Explorer/Tree/DocumentId";
-import { useDatabases } from "../Explorer/useDatabases";
 import { userContext } from "../UserContext";
 import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
+import * as QueryUtils from "../Utils/QueryUtils";
 import { BackendDefaults, HttpStatusCodes, SavedQueries } from "./Constants";
 import { createCollection } from "./dataAccess/createCollection";
 import { createDocument } from "./dataAccess/createDocument";
 import { deleteDocument } from "./dataAccess/deleteDocument";
 import { queryDocuments } from "./dataAccess/queryDocuments";
+import { queryDocumentsPage } from "./dataAccess/queryDocumentsPage";
 import { handleError } from "./ErrorHandlingUtils";

 export class QueriesClient {
@@ -98,35 +100,45 @@ export class QueriesClient {

    const options: any = { enableCrossPartitionQuery: true };
    const clearMessage = NotificationConsoleUtils.logConsoleProgress("Fetching saved queries");
-    const results = await queryDocuments(
+    const queryIterator: QueryIterator<ItemDefinition & Resource> = queryDocuments(
      SavedQueries.DatabaseName,
      SavedQueries.CollectionName,
      this.fetchQueriesQuery(),
      options
-    ).fetchAll();
-
-    let queries: DataModels.Query[] = _.map(results.resources, (document: DataModels.Query) => {
-      if (!document) {
-        return undefined;
-      }
-      const { id, resourceId, query, queryName } = document;
-      const parsedQuery: DataModels.Query = {
-        resourceId: resourceId,
-        queryName: queryName,
-        query: query,
-        id: id,
-      };
-      try {
-        this.validateQuery(parsedQuery);
-        return parsedQuery;
-      } catch (error) {
-        return undefined;
-      }
-    });
-    queries = _.reject(queries, (parsedQuery: DataModels.Query) => !parsedQuery);
-    NotificationConsoleUtils.logConsoleInfo("Successfully fetched saved queries");
-    clearMessage();
-    return queries;
+    );
+    const fetchQueries = async (firstItemIndex: number): Promise<ViewModels.QueryResults> =>
+      await queryDocumentsPage(queriesCollection.id(), queryIterator, firstItemIndex);
+    return QueryUtils.queryAllPages(fetchQueries)
+      .then(
+        (results: ViewModels.QueryResults) => {
+          let queries: DataModels.Query[] = _.map(results.documents, (document: DataModels.Query) => {
+            if (!document) {
+              return undefined;
+            }
+            const { id, resourceId, query, queryName } = document;
+            const parsedQuery: DataModels.Query = {
+              resourceId: resourceId,
+              queryName: queryName,
+              query: query,
+              id: id,
+            };
+            try {
+              this.validateQuery(parsedQuery);
+              return parsedQuery;
+            } catch (error) {
+              return undefined;
+            }
+          });
+          queries = _.reject(queries, (parsedQuery: DataModels.Query) => !parsedQuery);
+          NotificationConsoleUtils.logConsoleInfo("Successfully fetched saved queries");
+          return Promise.resolve(queries);
+        },
+        (error: any) => {
+          handleError(error, "getSavedQueries", "Failed to fetch saved queries");
+          return Promise.reject(error);
+        }
+      )
+      .finally(() => clearMessage());
  }

  public async deleteQuery(query: DataModels.Query): Promise<void> {
@@ -177,7 +189,7 @@ export class QueriesClient {

  private findQueriesCollection(): ViewModels.Collection {
    const queriesDatabase: ViewModels.Database = _.find(
-      useDatabases.getState().databases,
+      this.container.databases(),
      (database: ViewModels.Database) => database.id() === SavedQueries.DatabaseName
    );
    if (!queriesDatabase) {
--- a/src/Common/ResourceTreeContainer.tsx
+++ b/src/Common/ResourceTreeContainer.tsx
@@ -1,40 +1,18 @@
-import React, { FunctionComponent, MutableRefObject, useEffect, useRef } from "react";
+import React, { FunctionComponent } from "react";
 import arrowLeftImg from "../../images/imgarrowlefticon.svg";
 import refreshImg from "../../images/refresh-cosmos.svg";
 import { AuthType } from "../AuthType";
-import Explorer from "../Explorer/Explorer";
-import { ResourceTokenTree } from "../Explorer/Tree/ResourceTokenTree";
-import { ResourceTree } from "../Explorer/Tree/ResourceTree";
 import { userContext } from "../UserContext";
-import { NormalizedEventKey } from "./Constants";

-export interface ResourceTreeContainerProps {
+export interface ResourceTreeProps {
  toggleLeftPaneExpanded: () => void;
  isLeftPaneExpanded: boolean;
-  container: Explorer;
 }

-export const ResourceTreeContainer: FunctionComponent<ResourceTreeContainerProps> = ({
+export const ResourceTree: FunctionComponent<ResourceTreeProps> = ({
  toggleLeftPaneExpanded,
  isLeftPaneExpanded,
-  container,
-}: ResourceTreeContainerProps): JSX.Element => {
-  const focusButton = useRef<HTMLLIElement>() as MutableRefObject<HTMLLIElement>;
-
-  useEffect(() => {
-    if (isLeftPaneExpanded) {
-      if (focusButton.current) {
-        focusButton.current.focus();
-      }
-    }
-  });
-
-  const onKeyPressToggleLeftPaneExpanded = (event: React.KeyboardEvent) => {
-    if (event.key === NormalizedEventKey.Space || event.key === NormalizedEventKey.Enter) {
-      toggleLeftPaneExpanded();
-      event.stopPropagation();
-    }
-  };
+}: ResourceTreeProps): JSX.Element => {
  return (
    <div id="main" className={isLeftPaneExpanded ? "main" : "hiddenMain"}>
      {/* Collections Window - - Start */}
@@ -60,11 +38,9 @@ export const ResourceTreeContainer: FunctionComponent<ResourceTreeContainerProps
                id="expandToggleLeftPaneButton"
                role="button"
                onClick={toggleLeftPaneExpanded}
-                onKeyPress={onKeyPressToggleLeftPaneExpanded}
                tabIndex={0}
                aria-label="Collapse Tree"
                title="Collapse Tree"
-                ref={focusButton}
              >
                <img className="refreshcol1" src={arrowLeftImg} alt="Hide" />
              </span>
@@ -72,11 +48,9 @@ export const ResourceTreeContainer: FunctionComponent<ResourceTreeContainerProps
          </div>
        </div>
        {userContext.authType === AuthType.ResourceToken ? (
-          <ResourceTokenTree />
-        ) : userContext.features.enableKoResourceTree ? (
-          <div style={{ overflowY: "auto" }} data-bind="react:resourceTree" />
+          <div style={{ overflowY: "auto" }} data-bind="react:resourceTreeForResourceToken" />
        ) : (
-          <ResourceTree container={container} />
+          <div style={{ overflowY: "auto" }} data-bind="react:resourceTree" />
        )}
      </div>
      {/*  Collections Window - End */}
--- a/src/Common/Splitter.ts
+++ b/src/Common/Splitter.ts
@@ -1,3 +1,7 @@
+import * as ko from "knockout";
+
+import { SplitterMetrics } from "./Constants";
+
 export enum SplitterDirection {
  Horizontal = "horizontal",
  Vertical = "vertical",
@@ -24,12 +28,14 @@ export class Splitter {
  public lastX!: number;
  public lastWidth!: number;

+  private isCollapsed: ko.Observable<boolean>;
  private bounds: SplitterBounds;
  private direction: SplitterDirection;

  constructor(options: SplitterOptions) {
    this.splitterId = options.splitterId;
    this.leftSideId = options.leftId;
+    this.isCollapsed = ko.observable<boolean>(false);
    this.bounds = options.bounds;
    this.direction = options.direction;
    this.initialize();
@@ -77,4 +83,23 @@ export class Splitter {
  };

  private onResizeStop: JQueryUI.ResizableEvent = () => $("iframe").css("pointer-events", "auto");
+
+  public collapseLeft() {
+    this.lastX = $(this.splitter).position().left;
+    this.lastWidth = $(this.leftSide).width();
+    $(this.splitter).css("left", SplitterMetrics.CollapsedPositionLeft);
+    $(this.leftSide).css("width", "");
+    $(this.leftSide).resizable("option", "disabled", true).removeClass("ui-resizable-disabled"); // remove class so splitter is visible
+    $(this.splitter).removeClass("ui-resizable-e");
+    this.isCollapsed(true);
+  }
+
+  public expandLeft() {
+    $(this.splitter).addClass("ui-resizable-e");
+    $(this.leftSide).css("width", this.lastWidth);
+    $(this.splitter).css("left", this.lastX);
+    $(this.splitter).css("left", ""); // this ensures the splitter's position is not fixed and enables movement during resizing
+    $(this.leftSide).resizable("enable");
+    this.isCollapsed(false);
+  }
 }
--- a/src/Common/Tooltip/InfoTooltip.tsx
+++ b/src/Common/Tooltip/InfoTooltip.tsx
@@ -9,7 +9,7 @@ export const InfoTooltip: React.FunctionComponent<TooltipProps> = ({ children }:
  return (
    <span>
      <TooltipHost content={children}>
-        <Icon iconName="Info" ariaLabel="Info" className="panelInfoIcon" tabIndex={0} />
+        <Icon iconName="Info" ariaLabel="Info" className="panelInfoIcon" />
      </TooltipHost>
    </span>
  );
--- a/src/Common/dataAccess/createCollection.test.ts
+++ b/src/Common/dataAccess/createCollection.test.ts
@@ -1,10 +1,7 @@
 jest.mock("../../Utils/arm/request");
 jest.mock("../CosmosClient");
-import ko from "knockout";
 import { AuthType } from "../../AuthType";
 import { CreateCollectionParams, DatabaseAccount } from "../../Contracts/DataModels";
-import { Database } from "../../Contracts/ViewModels";
-import { useDatabases } from "../../Explorer/useDatabases";
 import { updateUserContext } from "../../UserContext";
 import { armRequest } from "../../Utils/arm/request";
 import { client } from "../CosmosClient";
@@ -26,15 +23,6 @@ describe("createCollection", () => {
      } as DatabaseAccount,
      apiType: "SQL",
    });
-    useDatabases.setState({
-      databases: [
-        {
-          id: ko.observable("testDatabase"),
-          loadCollections: () => undefined,
-          collections: ko.observableArray([]),
-        } as Database,
-      ],
-    });
  });

  it("should call ARM if logged in with AAD", async () => {
--- a/src/Common/dataAccess/createCollection.ts
+++ b/src/Common/dataAccess/createCollection.ts
@@ -4,16 +4,20 @@ import { ContainerRequest } from "@azure/cosmos/dist-esm/client/Container/Contai
 import { DatabaseRequest } from "@azure/cosmos/dist-esm/client/Database/DatabaseRequest";
 import { AuthType } from "../../AuthType";
 import * as DataModels from "../../Contracts/DataModels";
-import { useDatabases } from "../../Explorer/useDatabases";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../UserContext";
-import { getCollectionName } from "../../Utils/APITypeUtils";
-import { createUpdateCassandraTable } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
-import { createUpdateGremlinGraph } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
-import { createUpdateMongoDBCollection } from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
-import { createUpdateSqlContainer } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
-import { createUpdateTable } from "../../Utils/arm/generatedClients/cosmos/tableResources";
+import {
+  createUpdateCassandraTable,
+  getCassandraTable,
+} from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
+import { createUpdateGremlinGraph, getGremlinGraph } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
+import {
+  createUpdateMongoDBCollection,
+  getMongoDBCollection,
+} from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
+import { createUpdateSqlContainer, getSqlContainer } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
+import { createUpdateTable, getTable } from "../../Utils/arm/generatedClients/cosmos/tableResources";
 import * as ARMTypes from "../../Utils/arm/generatedClients/cosmos/types";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
@@ -55,16 +59,6 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
 };

 const createCollectionWithARM = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
-  if (!params.createNewDatabase) {
-    const isValid = await useDatabases.getState().validateCollectionId(params.databaseId, params.collectionId);
-    if (!isValid) {
-      const collectionName = getCollectionName().toLocaleLowerCase();
-      throw new Error(
-        `Create ${collectionName} failed: ${collectionName} with id ${params.collectionId} already exists`
-      );
-    }
-  }
-
  const { apiType } = userContext;
  switch (apiType) {
    case "SQL":
@@ -83,6 +77,23 @@ const createCollectionWithARM = async (params: DataModels.CreateCollectionParams
 };

 const createSqlContainer = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
+  try {
+    const getResponse = await getSqlContainer(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
+      userContext.databaseAccount.name,
+      params.databaseId,
+      params.collectionId
+    );
+    if (getResponse?.properties?.resource) {
+      throw new Error(`Create container failed: container with id ${params.collectionId} already exists`);
+    }
+  } catch (error) {
+    if (error.code !== "NotFound") {
+      throw error;
+    }
+  }
+
  const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
  const resource: ARMTypes.SqlContainerResource = {
    id: params.collectionId,
@@ -120,6 +131,23 @@ const createSqlContainer = async (params: DataModels.CreateCollectionParams): Pr

 const createMongoCollection = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
  const mongoWildcardIndexOnAllFields: ARMTypes.MongoIndex[] = [{ key: { keys: ["$**"] } }, { key: { keys: ["_id"] } }];
+  try {
+    const getResponse = await getMongoDBCollection(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
+      userContext.databaseAccount.name,
+      params.databaseId,
+      params.collectionId
+    );
+    if (getResponse?.properties?.resource) {
+      throw new Error(`Create collection failed: collection with id ${params.collectionId} already exists`);
+    }
+  } catch (error) {
+    if (error.code !== "NotFound") {
+      throw error;
+    }
+  }
+
  const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
  const resource: ARMTypes.MongoDBCollectionResource = {
    id: params.collectionId,
@@ -161,6 +189,23 @@ const createMongoCollection = async (params: DataModels.CreateCollectionParams):
 };

 const createCassandraTable = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
+  try {
+    const getResponse = await getCassandraTable(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
+      userContext.databaseAccount.name,
+      params.databaseId,
+      params.collectionId
+    );
+    if (getResponse?.properties?.resource) {
+      throw new Error(`Create table failed: table with id ${params.collectionId} already exists`);
+    }
+  } catch (error) {
+    if (error.code !== "NotFound") {
+      throw error;
+    }
+  }
+
  const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
  const resource: ARMTypes.CassandraTableResource = {
    id: params.collectionId,
@@ -188,6 +233,23 @@ const createCassandraTable = async (params: DataModels.CreateCollectionParams):
 };

 const createGraph = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
+  try {
+    const getResponse = await getGremlinGraph(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
+      userContext.databaseAccount.name,
+      params.databaseId,
+      params.collectionId
+    );
+    if (getResponse?.properties?.resource) {
+      throw new Error(`Create graph failed: graph with id ${params.collectionId} already exists`);
+    }
+  } catch (error) {
+    if (error.code !== "NotFound") {
+      throw error;
+    }
+  }
+
  const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
  const resource: ARMTypes.GremlinGraphResource = {
    id: params.collectionId,
@@ -222,6 +284,22 @@ const createGraph = async (params: DataModels.CreateCollectionParams): Promise<D
 };

 const createTable = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
+  try {
+    const getResponse = await getTable(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
+      userContext.databaseAccount.name,
+      params.collectionId
+    );
+    if (getResponse?.properties?.resource) {
+      throw new Error(`Create table failed: table with id ${params.collectionId} already exists`);
+    }
+  } catch (error) {
+    if (error.code !== "NotFound") {
+      throw error;
+    }
+  }
+
  const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
  const resource: ARMTypes.TableResource = {
    id: params.collectionId,
--- a/src/Common/dataAccess/createDatabase.ts
+++ b/src/Common/dataAccess/createDatabase.ts
@@ -2,13 +2,20 @@ import { DatabaseResponse } from "@azure/cosmos";
 import { DatabaseRequest } from "@azure/cosmos/dist-esm/client/Database/DatabaseRequest";
 import { AuthType } from "../../AuthType";
 import * as DataModels from "../../Contracts/DataModels";
-import { useDatabases } from "../../Explorer/useDatabases";
 import { userContext } from "../../UserContext";
-import { getDatabaseName } from "../../Utils/APITypeUtils";
-import { createUpdateCassandraKeyspace } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
-import { createUpdateGremlinDatabase } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
-import { createUpdateMongoDBDatabase } from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
-import { createUpdateSqlDatabase } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
+import {
+  createUpdateCassandraKeyspace,
+  getCassandraKeyspace,
+} from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
+import {
+  createUpdateGremlinDatabase,
+  getGremlinDatabase,
+} from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
+import {
+  createUpdateMongoDBDatabase,
+  getMongoDBDatabase,
+} from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
+import { createUpdateSqlDatabase, getSqlDatabase } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
 import {
  CassandraKeyspaceCreateUpdateParameters,
  CreateUpdateOptions,
@@ -41,11 +48,6 @@ export async function createDatabase(params: DataModels.CreateDatabaseParams): P
 }

 async function createDatabaseWithARM(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
-  if (!useDatabases.getState().validateDatabaseId(params.databaseId)) {
-    const databaseName = getDatabaseName().toLocaleLowerCase();
-    throw new Error(`Create ${databaseName} failed: ${databaseName} with id ${params.databaseId} already exists`);
-  }
-
  const { apiType } = userContext;

  switch (apiType) {
@@ -63,6 +65,22 @@ async function createDatabaseWithARM(params: DataModels.CreateDatabaseParams): P
 }

 async function createSqlDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
+  try {
+    const getResponse = await getSqlDatabase(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
+      userContext.databaseAccount.name,
+      params.databaseId
+    );
+    if (getResponse?.properties?.resource) {
+      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
+    }
+  } catch (error) {
+    if (error.code !== "NotFound") {
+      throw error;
+    }
+  }
+
  const options: CreateUpdateOptions = constructRpOptions(params);
  const rpPayload: SqlDatabaseCreateUpdateParameters = {
    properties: {
@@ -83,6 +101,22 @@ async function createSqlDatabase(params: DataModels.CreateDatabaseParams): Promi
 }

 async function createMongoDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
+  try {
+    const getResponse = await getMongoDBDatabase(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
+      userContext.databaseAccount.name,
+      params.databaseId
+    );
+    if (getResponse?.properties?.resource) {
+      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
+    }
+  } catch (error) {
+    if (error.code !== "NotFound") {
+      throw error;
+    }
+  }
+
  const options: CreateUpdateOptions = constructRpOptions(params);
  const rpPayload: MongoDBDatabaseCreateUpdateParameters = {
    properties: {
@@ -103,6 +137,22 @@ async function createMongoDatabase(params: DataModels.CreateDatabaseParams): Pro
 }

 async function createCassandraKeyspace(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
+  try {
+    const getResponse = await getCassandraKeyspace(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
+      userContext.databaseAccount.name,
+      params.databaseId
+    );
+    if (getResponse?.properties?.resource) {
+      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
+    }
+  } catch (error) {
+    if (error.code !== "NotFound") {
+      throw error;
+    }
+  }
+
  const options: CreateUpdateOptions = constructRpOptions(params);
  const rpPayload: CassandraKeyspaceCreateUpdateParameters = {
    properties: {
@@ -123,6 +173,22 @@ async function createCassandraKeyspace(params: DataModels.CreateDatabaseParams):
 }

 async function createGremlineDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
+  try {
+    const getResponse = await getGremlinDatabase(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
+      userContext.databaseAccount.name,
+      params.databaseId
+    );
+    if (getResponse?.properties?.resource) {
+      throw new Error(`Create database failed: database with id ${params.databaseId} already exists`);
+    }
+  } catch (error) {
+    if (error.code !== "NotFound") {
+      throw error;
+    }
+  }
+
  const options: CreateUpdateOptions = constructRpOptions(params);
  const rpPayload: GremlinDatabaseCreateUpdateParameters = {
    properties: {
--- a/src/ConfigContext.ts
+++ b/src/ConfigContext.ts
@@ -27,6 +27,7 @@ export interface ConfigContext {
  hostedExplorerURL: string;
  armAPIVersion?: string;
  allowedJunoOrigins: string[];
+  enableSchemaAnalyzer: boolean;
  msalRedirectURI?: string;
 }

@@ -62,6 +63,7 @@ let configContext: Readonly<ConfigContext> = {
    "https://tools-staging.cosmos.azure.com",
    "https://localhost",
  ],
+  enableSchemaAnalyzer: false,
 };

 export function resetConfigContext(): void {
@@ -118,14 +120,6 @@ export async function initializeConfiguration(): Promise<ConfigContext> {
      const armAPIVersion = params.get("armAPIVersion") || "";
      updateConfigContext({ armAPIVersion });
    }
-    if (params.has("armEndpoint")) {
-      const ARM_ENDPOINT = params.get("armEndpoint") || "";
-      updateConfigContext({ ARM_ENDPOINT });
-    }
-    if (params.has("aadEndpoint")) {
-      const AAD_ENDPOINT = params.get("aadEndpoint") || "";
-      updateConfigContext({ AAD_ENDPOINT });
-    }
    if (params.has("platform")) {
      const platform = params.get("platform");
      switch (platform) {
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -1,5 +1,3 @@
-import { ConnectionStatusType } from "../Common/Constants";
-
 export interface DatabaseAccount {
  id: string;
  name: string;
@@ -11,7 +9,6 @@ export interface DatabaseAccount {

 export interface DatabaseAccountExtendedProperties {
  documentEndpoint?: string;
-  disableLocalAuth?: boolean;
  tableEndpoint?: string;
  gremlinEndpoint?: string;
  cassandraEndpoint?: string;
@@ -498,8 +495,3 @@ export interface MemoryUsageInfo {
  freeKB: number;
  totalKB: number;
 }
-
-export interface ContainerConnectionInfo {
-  status: ConnectionStatusType;
-  //need to add ram and rom info
-}
--- a/src/Contracts/ViewModels.ts
+++ b/src/Contracts/ViewModels.ts
@@ -5,8 +5,9 @@ import {
  TriggerDefinition,
  UserDefinedFunctionDefinition,
 } from "@azure/cosmos";
+import { CommandButtonComponentProps } from "../Explorer/Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../Explorer/Explorer";
-import { ConsoleData } from "../Explorer/Menus/NotificationConsole/ConsoleData";
+import { ConsoleData } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
 import { CassandraTableKey, CassandraTableKeys } from "../Explorer/Tables/TableDataClient";
 import ConflictId from "../Explorer/Tree/ConflictId";
 import DocumentId from "../Explorer/Tree/DocumentId";
@@ -89,6 +90,7 @@ export interface Database extends TreeNode {

  selectedSubnodeKind: ko.Observable<CollectionTabKind>;

+  selectDatabase(): void;
  expandDatabase(): Promise<void>;
  collapseDatabase(): void;

@@ -274,6 +276,8 @@ export interface TabOptions {
  tabKind: CollectionTabKind;
  title: string;
  tabPath: string;
+  hashLocation: string;
+  onUpdateTabsButtons: (buttons: CommandButtonComponentProps[]) => void;
  isTabsContentExpanded?: ko.Observable<boolean>;
  onLoadStartKey?: number;

@@ -284,7 +288,6 @@ export interface TabOptions {
  rid?: string;
  node?: TreeNode;
  theme?: string;
-  index?: number;
 }

 export interface DocumentsTabOptions extends TabOptions {
--- a/src/Controls/Heatmap/Heatmap.test.ts
+++ b/src/Controls/Heatmap/Heatmap.test.ts
@@ -22,8 +22,8 @@ describe("The Heatmap Control", () => {
  };

  let heatmap: Heatmap;
-  const theme: PortalTheme = 1;
-  const divElement = `<div id="${Heatmap.elementId}"></div>`;
+  let theme: PortalTheme = 1;
+  const divElement: string = `<div id="${Heatmap.elementId}"></div>`;

  describe("drawHeatmap rendering", () => {
    beforeEach(() => {
@@ -100,7 +100,7 @@ describe("iframe rendering when there is no data", () => {
  });

  it("should show a no data message with a dark theme", () => {
-    const data = {
+    let data = {
      data: {
        signature: "pcIframe",
        data: {
@@ -111,7 +111,7 @@ describe("iframe rendering when there is no data", () => {
      },
    };

-    const divElement = `<div id="${Heatmap.elementId}"></div>`;
+    const divElement: string = `<div id="${Heatmap.elementId}"></div>`;
    document.body.innerHTML = divElement;

    handleMessage(data as MessageEvent);
@@ -120,7 +120,7 @@ describe("iframe rendering when there is no data", () => {
  });

  it("should show a no data message with a white theme", () => {
-    const data = {
+    let data = {
      data: {
        signature: "pcIframe",
        data: {
@@ -131,7 +131,7 @@ describe("iframe rendering when there is no data", () => {
      },
    };

-    const divElement = `<div id="${Heatmap.elementId}"></div>`;
+    const divElement: string = `<div id="${Heatmap.elementId}"></div>`;
    document.body.innerHTML = divElement;

    handleMessage(data as MessageEvent);
--- a/src/Controls/Heatmap/Heatmap.ts
+++ b/src/Controls/Heatmap/Heatmap.ts
@@ -39,7 +39,7 @@ export class Heatmap {
    }
  }

-  private _getFontStyles(size: number = StyleConstants.MediumFontSize, color = "#838383"): FontSettings {
+  private _getFontStyles(size: number = StyleConstants.MediumFontSize, color: string = "#838383"): FontSettings {
    return {
      family: StyleConstants.DataExplorerFont,
      size,
@@ -78,9 +78,9 @@ export class Heatmap {
    // go thru all rows and create 2d matrix for heatmap...
    for (let i = 0; i < rows.length; i++) {
      output.yAxisPoints.push(rows[i]);
-      const dataPoints: number[] = [];
+      let dataPoints: number[] = [];
      for (let a = 0; a < output.xAxisPoints.length; a++) {
-        const row: PartitionTimeStampToData = data[rows[i]];
+        let row: PartitionTimeStampToData = data[rows[i]];
        dataPoints.push(row[output.xAxisPoints[a]]["Normalized Throughput"]);
      }
      output.dataPoints.push(dataPoints);
@@ -193,7 +193,7 @@ export class Heatmap {
      this._getLayoutSettings(),
      this._getChartDisplaySettings()
    );
-    const plotDiv: any = document.getElementById(Heatmap.elementId);
+    let plotDiv: any = document.getElementById(Heatmap.elementId);
    plotDiv.on("plotly_click", (data: any) => {
      let timeSelected: string = data.points[0].x;
      timeSelected = timeSelected.replace(" ", "T");
@@ -205,7 +205,7 @@ export class Heatmap {
          break;
        }
      }
-      const output = [];
+      let output = [];
      for (let i = 0; i < this._chartData.dataPoints.length; i++) {
        output.push(this._chartData.dataPoints[i][xAxisIndex]);
      }
--- a/src/Explorer/ContextMenuButtonFactory.ts
+++ b/src/Explorer/ContextMenuButtonFactory.ts
@@ -0,0 +1,172 @@
+import AddCollectionIcon from "../../images/AddCollection.svg";
+import AddSqlQueryIcon from "../../images/AddSqlQuery_16x16.svg";
+import AddStoredProcedureIcon from "../../images/AddStoredProcedure.svg";
+import AddTriggerIcon from "../../images/AddTrigger.svg";
+import AddUdfIcon from "../../images/AddUdf.svg";
+import DeleteCollectionIcon from "../../images/DeleteCollection.svg";
+import DeleteDatabaseIcon from "../../images/DeleteDatabase.svg";
+import DeleteSprocIcon from "../../images/DeleteSproc.svg";
+import DeleteTriggerIcon from "../../images/DeleteTrigger.svg";
+import DeleteUDFIcon from "../../images/DeleteUDF.svg";
+import HostedTerminalIcon from "../../images/Hosted-Terminal.svg";
+import * as ViewModels from "../Contracts/ViewModels";
+import { userContext } from "../UserContext";
+import { getCollectionName, getDatabaseName } from "../Utils/APITypeUtils";
+import { TreeNodeMenuItem } from "./Controls/TreeComponent/TreeComponent";
+import Explorer from "./Explorer";
+import StoredProcedure from "./Tree/StoredProcedure";
+import Trigger from "./Tree/Trigger";
+import UserDefinedFunction from "./Tree/UserDefinedFunction";
+export interface CollectionContextMenuButtonParams {
+  databaseId: string;
+  collectionId: string;
+}
+
+export interface DatabaseContextMenuButtonParams {
+  databaseId: string;
+}
+/**
+ * New resource tree (in ReactJS)
+ */
+export class ResourceTreeContextMenuButtonFactory {
+  public static createDatabaseContextMenu(container: Explorer, databaseId: string): TreeNodeMenuItem[] {
+    const items: TreeNodeMenuItem[] = [
+      {
+        iconSrc: AddCollectionIcon,
+        onClick: () => container.onNewCollectionClicked(databaseId),
+        label: `New ${getCollectionName()}`,
+      },
+    ];
+
+    if (userContext.apiType !== "Tables") {
+      items.push({
+        iconSrc: DeleteDatabaseIcon,
+        onClick: () => container.openDeleteDatabaseConfirmationPane(),
+        label: `Delete ${getDatabaseName()}`,
+        styleClass: "deleteDatabaseMenuItem",
+      });
+    }
+    return items;
+  }
+
+  public static createCollectionContextMenuButton(
+    container: Explorer,
+    selectedCollection: ViewModels.Collection
+  ): TreeNodeMenuItem[] {
+    const items: TreeNodeMenuItem[] = [];
+    if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
+      items.push({
+        iconSrc: AddSqlQueryIcon,
+        onClick: () => selectedCollection && selectedCollection.onNewQueryClick(selectedCollection, null),
+        label: "New SQL Query",
+      });
+    }
+
+    if (userContext.apiType === "Mongo") {
+      items.push({
+        iconSrc: AddSqlQueryIcon,
+        onClick: () => selectedCollection && selectedCollection.onNewMongoQueryClick(selectedCollection, null),
+        label: "New Query",
+      });
+
+      items.push({
+        iconSrc: HostedTerminalIcon,
+        onClick: () => {
+          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+          if (container.isShellEnabled()) {
+            container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
+          } else {
+            selectedCollection && selectedCollection.onNewMongoShellClick();
+          }
+        },
+        label: container.isShellEnabled() ? "Open Mongo Shell" : "New Shell",
+      });
+    }
+
+    if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
+      items.push({
+        iconSrc: AddStoredProcedureIcon,
+        onClick: () => {
+          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+          selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection, null);
+        },
+        label: "New Stored Procedure",
+      });
+
+      items.push({
+        iconSrc: AddUdfIcon,
+        onClick: () => {
+          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+          selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection, null);
+        },
+        label: "New UDF",
+      });
+
+      items.push({
+        iconSrc: AddTriggerIcon,
+        onClick: () => {
+          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+          selectedCollection && selectedCollection.onNewTriggerClick(selectedCollection, null);
+        },
+        label: "New Trigger",
+      });
+    }
+
+    items.push({
+      iconSrc: DeleteCollectionIcon,
+      onClick: () => container.openDeleteCollectionConfirmationPane(),
+      label: `Delete ${getCollectionName()}`,
+      styleClass: "deleteCollectionMenuItem",
+    });
+
+    return items;
+  }
+
+  public static createStoreProcedureContextMenuItems(
+    container: Explorer,
+    storedProcedure: StoredProcedure
+  ): TreeNodeMenuItem[] {
+    if (userContext.apiType === "Cassandra") {
+      return [];
+    }
+
+    return [
+      {
+        iconSrc: DeleteSprocIcon,
+        onClick: () => storedProcedure.delete(),
+        label: "Delete Store Procedure",
+      },
+    ];
+  }
+
+  public static createTriggerContextMenuItems(container: Explorer, trigger: Trigger): TreeNodeMenuItem[] {
+    if (userContext.apiType === "Cassandra") {
+      return [];
+    }
+
+    return [
+      {
+        iconSrc: DeleteTriggerIcon,
+        onClick: () => trigger.delete(),
+        label: "Delete Trigger",
+      },
+    ];
+  }
+
+  public static createUserDefinedFunctionContextMenuItems(
+    container: Explorer,
+    userDefinedFunction: UserDefinedFunction
+  ): TreeNodeMenuItem[] {
+    if (userContext.apiType === "Cassandra") {
+      return [];
+    }
+
+    return [
+      {
+        iconSrc: DeleteUDFIcon,
+        onClick: () => userDefinedFunction.delete(),
+        label: "Delete User Defined Function",
+      },
+    ];
+  }
+}
--- a/src/Explorer/ContextMenuButtonFactory.tsx
+++ b/src/Explorer/ContextMenuButtonFactory.tsx
@@ -1,190 +0,0 @@
-import React from "react";
-import AddCollectionIcon from "../../images/AddCollection.svg";
-import AddSqlQueryIcon from "../../images/AddSqlQuery_16x16.svg";
-import AddStoredProcedureIcon from "../../images/AddStoredProcedure.svg";
-import AddTriggerIcon from "../../images/AddTrigger.svg";
-import AddUdfIcon from "../../images/AddUdf.svg";
-import DeleteCollectionIcon from "../../images/DeleteCollection.svg";
-import DeleteDatabaseIcon from "../../images/DeleteDatabase.svg";
-import DeleteSprocIcon from "../../images/DeleteSproc.svg";
-import DeleteTriggerIcon from "../../images/DeleteTrigger.svg";
-import DeleteUDFIcon from "../../images/DeleteUDF.svg";
-import HostedTerminalIcon from "../../images/Hosted-Terminal.svg";
-import * as ViewModels from "../Contracts/ViewModels";
-import { useSidePanel } from "../hooks/useSidePanel";
-import { userContext } from "../UserContext";
-import { getCollectionName, getDatabaseName } from "../Utils/APITypeUtils";
-import { TreeNodeMenuItem } from "./Controls/TreeComponent/TreeComponent";
-import Explorer from "./Explorer";
-import { useNotebook } from "./Notebook/useNotebook";
-import { DeleteCollectionConfirmationPane } from "./Panes/DeleteCollectionConfirmationPane/DeleteCollectionConfirmationPane";
-import { DeleteDatabaseConfirmationPanel } from "./Panes/DeleteDatabaseConfirmationPanel";
-import StoredProcedure from "./Tree/StoredProcedure";
-import Trigger from "./Tree/Trigger";
-import UserDefinedFunction from "./Tree/UserDefinedFunction";
-import { useSelectedNode } from "./useSelectedNode";
-
-export interface CollectionContextMenuButtonParams {
-  databaseId: string;
-  collectionId: string;
-}
-
-export interface DatabaseContextMenuButtonParams {
-  databaseId: string;
-}
-/**
- * New resource tree (in ReactJS)
- */
-export const createDatabaseContextMenu = (container: Explorer, databaseId: string): TreeNodeMenuItem[] => {
-  const items: TreeNodeMenuItem[] = [
-    {
-      iconSrc: AddCollectionIcon,
-      onClick: () => container.onNewCollectionClicked(databaseId),
-      label: `New ${getCollectionName()}`,
-    },
-  ];
-
-  if (userContext.apiType !== "Tables") {
-    items.push({
-      iconSrc: DeleteDatabaseIcon,
-      onClick: () =>
-        useSidePanel
-          .getState()
-          .openSidePanel(
-            "Delete " + getDatabaseName(),
-            <DeleteDatabaseConfirmationPanel refreshDatabases={() => container.refreshAllDatabases()} />
-          ),
-      label: `Delete ${getDatabaseName()}`,
-      styleClass: "deleteDatabaseMenuItem",
-    });
-  }
-  return items;
-};
-
-export const createCollectionContextMenuButton = (
-  container: Explorer,
-  selectedCollection: ViewModels.Collection
-): TreeNodeMenuItem[] => {
-  const items: TreeNodeMenuItem[] = [];
-  if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
-    items.push({
-      iconSrc: AddSqlQueryIcon,
-      onClick: () => selectedCollection && selectedCollection.onNewQueryClick(selectedCollection, undefined),
-      label: "New SQL Query",
-    });
-  }
-
-  if (userContext.apiType === "Mongo") {
-    items.push({
-      iconSrc: AddSqlQueryIcon,
-      onClick: () => selectedCollection && selectedCollection.onNewMongoQueryClick(selectedCollection, undefined),
-      label: "New Query",
-    });
-
-    items.push({
-      iconSrc: HostedTerminalIcon,
-      isDisabled: useNotebook.getState().isShellEnabled && userContext.features.notebooksTemporarilyDown,
-      onClick: () => {
-        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled) {
-          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
-        } else {
-          selectedCollection && selectedCollection.onNewMongoShellClick();
-        }
-      },
-      label: useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell",
-    });
-  }
-
-  if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
-    items.push({
-      iconSrc: AddStoredProcedureIcon,
-      onClick: () => {
-        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection, undefined);
-      },
-      label: "New Stored Procedure",
-    });
-
-    items.push({
-      iconSrc: AddUdfIcon,
-      onClick: () => {
-        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection);
-      },
-      label: "New UDF",
-    });
-
-    items.push({
-      iconSrc: AddTriggerIcon,
-      onClick: () => {
-        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        selectedCollection && selectedCollection.onNewTriggerClick(selectedCollection, undefined);
-      },
-      label: "New Trigger",
-    });
-  }
-
-  items.push({
-    iconSrc: DeleteCollectionIcon,
-    onClick: () =>
-      useSidePanel
-        .getState()
-        .openSidePanel(
-          "Delete " + getCollectionName(),
-          <DeleteCollectionConfirmationPane refreshDatabases={() => container.refreshAllDatabases()} />
-        ),
-    label: `Delete ${getCollectionName()}`,
-    styleClass: "deleteCollectionMenuItem",
-  });
-
-  return items;
-};
-
-export const createStoreProcedureContextMenuItems = (
-  container: Explorer,
-  storedProcedure: StoredProcedure
-): TreeNodeMenuItem[] => {
-  if (userContext.apiType === "Cassandra") {
-    return [];
-  }
-
-  return [
-    {
-      iconSrc: DeleteSprocIcon,
-      onClick: () => storedProcedure.delete(),
-      label: "Delete Store Procedure",
-    },
-  ];
-};
-
-export const createTriggerContextMenuItems = (container: Explorer, trigger: Trigger): TreeNodeMenuItem[] => {
-  if (userContext.apiType === "Cassandra") {
-    return [];
-  }
-
-  return [
-    {
-      iconSrc: DeleteTriggerIcon,
-      onClick: () => trigger.delete(),
-      label: "Delete Trigger",
-    },
-  ];
-};
-
-export const createUserDefinedFunctionContextMenuItems = (
-  container: Explorer,
-  userDefinedFunction: UserDefinedFunction
-): TreeNodeMenuItem[] => {
-  if (userContext.apiType === "Cassandra") {
-    return [];
-  }
-
-  return [
-    {
-      iconSrc: DeleteUDFIcon,
-      onClick: () => userDefinedFunction.delete(),
-      label: "Delete User Defined Function",
-    },
-  ];
-};
--- a/src/Explorer/Controls/Accordion/AccordionComponent.tsx
+++ b/src/Explorer/Controls/Accordion/AccordionComponent.tsx
@@ -8,9 +8,7 @@ import TriangleDownIcon from "../../../../images/Triangle-down.svg";
 import TriangleRightIcon from "../../../../images/Triangle-right.svg";
 import * as Constants from "../../../Common/Constants";

-export interface AccordionComponentProps {
-  children: React.ReactNode;
-}
+export interface AccordionComponentProps {}

 export class AccordionComponent extends React.Component<AccordionComponentProps> {
  public render(): JSX.Element {
@@ -80,7 +78,7 @@ export class AccordionItemComponent extends React.Component<AccordionItemCompone
    );
  }

-  private onHeaderClick = (): void => {
+  private onHeaderClick = (_event: React.MouseEvent<HTMLDivElement>): void => {
    this.setState({ isExpanded: !this.state.isExpanded });
  };

--- a/src/Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent.tsx
+++ b/src/Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent.tsx
@@ -1,6 +1,5 @@
 import { Icon, Label, Stack } from "@fluentui/react";
 import * as React from "react";
-import { NormalizedEventKey } from "../../../Common/Constants";
 import { accordionStackTokens } from "../Settings/SettingsRenderUtils";

 export interface CollapsibleSectionProps {
@@ -31,13 +30,6 @@ export class CollapsibleSectionComponent extends React.Component<CollapsibleSect
    }
  }

-  private onKeyPress = (event: React.KeyboardEvent) => {
-    if (event.key === NormalizedEventKey.Space || event.key === NormalizedEventKey.Enter) {
-      this.toggleCollapsed();
-      event.stopPropagation();
-    }
-  };
-
  public render(): JSX.Element {
    return (
      <>
@@ -47,11 +39,6 @@ export class CollapsibleSectionComponent extends React.Component<CollapsibleSect
          verticalAlign="center"
          tokens={accordionStackTokens}
          onClick={this.toggleCollapsed}
-          onKeyPress={this.onKeyPress}
-          tabIndex={0}
-          aria-name="Advanced"
-          role="button"
-          aria-expanded={this.state.isExpanded}
        >
          <Icon iconName={this.state.isExpanded ? "ChevronDown" : "ChevronRight"} />
          <Label>{this.props.title}</Label>
--- a/src/Explorer/Controls/CollapsiblePanel/snapshots/CollapsibleSectionComponent.test.tsx.snap
+++ b/src/Explorer/Controls/CollapsiblePanel/snapshots/CollapsibleSectionComponent.test.tsx.snap
@@ -3,14 +3,9 @@
 exports[`CollapsibleSectionComponent renders 1`] = `
 <Fragment>
  <Stack
-    aria-expanded={true}
-    aria-name="Advanced"
    className="collapsibleSection"
    horizontal={true}
    onClick={[Function]}
-    onKeyPress={[Function]}
-    role="button"
-    tabIndex={0}
    tokens={
      Object {
        "childrenGap": 10,
--- a/src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx
+++ b/src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx
@@ -121,7 +121,8 @@ export class CommandButtonComponent extends React.Component<CommandButtonCompone
    if (!this.dropdownElt || !this.expandButtonElt) {
      return;
    }
-    $(this.dropdownElt).offset({ left: $(this.expandButtonElt).offset().left });
+
+    const dropdownElt = $(this.dropdownElt).offset({ left: $(this.expandButtonElt).offset().left });
  }

  private onKeyPress(event: React.KeyboardEvent): boolean {
--- a/src/Explorer/Controls/Dialog.tsx
+++ b/src/Explorer/Controls/Dialog.tsx
@@ -13,7 +13,6 @@ import {
  Link,
  PrimaryButton,
  ProgressIndicator,
-  Text,
  TextField,
 } from "@fluentui/react";
 import React, { FC } from "react";
@@ -24,78 +23,13 @@ export interface DialogState {
  dialogProps?: DialogProps;
  openDialog: (props: DialogProps) => void;
  closeDialog: () => void;
-  showOkCancelModalDialog: (
-    title: string,
-    subText: string,
-    okLabel: string,
-    onOk: () => void,
-    cancelLabel: string,
-    onCancel: () => void,
-    contentHtml?: JSX.Element,
-    choiceGroupProps?: IChoiceGroupProps,
-    textFieldProps?: TextFieldProps,
-    primaryButtonDisabled?: boolean
-  ) => void;
-  showOkModalDialog: (title: string, subText: string) => void;
 }

-export const useDialog: UseStore<DialogState> = create((set, get) => ({
+export const useDialog: UseStore<DialogState> = create((set) => ({
  visible: false,
  openDialog: (props: DialogProps) => set(() => ({ visible: true, dialogProps: props })),
  closeDialog: () =>
-    set(
-      (state) => ({
-        visible: false,
-        openDialog: state.openDialog,
-        closeDialog: state.closeDialog,
-        showOkCancelModalDialog: state.showOkCancelModalDialog,
-        showOkModalDialog: state.showOkModalDialog,
-      }),
-      true // TODO: This probably should not be true but its causing a prod bug so easier to just set the proper state above
-    ),
-  showOkCancelModalDialog: (
-    title: string,
-    subText: string,
-    okLabel: string,
-    onOk: () => void,
-    cancelLabel: string,
-    onCancel: () => void,
-    contentHtml?: JSX.Element,
-    choiceGroupProps?: IChoiceGroupProps,
-    textFieldProps?: TextFieldProps,
-    primaryButtonDisabled?: boolean
-  ): void =>
-    get().openDialog({
-      isModal: true,
-      title,
-      subText,
-      primaryButtonText: okLabel,
-      secondaryButtonText: cancelLabel,
-      onPrimaryButtonClick: () => {
-        get().closeDialog();
-        onOk && onOk();
-      },
-      onSecondaryButtonClick: () => {
-        get().closeDialog();
-        onCancel && onCancel();
-      },
-      contentHtml,
-      choiceGroupProps,
-      textFieldProps,
-      primaryButtonDisabled,
-    }),
-  showOkModalDialog: (title: string, subText: string): void =>
-    get().openDialog({
-      isModal: true,
-      title,
-      subText,
-      primaryButtonText: "Close",
-      secondaryButtonText: undefined,
-      onPrimaryButtonClick: () => {
-        get().closeDialog();
-      },
-      onSecondaryButtonClick: undefined,
-    }),
+    set((state) => ({ visible: false, openDialog: state.openDialog, closeDialog: state.closeDialog }), true),
 }));

 export interface TextFieldProps extends ITextFieldProps {
@@ -128,7 +62,6 @@ export interface DialogProps {
  type?: DialogType;
  showCloseButton?: boolean;
  onDismiss?: () => void;
-  contentHtml?: JSX.Element;
 }

 const DIALOG_MIN_WIDTH = "400px";
@@ -155,7 +88,6 @@ export const Dialog: FC = () => {
    type,
    showCloseButton,
    onDismiss,
-    contentHtml,
  } = props || {};

  const dialogProps: IDialogProps = {
@@ -187,7 +119,8 @@ export const Dialog: FC = () => {
          text: secondaryButtonText,
          onClick: onSecondaryButtonClick,
        }
-      : undefined;
+      : {};
+
  return visible ? (
    <FluentDialog {...dialogProps}>
      {choiceGroupProps && <ChoiceGroup {...choiceGroupProps} />}
@@ -197,7 +130,6 @@ export const Dialog: FC = () => {
          {linkProps.linkText} <FontIcon iconName="NavigateExternalInline" />
        </Link>
      )}
-      {contentHtml && <Text>{contentHtml}</Text>}
      {progressIndicatorProps && <ProgressIndicator {...progressIndicatorProps} />}
      <DialogFooter>
        <PrimaryButton {...primaryButtonProps} />
--- a/src/Explorer/Controls/Editor/EditorComponent.ts
+++ b/src/Explorer/Controls/Editor/EditorComponent.ts
@@ -52,7 +52,7 @@ class EditorViewModel extends JsonEditorViewModel {
    if (EditorViewModel.providerRegistered.indexOf("sql") < 0) {
      const { SqlCompletionItemProvider } = await import("@azure/cosmos-language-service");
      const monaco = await loadMonaco();
-      monaco.languages.registerCompletionItemProvider("sql", new SqlCompletionItemProvider());
+      monaco.languages.registerCompletionItemProvider("sql", new SqlCompletionItemProvider() as any); //TODO: Remove any. The upstream cosmos language service needs to be fixed
      EditorViewModel.providerRegistered.push("sql");
    }
  }
--- a/src/Explorer/Controls/Editor/EditorReact.tsx
+++ b/src/Explorer/Controls/Editor/EditorReact.tsx
@@ -1,11 +1,6 @@
-import { Spinner, SpinnerSize } from "@fluentui/react";
 import * as React from "react";
 import { loadMonaco, monaco } from "../../LazyMonaco";
-// import "./EditorReact.less";

-interface EditorReactStates {
-  showEditor: boolean;
-}
 export interface EditorReactProps {
  language: string;
  content: string;
@@ -17,26 +12,22 @@ export interface EditorReactProps {
  theme?: string; // Monaco editor theme
 }

-export class EditorReact extends React.Component<EditorReactProps, EditorReactStates> {
+export class EditorReact extends React.Component<EditorReactProps> {
  private rootNode: HTMLElement;
  private editor: monaco.editor.IStandaloneCodeEditor;
  private selectionListener: monaco.IDisposable;

  public constructor(props: EditorReactProps) {
    super(props);
-    this.state = {
-      showEditor: false,
-    };
  }

  public componentDidMount(): void {
    this.createEditor(this.configureEditor.bind(this));
  }

-  public componentDidUpdate(previous: EditorReactProps) {
-    if (this.props.content !== previous.content) {
-      this.editor.setValue(this.props.content);
-    }
+  public shouldComponentUpdate(): boolean {
+    // Prevents component re-rendering
+    return false;
  }

  public componentWillUnmount(): void {
@@ -44,19 +35,14 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt
  }

  public render(): JSX.Element {
-    return (
-      <React.Fragment>
-        {!this.state.showEditor && <Spinner size={SpinnerSize.large} className="spinner" />}
-        <div className="jsonEditor" ref={(elt: HTMLElement) => this.setRef(elt)} />
-      </React.Fragment>
-    );
+    return <div className="jsonEditor" ref={(elt: HTMLElement) => this.setRef(elt)} />;
  }

  protected configureEditor(editor: monaco.editor.IStandaloneCodeEditor) {
    this.editor = editor;
    const queryEditorModel = this.editor.getModel();
    if (!this.props.isReadOnly && this.props.onContentChanged) {
-      queryEditorModel.onDidChangeContent(() => {
+      queryEditorModel.onDidChangeContent((e: monaco.editor.IModelContentChangedEvent) => {
        const queryEditorModel = this.editor.getModel();
        this.props.onContentChanged(queryEditorModel.getValue());
      });
@@ -76,7 +62,7 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt
   * Create the monaco editor and attach to DOM
   */
  private async createEditor(createCallback: (e: monaco.editor.IStandaloneCodeEditor) => void) {
-    const options: monaco.editor.IEditorConstructionOptions = {
+    const options = {
      value: this.props.content,
      language: this.props.language,
      readOnly: this.props.isReadOnly,
@@ -90,12 +76,6 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt
    this.rootNode.innerHTML = "";
    const monaco = await loadMonaco();
    createCallback(monaco.editor.create(this.rootNode, options));
-
-    if (this.rootNode.innerHTML) {
-      this.setState({
-        showEditor: true,
-      });
-    }
  }

  private setRef(element: HTMLElement): void {
--- a/src/Explorer/Controls/GitHub/GitHubReposComponent.tsx
+++ b/src/Explorer/Controls/GitHub/GitHubReposComponent.tsx
@@ -56,7 +56,7 @@ export class GitHubReposComponent extends React.Component<GitHubReposComponentPr

    return (
      <>
-        <div>{content}</div>
+        <div className={"paneMainContent"}>{content}</div>
        {!this.props.showAuthorizeAccess && (
          <>
            <div className={"paneFooter"} style={ContentFooterStyle}>
--- a/src/Explorer/Controls/GitHub/GitHubReposComponentAdapter.tsx
+++ b/src/Explorer/Controls/GitHub/GitHubReposComponentAdapter.tsx
@@ -0,0 +1,20 @@
+import ko from "knockout";
+import * as React from "react";
+import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
+import { GitHubReposComponent, GitHubReposComponentProps } from "./GitHubReposComponent";
+
+export class GitHubReposComponentAdapter implements ReactAdapter {
+  public parameters: ko.Observable<number>;
+
+  constructor(private props: GitHubReposComponentProps) {
+    this.parameters = ko.observable<number>(Date.now());
+  }
+
+  public renderComponent(): JSX.Element {
+    return <GitHubReposComponent {...this.props} />;
+  }
+
+  public triggerRender(): void {
+    window.requestAnimationFrame(() => this.parameters(Date.now()));
+  }
+}
--- a/src/Explorer/Controls/InputTypeahead/InputTypeahead.less
+++ b/src/Explorer/Controls/InputTypeahead/InputTypeahead.less
@@ -5,12 +5,6 @@
    display: inline-block;
    width: 100%;

-    .input-type-head-text-field {
-        width: 100%;
-    }
-    .input-query-form {
-        width: 100%;
-    }
    textarea {
        width: 100%;
        line-height: 1;
@@ -27,11 +21,4 @@
        }
    }
 }
-.input-typeahead-chocies-container {
-    border: 1px solid lightgrey;
-    padding: 5px 10px 5px 10px;
-    cursor: pointer;
-    .choice-caption{
-        font-size: 14px;
-    }
-}
+
--- a/src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
+++ b/src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
@@ -6,13 +6,14 @@
 *   typeaheadOverrideOptions: { dynamic:false }
 *
 */
-import { getTheme, IconButton, IIconProps, List, Stack, TextField } from "@fluentui/react";
+import "jquery-typeahead";
 import * as React from "react";
+import { KeyCodes } from "../../../Common/Constants";
 import "./InputTypeahead.less";

 export interface Item {
  caption: string;
-  value: string;
+  value: any;
 }

 /**
@@ -74,128 +75,170 @@ export interface InputTypeaheadComponentProps {
  useTextarea?: boolean;
 }

-interface InputTypeaheadComponentState {
-  isSuggestionVisible: boolean;
-  selectedChoice: Item;
-  filteredChoices: Item[];
+interface OnClickItem {
+  matchedKey: string;
+  value: any;
+  caption: string;
+  group: string;
 }

+interface Cache {
+  inputValue: string;
+  selection: Item;
+}
+
+interface InputTypeaheadComponentState {}
+
 export class InputTypeaheadComponent extends React.Component<
  InputTypeaheadComponentProps,
  InputTypeaheadComponentState
 > {
-  constructor(props: InputTypeaheadComponentProps) {
+  private inputElt: HTMLElement;
+  private containerElt: HTMLElement;
+
+  private cache: Cache;
+  private inputValue: string;
+  private selection: Item;
+
+  public constructor(props: InputTypeaheadComponentProps) {
    super(props);
-    this.state = {
-      isSuggestionVisible: false,
-      filteredChoices: [],
-      selectedChoice: {
-        caption: "",
-        value: "",
-      },
+    this.cache = {
+      inputValue: null,
+      selection: null,
    };
  }

-  private onRenderCell = (item: Item): JSX.Element => {
-    return (
-      <div className="input-typeahead-chocies-container" onClick={() => this.onChoiceClick(item)}>
-        <p className="choice-caption">{item.caption}</p>
-        <span>{item.value}</span>
-      </div>
-    );
-  };
-
-  private onChoiceClick = (item: Item): void => {
-    this.props.onNewValue(item.caption);
-    this.setState({ isSuggestionVisible: false, selectedChoice: item });
-  };
-
-  private handleChange = (value: string): void => {
-    if (!value) {
-      this.setState({ isSuggestionVisible: true });
+  /**
+   * Props have changed
+   * @param prevProps
+   * @param prevState
+   * @param snapshot
+   */
+  public componentDidUpdate(
+    prevProps: InputTypeaheadComponentProps,
+    prevState: InputTypeaheadComponentState,
+    snapshot: any
+  ): void {
+    if (prevProps.defaultValue !== this.props.defaultValue) {
+      $(this.inputElt).val(this.props.defaultValue);
+      this.initializeTypeahead();
    }
-    this.props.onNewValue(value);
-    const filteredChoices = this.filterChoiceByValue(this.props.choices, value);
-    this.setState({ filteredChoices });
-  };
+  }

-  private onSubmit = (event: React.KeyboardEvent<HTMLElement>): void => {
-    if (event.key === "Enter") {
+  /**
+   * Executed once react is done building the DOM for this component
+   */
+  public componentDidMount(): void {
+    this.initializeTypeahead();
+  }
+
+  public render(): JSX.Element {
+    return (
+      <span className="input-typeahead-container">
+        <div
+          className="input-typehead"
+          onKeyDown={(event: React.KeyboardEvent<HTMLDivElement>) => this.onKeyDown(event)}
+        >
+          <div className="typeahead__container" ref={(input) => (this.containerElt = input)}>
+            <div className="typeahead__field">
+              <span className="typeahead__query">
+                {this.props.useTextarea ? (
+                  <textarea
+                    rows={1}
+                    name="q"
+                    autoComplete="off"
+                    aria-label="Input query"
+                    ref={(input) => (this.inputElt = input)}
+                    defaultValue={this.props.defaultValue}
+                  />
+                ) : (
+                  <input
+                    name="q"
+                    type="search"
+                    autoComplete="off"
+                    aria-label="Input query"
+                    ref={(input) => (this.inputElt = input)}
+                    defaultValue={this.props.defaultValue}
+                  />
+                )}
+              </span>
+              {this.props.showSearchButton && (
+                <span className="typeahead__button">
+                  <button type="submit">
+                    <span className="typeahead__search-icon" />
+                  </button>
+                </span>
+              )}
+            </div>
+          </div>
+        </div>
+      </span>
+    );
+  }
+
+  private onKeyDown(event: React.KeyboardEvent<HTMLElement>) {
+    if (event.keyCode === KeyCodes.Enter) {
      if (this.props.submitFct) {
        event.preventDefault();
        event.stopPropagation();
-        this.props.submitFct(this.props.defaultValue, this.state.selectedChoice);
-        this.setState({ isSuggestionVisible: false });
+        this.props.submitFct(this.cache.inputValue, this.cache.selection);
+        $(this.containerElt).children(".typeahead__result").hide();
      }
    }
-  };
+  }

-  private filterChoiceByValue = (choices: Item[], searchKeyword: string): Item[] => {
-    return choices.filter((choice) =>
-      // @ts-ignore
-      Object.keys(choice).some((key) => choice[key].toLowerCase().includes(searchKeyword.toLowerCase()))
-    );
-  };
-
-  public render(): JSX.Element {
-    const { defaultValue, useTextarea, placeholder, onNewValue } = this.props;
-    const { isSuggestionVisible, selectedChoice, filteredChoices } = this.state;
-    const theme = getTheme();
-
-    const iconButtonStyles = {
-      root: {
-        color: theme.palette.neutralPrimary,
-        marginLeft: "10px !important",
-        marginTop: "0px",
-        marginRight: "2px",
-        width: "42px",
+  /**
+   * Must execute once ko is rendered, so that it can find the input element by id
+   */
+  private initializeTypeahead(): void {
+    const props = this.props;
+    let cache = this.cache;
+    let options: any = {
+      input: this.inputElt,
+      order: "asc",
+      minLength: 0,
+      searchOnFocus: true,
+      source: {
+        display: "caption",
+        data: () => {
+          return props.choices;
+        },
      },
-      rootHovered: {
-        color: theme.palette.neutralDark,
+      callback: {
+        onClick: (node: any, a: any, item: OnClickItem, event: any) => {
+          cache.selection = item;
+
+          if (props.onSelected) {
+            props.onSelected(item);
+          }
+        },
+        onResult(node: any, query: any, result: any, resultCount: any, resultCountPerGroup: any) {
+          cache.inputValue = query;
+          if (props.onNewValue) {
+            props.onNewValue(query);
+          }
+        },
      },
+      template: (query: string, item: any) => {
+        // Don't display id if caption *IS* the id
+        return item.caption === item.value
+          ? "<span>{{caption}}</span>"
+          : "<span><div>{{caption}}</div><div><small>{{value}}</small></div></span>";
+      },
+      dynamic: true,
    };
-    const cancelIcon: IIconProps = { iconName: "cancel" };
-    const searchIcon: IIconProps = { iconName: "Search" };

-    return (
-      <div className="input-typeahead-container">
-        <Stack horizontal>
-          <form aria-labelledby="input" className="input-query-form">
-            <TextField
-              multiline={useTextarea}
-              rows={1}
-              id="input"
-              defaultValue={defaultValue}
-              ariaLabel="Input query"
-              placeholder={placeholder}
-              className="input-type-head-text-field"
-              value={defaultValue}
-              onKeyDown={this.onSubmit}
-              onFocus={() => this.setState({ isSuggestionVisible: true })}
-              onChange={(_event, newValue?: string) => this.handleChange(newValue)}
-            />
-          </form>
-          {this.props.showCancelButton && (
-            <IconButton
-              styles={iconButtonStyles}
-              iconProps={cancelIcon}
-              ariaLabel="cancel Button"
-              onClick={() => onNewValue("")}
-            />
-          )}
-          {this.props.showSearchButton && (
-            <IconButton
-              styles={iconButtonStyles}
-              iconProps={searchIcon}
-              ariaLabel="Search Button"
-              onClick={() => this.props.submitFct(defaultValue, selectedChoice)}
-            />
-          )}
-        </Stack>
-        {filteredChoices.length && isSuggestionVisible ? (
-          <List items={filteredChoices} onRenderCell={this.onRenderCell} />
-        ) : undefined}
-      </div>
-    );
+    // Override options
+    if (props.typeaheadOverrideOptions) {
+      for (const p in props.typeaheadOverrideOptions) {
+        options[p] = props.typeaheadOverrideOptions[p];
+      }
+    }
+
+    if (props.hasOwnProperty("showCancelButton")) {
+      options.cancelButton = props.showCancelButton;
+    }
+
+    $(this.inputElt).typeahead(options);
  }
 }
--- a/src/Explorer/Controls/InputTypeahead/snapshots/InputTypeaheadComponent.test.tsx.snap
+++ b/src/Explorer/Controls/InputTypeahead/snapshots/InputTypeaheadComponent.test.tsx.snap
@@ -1,55 +1,61 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

 exports[`inputTypeahead renders <input /> 1`] = `
-<div
+<span
  className="input-typeahead-container"
 >
-  <Stack
-    horizontal={true}
+  <div
+    className="input-typehead"
+    onKeyDown={[Function]}
  >
-    <form
-      aria-labelledby="input"
-      className="input-query-form"
+    <div
+      className="typeahead__container"
    >
-      <StyledTextFieldBase
-        ariaLabel="Input query"
-        className="input-type-head-text-field"
-        id="input"
-        multiline={false}
-        onChange={[Function]}
-        onFocus={[Function]}
-        onKeyDown={[Function]}
-        placeholder="placeholder"
-        rows={1}
-      />
-    </form>
-  </Stack>
-</div>
+      <div
+        className="typeahead__field"
+      >
+        <span
+          className="typeahead__query"
+        >
+          <input
+            aria-label="Input query"
+            autoComplete="off"
+            name="q"
+            type="search"
+          />
+        </span>
+      </div>
+    </div>
+  </div>
+</span>
 `;

 exports[`inputTypeahead renders <textarea /> 1`] = `
-<div
+<span
  className="input-typeahead-container"
 >
-  <Stack
-    horizontal={true}
+  <div
+    className="input-typehead"
+    onKeyDown={[Function]}
  >
-    <form
-      aria-labelledby="input"
-      className="input-query-form"
+    <div
+      className="typeahead__container"
    >
-      <StyledTextFieldBase
-        ariaLabel="Input query"
-        className="input-type-head-text-field"
-        id="input"
-        multiline={true}
-        onChange={[Function]}
-        onFocus={[Function]}
-        onKeyDown={[Function]}
-        placeholder="placeholder"
-        rows={1}
-      />
-    </form>
-  </Stack>
-</div>
+      <div
+        className="typeahead__field"
+      >
+        <span
+          className="typeahead__query"
+        >
+          <textarea
+            aria-label="Input query"
+            autoComplete="off"
+            name="q"
+            rows={1}
+          />
+        </span>
+      </div>
+    </div>
+  </div>
+</span>
 `;
--- a/src/Explorer/Controls/JsonEditor/JsonEditorComponent.ts
+++ b/src/Explorer/Controls/JsonEditor/JsonEditorComponent.ts
@@ -90,7 +90,7 @@ export class JsonEditorViewModel extends WaitsForTemplateViewModel {
  protected async createEditor(content: string, createCallback: (e: monaco.editor.IStandaloneCodeEditor) => void) {
    this.registerCompletionItemProvider();
    this.editorContainer = document.getElementById(this.getEditorId());
-    const options: monaco.editor.IEditorConstructionOptions = {
+    const options = {
      value: content,
      language: this.getEditorLanguage(),
      readOnly: this.params.isReadOnly,
--- a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx
+++ b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx
@@ -1,90 +1,154 @@
-import { shallow } from "enzyme";
-import React from "react";
 import * as DataModels from "../../../Contracts/DataModels";
-import { NotebookTerminalComponent, NotebookTerminalComponentProps } from "./NotebookTerminalComponent";
+import { NotebookTerminalComponent } from "./NotebookTerminalComponent";

-const testAccount: DataModels.DatabaseAccount = {
-  id: "id",
-  kind: "kind",
-  location: "location",
-  name: "name",
-  properties: {
-    documentEndpoint: "https://testDocumentEndpoint.azure.com/",
-  },
-  type: "type",
+const createTestDatabaseAccount = (): DataModels.DatabaseAccount => {
+  return {
+    id: "testId",
+    kind: "testKind",
+    location: "testLocation",
+    name: "testName",
+    properties: {
+      cassandraEndpoint: null,
+      documentEndpoint: "https://testDocumentEndpoint.azure.com/",
+      gremlinEndpoint: null,
+      tableEndpoint: null,
+    },
+    type: "testType",
+  };
 };

-const testMongo32Account: DataModels.DatabaseAccount = {
-  ...testAccount,
+const createTestMongo32DatabaseAccount = (): DataModels.DatabaseAccount => {
+  return {
+    id: "testId",
+    kind: "testKind",
+    location: "testLocation",
+    name: "testName",
+    properties: {
+      cassandraEndpoint: null,
+      documentEndpoint: "https://testDocumentEndpoint.azure.com/",
+      gremlinEndpoint: null,
+      tableEndpoint: null,
+    },
+    type: "testType",
+  };
 };

-const testMongo36Account: DataModels.DatabaseAccount = {
-  ...testAccount,
-  properties: {
-    mongoEndpoint: "https://testMongoEndpoint.azure.com/",
-  },
+const createTestMongo36DatabaseAccount = (): DataModels.DatabaseAccount => {
+  return {
+    id: "testId",
+    kind: "testKind",
+    location: "testLocation",
+    name: "testName",
+    properties: {
+      cassandraEndpoint: null,
+      documentEndpoint: "https://testDocumentEndpoint.azure.com/",
+      gremlinEndpoint: null,
+      tableEndpoint: null,
+      mongoEndpoint: "https://testMongoEndpoint.azure.com/",
+    },
+    type: "testType",
+  };
 };

-const testCassandraAccount: DataModels.DatabaseAccount = {
-  ...testAccount,
-  properties: {
-    cassandraEndpoint: "https://testCassandraEndpoint.azure.com/",
-  },
+const createTestCassandraDatabaseAccount = (): DataModels.DatabaseAccount => {
+  return {
+    id: "testId",
+    kind: "testKind",
+    location: "testLocation",
+    name: "testName",
+    properties: {
+      cassandraEndpoint: "https://testCassandraEndpoint.azure.com/",
+      documentEndpoint: null,
+      gremlinEndpoint: null,
+      tableEndpoint: null,
+    },
+    type: "testType",
+  };
 };

-const testNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
-  authToken: "authToken",
-  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com",
+const createTerminal = (): NotebookTerminalComponent => {
+  return new NotebookTerminalComponent({
+    notebookServerInfo: {
+      authToken: "testAuthToken",
+      notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/",
+    },
+    databaseAccount: createTestDatabaseAccount(),
+  });
 };

-const testMongoNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
-  authToken: "authToken",
-  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongo",
+const createMongo32Terminal = (): NotebookTerminalComponent => {
+  return new NotebookTerminalComponent({
+    notebookServerInfo: {
+      authToken: "testAuthToken",
+      notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongo",
+    },
+    databaseAccount: createTestMongo32DatabaseAccount(),
+  });
 };

-const testCassandraNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
-  authToken: "authToken",
-  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/cassandra",
+const createMongo36Terminal = (): NotebookTerminalComponent => {
+  return new NotebookTerminalComponent({
+    notebookServerInfo: {
+      authToken: "testAuthToken",
+      notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongo",
+    },
+    databaseAccount: createTestMongo36DatabaseAccount(),
+  });
+};
+
+const createCassandraTerminal = (): NotebookTerminalComponent => {
+  return new NotebookTerminalComponent({
+    notebookServerInfo: {
+      authToken: "testAuthToken",
+      notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/cassandra",
+    },
+    databaseAccount: createTestCassandraDatabaseAccount(),
+  });
 };

 describe("NotebookTerminalComponent", () => {
-  it("renders terminal", () => {
-    const props: NotebookTerminalComponentProps = {
-      databaseAccount: testAccount,
-      notebookServerInfo: testNotebookServerInfo,
-    };
+  it("getTerminalParams: Test for terminal", () => {
+    const terminal: NotebookTerminalComponent = createTerminal();
+    const params: Map<string, string> = terminal.getTerminalParams();

-    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    expect(params).toEqual(
+      new Map<string, string>([["terminal", "true"]])
+    );
  });

-  it("renders mongo 3.2 shell", () => {
-    const props: NotebookTerminalComponentProps = {
-      databaseAccount: testMongo32Account,
-      notebookServerInfo: testMongoNotebookServerInfo,
-    };
+  it("getTerminalParams: Test for Mongo 3.2 terminal", () => {
+    const terminal: NotebookTerminalComponent = createMongo32Terminal();
+    const params: Map<string, string> = terminal.getTerminalParams();

-    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    expect(params).toEqual(
+      new Map<string, string>([
+        ["terminal", "true"],
+        ["terminalEndpoint", new URL(terminal.props.databaseAccount.properties.documentEndpoint).host],
+      ])
+    );
  });

-  it("renders mongo 3.6 shell", () => {
-    const props: NotebookTerminalComponentProps = {
-      databaseAccount: testMongo36Account,
-      notebookServerInfo: testMongoNotebookServerInfo,
-    };
+  it("getTerminalParams: Test for Mongo 3.6 terminal", () => {
+    const terminal: NotebookTerminalComponent = createMongo36Terminal();
+    const params: Map<string, string> = terminal.getTerminalParams();

-    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    expect(params).toEqual(
+      new Map<string, string>([
+        ["terminal", "true"],
+        ["terminalEndpoint", new URL(terminal.props.databaseAccount.properties.mongoEndpoint).host],
+      ])
+    );
  });

-  it("renders cassandra shell", () => {
-    const props: NotebookTerminalComponentProps = {
-      databaseAccount: testCassandraAccount,
-      notebookServerInfo: testCassandraNotebookServerInfo,
-    };
+  it("getTerminalParams: Test for Cassandra terminal", () => {
+    const terminal: NotebookTerminalComponent = createCassandraTerminal();
+    const params: Map<string, string> = terminal.getTerminalParams();

-    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
-    expect(wrapper).toMatchSnapshot();
+    expect(params).toEqual(
+      new Map<string, string>([
+        ["terminal", "true"],
+        ["terminalEndpoint", new URL(terminal.props.databaseAccount.properties.cassandraEndpoint).host],
+      ])
+    );
  });
 });
--- a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
+++ b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
@@ -2,12 +2,12 @@
 * Wrapper around Notebook server terminal
 */

-import postRobot from "post-robot";
 import * as React from "react";
 import * as DataModels from "../../../Contracts/DataModels";
-import { TerminalProps } from "../../../Terminal/TerminalProps";
-import { userContext } from "../../../UserContext";
 import * as StringUtils from "../../../Utils/StringUtils";
+import { userContext } from "../../../UserContext";
+import { TerminalQueryParams } from "../../../Common/Constants";
+import { handleError } from "../../../Common/ErrorHandlingUtils";

 export interface NotebookTerminalComponentProps {
  notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo;
@@ -15,69 +15,79 @@ export interface NotebookTerminalComponentProps {
 }

 export class NotebookTerminalComponent extends React.Component<NotebookTerminalComponentProps> {
-  private terminalWindow: Window;
-
  constructor(props: NotebookTerminalComponentProps) {
    super(props);
  }

-  componentDidMount(): void {
-    this.sendPropsToTerminalFrame();
-  }
-
  public render(): JSX.Element {
    return (
      <div className="notebookTerminalContainer">
        <iframe
          title="Terminal to Notebook Server"
-          onLoad={(event) => this.handleFrameLoad(event)}
-          src="terminal.html"
+          src={NotebookTerminalComponent.createNotebookAppSrc(this.props.notebookServerInfo, this.getTerminalParams())}
        />
      </div>
    );
  }

-  handleFrameLoad(event: React.SyntheticEvent<HTMLIFrameElement, Event>): void {
-    this.terminalWindow = (event.target as HTMLIFrameElement).contentWindow;
-    this.sendPropsToTerminalFrame();
-  }
+  public getTerminalParams(): Map<string, string> {
+    let params: Map<string, string> = new Map<string, string>();
+    params.set(TerminalQueryParams.Terminal, "true");

-  sendPropsToTerminalFrame(): void {
-    if (!this.terminalWindow) {
-      return;
+    const terminalEndpoint: string = this.tryGetTerminalEndpoint();
+    if (terminalEndpoint) {
+      params.set(TerminalQueryParams.TerminalEndpoint, terminalEndpoint);
    }

-    const props: TerminalProps = {
-      terminalEndpoint: this.tryGetTerminalEndpoint(),
-      notebookServerEndpoint: this.props.notebookServerInfo?.notebookServerEndpoint,
-      authToken: this.props.notebookServerInfo?.authToken,
-      subscriptionId: userContext.subscriptionId,
-      apiType: userContext.apiType,
-      authType: userContext.authType,
-      databaseAccount: userContext.databaseAccount,
-    };
-
-    postRobot.send(this.terminalWindow, "props", props, {
-      domain: window.location.origin,
-    });
+    return params;
  }

-  public tryGetTerminalEndpoint(): string | undefined {
-    let terminalEndpoint: string | undefined;
+  public tryGetTerminalEndpoint(): string | null {
+    let terminalEndpoint: string | null;

-    const notebookServerEndpoint = this.props.notebookServerInfo?.notebookServerEndpoint;
+    const notebookServerEndpoint: string = this.props.notebookServerInfo.notebookServerEndpoint;
    if (StringUtils.endsWith(notebookServerEndpoint, "mongo")) {
-      // mongoEndpoint is only available for Mongo 3.6 and higher, fallback to documentEndpoint otherwise
-      terminalEndpoint =
-        this.props.databaseAccount?.properties.mongoEndpoint || this.props.databaseAccount?.properties.documentEndpoint;
+      let mongoShellEndpoint: string = this.props.databaseAccount.properties.mongoEndpoint;
+      if (!mongoShellEndpoint) {
+        // mongoEndpoint is only available for Mongo 3.6 and higher.
+        // Fallback to documentEndpoint otherwise.
+        mongoShellEndpoint = this.props.databaseAccount.properties.documentEndpoint;
+      }
+      terminalEndpoint = mongoShellEndpoint;
    } else if (StringUtils.endsWith(notebookServerEndpoint, "cassandra")) {
-      terminalEndpoint = this.props.databaseAccount?.properties.cassandraEndpoint;
+      terminalEndpoint = this.props.databaseAccount.properties.cassandraEndpoint;
    }

    if (terminalEndpoint) {
      return new URL(terminalEndpoint).host;
    }
+    return null;
+  }

-    return undefined;
+  public static createNotebookAppSrc(
+    serverInfo: DataModels.NotebookWorkspaceConnectionInfo,
+    params: Map<string, string>
+  ): string {
+    if (!serverInfo.notebookServerEndpoint) {
+      handleError(
+        "Notebook server endpoint not defined. Terminal will fail to connect to jupyter server.",
+        "NotebookTerminalComponent/createNotebookAppSrc"
+      );
+      return "";
+    }
+
+    params.set(TerminalQueryParams.Server, serverInfo.notebookServerEndpoint);
+    if (serverInfo.authToken && serverInfo.authToken.length > 0) {
+      params.set(TerminalQueryParams.Token, serverInfo.authToken);
+    }
+
+    params.set(TerminalQueryParams.SubscriptionId, userContext.subscriptionId);
+
+    let result: string = "terminal.html?";
+    for (let key of params.keys()) {
+      result += `${key}=${encodeURIComponent(params.get(key))}&`;
+    }
+
+    return result;
  }
 }
--- a/src/Explorer/Controls/Notebook/snapshots/NotebookTerminalComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Notebook/snapshots/NotebookTerminalComponent.test.tsx.snap
@@ -1,49 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`NotebookTerminalComponent renders cassandra shell 1`] = `
-<div
-  className="notebookTerminalContainer"
->
-  <iframe
-    onLoad={[Function]}
-    src="terminal.html"
-    title="Terminal to Notebook Server"
-  />
-</div>
-`;
-
-exports[`NotebookTerminalComponent renders mongo 3.2 shell 1`] = `
-<div
-  className="notebookTerminalContainer"
->
-  <iframe
-    onLoad={[Function]}
-    src="terminal.html"
-    title="Terminal to Notebook Server"
-  />
-</div>
-`;
-
-exports[`NotebookTerminalComponent renders mongo 3.6 shell 1`] = `
-<div
-  className="notebookTerminalContainer"
->
-  <iframe
-    onLoad={[Function]}
-    src="terminal.html"
-    title="Terminal to Notebook Server"
-  />
-</div>
-`;
-
-exports[`NotebookTerminalComponent renders terminal 1`] = `
-<div
-  className="notebookTerminalContainer"
->
-  <iframe
-    onLoad={[Function]}
-    src="terminal.html"
-    title="Terminal to Notebook Server"
-  />
-</div>
-`;
--- a/src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
+++ b/src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
@@ -17,8 +17,6 @@ import Explorer from "../../Explorer";
 import { NotebookClientV2 } from "../../Notebook/NotebookClientV2";
 import { NotebookComponentBootstrapper } from "../../Notebook/NotebookComponent/NotebookComponentBootstrapper";
 import NotebookReadOnlyRenderer from "../../Notebook/NotebookRenderer/NotebookReadOnlyRenderer";
-import { NotebookUtil } from "../../Notebook/NotebookUtil";
-import { useNotebook } from "../../Notebook/useNotebook";
 import { Dialog, TextFieldProps, useDialog } from "../Dialog";
 import { NotebookMetadataComponent } from "./NotebookMetadataComponent";
 import "./NotebookViewerComponent.less";
@@ -57,7 +55,7 @@ export class NotebookViewerComponent
      databaseAccountName: undefined,
      defaultExperience: "NotebookViewer",
      isReadOnly: true,
-      cellEditorType: "codemirror",
+      cellEditorType: "monaco",
      autoSaveInterval: 365 * 24 * 3600 * 1000, // There is no way to turn off auto-save, set to 1 year
      contentProvider: contents.JupyterContentProvider, // NotebookViewer only knows how to talk to Jupyter contents API
    });
@@ -148,9 +146,7 @@ export class NotebookViewerComponent
            <NotebookMetadataComponent
              data={this.state.galleryItem}
              isFavorite={this.state.isFavorite}
-              downloadButtonText={
-                this.props.container && NotebookUtil.getNotebookBtnTitle(useNotebook.getState().notebookFolderName)
-              }
+              downloadButtonText={this.props.container && "Download to my notebooks"}
              onTagClick={this.props.onTagClick}
              onFavoriteClick={this.favoriteItem}
              onUnfavoriteClick={this.unfavoriteItem}
--- a/src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx
+++ b/src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx
@@ -29,9 +29,8 @@ import { QueriesClient } from "../../../Common/QueriesClient";
 import * as DataModels from "../../../Contracts/DataModels";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
-import { useDialog } from "../Dialog";

-const title = "Open Saved Queries";
+const title: string = "Open Saved Queries";

 export interface QueriesGridComponentProps {
  queriesClient: QueriesClient;
@@ -197,9 +196,9 @@ export class QueriesGridComponent extends React.Component<QueriesGridComponentPr
      {
        key: "Action",
        name: "Action",
-        fieldName: undefined,
+        fieldName: null,
        minWidth: 70,
-        onRender: (query: Query) => {
+        onRender: (query: Query, index: number, column: IColumn) => {
          const buttonProps: IButtonProps = {
            iconProps: {
              iconName: "More",
@@ -215,50 +214,47 @@ export class QueriesGridComponent extends React.Component<QueriesGridComponentPr
                {
                  key: "Open",
                  text: "Open query",
-                  onClick: () => {
+                  onClick: (event: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>, menuItem: any) => {
                    this.props.onQuerySelect(query);
                  },
                },
                {
                  key: "Delete",
                  text: "Delete query",
-                  onClick: async () => {
-                    useDialog.getState().showOkCancelModalDialog(
-                      "Confirm delete",
-                      "Are you sure you want to delete this query?",
-                      "Delete",
-                      async () => {
-                        const startKey: number = TelemetryProcessor.traceStart(Action.DeleteSavedQuery, {
-                          dataExplorerArea: Constants.Areas.ContextualPane,
-                          paneTitle: title,
-                        });
-                        try {
-                          await this.props.queriesClient.deleteQuery(query);
-                          TelemetryProcessor.traceSuccess(
-                            Action.DeleteSavedQuery,
-                            {
-                              dataExplorerArea: Constants.Areas.ContextualPane,
-                              paneTitle: title,
-                            },
-                            startKey
-                          );
-                        } catch (error) {
-                          TelemetryProcessor.traceFailure(
-                            Action.DeleteSavedQuery,
-                            {
-                              dataExplorerArea: Constants.Areas.ContextualPane,
-                              paneTitle: title,
-                              error: getErrorMessage(error),
-                              errorStack: getErrorStack(error),
-                            },
-                            startKey
-                          );
-                        }
-                        await this.fetchSavedQueries(); // get latest state
-                      },
-                      "Cancel",
-                      undefined
-                    );
+                  onClick: async (
+                    event: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>,
+                    menuItem: any
+                  ) => {
+                    if (window.confirm("Are you sure you want to delete this query?")) {
+                      const container = window.dataExplorer;
+                      const startKey: number = TelemetryProcessor.traceStart(Action.DeleteSavedQuery, {
+                        dataExplorerArea: Constants.Areas.ContextualPane,
+                        paneTitle: title,
+                      });
+                      try {
+                        await this.props.queriesClient.deleteQuery(query);
+                        TelemetryProcessor.traceSuccess(
+                          Action.DeleteSavedQuery,
+                          {
+                            dataExplorerArea: Constants.Areas.ContextualPane,
+                            paneTitle: title,
+                          },
+                          startKey
+                        );
+                      } catch (error) {
+                        TelemetryProcessor.traceFailure(
+                          Action.DeleteSavedQuery,
+                          {
+                            dataExplorerArea: Constants.Areas.ContextualPane,
+                            paneTitle: title,
+                            error: getErrorMessage(error),
+                            errorStack: getErrorStack(error),
+                          },
+                          startKey
+                        );
+                      }
+                      await this.fetchSavedQueries(); // get latest state
+                    }
                  },
                },
              ],
--- a/src/Explorer/Controls/Settings/SettingsComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.test.tsx
@@ -38,6 +38,8 @@ describe("SettingsComponent", () => {
      title: "Scale & Settings",
      tabPath: "",
      node: undefined,
+      hashLocation: "settings",
+      onUpdateTabsButtons: undefined,
    }),
  };

@@ -126,6 +128,7 @@ describe("SettingsComponent", () => {
      isDatabaseExpanded: undefined,
      isDatabaseShared: ko.computed(() => true),
      selectedSubnodeKind: undefined,
+      selectDatabase: undefined,
      expandDatabase: undefined,
      collapseDatabase: undefined,
      loadCollections: undefined,
--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -17,7 +17,7 @@ import { userContext } from "../../../UserContext";
 import { MongoDBCollectionResource, MongoIndex } from "../../../Utils/arm/generatedClients/cosmos/types";
 import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
-import { useCommandBar } from "../../Menus/CommandBar/CommandBarComponentAdapter";
+import Explorer from "../../Explorer";
 import { SettingsTabV2 } from "../../Tabs/SettingsTabV2";
 import "./SettingsComponent.less";
 import { mongoIndexingPolicyAADError } from "./SettingsRenderUtils";
@@ -121,6 +121,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
  private collection: ViewModels.Collection;
  private database: ViewModels.Database;
  private offer: DataModels.Offer;
+  private container: Explorer;
  private changeFeedPolicyVisible: boolean;
  private isFixedContainer: boolean;
  private shouldShowIndexingPolicyEditor: boolean;
@@ -132,6 +133,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
    this.isCollectionSettingsTab = this.props.settingsTab.tabKind === ViewModels.CollectionTabKind.CollectionSettingsV2;
    if (this.isCollectionSettingsTab) {
      this.collection = this.props.settingsTab.collection as ViewModels.Collection;
+      this.container = this.collection?.container;
      this.offer = this.collection?.offer();
      this.isAnalyticalStorageEnabled = !!this.collection?.analyticalStorageTtl();
      this.shouldShowIndexingPolicyEditor = userContext.apiType !== "Cassandra" && userContext.apiType !== "Mongo";
@@ -143,6 +145,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
        userContext.apiType === "Mongo" && (!this.collection?.partitionKey || this.collection?.partitionKey.systemKey);
    } else {
      this.database = this.props.settingsTab.database;
+      this.container = this.database?.container;
      this.offer = this.database?.offer();
    }

@@ -219,13 +222,13 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
    this.setAutoPilotStates();
    this.setBaseline();
    if (this.props.settingsTab.isActive()) {
-      useCommandBar.getState().setContextButtons(this.getTabsButtons());
+      this.props.settingsTab.getContainer().onUpdateTabsButtons(this.getTabsButtons());
    }
  }

  componentDidUpdate(): void {
    if (this.props.settingsTab.isActive()) {
-      useCommandBar.getState().setContextButtons(this.getTabsButtons());
+      this.props.settingsTab.getContainer().onUpdateTabsButtons(this.getTabsButtons());
    }
  }

@@ -290,7 +293,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
    this.state.wasAutopilotOriginallySet !== this.state.isAutoPilotSelected;

  public shouldShowKeyspaceSharedThroughputMessage = (): boolean =>
-    userContext.apiType === "Cassandra" && hasDatabaseSharedThroughput(this.collection);
+    this.container && userContext.apiType === "Cassandra" && hasDatabaseSharedThroughput(this.collection);

  public hasConflictResolution = (): boolean =>
    userContext?.databaseAccount?.properties?.enableMultipleWriteLocations &&
@@ -880,6 +883,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
    const scaleComponentProps: ScaleComponentProps = {
      collection: this.collection,
      database: this.database,
+      container: this.container,
      isFixedContainer: this.isFixedContainer,
      onThroughputChange: this.onThroughputChange,
      throughput: this.state.throughput,
@@ -907,6 +911,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S

    const subSettingsComponentProps: SubSettingsComponentProps = {
      collection: this.collection,
+      container: this.container,
      isAnalyticalStorageEnabled: this.isAnalyticalStorageEnabled,
      changeFeedPolicyVisible: this.changeFeedPolicyVisible,
      timeToLive: this.state.timeToLive,
@@ -959,6 +964,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S

    const conflictResolutionPolicyComponentProps: ConflictResolutionComponentProps = {
      collection: this.collection,
+      container: this.container,
      conflictResolutionPolicyMode: this.state.conflictResolutionPolicyMode,
      conflictResolutionPolicyModeBaseline: this.state.conflictResolutionPolicyModeBaseline,
      onConflictResolutionPolicyModeChange: this.onConflictResolutionPolicyModeChange,
--- a/src/Explorer/Controls/Settings/SettingsComponentAdapter.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponentAdapter.tsx
@@ -0,0 +1,14 @@
+import ko from "knockout";
+import * as React from "react";
+import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
+import { SettingsComponent, SettingsComponentProps } from "./SettingsComponent";
+
+export class SettingsComponentAdapter implements ReactAdapter {
+  public parameters: ko.Computed<boolean>;
+
+  constructor(private props: SettingsComponentProps) {}
+
+  public renderComponent(): JSX.Element {
+    return this.parameters() ? <SettingsComponent {...this.props} /> : <></>;
+  }
+}
--- a/src/Explorer/Controls/Settings/SettingsRenderUtils.tsx
+++ b/src/Explorer/Controls/Settings/SettingsRenderUtils.tsx
@@ -1,45 +1,45 @@
+import * as React from "react";
+import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
+import { AutopilotDocumentation, hoursInAMonth } from "../../../Shared/Constants";
+import { Urls, StyleConstants } from "../../../Common/Constants";
+import {
+  getPriceCurrency,
+  getCurrencySign,
+  getAutoscalePricePerRu,
+  getMultimasterMultiplier,
+  computeRUUsagePriceHourly,
+  getPricePerRu,
+  estimatedCostDisclaimer,
+} from "../../../Utils/PricingUtils";
 import {
-  DetailsList,
-  DetailsListLayoutMode,
-  DetailsRow,
-  ICheckboxStyles,
-  IChoiceGroupStyles,
-  IColumn,
-  IDetailsColumnStyles,
-  IDetailsListStyles,
-  IDetailsRowProps,
-  IDetailsRowStyles,
-  IDropdownStyles,
-  IMessageBarStyles,
-  ISeparatorStyles,
-  IStackProps,
-  IStackStyles,
-  IStackTokens,
  ITextFieldStyles,
-  ITextStyles,
+  ICheckboxStyles,
+  IStackProps,
+  IStackTokens,
+  IChoiceGroupStyles,
  Link,
+  Text,
+  IMessageBarStyles,
+  ITextStyles,
+  IDetailsRowStyles,
+  IStackStyles,
+  IDetailsListStyles,
+  IDropdownStyles,
+  ISeparatorStyles,
  MessageBar,
  MessageBarType,
-  SelectionMode,
+  Stack,
  Spinner,
  SpinnerSize,
-  Stack,
-  Text,
+  DetailsList,
+  IColumn,
+  SelectionMode,
+  DetailsListLayoutMode,
+  IDetailsRowProps,
+  DetailsRow,
+  IDetailsColumnStyles,
 } from "@fluentui/react";
-import * as React from "react";
-import { StyleConstants, Urls } from "../../../Common/Constants";
-import { AutopilotDocumentation, hoursInAMonth } from "../../../Shared/Constants";
-import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
-import {
-  computeRUUsagePriceHourly,
-  estimatedCostDisclaimer,
-  getAutoscalePricePerRu,
-  getCurrencySign,
-  getMultimasterMultiplier,
-  getPriceCurrency,
-  getPricePerRu,
-} from "../../../Utils/PricingUtils";
-import { isDirty, isDirtyTypes } from "./SettingsUtils";
+import { isDirtyTypes, isDirty } from "./SettingsUtils";

 export interface EstimatedSpendingDisplayProps {
  costType: JSX.Element;
@@ -65,7 +65,7 @@ export interface PriceBreakdown {
  currencySign: string;
 }

-export const infoAndToolTipTextStyle: ITextStyles = { root: { fontSize: 14, color: "windowtext" } };
+export const infoAndToolTipTextStyle: ITextStyles = { root: { fontSize: 14 } };

 export const noLeftPaddingCheckBoxStyle: ICheckboxStyles = {
  label: {
@@ -223,15 +223,14 @@ export const getRuPriceBreakdown = (
    multimasterEnabled: isMultimaster,
    isAutoscale: isAutoscale,
  });
-  const multimasterMultiplier = getMultimasterMultiplier(numberOfRegions, isMultimaster);
-  const pricePerRu: number = isAutoscale
-    ? getAutoscalePricePerRu(serverId, multimasterMultiplier)
-    : getPricePerRu(serverId, multimasterMultiplier);
+  const basePricePerRu: number = isAutoscale
+    ? getAutoscalePricePerRu(serverId, getMultimasterMultiplier(numberOfRegions, isMultimaster))
+    : getPricePerRu(serverId);
  return {
-    hourlyPrice,
+    hourlyPrice: hourlyPrice,
    dailyPrice: hourlyPrice * 24,
    monthlyPrice: hourlyPrice * hoursInAMonth,
-    pricePerRu,
+    pricePerRu: basePricePerRu * getMultimasterMultiplier(numberOfRegions, isMultimaster),
    currency: getPriceCurrency(serverId),
    currencySign: getCurrencySign(serverId),
  };
@@ -272,7 +271,7 @@ export const manualToAutoscaleDisclaimerElement: JSX.Element = (
  <Text styles={infoAndToolTipTextStyle} id="manualToAutoscaleDisclaimerElement">
    The starting autoscale max RU/s will be determined by the system, based on the current manual throughput settings
    and storage of your resource. After autoscale has been enabled, you can change the max RU/s.{" "}
-    <Link href={Urls.autoscaleMigration}>Learn more</Link>
+    <a href={Urls.autoscaleMigration}>Learn more</a>
  </Text>
 );

--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ConflictResolutionComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ConflictResolutionComponent.test.tsx
@@ -1,12 +1,13 @@
 import { shallow } from "enzyme";
 import React from "react";
+import { ConflictResolutionComponentProps, ConflictResolutionComponent } from "./ConflictResolutionComponent";
+import { container, collection } from "../TestUtils";
 import * as DataModels from "../../../../Contracts/DataModels";
-import { collection } from "../TestUtils";
-import { ConflictResolutionComponent, ConflictResolutionComponentProps } from "./ConflictResolutionComponent";

 describe("ConflictResolutionComponent", () => {
  const baseProps: ConflictResolutionComponentProps = {
    collection: collection,
+    container: container,
    conflictResolutionPolicyMode: DataModels.ConflictResolutionMode.Custom,
    conflictResolutionPolicyModeBaseline: DataModels.ConflictResolutionMode.Custom,
    onConflictResolutionPolicyModeChange: () => {
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ConflictResolutionComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ConflictResolutionComponent.tsx
@@ -1,19 +1,21 @@
-import { ChoiceGroup, IChoiceGroupOption, ITextFieldProps, Stack, TextField } from "@fluentui/react";
 import * as React from "react";
-import * as DataModels from "../../../../Contracts/DataModels";
 import * as ViewModels from "../../../../Contracts/ViewModels";
+import * as DataModels from "../../../../Contracts/DataModels";
+import Explorer from "../../../Explorer";
 import {
-  conflictResolutionCustomToolTip,
-  conflictResolutionLwwTooltip,
-  getChoiceGroupStyles,
  getTextFieldStyles,
+  conflictResolutionLwwTooltip,
+  conflictResolutionCustomToolTip,
  subComponentStackProps,
+  getChoiceGroupStyles,
 } from "../SettingsRenderUtils";
-import { isDirty } from "../SettingsUtils";
+import { TextField, ITextFieldProps, Stack, IChoiceGroupOption, ChoiceGroup } from "@fluentui/react";
 import { ToolTipLabelComponent } from "./ToolTipLabelComponent";
+import { isDirty } from "../SettingsUtils";

 export interface ConflictResolutionComponentProps {
  collection: ViewModels.Collection;
+  container: Explorer;
  conflictResolutionPolicyMode: DataModels.ConflictResolutionMode;
  conflictResolutionPolicyModeBaseline: DataModels.ConflictResolutionMode;
  onConflictResolutionPolicyModeChange: (newMode: DataModels.ConflictResolutionMode) => void;
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/snapshots/IndexingPolicyRefreshComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/snapshots/IndexingPolicyRefreshComponent.test.tsx.snap
@@ -8,7 +8,6 @@ exports[`IndexingPolicyRefreshComponent renders 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.test.tsx
@@ -7,17 +7,20 @@ import * as SharedConstants from "../../../../Shared/Constants";
 import { updateUserContext } from "../../../../UserContext";
 import Explorer from "../../../Explorer";
 import { throughputUnit } from "../SettingsRenderUtils";
-import { collection } from "../TestUtils";
+import { collection, container } from "../TestUtils";
 import { ScaleComponent, ScaleComponentProps } from "./ScaleComponent";
 import { ThroughputInputAutoPilotV3Component } from "./ThroughputInputComponents/ThroughputInputAutoPilotV3Component";

 describe("ScaleComponent", () => {
  const nonNationalCloudContainer = new Explorer();
+  nonNationalCloudContainer.isRunningOnNationalCloud = () => false;
+
  const targetThroughput = 6000;

  const baseProps: ScaleComponentProps = {
    collection: collection,
    database: undefined,
+    container: container,
    isFixedContainer: false,
    onThroughputChange: () => {
      return;
@@ -108,7 +111,7 @@ describe("ScaleComponent", () => {
    let scaleComponent = new ScaleComponent(baseProps);
    expect(scaleComponent.getThroughputTitle()).toEqual("Throughput (6,000 - unlimited RU/s)");

-    let newProps = { ...baseProps };
+    let newProps = { ...baseProps, container: nonNationalCloudContainer };
    scaleComponent = new ScaleComponent(newProps);
    expect(scaleComponent.getThroughputTitle()).toEqual("Throughput (6,000 - unlimited RU/s)");

@@ -121,7 +124,7 @@ describe("ScaleComponent", () => {
    let scaleComponent = new ScaleComponent(baseProps);
    expect(scaleComponent.canThroughputExceedMaximumValue()).toEqual(true);

-    const newProps = { ...baseProps };
+    const newProps = { ...baseProps, container: nonNationalCloudContainer };
    scaleComponent = new ScaleComponent(newProps);
    expect(scaleComponent.canThroughputExceedMaximumValue()).toEqual(true);
  });
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx
@@ -7,7 +7,7 @@ import * as ViewModels from "../../../../Contracts/ViewModels";
 import * as SharedConstants from "../../../../Shared/Constants";
 import { userContext } from "../../../../UserContext";
 import * as AutoPilotUtils from "../../../../Utils/AutoPilotUtils";
-import { isRunningOnNationalCloud } from "../../../../Utils/CloudUtils";
+import Explorer from "../../../Explorer";
 import {
  getTextFieldStyles,
  getThroughputApplyLongDelayMessage,
@@ -23,6 +23,7 @@ import { ThroughputInputAutoPilotV3Component } from "./ThroughputInputComponents
 export interface ScaleComponentProps {
  collection: ViewModels.Collection;
  database: ViewModels.Database;
+  container: Explorer;
  isFixedContainer: boolean;
  onThroughputChange: (newThroughput: number) => void;
  throughput: number;
@@ -108,7 +109,11 @@ export class ScaleComponent extends React.Component<ScaleComponentProps> {
  };

  public canThroughputExceedMaximumValue = (): boolean => {
-    return !this.props.isFixedContainer && configContext.platform === Platform.Portal && !isRunningOnNationalCloud();
+    return (
+      !this.props.isFixedContainer &&
+      configContext.platform === Platform.Portal &&
+      !this.props.container.isRunningOnNationalCloud()
+    );
  };

  public getInitialNotificationElement = (): JSX.Element => {
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.test.tsx
@@ -4,12 +4,14 @@ import { DatabaseAccount } from "../../../../Contracts/DataModels";
 import { updateUserContext } from "../../../../UserContext";
 import Explorer from "../../../Explorer";
 import { ChangeFeedPolicyState, GeospatialConfigType, TtlOff, TtlOn, TtlOnNoDefault, TtlType } from "../SettingsUtils";
-import { collection } from "../TestUtils";
+import { collection, container } from "../TestUtils";
 import { SubSettingsComponent, SubSettingsComponentProps } from "./SubSettingsComponent";

 describe("SubSettingsComponent", () => {
  const baseProps: SubSettingsComponentProps = {
    collection: collection,
+    container: container,
+
    timeToLive: TtlType.On,
    timeToLiveBaseline: TtlType.On,
    onTtlChange: () => {
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx
@@ -2,6 +2,7 @@ import { ChoiceGroup, IChoiceGroupOption, Label, Link, MessageBar, Stack, Text,
 import * as React from "react";
 import * as ViewModels from "../../../../Contracts/ViewModels";
 import { userContext } from "../../../../UserContext";
+import Explorer from "../../../Explorer";
 import { Int32 } from "../../../Panes/Tables/Validators/EntityPropertyValidationCommon";
 import {
  changeFeedPolicyToolTip,
@@ -27,6 +28,8 @@ import { ToolTipLabelComponent } from "./ToolTipLabelComponent";

 export interface SubSettingsComponentProps {
  collection: ViewModels.Collection;
+  container: Explorer;
+
  timeToLive: TtlType;
  timeToLiveBaseline: TtlType;

--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/snapshots/ThroughputInputAutoPilotV3Component.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/snapshots/ThroughputInputAutoPilotV3Component.test.tsx.snap
@@ -20,7 +20,6 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
      styles={
        Object {
          "root": Object {
-            "color": "windowtext",
            "fontSize": 14,
          },
        }
@@ -40,7 +39,6 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
            styles={
              Object {
                "root": Object {
-                  "color": "windowtext",
                  "fontSize": 14,
                },
              }
@@ -75,7 +73,6 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
        styles={
          Object {
            "root": Object {
-              "color": "windowtext",
              "fontSize": 14,
            },
          }
@@ -83,11 +80,11 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
      >
        The starting autoscale max RU/s will be determined by the system, based on the current manual throughput settings and storage of your resource. After autoscale has been enabled, you can change the max RU/s.
         
-        <StyledLinkBase
+        <a
          href="https://aka.ms/cosmos-autoscale-migration"
        >
          Learn more
-        </StyledLinkBase>
+        </a>
      </Text>
    </StyledMessageBar>
    <StyledChoiceGroup
@@ -189,7 +186,6 @@ exports[`ThroughputInputAutoPilotV3Component spendAck checkbox visible 1`] = `
            styles={
              Object {
                "root": Object {
-                  "color": "windowtext",
                  "fontSize": 14,
                },
              }
@@ -464,7 +460,6 @@ exports[`ThroughputInputAutoPilotV3Component throughput input visible 1`] = `
            styles={
              Object {
                "root": Object {
-                  "color": "windowtext",
                  "fontSize": 14,
                },
              }
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/snapshots/ScaleComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/snapshots/ScaleComponent.test.tsx.snap
@@ -16,7 +16,6 @@ exports[`ScaleComponent renders with correct initial notification 1`] = `
      styles={
        Object {
          "root": Object {
-            "color": "windowtext",
            "fontSize": 14,
          },
        }
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/snapshots/SubSettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/snapshots/SubSettingsComponent.test.tsx.snap
@@ -136,7 +136,6 @@ exports[`SubSettingsComponent analyticalTimeToLive hidden 1`] = `
            styles={
              Object {
                "root": Object {
-                  "color": "windowtext",
                  "fontSize": 14,
                },
              }
@@ -413,7 +412,6 @@ exports[`SubSettingsComponent analyticalTimeToLiveSeconds hidden 1`] = `
            styles={
              Object {
                "root": Object {
-                  "color": "windowtext",
                  "fontSize": 14,
                },
              }
@@ -954,7 +952,6 @@ exports[`SubSettingsComponent renders 1`] = `
            styles={
              Object {
                "root": Object {
-                  "color": "windowtext",
                  "fontSize": 14,
                },
              }
@@ -1231,7 +1228,6 @@ exports[`SubSettingsComponent timeToLiveSeconds hidden 1`] = `
            styles={
              Object {
                "root": Object {
-                  "color": "windowtext",
                  "fontSize": 14,
                },
              }
--- a/src/Explorer/Controls/Settings/SettingsUtils.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsUtils.test.tsx
@@ -36,6 +36,7 @@ describe("SettingsUtils", () => {
        isDatabaseExpanded: ko.observable(false),
        isDatabaseShared: ko.computed(() => true),
        selectedSubnodeKind: ko.observable(undefined),
+        selectDatabase: undefined,
        expandDatabase: undefined,
        collapseDatabase: undefined,
        loadCollections: undefined,
--- a/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
@@ -30,21 +30,73 @@ exports[`SettingsComponent renders 1`] = `
              "container": Explorer {
                "_isInitializingNotebooks": false,
                "_resetNotebookWorkspace": [Function],
+                "canSaveQueries": [Function],
+                "collapsedResourceTreeWidth": 36,
+                "commandBarComponentAdapter": CommandBarComponentAdapter {
+                  "container": [Circular],
+                  "isNotebookTabActive": [Function],
+                  "parameters": [Function],
+                  "tabsButtons": Array [],
+                },
+                "databases": [Function],
+                "isAccountReady": [Function],
                "isFixedCollectionWithSharedThroughputSupported": [Function],
+                "isHostedDataExplorerEnabled": [Function],
+                "isNotebookEnabled": [Function],
+                "isNotebooksEnabledForAccount": [Function],
+                "isResourceTokenCollectionNodeSelected": [Function],
+                "isSchemaEnabled": [Function],
+                "isServerlessEnabled": [Function],
+                "isShellEnabled": [Function],
+                "isSynapseLinkUpdating": [Function],
                "isTabsContentExpanded": [Function],
+                "memoryUsageInfo": [Function],
+                "notebookBasePath": [Function],
+                "notebookServerInfo": [Function],
                "onRefreshDatabasesKeyPress": [Function],
                "onRefreshResourcesClick": [Function],
-                "phoenixClient": PhoenixClient {},
                "provideFeedbackEmail": [Function],
                "queriesClient": QueriesClient {
                  "container": [Circular],
                },
                "refreshNotebookList": [Function],
+                "resourceTokenCollection": [Function],
+                "resourceTokenCollectionId": [Function],
+                "resourceTokenDatabaseId": [Function],
+                "resourceTokenPartitionKey": [Function],
                "resourceTree": ResourceTreeAdapter {
                  "container": [Circular],
                  "copyNotebook": [Function],
+                  "databaseCollectionIdMap": Map {},
+                  "koSubsCollectionIdMap": Map {},
+                  "koSubsDatabaseIdMap": Map {},
                  "parameters": [Function],
                },
+                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                  "container": [Circular],
+                  "parameters": [Function],
+                },
+                "selectedDatabaseId": [Function],
+                "selectedNode": [Function],
+                "setInProgressConsoleDataIdToBeDeleted": undefined,
+                "setNotificationConsoleData": undefined,
+                "sparkClusterConnectionInfo": [Function],
+                "splitter": Splitter {
+                  "bounds": Object {
+                    "max": 400,
+                    "min": 240,
+                  },
+                  "direction": "vertical",
+                  "isCollapsed": [Function],
+                  "leftSideId": "resourcetree",
+                  "onResizeStart": [Function],
+                  "onResizeStop": [Function],
+                  "splitterId": "h_splitter1",
+                },
+                "tabsManager": TabsManager {
+                  "activeTab": [Function],
+                  "openedTabs": [Function],
+                },
              },
              "databaseId": "test",
              "defaultTtl": [Function],
@@ -64,6 +116,79 @@ exports[`SettingsComponent renders 1`] = `
              "usageSizeInKB": [Function],
            }
          }
+          container={
+            Explorer {
+              "_isInitializingNotebooks": false,
+              "_resetNotebookWorkspace": [Function],
+              "canSaveQueries": [Function],
+              "collapsedResourceTreeWidth": 36,
+              "commandBarComponentAdapter": CommandBarComponentAdapter {
+                "container": [Circular],
+                "isNotebookTabActive": [Function],
+                "parameters": [Function],
+                "tabsButtons": Array [],
+              },
+              "databases": [Function],
+              "isAccountReady": [Function],
+              "isFixedCollectionWithSharedThroughputSupported": [Function],
+              "isHostedDataExplorerEnabled": [Function],
+              "isNotebookEnabled": [Function],
+              "isNotebooksEnabledForAccount": [Function],
+              "isResourceTokenCollectionNodeSelected": [Function],
+              "isSchemaEnabled": [Function],
+              "isServerlessEnabled": [Function],
+              "isShellEnabled": [Function],
+              "isSynapseLinkUpdating": [Function],
+              "isTabsContentExpanded": [Function],
+              "memoryUsageInfo": [Function],
+              "notebookBasePath": [Function],
+              "notebookServerInfo": [Function],
+              "onRefreshDatabasesKeyPress": [Function],
+              "onRefreshResourcesClick": [Function],
+              "provideFeedbackEmail": [Function],
+              "queriesClient": QueriesClient {
+                "container": [Circular],
+              },
+              "refreshNotebookList": [Function],
+              "resourceTokenCollection": [Function],
+              "resourceTokenCollectionId": [Function],
+              "resourceTokenDatabaseId": [Function],
+              "resourceTokenPartitionKey": [Function],
+              "resourceTree": ResourceTreeAdapter {
+                "container": [Circular],
+                "copyNotebook": [Function],
+                "databaseCollectionIdMap": Map {},
+                "koSubsCollectionIdMap": Map {},
+                "koSubsDatabaseIdMap": Map {},
+                "parameters": [Function],
+              },
+              "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                "container": [Circular],
+                "parameters": [Function],
+              },
+              "selectedDatabaseId": [Function],
+              "selectedNode": [Function],
+              "setInProgressConsoleDataIdToBeDeleted": undefined,
+              "setNotificationConsoleData": undefined,
+              "sparkClusterConnectionInfo": [Function],
+              "splitter": Splitter {
+                "bounds": Object {
+                  "max": 400,
+                  "min": 240,
+                },
+                "direction": "vertical",
+                "isCollapsed": [Function],
+                "leftSideId": "resourcetree",
+                "onResizeStart": [Function],
+                "onResizeStop": [Function],
+                "splitterId": "h_splitter1",
+              },
+              "tabsManager": TabsManager {
+                "activeTab": [Function],
+                "openedTabs": [Function],
+              },
+            }
+          }
          isAutoPilotSelected={false}
          isFixedContainer={false}
          onAutoPilotSelected={[Function]}
@@ -98,21 +223,73 @@ exports[`SettingsComponent renders 1`] = `
              "container": Explorer {
                "_isInitializingNotebooks": false,
                "_resetNotebookWorkspace": [Function],
+                "canSaveQueries": [Function],
+                "collapsedResourceTreeWidth": 36,
+                "commandBarComponentAdapter": CommandBarComponentAdapter {
+                  "container": [Circular],
+                  "isNotebookTabActive": [Function],
+                  "parameters": [Function],
+                  "tabsButtons": Array [],
+                },
+                "databases": [Function],
+                "isAccountReady": [Function],
                "isFixedCollectionWithSharedThroughputSupported": [Function],
+                "isHostedDataExplorerEnabled": [Function],
+                "isNotebookEnabled": [Function],
+                "isNotebooksEnabledForAccount": [Function],
+                "isResourceTokenCollectionNodeSelected": [Function],
+                "isSchemaEnabled": [Function],
+                "isServerlessEnabled": [Function],
+                "isShellEnabled": [Function],
+                "isSynapseLinkUpdating": [Function],
                "isTabsContentExpanded": [Function],
+                "memoryUsageInfo": [Function],
+                "notebookBasePath": [Function],
+                "notebookServerInfo": [Function],
                "onRefreshDatabasesKeyPress": [Function],
                "onRefreshResourcesClick": [Function],
-                "phoenixClient": PhoenixClient {},
                "provideFeedbackEmail": [Function],
                "queriesClient": QueriesClient {
                  "container": [Circular],
                },
                "refreshNotebookList": [Function],
+                "resourceTokenCollection": [Function],
+                "resourceTokenCollectionId": [Function],
+                "resourceTokenDatabaseId": [Function],
+                "resourceTokenPartitionKey": [Function],
                "resourceTree": ResourceTreeAdapter {
                  "container": [Circular],
                  "copyNotebook": [Function],
+                  "databaseCollectionIdMap": Map {},
+                  "koSubsCollectionIdMap": Map {},
+                  "koSubsDatabaseIdMap": Map {},
                  "parameters": [Function],
                },
+                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                  "container": [Circular],
+                  "parameters": [Function],
+                },
+                "selectedDatabaseId": [Function],
+                "selectedNode": [Function],
+                "setInProgressConsoleDataIdToBeDeleted": undefined,
+                "setNotificationConsoleData": undefined,
+                "sparkClusterConnectionInfo": [Function],
+                "splitter": Splitter {
+                  "bounds": Object {
+                    "max": 400,
+                    "min": 240,
+                  },
+                  "direction": "vertical",
+                  "isCollapsed": [Function],
+                  "leftSideId": "resourcetree",
+                  "onResizeStart": [Function],
+                  "onResizeStop": [Function],
+                  "splitterId": "h_splitter1",
+                },
+                "tabsManager": TabsManager {
+                  "activeTab": [Function],
+                  "openedTabs": [Function],
+                },
              },
              "databaseId": "test",
              "defaultTtl": [Function],
@@ -132,6 +309,79 @@ exports[`SettingsComponent renders 1`] = `
              "usageSizeInKB": [Function],
            }
          }
+          container={
+            Explorer {
+              "_isInitializingNotebooks": false,
+              "_resetNotebookWorkspace": [Function],
+              "canSaveQueries": [Function],
+              "collapsedResourceTreeWidth": 36,
+              "commandBarComponentAdapter": CommandBarComponentAdapter {
+                "container": [Circular],
+                "isNotebookTabActive": [Function],
+                "parameters": [Function],
+                "tabsButtons": Array [],
+              },
+              "databases": [Function],
+              "isAccountReady": [Function],
+              "isFixedCollectionWithSharedThroughputSupported": [Function],
+              "isHostedDataExplorerEnabled": [Function],
+              "isNotebookEnabled": [Function],
+              "isNotebooksEnabledForAccount": [Function],
+              "isResourceTokenCollectionNodeSelected": [Function],
+              "isSchemaEnabled": [Function],
+              "isServerlessEnabled": [Function],
+              "isShellEnabled": [Function],
+              "isSynapseLinkUpdating": [Function],
+              "isTabsContentExpanded": [Function],
+              "memoryUsageInfo": [Function],
+              "notebookBasePath": [Function],
+              "notebookServerInfo": [Function],
+              "onRefreshDatabasesKeyPress": [Function],
+              "onRefreshResourcesClick": [Function],
+              "provideFeedbackEmail": [Function],
+              "queriesClient": QueriesClient {
+                "container": [Circular],
+              },
+              "refreshNotebookList": [Function],
+              "resourceTokenCollection": [Function],
+              "resourceTokenCollectionId": [Function],
+              "resourceTokenDatabaseId": [Function],
+              "resourceTokenPartitionKey": [Function],
+              "resourceTree": ResourceTreeAdapter {
+                "container": [Circular],
+                "copyNotebook": [Function],
+                "databaseCollectionIdMap": Map {},
+                "koSubsCollectionIdMap": Map {},
+                "koSubsDatabaseIdMap": Map {},
+                "parameters": [Function],
+              },
+              "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                "container": [Circular],
+                "parameters": [Function],
+              },
+              "selectedDatabaseId": [Function],
+              "selectedNode": [Function],
+              "setInProgressConsoleDataIdToBeDeleted": undefined,
+              "setNotificationConsoleData": undefined,
+              "sparkClusterConnectionInfo": [Function],
+              "splitter": Splitter {
+                "bounds": Object {
+                  "max": 400,
+                  "min": 240,
+                },
+                "direction": "vertical",
+                "isCollapsed": [Function],
+                "leftSideId": "resourcetree",
+                "onResizeStart": [Function],
+                "onResizeStop": [Function],
+                "splitterId": "h_splitter1",
+              },
+              "tabsManager": TabsManager {
+                "activeTab": [Function],
+                "openedTabs": [Function],
+              },
+            }
+          }
          geospatialConfigType="Geometry"
          geospatialConfigTypeBaseline="Geometry"
          isAnalyticalStorageEnabled={false}
--- a/src/Explorer/Controls/Settings/snapshots/SettingsRenderUtils.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/snapshots/SettingsRenderUtils.test.tsx.snap
@@ -159,7 +159,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -167,17 +166,16 @@ exports[`SettingsUtils functions render 1`] = `
  >
    The starting autoscale max RU/s will be determined by the system, based on the current manual throughput settings and storage of your resource. After autoscale has been enabled, you can change the max RU/s.
     
-    <StyledLinkBase
+    <a
      href="https://aka.ms/cosmos-autoscale-migration"
    >
      Learn more
-    </StyledLinkBase>
+    </a>
  </Text>
  <Text
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -197,7 +195,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -210,7 +207,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -223,7 +219,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -235,7 +230,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -255,7 +249,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -271,7 +264,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -286,7 +278,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -300,7 +291,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -312,7 +302,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -332,7 +321,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -375,7 +363,6 @@ exports[`SettingsUtils functions render 1`] = `
      styles={
        Object {
          "root": Object {
-            "color": "windowtext",
            "fontSize": 14,
          },
        }
@@ -391,7 +378,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
@@ -408,7 +394,6 @@ exports[`SettingsUtils functions render 1`] = `
    styles={
      Object {
        "root": Object {
-          "color": "windowtext",
          "fontSize": 14,
        },
      }
--- a/src/Explorer/Controls/Tabs/TabComponent.less
+++ b/src/Explorer/Controls/Tabs/TabComponent.less
@@ -1,6 +1,7 @@
@import "../../../../less/Common/Constants";

 .tabComponentContainer {
+    overflow: hidden;
    height: 100%;
    .flex-display();
    .flex-direction();
--- a/src/Explorer/Controls/Tabs/TabComponent.tsx
+++ b/src/Explorer/Controls/Tabs/TabComponent.tsx
@@ -58,7 +58,7 @@ export class TabComponent extends React.Component<TabComponentProps> {
            as="span"
            className={className}
            role="presentation"
-            onActivated={() => this.setActiveTab(index)}
+            onActivated={(e) => this.setActiveTab(index)}
            aria-label={`Select tab: ${tab.title}`}
          >
            {tab.title}
--- a/src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx
+++ b/src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx
@@ -6,7 +6,6 @@ import { userContext } from "../../../../UserContext";
 import {
  calculateEstimateNumber,
  computeRUUsagePriceHourly,
-  estimatedCostDisclaimer,
  getAutoscalePricePerRu,
  getCurrencySign,
  getMultimasterMultiplier,
@@ -43,9 +42,11 @@ export const CostEstimateText: FunctionComponent<CostEstimateTextProps> = ({
  const currency: string = getPriceCurrency(serverId);
  const currencySign: string = getCurrencySign(serverId);
  const multiplier = getMultimasterMultiplier(numberOfRegions, multimasterEnabled);
-  const pricePerRu = isAutoscale ? getAutoscalePricePerRu(serverId, multiplier) : getPricePerRu(serverId, multiplier);
+  const pricePerRu = isAutoscale
+    ? getAutoscalePricePerRu(serverId, multiplier) * multiplier
+    : getPricePerRu(serverId) * multiplier;

-  const iconWithEstimatedCostDisclaimer: JSX.Element = <InfoTooltip>{estimatedCostDisclaimer}</InfoTooltip>;
+  const iconWithEstimatedCostDisclaimer: JSX.Element = <InfoTooltip>PricingUtils.estimatedCostDisclaimer</InfoTooltip>;

  if (isAutoscale) {
    return (
--- a/src/Explorer/Controls/ThroughputInput/ThroughputInput.test.tsx
+++ b/src/Explorer/Controls/ThroughputInput/ThroughputInput.test.tsx
@@ -4,7 +4,7 @@ import { ThroughputInput } from "./ThroughputInput";
 const props = {
  isDatabase: false,
  showFreeTierExceedThroughputTooltip: true,
-  isSharded: true,
+  isSharded: false,
  setThroughputValue: () => jest.fn(),
  setIsAutoscale: () => jest.fn(),
  onCostAcknowledgeChange: () => jest.fn(),
--- a/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
+++ b/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
@@ -41,16 +41,9 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
      throughputHeaderText = AutoPilotUtils.getAutoPilotHeaderText().toLocaleLowerCase();
    } else {
      const minRU: string = SharedConstants.CollectionCreation.DefaultCollectionRUs400.toLocaleString();
-
-      let maxRU: string;
-      if (userContext.isTryCosmosDBSubscription) {
-        maxRU = Constants.TryCosmosExperience.maxRU.toLocaleString();
-      } else if (!isSharded) {
-        maxRU = "10000";
-      } else {
-        maxRU = "unlimited";
-      }
-
+      const maxRU: string = userContext.isTryCosmosDBSubscription
+        ? Constants.TryCosmosExperience.maxRU.toLocaleString()
+        : "unlimited";
      throughputHeaderText = `throughput (${minRU} - ${maxRU} RU/s)`;
    }
    return `${isDatabase ? "Database" : getCollectionName()} ${throughputHeaderText}`;
@@ -118,7 +111,6 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
        <input
          className="throughputInputRadioBtn"
          aria-label="Autoscale mode"
-          aria-required={true}
          checked={isAutoscaleSelected}
          type="radio"
          role="radio"
@@ -132,7 +124,6 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
          aria-label="Manual mode"
          checked={!isAutoscaleSelected}
          type="radio"
-          aria-required={true}
          role="radio"
          tabIndex={0}
          onChange={(e) => handleOnChangeMode(e, "Manual")}
--- a/src/Explorer/Controls/ThroughputInput/snapshots/ThroughputInput.test.tsx.snap
+++ b/src/Explorer/Controls/ThroughputInput/snapshots/ThroughputInput.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`ThroughputInput Pane should render Default properly 1`] = `
 <ThroughputInput
  isDatabase={false}
-  isSharded={true}
+  isSharded={false}
  onCostAcknowledgeChange={[Function]}
  setIsAutoscale={[Function]}
  setThroughputValue={[Function]}
@@ -345,14 +345,12 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                    ariaLabel="Info"
                    className="panelInfoIcon"
                    iconName="Info"
-                    tabIndex={0}
                  >
                    <IconBase
                      ariaLabel="Info"
                      className="panelInfoIcon"
                      iconName="Info"
                      styles={[Function]}
-                      tabIndex={0}
                      theme={
                        Object {
                          "disableGlobalClassNames": false,
@@ -632,7 +630,6 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                        className="panelInfoIcon root-57"
                        data-icon-name="Info"
                        role="img"
-                        tabIndex={0}
                      >
                        
                      </i>
@@ -654,7 +651,6 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
      >
        <input
          aria-label="Autoscale mode"
-          aria-required={true}
          checked={true}
          className="throughputInputRadioBtn"
          key=".0:$.0"
@@ -671,7 +667,6 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
        </span>
        <input
          aria-label="Manual mode"
-          aria-required={true}
          checked={false}
          className="throughputInputRadioBtn"
          key=".0:$.2"
@@ -1332,14 +1327,12 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                        ariaLabel="Info"
                        className="panelInfoIcon"
                        iconName="Info"
-                        tabIndex={0}
                      >
                        <IconBase
                          ariaLabel="Info"
                          className="panelInfoIcon"
                          iconName="Info"
                          styles={[Function]}
-                          tabIndex={0}
                          theme={
                            Object {
                              "disableGlobalClassNames": false,
@@ -1619,7 +1612,6 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
                            className="panelInfoIcon root-57"
                            data-icon-name="Info"
                            role="img"
-                            tabIndex={0}
                          >
                            
                          </i>
--- a/src/Explorer/Controls/TreeComponent/TreeComponent.tsx
+++ b/src/Explorer/Controls/TreeComponent/TreeComponent.tsx
@@ -58,7 +58,7 @@ export interface TreeComponentProps {
 export class TreeComponent extends React.Component<TreeComponentProps> {
  public render(): JSX.Element {
    return (
-      <div style={this.props.style} className={`treeComponent ${this.props.className}`} role="tree">
+      <div style={this.props.style} className={`treeComponent ${this.props.className}`}>
        <TreeNodeComponent paddingLeft={0} node={this.props.rootNode} generation={0} />
      </div>
    );
@@ -172,7 +172,6 @@ export class TreeNodeComponent extends React.Component<TreeNodeComponentProps, T
        className={`${this.props.node.className || ""} main${generation} nodeItem ${showSelected ? "selected" : ""}`}
        onClick={(event: React.MouseEvent<HTMLDivElement>) => this.onNodeClick(event, node)}
        onKeyPress={(event: React.KeyboardEvent<HTMLDivElement>) => this.onNodeKeyPress(event, node)}
-        role="treeitem"
      >
        <div
          className={`treeNodeHeader ${this.state.isMenuShowing ? "showingMenu" : ""}`}
@@ -243,7 +242,6 @@ export class TreeNodeComponent extends React.Component<TreeNodeComponentProps, T
      <div ref={this.contextMenuRef} onContextMenu={this.onRightClick} onKeyPress={this.onMoreButtonKeyPress}>
        <IconButton
          name="More"
-          title="More"
          className="treeMenuEllipsis"
          ariaLabel={menuItemLabel}
          menuIconProps={{
--- a/src/Explorer/Controls/TreeComponent/snapshots/TreeComponent.test.tsx.snap
+++ b/src/Explorer/Controls/TreeComponent/snapshots/TreeComponent.test.tsx.snap
@@ -3,7 +3,6 @@
 exports[`TreeComponent renders a simple tree 1`] = `
 <div
  className="treeComponent tree"
-  role="tree"
 >
  <TreeNodeComponent
    generation={0}
@@ -38,7 +37,6 @@ exports[`TreeNodeComponent does not render children by default 1`] = `
  className=" main2 nodeItem "
  onClick={[Function]}
  onKeyPress={[Function]}
-  role="treeitem"
 >
  <div
    className="treeNodeHeader "
@@ -139,7 +137,6 @@ exports[`TreeNodeComponent renders a simple node (sorted children, expanded) 1`]
  className="nodeClassname main12 nodeItem "
  onClick={[Function]}
  onKeyPress={[Function]}
-  role="treeitem"
 >
  <div
    className="treeNodeHeader "
@@ -211,7 +208,6 @@ exports[`TreeNodeComponent renders a simple node (sorted children, expanded) 1`]
            },
          }
        }
-        title="More"
      />
    </div>
  </div>
@@ -289,7 +285,6 @@ exports[`TreeNodeComponent renders loading icon 1`] = `
  className=" main2 nodeItem "
  onClick={[Function]}
  onKeyPress={[Function]}
-  role="treeitem"
 >
  <div
    className="treeNodeHeader "
@@ -361,7 +356,6 @@ exports[`TreeNodeComponent renders sorted children, expanded, leaves and parents
  className="nodeClassname main12 nodeItem "
  onClick={[Function]}
  onKeyPress={[Function]}
-  role="treeitem"
 >
  <div
    className="treeNodeHeader "
@@ -424,7 +418,6 @@ exports[`TreeNodeComponent renders sorted children, expanded, leaves and parents
            },
          }
        }
-        title="More"
      />
    </div>
  </div>
@@ -530,7 +523,6 @@ exports[`TreeNodeComponent renders unsorted children by default 1`] = `
  className=" main2 nodeItem "
  onClick={[Function]}
  onKeyPress={[Function]}
-  role="treeitem"
 >
  <div
    className="treeNodeHeader "
--- a/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
+++ b/src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
@@ -2,22 +2,22 @@ jest.mock("../Graph/GraphExplorerComponent/GremlinClient");
 jest.mock("../../Common/dataAccess/createCollection");
 jest.mock("../../Common/dataAccess/createDocument");
 import * as ko from "knockout";
+import Q from "q";
 import { createDocument } from "../../Common/dataAccess/createDocument";
 import { DatabaseAccount } from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { updateUserContext } from "../../UserContext";
 import Explorer from "../Explorer";
-import { useDatabases } from "../useDatabases";
 import { ContainerSampleGenerator } from "./ContainerSampleGenerator";

 describe("ContainerSampleGenerator", () => {
-  let explorerStub: Explorer;
-
-  beforeAll(() => {
-    explorerStub = {
-      refreshAllDatabases: () => {},
-    } as Explorer;
-  });
+  const createExplorerStub = (database: ViewModels.Database): Explorer => {
+    const explorerStub = {} as Explorer;
+    explorerStub.databases = ko.observableArray<ViewModels.Database>([database]);
+    explorerStub.findDatabaseWithId = () => database;
+    explorerStub.refreshAllDatabases = () => Q.resolve();
+    return explorerStub;
+  };

  beforeEach(() => {
    (createDocument as jest.Mock).mockResolvedValue(undefined);
@@ -59,7 +59,8 @@ describe("ContainerSampleGenerator", () => {
      loadCollections: () => {},
    } as ViewModels.Database;
    database.findCollectionWithId = () => collection;
-    useDatabases.getState().addDatabases([database]);
+
+    const explorerStub = createExplorerStub(database);

    const generator = await ContainerSampleGenerator.createSampleGeneratorAsync(explorerStub);
    generator.setData(sampleData);
@@ -107,8 +108,8 @@ describe("ContainerSampleGenerator", () => {
    } as ViewModels.Database;
    database.findCollectionWithId = () => collection;
    collection.databaseId = database.id();
-    useDatabases.getState().addDatabases([database]);

+    const explorerStub = createExplorerStub(database);
    updateUserContext({
      databaseAccount: {
        properties: {
@@ -125,6 +126,7 @@ describe("ContainerSampleGenerator", () => {

  it("should not create any sample for Mongo API account", async () => {
    const experience = "Sample generation not supported for this API Mongo";
+    const explorerStub = createExplorerStub(undefined);
    updateUserContext({
      databaseAccount: {
        properties: {
@@ -139,6 +141,7 @@ describe("ContainerSampleGenerator", () => {

  it("should not create any sample for Table API account", async () => {
    const experience = "Sample generation not supported for this API Tables";
+    const explorerStub = createExplorerStub(undefined);
    updateUserContext({
      databaseAccount: {
        properties: {
@@ -160,6 +163,7 @@ describe("ContainerSampleGenerator", () => {
        },
      } as DatabaseAccount,
    });
+    const explorerStub = createExplorerStub(undefined);
    // Rejects with error that contains experience
    await expect(ContainerSampleGenerator.createSampleGeneratorAsync(explorerStub)).rejects.toMatch(experience);
  });
--- a/src/Explorer/DataSamples/ContainerSampleGenerator.ts
+++ b/src/Explorer/DataSamples/ContainerSampleGenerator.ts
@@ -7,7 +7,6 @@ import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"
 import GraphTab from ".././Tabs/GraphTab";
 import Explorer from "../Explorer";
 import { GremlinClient } from "../Graph/GraphExplorerComponent/GremlinClient";
-import { useDatabases } from "../useDatabases";

 interface SampleDataFile extends DataModels.CreateCollectionParams {
  data: any[];
@@ -60,7 +59,7 @@ export class ContainerSampleGenerator {

    await createCollection(createRequest);
    await this.container.refreshAllDatabases();
-    const database = useDatabases.getState().findDatabaseWithId(this.sampleDataFile.databaseId);
+    const database = this.container.findDatabaseWithId(this.sampleDataFile.databaseId);
    if (!database) {
      return undefined;
    }
--- a/src/Explorer/DataSamples/DataSamplesUtil.test.ts
+++ b/src/Explorer/DataSamples/DataSamplesUtil.test.ts
@@ -2,7 +2,6 @@ import * as ko from "knockout";
 import * as sinon from "sinon";
 import { Collection, Database } from "../../Contracts/ViewModels";
 import Explorer from "../Explorer";
-import { useDatabases } from "../useDatabases";
 import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
 import { DataSamplesUtil } from "./DataSamplesUtil";

@@ -17,7 +16,8 @@ describe("DataSampleUtils", () => {
      collections: ko.observableArray<Collection>([collection]),
    } as Database;
    const explorer = {} as Explorer;
-    useDatabases.getState().addDatabases([database]);
+    explorer.databases = ko.observableArray<Database>([database]);
+    explorer.showOkModalDialog = () => {};
    const dataSamplesUtil = new DataSamplesUtil(explorer);

    const fakeGenerator = sinon.createStubInstance<ContainerSampleGenerator>(ContainerSampleGenerator as any);
--- a/src/Explorer/DataSamples/DataSamplesUtil.ts
+++ b/src/Explorer/DataSamples/DataSamplesUtil.ts
@@ -1,9 +1,7 @@
 import * as ViewModels from "../../Contracts/ViewModels";
 import { userContext } from "../../UserContext";
 import { logConsoleError, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
-import { useDialog } from "../Controls/Dialog";
 import Explorer from "../Explorer";
-import { useDatabases } from "../useDatabases";
 import { ContainerSampleGenerator } from "./ContainerSampleGenerator";

 export class DataSamplesUtil {
@@ -19,9 +17,9 @@ export class DataSamplesUtil {

    const databaseName = generator.getDatabaseId();
    const containerName = generator.getCollectionId();
-    if (this.hasContainer(databaseName, containerName, useDatabases.getState().databases)) {
+    if (this.hasContainer(databaseName, containerName, this.container.databases())) {
      const msg = `The container ${containerName} in database ${databaseName} already exists. Please delete it and retry.`;
-      useDialog.getState().showOkModalDialog(DataSamplesUtil.DialogTitle, msg);
+      this.container.showOkModalDialog(DataSamplesUtil.DialogTitle, msg);
      logConsoleError(msg);
      return;
    }
@@ -30,7 +28,7 @@ export class DataSamplesUtil {
      .createSampleContainerAsync()
      .catch((error) => logConsoleError(`Error creating sample container: ${error}`));
    const msg = `The sample ${containerName} in database ${databaseName} has been successfully created.`;
-    useDialog.getState().showOkModalDialog(DataSamplesUtil.DialogTitle, msg);
+    this.container.showOkModalDialog(DataSamplesUtil.DialogTitle, msg);
    logConsoleInfo(msg);
  }

--- a/src/Explorer/Explorer.test.tsx
+++ b/src/Explorer/Explorer.test.tsx
@@ -0,0 +1,43 @@
+jest.mock("./../Common/dataAccess/deleteDatabase");
+jest.mock("./../Shared/Telemetry/TelemetryProcessor");
+import * as ko from "knockout";
+import { deleteDatabase } from "./../Common/dataAccess/deleteDatabase";
+import * as ViewModels from "./../Contracts/ViewModels";
+import Explorer from "./Explorer";
+
+describe("Explorer.isLastDatabase() and Explorer.isLastNonEmptyDatabase()", () => {
+  let explorer: Explorer;
+  beforeAll(() => {
+    (deleteDatabase as jest.Mock).mockResolvedValue(undefined);
+  });
+
+  beforeEach(() => {
+    explorer = new Explorer();
+  });
+
+  it("should be true if only 1 database", () => {
+    const database = {} as ViewModels.Database;
+    explorer.databases = ko.observableArray<ViewModels.Database>([database]);
+    expect(explorer.isLastDatabase()).toBe(true);
+  });
+
+  it("should be false if only 2 databases", () => {
+    const database = {} as ViewModels.Database;
+    const database2 = {} as ViewModels.Database;
+    explorer.databases = ko.observableArray<ViewModels.Database>([database, database2]);
+    expect(explorer.isLastDatabase()).toBe(false);
+  });
+
+  it("should be false if not last empty database", () => {
+    const database = {} as ViewModels.Database;
+    explorer.databases = ko.observableArray<ViewModels.Database>([database]);
+    expect(explorer.isLastNonEmptyDatabase()).toBe(false);
+  });
+
+  it("should be true if last non empty database", () => {
+    const database = {} as ViewModels.Database;
+    database.collections = ko.observableArray<ViewModels.Collection>([{} as ViewModels.Collection]);
+    explorer.databases = ko.observableArray<ViewModels.Database>([database]);
+    expect(explorer.isLastNonEmptyDatabase()).toBe(true);
+  });
+});
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
--- a/src/Explorer/Graph/GraphExplorerComponent/EditorNeighborsComponent.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/EditorNeighborsComponent.tsx
@@ -4,12 +4,12 @@
 */

 import * as React from "react";
-import AddPropertyIcon from "../../../../images/Add-property.svg";
-import DeleteIcon from "../../../../images/delete.svg";
-import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
-import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
-import { EditedEdges, GraphNewEdgeData, NeighborVertexBasicInfo, PossibleVertex } from "./GraphExplorer";
+import { NeighborVertexBasicInfo, EditedEdges, GraphNewEdgeData, PossibleVertex } from "./GraphExplorer";
 import * as GraphUtil from "./GraphUtil";
+import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
+import DeleteIcon from "../../../../images/delete.svg";
+import AddPropertyIcon from "../../../../images/Add-property.svg";
+import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";

 export interface EditorNeighborsComponentProps {
  isSource: boolean;
@@ -83,11 +83,11 @@ export class EditorNeighborsComponent extends React.Component<EditorNeighborsCom
  }

  private removeCurrentNeighborEdge(index: number): void {
-    const sources = this.props.editedNeighbors.currentNeighbors;
-    const id = sources[index].edgeId;
+    let sources = this.props.editedNeighbors.currentNeighbors;
+    let id = sources[index].edgeId;
    sources.splice(index, 1);

-    const droppedIds = this.props.editedNeighbors.droppedIds;
+    let droppedIds = this.props.editedNeighbors.droppedIds;
    droppedIds.push(id);
    this.onUpdateEdges();
  }
@@ -215,7 +215,7 @@ export class EditorNeighborsComponent extends React.Component<EditorNeighborsCom
            </td>
            <td className="actionCol">
              <span className="rightPaneTrashIcon rightPaneBtns">
-                <img src={DeleteIcon} alt="Delete" onClick={() => this.removeAddedEdgeToNeighbor(index)} />
+                <img src={DeleteIcon} alt="Delete" onClick={(e) => this.removeAddedEdgeToNeighbor(index)} />
              </span>
            </td>
          </tr>
--- a/src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.test.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.test.tsx
@@ -1,11 +1,12 @@
-import { shallow } from "enzyme";
 import React from "react";
+import { shallow } from "enzyme";
+import { GraphHighlightedNodeData, EditedProperties } from "./GraphExplorer";
+
 import { EditorNodePropertiesComponent, EditorNodePropertiesComponentProps } from "./EditorNodePropertiesComponent";

 describe("<EditorNodePropertiesComponent />", () => {
  // Tests that: single value prop is rendered with a textbox and a delete button
  // multi-value prop only a delete button (cannot be edited)
-  const onUpdateProperties = jest.fn();
  it("renders component", () => {
    const props: EditorNodePropertiesComponentProps = {
      editedProperties: {
@@ -23,6 +24,7 @@ describe("<EditorNodePropertiesComponent />", () => {
              { value: true, type: "boolean" },
              { value: false, type: "boolean" },
              { value: undefined, type: "null" },
+              { value: null, type: "null" },
            ],
          },
        ],
@@ -39,13 +41,14 @@ describe("<EditorNodePropertiesComponent />", () => {
              { value: true, type: "boolean" },
              { value: false, type: "boolean" },
              { value: undefined, type: "null" },
+              { value: null, type: "null" },
            ],
          },
        ],
        addedProperties: [],
        droppedKeys: [],
      },
-      onUpdateProperties,
+      onUpdateProperties: (editedProperties: EditedProperties): void => {},
    };
    const wrapper = shallow(<EditorNodePropertiesComponent {...props} />);
    expect(wrapper).toMatchSnapshot();
@@ -78,7 +81,7 @@ describe("<EditorNodePropertiesComponent />", () => {
        addedProperties: [],
        droppedKeys: [],
      },
-      onUpdateProperties,
+      onUpdateProperties: (editedProperties: EditedProperties): void => {},
    };
    const wrapper = shallow(<EditorNodePropertiesComponent {...props} />);
    expect(wrapper).toMatchSnapshot();
--- a/src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.tsx
@@ -4,12 +4,12 @@
 */

 import * as React from "react";
-import AddIcon from "../../../../images/Add-property.svg";
-import DeleteIcon from "../../../../images/delete.svg";
 import * as ViewModels from "../../../Contracts/ViewModels";
-import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
 import { EditedProperties } from "./GraphExplorer";
+import DeleteIcon from "../../../../images/delete.svg";
+import AddIcon from "../../../../images/Add-property.svg";
 import { ReadOnlyNodePropertiesComponent } from "./ReadOnlyNodePropertiesComponent";
+import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";

 export interface EditorNodePropertiesComponentProps {
  editedProperties: EditedProperties;
@@ -48,7 +48,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
    const editedProperties = this.props.editedProperties;
    // search for it
    for (let i = 0; i < editedProperties.existingProperties.length; i++) {
-      const ip = editedProperties.existingProperties[i];
+      let ip = editedProperties.existingProperties[i];
      if (ip.key === key) {
        editedProperties.existingProperties.splice(i, 1);
        editedProperties.droppedKeys.push(key);
@@ -60,7 +60,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro

  private removeAddedProperty(index: number): void {
    const editedProperties = this.props.editedProperties;
-    const ap = editedProperties.addedProperties;
+    let ap = editedProperties.addedProperties;
    ap.splice(index, 1);

    this.props.onUpdateProperties(editedProperties);
@@ -68,7 +68,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro

  private addProperty(): void {
    const editedProperties = this.props.editedProperties;
-    const ap = editedProperties.addedProperties;
+    let ap = editedProperties.addedProperties;
    ap.push({ key: "", values: [{ value: "", type: EditorNodePropertiesComponent.DEFAULT_PROPERTY_TYPE }] });
    this.props.onUpdateProperties(editedProperties);
  }
@@ -126,7 +126,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
            onChange={(e) => {
              singleValue.type = e.target.value as ViewModels.InputPropertyValueTypeString;
              if (singleValue.type === "null") {
-                singleValue.value = undefined;
+                singleValue.value = null;
              }
              this.props.onUpdateProperties(this.props.editedProperties);
            }}
@@ -144,7 +144,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
            className="rightPaneTrashIcon rightPaneBtns"
            as="span"
            aria-label="Delete property"
-            onActivated={() => this.removeExistingProperty(key)}
+            onActivated={(e) => this.removeExistingProperty(key)}
          >
            <img src={DeleteIcon} alt="Delete" />
          </AccessibleElement>
@@ -166,7 +166,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
            className="rightPaneTrashIcon rightPaneBtns"
            as="span"
            aria-label="Remove existing property"
-            onActivated={() => this.removeExistingProperty(nodeProp.key)}
+            onActivated={(e) => this.removeExistingProperty(nodeProp.key)}
          >
            <img src={DeleteIcon} alt="Delete" />
          </AccessibleElement>
@@ -206,7 +206,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
                    onChange={(e) => {
                      firstValue.value = e.target.value;
                      if (firstValue.type === "null") {
-                        firstValue.value = undefined;
+                        firstValue.value = null;
                      }
                      this.props.onUpdateProperties(this.props.editedProperties);
                    }}
@@ -235,7 +235,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
                  className="rightPaneTrashIcon rightPaneBtns"
                  as="span"
                  aria-label="Remove property"
-                  onActivated={() => this.removeAddedProperty(index)}
+                  onActivated={(e) => this.removeAddedProperty(index)}
                >
                  <img src={DeleteIcon} alt="Delete" />
                </AccessibleElement>
--- a/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
@@ -10,7 +10,7 @@ import { queryDocumentsPage } from "../../../Common/dataAccess/queryDocumentsPag
 import * as DataModels from "../../../Contracts/DataModels";
 import * as StorageUtility from "../../../Shared/StorageUtility";
 import { TabComponent } from "../../Controls/Tabs/TabComponent";
-import { ConsoleDataType } from "../../Menus/NotificationConsole/ConsoleData";
+import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
 import GraphTab from "../../Tabs/GraphTab";
 import * as D3ForceGraph from "./D3ForceGraph";
 import { GraphData } from "./GraphData";
--- a/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { FeedOptions, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import * as Q from "q";
 import * as React from "react";
@@ -20,7 +18,7 @@ import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../../Ut
 import { EditorReact } from "../../Controls/Editor/EditorReact";
 import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
 import * as TabComponent from "../../Controls/Tabs/TabComponent";
-import { ConsoleDataType } from "../../Menus/NotificationConsole/ConsoleData";
+import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
 import { IGraphConfig } from "../../Tabs/GraphTab";
 import { ArraysByKeyCache } from "./ArraysByKeyCache";
 import * as D3ForceGraph from "./D3ForceGraph";
@@ -296,6 +294,8 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      this.setGremlinParams();
    }

+    const selectedNode = this.state.highlightedNode;
+
    props.onGraphAccessorCreated({
      applyFilter: this.submitQuery.bind(this),
      addVertex: this.addVertex.bind(this),
@@ -303,7 +303,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    });
  } // constructor

-  public shareIGraphConfig(igraphConfig: IGraphConfig): void {
+  public shareIGraphConfig(igraphConfig: IGraphConfig) {
    this.setState({
      igraphConfig: { ...igraphConfig },
    });
@@ -330,10 +330,10 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    const partitionKeyProperty = this.props.collectionPartitionKeyProperty;

    // aggregate all the properties, remove dropped ones
-    const finalProperties = editedProperties.existingProperties.concat(editedProperties.addedProperties);
+    let finalProperties = editedProperties.existingProperties.concat(editedProperties.addedProperties);

    // Compose the query
-    const pkId = editedProperties.pkId;
+    let pkId = editedProperties.pkId;
    let updateQueryFragment = "";

    finalProperties.forEach((p) => {
@@ -422,7 +422,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   * Called from ko binding
   * @param id
   */
-  public selectNode(id: string): void {
+  public selectNode(id: string) {
    if (!this.d3ForceGraph) {
      console.warn("Attempting to select node, but d3ForceGraph not initialized, yet.");
      return;
@@ -431,7 +431,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    this.d3ForceGraph.selectNode(id);
  }

-  public deleteHighlightedNode(): void {
+  public deleteHighlightedNode() {
    if (!this.state.highlightedNode) {
      GraphExplorer.reportToConsole(ConsoleDataType.Error, "No highlighted node to remove.");
      return;
@@ -467,23 +467,23 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   * Is of type: {e: GremlinEdge, v: GremlinVertex}[]
   * @param data
   */
-  public static isEdgeVertexPairArray(data: any): boolean {
+  public static isEdgeVertexPairArray(data: any) {
    if (!(data instanceof Array)) {
      GraphExplorer.reportToConsole(ConsoleDataType.Info, "Query result not an array", data);
      return false;
    }

-    const pairs: any[] = data;
+    let pairs: any[] = data;
    for (let i = 0; i < pairs.length; i++) {
      const item = pairs[i];
      if (
-        !Object.prototype.hasOwnProperty.call(item, "e") ||
-        !Object.prototype.hasOwnProperty.call(item, "v") ||
-        !Object.prototype.hasOwnProperty.call(item["e"], "id") ||
-        !Object.prototype.hasOwnProperty.call(item["e"], "type") ||
+        !item.hasOwnProperty("e") ||
+        !item.hasOwnProperty("v") ||
+        !item["e"].hasOwnProperty("id") ||
+        !item["e"].hasOwnProperty("type") ||
        item["e"].type !== "edge" ||
-        !Object.prototype.hasOwnProperty.call(item["v"], "id") ||
-        !Object.prototype.hasOwnProperty.call(item["e"], "type") ||
+        !item["v"].hasOwnProperty("id") ||
+        !item["v"].hasOwnProperty("type") ||
        item["v"].type !== "vertex"
      ) {
        return false;
@@ -514,7 +514,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    // Try hitting cache first
    const cache = outE ? this.outECache : this.inECache;
    const pairs = cache.retrieve(vertex.id, startIndex, pageSize);
-    if (pairs !== null && pairs.length === pageSize) {
+    if (pairs != null && pairs.length === pageSize) {
      const msg = `Retrieved ${pairs.length} ${outE ? "outE" : "inE"} edges from cache for vertex id: ${vertex.id}`;
      GraphExplorer.reportToConsole(ConsoleDataType.Info, msg);
      return Q.resolve(pairs);
@@ -588,6 +588,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      vertex._outEAllLoaded &&
      vertex._inEAllLoaded
    ) {
+      console.info("No more edges to load for vertex " + vertex.id);
      updateGraphData();
      return Q.resolve(graphData);
    }
@@ -667,7 +668,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      }
    );

-    return promise.then(() => {
+    return promise.then((nbPairsFetched: number) => {
      if (offsetIndex >= GraphExplorer.LOAD_PAGE_SIZE || !vertex._outEAllLoaded || !vertex._inEAllLoaded) {
        vertex._pagination = {
          total:
@@ -753,7 +754,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   * Create a new edge in docdb and update graph
   * @param e
   */
-  public createNewEdge(e: GraphNewEdgeData): Q.Promise<unknown> {
+  public createNewEdge(e: GraphNewEdgeData): Q.Promise<any> {
    const q = `g.V('${GraphUtil.escapeSingleQuotes(e.inputOutV)}').addE('${GraphUtil.escapeSingleQuotes(
      e.label
    )}').To(g.V('${GraphUtil.escapeSingleQuotes(e.inputInV)}'))`;
@@ -771,8 +772,8 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
          return;
        }

-        const edge = edges[0];
-        const graphData = this.originalGraphData;
+        let edge = edges[0];
+        let graphData = this.originalGraphData;
        graphData.addEdge(edge);

        // Allow loadNeighbors to load list new edge
@@ -799,10 +800,10 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   * Manually update in-memory graph.
   * @param edgeId
   */
-  public removeEdge(edgeId: string): Q.Promise<unknown> {
+  public removeEdge(edgeId: string): Q.Promise<any> {
    return this.submitToBackend(`g.E('${GraphUtil.escapeSingleQuotes(edgeId)}').drop()`).then(
      () => {
-        const graphData = this.originalGraphData;
+        let graphData = this.originalGraphData;
        graphData.removeEdge(edgeId, false);
        this.updateGraphData(graphData, this.state.igraphConfig);
      },
@@ -825,14 +826,10 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      return false;
    }

-    const vertices: any[] = data;
+    let vertices: any[] = data;
    if (vertices.length > 0) {
-      const v0 = vertices[0];
-      if (
-        !Object.prototype.hasOwnProperty.call(v0, "id") ||
-        !Object.prototype.hasOwnProperty.call(v0, "type") ||
-        v0.type !== "vertex"
-      ) {
+      let v0 = vertices[0];
+      if (!v0.hasOwnProperty("id") || !v0.hasOwnProperty("type") || v0.type !== "vertex") {
        return false;
      }
    }
@@ -840,7 +837,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
  }

  public processGremlinQueryResults(result: GremlinClient.GremlinRequestResult): void {
-    const data = result.data as GraphData.GremlinVertex[];
+    const data = result.data as any;
    this.setFilterQueryStatus(FilterQueryStatus.GraphEmptyResult);

    if (data === null) {
@@ -930,13 +927,13 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
          throw { title: err };
        }

-        if (vertices === null || vertices.length < 1) {
+        if (vertices == null || vertices.length < 1) {
          const err = "Failed to create vertex (no vertex in response)";
          GraphExplorer.reportToConsole(ConsoleDataType.Error, err, vertices);
          throw { title: err };
        }

-        const vertex = vertices[0];
+        let vertex = vertices[0];
        const graphData = this.originalGraphData;
        graphData.addVertex(vertex);
        this.updateGraphData(graphData, this.state.igraphConfig);
@@ -1025,7 +1022,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    this.gremlinClient.destroy();
  }
  public componentDidMount(): void {
-    if (this.props.onLoadStartKey !== null && this.props.onLoadStartKey !== undefined) {
+    if (this.props.onLoadStartKey != null && this.props.onLoadStartKey != undefined) {
      TelemetryProcessor.traceSuccess(
        Action.Tab,
        {
@@ -1085,7 +1082,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
  public static reportToConsole(type: ConsoleDataType.Info, msg: string, ...errorData: any[]): void;
  public static reportToConsole(type: ConsoleDataType.Error, msg: string, ...errorData: any[]): void;
  public static reportToConsole(type: ConsoleDataType, msg: string, ...errorData: any[]): void | (() => void) {
-    let errorDataStr = "";
+    let errorDataStr: string = "";
    if (errorData && errorData.length > 0) {
      console.error(msg, errorData);
      errorDataStr = ": " + JSON.stringify(errorData);
@@ -1164,15 +1161,12 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      )}"`
    ).then(
      (documents: DataModels.DocumentId[]) => {
-        $.each(
-          documents,
-          (index: number, doc: { _graph_icon_property_value: string; icon: string; format: string }) => {
-            newIconsMap[doc["_graph_icon_property_value"]] = {
-              data: doc["icon"],
-              format: doc["format"],
-            };
-          }
-        );
+        $.each(documents, (index: number, doc: any) => {
+          newIconsMap[doc["_graph_icon_property_value"]] = {
+            data: doc["icon"],
+            format: doc["format"],
+          };
+        });

        // Update graph configuration
        this.setState({
@@ -1229,8 +1223,8 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    const key = this.state.igraphConfig.nodeCaption;
    return $.map(
      this.state.rootMap,
-      (value: any): LeftPane.CaptionId => {
-        const result = GraphData.GraphData.getNodePropValue(value, key);
+      (value: any, index: number): LeftPane.CaptionId => {
+        let result = GraphData.GraphData.getNodePropValue(value, key);
        return {
          caption: result !== undefined ? result : value.id,
          id: value.id,
@@ -1243,7 +1237,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   * Selecting a root node means
   * @param node
   */
-  private selectRootNode(id: string): Q.Promise<unknown> {
+  private selectRootNode(id: string): Q.Promise<any> {
    if (!this.d3ForceGraph) {
      console.warn("Attempting to reset zoom, but d3ForceGraph not initialized, yet.");
    } else {
@@ -1288,7 +1282,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
        this.collectNodeProperties(this.originalGraphData.vertices);
        this.updatePropertiesPane(id);
      },
-      (reason: string) => {
+      (reason: any) => {
        GraphExplorer.reportToConsole(ConsoleDataType.Error, `Failed to select root node. Reason:${reason}`);
      }
    );
@@ -1355,10 +1349,10 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
  private getPkIdFromVertex(v: GraphData.GremlinVertex): string {
    if (
      this.props.collectionPartitionKeyProperty &&
-      Object.prototype.hasOwnProperty.call(v, "properties") &&
-      Object.prototype.hasOwnProperty.call(v.properties, this.props.collectionPartitionKeyProperty) &&
+      v.hasOwnProperty("properties") &&
+      v.properties.hasOwnProperty(this.props.collectionPartitionKeyProperty) &&
      v.properties[this.props.collectionPartitionKeyProperty].length > 0 &&
-      Object.prototype.hasOwnProperty.call(v.properties[this.props.collectionPartitionKeyProperty][0], "value")
+      v.properties[this.props.collectionPartitionKeyProperty][0].hasOwnProperty("value")
    ) {
      const pk = v.properties[this.props.collectionPartitionKeyProperty][0].value;
      return GraphExplorer.generatePkIdPair(pk, v.id);
@@ -1376,8 +1370,8 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
  private getPkIdFromNodeData(v: GraphHighlightedNodeData): string {
    if (
      this.props.collectionPartitionKeyProperty &&
-      Object.prototype.hasOwnProperty.call(v, "properties") &&
-      Object.prototype.hasOwnProperty.call(v.properties, this.props.collectionPartitionKeyProperty)
+      v.hasOwnProperty("properties") &&
+      v.properties.hasOwnProperty(this.props.collectionPartitionKeyProperty)
    ) {
      const pk = v.properties[this.props.collectionPartitionKeyProperty];
      return GraphExplorer.generatePkIdPair(pk[0] as PartitionKeyValueType, v.id);
@@ -1394,14 +1388,14 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   * @return id
   */
  public static getPkIdFromDocumentId(d: DataModels.DocumentId, collectionPartitionKeyProperty: string): string {
-    const { id } = d;
+    let { id } = d;
    if (typeof id !== "string") {
      const error = `Vertex id is not a string: ${JSON.stringify(id)}.`;
      logConsoleError(error);
      throw new Error(error);
    }

-    if (collectionPartitionKeyProperty && Object.prototype.hasOwnProperty.call(d, collectionPartitionKeyProperty)) {
+    if (collectionPartitionKeyProperty && d.hasOwnProperty(collectionPartitionKeyProperty)) {
      let pk = (d as any)[collectionPartitionKeyProperty];
      if (typeof pk !== "string" && typeof pk !== "number" && typeof pk !== "boolean") {
        if (Array.isArray(pk) && pk.length > 0) {
@@ -1431,7 +1425,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    }"] AS p FROM c WHERE NOT IS_DEFINED(c._isEdge)`;
    return this.executeNonPagedDocDbQuery(q).then(
      (documents: DataModels.DocumentId[]) => {
-        const possibleVertices = [] as PossibleVertex[];
+        let possibleVertices = [] as PossibleVertex[];
        $.each(documents, (index: number, item: any) => {
          if (highlightedNodeId && item.id === highlightedNodeId) {
            // Exclude highlighed node in the list
@@ -1445,7 +1439,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
              caption: item.p,
            });
          } else {
-            if (Object.prototype.hasOwnProperty.call(item, "p")) {
+            if (item.hasOwnProperty("p")) {
              possibleVertices.push({
                value: item.id,
                caption: item.p[0]["_value"],
@@ -1468,17 +1462,17 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   * @param addedEdges
   * @return promise when done
   */
-  private editGraphEdges(editedEdges: EditedEdges): Q.Promise<unknown> {
-    const promises = [];
+  private editGraphEdges(editedEdges: EditedEdges): Q.Promise<any> {
+    let promises = [];
    // Drop edges
    for (let i = 0; i < editedEdges.droppedIds.length; i++) {
-      const id = editedEdges.droppedIds[i];
+      let id = editedEdges.droppedIds[i];
      promises.push(this.removeEdge(id));
    }

    // Add edges
    for (let i = 0; i < editedEdges.addedEdges.length; i++) {
-      const e = editedEdges.addedEdges[i];
+      let e = editedEdges.addedEdges[i];
      promises.push(
        this.createNewEdge(e).then(() => {
          // Reload neighbors in case we linked to a vertex that isn't loaded in the graph
@@ -1531,9 +1525,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
  /**
   * For unit testing purposes
   */
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public onGraphUpdated(_timestamp: number): void {}
+  public onGraphUpdated(timestamp: number): void {}

  /**
   * Get node properties for styling purposes. Result is the union of all properties of all nodes.
@@ -1541,17 +1533,17 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
  private collectNodeProperties(vertices: GraphData.GremlinVertex[]) {
    const props = {} as any; // Hashset
    $.each(vertices, (index: number, item: GraphData.GremlinVertex) => {
-      for (const p in item) {
+      for (var p in item) {
        // DocDB: Exclude type because it's always 'vertex'
        if (p !== "type" && typeof (item as any)[p] === "string") {
          props[p] = true;
        }
      }
      // Inspect properties
-      if (Object.prototype.hasOwnProperty.call(item, "properties")) {
+      if (item.hasOwnProperty("properties")) {
        // TODO This is DocDB-graph specific
        // Assume each property value is [{value:... }]
-        for (const f in item.properties) {
+        for (var f in item.properties) {
          props[f] = true;
        }
      }
@@ -1578,21 +1570,21 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      return;
    }

-    const data = this.originalGraphData.getVertexById(id);
+    let data = this.originalGraphData.getVertexById(id);

    // A bit of translation to make it easier to display
-    const props: { [id: string]: ViewModels.GremlinPropertyValueType[] } = {};
-    for (const p in data.properties) {
+    let props: { [id: string]: ViewModels.GremlinPropertyValueType[] } = {};
+    for (let p in data.properties) {
      props[p] = data.properties[p].map((gremlinProperty) => gremlinProperty.value);
    }

    // update neighbors
-    const sources: NeighborVertexBasicInfo[] = [];
-    const targets: NeighborVertexBasicInfo[] = [];
+    let sources: NeighborVertexBasicInfo[] = [];
+    let targets: NeighborVertexBasicInfo[] = [];
    this.props.onResetDefaultGraphConfigValues();
-    const nodeCaption = this.state.igraphConfigUiData.nodeCaptionChoice;
+    let nodeCaption = this.state.igraphConfigUiData.nodeCaptionChoice;
    this.updateSelectedNodeNeighbors(data.id, nodeCaption, sources, targets);
-    const sData: GraphHighlightedNodeData = {
+    let sData: GraphHighlightedNodeData = {
      id: data.id,
      label: data.label,
      properties: props,
@@ -1619,16 +1611,16 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    targets: NeighborVertexBasicInfo[]
  ): void {
    // update neighbors
-    const gd = this.originalGraphData;
-    const v = gd.getVertexById(id);
+    let gd = this.originalGraphData;
+    let v = gd.getVertexById(id);

    // Clear the array while keeping the references
    sources.length = 0;
    targets.length = 0;

-    const possibleEdgeLabels = {} as any; // Collect all edge labels in a hashset
+    let possibleEdgeLabels = {} as any; // Collect all edge labels in a hashset

-    for (const p in v.inE) {
+    for (let p in v.inE) {
      possibleEdgeLabels[p] = true;
      const edges = v.inE[p];
      $.each(edges, (index: number, edge: GraphData.GremlinShortInEdge) => {
@@ -1637,7 +1629,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
          // If id not known, it must be an edge node whose neighbor hasn't been loaded into the graph, yet
          return;
        }
-        const caption = GraphData.GraphData.getNodePropValue(gd.getVertexById(neighborId), nodeCaption) as string;
+        let caption = GraphData.GraphData.getNodePropValue(gd.getVertexById(neighborId), nodeCaption) as string;
        sources.push({
          name: caption,
          id: neighborId,
@@ -1647,7 +1639,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      });
    }

-    for (const p in v.outE) {
+    for (let p in v.outE) {
      possibleEdgeLabels[p] = true;
      const edges = v.outE[p];
      $.each(edges, (index: number, edge: GraphData.GremlinShortOutEdge) => {
@@ -1656,7 +1648,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
          // If id not known, it must be an edge node whose neighbor hasn't been loaded into the graph, yet
          return;
        }
-        const caption = GraphData.GraphData.getNodePropValue(gd.getVertexById(neighborId), nodeCaption) as string;
+        let caption = GraphData.GraphData.getNodePropValue(gd.getVertexById(neighborId), nodeCaption) as string;
        targets.push({
          name: caption,
          id: neighborId,
@@ -1668,7 +1660,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl

    this.setState({
      possibleEdgeLabels: Object.keys(possibleEdgeLabels).map(
-        (value: string): InputTypeaheadComponent.Item => {
+        (value: string, index: number, array: string[]): InputTypeaheadComponent.Item => {
          return { caption: value, value: value };
        }
      ),
@@ -1689,20 +1681,20 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      return;
    }

-    const updatedVertex = vertices[0];
+    let updatedVertex = vertices[0];
    if (this.originalGraphData.hasVertexId(updatedVertex.id)) {
-      const currentVertex = this.originalGraphData.getVertexById(updatedVertex.id);
+      let currentVertex = this.originalGraphData.getVertexById(updatedVertex.id);
      // Copy updated properties
-      if (Object.prototype.hasOwnProperty.call(currentVertex, "properties")) {
+      if (currentVertex.hasOwnProperty("properties")) {
        delete currentVertex["properties"];
      }
-      for (const p in updatedVertex) {
+      for (var p in updatedVertex) {
        (currentVertex as any)[p] = updatedVertex[p];
      }
    }

    // TODO This kind of assumes saveVertexProperty is done from property panes.
-    const hn = this.state.highlightedNode;
+    let hn = this.state.highlightedNode;
    if (hn && hn.id === updatedVertex.id) {
      this.updatePropertiesPane(hn.id);
    }
@@ -1716,7 +1708,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    igraphConfig?: IGraphConfig
  ) {
    this.originalGraphData = graphData;
-    const gd = JSON.parse(JSON.stringify(this.originalGraphData));
+    let gd = JSON.parse(JSON.stringify(this.originalGraphData));
    if (!this.d3ForceGraph) {
      console.warn("Attempting to update graph, but d3ForceGraph not initialized, yet.");
      return;
@@ -1881,7 +1873,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl

    promise
      .then((result: GremlinClient.GremlinRequestResult) => this.processGremlinQueryResults(result))
-      .catch((error: Error) => {
+      .catch((error: any) => {
        const errorMsg = `Failed to process query result: ${getErrorMessage(error)}`;
        GraphExplorer.reportToConsole(ConsoleDataType.Error, errorMsg);
        this.setState({
--- a/src/Explorer/Graph/GraphExplorerComponent/GraphExplorerAdapter.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/GraphExplorerAdapter.tsx
@@ -0,0 +1,74 @@
+import * as React from "react";
+import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
+import * as ViewModels from "../../../Contracts/ViewModels";
+import { IGraphConfig } from "../../Tabs/GraphTab";
+import { GraphAccessor, GraphExplorer } from "./GraphExplorer";
+interface Parameter {
+  onIsNewVertexDisabledChange: (isEnabled: boolean) => void;
+  onGraphAccessorCreated: (instance: GraphAccessor) => void;
+  onIsFilterQueryLoading: (isFilterQueryLoading: boolean) => void;
+  onIsValidQuery: (isValidQuery: boolean) => void;
+  onIsPropertyEditing: (isEditing: boolean) => void;
+  onIsGraphDisplayed: (isDisplayed: boolean) => void;
+  onResetDefaultGraphConfigValues: () => void;
+
+  collectionPartitionKeyProperty: string;
+  graphBackendEndpoint: string;
+  databaseId: string;
+  collectionId: string;
+  masterKey: string;
+
+  onLoadStartKey: number;
+  onLoadStartKeyChange: (newKey: number) => void;
+  resourceId: string;
+
+  igraphConfigUiData: ViewModels.IGraphConfigUiData;
+  igraphConfig: IGraphConfig;
+  setIConfigUiData?: (data: string[]) => void;
+}
+
+interface IGraphExplorerProps {
+  isChanged: boolean;
+}
+
+interface IGraphExplorerStates {
+  isChangedState: boolean;
+}
+
+export interface GraphExplorerAdapter
+  extends ReactAdapter,
+    React.Component<IGraphExplorerProps, IGraphExplorerStates> {}
+export class GraphExplorerAdapter implements ReactAdapter {
+  public params: Parameter;
+  public parameters = {};
+  public isNewVertexDisabled: boolean;
+
+  public constructor(params: Parameter, props?: IGraphExplorerProps) {
+    this.params = params;
+  }
+
+  public renderComponent(): JSX.Element {
+    return (
+      <GraphExplorer
+        onIsNewVertexDisabledChange={this.params.onIsNewVertexDisabledChange}
+        onGraphAccessorCreated={this.params.onGraphAccessorCreated}
+        onIsFilterQueryLoadingChange={this.params.onIsFilterQueryLoading}
+        onIsValidQueryChange={this.params.onIsValidQuery}
+        onIsPropertyEditing={this.params.onIsPropertyEditing}
+        onIsGraphDisplayed={this.params.onIsGraphDisplayed}
+        onResetDefaultGraphConfigValues={this.params.onResetDefaultGraphConfigValues}
+        collectionPartitionKeyProperty={this.params.collectionPartitionKeyProperty}
+        graphBackendEndpoint={this.params.graphBackendEndpoint}
+        databaseId={this.params.databaseId}
+        collectionId={this.params.collectionId}
+        masterKey={this.params.masterKey}
+        onLoadStartKey={this.params.onLoadStartKey}
+        onLoadStartKeyChange={this.params.onLoadStartKeyChange}
+        resourceId={this.params.resourceId}
+        igraphConfigUiData={this.params.igraphConfigUiData}
+        igraphConfig={this.params.igraphConfig}
+        setIConfigUiData={this.params.setIConfigUiData}
+      />
+    );
+  }
+}
--- a/src/Explorer/Graph/GraphExplorerComponent/GraphUtil.test.ts
+++ b/src/Explorer/Graph/GraphExplorerComponent/GraphUtil.test.ts
@@ -1,7 +1,9 @@
-import * as sinon from "sinon";
-import { GraphData, GremlinEdge, GremlinVertex } from "./GraphData";
-import { GraphExplorer } from "./GraphExplorer";
 import * as GraphUtil from "./GraphUtil";
+import { GraphData, GremlinVertex, GremlinEdge } from "./GraphData";
+import * as sinon from "sinon";
+import { GraphExplorer } from "./GraphExplorer";
+window.$ = window.jQuery = require("jquery");
+
 const OUT_E_MATCHER = "g\\.V\\(.*\\).outE\\(\\).*\\.as\\('e'\\).inV\\(\\)\\.as\\('v'\\)\\.select\\('e', *'v'\\)";
 const IN_E_MATCHER = "g\\.V\\(.*\\).inE\\(\\).*\\.as\\('e'\\).outV\\(\\)\\.as\\('v'\\)\\.select\\('e', *'v'\\)";

--- a/src/Explorer/Graph/GraphExplorerComponent/MiddlePaneComponent.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/MiddlePaneComponent.tsx
@@ -1,8 +1,8 @@
 import * as React from "react";
+import { GraphVizComponent, GraphVizComponentProps } from "./GraphVizComponent";
 import CollapseArrowIcon from "../../../../images/Collapse_arrow_14x14.svg";
 import ExpandIcon from "../../../../images/Expand_14x14.svg";
 import LoadingIndicatorIcon from "../../../../images/LoadingIndicator_3Squares.gif";
-import { GraphVizComponent, GraphVizComponentProps } from "./GraphVizComponent";

 interface MiddlePaneComponentProps {
  isTabsContentExpanded: boolean;
@@ -17,14 +17,7 @@ export class MiddlePaneComponent extends React.Component<MiddlePaneComponentProp
      <div className="middlePane">
        <div className="graphTitle">
          <span className="paneTitle">Graph</span>
-          <span
-            className="graphExpandCollapseBtn pull-right"
-            onClick={this.props.toggleExpandGraph}
-            role="button"
-            aria-expanded={this.props.isTabsContentExpanded}
-            aria-name="View graph in full screen"
-            tabIndex={0}
-          >
+          <span className="graphExpandCollapseBtn pull-right" onClick={this.props.toggleExpandGraph}>
            <img
              src={this.props.isTabsContentExpanded ? CollapseArrowIcon : ExpandIcon}
              alt={this.props.isTabsContentExpanded ? "collapse graph content" : "expand graph content"}
--- a/src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx
@@ -5,26 +5,21 @@
 */

 import * as React from "react";
-import CancelIcon from "../../../../images/cancel.svg";
-import CheckIcon from "../../../../images/check-1.svg";
-import DeleteIcon from "../../../../images/delete.svg";
-import EditIcon from "../../../../images/edit-1.svg";
-import * as ViewModels from "../../../Contracts/ViewModels";
-import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
+import { GraphHighlightedNodeData, EditedProperties, EditedEdges, PossibleVertex } from "./GraphExplorer";
 import { CollapsiblePanel } from "../../Controls/CollapsiblePanel/CollapsiblePanel";
-import { Item } from "../../Controls/InputTypeahead/InputTypeaheadComponent";
-import { ConsoleDataType } from "../../Menus/NotificationConsole/ConsoleData";
-import * as EditorNeighbors from "./EditorNeighborsComponent";
-import { EditorNodePropertiesComponent } from "./EditorNodePropertiesComponent";
-import {
-  EditedEdges,
-  EditedProperties,
-  GraphExplorer,
-  GraphHighlightedNodeData,
-  PossibleVertex,
-} from "./GraphExplorer";
-import { ReadOnlyNeighborsComponent } from "./ReadOnlyNeighborsComponent";
 import { ReadOnlyNodePropertiesComponent } from "./ReadOnlyNodePropertiesComponent";
+import { EditorNodePropertiesComponent } from "./EditorNodePropertiesComponent";
+import { ReadOnlyNeighborsComponent } from "./ReadOnlyNeighborsComponent";
+import * as ViewModels from "../../../Contracts/ViewModels";
+import { Item } from "../../Controls/InputTypeahead/InputTypeaheadComponent";
+import * as EditorNeighbors from "./EditorNeighborsComponent";
+import EditIcon from "../../../../images/edit.svg";
+import DeleteIcon from "../../../../images/delete.svg";
+import CheckIcon from "../../../../images/check.svg";
+import CancelIcon from "../../../../images/cancel.svg";
+import { GraphExplorer } from "./GraphExplorer";
+import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
+import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";

 export enum Mode {
  READONLY_PROP,
--- a/src/Explorer/Graph/GraphExplorerComponent/QueryContainerComponent.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/QueryContainerComponent.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
-import CloseIcon from "../../../../images/close-black.svg";
 import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
+import CloseIcon from "../../../../images/close-black.svg";

 export interface QueryContainerComponentProps {
  initialQuery: string;
@@ -82,7 +82,7 @@ export class QueryContainerComponent extends React.Component<
        <button
          type="button"
          className="filterbtnstyle queryButton"
-          onClick={() => this.props.onExecuteClick(this.state.query)}
+          onClick={(e) => this.props.onExecuteClick(this.state.query)}
          disabled={this.props.isLoading || !QueryContainerComponent.isQueryValid(this.state.query)}
        >
          Execute Gremlin Query
--- a/src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNeighborsComponent.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNeighborsComponent.tsx
@@ -4,9 +4,9 @@
 */

 import * as React from "react";
-import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
 import { GraphHighlightedNodeData, NeighborVertexBasicInfo } from "./GraphExplorer";
 import * as GraphUtil from "./GraphUtil";
+import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";

 export interface ReadOnlyNeighborsComponentProps {
  node: GraphHighlightedNodeData;
@@ -48,7 +48,7 @@ export class ReadOnlyNeighborsComponent extends React.Component<ReadOnlyNeighbor
                    className="clickableLink"
                    as="a"
                    aria-label={_neighbor.name}
-                    onActivated={() => this.props.selectNode(_neighbor.id)}
+                    onActivated={(e) => this.props.selectNode(_neighbor.id)}
                    title={GraphUtil.getNeighborTitle(_neighbor)}
                  >
                    {_neighbor.name}
--- a/src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx
@@ -4,8 +4,8 @@
 */

 import * as React from "react";
-import * as ViewModels from "../../../Contracts/ViewModels";
 import { GraphHighlightedNodeData } from "./GraphExplorer";
+import * as ViewModels from "../../../Contracts/ViewModels";

 export interface ReadOnlyNodePropertiesComponentProps {
  node: GraphHighlightedNodeData;
--- a/src/Explorer/Graph/GraphExplorerComponent/snapshots/EditorNodePropertiesComponent.test.tsx.snap
+++ b/src/Explorer/Graph/GraphExplorerComponent/snapshots/EditorNodePropertiesComponent.test.tsx.snap
@@ -37,7 +37,7 @@ exports[`<EditorNodePropertiesComponent /> renders component 1`] = `
      </td>
      <td
        className="valueCol"
-        title="efgh, 1234, true, false, undefined"
+        title="efgh, 1234, true, false, undefined, null"
      >
        <div
          className="propertyValue"
@@ -69,6 +69,12 @@ exports[`<EditorNodePropertiesComponent /> renders component 1`] = `
        >
          undefined
        </div>
+        <div
+          className="propertyValue isNull"
+          key="null"
+        >
+          null
+        </div>
      </td>
    </tr>
    <tr
@@ -172,6 +178,12 @@ exports[`<EditorNodePropertiesComponent /> renders component 1`] = `
        >
          undefined
        </div>
+        <div
+          className="propertyValue isNull"
+          key="null"
+        >
+          null
+        </div>
      </td>
      <td />
      <td
--- a/src/Explorer/Graph/GraphExplorerComponent/graphExplorer.less
+++ b/src/Explorer/Graph/GraphExplorerComponent/graphExplorer.less
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
@@ -3,82 +3,100 @@
 * If the component signals a change through the callback passed in the properties, it must render the React component when appropriate
 * and update any knockout observables passed from the parent.
 */
-import { CommandBar as FluentCommandBar, ICommandBarItemProps } from "@fluentui/react";
+import { CommandBar, ICommandBarItemProps } from "@fluentui/react";
+import * as ko from "knockout";
 import * as React from "react";
-import create, { UseStore } from "zustand";
+import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
 import { StyleConstants } from "../../../Common/Constants";
 import * as ViewModels from "../../../Contracts/ViewModels";
-import { useTabs } from "../../../hooks/useTabs";
 import { userContext } from "../../../UserContext";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
-import { NotebookUtil } from "../../Notebook/NotebookUtil";
-import { useSelectedNode } from "../../useSelectedNode";
 import * as CommandBarComponentButtonFactory from "./CommandBarComponentButtonFactory";
 import * as CommandBarUtil from "./CommandBarUtil";

-interface Props {
-  container: Explorer;
+export class CommandBarComponentAdapter implements ReactAdapter {
+  public parameters: ko.Observable<number>;
+  public container: Explorer;
+  private tabsButtons: CommandButtonComponentProps[];
+  private isNotebookTabActive: ko.Computed<boolean>;
+
+  constructor(container: Explorer) {
+    this.container = container;
+    this.tabsButtons = [];
+    this.isNotebookTabActive = ko.computed(
+      () => container.tabsManager.activeTab()?.tabKind === ViewModels.CollectionTabKind.NotebookV2
+    );
+
+    // These are the parameters watched by the react binding that will trigger a renderComponent() if one of the ko mutates
+    const toWatch = [
+      container.isDatabaseNodeOrNoneSelected,
+      container.isDatabaseNodeSelected,
+      container.isNoneSelected,
+      container.isResourceTokenCollectionNodeSelected,
+      container.isHostedDataExplorerEnabled,
+      container.isSynapseLinkUpdating,
+      userContext?.databaseAccount,
+      this.isNotebookTabActive,
+      container.isServerlessEnabled,
+    ];
+
+    ko.computed(() => ko.toJSON(toWatch)).subscribe(() => this.triggerRender());
+    this.parameters = ko.observable(Date.now());
+  }
+
+  public onUpdateTabsButtons(buttons: CommandButtonComponentProps[]): void {
+    this.tabsButtons = buttons;
+    this.triggerRender();
+  }
+
+  public renderComponent(): JSX.Element {
+    const backgroundColor = StyleConstants.BaseLight;
+
+    const staticButtons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(this.container);
+    const contextButtons = (this.tabsButtons || []).concat(
+      CommandBarComponentButtonFactory.createContextCommandBarButtons(this.container)
+    );
+    const controlButtons = CommandBarComponentButtonFactory.createControlCommandBarButtons(this.container);
+
+    const uiFabricStaticButtons = CommandBarUtil.convertButton(staticButtons, backgroundColor);
+    if (this.tabsButtons && this.tabsButtons.length > 0) {
+      uiFabricStaticButtons.forEach((btn: ICommandBarItemProps) => (btn.iconOnly = true));
+    }
+
+    const uiFabricTabsButtons: ICommandBarItemProps[] = CommandBarUtil.convertButton(contextButtons, backgroundColor);
+
+    if (uiFabricTabsButtons.length > 0) {
+      uiFabricStaticButtons.push(CommandBarUtil.createDivider("commandBarDivider"));
+    }
+
+    const uiFabricControlButtons = CommandBarUtil.convertButton(controlButtons, backgroundColor);
+    uiFabricControlButtons.forEach((btn: ICommandBarItemProps) => (btn.iconOnly = true));
+
+    if (this.isNotebookTabActive()) {
+      uiFabricControlButtons.unshift(
+        CommandBarUtil.createMemoryTracker("memoryTracker", this.container.memoryUsageInfo)
+      );
+    }
+
+    return (
+      <React.Fragment>
+        <div className="commandBarContainer">
+          <CommandBar
+            ariaLabel="Use left and right arrow keys to navigate between commands"
+            items={uiFabricStaticButtons.concat(uiFabricTabsButtons)}
+            farItems={uiFabricControlButtons}
+            styles={{
+              root: { backgroundColor: backgroundColor },
+            }}
+            overflowButtonProps={{ ariaLabel: "More commands" }}
+          />
+        </div>
+      </React.Fragment>
+    );
+  }
+
+  private triggerRender() {
+    window.requestAnimationFrame(() => this.parameters(Date.now()));
+  }
 }
-
-export interface CommandBarStore {
-  contextButtons: CommandButtonComponentProps[];
-  setContextButtons: (contextButtons: CommandButtonComponentProps[]) => void;
-}
-
-export const useCommandBar: UseStore<CommandBarStore> = create((set) => ({
-  contextButtons: [],
-  setContextButtons: (contextButtons: CommandButtonComponentProps[]) => set((state) => ({ ...state, contextButtons })),
-}));
-
-export const CommandBar: React.FC<Props> = ({ container }: Props) => {
-  const selectedNodeState = useSelectedNode();
-  const buttons = useCommandBar((state) => state.contextButtons);
-  const backgroundColor = StyleConstants.BaseLight;
-
-  const staticButtons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(container, selectedNodeState);
-  const contextButtons = (buttons || []).concat(
-    CommandBarComponentButtonFactory.createContextCommandBarButtons(container, selectedNodeState)
-  );
-  const controlButtons = CommandBarComponentButtonFactory.createControlCommandBarButtons(container);
-
-  const uiFabricStaticButtons = CommandBarUtil.convertButton(staticButtons, backgroundColor);
-  if (buttons && buttons.length > 0) {
-    uiFabricStaticButtons.forEach((btn: ICommandBarItemProps) => (btn.iconOnly = true));
-  }
-
-  const uiFabricTabsButtons: ICommandBarItemProps[] = CommandBarUtil.convertButton(contextButtons, backgroundColor);
-
-  if (uiFabricTabsButtons.length > 0) {
-    uiFabricStaticButtons.push(CommandBarUtil.createDivider("commandBarDivider"));
-  }
-
-  const uiFabricControlButtons = CommandBarUtil.convertButton(controlButtons, backgroundColor);
-  uiFabricControlButtons.forEach((btn: ICommandBarItemProps) => (btn.iconOnly = true));
-
-  if (NotebookUtil.isPhoenixEnabled()) {
-    uiFabricControlButtons.unshift(CommandBarUtil.createConnectionStatus(container, "connectionStatus"));
-  }
-
-  if (
-    userContext.features.phoenix === false &&
-    userContext.features.notebooksTemporarilyDown === false &&
-    useTabs.getState().activeTab?.tabKind === ViewModels.CollectionTabKind.NotebookV2
-  ) {
-    uiFabricControlButtons.unshift(CommandBarUtil.createMemoryTracker("memoryTracker"));
-  }
-
-  return (
-    <div className="commandBarContainer">
-      <FluentCommandBar
-        ariaLabel="Use left and right arrow keys to navigate between commands"
-        items={uiFabricStaticButtons.concat(uiFabricTabsButtons)}
-        farItems={uiFabricControlButtons}
-        styles={{
-          root: { backgroundColor: backgroundColor },
-        }}
-        overflowButtonProps={{ ariaLabel: "More commands" }}
-      />
-    </div>
-  );
-};
--- a/Show More
+++ b/Show More