split service changes

.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

.eslintignore

@@ -6,7 +6,7 @@ src/Api/Apis.ts
 src/AuthType.ts
 src/Bindings/BindingHandlersRegisterer.ts
 src/Bindings/ReactBindingHandler.ts
-src/Common/Constants/index.ts
+src/Common/Constants.ts
 src/Common/CosmosClient.test.ts
 src/Common/CosmosClient.ts
 src/Common/DataAccessUtilityBase.test.ts
@@ -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,34 @@ src/Definitions/png.d.ts
 src/Definitions/svg.d.ts
 src/Explorer/ComponentRegisterer.test.ts
 src/Explorer/ComponentRegisterer.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 +83,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
@@ -72,22 +105,33 @@ src/Explorer/Notebook/NotebookContentClient.ts
 src/Explorer/Notebook/NotebookContentItem.ts
 src/Explorer/Notebook/NotebookUtil.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
 src/Explorer/Tables/DataTable/DataTableContextMenu.ts
 src/Explorer/Tables/DataTable/DataTableOperationManager.ts
-# src/Explorer/Tables/DataTable/DataTableOperations.ts
+src/Explorer/Tables/DataTable/DataTableOperations.ts
 src/Explorer/Tables/DataTable/DataTableViewModel.ts
-# src/Explorer/Tables/DataTable/TableCommands.ts
-# src/Explorer/Tables/DataTable/TableEntityCache.ts
+src/Explorer/Tables/DataTable/TableCommands.ts
+src/Explorer/Tables/DataTable/TableEntityCache.ts
 src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
-# src/Explorer/Tables/Entities.ts
+src/Explorer/Tables/Entities.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/TableDataClient.ts
 src/Explorer/Tables/TableEntityProcessor.ts
 src/Explorer/Tables/Utilities.ts
@@ -97,62 +141,163 @@ 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/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/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/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

.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",

.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:

.vscode/settings.json

@@ -22,6 +22,5 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true,
     "source.organizeImports": true
-  },
-  "typescript.preferences.importModuleSpecifier": "non-relative"
+  }
 }

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
 }

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>

jest.config.js

@@ -37,8 +37,8 @@ module.exports = {
     global: {
       branches: 25,
       functions: 25,
-      lines: 29,
-      statements: 29,
+      lines: 30,
+      statements: 30,
     },
   },
 
@@ -129,8 +129,6 @@ module.exports = {
   // The test environment that will be used for testing
   // testEnvironment: "jest-environment-jsdom",
 
-  modulePaths: ["node_modules", "<rootDir>/src"],
-
   // Options that will be passed to the testEnvironment
   // testEnvironmentOptions: {},
 

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;

less/documentDB.less

@@ -2357,8 +2357,6 @@ a:link {
   height: 100%;
   flex-grow: 1;
   overflow: hidden;
-  min-height: 300px;
-  overflow-y: scroll;
 }
 
 .tabs {
@@ -2834,8 +2832,6 @@ a:link {
 
 #explorerNotificationConsole {
   z-index: 1000;
-  overflow-y: auto;
-  overflow-x: clip;
 }
 
 .uniqueIndexesContainer {

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;
-  }
 }
 
 

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;
+}

package.json

@@ -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",
@@ -81,10 +80,10 @@
     "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",
@@ -98,7 +97,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"
@@ -132,7 +131,6 @@
     "@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 +152,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",
+    "mini-css-extract-plugin": "0.4.3",
     "monaco-editor-webpack-plugin": "1.7.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",
     "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",

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>

src/Common/Constants.ts

@@ -0,0 +1,371 @@
+export class CodeOfConductEndpoints {
+  public static privacyStatement: string = "https://aka.ms/ms-privacy-policy";
+  public static codeOfConduct: string = "https://aka.ms/cosmos-code-of-conduct";
+  public static termsOfUse: string = "https://aka.ms/ms-terms-of-use";
+}
+
+export class EndpointsRegex {
+  public static readonly cassandra = [
+    "AccountEndpoint=(.*).cassandra.cosmosdb.azure.com",
+    "HostName=(.*).cassandra.cosmos.azure.com",
+  ];
+  public static readonly mongo = "mongodb://.*:(.*)@(.*).documents.azure.com";
+  public static readonly mongoCompute = "mongodb://.*:(.*)@(.*).mongo.cosmos.azure.com";
+  public static readonly sql = "AccountEndpoint=https://(.*).documents.azure.com";
+  public static readonly table = "TableEndpoint=https://(.*).table.cosmosdb.azure.com";
+}
+
+export class ApiEndpoints {
+  public static runtimeProxy: string = "/api/RuntimeProxy";
+  public static guestRuntimeProxy: string = "/api/guest/RuntimeProxy";
+}
+
+export class ServerIds {
+  public static localhost: string = "localhost";
+  public static blackforest: string = "blackforest";
+  public static fairfax: string = "fairfax";
+  public static mooncake: string = "mooncake";
+  public static productionPortal: string = "prod";
+  public static dev: string = "dev";
+}
+
+export class ArmApiVersions {
+  public static readonly documentDB: string = "2015-11-06";
+  public static readonly arcadia: string = "2019-06-01-preview";
+  public static readonly arcadiaLivy: string = "2019-11-01-preview";
+  public static readonly arm: string = "2015-11-01";
+  public static readonly armFeatures: string = "2014-08-01-preview";
+  public static readonly publicVersion = "2020-04-01";
+}
+
+export class ArmResourceTypes {
+  public static readonly notebookWorkspaces = "Microsoft.DocumentDB/databaseAccounts/notebookWorkspaces";
+  public static readonly synapseWorkspaces = "Microsoft.Synapse/workspaces";
+}
+
+export class BackendDefaults {
+  public static partitionKeyKind = "Hash";
+  public static singlePartitionStorageInGb: string = "10";
+  public static multiPartitionStorageInGb: string = "100";
+  public static maxChangeFeedRetentionDuration: number = 10;
+  public static partitionKeyVersion = 2;
+}
+
+export class ClientDefaults {
+  public static requestTimeoutMs: number = 60000;
+  public static portalCacheTimeoutMs: number = 10000;
+  public static errorNotificationTimeoutMs: number = 5000;
+  public static copyHelperTimeoutMs: number = 2000;
+  public static waitForDOMElementMs: number = 500;
+  public static cacheBustingTimeoutMs: number =
+    10 /** minutes **/ * 60 /** to seconds **/ * 1000 /** to milliseconds **/;
+  public static databaseThroughputIncreaseFactor: number = 100;
+  public static readonly arcadiaTokenRefreshInterval: number =
+    20 /** minutes **/ * 60 /** to seconds **/ * 1000 /** to milliseconds **/;
+  public static readonly arcadiaTokenRefreshIntervalPaddingMs: number = 2000;
+}
+
+export enum AccountKind {
+  DocumentDB = "DocumentDB",
+  MongoDB = "MongoDB",
+  Parse = "Parse",
+  GlobalDocumentDB = "GlobalDocumentDB",
+  Default = "DocumentDB",
+}
+
+export class CorrelationBackend {
+  public static Url: string = "https://aka.ms/cosmosdbanalytics";
+}
+
+export class CapabilityNames {
+  public static EnableTable: string = "EnableTable";
+  public static EnableGremlin: string = "EnableGremlin";
+  public static EnableCassandra: string = "EnableCassandra";
+  public static EnableAutoScale: string = "EnableAutoScale";
+  public static readonly EnableNotebooks: string = "EnableNotebooks";
+  public static readonly EnableStorageAnalytics: string = "EnableStorageAnalytics";
+  public static readonly EnableMongo: string = "EnableMongo";
+  public static readonly EnableServerless: string = "EnableServerless";
+}
+
+// flight names returned from the portal are always lowercase
+export class Flights {
+  public static readonly SettingsV2 = "settingsv2";
+  public static readonly MongoIndexEditor = "mongoindexeditor";
+  public static readonly MongoIndexing = "mongoindexing";
+  public static readonly AutoscaleTest = "autoscaletest";
+  public static readonly SchemaAnalyzer = "schemaanalyzer";
+}
+
+export class AfecFeatures {
+  public static readonly Spark = "spark-public-preview";
+  public static readonly Notebooks = "sparknotebooks-public-preview";
+  public static readonly StorageAnalytics = "storageanalytics-public-preview";
+}
+
+export class TagNames {
+  public static defaultExperience: string = "defaultExperience";
+}
+
+export class MongoDBAccounts {
+  public static protocol: string = "https";
+  public static defaultPort: string = "10255";
+}
+
+export enum MongoBackendEndpointType {
+  local,
+  remote,
+}
+
+// TODO: 435619 Add default endpoints per cloud and use regional only when available
+export class CassandraBackend {
+  public static readonly createOrDeleteApi: string = "api/cassandra/createordelete";
+  public static readonly guestCreateOrDeleteApi: string = "api/guest/cassandra/createordelete";
+  public static readonly queryApi: string = "api/cassandra";
+  public static readonly guestQueryApi: string = "api/guest/cassandra";
+  public static readonly keysApi: string = "api/cassandra/keys";
+  public static readonly guestKeysApi: string = "api/guest/cassandra/keys";
+  public static readonly schemaApi: string = "api/cassandra/schema";
+  public static readonly guestSchemaApi: string = "api/guest/cassandra/schema";
+}
+
+export class Queries {
+  public static CustomPageOption: string = "custom";
+  public static UnlimitedPageOption: string = "unlimited";
+  public static itemsPerPage: number = 100;
+  public static unlimitedItemsPerPage: number = 100; // TODO: Figure out appropriate value so it works for accounts with a large number of partitions
+
+  public static QueryEditorMinHeightRatio: number = 0.1;
+  public static QueryEditorMaxHeightRatio: number = 0.4;
+  public static readonly DefaultMaxDegreeOfParallelism = 6;
+}
+
+export class SavedQueries {
+  public static readonly CollectionName: string = "___Query";
+  public static readonly DatabaseName: string = "___Cosmos";
+  public static readonly OfferThroughput: number = 400;
+  public static readonly PartitionKeyProperty: string = "id";
+}
+
+export class DocumentsGridMetrics {
+  public static DocumentsPerPage: number = 100;
+  public static IndividualRowHeight: number = 34;
+  public static BufferHeight: number = 28;
+  public static SplitterMinWidth: number = 200;
+  public static SplitterMaxWidth: number = 360;
+
+  public static DocumentEditorMinWidthRatio: number = 0.2;
+  public static DocumentEditorMaxWidthRatio: number = 0.4;
+}
+
+export class Areas {
+  public static ResourceTree: string = "Resource Tree";
+  public static ContextualPane: string = "Contextual Pane";
+  public static Tab: string = "Tab";
+  public static ShareDialog: string = "Share Access Dialog";
+  public static Notebook: string = "Notebook";
+}
+
+export class HttpHeaders {
+  public static activityId: string = "x-ms-activity-id";
+  public static apiType: string = "x-ms-cosmos-apitype";
+  public static authorization: string = "authorization";
+  public static collectionIndexTransformationProgress: string =
+    "x-ms-documentdb-collection-index-transformation-progress";
+  public static continuation: string = "x-ms-continuation";
+  public static correlationRequestId: string = "x-ms-correlation-request-id";
+  public static enableScriptLogging: string = "x-ms-documentdb-script-enable-logging";
+  public static guestAccessToken: string = "x-ms-encrypted-auth-token";
+  public static getReadOnlyKey: string = "x-ms-get-read-only-key";
+  public static connectionString: string = "x-ms-connection-string";
+  public static msDate: string = "x-ms-date";
+  public static location: string = "Location";
+  public static contentType: string = "Content-Type";
+  public static offerReplacePending: string = "x-ms-offer-replace-pending";
+  public static user: string = "x-ms-user";
+  public static populatePartitionStatistics: string = "x-ms-documentdb-populatepartitionstatistics";
+  public static queryMetrics: string = "x-ms-documentdb-query-metrics";
+  public static requestCharge: string = "x-ms-request-charge";
+  public static resourceQuota: string = "x-ms-resource-quota";
+  public static resourceUsage: string = "x-ms-resource-usage";
+  public static retryAfterMs: string = "x-ms-retry-after-ms";
+  public static scriptLogResults: string = "x-ms-documentdb-script-log-results";
+  public static populateCollectionThroughputInfo = "x-ms-documentdb-populatecollectionthroughputinfo";
+  public static supportSpatialLegacyCoordinates = "x-ms-documentdb-supportspatiallegacycoordinates";
+  public static usePolygonsSmallerThanAHemisphere = "x-ms-documentdb-usepolygonssmallerthanahemisphere";
+  public static autoPilotThroughput = "autoscaleSettings";
+  public static autoPilotThroughputSDK = "x-ms-cosmos-offer-autopilot-settings";
+  public static partitionKey: string = "x-ms-documentdb-partitionkey";
+  public static migrateOfferToManualThroughput: string = "x-ms-cosmos-migrate-offer-to-manual-throughput";
+  public static migrateOfferToAutopilot: string = "x-ms-cosmos-migrate-offer-to-autopilot";
+}
+
+export class ApiType {
+  // Mapped to hexadecimal values in the backend
+  public static readonly MongoDB: number = 1;
+  public static readonly Gremlin: number = 2;
+  public static readonly Cassandra: number = 4;
+  public static readonly Table: number = 8;
+  public static readonly SQL: number = 16;
+}
+
+export class HttpStatusCodes {
+  public static readonly OK: number = 200;
+  public static readonly Created: number = 201;
+  public static readonly Accepted: number = 202;
+  public static readonly NoContent: number = 204;
+  public static readonly NotModified: number = 304;
+  public static readonly Unauthorized: number = 401;
+  public static readonly Forbidden: number = 403;
+  public static readonly NotFound: number = 404;
+  public static readonly TooManyRequests: number = 429;
+  public static readonly Conflict: number = 409;
+
+  public static readonly InternalServerError: number = 500;
+  public static readonly BadGateway: number = 502;
+  public static readonly ServiceUnavailable: number = 503;
+  public static readonly GatewayTimeout: number = 504;
+
+  public static readonly RetryableStatusCodes: number[] = [
+    HttpStatusCodes.TooManyRequests,
+    HttpStatusCodes.InternalServerError, // TODO: Handle all 500s on Portal backend and remove from retries list
+    HttpStatusCodes.BadGateway,
+    HttpStatusCodes.ServiceUnavailable,
+    HttpStatusCodes.GatewayTimeout,
+  ];
+}
+
+export class Urls {
+  public static feedbackEmail = "https://aka.ms/cosmosdbfeedback?subject=Cosmos%20DB%20Data%20Explorer%20Feedback";
+  public static autoscaleMigration = "https://aka.ms/cosmos-autoscale-migration";
+  public static freeTierInformation = "https://aka.ms/cosmos-free-tier";
+  public static cosmosPricing = "https://aka.ms/azure-cosmos-db-pricing";
+}
+
+export class HashRoutePrefixes {
+  public static databases: string = "/dbs/{db_id}";
+  public static collections: string = "/dbs/{db_id}/colls/{coll_id}";
+  public static sprocHash: string = "/sprocs/";
+  public static sprocs: string = HashRoutePrefixes.collections + HashRoutePrefixes.sprocHash + "{sproc_id}";
+  public static docs: string = HashRoutePrefixes.collections + "/docs/{doc_id}/";
+  public static conflicts: string = HashRoutePrefixes.collections + "/conflicts";
+
+  public static databasesWithId(databaseId: string): string {
+    return this.databases.replace("{db_id}", databaseId).replace("/", ""); // strip the first slash since hasher adds it
+  }
+
+  public static collectionsWithIds(databaseId: string, collectionId: string): string {
+    const transformedDatabasePrefix: string = this.collections.replace("{db_id}", databaseId);
+
+    return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("/", ""); // strip the first slash since hasher adds it
+  }
+
+  public static sprocWithIds(
+    databaseId: string,
+    collectionId: string,
+    sprocId: string,
+    stripFirstSlash: boolean = true
+  ): string {
+    const transformedDatabasePrefix: string = this.sprocs.replace("{db_id}", databaseId);
+
+    const transformedSprocRoute: string = transformedDatabasePrefix
+      .replace("{coll_id}", collectionId)
+      .replace("{sproc_id}", sprocId);
+    if (!!stripFirstSlash) {
+      return transformedSprocRoute.replace("/", ""); // strip the first slash since hasher adds it
+    }
+
+    return transformedSprocRoute;
+  }
+
+  public static conflictsWithIds(databaseId: string, collectionId: string) {
+    const transformedDatabasePrefix: string = this.conflicts.replace("{db_id}", databaseId);
+
+    return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("/", ""); // strip the first slash since hasher adds it;
+  }
+
+  public static docsWithIds(databaseId: string, collectionId: string, docId: string) {
+    const transformedDatabasePrefix: string = this.docs.replace("{db_id}", databaseId);
+
+    return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("{doc_id}", docId).replace("/", ""); // strip the first slash since hasher adds it
+  }
+}
+
+export class ConfigurationOverridesValues {
+  public static IsBsonSchemaV2: string = "true";
+}
+
+export class KeyCodes {
+  public static Space: number = 32;
+  public static Enter: number = 13;
+  public static Escape: number = 27;
+  public static UpArrow: number = 38;
+  public static DownArrow: number = 40;
+  public static LeftArrow: number = 37;
+  public static RightArrow: number = 39;
+  public static Tab: number = 9;
+}
+
+// Normalized per: https://www.w3.org/TR/uievents-key/#named-key-attribute-values
+export class NormalizedEventKey {
+  public static readonly Space = " ";
+  public static readonly Enter = "Enter";
+  public static readonly Escape = "Escape";
+  public static readonly UpArrow = "ArrowUp";
+  public static readonly DownArrow = "ArrowDown";
+  public static readonly LeftArrow = "ArrowLeft";
+  public static readonly RightArrow = "ArrowRight";
+}
+
+export class TryCosmosExperience {
+  public static extendUrl: string = "https://trycosmosdb.azure.com/api/resource/extendportal?userId={0}";
+  public static deleteUrl: string = "https://trycosmosdb.azure.com/api/resource/deleteportal?userId={0}";
+  public static collectionsPerAccount: number = 3;
+  public static maxRU: number = 5000;
+  public static defaultRU: number = 3000;
+}
+
+export class OfferVersions {
+  public static V1: string = "V1";
+  public static V2: string = "V2";
+}
+
+export enum ConflictOperationType {
+  Replace = "replace",
+  Create = "create",
+  Delete = "delete",
+}
+
+export const EmulatorMasterKey =
+  //[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")]
+  "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
+
+// A variable @MyVariable defined in Constants.less is accessible as StyleConstants.MyVariable
+export const StyleConstants = require("less-vars-loader!../../less/Common/Constants.less");
+
+export class Notebook {
+  public static readonly defaultBasePath = "./notebooks";
+  public static readonly heartbeatDelayMs = 5000;
+  public static readonly kernelRestartInitialDelayMs = 1000;
+  public static readonly kernelRestartMaxDelayMs = 20000;
+  public static readonly autoSaveIntervalMs = 120000;
+}
+
+export class SparkLibrary {
+  public static readonly nameMinLength = 3;
+  public static readonly nameMaxLength = 63;
+}
+
+export class AnalyticalStorageTtl {
+  public static readonly Days90: number = 7776000;
+  public static readonly Infinite: number = -1;
+  public static readonly Disabled: number = 0;
+}
+
+export class TerminalQueryParams {
+  public static readonly Terminal = "terminal";
+  public static readonly Server = "server";
+  public static readonly Token = "token";
+  public static readonly SubscriptionId = "subscriptionId";
+  public static readonly TerminalEndpoint = "terminalEndpoint";
+}

src/Common/Constants/AfecFeatures.ts

@@ -1,3 +0,0 @@
-export const Spark = "spark-public-preview";
-export const Notebooks = "sparknotebooks-public-preview";
-export const StorageAnalytics = "storageanalytics-public-preview";

src/Common/Constants/AnalyticalStorageTtl.ts

@@ -1,3 +0,0 @@
-export const Days90 = 7776000;
-export const Infinite = -1;
-export const Disabled = 0;

src/Common/Constants/ApiEndpoints.ts

@@ -1,2 +0,0 @@
-export const runtimeProxy = "/api/RuntimeProxy";
-export const guestRuntimeProxy = "/api/guest/RuntimeProxy";

src/Common/Constants/ApiType.ts

@@ -1,6 +0,0 @@
-// Mapped to hexadecimal values in the backend
-export const MongoDB = 1;
-export const Gremlin = 2;
-export const Cassandra = 4;
-export const Table = 8;
-export const SQL = 16;

src/Common/Constants/Areas.ts

@@ -1,5 +0,0 @@
-export const ResourceTree = "Resource Tree";
-export const ContextualPane = "Contextual Pane";
-export const Tab = "Tab";
-export const ShareDialog = "Share Access Dialog";
-export const Notebook = "Notebook";

src/Common/Constants/ArmApiVersions.ts

@@ -1,6 +0,0 @@
-export const documentDB = "2015-11-06";
-export const arcadia = "2019-06-01-preview";
-export const arcadiaLivy = "2019-11-01-preview";
-export const arm = "2015-11-01";
-export const armFeatures = "2014-08-01-preview";
-export const publicVersion = "2020-04-01";

src/Common/Constants/ArmResourceTypes.ts

@@ -1,2 +0,0 @@
-export const notebookWorkspaces = "Microsoft.DocumentDB/databaseAccounts/notebookWorkspaces";
-export const synapseWorkspaces = "Microsoft.Synapse/workspaces";

src/Common/Constants/BackendDefaults.ts

@@ -1,5 +0,0 @@
-export const partitionKeyKind = "Hash";
-export const singlePartitionStorageInGb = "10";
-export const multiPartitionStorageInGb = "100";
-export const maxChangeFeedRetentionDuration = 10;
-export const partitionKeyVersion = 2;

src/Common/Constants/CapabilityNames.ts

@@ -1,8 +0,0 @@
-export const EnableTable = "EnableTable";
-export const EnableGremlin = "EnableGremlin";
-export const EnableCassandra = "EnableCassandra";
-export const EnableAutoScale = "EnableAutoScale";
-export const EnableNotebooks = "EnableNotebooks";
-export const EnableStorageAnalytics = "EnableStorageAnalytics";
-export const EnableMongo = "EnableMongo";
-export const EnableServerless = "EnableServerless";

src/Common/Constants/CassandraBackend.ts

@@ -1,9 +0,0 @@
-// TODO: 435619 Add default endpoints per cloud and use regional only when available
-export const createOrDeleteApi = "api/cassandra/createordelete";
-export const guestCreateOrDeleteApi = "api/guest/cassandra/createordelete";
-export const queryApi = "api/cassandra";
-export const guestQueryApi = "api/guest/cassandra";
-export const keysApi = "api/cassandra/keys";
-export const guestKeysApi = "api/guest/cassandra/keys";
-export const schemaApi = "api/cassandra/schema";
-export const guestSchemaApi = "api/guest/cassandra/schema";

src/Common/Constants/ClientDefaults.ts

@@ -1,9 +0,0 @@
-export const requestTimeoutMs = 60000;
-export const portalCacheTimeoutMs = 10000;
-export const errorNotificationTimeoutMs = 5000;
-export const copyHelperTimeoutMs = 2000;
-export const waitForDOMElementMs = 500;
-export const cacheBustingTimeoutMs = 10 /** minutes **/ * 60 /** to seconds **/ * 1000; /** to milliseconds **/
-export const databaseThroughputIncreaseFactor = 100;
-export const arcadiaTokenRefreshInterval = 20 /** minutes **/ * 60 /** to seconds **/ * 1000; /** to milliseconds **/
-export const arcadiaTokenRefreshIntervalPaddingMs = 2000;

src/Common/Constants/CodeOfConductEndpoints.ts

@@ -1,3 +0,0 @@
-export const privacyStatement = "https://aka.ms/ms-privacy-policy";
-export const codeOfConduct = "https://aka.ms/cosmos-code-of-conduct";
-export const termsOfUse = "https://aka.ms/ms-terms-of-use";

src/Common/Constants/ConfigurationOverridesValues.ts

@@ -1 +0,0 @@
-export const IsBsonSchemaV2 = "true";

src/Common/Constants/CorrelationBackend.ts

@@ -1 +0,0 @@
-export const Url = "https://aka.ms/cosmosdbanalytics";

src/Common/Constants/DocumentsGridMetrics.ts

@@ -1,8 +0,0 @@
-export const DocumentsPerPage = 100;
-export const IndividualRowHeight = 34;
-export const BufferHeight = 28;
-export const SplitterMinWidth = 200;
-export const SplitterMaxWidth = 360;
-
-export const DocumentEditorMinWidthRatio = 0.2;
-export const DocumentEditorMaxWidthRatio = 0.4;

src/Common/Constants/EndpointsRegex.ts

@@ -1,8 +0,0 @@
-export const cassandra = [
-  "AccountEndpoint=(.*).cassandra.cosmosdb.azure.com",
-  "HostName=(.*).cassandra.cosmos.azure.com",
-];
-export const mongo = "mongodb://.*:(.*)@(.*).documents.azure.com";
-export const mongoCompute = "mongodb://.*:(.*)@(.*).mongo.cosmos.azure.com";
-export const sql = "AccountEndpoint=https://(.*).documents.azure.com";
-export const table = "TableEndpoint=https://(.*).table.cosmosdb.azure.com";

src/Common/Constants/Flights.ts

@@ -1,8 +0,0 @@
-// flight names returned from the portal are always lowercase
-export const SettingsV2 = "settingsv2";
-export const MongoIndexEditor = "mongoindexeditor";
-export const MongoIndexing = "mongoindexing";
-export const AutoscaleTest = "autoscaletest";
-export const PartitionKeyTest = "partitionkeytest";
-export const PKPartitionKeyTest = "pkpartitionkeytest";
-export const Phoenix = "phoenix";

src/Common/Constants/HashRoutePrefixes.ts

@@ -1,40 +0,0 @@
-export const databases = "/dbs/{db_id}";
-export const collections = "/dbs/{db_id}/colls/{coll_id}";
-export const sprocHash = "/sprocs/";
-export const sprocs = collections + sprocHash + "{sproc_id}";
-export const docs = collections + "/docs/{doc_id}/";
-export const conflicts = collections + "/conflicts";
-
-export const databasesWithId = (databaseId: string) => {
-  return databases.replace("{db_id}", databaseId).replace("/", ""); // strip the first slash since hasher adds it
-};
-
-export const collectionsWithIds = (databaseId: string, collectionId: string) => {
-  const transformedDatabasePrefix = collections.replace("{db_id}", databaseId);
-
-  return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("/", ""); // strip the first slash since hasher adds it
-};
-
-export const sprocWithIds = (databaseId: string, collectionId: string, sprocId: string, stripFirstSlash = true) => {
-  const transformedDatabasePrefix = sprocs.replace("{db_id}", databaseId);
-
-  const transformedSprocRoute = transformedDatabasePrefix
-    .replace("{coll_id}", collectionId)
-    .replace("{sproc_id}", sprocId);
-  if (stripFirstSlash) {
-    return transformedSprocRoute.replace("/", ""); // strip the first slash since hasher adds it
-  }
-
-  return transformedSprocRoute;
-};
-
-export const conflictsWithIds = (databaseId: string, collectionId: string) => {
-  const transformedDatabasePrefix = conflicts.replace("{db_id}", databaseId);
-
-  return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("/", ""); // strip the first slash since hasher adds it;
-};
-
-export const docsWithIds = (databaseId: string, collectionId: string, docId: string): string => {
-  const transformedDatabasePrefix = docs.replace("{db_id}", databaseId);
-  return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("{doc_id}", docId).replace("/", ""); // strip the first slash since hasher adds it
-};

src/Common/Constants/HttpHeaders.ts

@@ -1,30 +0,0 @@
-export const activityId = "x-ms-activity-id";
-export const apiType = "x-ms-cosmos-apitype";
-export const authorization = "authorization";
-export const collectionIndexTransformationProgress = "x-ms-documentdb-collection-index-transformation-progress";
-export const continuation = "x-ms-continuation";
-export const correlationRequestId = "x-ms-correlation-request-id";
-export const enableScriptLogging = "x-ms-documentdb-script-enable-logging";
-export const guestAccessToken = "x-ms-encrypted-auth-token";
-export const getReadOnlyKey = "x-ms-get-read-only-key";
-export const connectionString = "x-ms-connection-string";
-export const msDate = "x-ms-date";
-export const location = "Location";
-export const contentType = "Content-Type";
-export const offerReplacePending = "x-ms-offer-replace-pending";
-export const user = "x-ms-user";
-export const populatePartitionStatistics = "x-ms-documentdb-populatepartitionstatistics";
-export const queryMetrics = "x-ms-documentdb-query-metrics";
-export const requestCharge = "x-ms-request-charge";
-export const resourceQuota = "x-ms-resource-quota";
-export const resourceUsage = "x-ms-resource-usage";
-export const retryAfterMs = "x-ms-retry-after-ms";
-export const scriptLogResults = "x-ms-documentdb-script-log-results";
-export const populateCollectionThroughputInfo = "x-ms-documentdb-populatecollectionthroughputinfo";
-export const supportSpatialLegacyCoordinates = "x-ms-documentdb-supportspatiallegacycoordinates";
-export const usePolygonsSmallerThanAHemisphere = "x-ms-documentdb-usepolygonssmallerthanahemisphere";
-export const autoPilotThroughput = "autoscaleSettings";
-export const autoPilotThroughputSDK = "x-ms-cosmos-offer-autopilot-settings";
-export const partitionKey = "x-ms-documentdb-partitionkey";
-export const migrateOfferToManualThroughput = "x-ms-cosmos-migrate-offer-to-manual-throughput";
-export const migrateOfferToAutopilot = "x-ms-cosmos-migrate-offer-to-autopilot";

src/Common/Constants/HttpStatusCodes.ts

@@ -1,23 +0,0 @@
-export const OK = 200;
-export const Created = 201;
-export const Accepted = 202;
-export const NoContent = 204;
-export const NotModified = 304;
-export const Unauthorized = 401;
-export const Forbidden = 403;
-export const NotFound = 404;
-export const TooManyRequests = 429;
-export const Conflict = 409;
-
-export const InternalServerError = 500;
-export const BadGateway = 502;
-export const ServiceUnavailable = 503;
-export const GatewayTimeout = 504;
-
-export const RetryableStatusCodes: number[] = [
-  TooManyRequests,
-  InternalServerError, // TODO: Handle all 500s on Portal backend and remove from retries list
-  BadGateway,
-  ServiceUnavailable,
-  GatewayTimeout,
-];

src/Common/Constants/KeyCodes.ts

@@ -1,8 +0,0 @@
-export const Space = 32;
-export const Enter = 13;
-export const Escape = 27;
-export const UpArrow = 38;
-export const DownArrow = 40;
-export const LeftArrow = 37;
-export const RightArrow = 39;
-export const Tab = 9;

src/Common/Constants/MongoDBAccounts.ts

@@ -1,2 +0,0 @@
-export const protocol = "https";
-export const defaultPort = "10255";

src/Common/Constants/NormalizedEventKey.ts

@@ -1,8 +0,0 @@
-// Normalized per: https://www.w3.org/TR/uievents-key/#named-key-attribute-values
-export const Space = " ";
-export const Enter = "Enter";
-export const Escape = "Escape";
-export const UpArrow = "ArrowUp";
-export const DownArrow = "ArrowDown";
-export const LeftArrow = "ArrowLeft";
-export const RightArrow = "ArrowRight";

src/Common/Constants/Notebook.ts

@@ -1,27 +0,0 @@
-export const defaultBasePath = "./notebooks";
-export const heartbeatDelayMs = 60000;
-export const kernelRestartInitialDelayMs = 1000;
-export const kernelRestartMaxDelayMs = 20000;
-export const autoSaveIntervalMs = 120000;
-export const memoryGuageToGB = 1048576;
-export const temporarilyDownMsg = "Notebooks is currently not available. We are working on it.";
-export const mongoShellTemporarilyDownMsg =
-  "We have identified an issue with the Mongo Shell and it is unavailable right now. We are actively working on the mitigation.";
-export const cassandraShellTemporarilyDownMsg =
-  "We have identified an issue with the Cassandra Shell and it is unavailable right now. We are actively working on the mitigation.";
-export const saveNotebookModalTitle = "Save Notebook in temporary workspace";
-export const 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.";
-export const newNotebookModalTitle = "Create Notebook in temporary workspace";
-export const newNotebookUploadModalTitle = "Upload Notebook in temporary workspace";
-export const 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.";
-export const 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. ";
-export const 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.";
-export const 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. ";
-export const cosmosNotebookHomePageUrl = "https://aka.ms/cosmos-notebooks-limits";
-export const cosmosNotebookGitDocumentationUrl = "https://aka.ms/cosmos-notebooks-github";
-export const learnMore = "Learn more.";

src/Common/Constants/OfferVersions.ts

@@ -1,2 +0,0 @@
-export const V1 = "V1";
-export const V2 = "V2";

src/Common/Constants/Queries.ts

@@ -1,8 +0,0 @@
-export const CustomPageOption = "custom";
-export const UnlimitedPageOption = "unlimited";
-export const itemsPerPage = 100;
-export const unlimitedItemsPerPage = 100; // TODO: Figure out appropriate value so it works for accounts with a large number of partitions
-
-export const QueryEditorMinHeightRatio = 0.1;
-export const QueryEditorMaxHeightRatio = 0.4;
-export const DefaultMaxDegreeOfParallelism = 6;

src/Common/Constants/SavedQueries.ts

@@ -1,4 +0,0 @@
-export const CollectionName = "___Query";
-export const DatabaseName = "___Cosmos";
-export const OfferThroughput = 400;
-export const PartitionKeyProperty = "id";

src/Common/Constants/ServerIds.ts

@@ -1,6 +0,0 @@
-export const localhost = "localhost";
-export const blackforest = "blackforest";
-export const fairfax = "fairfax";
-export const mooncake = "mooncake";
-export const productionPortal = "prod";
-export const dev = "dev";

src/Common/Constants/SparkLibrary.ts

@@ -1,2 +0,0 @@
-export const nameMinLength = 3;
-export const nameMaxLength = 63;

src/Common/Constants/TagNames.ts

@@ -1 +0,0 @@
-export const defaultExperience = "defaultExperience";

src/Common/Constants/TerminalQueryParams.ts

@@ -1,5 +0,0 @@
-export const Terminal = "terminal";
-export const Server = "server";
-export const Token = "token";
-export const SubscriptionId = "subscriptionId";
-export const TerminalEndpoint = "terminalEndpoint";

src/Common/Constants/TryCosmosExperience.ts

@@ -1,5 +0,0 @@
-export const extendUrl = "https://trycosmosdb.azure.com/api/resource/extendportal?userId={0}";
-export const deleteUrl = "https://trycosmosdb.azure.com/api/resource/deleteportal?userId={0}";
-export const collectionsPerAccount = 3;
-export const maxRU = 5000;
-export const defaultRU = 3000;

src/Common/Constants/Urls.ts

@@ -1,4 +0,0 @@
-export const feedbackEmail = "https://aka.ms/cosmosdbfeedback?subject=Cosmos%20DB%20Data%20Explorer%20Feedback";
-export const autoscaleMigration = "https://aka.ms/cosmos-autoscale-migration";
-export const freeTierInformation = "https://aka.ms/cosmos-free-tier";
-export const cosmosPricing = "https://aka.ms/azure-cosmos-db-pricing";

src/Common/Constants/index.ts

@@ -1,105 +0,0 @@
-import * as AfecFeatures from "./AfecFeatures";
-import * as AnalyticalStorageTtl from "./AnalyticalStorageTtl";
-import * as ApiEndpoints from "./ApiEndpoints";
-import * as ApiType from "./ApiType";
-import * as Areas from "./Areas";
-import * as ArmApiVersions from "./ArmApiVersions";
-import * as ArmResourceTypes from "./ArmResourceTypes";
-import * as BackendDefaults from "./BackendDefaults";
-import * as CapabilityNames from "./CapabilityNames";
-import * as CassandraBackend from "./CassandraBackend";
-import * as ClientDefaults from "./ClientDefaults";
-import * as CodeOfConductEndpoints from "./CodeOfConductEndpoints";
-import * as ConfigurationOverridesValues from "./ConfigurationOverridesValues";
-import * as CorrelationBackend from "./CorrelationBackend";
-import * as DocumentsGridMetrics from "./DocumentsGridMetrics";
-import * as EndpointsRegex from "./EndpointsRegex";
-import * as Flights from "./Flights";
-import * as HashRoutePrefixes from "./HashRoutePrefixes";
-import * as HttpHeaders from "./HttpHeaders";
-import * as HttpStatusCodes from "./HttpStatusCodes";
-import * as KeyCodes from "./KeyCodes";
-import * as MongoDBAccounts from "./MongoDBAccounts";
-import * as NormalizedEventKey from "./NormalizedEventKey";
-import * as Notebook from "./Notebook";
-import * as OfferVersions from "./OfferVersions";
-import * as Queries from "./Queries";
-import * as SavedQueries from "./SavedQueries";
-import * as ServerIds from "./ServerIds";
-import * as SparkLibrary from "./SparkLibrary";
-import * as TagNames from "./TagNames";
-import * as TerminalQueryParams from "./TerminalQueryParams";
-import * as TryCosmosExperience from "./TryCosmosExperience";
-import * as Urls from "./Urls";
-
-const StyleConstants = require("less-vars-loader!../../../less/Common/Constants.less");
-
-export {
-  StyleConstants,
-  SparkLibrary,
-  ConfigurationOverridesValues,
-  OfferVersions,
-  AnalyticalStorageTtl,
-  Notebook,
-  TryCosmosExperience,
-  NormalizedEventKey,
-  KeyCodes,
-  HashRoutePrefixes,
-  Urls,
-  HttpStatusCodes,
-  ApiType,
-  HttpHeaders,
-  Areas,
-  DocumentsGridMetrics,
-  SavedQueries,
-  Queries,
-  CassandraBackend,
-  MongoDBAccounts,
-  TagNames,
-  AfecFeatures,
-  Flights,
-  CorrelationBackend,
-  CapabilityNames,
-  ClientDefaults,
-  BackendDefaults,
-  ArmResourceTypes,
-  ArmApiVersions,
-  TerminalQueryParams,
-  CodeOfConductEndpoints,
-  ApiEndpoints,
-  EndpointsRegex,
-  ServerIds,
-};
-
-export enum ConnectionStatusType {
-  Connect = "Connect",
-  Connecting = "Connecting",
-  Connected = "Connected",
-  Failed = "Connection Failed",
-  ReConnect = "Reconnect",
-}
-
-export enum ConflictOperationType {
-  Replace = "replace",
-  Create = "create",
-  Delete = "delete",
-}
-
-export const EmulatorMasterKey =
-  //[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")]
-  "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
-
-// A variable @MyVariable defined in Constants.less is accessible as StyleConstants.MyVariable
-
-export enum AccountKind {
-  DocumentDB = "DocumentDB",
-  MongoDB = "MongoDB",
-  Parse = "Parse",
-  GlobalDocumentDB = "GlobalDocumentDB",
-  Default = "DocumentDB",
-}
-
-export enum MongoBackendEndpointType {
-  local,
-  remote,
-}

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()", () => {

src/Common/MongoProxyClient.test.ts

@@ -3,16 +3,8 @@ 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";
 
 const databaseId = "testDB";
 
@@ -254,31 +246,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");
-    });
-  });
 });

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,8 +78,9 @@ export function queryDocuments(
         : "",
   };
 
-  const endpoint = getFeatureEndpointOrDefault("resourcelist") || "";
-  const headers: HeadersInit = {
+  const endpoint = getEndpoint() || "";
+
+  const headers = {
     ...defaultHeaders,
     ...authHeaders(),
     [CosmosSDKConstants.HttpHeaders.IsQuery]: "true",
@@ -141,8 +141,7 @@ export function readDocument(
         : "",
   };
 
-  const endpoint = getFeatureEndpointOrDefault("readDocument");
-
+  const endpoint = getEndpoint();
   return window
     .fetch(`${endpoint}?${queryString.stringify(params)}`, {
       method: "GET",
@@ -182,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)}`, {
@@ -226,7 +225,7 @@ export function updateDocument(
         ? documentId.partitionKeyProperty
         : "",
   };
-  const endpoint = getFeatureEndpointOrDefault("updateDocument");
+  const endpoint = getEndpoint();
 
   return window
     .fetch(`${endpoint}?${queryString.stringify(params)}`, {
@@ -267,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)}`, {
@@ -310,7 +309,7 @@ export function createMongoCollectionWithProxy(
     autoPilotThroughput: params.autoPilotMaxThroughput?.toString(),
   };
 
-  const endpoint = getFeatureEndpointOrDefault("createCollectionWithProxy");
+  const endpoint = getEndpoint();
 
   return window
     .fetch(
@@ -334,15 +333,8 @@ export function createMongoCollectionWithProxy(
     });
 }
 
-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");

src/Common/ResourceTree.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 */}

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>
   );

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 () => {

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,

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: {

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 {

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
-}

src/Contracts/ViewModels.ts

@@ -3,7 +3,7 @@ import {
   Resource,
   StoredProcedureDefinition,
   TriggerDefinition,
-  UserDefinedFunctionDefinition,
+  UserDefinedFunctionDefinition
 } from "@azure/cosmos";
 import Explorer from "../Explorer/Explorer";
 import { ConsoleData } from "../Explorer/Menus/NotificationConsole/ConsoleData";
@@ -370,6 +370,7 @@ export enum TerminalKind {
   Default = 0,
   Mongo = 1,
   Cassandra = 2,
+  PostgreSQL = 3
 }
 
 export interface DataExplorerInputsFrame {

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);

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]);
       }

src/Explorer/ContextMenuButtonFactory.tsx

@@ -16,7 +16,6 @@ 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";
@@ -50,10 +49,7 @@ export const createDatabaseContextMenu = (container: Explorer, databaseId: strin
       onClick: () =>
         useSidePanel
           .getState()
-          .openSidePanel(
-            "Delete " + getDatabaseName(),
-            <DeleteDatabaseConfirmationPanel refreshDatabases={() => container.refreshAllDatabases()} />
-          ),
+          .openSidePanel("Delete " + getDatabaseName(), <DeleteDatabaseConfirmationPanel explorer={container} />),
       label: `Delete ${getDatabaseName()}`,
       styleClass: "deleteDatabaseMenuItem",
     });
@@ -83,16 +79,15 @@ export const createCollectionContextMenuButton = (
 
     items.push({
       iconSrc: HostedTerminalIcon,
-      isDisabled: useNotebook.getState().isShellEnabled && userContext.features.notebooksTemporarilyDown,
       onClick: () => {
         const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled) {
+        if (container.isShellEnabled()) {
           container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
         } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
         }
       },
-      label: useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell",
+      label: container.isShellEnabled() ? "Open Mongo Shell" : "New Shell",
     });
   }
 
@@ -110,7 +105,7 @@ export const createCollectionContextMenuButton = (
       iconSrc: AddUdfIcon,
       onClick: () => {
         const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection);
+        selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection, undefined);
       },
       label: "New UDF",
     });
@@ -130,10 +125,7 @@ export const createCollectionContextMenuButton = (
     onClick: () =>
       useSidePanel
         .getState()
-        .openSidePanel(
-          "Delete " + getCollectionName(),
-          <DeleteCollectionConfirmationPane refreshDatabases={() => container.refreshAllDatabases()} />
-        ),
+        .openSidePanel("Delete " + getCollectionName(), <DeleteCollectionConfirmationPane explorer={container} />),
     label: `Delete ${getCollectionName()}`,
     styleClass: "deleteCollectionMenuItem",
   });

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 });
   };
 

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>

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,

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 {

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} />

src/Explorer/Controls/Editor/EditorReact.tsx

@@ -56,7 +56,7 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt
     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());
       });

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}>

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;
-    }
-}
+

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);
   }
 }

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>
 `;

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],
+      ])
+    );
   });
 });

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;
   }
 }

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>
-`;

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";
@@ -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}

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
+                    }
                   },
                 },
               ],

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -16,6 +16,7 @@ import { trace, traceFailure, traceStart, traceSuccess } from "../../../Shared/T
 import { userContext } from "../../../UserContext";
 import { MongoDBCollectionResource, MongoIndex } from "../../../Utils/arm/generatedClients/cosmos/types";
 import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
+import { logConsoleError } from "../../../Utils/NotificationConsoleUtils";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import { useCommandBar } from "../../Menus/CommandBar/CommandBarComponentAdapter";
 import { SettingsTabV2 } from "../../Tabs/SettingsTabV2";
@@ -109,6 +110,7 @@ export interface SettingsComponentState {
 
   initialNotification: DataModels.Notification;
   selectedTab: SettingsV2TabTypes;
+  offerLoaded: boolean;
 }
 
 export class SettingsComponent extends React.Component<SettingsComponentProps, SettingsComponentState> {
@@ -193,6 +195,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
 
       initialNotification: undefined,
       selectedTab: SettingsV2TabTypes.ScaleTab,
+      offerLoaded: !!this.offer,
     };
 
     this.saveSettingsButton = {
@@ -214,6 +217,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     if (this.isCollectionSettingsTab) {
       this.refreshIndexTransformationProgress();
       this.loadMongoIndexes();
+      this.loadCollectionOffer();
     }
 
     this.setAutoPilotStates();
@@ -368,6 +372,34 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     });
   };
 
+  private async loadCollectionOffer() {
+    try {
+      this.props.settingsTab.isExecuting(true);
+      await this.collection.loadOffer();
+      this.props.settingsTab.tabTitle(this.collection.offer() ? "Settings" : "Scale & Settings");
+      this.setState({ offerLoaded: true });
+    } catch (error) {
+      this.props.settingsTab.isExecutionError(true);
+      const errorMessage = getErrorMessage(error);
+      traceFailure(
+        Action.Tab,
+        {
+          databaseName: this.collection.databaseId,
+          collectionName: this.collection.id(),
+
+          dataExplorerArea: Constants.Areas.Tab,
+          tabTitle: this.props.settingsTab.tabTitle,
+          error: errorMessage,
+          errorStack: getErrorStack(error),
+        },
+        this.props.settingsTab.onLoadStartKey
+      );
+      logConsoleError(`Error while fetching container settings for container ${this.collection.id()}: ${errorMessage}`);
+    } finally {
+      this.props.settingsTab.isExecuting(false);
+    }
+  }
+
   private getMongoIndexesToSave = (): MongoIndex[] => {
     let finalIndexes: MongoIndex[] = [];
     this.state.currentMongoIndexes?.map((mongoIndex: MongoIndex, index: number) => {
@@ -905,6 +937,10 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       );
     }
 
+    if (!this.state.offerLoaded) {
+      return <></>;
+    }
+
     const subSettingsComponentProps: SubSettingsComponentProps = {
       collection: this.collection,
       isAnalyticalStorageEnabled: this.isAnalyticalStorageEnabled,

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>
 );
 

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,
         },
       }

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,
                 },
               }

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,
           },
         }

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,
                 },
               }

src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap

@@ -30,21 +30,39 @@ exports[`SettingsComponent renders 1`] = `
               "container": Explorer {
                 "_isInitializingNotebooks": false,
                 "_resetNotebookWorkspace": [Function],
+                "isAccountReady": [Function],
                 "isFixedCollectionWithSharedThroughputSupported": [Function],
+                "isNotebookEnabled": [Function],
+                "isNotebooksEnabledForAccount": [Function],
+                "isSchemaEnabled": [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],
                 "resourceTree": ResourceTreeAdapter {
                   "container": [Circular],
                   "copyNotebook": [Function],
                   "parameters": [Function],
                 },
+                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                  "container": [Circular],
+                  "parameters": [Function],
+                },
+                "sparkClusterConnectionInfo": [Function],
+                "tabsManager": TabsManager {
+                  "activeTab": [Function],
+                  "openedTabs": [Function],
+                },
               },
               "databaseId": "test",
               "defaultTtl": [Function],
@@ -98,21 +116,39 @@ exports[`SettingsComponent renders 1`] = `
               "container": Explorer {
                 "_isInitializingNotebooks": false,
                 "_resetNotebookWorkspace": [Function],
+                "isAccountReady": [Function],
                 "isFixedCollectionWithSharedThroughputSupported": [Function],
+                "isNotebookEnabled": [Function],
+                "isNotebooksEnabledForAccount": [Function],
+                "isSchemaEnabled": [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],
                 "resourceTree": ResourceTreeAdapter {
                   "container": [Circular],
                   "copyNotebook": [Function],
                   "parameters": [Function],
                 },
+                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                  "container": [Circular],
+                  "parameters": [Function],
+                },
+                "sparkClusterConnectionInfo": [Function],
+                "tabsManager": TabsManager {
+                  "activeTab": [Function],
+                  "openedTabs": [Function],
+                },
               },
               "databaseId": "test",
               "defaultTtl": [Function],

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,
         },
       }

src/Explorer/Controls/Tabs/TabComponent.less

@@ -1,6 +1,7 @@
 @import "../../../../less/Common/Constants";
 
 .tabComponentContainer {
+    overflow: hidden;
     height: 100%;
     .flex-display();
     .flex-direction();

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}

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 (

src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx

@@ -118,7 +118,6 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
         <input
           className="throughputInputRadioBtn"
           aria-label="Autoscale mode"
-          aria-required={true}
           checked={isAutoscaleSelected}
           type="radio"
           role="radio"
@@ -132,7 +131,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")}

src/Explorer/Controls/ThroughputInput/__snapshots__/ThroughputInput.test.tsx.snap

@@ -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>

src/Explorer/Controls/TreeComponent/TreeComponent.tsx

@@ -243,7 +243,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={{

src/Explorer/Controls/TreeComponent/__snapshots__/TreeComponent.test.tsx.snap

@@ -211,7 +211,6 @@ exports[`TreeNodeComponent renders a simple node (sorted children, expanded) 1`]
             },
           }
         }
-        title="More"
       />
     </div>
   </div>
@@ -424,7 +423,6 @@ exports[`TreeNodeComponent renders sorted children, expanded, leaves and parents
             },
           }
         }
-        title="More"
       />
     </div>
   </div>

src/Explorer/DataSamples/DataSamplesUtil.test.ts

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

src/Explorer/DataSamples/DataSamplesUtil.ts

@@ -1,7 +1,6 @@
 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";
@@ -21,7 +20,7 @@ export class DataSamplesUtil {
     const containerName = generator.getCollectionId();
     if (this.hasContainer(databaseName, containerName, useDatabases.getState().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 +29,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);
   }