Merge branch 'update_to_webpack_5' of https://github.com/Azure/cosmos-explorer into update_to_webpack_5

.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

@@ -44,6 +44,7 @@ src/Definitions/png.d.ts
 src/Definitions/svg.d.ts
 src/Explorer/ComponentRegisterer.test.ts
 src/Explorer/ComponentRegisterer.ts
+src/Explorer/ContextMenuButtonFactory.ts
 src/Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.ts
 src/Explorer/Controls/DiffEditor/DiffEditorComponent.ts
 src/Explorer/Controls/DynamicList/DynamicList.test.ts
@@ -71,6 +72,7 @@ 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
@@ -82,6 +84,11 @@ src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.test.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts
+# src/Explorer/Graph/GraphStyleComponent/GraphStyle.test.ts
+# src/Explorer/Graph/GraphStyleComponent/GraphStyleComponent.ts
+
+src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts
+src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.ts
 src/Explorer/Menus/ContextMenu.ts
 src/Explorer/MostRecentActivity/MostRecentActivity.ts
 src/Explorer/Notebook/NotebookClientV2.ts
@@ -98,11 +105,23 @@ src/Explorer/Notebook/NotebookContainerClient.ts
 src/Explorer/Notebook/NotebookContentClient.ts
 src/Explorer/Notebook/NotebookContentItem.ts
 src/Explorer/Notebook/NotebookUtil.ts
+src/Explorer/OpenActions.test.ts
+src/Explorer/OpenActions.ts
 src/Explorer/OpenActionsStubs.ts
+src/Explorer/Panes/AddDatabasePane.ts
+src/Explorer/Panes/AddDatabasePane.test.ts
+src/Explorer/Panes/BrowseQueriesPane.ts
+src/Explorer/Panes/ContextualPaneBase.ts
+# src/Explorer/Panes/GraphStylingPane.ts
+# src/Explorer/Panes/NewVertexPane.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
@@ -119,6 +138,7 @@ src/Explorer/Tables/QueryBuilder/ClauseGroupViewModel.ts
 src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.ts
 src/Explorer/Tables/QueryBuilder/QueryBuilderViewModel.ts
 src/Explorer/Tables/QueryBuilder/QueryClauseViewModel.ts
+src/Explorer/Tables/QueryBuilder/QueryViewModel.ts
 src/Explorer/Tables/TableDataClient.ts
 src/Explorer/Tables/TableEntityProcessor.ts
 src/Explorer/Tables/Utilities.ts
@@ -128,67 +148,170 @@ src/Explorer/Tabs/DocumentsTab.test.ts
 src/Explorer/Tabs/DocumentsTab.ts
 src/Explorer/Tabs/GraphTab.ts
 src/Explorer/Tabs/MongoDocumentsTab.ts
+src/Explorer/Tabs/MongoQueryTab.ts
+src/Explorer/Tabs/MongoShellTab.ts
 src/Explorer/Tabs/NotebookV2Tab.ts
+src/Explorer/Tabs/QueryTab.test.ts
+src/Explorer/Tabs/QueryTab.ts
+src/Explorer/Tabs/QueryTablesTab.ts
 src/Explorer/Tabs/ScriptTabBase.ts
+src/Explorer/Tabs/StoredProcedureTab.ts
 src/Explorer/Tabs/TabComponents.ts
 src/Explorer/Tabs/TabsBase.ts
 src/Explorer/Tabs/TriggerTab.ts
 src/Explorer/Tabs/UserDefinedFunctionTab.ts
 src/Explorer/Tree/AccessibleVerticalList.ts
+src/Explorer/Tree/Collection.test.ts
 src/Explorer/Tree/Collection.ts
 src/Explorer/Tree/ConflictId.ts
+src/Explorer/Tree/Database.ts
 src/Explorer/Tree/DocumentId.ts
 src/Explorer/Tree/ObjectId.ts
 src/Explorer/Tree/ResourceTokenCollection.ts
 src/Explorer/Tree/StoredProcedure.ts
 src/Explorer/Tree/TreeComponents.ts
 src/Explorer/Tree/Trigger.ts
+src/Explorer/Tree/UserDefinedFunction.ts
 src/Explorer/WaitsForTemplateViewModel.ts
 src/GitHub/GitHubClient.test.ts
 src/GitHub/GitHubClient.ts
 src/GitHub/GitHubConnector.ts
+src/GitHub/GitHubContentProvider.test.ts
+src/GitHub/GitHubContentProvider.ts
 src/GitHub/GitHubOAuthService.ts
+src/HostedExplorer.ts
 src/Index.ts
 src/Juno/JunoClient.test.ts
 src/Juno/JunoClient.ts
+src/Main.ts
+src/NotebookWorkspaceManager/NotebookWorkspaceManager.ts
+src/NotebookWorkspaceManager/NotebookWorkspaceResourceProviderMockClients.ts
+src/Platform/Emulator/DataAccessUtility.ts
+src/Platform/Emulator/ExplorerFactory.ts
+src/Platform/Emulator/Main.ts
+src/Platform/Emulator/NotificationsClient.ts
+src/Platform/Hosted/ArmResourceUtils.ts
 src/Platform/Hosted/Authorization.ts
+src/Platform/Hosted/DataAccessUtility.ts
+src/Platform/Hosted/ExplorerFactory.ts
+src/Platform/Hosted/Helpers/ConnectionStringParser.test.ts
+src/Platform/Hosted/Main.ts
+src/Platform/Hosted/Maint.test.ts
+src/Platform/Hosted/NotificationsClient.ts
+src/Platform/Portal/DataAccessUtility.ts
+src/Platform/Portal/ExplorerFactory.ts
+src/Platform/Portal/Main.ts
+src/Platform/Portal/NotificationsClient.ts
+src/PlatformType.ts
 src/ReactDevTools.ts
+src/ResourceProvider/IResourceProviderClient.test.ts
+src/ResourceProvider/IResourceProviderClient.ts
+src/ResourceProvider/ResourceProviderClient.ts
+src/ResourceProvider/ResourceProviderClientFactory.ts
+src/RouteHandlers/RouteHandler.ts
+src/RouteHandlers/TabRouteHandler.test.ts
+src/RouteHandlers/TabRouteHandler.ts
 src/Shared/Constants.ts
 src/Shared/DefaultExperienceUtility.test.ts
 src/Shared/DefaultExperienceUtility.ts
+src/Shared/ExplorerSettings.ts
+src/Shared/PriceEstimateCalculator.ts
+src/Shared/StorageUtility.test.ts
+src/Shared/StorageUtility.ts
 src/Shared/appInsights.ts
 src/SparkClusterManager/ArcadiaResourceManager.ts
 src/SparkClusterManager/SparkClusterManager.ts
 src/Terminal/JupyterLabAppFactory.ts
 src/Terminal/NotebookAppContracts.d.ts
+src/Terminal/index.ts
+src/TokenProviders/PortalTokenProvider.ts
+src/TokenProviders/TokenProviderFactory.ts
+src/Utils/PricingUtils.test.ts
+src/Utils/QueryUtils.test.ts
 src/applyExplorerBindings.ts
 src/global.d.ts
 src/setupTests.ts
+src/Explorer/Controls/AccessibleElement/AccessibleElement.tsx
+src/Explorer/Controls/Accordion/AccordionComponent.tsx
+src/Explorer/Controls/AccountSwitch/AccountSwitchComponent.test.tsx
+src/Explorer/Controls/AccountSwitch/AccountSwitchComponent.tsx
+src/Explorer/Controls/AccountSwitch/AccountSwitchComponentAdapter.tsx
+src/Explorer/Controls/Arcadia/ArcadiaMenuPicker.tsx
+src/Explorer/Controls/CollapsiblePanel/CollapsiblePanel.tsx
+src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx
+src/Explorer/Controls/DialogReactComponent/DialogComponent.tsx
+src/Explorer/Controls/DialogReactComponent/DialogComponentAdapter.tsx
+src/Explorer/Controls/Directory/DefaultDirectoryDropdownComponent.test.tsx
+src/Explorer/Controls/Directory/DefaultDirectoryDropdownComponent.tsx
+src/Explorer/Controls/Directory/DirectoryComponentAdapter.tsx
+src/Explorer/Controls/Directory/DirectoryListComponent.test.tsx
+src/Explorer/Controls/Directory/DirectoryListComponent.tsx
+src/Explorer/Controls/Editor/EditorReact.tsx
 src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
 src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx
 src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
+src/Explorer/Controls/NotebookViewer/NotebookMetadataComponent.tsx
+src/NotebookViewer/NotebookViewer.tsx
 src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
+src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx
+src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponentAdapter.tsx
+src/Explorer/Controls/ResizeSensorReactComponent/ResizeSensorComponent.tsx
+src/Explorer/Controls/Spark/ClusterSettingsComponent.tsx
+src/Explorer/Controls/Spark/ClusterSettingsComponentAdapter.tsx
+src/Explorer/Controls/Tabs/TabComponent.tsx
+src/Explorer/Controls/TreeComponent/TreeComponent.test.tsx
 src/Explorer/Controls/TreeComponent/TreeComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/EditorNeighborsComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.test.tsx
+src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
+src/Explorer/Graph/GraphExplorerComponent/GraphExplorerAdapter.tsx
 src/Explorer/Graph/GraphExplorerComponent/GraphVizComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/LeftPaneComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/MiddlePaneComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/QueryContainerComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNeighborsComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx
 src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
+src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.test.tsx
+src/Explorer/Notebook/NotebookComponent/NotebookComponent.tsx
 src/Explorer/Notebook/NotebookComponent/NotebookComponentAdapter.tsx
 src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx
 src/Explorer/Notebook/NotebookComponent/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/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

@@ -43,6 +43,7 @@ module.exports = {
     "@typescript-eslint/no-explicit-any": "error",
     "prefer-arrow/prefer-arrow-functions": ["error", { allowStandaloneDeclarations: true }],
     eqeqeq: "error",
+    "react/react-in-jsx-scope": "off",
     "react/display-name": "off",
     "react-hooks/rules-of-hooks": "warn", // TODO: error
     "react-hooks/exhaustive-deps": "warn", // TODO: 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:

.github/workflows/cleanup.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
   schedule:
     # Once every hour
-    - cron: "0 15 * * *"
+    - cron: "0 * * * *"
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

babel.config.js

@@ -1,4 +1,13 @@
 module.exports = {
-  presets: [["@babel/preset-env", { targets: { node: "current" } }], "@babel/preset-react", "@babel/preset-typescript"],
+  presets: [
+    ["@babel/preset-env", { targets: { node: "current" } }],
+    [
+      "@babel/preset-react",
+      {
+        runtime: "automatic",
+      },
+    ],
+    "@babel/preset-typescript",
+  ],
   plugins: [["@babel/plugin-proposal-decorators", { legacy: true }]],
 };

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/check-1.svg

@@ -1,10 +0,0 @@
-<svg width="14" height="10" viewBox="0 0 14 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path d="M14.01 0.72999L4.81001 9.93999L0.0100098 5.17999L0.78001 4.40999L4.78001 8.40999L13.21 -0.0100098L14.01 0.72999Z" fill="#0078D4"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="14" height="9.99" fill="white"/>
-</clipPath>
-</defs>
-</svg>

jest.config.js

@@ -62,6 +62,8 @@ module.exports = {
   //   "node_modules"
   // ],
 
+  modulePaths: ["node_modules", "<rootDir>/src"],
+
   // An array of file extensions your modules use
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "html", "svg"],
 

less/Common/Constants.less

@@ -4,12 +4,11 @@
 
 @font-face {
   font-family: wf_segoe-ui_normal;
-  src: local("Segoe UI"), url("../../fonts/segoe-ui/west-european/normal/latest.woff");
+  src: url(./fonts/segoe-ui/west-european/normal/latest.woff);
 }
 
 @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/TableStyles/fulldatatables.less

@@ -51,7 +51,7 @@ table.can-select.dataTable tbody tr {
 table.can-select.dataTable tbody tr.selected {
   color: #000000 !important;
   /*[{datatable-row-selected-text} !important]*/
-    background-color: #C9DEF5;
+  background-color: #c9def5;
   /*[{datatable-row-selected-background}]*/
   border: 1px solid #b3d1f1;
   /*[1px solid {datatable-row-selected-border}]*/
@@ -64,23 +64,23 @@ table.can-select.dataTable tbody tr.selected td:first-child {
 
 table.can-select.dataTable.hover tbody tr:hover,
 table.dataTable.storage tbody tr:hover {
-    background-color: #C9DEF5;
+  background-color: #c9def5;
   /*[{datatable-row-hover-background}]*/
 }
 
 table.dataTable.storage tbody tr:hover td:empty {
-    background-color: #C9DEF5;
+  background-color: #c9def5;
   /*[{datatable-row-hover-empty-background}]*/
 }
 
 table.can-select.dataTable.hover tbody tr:hover.selected,
 table.can-select.dataTable.storage tbody tr:hover.selected {
-    background-color: #C9DEF5;
+  background-color: #c9def5;
   /*[{datatable-row-selected-background}]*/
 }
 
 table.can-select.dataTable:not(:focus) tbody tr.selected {
-    color: #1E1E1E;
+  color: #1e1e1e;
   /*[{datatable-row-selected-text}]*/
   background-color: #767676;
   /*[{datatable-row-selected-background}]*/
@@ -95,7 +95,7 @@ table.can-select.dataTable.storage:not(:focus) tbody tr:hover.selected {
 table.storage thead th,
 table.storage tfoot th {
   font-weight: normal;
-    color: #DDDDDD;
+  color: #dddddd;
   /*[{datatable-header-text}]*/
   white-space: nowrap;
 }
@@ -103,7 +103,7 @@ table.storage tfoot th {
 table.storage thead th,
 table.storage thead td {
   padding: 0.5em 1em;
-    border: 1px solid #DDDDDD;
+  border: 1px solid #dddddd;
   /*[1px solid {datatable-header-border}]*/
   background-color: @BaseLight;
   /*[{datatable-header-background}]*/
@@ -115,10 +115,10 @@ table.storage thead td {
 
 table.dataTable thead th:active,
 table.dataTable thead td:active {
-    border: 1px solid #DDDDDD;
+  border: 1px solid #dddddd;
   /*[1px solid {datatable-header-cell-active-border}]*/
   outline: none;
-    background-color: #B4C7DC !important;
+  background-color: #b4c7dc !important;
   /*[{datatable-header-cell-active-background} !important] */
 }
 
@@ -126,15 +126,15 @@ table.dataTable thead th:focus,
 table.dataTable thead td:focus {
   border-width: 1px;
   border-style: solid;
-    border-color: #007ACC;
+  border-color: #007acc;
   /*[{datatable-header-cell-focus-background}]*/
 }
 
 table.dataTable thead th:hover,
 table.dataTable thead td:hover {
-    border: 1px solid #007ACC;
+  border: 1px solid #007acc;
   /*[1px solid {datatable-header-cell-hover-border}]*/
-    background-color: #C9DEF5;
+  background-color: #c9def5;
   /*[{datatable-header-cell-hover-background}]*/
   color: #000000;
   /*[{datatable-header-cell-hover-text}]*/
@@ -153,7 +153,7 @@ table.storage thead td:last-child:not(:focus):not(:hover) {
 table.dataTable tfoot th,
 table.dataTable tfoot td {
   padding: 5px 18px 5px 18px;
-    border-top: 1px solid #DDDDDD;
+  border-top: 1px solid #dddddd;
   /*[1px solid {datatable-header-border}]*/
   background-color: @BaseLight;
   /*[{datatable-header-background}]*/
@@ -176,11 +176,11 @@ table.dataTable thead .sorting_desc_disabled {
 }
 
 table.dataTable thead .sorting_asc {
-    background-image: url("../../images/QueryBuilder/CollapseChevronUp_16x.png");
+  background-image: url(/images/QueryBuilder/CollapseChevronUp_16x.png);
 }
 
 table.dataTable thead .sorting_desc {
-    background-image: url("../../images/QueryBuilder/CollapseChevronDown_16x.png");
+  background-image: url(/images/QueryBuilder/CollapseChevronDown_16x.png);
 }
 
 table.dataTable tbody tr {
@@ -207,7 +207,6 @@ table.dataTable tbody tr td:first-child img {
   vertical-align: middle;
 }
 
-
 table.dataTable tbody tr td:first-child {
   border-left-width: 1px;
 }
@@ -225,12 +224,12 @@ table.show-gridlines tbody th,
 table.show-gridlines tbody td {
   border-width: 1px 1px 1px 0px;
   border-style: solid;
-    border-color: #DDDDDD;
+  border-color: #dddddd;
   /*[{datatable-base-border}]*/
 }
 
 table.show-gridlines tbody td:empty {
-    background-color: #E3E2E6;
+  background-color: #e3e2e6;
   /*[{datatable-base-border}]*/
 }
 
@@ -277,7 +276,7 @@ table.dataTable.hover tbody tr:hover,
 table.dataTable.storage tbody tr:hover {
   color: #000000;
   /*[{datatable-row-hover-text}]*/
-    background-color: #FCFCFC;
+  background-color: #fcfcfc;
   /*[{datatable-row-hover-background}]*/
 }
 
@@ -416,7 +415,6 @@ table.dataTable td {
   margin: 0px;
 }
 
-
 /*
  * Control feature layout
  */
@@ -446,7 +444,7 @@ table.dataTable td {
 .dataTables_wrapper .dataTables_filter input {
   background-color: #333337;
   /*[{plugin-textbox-background-color}]*/
-    border: 1px solid #3F3F46;
+  border: 1px solid #3f3f46;
   /*[1px solid {plugin-textbox-border-color}]*/
   margin-left: 0.5em;
   outline: none;
@@ -455,7 +453,7 @@ table.dataTable td {
 .dataTables_wrapper .dataTables_filter input:active,
 .dataTables_wrapper .dataTables_filter input:focus,
 .dataTables_wrapper .dataTables_filter input:hover {
-    border: 1px solid #007ACC;
+  border: 1px solid #007acc;
   /*[1px solid {search-control-mouse-over-border}]*/
 }
 
@@ -466,7 +464,7 @@ table.dataTable td {
 .dataTables_wrapper .dataTables_length select:active,
 .dataTables_wrapper .dataTables_length select:focus,
 .dataTables_wrapper .dataTables_length select:hover {
-    outline: 1px solid #007ACC;
+  outline: 1px solid #007acc;
   /*[1px solid {search-control-mouse-over-border}]*/
 }
 
@@ -549,7 +547,6 @@ table.dataTable td {
   overflow: hidden;
   .flex-display();
   .flex-direction();
-   
 }
 
 .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody {
@@ -609,7 +606,6 @@ tr:hover td.nameColumnText {
   display: none;
 }
 
-
 /*@media screen and (max-width: 767px) {
     .dataTables_wrapper .dataTables_info,
     .dataTables_wrapper .dataTables_paginate {
@@ -633,21 +629,21 @@ tr:hover td.nameColumnText {
 }*/
 
 .context-menu-item.icon-reset-column-order {
-    background-image: url(../../images/Reset-column-options.svg);
+  background-image: url(/images/Reset-column-options.svg);
 }
 
 .context-menu-item.icon-shift-non-empty-columns-left {
-    background-image: url(../../images/Reorder.svg);
+  background-image: url(/images/Reorder.svg);
 }
 
 .context-menu-item.icon-edit-entity {
-    background-image: url(../../images/Edit_entity.svg);
+  background-image: url(/images/Edit_entity.svg);
 }
 
 .context-menu-item.icon-delete-entity {
-    background-image: url(../../images/delete.svg);
+  background-image: url(/images/delete.svg);
 }
 
 .context-menu-item.icon-customize-columns {
-    background-image: url(../../images/Options.svg);
+  background-image: url(/images/Options.svg);
 }

less/documentDB.less

@@ -724,24 +724,45 @@ execute-sproc-params-pane {
 
   .results-container,
   .errors-container {
+    padding: @MediumSpace 0px 0px @MediumSpace;
     height: 100%;
     .flex-display();
     .flex-direction();
     overflow: hidden;
 
-    .enterInputParameters {
+    .toggles {
-      padding: @LargeSpace @MediumSpace;
+      height: @ToggleHeight;
+      width: @ToggleWidth;
+      margin-left: @MediumSpace;
+
+      &:focus {
+        .focus();
       }
 
-    div[role="tabpanel"] {
+      .tab {
-      height: 100%;
+        margin-right: @MediumSpace;
-      padding-bottom: 50px;
+      }
+
+      .toggleSwitch {
+        .toggleSwitch();
+      }
+
+      .selectedToggle {
+        .selectedToggle();
+      }
+
+      .unselectedToggle {
+        .unselectedToggle();
+      }
+    }
+
+    .enterInputParameters {
+      padding: @LargeSpace @MediumSpace;
     }
   }
 
   .errors-container {
     padding-left: (2 * @MediumSpace);
-    padding: @MediumSpace 0px 0px @MediumSpace;
     .errors-header {
       font-weight: 700;
       font-size: @DefaultFontSize;
@@ -1292,7 +1313,7 @@ menuQuickStart {
 }
 
 .plusimg-but {
-  background-image: url(../images/plus_normal.svg);
+  background-image: url(/images/plus_normal.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -1300,7 +1321,7 @@ menuQuickStart {
 }
 
 .plusimg-but:hover {
-  background-image: url(../images/plus_hover.svg);
+  background-image: url(/images/plus_hover.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -1308,7 +1329,7 @@ menuQuickStart {
 }
 
 .plusimg-but:active {
-  background-image: url(../images/plus_pressed.svg);
+  background-image: url(/images/plus_pressed.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -1316,7 +1337,7 @@ menuQuickStart {
 }
 
 .plusimg-but:disabled {
-  background-image: url(../images/plus_disabled.svg);
+  background-image: url(/images/plus_disabled.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -1324,7 +1345,7 @@ menuQuickStart {
 }
 
 .minusimg-but {
-  background-image: url(../images/minus_normal.svg);
+  background-image: url(/images/minus_normal.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -1332,7 +1353,7 @@ menuQuickStart {
 }
 
 .minusimg-but:hover {
-  background-image: url(../images/minus_hover.svg);
+  background-image: url(/images/minus_hover.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -1340,7 +1361,7 @@ menuQuickStart {
 }
 
 .minusimg-but:active {
-  background-image: url(../images/minus_pressed.svg);
+  background-image: url(/images/minus_pressed.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -1348,7 +1369,7 @@ menuQuickStart {
 }
 
 .minusimg-but:disabled {
-  background-image: url(../images/minus_disabled.svg);
+  background-image: url(/images/minus_disabled.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -2686,7 +2707,7 @@ a:link {
         .errorIcon {
           width: @ErrorIconWidth;
           height: @LoadingErrorIconSize;
-          background-image: url(../images/error_no_outline.svg);
+          background-image: url(/images/error_no_outline.svg);
           background-repeat: no-repeat;
           background-position: center;
           background-size: 3px;
@@ -3068,10 +3089,3 @@ settings-pane {
   display: none;
   height: 0px;
 }
-.spinner {
-  width: 100%;
-  position: absolute;
-  z-index: 1;
-  background: white;
-  height: 100%;
-}

less/forms.less

@@ -201,11 +201,3 @@
 .migration:disabled {
     background-color: #ccc;
 }
-
-.trigger-field {
-    width: 40%;
-    margin-top: 10px
-}
-.trigger-form {
-    padding: 10px 30px 10px 30px;
-}

less/hostedexplorer.less

@@ -90,7 +90,6 @@ body {
         }
 
         .accountSwitchComponentContainer {
-                    
           .accountNameHeader {
             font-size: 14px;
             color: @BaseLight;
@@ -240,13 +239,13 @@ body {
           margin: @SmallSpace (2 * @MediumSpace) 0px 0px;
           cursor: pointer;
           padding: @SmallSpace @LargeSpace @LargeSpace @SmallSpace;
-                    background-image: url(../images/cancel.svg);
+          background-image: url(/images/cancel.svg);
           background-repeat: no-repeat;
           width: 16px;
           height: 16px;
 
           &:hover {
-                        background-image: url(../images/cancel-hover.svg);
+            background-image: url(/images/cancel-hover.svg);
             background-repeat: no-repeat;
           }
         }
@@ -289,7 +288,7 @@ body {
 
     .directoryDivider {
       border-bottom: 1px solid @DividerColor;
-            margin-bottom: @LargeSpace
+      margin-bottom: @LargeSpace;
     }
   }
 
@@ -307,10 +306,10 @@ body {
 
     .main {
       width: 100%;
-            transition: all .0s ease-in-out;
+      transition: all 0s ease-in-out;
       -ms-transition: all 0s ease-in-out;
       -webkit-transition: all 0s ease-in-out;
-            -moz-transition: all .0s ease-in-out;
+      -moz-transition: all 0s ease-in-out;
       height: 100vh;
       background-color: @BaseLight;
     }
@@ -321,9 +320,9 @@ body {
   .mini {
     width: 0%;
     float: left;
-        transition: all .4s ease-in-out;
+    transition: all 0.4s ease-in-out;
-        -webkit-transition: all .4s ease-in-out;
+    -webkit-transition: all 0.4s ease-in-out;
-        -moz-transition: all .4s ease-in-out;
+    -moz-transition: all 0.4s ease-in-out;
     height: 100vh;
     background-color: white;
     border-right: solid 1px lightgray;
@@ -543,11 +542,11 @@ body {
 
   .datalist-arrow:focus:after,
   .datalist-arrow:active:after {
-        background: #1EBBEE;
+    background: #1ebbee;
   }
 
   input::-webkit-calendar-picker-indicator::after {
-        content: '\276F';
+    content: "\276F";
     right: 0;
     top: -8%;
     display: block;
@@ -561,7 +560,7 @@ body {
   }
 
   .datalist-arrow:after:hover {
-        content: '\276F';
+    content: "\276F";
     position: absolute;
     right: 1px;
     top: 6%;
@@ -573,7 +572,7 @@ body {
     color: #fff;
     text-align: center;
     pointer-events: none;
-        background-color: #1EBBEE;
+    background-color: #1ebbee;
   }
 
   .Introline3 {
@@ -676,7 +675,7 @@ body {
   .atags {
     color: @AccentMediumHigh;
     font-weight: 400;
-        cursor: pointer
+    cursor: pointer;
   }
 
   ul {

less/quickstart.less

@@ -130,19 +130,19 @@ menuQuickStart {
 .content {
   display: inline-block;
   width: 100%;
-    transition: all .4s ease-in-out;
+  transition: all 0.4s ease-in-out;
-    -ms-transition: all .4s ease-in-out;
+  -ms-transition: all 0.4s ease-in-out;
-    -webkit-transition: all .4s ease-in-out;
+  -webkit-transition: all 0.4s ease-in-out;
-    -moz-transition: all .4s ease-in-out;
+  -moz-transition: all 0.4s ease-in-out;
   height: 100vh;
 }
 
 .mini {
   width: 0%;
   float: left;
-    transition: all .4s ease-in-out;
+  transition: all 0.4s ease-in-out;
-    -webkit-transition: all .4s ease-in-out;
+  -webkit-transition: all 0.4s ease-in-out;
-    -moz-transition: all .4s ease-in-out;
+  -moz-transition: all 0.4s ease-in-out;
   height: 100vh;
   background-color: white;
 }
@@ -235,29 +235,29 @@ menuQuickStart {
 }
 
 .gridRowSelected {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 .gridRowSelected:hover {
-    background-color: #DEF!important;
+  background-color: #def !important;
   cursor: initial;
 }
 
 .collectionNodeSelected {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 .collectionNodeSelected:hover {
-    background-color: #DEF!important;
+  background-color: #def !important;
   cursor: default !important;
 }
 
 .databaseNodeSelected {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 .databaseNodeSelected:hover {
-    background-color: #DEF!important;
+  background-color: #def !important;
   cursor: default !important;
 }
 
@@ -266,7 +266,7 @@ menuQuickStart {
   border-top: 1px solid #eee;
   margin-left: -17px;
   width: 100%;
-    color: 1px solid #53575B;
+  color: 1px solid #53575b;
 }
 
 .partitioning-btn {
@@ -328,11 +328,11 @@ menuQuickStart {
 
 .collid-white {
   width: 100%;
-    border: solid 1px #DDD;
+  border: solid 1px #ddd;
 }
 
 .plusimg-but {
-    background-image: url(../images/plus_normal.svg);
+  background-image: url(/images/plus_normal.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -340,7 +340,7 @@ menuQuickStart {
 }
 
 .plusimg-but:hover {
-    background-image: url(../images/plus_hover.svg);
+  background-image: url(/images/plus_hover.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -348,7 +348,7 @@ menuQuickStart {
 }
 
 .plusimg-but:active {
-    background-image: url(../images/plus_pressed.svg);
+  background-image: url(/images/plus_pressed.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -356,7 +356,7 @@ menuQuickStart {
 }
 
 .plusimg-but:disabled {
-    background-image: url(../images/plus_disabled.svg);
+  background-image: url(/images/plus_disabled.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -364,7 +364,7 @@ menuQuickStart {
 }
 
 .minusimg-but {
-    background-image: url(../images/minus_normal.svg);
+  background-image: url(/images/minus_normal.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -372,7 +372,7 @@ menuQuickStart {
 }
 
 .minusimg-but:hover {
-    background-image: url(../images/minus_hover.svg);
+  background-image: url(/images/minus_hover.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -380,7 +380,7 @@ menuQuickStart {
 }
 
 .minusimg-but:active {
-    background-image: url(../images/minus_pressed.svg);
+  background-image: url(/images/minus_pressed.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -388,7 +388,7 @@ menuQuickStart {
 }
 
 .minusimg-but:disabled {
-    background-image: url(../images/minus_disabled.svg);
+  background-image: url(/images/minus_disabled.svg);
   background-repeat: no-repeat;
   padding: 6px 16px;
   position: static;
@@ -515,11 +515,11 @@ label {
 
 .datalist-arrow:focus:after,
 .datalist-arrow:active:after {
-    background: #1EBBEE;
+  background: #1ebbee;
 }
 
 input::-webkit-calendar-picker-indicator::after {
-    content: '\276F';
+  content: "\276F";
   right: 0;
   top: -8%;
   display: block;
@@ -533,7 +533,7 @@ input::-webkit-calendar-picker-indicator::after {
 }
 
 .datalist-arrow:after:hover {
-    content: '\276F';
+  content: "\276F";
   position: absolute;
   right: 1px;
   top: 6%;
@@ -545,7 +545,7 @@ input::-webkit-calendar-picker-indicator::after {
   color: #fff;
   text-align: center;
   pointer-events: none;
-    background-color: #1EBBEE;
+  background-color: #1ebbee;
 }
 
 .Introline3 {
@@ -567,7 +567,7 @@ input::-webkit-calendar-picker-indicator::after {
 }
 
 .collectionCollapsed:hover {
-    background: #EEEEEE;
+  background: #eeeeee;
 }
 
 .collectionCollapsed:active {
@@ -590,12 +590,12 @@ input::-webkit-calendar-picker-indicator::after {
 
 .leftarrowCollapsed {
   padding: 2px 4px 4px 5px;
-    border: solid 1px #FFF;
+  border: solid 1px #fff;
   margin: 6px 4px 0px -11px;
 }
 
 .leftarrowCollapsed:hover {
-    background-color: #EEEEEE;
+  background-color: #eeeeee;
 }
 
 .leftarrowCollapsed:active {
@@ -691,7 +691,7 @@ input::-webkit-calendar-picker-indicator::after {
 .atags {
   color: @AccentMediumHigh;
   font-weight: 400;
-    cursor: pointer
+  cursor: pointer;
 }
 
 .qsmenuicons {
@@ -754,13 +754,13 @@ a:link {
 }
 
 .command:hover {
-    background-color: #E6E6E6;
+  background-color: #e6e6e6;
   cursor: pointer;
   padding-bottom: 12px;
 }
 
 .command:active {
-    background-color: #CCCCCC;
+  background-color: #cccccc;
   border: solid 1px @AccentMediumHigh;
 }
 
@@ -966,7 +966,7 @@ a:link {
   color: #393939;
 }
 
-.tab [type=radio] {
+.tab [type="radio"] {
   display: none;
 }
 
@@ -979,40 +979,40 @@ a:link {
   padding: 15px 0px 20px 0;
 }
 
-.tab [type=radio]:checked~label {
+.tab [type="radio"]:checked ~ label {
   border: 1px solid #0072c6;
   background-color: @AccentMediumHigh;
   color: white;
   z-index: 2;
 }
 
-.tab [type=radio]:checked~label:hover {
+.tab [type="radio"]:checked ~ label:hover {
   border: 1px solid @AccentMediumHigh;
   background-color: @AccentMediumHigh;
   color: white;
   z-index: 2;
 }
 
-.tab [type=radio]:checked~label:active {
+.tab [type="radio"]:checked ~ label:active {
   border: 1px solid #0072c6;
   background-color: #0072c6;
   color: white;
   z-index: 2;
 }
 
-.tab [type=radio]:checked~label~.tabcontent {
+.tab [type="radio"]:checked ~ label ~ .tabcontent {
   z-index: 1;
   display: initial;
 }
 
-.tab [type=radio]:not(:checked)~label:hover {
+.tab [type="radio"]:not(:checked) ~ label:hover {
   border: 1px solid #969696;
   background-color: #969696;
   color: white;
   cursor: pointer;
 }
 
-.tab [type=radio]:not(:checked)~label~.tabcontent {
+.tab [type="radio"]:not(:checked) ~ label ~ .tabcontent {
   display: none;
 }
 
@@ -1193,7 +1193,7 @@ a:link {
 .nav-tabs > li.active > a,
 .nav-tabs > li.active > a:focus,
 .nav-tabs > li.active > a:hover {
-    border-bottom-color: #FFF;
+  border-bottom-color: #fff;
 }
 
 .tabList {
@@ -1249,20 +1249,20 @@ a:link {
 }
 
 .close-Icon {
-    background-image: url(../images/close-black.svg);
+  background-image: url(/images/close-black.svg);
   background-repeat: no-repeat;
   padding: 0px 0px 0px 11px;
 }
 
 .close-Icon:hover {
-    background-image: url(../images/close-black-hover.svg);
+  background-image: url(/images/close-black-hover.svg);
   background-repeat: no-repeat;
   padding: 0px 0px 0px 11px;
 }
 
 .clickableLink {
   color: @AccentMediumHigh;
-    font-family: 'Segoe UI';
+  font-family: "Segoe UI";
   font-size: 12px;
   cursor: pointer;
 }

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,7 +1,9 @@
 @import "./Common/Constants";
 
+
 .resourceTree {
     height: 100%;
+    width: 20%;
     flex: 0 0 auto;
     .main {
         height: 100%;
@@ -44,13 +46,14 @@
 }
 
 .contextmenushowing {
-  background-color: #eee;
+    background-color: #EEE;
 }
 
 .collectionstree {
     width: 100%;
     margin-top: @DefaultSpace;
 
+
     .databaseList {
         list-style-type: none;
         padding-left: 0px;
@@ -189,7 +192,7 @@ img.collectionsTreeCollapseExpand {
 }
 
 .expanded::before {
-  content: "\23F7";
+    content: '\23F7';
     margin-left: 0px;
     font-size: 15px;
 }
@@ -208,7 +211,7 @@ img.collectionsTreeCollapseExpand {
     transform: rotate(-90deg) translateX(-100%);
     -webkit-transform: rotate(-90deg) translateX(-100%);
     -ms-transform: rotate(-90deg) translateX(-100%);
-  border-bottom: 1px solid #ccc;
+    border-bottom: 1px solid #CCC;
 }
 
 .main-nav-img {

package.json

@@ -9,10 +9,10 @@
     "@azure/cosmos-language-service": "0.0.5",
     "@azure/identity": "1.2.1",
     "@azure/ms-rest-nodeauth": "3.0.7",
+    "@babel/plugin-proposal-class-properties": "7.13.0",
+    "@babel/plugin-proposal-decorators": "7.14.2",
+    "@fluentui/react": "8.14.8",
     "@azure/msal-browser": "2.14.2",
-    "@babel/plugin-proposal-class-properties": "7.12.1",
-    "@babel/plugin-proposal-decorators": "7.12.12",
-    "@fluentui/react": "8.14.3",
     "@jupyterlab/services": "6.0.2",
     "@jupyterlab/terminal": "3.0.3",
     "@microsoft/applicationinsights-web": "2.6.1",
@@ -22,7 +22,7 @@
     "@nteract/data-explorer": "8.0.3",
     "@nteract/directory-listing": "2.0.6",
     "@nteract/dropdown-menu": "1.0.1",
-    "@nteract/editor": "10.1.12",
+    "@nteract/editor": "10.1.2",
     "@nteract/fixtures": "2.3.0",
     "@nteract/iron-icons": "1.0.0",
     "@nteract/jupyter-widgets": "2.0.0",
@@ -41,18 +41,13 @@
     "@nteract/transform-vega": "7.0.6",
     "@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",
     "clipboard-copy": "4.0.1",
-    "copy-webpack-plugin": "9.0.1",
     "crossroads": "0.12.2",
-    "css-element-queries": "1.1.1",
+    "crypto-browserify": "3.12.0",
+    "css-element-queries": "1.2.3",
     "d3": "6.1.1",
     "datatables.net-colreorder-dt": "1.5.1",
     "datatables.net-dt": "1.10.19",
@@ -60,18 +55,18 @@
     "dayjs": "1.8.19",
     "dom-to-image": "2.6.0",
     "dotenv": "8.2.0",
-    "eslint-plugin-jest": "23.13.2",
+    "eslint-plugin-jest": "24.3.6",
-    "eslint-plugin-react": "7.20.0",
+    "eslint-plugin-react": "7.23.2",
     "hasher": "1.2.0",
-    "html2canvas": "1.0.0-rc.5",
+    "html2canvas": "1.0.0-rc.7",
-    "i18next": "19.8.4",
+    "i18next": "20.2.2",
-    "i18next-browser-languagedetector": "6.0.1",
+    "i18next-browser-languagedetector": "6.1.0",
-    "i18next-http-backend": "1.0.23",
+    "i18next-http-backend": "1.2.2",
     "iframe-resizer-react": "1.1.0",
     "immutable": "4.0.0-rc.12",
     "is-ci": "2.0.0",
-    "jquery": "3.5.1",
+    "jquery": "3.6.0",
-    "jquery-typeahead": "2.10.6",
+    "jquery-typeahead": "2.11.1",
     "jquery-ui-dist": "1.12.1",
     "knockout": "3.5.1",
     "mkdirp": "1.0.4",
@@ -81,118 +76,123 @@
     "plotly.js-cartesian-dist-min": "1.52.3",
     "post-robot": "10.0.42",
     "q": "1.5.1",
-    "react": "16.14.0",
+    "react": "17.0.2",
     "react-animate-height": "2.0.8",
     "react-dnd": "14.0.2",
     "react-dnd-html5-backend": "14.0.0",
-    "react-dom": "16.13.1",
+    "react-dom": "17.0.2",
     "react-hotkeys": "2.0.0",
-    "react-i18next": "11.8.5",
+    "react-i18next": "11.8.15",
     "react-notification-system": "0.2.17",
-    "react-redux": "7.1.3",
+    "react-redux": "7.2.4",
-    "react-splitter-layout": "4.0.0",
+    "redux": "4.1.0",
-    "redux": "4.0.4",
     "reflect-metadata": "0.1.13",
     "rx-jupyter": "5.5.12",
     "rxjs": "6.6.3",
     "sanitize-html": "2.3.3",
-    "styled-components": "4.3.2",
+    "styled-components": "5.3.0",
     "swr": "0.4.0",
-    "terser-webpack-plugin": "5.1.4",
+    "underscore": "1.13.1",
-    "underscore": "1.9.1",
     "utility-types": "3.10.0",
     "zustand": "3.5.0"
   },
   "devDependencies": {
-    "@babel/core": "7.9.0",
+    "@babel/core": "7.14.2",
-    "@babel/preset-env": "7.9.0",
+    "@babel/preset-env": "7.14.2",
-    "@babel/preset-react": "7.9.4",
+    "@babel/preset-react": "7.13.13",
-    "@babel/preset-typescript": "7.9.0",
+    "@babel/preset-typescript": "7.13.0",
-    "@testing-library/react": "11.2.3",
+    "@svgr/webpack": "5.5.0",
+    "@testing-library/jest-dom": "5.12.0",
+    "@testing-library/react": "11.2.7",
     "@types/applicationinsights-js": "1.0.7",
     "@types/codemirror": "0.0.56",
     "@types/crossroads": "0.0.30",
     "@types/d3": "5.9.2",
     "@types/dom-to-image": "2.6.2",
-    "@types/enzyme": "3.10.7",
+    "@types/enzyme": "3.10.8",
-    "@types/enzyme-adapter-react-16": "1.0.6",
     "@types/hasher": "0.0.31",
-    "@types/jest": "26.0.20",
+    "@types/memoize-one": "4.1.1",
-    "@types/node": "12.11.1",
+    "@types/mkdirp": "1.0.1",
+    "@types/node": "15.3.0",
+    "@types/node-fetch": "2.5.10",
     "@types/post-robot": "10.0.1",
+    "@types/promise.prototype.finally": "2.0.4",
+    "@types/jest": "26.0.20",
     "@types/q": "1.5.1",
-    "@types/react": "17.0.3",
+    "@types/react": "17.0.5",
-    "@types/react-dom": "17.0.3",
+    "@types/react-dom": "17.0.5",
     "@types/react-notification-system": "0.2.39",
-    "@types/react-redux": "7.1.7",
+    "@types/react-redux": "7.1.16",
-    "@types/react-splitter-layout": "3.0.1",
+    "@types/sanitize-html": "2.3.1",
-    "@types/sanitize-html": "1.27.2",
     "@types/sinon": "2.3.3",
-    "@types/styled-components": "5.1.1",
+    "@types/styled-components": "5.1.9",
-    "@types/underscore": "1.7.36",
+    "@types/underscore": "1.11.2",
-    "@typescript-eslint/eslint-plugin": "4.22.0",
+    "@typescript-eslint/eslint-plugin": "4.23.0",
-    "@typescript-eslint/parser": "4.22.0",
+    "@typescript-eslint/parser": "4.23.0",
-    "@webpack-cli/serve": "1.5.2",
+    "@wojtekmaj/enzyme-adapter-react-17": "0.6.1",
-    "babel-jest": "24.9.0",
+    "babel-jest": "26.6.3",
-    "babel-loader": "8.1.0",
+    "babel-loader": "8.2.2",
     "buffer": "5.1.0",
-    "case-sensitive-paths-webpack-plugin": "2.3.0",
+    "case-sensitive-paths-webpack-plugin": "2.4.0",
+    "clean-webpack-plugin": "4.0.0-alpha.0",
+    "copy-webpack-plugin": "8.1.1",
     "create-file-webpack": "1.0.2",
     "css-loader": "1.0.0",
     "enzyme": "3.11.0",
-    "enzyme-adapter-react-16": "1.15.5",
+    "enzyme-to-json": "3.6.2",
-    "enzyme-to-json": "3.6.1",
+    "eslint": "7.26.0",
-    "eslint": "7.8.1",
     "eslint-cli": "1.1.1",
     "eslint-plugin-no-null": "1.0.2",
-    "eslint-plugin-prefer-arrow": "1.2.2",
+    "eslint-plugin-prefer-arrow": "1.2.3",
     "eslint-plugin-react-hooks": "4.2.0",
+    "expose-loader": "2.0.0",
     "expect-playwright": "0.3.3",
     "fast-glob": "3.2.5",
-    "file-loader": "2.0.0",
+    "file-loader": "6.2.0",
     "fs-extra": "7.0.0",
     "html-inline-css-webpack-plugin": "1.11.0",
-    "html-loader": "0.5.5",
+    "html-loader": "2.1.2",
     "html-loader-jest": "0.2.1",
-    "html-webpack-plugin": "5.3.2",
+    "html-webpack-plugin": "5.3.1",
     "jest": "26.6.3",
-    "jest-canvas-mock": "2.3.1",
+    "jest-canvas-mock": "2.1.0",
-    "jest-playwright-preset": "1.5.1",
+    "jest-playwright-preset": "1.5.2",
-    "jest-trx-results-processor": "0.0.7",
+    "jest-trx-results-processor": "2.2.0",
-    "less": "3.8.1",
+    "less": "4.1.1",
-    "less-loader": "4.1.0",
+    "less-loader": "8.1.1",
     "less-vars-loader": "1.1.0",
-    "mini-css-extract-plugin": "2.1.0",
+    "mini-css-extract-plugin": "1.6.0",
     "monaco-editor-webpack-plugin": "1.7.0",
     "node-fetch": "2.6.1",
-    "playwright": "1.13.0",
+    "playwright": "1.10.0",
-    "prettier": "2.2.1",
+    "prettier": "2.3.0",
     "process": "0.11.10",
-    "raw-loader": "0.5.1",
+    "raw-loader": "4.0.2",
     "react-dev-utils": "11.0.4",
     "rimraf": "3.0.0",
     "sinon": "3.2.1",
-    "style-loader": "0.23.0",
+    "style-loader": "2.0.0",
-    "ts-loader": "9.2.4",
+    "terser-webpack-plugin": "5.1.2",
-    "tslint": "5.11.0",
+    "ts-loader": "9.1.2",
-    "tslint-microsoft-contrib": "6.0.0",
+    "tslint": "5.20.1",
+    "tslint-microsoft-contrib": "6.2.0",
     "typedoc": "0.20.36",
-    "typescript": "4.3.4",
+    "typescript": "4.2.4",
-    "url-loader": "1.1.1",
+    "url-loader": "4.1.1",
     "wait-on": "4.0.2",
-    "webpack": "5.47.0",
+    "webpack": "5.37.0",
-    "webpack-bundle-analyzer": "4.4.2",
+    "webpack-bundle-analyzer": "4.4.1",
-    "webpack-cli": "4.7.2",
+    "webpack-cli": "4.7.0",
     "webpack-dev-server": "3.11.2"
   },
   "scripts": {
-    "start": "webpack serve --mode development",
+    "start": "webpack serve",
     "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:prod": "node --max_old_space_size=10196 ./node_modules/webpack/bin/webpack.js  --mode production",
-    "pack:fast": "webpack  --mode development --progress",
+    "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",

preview/config.json

@@ -1,4 +1,3 @@
 {
-  "PROXY_PATH": "/proxy",
+  "PROXY_PATH": "/proxy"
-  "msalRedirectURI": "https://cosmos-explorer-preview.azurewebsites.net/"
 }

preview/index.js

@@ -62,17 +62,6 @@ app.get("/pull/:pr(\\d+)", (req, res) => {
     })
     .catch(() => res.sendStatus(500));
 });
-app.get("/", (req, res) => {
-  fetch("https://api.github.com/repos/Azure/cosmos-explorer/branches/master")
-    .then((response) => response.json())
-    .then(({ commit: { sha } }) => {
-      const explorer = new URL(
-        "https://cosmos-explorer-preview.azurewebsites.net/commit/" + sha + "/hostedExplorer.html"
-      );
-      return res.redirect(explorer.href);
-    })
-    .catch(() => res.sendStatus(500));
-});
 
 app.listen(port, () => {
   console.log(`Example app listening on port: ${port}`);

src/Common/CollapsedResourceTree.tsx

@@ -1,5 +1,5 @@
+import arrowLeftImg from "images/imgarrowlefticon.svg";
 import React, { FunctionComponent } from "react";
-import arrowLeftImg from "../../images/imgarrowlefticon.svg";
 import { userContext } from "../UserContext";
 
 export interface CollapsedResourceTreeProps {

src/Common/Constants.ts

@@ -94,8 +94,7 @@ export class Flights {
   public static readonly MongoIndexEditor = "mongoindexeditor";
   public static readonly MongoIndexing = "mongoindexing";
   public static readonly AutoscaleTest = "autoscaletest";
-  public static readonly PartitionKeyTest = "partitionkeytest";
+  public static readonly SchemaAnalyzer = "schemaanalyzer";
-  public static readonly PKPartitionKeyTest = "pkpartitionkeytest";
 }
 
 export class AfecFeatures {
@@ -159,6 +158,16 @@ export class DocumentsGridMetrics {
   public static DocumentEditorMaxWidthRatio: number = 0.4;
 }
 
+export class ExplorerMetrics {
+  public static SplitterMinWidth: number = 240;
+  public static SplitterMaxWidth: number = 400;
+  public static CollapsedResourceTreeWidth: number = 36;
+}
+
+export class SplitterMetrics {
+  public static CollapsedPositionLeft: number = ExplorerMetrics.CollapsedResourceTreeWidth;
+}
+
 export class Areas {
   public static ResourceTree: string = "Resource Tree";
   public static ContextualPane: string = "Contextual Pane";
@@ -350,11 +359,6 @@ export class Notebook {
   public static readonly kernelRestartInitialDelayMs = 1000;
   public static readonly kernelRestartMaxDelayMs = 20000;
   public static readonly autoSaveIntervalMs = 120000;
-  public static readonly temporarilyDownMsg = "Notebooks is currently not available. We are working on it.";
-  public static readonly mongoShellTemporarilyDownMsg =
-    "We have identified an issue with the Mongo Shell and it is unavailable right now. We are actively working on the mitigation.";
-  public static readonly cassandraShellTemporarilyDownMsg =
-    "We have identified an issue with the Cassandra Shell and it is unavailable right now. We are actively working on the mitigation.";
 }
 
 export class SparkLibrary {

src/Common/CosmosClient.ts

@@ -83,7 +83,7 @@ export function client(): Cosmos.CosmosClient {
   if (_client) return _client;
   const options: Cosmos.CosmosClientOptions = {
     endpoint: endpoint() || "https://cosmos.azure.com", // CosmosClient gets upset if we pass a bad URL. This should never actually get called
-    key: userContext.masterKey,
+    ...(!userContext.features.enableAadDataPlane && { key: userContext.masterKey }),
     tokenProvider,
     connectionPolicy: {
       enableEndpointDiscovery: false,

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

@@ -5,6 +5,7 @@ import { Collection } from "../Contracts/ViewModels";
 import DocumentId from "../Explorer/Tree/DocumentId";
 import { updateUserContext } from "../UserContext";
 import { deleteDocument, getEndpoint, queryDocuments, readDocument, updateDocument } from "./MongoProxyClient";
+jest.mock("../ResourceProvider/ResourceProviderClient.ts");
 
 const databaseId = "testDB";
 
@@ -30,7 +31,7 @@ const collection = {
   },
 } as Collection;
 
-const documentId = ({
+const documentId = {
   partitionKeyHeader: () => "[]",
   self: "db/testDB/db/testCollection/docs/testId",
   partitionKeyProperty,
@@ -39,7 +40,7 @@ const documentId = ({
     kind: "Hash",
     version: 1,
   },
-} as unknown) as DocumentId;
+} as unknown as DocumentId;
 
 const databaseAccount = {
   id: "foo",

src/Common/MongoProxyClient.ts

@@ -111,7 +111,7 @@ export function queryDocuments(
           headers: response.headers,
         };
       }
-      await errorHandling(response, "querying documents", params);
+      errorHandling(response, "querying documents", params);
       return undefined;
     });
 }
@@ -153,11 +153,11 @@ export function readDocument(
         ),
       },
     })
-    .then(async (response) => {
+    .then((response) => {
       if (response.ok) {
         return response.json();
       }
-      return await errorHandling(response, "reading document", params);
+      return errorHandling(response, "reading document", params);
     });
 }
 
@@ -192,11 +192,11 @@ export function createDocument(
         ...authHeaders(),
       },
     })
-    .then(async (response) => {
+    .then((response) => {
       if (response.ok) {
         return response.json();
       }
-      return await errorHandling(response, "creating document", params);
+      return errorHandling(response, "creating document", params);
     });
 }
 
@@ -238,11 +238,11 @@ export function updateDocument(
         [CosmosSDKConstants.HttpHeaders.PartitionKey]: JSON.stringify(documentId.partitionKeyHeader()),
       },
     })
-    .then(async (response) => {
+    .then((response) => {
       if (response.ok) {
         return response.json();
       }
-      return await errorHandling(response, "updating document", params);
+      return errorHandling(response, "updating document", params);
     });
 }
 
@@ -278,11 +278,11 @@ export function deleteDocument(databaseId: string, collection: Collection, docum
         [CosmosSDKConstants.HttpHeaders.PartitionKey]: JSON.stringify(documentId.partitionKeyHeader()),
       },
     })
-    .then(async (response) => {
+    .then((response) => {
       if (response.ok) {
         return undefined;
       }
-      return await errorHandling(response, "deleting document", params);
+      return errorHandling(response, "deleting document", params);
     });
 }
 
@@ -314,7 +314,7 @@ export function createMongoCollectionWithProxy(
   return window
     .fetch(
       `${endpoint}/createCollection?${queryString.stringify(
-        (mongoParams as unknown) as queryString.ParsedUrlQueryInput
+        mongoParams as unknown as queryString.ParsedUrlQueryInput
       )}`,
       {
         method: "POST",
@@ -325,11 +325,11 @@ export function createMongoCollectionWithProxy(
         },
       }
     )
-    .then(async (response) => {
+    .then((response) => {
       if (response.ok) {
         return response.json();
       }
-      return await errorHandling(response, "creating collection", mongoParams);
+      return errorHandling(response, "creating collection", mongoParams);
     });
 }
 

src/Common/QueriesClient.ts

@@ -1,17 +1,19 @@
+import { ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import * as _ from "underscore";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import Explorer from "../Explorer/Explorer";
 import DocumentsTab from "../Explorer/Tabs/DocumentsTab";
 import DocumentId from "../Explorer/Tree/DocumentId";
-import { useDatabases } from "../Explorer/useDatabases";
 import { userContext } from "../UserContext";
 import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
+import * as QueryUtils from "../Utils/QueryUtils";
 import { BackendDefaults, HttpStatusCodes, SavedQueries } from "./Constants";
 import { createCollection } from "./dataAccess/createCollection";
 import { createDocument } from "./dataAccess/createDocument";
 import { deleteDocument } from "./dataAccess/deleteDocument";
 import { queryDocuments } from "./dataAccess/queryDocuments";
+import { queryDocumentsPage } from "./dataAccess/queryDocumentsPage";
 import { handleError } from "./ErrorHandlingUtils";
 
 export class QueriesClient {
@@ -98,14 +100,18 @@ export class QueriesClient {
 
     const options: any = { enableCrossPartitionQuery: true };
     const clearMessage = NotificationConsoleUtils.logConsoleProgress("Fetching saved queries");
-    const results = await queryDocuments(
+    const queryIterator: QueryIterator<ItemDefinition & Resource> = queryDocuments(
       SavedQueries.DatabaseName,
       SavedQueries.CollectionName,
       this.fetchQueriesQuery(),
       options
-    ).fetchAll();
+    );
-
+    const fetchQueries = async (firstItemIndex: number): Promise<ViewModels.QueryResults> =>
-    let queries: DataModels.Query[] = _.map(results.resources, (document: DataModels.Query) => {
+      await queryDocumentsPage(queriesCollection.id(), queryIterator, firstItemIndex);
+    return QueryUtils.queryAllPages(fetchQueries)
+      .then(
+        (results: ViewModels.QueryResults) => {
+          let queries: DataModels.Query[] = _.map(results.documents, (document: DataModels.Query) => {
             if (!document) {
               return undefined;
             }
@@ -125,8 +131,14 @@ export class QueriesClient {
           });
           queries = _.reject(queries, (parsedQuery: DataModels.Query) => !parsedQuery);
           NotificationConsoleUtils.logConsoleInfo("Successfully fetched saved queries");
-    clearMessage();
+          return Promise.resolve(queries);
-    return queries;
+        },
+        (error: any) => {
+          handleError(error, "getSavedQueries", "Failed to fetch saved queries");
+          return Promise.reject(error);
+        }
+      )
+      .finally(() => clearMessage());
   }
 
   public async deleteQuery(query: DataModels.Query): Promise<void> {
@@ -177,7 +189,7 @@ export class QueriesClient {
 
   private findQueriesCollection(): ViewModels.Collection {
     const queriesDatabase: ViewModels.Database = _.find(
-      useDatabases.getState().databases,
+      this.container.databases(),
       (database: ViewModels.Database) => database.id() === SavedQueries.DatabaseName
     );
     if (!queriesDatabase) {

src/Common/ResourceTree.tsx

@@ -1,23 +1,18 @@
+import arrowLeftImg from "images/imgarrowlefticon.svg";
+import refreshImg from "images/refresh-cosmos.svg";
 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";
 
-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,
+}: ResourceTreeProps): JSX.Element => {
-}: ResourceTreeContainerProps): JSX.Element => {
   return (
     <div id="main" className={isLeftPaneExpanded ? "main" : "hiddenMain"}>
       {/* Collections Window - - Start */}
@@ -53,11 +48,9 @@ export const ResourceTreeContainer: FunctionComponent<ResourceTreeContainerProps
           </div>
         </div>
         {userContext.authType === AuthType.ResourceToken ? (
-          <ResourceTokenTree />
+          <div style={{ overflowY: "auto" }} data-bind="react:resourceTreeForResourceToken" />
-        ) : userContext.features.enableKoResourceTree ? (
-          <div style={{ overflowY: "auto" }} data-bind="react:resourceTree" />
         ) : (
-          <ResourceTree container={container} />
+          <div style={{ overflowY: "auto" }} data-bind="react:resourceTree" />
         )}
       </div>
       {/*  Collections Window - End */}

src/Common/Splitter.ts

@@ -1,3 +1,7 @@
+import * as ko from "knockout";
+
+import { SplitterMetrics } from "./Constants";
+
 export enum SplitterDirection {
   Horizontal = "horizontal",
   Vertical = "vertical",
@@ -24,12 +28,14 @@ export class Splitter {
   public lastX!: number;
   public lastWidth!: number;
 
+  private isCollapsed: ko.Observable<boolean>;
   private bounds: SplitterBounds;
   private direction: SplitterDirection;
 
   constructor(options: SplitterOptions) {
     this.splitterId = options.splitterId;
     this.leftSideId = options.leftId;
+    this.isCollapsed = ko.observable<boolean>(false);
     this.bounds = options.bounds;
     this.direction = options.direction;
     this.initialize();
@@ -77,4 +83,23 @@ export class Splitter {
   };
 
   private onResizeStop: JQueryUI.ResizableEvent = () => $("iframe").css("pointer-events", "auto");
+
+  public collapseLeft() {
+    this.lastX = $(this.splitter).position().left;
+    this.lastWidth = $(this.leftSide).width();
+    $(this.splitter).css("left", SplitterMetrics.CollapsedPositionLeft);
+    $(this.leftSide).css("width", "");
+    $(this.leftSide).resizable("option", "disabled", true).removeClass("ui-resizable-disabled"); // remove class so splitter is visible
+    $(this.splitter).removeClass("ui-resizable-e");
+    this.isCollapsed(true);
+  }
+
+  public expandLeft() {
+    $(this.splitter).addClass("ui-resizable-e");
+    $(this.leftSide).css("width", this.lastWidth);
+    $(this.splitter).css("left", this.lastX);
+    $(this.splitter).css("left", ""); // this ensures the splitter's position is not fixed and enables movement during resizing
+    $(this.leftSide).resizable("enable");
+    this.isCollapsed(false);
+  }
 }

src/Common/TableEntity.tsx

@@ -1,3 +1,5 @@
+import DeleteIcon from "images/delete.svg";
+import EditIcon from "images/Edit_entity.svg";
 import {
   Dropdown,
   IDropdownOption,
@@ -10,8 +12,6 @@ import {
   TooltipHost,
 } from "@fluentui/react";
 import React, { FunctionComponent } from "react";
-import DeleteIcon from "../../images/delete.svg";
-import EditIcon from "../../images/Edit_entity.svg";
 import { CassandraType, TableType } from "../Explorer/Tables/Constants";
 import { userContext } from "../UserContext";
 import { EntityValue } from "./EntityValue";

src/Common/Upload/Upload.tsx

@@ -1,6 +1,6 @@
 import { Image, Stack, TextField } from "@fluentui/react";
+import FolderIcon from "images/folder_16x16.svg";
 import React, { ChangeEvent, FunctionComponent, KeyboardEvent, useRef, useState } from "react";
-import FolderIcon from "../../../images/folder_16x16.svg";
 import * as Constants from "../Constants";
 import { InfoTooltip } from "../Tooltip/InfoTooltip";
 

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 {
-import { createUpdateCassandraTable } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
+  createUpdateCassandraTable,
-import { createUpdateGremlinGraph } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
+  getCassandraTable,
-import { createUpdateMongoDBCollection } from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
+} from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
-import { createUpdateSqlContainer } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
+import { createUpdateGremlinGraph, getGremlinGraph } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
-import { createUpdateTable } from "../../Utils/arm/generatedClients/cosmos/tableResources";
+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 {
-import { createUpdateCassandraKeyspace } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
+  createUpdateCassandraKeyspace,
-import { createUpdateGremlinDatabase } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
+  getCassandraKeyspace,
-import { createUpdateMongoDBDatabase } from "../../Utils/arm/generatedClients/cosmos/mongoDBResources";
+} from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
-import { createUpdateSqlDatabase } from "../../Utils/arm/generatedClients/cosmos/sqlResources";
+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/Common/dataAccess/createTrigger.ts

@@ -54,7 +54,7 @@ export async function createTrigger(
     const response = await client()
       .database(databaseId)
       .container(collectionId)
-      .scripts.triggers.create((trigger as unknown) as TriggerDefinition); // TODO: TypeScript does not like the SQL SDK trigger type
+      .scripts.triggers.create(trigger as unknown as TriggerDefinition); // TODO: TypeScript does not like the SQL SDK trigger type
     return response.resource;
   } catch (error) {
     handleError(error, "CreateTrigger", `Error while creating trigger ${trigger.id}`);

src/Common/dataAccess/updateOffer.ts

@@ -405,7 +405,7 @@ const updateOfferWithSDK = async (params: UpdateOfferParams): Promise<Offer> =>
   const sdkResponse = await client()
     .offer(params.currentOffer.id)
     // TODO Remove casting when SDK types are fixed (https://github.com/Azure/azure-sdk-for-js/issues/10660)
-    .replace((newOffer as unknown) as OfferDefinition, options);
+    .replace(newOffer as unknown as OfferDefinition, options);
 
   return parseSDKOfferResponse(sdkResponse);
 };

src/Common/dataAccess/updateTrigger.ts

@@ -51,7 +51,7 @@ export async function updateTrigger(
       .database(databaseId)
       .container(collectionId)
       .scripts.trigger(trigger.id)
-      .replace((trigger as unknown) as TriggerDefinition); // TODO: TypeScript does not like the SQL SDK trigger type
+      .replace(trigger as unknown as TriggerDefinition); // TODO: TypeScript does not like the SQL SDK trigger type
     return response?.resource;
   } catch (error) {
     handleError(error, "UpdateTrigger", `Error while updating trigger ${trigger.id}`);

src/ConfigContext.ts

@@ -27,7 +27,7 @@ export interface ConfigContext {
   hostedExplorerURL: string;
   armAPIVersion?: string;
   allowedJunoOrigins: string[];
-  msalRedirectURI?: string;
+  enableSchemaAnalyzer: boolean;
 }
 
 // Default configuration
@@ -62,6 +62,7 @@ let configContext: Readonly<ConfigContext> = {
     "https://tools-staging.cosmos.azure.com",
     "https://localhost",
   ],
+  enableSchemaAnalyzer: false,
 };
 
 export function resetConfigContext(): void {
@@ -118,14 +119,6 @@ export async function initializeConfiguration(): Promise<ConfigContext> {
       const armAPIVersion = params.get("armAPIVersion") || "";
       updateConfigContext({ armAPIVersion });
     }
-    if (params.has("armEndpoint")) {
-      const ARM_ENDPOINT = params.get("armEndpoint") || "";
-      updateConfigContext({ ARM_ENDPOINT });
-    }
-    if (params.has("aadEndpoint")) {
-      const AAD_ENDPOINT = params.get("aadEndpoint") || "";
-      updateConfigContext({ AAD_ENDPOINT });
-    }
     if (params.has("platform")) {
       const platform = params.get("platform");
       switch (platform) {

src/Contracts/DataModels.ts

@@ -9,7 +9,6 @@ export interface DatabaseAccount {
 
 export interface DatabaseAccountExtendedProperties {
   documentEndpoint?: string;
-  disableLocalAuth?: boolean;
   tableEndpoint?: string;
   gremlinEndpoint?: string;
   cassandraEndpoint?: string;

src/Contracts/ViewModels.ts

@@ -5,8 +5,9 @@ import {
   TriggerDefinition,
   UserDefinedFunctionDefinition,
 } from "@azure/cosmos";
+import { CommandButtonComponentProps } from "../Explorer/Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../Explorer/Explorer";
-import { ConsoleData } from "../Explorer/Menus/NotificationConsole/ConsoleData";
+import { ConsoleData } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
 import { CassandraTableKey, CassandraTableKeys } from "../Explorer/Tables/TableDataClient";
 import ConflictId from "../Explorer/Tree/ConflictId";
 import DocumentId from "../Explorer/Tree/DocumentId";
@@ -89,6 +90,7 @@ export interface Database extends TreeNode {
 
   selectedSubnodeKind: ko.Observable<CollectionTabKind>;
 
+  selectDatabase(): void;
   expandDatabase(): Promise<void>;
   collapseDatabase(): void;
 
@@ -274,6 +276,8 @@ export interface TabOptions {
   tabKind: CollectionTabKind;
   title: string;
   tabPath: string;
+  hashLocation: string;
+  onUpdateTabsButtons: (buttons: CommandButtonComponentProps[]) => void;
   isTabsContentExpanded?: ko.Observable<boolean>;
   onLoadStartKey?: number;
 
@@ -284,7 +288,6 @@ export interface TabOptions {
   rid?: string;
   node?: TreeNode;
   theme?: string;
-  index?: number;
 }
 
 export interface DocumentsTabOptions extends TabOptions {

src/Explorer/ContextMenuButtonFactory.ts

@@ -0,0 +1,172 @@
+import AddCollectionIcon from "images/AddCollection.svg";
+import AddSqlQueryIcon from "images/AddSqlQuery_16x16.svg";
+import AddStoredProcedureIcon from "images/AddStoredProcedure.svg";
+import AddTriggerIcon from "images/AddTrigger.svg";
+import AddUdfIcon from "images/AddUdf.svg";
+import DeleteCollectionIcon from "images/DeleteCollection.svg";
+import DeleteDatabaseIcon from "images/DeleteDatabase.svg";
+import DeleteSprocIcon from "images/DeleteSproc.svg";
+import DeleteTriggerIcon from "images/DeleteTrigger.svg";
+import DeleteUDFIcon from "images/DeleteUDF.svg";
+import HostedTerminalIcon from "images/Hosted-Terminal.svg";
+import * as ViewModels from "../Contracts/ViewModels";
+import { userContext } from "../UserContext";
+import { getCollectionName, getDatabaseName } from "../Utils/APITypeUtils";
+import { TreeNodeMenuItem } from "./Controls/TreeComponent/TreeComponent";
+import Explorer from "./Explorer";
+import StoredProcedure from "./Tree/StoredProcedure";
+import Trigger from "./Tree/Trigger";
+import UserDefinedFunction from "./Tree/UserDefinedFunction";
+export interface CollectionContextMenuButtonParams {
+  databaseId: string;
+  collectionId: string;
+}
+
+export interface DatabaseContextMenuButtonParams {
+  databaseId: string;
+}
+/**
+ * New resource tree (in ReactJS)
+ */
+export class ResourceTreeContextMenuButtonFactory {
+  public static createDatabaseContextMenu(container: Explorer, databaseId: string): TreeNodeMenuItem[] {
+    const items: TreeNodeMenuItem[] = [
+      {
+        iconSrc: AddCollectionIcon,
+        onClick: () => container.onNewCollectionClicked(databaseId),
+        label: `New ${getCollectionName()}`,
+      },
+    ];
+
+    if (userContext.apiType !== "Tables") {
+      items.push({
+        iconSrc: DeleteDatabaseIcon,
+        onClick: () => container.openDeleteDatabaseConfirmationPane(),
+        label: `Delete ${getDatabaseName()}`,
+        styleClass: "deleteDatabaseMenuItem",
+      });
+    }
+    return items;
+  }
+
+  public static createCollectionContextMenuButton(
+    container: Explorer,
+    selectedCollection: ViewModels.Collection
+  ): TreeNodeMenuItem[] {
+    const items: TreeNodeMenuItem[] = [];
+    if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
+      items.push({
+        iconSrc: AddSqlQueryIcon,
+        onClick: () => selectedCollection && selectedCollection.onNewQueryClick(selectedCollection, null),
+        label: "New SQL Query",
+      });
+    }
+
+    if (userContext.apiType === "Mongo") {
+      items.push({
+        iconSrc: AddSqlQueryIcon,
+        onClick: () => selectedCollection && selectedCollection.onNewMongoQueryClick(selectedCollection, null),
+        label: "New Query",
+      });
+
+      items.push({
+        iconSrc: HostedTerminalIcon,
+        onClick: () => {
+          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+          if (container.isShellEnabled()) {
+            container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
+          } else {
+            selectedCollection && selectedCollection.onNewMongoShellClick();
+          }
+        },
+        label: container.isShellEnabled() ? "Open Mongo Shell" : "New Shell",
+      });
+    }
+
+    if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
+      items.push({
+        iconSrc: AddStoredProcedureIcon,
+        onClick: () => {
+          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+          selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection, null);
+        },
+        label: "New Stored Procedure",
+      });
+
+      items.push({
+        iconSrc: AddUdfIcon,
+        onClick: () => {
+          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+          selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection, null);
+        },
+        label: "New UDF",
+      });
+
+      items.push({
+        iconSrc: AddTriggerIcon,
+        onClick: () => {
+          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+          selectedCollection && selectedCollection.onNewTriggerClick(selectedCollection, null);
+        },
+        label: "New Trigger",
+      });
+    }
+
+    items.push({
+      iconSrc: DeleteCollectionIcon,
+      onClick: () => container.openDeleteCollectionConfirmationPane(),
+      label: `Delete ${getCollectionName()}`,
+      styleClass: "deleteCollectionMenuItem",
+    });
+
+    return items;
+  }
+
+  public static createStoreProcedureContextMenuItems(
+    container: Explorer,
+    storedProcedure: StoredProcedure
+  ): TreeNodeMenuItem[] {
+    if (userContext.apiType === "Cassandra") {
+      return [];
+    }
+
+    return [
+      {
+        iconSrc: DeleteSprocIcon,
+        onClick: () => storedProcedure.delete(),
+        label: "Delete Store Procedure",
+      },
+    ];
+  }
+
+  public static createTriggerContextMenuItems(container: Explorer, trigger: Trigger): TreeNodeMenuItem[] {
+    if (userContext.apiType === "Cassandra") {
+      return [];
+    }
+
+    return [
+      {
+        iconSrc: DeleteTriggerIcon,
+        onClick: () => trigger.delete(),
+        label: "Delete Trigger",
+      },
+    ];
+  }
+
+  public static createUserDefinedFunctionContextMenuItems(
+    container: Explorer,
+    userDefinedFunction: UserDefinedFunction
+  ): TreeNodeMenuItem[] {
+    if (userContext.apiType === "Cassandra") {
+      return [];
+    }
+
+    return [
+      {
+        iconSrc: DeleteUDFIcon,
+        onClick: () => userDefinedFunction.delete(),
+        label: "Delete User Defined Function",
+      },
+    ];
+  }
+}

src/Explorer/ContextMenuButtonFactory.tsx

@@ -1,190 +0,0 @@
-import React from "react";
-import AddCollectionIcon from "../../images/AddCollection.svg";
-import AddSqlQueryIcon from "../../images/AddSqlQuery_16x16.svg";
-import AddStoredProcedureIcon from "../../images/AddStoredProcedure.svg";
-import AddTriggerIcon from "../../images/AddTrigger.svg";
-import AddUdfIcon from "../../images/AddUdf.svg";
-import DeleteCollectionIcon from "../../images/DeleteCollection.svg";
-import DeleteDatabaseIcon from "../../images/DeleteDatabase.svg";
-import DeleteSprocIcon from "../../images/DeleteSproc.svg";
-import DeleteTriggerIcon from "../../images/DeleteTrigger.svg";
-import DeleteUDFIcon from "../../images/DeleteUDF.svg";
-import HostedTerminalIcon from "../../images/Hosted-Terminal.svg";
-import * as ViewModels from "../Contracts/ViewModels";
-import { useSidePanel } from "../hooks/useSidePanel";
-import { userContext } from "../UserContext";
-import { getCollectionName, getDatabaseName } from "../Utils/APITypeUtils";
-import { TreeNodeMenuItem } from "./Controls/TreeComponent/TreeComponent";
-import Explorer from "./Explorer";
-import { useNotebook } from "./Notebook/useNotebook";
-import { DeleteCollectionConfirmationPane } from "./Panes/DeleteCollectionConfirmationPane/DeleteCollectionConfirmationPane";
-import { DeleteDatabaseConfirmationPanel } from "./Panes/DeleteDatabaseConfirmationPanel";
-import StoredProcedure from "./Tree/StoredProcedure";
-import Trigger from "./Tree/Trigger";
-import UserDefinedFunction from "./Tree/UserDefinedFunction";
-import { useSelectedNode } from "./useSelectedNode";
-
-export interface CollectionContextMenuButtonParams {
-  databaseId: string;
-  collectionId: string;
-}
-
-export interface DatabaseContextMenuButtonParams {
-  databaseId: string;
-}
-/**
- * New resource tree (in ReactJS)
- */
-export const createDatabaseContextMenu = (container: Explorer, databaseId: string): TreeNodeMenuItem[] => {
-  const items: TreeNodeMenuItem[] = [
-    {
-      iconSrc: AddCollectionIcon,
-      onClick: () => container.onNewCollectionClicked(databaseId),
-      label: `New ${getCollectionName()}`,
-    },
-  ];
-
-  if (userContext.apiType !== "Tables") {
-    items.push({
-      iconSrc: DeleteDatabaseIcon,
-      onClick: () =>
-        useSidePanel
-          .getState()
-          .openSidePanel(
-            "Delete " + getDatabaseName(),
-            <DeleteDatabaseConfirmationPanel refreshDatabases={() => container.refreshAllDatabases()} />
-          ),
-      label: `Delete ${getDatabaseName()}`,
-      styleClass: "deleteDatabaseMenuItem",
-    });
-  }
-  return items;
-};
-
-export const createCollectionContextMenuButton = (
-  container: Explorer,
-  selectedCollection: ViewModels.Collection
-): TreeNodeMenuItem[] => {
-  const items: TreeNodeMenuItem[] = [];
-  if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
-    items.push({
-      iconSrc: AddSqlQueryIcon,
-      onClick: () => selectedCollection && selectedCollection.onNewQueryClick(selectedCollection, undefined),
-      label: "New SQL Query",
-    });
-  }
-
-  if (userContext.apiType === "Mongo") {
-    items.push({
-      iconSrc: AddSqlQueryIcon,
-      onClick: () => selectedCollection && selectedCollection.onNewMongoQueryClick(selectedCollection, undefined),
-      label: "New Query",
-    });
-
-    items.push({
-      iconSrc: HostedTerminalIcon,
-      isDisabled: useNotebook.getState().isShellEnabled && userContext.features.notebooksTemporarilyDown,
-      onClick: () => {
-        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled) {
-          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
-        } else {
-          selectedCollection && selectedCollection.onNewMongoShellClick();
-        }
-      },
-      label: useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell",
-    });
-  }
-
-  if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
-    items.push({
-      iconSrc: AddStoredProcedureIcon,
-      onClick: () => {
-        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection, undefined);
-      },
-      label: "New Stored Procedure",
-    });
-
-    items.push({
-      iconSrc: AddUdfIcon,
-      onClick: () => {
-        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection);
-      },
-      label: "New UDF",
-    });
-
-    items.push({
-      iconSrc: AddTriggerIcon,
-      onClick: () => {
-        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        selectedCollection && selectedCollection.onNewTriggerClick(selectedCollection, undefined);
-      },
-      label: "New Trigger",
-    });
-  }
-
-  items.push({
-    iconSrc: DeleteCollectionIcon,
-    onClick: () =>
-      useSidePanel
-        .getState()
-        .openSidePanel(
-          "Delete " + getCollectionName(),
-          <DeleteCollectionConfirmationPane refreshDatabases={() => container.refreshAllDatabases()} />
-        ),
-    label: `Delete ${getCollectionName()}`,
-    styleClass: "deleteCollectionMenuItem",
-  });
-
-  return items;
-};
-
-export const createStoreProcedureContextMenuItems = (
-  container: Explorer,
-  storedProcedure: StoredProcedure
-): TreeNodeMenuItem[] => {
-  if (userContext.apiType === "Cassandra") {
-    return [];
-  }
-
-  return [
-    {
-      iconSrc: DeleteSprocIcon,
-      onClick: () => storedProcedure.delete(),
-      label: "Delete Store Procedure",
-    },
-  ];
-};
-
-export const createTriggerContextMenuItems = (container: Explorer, trigger: Trigger): TreeNodeMenuItem[] => {
-  if (userContext.apiType === "Cassandra") {
-    return [];
-  }
-
-  return [
-    {
-      iconSrc: DeleteTriggerIcon,
-      onClick: () => trigger.delete(),
-      label: "Delete Trigger",
-    },
-  ];
-};
-
-export const createUserDefinedFunctionContextMenuItems = (
-  container: Explorer,
-  userDefinedFunction: UserDefinedFunction
-): TreeNodeMenuItem[] => {
-  if (userContext.apiType === "Cassandra") {
-    return [];
-  }
-
-  return [
-    {
-      iconSrc: DeleteUDFIcon,
-      onClick: () => userDefinedFunction.delete(),
-      label: "Delete User Defined Function",
-    },
-  ];
-};

src/Explorer/Controls/Accordion/AccordionComponent.tsx

@@ -2,15 +2,13 @@
  * Accordion top class
  */
 
+import TriangleDownIcon from "images/Triangle-down.svg";
+import TriangleRightIcon from "images/Triangle-right.svg";
 import * as React from "react";
 import AnimateHeight from "react-animate-height";
-import TriangleDownIcon from "../../../../images/Triangle-down.svg";
-import TriangleRightIcon from "../../../../images/Triangle-right.svg";
 import * as Constants from "../../../Common/Constants";
 
-export interface AccordionComponentProps {
+export interface AccordionComponentProps {}
-  children: React.ReactNode;
-}
 
 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/CollapsiblePanel.tsx

@@ -6,8 +6,8 @@
  * - calling render()
  */
 
+import LeftArrowIcon from "images/imgarrowlefticon.svg";
 import * as React from "react";
-import LeftArrowIcon from "../../../../images/imgarrowlefticon.svg";
 import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
 
 export interface CollapsiblePanelProps {

src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx

@@ -1,8 +1,8 @@
+import CollapseChevronDownIcon from "images/QueryBuilder/CollapseChevronDown_16x.png";
 /**
  * React component for Command button component.
  */
 import * as React from "react";
-import CollapseChevronDownIcon from "../../../../images/QueryBuilder/CollapseChevronDown_16x.png";
 import { KeyCodes } from "../../../Common/Constants";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
@@ -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 {
@@ -203,11 +204,9 @@ export class CommandButtonComponent extends React.Component<CommandButtonCompone
           }}
         >
           <div className="commandDropdown">
-            {this.props.children.map(
+            {this.props.children.map((c: CommandButtonComponentProps, index: number): JSX.Element => {
-              (c: CommandButtonComponentProps, index: number): JSX.Element => {
               return CommandButtonComponent.renderButton(c, `${index}`);
-              }
+            })}
-            )}
           </div>
         </div>
       </div>

src/Explorer/Controls/Dialog.tsx

@@ -23,75 +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,
-    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(
+    set((state) => ({ visible: false, openDialog: state.openDialog, closeDialog: state.closeDialog }), true),
-      (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,
-    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();
-      },
-      choiceGroupProps,
-      textFieldProps,
-      primaryButtonDisabled,
-    }),
-  showOkModalDialog: (title: string, subText: string): void =>
-    get().openDialog({
-      isModal: true,
-      title,
-      subText,
-      primaryButtonText: "Close",
-      secondaryButtonText: undefined,
-      onPrimaryButtonClick: () => {
-        get().closeDialog();
-      },
-      onSecondaryButtonClick: undefined,
-    }),
 }));
 
 export interface TextFieldProps extends ITextFieldProps {

src/Explorer/Controls/Directory/DefaultDirectoryDropdownComponent.tsx

@@ -0,0 +1,69 @@
+/**
+ * React component for Switch Directory
+ */
+
+import { Dropdown, IDropdownOption, IDropdownProps } from "@fluentui/react";
+import * as React from "react";
+import _ from "underscore";
+import { Tenant } from "../../../Contracts/DataModels";
+
+export interface DefaultDirectoryDropdownProps {
+  directories: Array<Tenant>;
+  defaultDirectoryId: string;
+  onDefaultDirectoryChange: (newDirectory: Tenant) => void;
+}
+
+export class DefaultDirectoryDropdownComponent extends React.Component<DefaultDirectoryDropdownProps> {
+  public static readonly lastVisitedKey: string = "lastVisited";
+
+  public render(): JSX.Element {
+    const lastVisitedOption: IDropdownOption = {
+      key: DefaultDirectoryDropdownComponent.lastVisitedKey,
+      text: "Sign in to your last visited directory",
+    };
+    const directoryOptions: Array<IDropdownOption> = this.props.directories.map((dirc): IDropdownOption => {
+      return {
+        key: dirc.tenantId,
+        text: `${dirc.displayName}(${dirc.tenantId})`,
+      };
+    });
+    const dropDownOptions: Array<IDropdownOption> = [lastVisitedOption, ...directoryOptions];
+    const dropDownProps: IDropdownProps = {
+      label: "Set your default directory",
+      options: dropDownOptions,
+      defaultSelectedKey: this.props.defaultDirectoryId ? this.props.defaultDirectoryId : lastVisitedOption.key,
+      onChange: this._onDropdownChange,
+      className: "defaultDirectoryDropdown",
+    };
+
+    return <Dropdown {...dropDownProps} />;
+  }
+
+  private _onDropdownChange = (e: React.FormEvent<HTMLDivElement>, option?: IDropdownOption, index?: number): void => {
+    if (!option || !option.key) {
+      return;
+    }
+
+    if (option.key === this.props.defaultDirectoryId) {
+      return;
+    }
+
+    if (option.key === DefaultDirectoryDropdownComponent.lastVisitedKey) {
+      this.props.onDefaultDirectoryChange({
+        tenantId: option.key,
+        countryCode: undefined,
+        displayName: undefined,
+        domains: [],
+        id: undefined,
+      });
+      return;
+    }
+
+    const selectedDirectory = _.find(this.props.directories, (d) => d.tenantId === option.key);
+    if (!selectedDirectory) {
+      return;
+    }
+
+    this.props.onDefaultDirectoryChange(selectedDirectory);
+  };
+}

src/Explorer/Controls/DynamicList/dynamic-list.html

@@ -0,0 +1,35 @@
+<div class="dynamicList" data-bind="setTemplateReady: true">
+  <div class="dynamicListContainer" data-bind="foreach: listItems">
+    <div class="dynamicListItem">
+      <input
+        id="uniqueKeyItems"
+        type="text"
+        autocomplete="off"
+        data-bind="value: value, attr: {placeholder: $parent.placeholder, 'aria-label': $parent.ariaLabel}"
+      />
+      <span
+        class="dynamicListItemDelete"
+        title="Remove item"
+        role="button"
+        aria-label="Remove item"
+        tabindex="0"
+        data-bind="click: $parent.removeItem, event: { keydown: $parent.onRemoveItemKeyPress }"
+      >
+        <img src="/images/delete.svg" alt="Remove item" />
+      </span>
+    </div>
+  </div>
+  <div class="dynamicListItemNew">
+    <span
+      class="dynamicListItemAdd"
+      id="addUniqueKeyBtn"
+      role="button"
+      aria-label="Add unique key"
+      tabindex="0"
+      data-bind="click: addItem, event: { keydown: onAddItemKeyPress }"
+    >
+      <img src="/images/Add-property.svg" data-bind="attr: {alt: buttonText}" />
+      <span data-bind="text: buttonText"></span>
+    </span>
+  </div>
+</div>

src/Explorer/Controls/Editor/EditorReact.tsx

@@ -1,11 +1,6 @@
-import { Spinner, SpinnerSize } from "@fluentui/react";
 import * as React from "react";
 import { loadMonaco, monaco } from "../../LazyMonaco";
-// import "./EditorReact.less";
 
-interface EditorReactStates {
-  showEditor: boolean;
-}
 export interface EditorReactProps {
   language: string;
   content: string;
@@ -17,26 +12,22 @@ export interface EditorReactProps {
   theme?: string; // Monaco editor theme
 }
 
-export class EditorReact extends React.Component<EditorReactProps, EditorReactStates> {
+export class EditorReact extends React.Component<EditorReactProps> {
   private rootNode: HTMLElement;
   private editor: monaco.editor.IStandaloneCodeEditor;
   private selectionListener: monaco.IDisposable;
 
   public constructor(props: EditorReactProps) {
     super(props);
-    this.state = {
-      showEditor: false,
-    };
   }
 
   public componentDidMount(): void {
     this.createEditor(this.configureEditor.bind(this));
   }
 
-  public componentDidUpdate(previous: EditorReactProps) {
+  public shouldComponentUpdate(): boolean {
-    if (this.props.content !== previous.content) {
+    // Prevents component re-rendering
-      this.editor.setValue(this.props.content);
+    return false;
-    }
   }
 
   public componentWillUnmount(): void {
@@ -44,19 +35,14 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt
   }
 
   public render(): JSX.Element {
-    return (
+    return <div className="jsonEditor" ref={(elt: HTMLElement) => this.setRef(elt)} />;
-      <React.Fragment>
-        {!this.state.showEditor && <Spinner size={SpinnerSize.large} className="spinner" />}
-        <div className="jsonEditor" ref={(elt: HTMLElement) => this.setRef(elt)} />
-      </React.Fragment>
-    );
   }
 
   protected configureEditor(editor: monaco.editor.IStandaloneCodeEditor) {
     this.editor = editor;
     const queryEditorModel = this.editor.getModel();
     if (!this.props.isReadOnly && this.props.onContentChanged) {
-      queryEditorModel.onDidChangeContent(() => {
+      queryEditorModel.onDidChangeContent((e: monaco.editor.IModelContentChangedEvent) => {
         const queryEditorModel = this.editor.getModel();
         this.props.onContentChanged(queryEditorModel.getValue());
       });
@@ -90,12 +76,6 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt
     this.rootNode.innerHTML = "";
     const monaco = await loadMonaco();
     createCallback(monaco.editor.create(this.rootNode, options));
-
-    if (this.rootNode.innerHTML) {
-      this.setState({
-        showEditor: true,
-      });
-    }
   }
 
   private setRef(element: HTMLElement): void {

src/Explorer/Controls/ErrorDisplayComponent/error-display-component.html

@@ -0,0 +1,6 @@
+<div class="warningErrorContainer" data-bind="visible: !!params.errorMsg()">
+  <div class="warningErrorContent">
+    <span><img src="/images/error_red.svg" alt="Error" /></span>
+    <span class="settingErrorMsg warningErrorDetailsLinkContainer" data-bind="text: params.errorMsg()"></span>
+  </div>
+</div>

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/GitHub/GitHubReposComponentAdapter.tsx

@@ -0,0 +1,20 @@
+import ko from "knockout";
+import * as React from "react";
+import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
+import { GitHubReposComponent, GitHubReposComponentProps } from "./GitHubReposComponent";
+
+export class GitHubReposComponentAdapter implements ReactAdapter {
+  public parameters: ko.Observable<number>;
+
+  constructor(private props: GitHubReposComponentProps) {
+    this.parameters = ko.observable<number>(Date.now());
+  }
+
+  public renderComponent(): JSX.Element {
+    return <GitHubReposComponent {...this.props} />;
+  }
+
+  public triggerRender(): void {
+    window.requestAnimationFrame(() => this.parameters(Date.now()));
+  }
+}

src/Explorer/Controls/InputTypeahead/InputTypeahead.less

@@ -5,9 +5,6 @@
     display: inline-block;
     width: 100%;
 
-    .input-type-head-text-field {
-        width: 100%;
-    }
     textarea {
         width: 100%;
         line-height: 1;
@@ -24,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,125 +75,170 @@ export interface InputTypeaheadComponentProps {
   useTextarea?: boolean;
 }
 
-interface InputTypeaheadComponentState {
+interface OnClickItem {
-  isSuggestionVisible: boolean;
+  matchedKey: string;
-  selectedChoice: Item;
+  value: any;
-  filteredChoices: Item[];
+  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 = {
+    this.cache = {
-      isSuggestionVisible: false,
+      inputValue: null,
-      filteredChoices: [],
+      selection: null,
-      selectedChoice: {
-        caption: "",
-        value: "",
-      },
     };
   }
 
-  private onRenderCell = (item: Item): JSX.Element => {
+  /**
+   * 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();
+    }
+  }
+
+  /**
+   * Executed once react is done building the DOM for this component
+   */
+  public componentDidMount(): void {
+    this.initializeTypeahead();
+  }
+
+  public render(): JSX.Element {
     return (
-      <div className="input-typeahead-chocies-container" onClick={() => this.onChoiceClick(item)}>
+      <span className="input-typeahead-container">
-        <p className="choice-caption">{item.caption}</p>
+        <div
-        <span>{item.value}</span>
+          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 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 });
   }
-    this.props.onNewValue(value);
-    const filteredChoices = this.filterChoiceByValue(this.props.choices, value);
-    this.setState({ filteredChoices });
-  };
 
-  private onSubmit = (event: React.KeyboardEvent<HTMLElement>): void => {
+  private onKeyDown(event: React.KeyboardEvent<HTMLElement>) {
-    if (event.key === "Enter") {
+    if (event.keyCode === KeyCodes.Enter) {
       if (this.props.submitFct) {
         event.preventDefault();
         event.stopPropagation();
-        this.props.submitFct(this.props.defaultValue, this.state.selectedChoice);
+        this.props.submitFct(this.cache.inputValue, this.cache.selection);
-        this.setState({ isSuggestionVisible: false });
+        $(this.containerElt).children(".typeahead__result").hide();
+      }
     }
   }
-  };
 
-  private filterChoiceByValue = (choices: Item[], searchKeyword: string): Item[] => {
+  /**
-    return choices.filter((choice) =>
+   * Must execute once ko is rendered, so that it can find the input element by id
-      // @ts-ignore
+   */
-      Object.keys(choice).some((key) => choice[key].toLowerCase().includes(searchKeyword.toLowerCase()))
+  private initializeTypeahead(): void {
-    );
+    const props = this.props;
-  };
+    let cache = this.cache;
-
+    let options: any = {
-  public render(): JSX.Element {
+      input: this.inputElt,
-    const { defaultValue, useTextarea, placeholder, onNewValue } = this.props;
+      order: "asc",
-    const { isSuggestionVisible, selectedChoice, filteredChoices } = this.state;
+      minLength: 0,
-    const theme = getTheme();
+      searchOnFocus: true,
-
+      source: {
-    const iconButtonStyles = {
+        display: "caption",
-      root: {
+        data: () => {
-        color: theme.palette.neutralPrimary,
+          return props.choices;
-        marginLeft: "10px !important",
-        marginTop: "0px",
-        marginRight: "2px",
-        width: "42px",
         },
-      rootHovered: {
-        color: theme.palette.neutralDark,
       },
-    };
+      callback: {
-    const cancelIcon: IIconProps = { iconName: "cancel" };
+        onClick: (node: any, a: any, item: OnClickItem, event: any) => {
-    const searchIcon: IIconProps = { iconName: "Search" };
+          cache.selection = item;
 
-    return (
+          if (props.onSelected) {
-      <div className="input-typeahead-container">
+            props.onSelected(item);
-        <Stack horizontal>
+          }
-          <TextField
+        },
-            multiline={useTextarea}
+        onResult(node: any, query: any, result: any, resultCount: any, resultCountPerGroup: any) {
-            rows={1}
+          cache.inputValue = query;
-            defaultValue={defaultValue}
+          if (props.onNewValue) {
-            ariaLabel="Input query"
+            props.onNewValue(query);
-            placeholder={placeholder}
+          }
-            className="input-type-head-text-field"
+        },
-            value={defaultValue}
+      },
-            onKeyDown={this.onSubmit}
+      template: (query: string, item: any) => {
-            onFocus={() => this.setState({ isSuggestionVisible: true })}
+        // Don't display id if caption *IS* the id
-            onChange={(_event, newValue?: string) => this.handleChange(newValue)}
+        return item.caption === item.value
-          />
+          ? "<span>{{caption}}</span>"
-          {this.props.showCancelButton && (
+          : "<span><div>{{caption}}</div><div><small>{{value}}</small></div></span>";
-            <IconButton
+      },
-              styles={iconButtonStyles}
+      dynamic: true,
-              iconProps={cancelIcon}
+    };
-              ariaLabel="cancel Button"
+
-              onClick={() => onNewValue("")}
+    // Override options
-            />
+    if (props.typeaheadOverrideOptions) {
-          )}
+      for (const p in props.typeaheadOverrideOptions) {
-          {this.props.showSearchButton && (
+        options[p] = props.typeaheadOverrideOptions[p];
-            <IconButton
+      }
-              styles={iconButtonStyles}
+    }
-              iconProps={searchIcon}
+
-              ariaLabel="Search Button"
+    if (props.hasOwnProperty("showCancelButton")) {
-              onClick={() => this.props.submitFct(defaultValue, selectedChoice)}
+      options.cancelButton = props.showCancelButton;
-            />
+    }
-          )}
+
-        </Stack>
+    $(this.inputElt).typeahead(options);
-        {filteredChoices.length && isSuggestionVisible ? (
-          <List items={filteredChoices} onRenderCell={this.onRenderCell} />
-        ) : undefined}
-      </div>
-    );
   }
 }

src/Explorer/Controls/InputTypeahead/__snapshots__/InputTypeaheadComponent.test.tsx.snap

@@ -1,43 +1,61 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`inputTypeahead renders <input /> 1`] = `
-<div
+<span
   className="input-typeahead-container"
 >
-  <Stack
+  <div
-    horizontal={true}
+    className="input-typehead"
-  >
-    <StyledTextFieldBase
-      ariaLabel="Input query"
-      className="input-type-head-text-field"
-      multiline={false}
-      onChange={[Function]}
-      onFocus={[Function]}
     onKeyDown={[Function]}
-      placeholder="placeholder"
+  >
-      rows={1}
+    <div
+      className="typeahead__container"
+    >
+      <div
+        className="typeahead__field"
+      >
+        <span
+          className="typeahead__query"
+        >
+          <input
+            aria-label="Input query"
+            autoComplete="off"
+            name="q"
+            type="search"
           />
-  </Stack>
+        </span>
       </div>
+    </div>
+  </div>
+</span>
 `;
 
 exports[`inputTypeahead renders <textarea /> 1`] = `
-<div
+<span
   className="input-typeahead-container"
 >
-  <Stack
+  <div
-    horizontal={true}
+    className="input-typehead"
-  >
-    <StyledTextFieldBase
-      ariaLabel="Input query"
-      className="input-type-head-text-field"
-      multiline={true}
-      onChange={[Function]}
-      onFocus={[Function]}
     onKeyDown={[Function]}
-      placeholder="placeholder"
+  >
+    <div
+      className="typeahead__container"
+    >
+      <div
+        className="typeahead__field"
+      >
+        <span
+          className="typeahead__query"
+        >
+          <textarea
+            aria-label="Input query"
+            autoComplete="off"
+            name="q"
             rows={1}
           />
-  </Stack>
+        </span>
       </div>
+    </div>
+  </div>
+</span>
 `;

src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx

@@ -1,90 +1,152 @@
-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 = {
+const createTestDatabaseAccount = (): DataModels.DatabaseAccount => {
-  id: "id",
+  return {
-  kind: "kind",
+    id: "testId",
-  location: "location",
+    kind: "testKind",
-  name: "name",
+    location: "testLocation",
+    name: "testName",
     properties: {
+      cassandraEndpoint: null,
       documentEndpoint: "https://testDocumentEndpoint.azure.com/",
+      gremlinEndpoint: null,
+      tableEndpoint: null,
     },
-  type: "type",
+    type: "testType",
+  };
 };
 
-const testMongo32Account: DataModels.DatabaseAccount = {
+const createTestMongo32DatabaseAccount = (): DataModels.DatabaseAccount => {
-  ...testAccount,
+  return {
-};
+    id: "testId",
-
+    kind: "testKind",
-const testMongo36Account: DataModels.DatabaseAccount = {
+    location: "testLocation",
-  ...testAccount,
+    name: "testName",
     properties: {
+      cassandraEndpoint: null,
+      documentEndpoint: "https://testDocumentEndpoint.azure.com/",
+      gremlinEndpoint: null,
+      tableEndpoint: null,
+    },
+    type: "testType",
+  };
+};
+
+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 = {
+const createTestCassandraDatabaseAccount = (): DataModels.DatabaseAccount => {
-  ...testAccount,
+  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 = {
+const createTerminal = (): NotebookTerminalComponent => {
-  authToken: "authToken",
+  return new NotebookTerminalComponent({
-  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com",
+    notebookServerInfo: {
+      authToken: "testAuthToken",
+      notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/",
+    },
+    databaseAccount: createTestDatabaseAccount(),
+  });
 };
 
-const testMongoNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
+const createMongo32Terminal = (): NotebookTerminalComponent => {
-  authToken: "authToken",
+  return new NotebookTerminalComponent({
+    notebookServerInfo: {
+      authToken: "testAuthToken",
       notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongo",
+    },
+    databaseAccount: createTestMongo32DatabaseAccount(),
+  });
 };
 
-const testCassandraNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
+const createMongo36Terminal = (): NotebookTerminalComponent => {
-  authToken: "authToken",
+  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", () => {
+  it("getTerminalParams: Test for terminal", () => {
-    const props: NotebookTerminalComponentProps = {
+    const terminal: NotebookTerminalComponent = createTerminal();
-      databaseAccount: testAccount,
+    const params: Map<string, string> = terminal.getTerminalParams();
-      notebookServerInfo: testNotebookServerInfo,
-    };
 
-    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
+    expect(params).toEqual(new Map<string, string>([["terminal", "true"]]));
-    expect(wrapper).toMatchSnapshot();
   });
 
-  it("renders mongo 3.2 shell", () => {
+  it("getTerminalParams: Test for Mongo 3.2 terminal", () => {
-    const props: NotebookTerminalComponentProps = {
+    const terminal: NotebookTerminalComponent = createMongo32Terminal();
-      databaseAccount: testMongo32Account,
+    const params: Map<string, string> = terminal.getTerminalParams();
-      notebookServerInfo: testMongoNotebookServerInfo,
-    };
 
-    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
+    expect(params).toEqual(
-    expect(wrapper).toMatchSnapshot();
+      new Map<string, string>([
+        ["terminal", "true"],
+        ["terminalEndpoint", new URL(terminal.props.databaseAccount.properties.documentEndpoint).host],
+      ])
+    );
   });
 
-  it("renders mongo 3.6 shell", () => {
+  it("getTerminalParams: Test for Mongo 3.6 terminal", () => {
-    const props: NotebookTerminalComponentProps = {
+    const terminal: NotebookTerminalComponent = createMongo36Terminal();
-      databaseAccount: testMongo36Account,
+    const params: Map<string, string> = terminal.getTerminalParams();
-      notebookServerInfo: testMongoNotebookServerInfo,
-    };
 
-    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
+    expect(params).toEqual(
-    expect(wrapper).toMatchSnapshot();
+      new Map<string, string>([
+        ["terminal", "true"],
+        ["terminalEndpoint", new URL(terminal.props.databaseAccount.properties.mongoEndpoint).host],
+      ])
+    );
   });
 
-  it("renders cassandra shell", () => {
+  it("getTerminalParams: Test for Cassandra terminal", () => {
-    const props: NotebookTerminalComponentProps = {
+    const terminal: NotebookTerminalComponent = createCassandraTerminal();
-      databaseAccount: testCassandraAccount,
+    const params: Map<string, string> = terminal.getTerminalParams();
-      notebookServerInfo: testCassandraNotebookServerInfo,
-    };
 
-    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
+    expect(params).toEqual(
-    expect(wrapper).toMatchSnapshot();
+      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={NotebookTerminalComponent.createNotebookAppSrc(this.props.notebookServerInfo, this.getTerminalParams())}
-          src="terminal.html"
         />
       </div>
     );
   }
 
-  handleFrameLoad(event: React.SyntheticEvent<HTMLIFrameElement, Event>): void {
+  public getTerminalParams(): Map<string, string> {
-    this.terminalWindow = (event.target as HTMLIFrameElement).contentWindow;
+    let params: Map<string, string> = new Map<string, string>();
-    this.sendPropsToTerminalFrame();
+    params.set(TerminalQueryParams.Terminal, "true");
+
+    const terminalEndpoint: string = this.tryGetTerminalEndpoint();
+    if (terminalEndpoint) {
+      params.set(TerminalQueryParams.TerminalEndpoint, terminalEndpoint);
     }
 
-  sendPropsToTerminalFrame(): void {
+    return params;
-    if (!this.terminalWindow) {
-      return;
   }
 
-    const props: TerminalProps = {
+  public tryGetTerminalEndpoint(): string | null {
-      terminalEndpoint: this.tryGetTerminalEndpoint(),
+    let terminalEndpoint: string | null;
-      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, {
+    const notebookServerEndpoint: string = this.props.notebookServerInfo.notebookServerEndpoint;
-      domain: window.location.origin,
-    });
-  }
-
-  public tryGetTerminalEndpoint(): string | undefined {
-    let terminalEndpoint: string | undefined;
-
-    const notebookServerEndpoint = this.props.notebookServerInfo?.notebookServerEndpoint;
     if (StringUtils.endsWith(notebookServerEndpoint, "mongo")) {
-      // mongoEndpoint is only available for Mongo 3.6 and higher, fallback to documentEndpoint otherwise
+      let mongoShellEndpoint: string = this.props.databaseAccount.properties.mongoEndpoint;
-      terminalEndpoint =
+      if (!mongoShellEndpoint) {
-        this.props.databaseAccount?.properties.mongoEndpoint || this.props.databaseAccount?.properties.documentEndpoint;
+        // 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/NotebookGallery/Cards/GalleryCardComponent.tsx

@@ -18,8 +18,8 @@ import {
   Text,
   TooltipHost,
 } from "@fluentui/react";
+import CosmosDBLogo from "images/CosmosDB-logo.svg";
 import React, { FunctionComponent, useState } from "react";
-import CosmosDBLogo from "../../../../../images/CosmosDB-logo.svg";
 import { IGalleryItem } from "../../../../Juno/JunoClient";
 import * as FileSystemUtil from "../../../Notebook/FileSystemUtil";
 

src/Explorer/Controls/NotebookViewer/NotebookMetadataComponent.tsx

@@ -2,12 +2,12 @@
  * Wrapper around Notebook metadata
  */
 import { FontWeights, Icon, IconButton, Link, Persona, PersonaSize, PrimaryButton, Stack, Text } from "@fluentui/react";
+import CosmosDBLogo from "images/CosmosDB-logo.svg";
 import * as React from "react";
 import { IGalleryItem } from "../../../Juno/JunoClient";
 import * as FileSystemUtil from "../../Notebook/FileSystemUtil";
-import "./NotebookViewerComponent.less";
-import CosmosDBLogo from "../../../../images/CosmosDB-logo.svg";
 import { InfoComponent } from "../NotebookGallery/InfoComponent/InfoComponent";
+import "./NotebookViewerComponent.less";
 
 export interface NotebookMetadataComponentProps {
   data: IGalleryItem;

src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx

@@ -43,7 +43,8 @@ interface NotebookViewerComponentState {
 
 export class NotebookViewerComponent
   extends React.Component<NotebookViewerComponentProps, NotebookViewerComponentState>
-  implements DialogHost {
+  implements DialogHost
+{
   private clientManager: NotebookClientV2;
   private notebookComponentBootstrapper: NotebookComponentBootstrapper;
 
@@ -55,7 +56,7 @@ export class NotebookViewerComponent
       databaseAccountName: undefined,
       defaultExperience: "NotebookViewer",
       isReadOnly: true,
-      cellEditorType: "codemirror",
+      cellEditorType: "monaco",
       autoSaveInterval: 365 * 24 * 3600 * 1000, // There is no way to turn off auto-save, set to 1 year
       contentProvider: contents.JupyterContentProvider, // NotebookViewer only knows how to talk to Jupyter contents API
     });

src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx

@@ -19,9 +19,9 @@ import {
   SelectionZone,
   TextField,
 } from "@fluentui/react";
+import SaveQueryBannerIcon from "images/save_query_banner.png";
 import * as React from "react";
 import * as _ from "underscore";
-import SaveQueryBannerIcon from "../../../../images/save_query_banner.png";
 import * as Constants from "../../../Common/Constants";
 import { StyleConstants } from "../../../Common/Constants";
 import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
@@ -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,19 +214,19 @@ 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 () => {
+                  onClick: async (
-                    useDialog.getState().showOkCancelModalDialog(
+                    event: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>,
-                      "Confirm delete",
+                    menuItem: any
-                      "Are you sure you want to delete this query?",
+                  ) => {
-                      "Delete",
+                    if (window.confirm("Are you sure you want to delete this query?")) {
-                      async () => {
+                      const container = window.dataExplorer;
                       const startKey: number = TelemetryProcessor.traceStart(Action.DeleteSavedQuery, {
                         dataExplorerArea: Constants.Areas.ContextualPane,
                         paneTitle: title,
@@ -255,10 +254,7 @@ export class QueriesGridComponent extends React.Component<QueriesGridComponentPr
                         );
                       }
                       await this.fetchSavedQueries(); // get latest state
-                      },
+                    }
-                      "Cancel",
-                      undefined
-                    );
                   },
                 },
               ],

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

@@ -38,6 +38,8 @@ describe("SettingsComponent", () => {
       title: "Scale & Settings",
       tabPath: "",
       node: undefined,
+      hashLocation: "settings",
+      onUpdateTabsButtons: undefined,
     }),
   };
 
@@ -126,6 +128,7 @@ describe("SettingsComponent", () => {
       isDatabaseExpanded: undefined,
       isDatabaseShared: ko.computed(() => true),
       selectedSubnodeKind: undefined,
+      selectDatabase: undefined,
       expandDatabase: undefined,
       collapseDatabase: undefined,
       loadCollections: undefined,

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -1,7 +1,7 @@
 import { IPivotItemProps, IPivotProps, Pivot, PivotItem } from "@fluentui/react";
+import DiscardIcon from "images/discard.svg";
+import SaveIcon from "images/save-cosmos.svg";
 import * as React from "react";
-import DiscardIcon from "../../../../images/discard.svg";
-import SaveIcon from "../../../../images/save-cosmos.svg";
 import { AuthType } from "../../../AuthType";
 import * as Constants from "../../../Common/Constants";
 import { getIndexTransformationProgress } from "../../../Common/dataAccess/getIndexTransformationProgress";
@@ -17,7 +17,7 @@ import { userContext } from "../../../UserContext";
 import { MongoDBCollectionResource, MongoIndex } from "../../../Utils/arm/generatedClients/cosmos/types";
 import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
-import { useCommandBar } from "../../Menus/CommandBar/CommandBarComponentAdapter";
+import Explorer from "../../Explorer";
 import { SettingsTabV2 } from "../../Tabs/SettingsTabV2";
 import "./SettingsComponent.less";
 import { mongoIndexingPolicyAADError } from "./SettingsRenderUtils";
@@ -121,6 +121,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
   private collection: ViewModels.Collection;
   private database: ViewModels.Database;
   private offer: DataModels.Offer;
+  private container: Explorer;
   private changeFeedPolicyVisible: boolean;
   private isFixedContainer: boolean;
   private shouldShowIndexingPolicyEditor: boolean;
@@ -132,6 +133,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     this.isCollectionSettingsTab = this.props.settingsTab.tabKind === ViewModels.CollectionTabKind.CollectionSettingsV2;
     if (this.isCollectionSettingsTab) {
       this.collection = this.props.settingsTab.collection as ViewModels.Collection;
+      this.container = this.collection?.container;
       this.offer = this.collection?.offer();
       this.isAnalyticalStorageEnabled = !!this.collection?.analyticalStorageTtl();
       this.shouldShowIndexingPolicyEditor = userContext.apiType !== "Cassandra" && userContext.apiType !== "Mongo";
@@ -143,6 +145,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         userContext.apiType === "Mongo" && (!this.collection?.partitionKey || this.collection?.partitionKey.systemKey);
     } else {
       this.database = this.props.settingsTab.database;
+      this.container = this.database?.container;
       this.offer = this.database?.offer();
     }
 
@@ -219,13 +222,13 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     this.setAutoPilotStates();
     this.setBaseline();
     if (this.props.settingsTab.isActive()) {
-      useCommandBar.getState().setContextButtons(this.getTabsButtons());
+      this.props.settingsTab.getContainer().onUpdateTabsButtons(this.getTabsButtons());
     }
   }
 
   componentDidUpdate(): void {
     if (this.props.settingsTab.isActive()) {
-      useCommandBar.getState().setContextButtons(this.getTabsButtons());
+      this.props.settingsTab.getContainer().onUpdateTabsButtons(this.getTabsButtons());
     }
   }
 
@@ -290,7 +293,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     this.state.wasAutopilotOriginallySet !== this.state.isAutoPilotSelected;
 
   public shouldShowKeyspaceSharedThroughputMessage = (): boolean =>
-    userContext.apiType === "Cassandra" && hasDatabaseSharedThroughput(this.collection);
+    this.container && userContext.apiType === "Cassandra" && hasDatabaseSharedThroughput(this.collection);
 
   public hasConflictResolution = (): boolean =>
     userContext?.databaseAccount?.properties?.enableMultipleWriteLocations &&
@@ -880,6 +883,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     const scaleComponentProps: ScaleComponentProps = {
       collection: this.collection,
       database: this.database,
+      container: this.container,
       isFixedContainer: this.isFixedContainer,
       onThroughputChange: this.onThroughputChange,
       throughput: this.state.throughput,
@@ -907,6 +911,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
 
     const subSettingsComponentProps: SubSettingsComponentProps = {
       collection: this.collection,
+      container: this.container,
       isAnalyticalStorageEnabled: this.isAnalyticalStorageEnabled,
       changeFeedPolicyVisible: this.changeFeedPolicyVisible,
       timeToLive: this.state.timeToLive,
@@ -959,6 +964,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
 
     const conflictResolutionPolicyComponentProps: ConflictResolutionComponentProps = {
       collection: this.collection,
+      container: this.container,
       conflictResolutionPolicyMode: this.state.conflictResolutionPolicyMode,
       conflictResolutionPolicyModeBaseline: this.state.conflictResolutionPolicyModeBaseline,
       onConflictResolutionPolicyModeChange: this.onConflictResolutionPolicyModeChange,

src/Explorer/Controls/Settings/SettingsComponentAdapter.tsx

@@ -0,0 +1,14 @@
+import ko from "knockout";
+import * as React from "react";
+import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
+import { SettingsComponent, SettingsComponentProps } from "./SettingsComponent";
+
+export class SettingsComponentAdapter implements ReactAdapter {
+  public parameters: ko.Computed<boolean>;
+
+  constructor(private props: SettingsComponentProps) {}
+
+  public renderComponent(): JSX.Element {
+    return this.parameters() ? <SettingsComponent {...this.props} /> : <></>;
+  }
+}

src/Explorer/Controls/Settings/SettingsSubComponents/ConflictResolutionComponent.test.tsx

@@ -1,12 +1,13 @@
 import { shallow } from "enzyme";
 import React from "react";
+import { ConflictResolutionComponentProps, ConflictResolutionComponent } from "./ConflictResolutionComponent";
+import { container, collection } from "../TestUtils";
 import * as DataModels from "../../../../Contracts/DataModels";
-import { collection } from "../TestUtils";
-import { ConflictResolutionComponent, ConflictResolutionComponentProps } from "./ConflictResolutionComponent";
 
 describe("ConflictResolutionComponent", () => {
   const baseProps: ConflictResolutionComponentProps = {
     collection: collection,
+    container: container,
     conflictResolutionPolicyMode: DataModels.ConflictResolutionMode.Custom,
     conflictResolutionPolicyModeBaseline: DataModels.ConflictResolutionMode.Custom,
     onConflictResolutionPolicyModeChange: () => {

src/Explorer/Controls/Settings/SettingsSubComponents/ConflictResolutionComponent.tsx

@@ -1,19 +1,21 @@
-import { ChoiceGroup, IChoiceGroupOption, ITextFieldProps, Stack, TextField } from "@fluentui/react";
 import * as React from "react";
-import * as DataModels from "../../../../Contracts/DataModels";
 import * as ViewModels from "../../../../Contracts/ViewModels";
+import * as DataModels from "../../../../Contracts/DataModels";
+import Explorer from "../../../Explorer";
 import {
-  conflictResolutionCustomToolTip,
-  conflictResolutionLwwTooltip,
-  getChoiceGroupStyles,
   getTextFieldStyles,
+  conflictResolutionLwwTooltip,
+  conflictResolutionCustomToolTip,
   subComponentStackProps,
+  getChoiceGroupStyles,
 } from "../SettingsRenderUtils";
-import { isDirty } from "../SettingsUtils";
+import { TextField, ITextFieldProps, Stack, IChoiceGroupOption, ChoiceGroup } from "@fluentui/react";
 import { ToolTipLabelComponent } from "./ToolTipLabelComponent";
+import { isDirty } from "../SettingsUtils";
 
 export interface ConflictResolutionComponentProps {
   collection: ViewModels.Collection;
+  container: Explorer;
   conflictResolutionPolicyMode: DataModels.ConflictResolutionMode;
   conflictResolutionPolicyModeBaseline: DataModels.ConflictResolutionMode;
   onConflictResolutionPolicyModeChange: (newMode: DataModels.ConflictResolutionMode) => void;

src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.test.tsx

@@ -1,8 +1,8 @@
 import { shallow } from "enzyme";
 import React from "react";
+import { renderToString } from "react-dom/server";
 import { MongoIndexTypes, MongoNotificationMessage, MongoNotificationType } from "../../SettingsUtils";
 import { MongoIndexingPolicyComponent, MongoIndexingPolicyComponentProps } from "./MongoIndexingPolicyComponent";
-import { renderToString } from "react-dom/server";
 
 describe("MongoIndexingPolicyComponent", () => {
   const baseProps: MongoIndexingPolicyComponentProps = {
@@ -84,7 +84,7 @@ describe("MongoIndexingPolicyComponent", () => {
     ];
 
     test.each(cases)(
-      "",
+      "test Mongo Indexing Policy",
       (
         notification: MongoNotificationMessage,
         indexToDropIsPresent: boolean,
@@ -109,12 +109,13 @@ describe("MongoIndexingPolicyComponent", () => {
         expect(mongoIndexingPolicyComponent.isMongoIndexingPolicyDiscardable()).toEqual(
           isMongoIndexingPolicyDiscardable
         );
-        if (mongoWarningNotificationMessage) {
+
-          const elementAsString = renderToString(mongoIndexingPolicyComponent.getMongoWarningNotificationMessage());
+        const warningNotificationElementAsString = renderToString(
-          expect(elementAsString).toContain(mongoWarningNotificationMessage);
+          mongoIndexingPolicyComponent.getMongoWarningNotificationMessage()
-        } else {
+        );
-          expect(mongoIndexingPolicyComponent.getMongoWarningNotificationMessage()).toBeUndefined();
+        expect(warningNotificationElementAsString.includes(mongoWarningNotificationMessage)).toEqual(
-        }
+          !!mongoWarningNotificationMessage
+        );
       }
     );
   });

src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.test.tsx

@@ -7,17 +7,20 @@ import * as SharedConstants from "../../../../Shared/Constants";
 import { updateUserContext } from "../../../../UserContext";
 import Explorer from "../../../Explorer";
 import { throughputUnit } from "../SettingsRenderUtils";
-import { collection } from "../TestUtils";
+import { collection, container } from "../TestUtils";
 import { ScaleComponent, ScaleComponentProps } from "./ScaleComponent";
 import { ThroughputInputAutoPilotV3Component } from "./ThroughputInputComponents/ThroughputInputAutoPilotV3Component";
 
 describe("ScaleComponent", () => {
   const nonNationalCloudContainer = new Explorer();
+  nonNationalCloudContainer.isRunningOnNationalCloud = () => false;
+
   const targetThroughput = 6000;
 
   const baseProps: ScaleComponentProps = {
     collection: collection,
     database: undefined,
+    container: container,
     isFixedContainer: false,
     onThroughputChange: () => {
       return;
@@ -108,7 +111,7 @@ describe("ScaleComponent", () => {
     let scaleComponent = new ScaleComponent(baseProps);
     expect(scaleComponent.getThroughputTitle()).toEqual("Throughput (6,000 - unlimited RU/s)");
 
-    let newProps = { ...baseProps };
+    let newProps = { ...baseProps, container: nonNationalCloudContainer };
     scaleComponent = new ScaleComponent(newProps);
     expect(scaleComponent.getThroughputTitle()).toEqual("Throughput (6,000 - unlimited RU/s)");
 
@@ -121,7 +124,7 @@ describe("ScaleComponent", () => {
     let scaleComponent = new ScaleComponent(baseProps);
     expect(scaleComponent.canThroughputExceedMaximumValue()).toEqual(true);
 
-    const newProps = { ...baseProps };
+    const newProps = { ...baseProps, container: nonNationalCloudContainer };
     scaleComponent = new ScaleComponent(newProps);
     expect(scaleComponent.canThroughputExceedMaximumValue()).toEqual(true);
   });

src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx

@@ -7,7 +7,7 @@ import * as ViewModels from "../../../../Contracts/ViewModels";
 import * as SharedConstants from "../../../../Shared/Constants";
 import { userContext } from "../../../../UserContext";
 import * as AutoPilotUtils from "../../../../Utils/AutoPilotUtils";
-import { isRunningOnNationalCloud } from "../../../../Utils/CloudUtils";
+import Explorer from "../../../Explorer";
 import {
   getTextFieldStyles,
   getThroughputApplyLongDelayMessage,
@@ -23,6 +23,7 @@ import { ThroughputInputAutoPilotV3Component } from "./ThroughputInputComponents
 export interface ScaleComponentProps {
   collection: ViewModels.Collection;
   database: ViewModels.Database;
+  container: Explorer;
   isFixedContainer: boolean;
   onThroughputChange: (newThroughput: number) => void;
   throughput: number;
@@ -108,7 +109,11 @@ export class ScaleComponent extends React.Component<ScaleComponentProps> {
   };
 
   public canThroughputExceedMaximumValue = (): boolean => {
-    return !this.props.isFixedContainer && configContext.platform === Platform.Portal && !isRunningOnNationalCloud();
+    return (
+      !this.props.isFixedContainer &&
+      configContext.platform === Platform.Portal &&
+      !this.props.container.isRunningOnNationalCloud()
+    );
   };
 
   public getInitialNotificationElement = (): JSX.Element => {

src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.test.tsx

@@ -4,12 +4,14 @@ import { DatabaseAccount } from "../../../../Contracts/DataModels";
 import { updateUserContext } from "../../../../UserContext";
 import Explorer from "../../../Explorer";
 import { ChangeFeedPolicyState, GeospatialConfigType, TtlOff, TtlOn, TtlOnNoDefault, TtlType } from "../SettingsUtils";
-import { collection } from "../TestUtils";
+import { collection, container } from "../TestUtils";
 import { SubSettingsComponent, SubSettingsComponentProps } from "./SubSettingsComponent";
 
 describe("SubSettingsComponent", () => {
   const baseProps: SubSettingsComponentProps = {
     collection: collection,
+    container: container,
+
     timeToLive: TtlType.On,
     timeToLiveBaseline: TtlType.On,
     onTtlChange: () => {

src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx

@@ -2,6 +2,7 @@ import { ChoiceGroup, IChoiceGroupOption, Label, Link, MessageBar, Stack, Text,
 import * as React from "react";
 import * as ViewModels from "../../../../Contracts/ViewModels";
 import { userContext } from "../../../../UserContext";
+import Explorer from "../../../Explorer";
 import { Int32 } from "../../../Panes/Tables/Validators/EntityPropertyValidationCommon";
 import {
   changeFeedPolicyToolTip,
@@ -27,6 +28,8 @@ import { ToolTipLabelComponent } from "./ToolTipLabelComponent";
 
 export interface SubSettingsComponentProps {
   collection: ViewModels.Collection;
+  container: Explorer;
+
   timeToLive: TtlType;
   timeToLiveBaseline: TtlType;
 

src/Explorer/Controls/Settings/SettingsUtils.test.tsx

@@ -36,6 +36,7 @@ describe("SettingsUtils", () => {
         isDatabaseExpanded: ko.observable(false),
         isDatabaseShared: ko.computed(() => true),
         selectedSubnodeKind: ko.observable(undefined),
+        selectDatabase: undefined,
         expandDatabase: undefined,
         collapseDatabase: undefined,
         loadCollections: undefined,

src/Explorer/Controls/Settings/TestUtils.tsx

@@ -5,7 +5,7 @@ import Explorer from "../../Explorer";
 
 export const container = new Explorer();
 
-export const collection = ({
+export const collection = {
   container: container,
   databaseId: "test",
   id: ko.observable<string>("test"),
@@ -43,4 +43,4 @@ export const collection = ({
   readSettings: () => {
     return;
   },
-} as unknown) as ViewModels.Collection;
+} as unknown as ViewModels.Collection;

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

@@ -30,20 +30,76 @@ exports[`SettingsComponent renders 1`] = `
               "container": Explorer {
                 "_isInitializingNotebooks": false,
                 "_resetNotebookWorkspace": [Function],
+                "canSaveQueries": [Function],
+                "closeSidePanel": undefined,
+                "collapsedResourceTreeWidth": 36,
+                "commandBarComponentAdapter": CommandBarComponentAdapter {
+                  "container": [Circular],
+                  "isNotebookTabActive": [Function],
+                  "parameters": [Function],
+                  "tabsButtons": Array [],
+                },
+                "databases": [Function],
+                "isAccountReady": [Function],
                 "isFixedCollectionWithSharedThroughputSupported": [Function],
+                "isHostedDataExplorerEnabled": [Function],
+                "isNotebookEnabled": [Function],
+                "isNotebooksEnabledForAccount": [Function],
+                "isResourceTokenCollectionNodeSelected": [Function],
+                "isSchemaEnabled": [Function],
+                "isServerlessEnabled": [Function],
+                "isShellEnabled": [Function],
+                "isSynapseLinkUpdating": [Function],
                 "isTabsContentExpanded": [Function],
+                "memoryUsageInfo": [Function],
+                "notebookBasePath": [Function],
+                "notebookServerInfo": [Function],
                 "onRefreshDatabasesKeyPress": [Function],
                 "onRefreshResourcesClick": [Function],
+                "openSidePanel": undefined,
                 "provideFeedbackEmail": [Function],
                 "queriesClient": QueriesClient {
                   "container": [Circular],
                 },
                 "refreshNotebookList": [Function],
+                "resourceTokenCollection": [Function],
+                "resourceTokenCollectionId": [Function],
+                "resourceTokenDatabaseId": [Function],
+                "resourceTokenPartitionKey": [Function],
                 "resourceTree": ResourceTreeAdapter {
                   "container": [Circular],
                   "copyNotebook": [Function],
+                  "databaseCollectionIdMap": Map {},
+                  "koSubsCollectionIdMap": Map {},
+                  "koSubsDatabaseIdMap": Map {},
                   "parameters": [Function],
                 },
+                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                  "container": [Circular],
+                  "parameters": [Function],
+                },
+                "selectedDatabaseId": [Function],
+                "selectedNode": [Function],
+                "setInProgressConsoleDataIdToBeDeleted": undefined,
+                "setIsNotificationConsoleExpanded": undefined,
+                "setNotificationConsoleData": undefined,
+                "sparkClusterConnectionInfo": [Function],
+                "splitter": Splitter {
+                  "bounds": Object {
+                    "max": 400,
+                    "min": 240,
+                  },
+                  "direction": "vertical",
+                  "isCollapsed": [Function],
+                  "leftSideId": "resourcetree",
+                  "onResizeStart": [Function],
+                  "onResizeStop": [Function],
+                  "splitterId": "h_splitter1",
+                },
+                "tabsManager": TabsManager {
+                  "activeTab": [Function],
+                  "openedTabs": [Function],
+                },
               },
               "databaseId": "test",
               "defaultTtl": [Function],
@@ -63,6 +119,82 @@ exports[`SettingsComponent renders 1`] = `
               "usageSizeInKB": [Function],
             }
           }
+          container={
+            Explorer {
+              "_isInitializingNotebooks": false,
+              "_resetNotebookWorkspace": [Function],
+              "canSaveQueries": [Function],
+              "closeSidePanel": undefined,
+              "collapsedResourceTreeWidth": 36,
+              "commandBarComponentAdapter": CommandBarComponentAdapter {
+                "container": [Circular],
+                "isNotebookTabActive": [Function],
+                "parameters": [Function],
+                "tabsButtons": Array [],
+              },
+              "databases": [Function],
+              "isAccountReady": [Function],
+              "isFixedCollectionWithSharedThroughputSupported": [Function],
+              "isHostedDataExplorerEnabled": [Function],
+              "isNotebookEnabled": [Function],
+              "isNotebooksEnabledForAccount": [Function],
+              "isResourceTokenCollectionNodeSelected": [Function],
+              "isSchemaEnabled": [Function],
+              "isServerlessEnabled": [Function],
+              "isShellEnabled": [Function],
+              "isSynapseLinkUpdating": [Function],
+              "isTabsContentExpanded": [Function],
+              "memoryUsageInfo": [Function],
+              "notebookBasePath": [Function],
+              "notebookServerInfo": [Function],
+              "onRefreshDatabasesKeyPress": [Function],
+              "onRefreshResourcesClick": [Function],
+              "openSidePanel": undefined,
+              "provideFeedbackEmail": [Function],
+              "queriesClient": QueriesClient {
+                "container": [Circular],
+              },
+              "refreshNotebookList": [Function],
+              "resourceTokenCollection": [Function],
+              "resourceTokenCollectionId": [Function],
+              "resourceTokenDatabaseId": [Function],
+              "resourceTokenPartitionKey": [Function],
+              "resourceTree": ResourceTreeAdapter {
+                "container": [Circular],
+                "copyNotebook": [Function],
+                "databaseCollectionIdMap": Map {},
+                "koSubsCollectionIdMap": Map {},
+                "koSubsDatabaseIdMap": Map {},
+                "parameters": [Function],
+              },
+              "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                "container": [Circular],
+                "parameters": [Function],
+              },
+              "selectedDatabaseId": [Function],
+              "selectedNode": [Function],
+              "setInProgressConsoleDataIdToBeDeleted": undefined,
+              "setIsNotificationConsoleExpanded": undefined,
+              "setNotificationConsoleData": undefined,
+              "sparkClusterConnectionInfo": [Function],
+              "splitter": Splitter {
+                "bounds": Object {
+                  "max": 400,
+                  "min": 240,
+                },
+                "direction": "vertical",
+                "isCollapsed": [Function],
+                "leftSideId": "resourcetree",
+                "onResizeStart": [Function],
+                "onResizeStop": [Function],
+                "splitterId": "h_splitter1",
+              },
+              "tabsManager": TabsManager {
+                "activeTab": [Function],
+                "openedTabs": [Function],
+              },
+            }
+          }
           isAutoPilotSelected={false}
           isFixedContainer={false}
           onAutoPilotSelected={[Function]}
@@ -97,20 +229,76 @@ exports[`SettingsComponent renders 1`] = `
               "container": Explorer {
                 "_isInitializingNotebooks": false,
                 "_resetNotebookWorkspace": [Function],
+                "canSaveQueries": [Function],
+                "closeSidePanel": undefined,
+                "collapsedResourceTreeWidth": 36,
+                "commandBarComponentAdapter": CommandBarComponentAdapter {
+                  "container": [Circular],
+                  "isNotebookTabActive": [Function],
+                  "parameters": [Function],
+                  "tabsButtons": Array [],
+                },
+                "databases": [Function],
+                "isAccountReady": [Function],
                 "isFixedCollectionWithSharedThroughputSupported": [Function],
+                "isHostedDataExplorerEnabled": [Function],
+                "isNotebookEnabled": [Function],
+                "isNotebooksEnabledForAccount": [Function],
+                "isResourceTokenCollectionNodeSelected": [Function],
+                "isSchemaEnabled": [Function],
+                "isServerlessEnabled": [Function],
+                "isShellEnabled": [Function],
+                "isSynapseLinkUpdating": [Function],
                 "isTabsContentExpanded": [Function],
+                "memoryUsageInfo": [Function],
+                "notebookBasePath": [Function],
+                "notebookServerInfo": [Function],
                 "onRefreshDatabasesKeyPress": [Function],
                 "onRefreshResourcesClick": [Function],
+                "openSidePanel": undefined,
                 "provideFeedbackEmail": [Function],
                 "queriesClient": QueriesClient {
                   "container": [Circular],
                 },
                 "refreshNotebookList": [Function],
+                "resourceTokenCollection": [Function],
+                "resourceTokenCollectionId": [Function],
+                "resourceTokenDatabaseId": [Function],
+                "resourceTokenPartitionKey": [Function],
                 "resourceTree": ResourceTreeAdapter {
                   "container": [Circular],
                   "copyNotebook": [Function],
+                  "databaseCollectionIdMap": Map {},
+                  "koSubsCollectionIdMap": Map {},
+                  "koSubsDatabaseIdMap": Map {},
                   "parameters": [Function],
                 },
+                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                  "container": [Circular],
+                  "parameters": [Function],
+                },
+                "selectedDatabaseId": [Function],
+                "selectedNode": [Function],
+                "setInProgressConsoleDataIdToBeDeleted": undefined,
+                "setIsNotificationConsoleExpanded": undefined,
+                "setNotificationConsoleData": undefined,
+                "sparkClusterConnectionInfo": [Function],
+                "splitter": Splitter {
+                  "bounds": Object {
+                    "max": 400,
+                    "min": 240,
+                  },
+                  "direction": "vertical",
+                  "isCollapsed": [Function],
+                  "leftSideId": "resourcetree",
+                  "onResizeStart": [Function],
+                  "onResizeStop": [Function],
+                  "splitterId": "h_splitter1",
+                },
+                "tabsManager": TabsManager {
+                  "activeTab": [Function],
+                  "openedTabs": [Function],
+                },
               },
               "databaseId": "test",
               "defaultTtl": [Function],
@@ -130,6 +318,82 @@ exports[`SettingsComponent renders 1`] = `
               "usageSizeInKB": [Function],
             }
           }
+          container={
+            Explorer {
+              "_isInitializingNotebooks": false,
+              "_resetNotebookWorkspace": [Function],
+              "canSaveQueries": [Function],
+              "closeSidePanel": undefined,
+              "collapsedResourceTreeWidth": 36,
+              "commandBarComponentAdapter": CommandBarComponentAdapter {
+                "container": [Circular],
+                "isNotebookTabActive": [Function],
+                "parameters": [Function],
+                "tabsButtons": Array [],
+              },
+              "databases": [Function],
+              "isAccountReady": [Function],
+              "isFixedCollectionWithSharedThroughputSupported": [Function],
+              "isHostedDataExplorerEnabled": [Function],
+              "isNotebookEnabled": [Function],
+              "isNotebooksEnabledForAccount": [Function],
+              "isResourceTokenCollectionNodeSelected": [Function],
+              "isSchemaEnabled": [Function],
+              "isServerlessEnabled": [Function],
+              "isShellEnabled": [Function],
+              "isSynapseLinkUpdating": [Function],
+              "isTabsContentExpanded": [Function],
+              "memoryUsageInfo": [Function],
+              "notebookBasePath": [Function],
+              "notebookServerInfo": [Function],
+              "onRefreshDatabasesKeyPress": [Function],
+              "onRefreshResourcesClick": [Function],
+              "openSidePanel": undefined,
+              "provideFeedbackEmail": [Function],
+              "queriesClient": QueriesClient {
+                "container": [Circular],
+              },
+              "refreshNotebookList": [Function],
+              "resourceTokenCollection": [Function],
+              "resourceTokenCollectionId": [Function],
+              "resourceTokenDatabaseId": [Function],
+              "resourceTokenPartitionKey": [Function],
+              "resourceTree": ResourceTreeAdapter {
+                "container": [Circular],
+                "copyNotebook": [Function],
+                "databaseCollectionIdMap": Map {},
+                "koSubsCollectionIdMap": Map {},
+                "koSubsDatabaseIdMap": Map {},
+                "parameters": [Function],
+              },
+              "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                "container": [Circular],
+                "parameters": [Function],
+              },
+              "selectedDatabaseId": [Function],
+              "selectedNode": [Function],
+              "setInProgressConsoleDataIdToBeDeleted": undefined,
+              "setIsNotificationConsoleExpanded": undefined,
+              "setNotificationConsoleData": undefined,
+              "sparkClusterConnectionInfo": [Function],
+              "splitter": Splitter {
+                "bounds": Object {
+                  "max": 400,
+                  "min": 240,
+                },
+                "direction": "vertical",
+                "isCollapsed": [Function],
+                "leftSideId": "resourcetree",
+                "onResizeStart": [Function],
+                "onResizeStop": [Function],
+                "splitterId": "h_splitter1",
+              },
+              "tabsManager": TabsManager {
+                "activeTab": [Function],
+                "openedTabs": [Function],
+              },
+            }
+          }
           geospatialConfigType="Geometry"
           geospatialConfigTypeBaseline="Geometry"
           isAnalyticalStorageEnabled={false}

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/ThroughputInput.test.tsx

@@ -4,7 +4,7 @@ import { ThroughputInput } from "./ThroughputInput";
 const props = {
   isDatabase: false,
   showFreeTierExceedThroughputTooltip: true,
-  isSharded: true,
+  isSharded: false,
   setThroughputValue: () => jest.fn(),
   setIsAutoscale: () => jest.fn(),
   onCostAcknowledgeChange: () => jest.fn(),

src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx

@@ -41,16 +41,9 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
       throughputHeaderText = AutoPilotUtils.getAutoPilotHeaderText().toLocaleLowerCase();
     } else {
       const minRU: string = SharedConstants.CollectionCreation.DefaultCollectionRUs400.toLocaleString();
-
+      const maxRU: string = userContext.isTryCosmosDBSubscription
-      let maxRU: string;
+        ? Constants.TryCosmosExperience.maxRU.toLocaleString()
-      if (userContext.isTryCosmosDBSubscription) {
+        : "unlimited";
-        maxRU = Constants.TryCosmosExperience.maxRU.toLocaleString();
-      } else if (!isSharded) {
-        maxRU = "10000";
-      } else {
-        maxRU = "unlimited";
-      }
-
       throughputHeaderText = `throughput (${minRU} - ${maxRU} RU/s)`;
     }
     return `${isDatabase ? "Database" : getCollectionName()} ${throughputHeaderText}`;

src/Explorer/Controls/ThroughputInput/ThroughputInputComponentAutoscaleV3.html

@@ -0,0 +1,194 @@
+<div>
+  <div>
+    <p class="pkPadding">
+      <!-- ko if: showAsMandatory -->
+      <span class="mandatoryStar">*</span>
+      <!-- /ko -->
+
+      <span data-bind="text: label"></span>
+
+      <!-- ko if: infoBubbleText -->
+      <span class="infoTooltip" role="tooltip" tabindex="0">
+        <img class="infoImg" src="/images/info-bubble.svg" alt="More information" />
+        <span data-bind="text: infoBubbleText" class="tooltiptext throughputRuInfo"></span>
+      </span>
+      <!-- /ko -->
+    </p>
+  </div>
+
+  <!-- ko if: !isFixed -->
+  <div class="throughputModeContainer">
+    <input
+      class="throughputModeRadio"
+      aria-label="Autopilot mode"
+      type="radio"
+      role="radio"
+      tabindex="0"
+      data-bind="
+          checked: isAutoPilotSelected,
+          checkedValue: true,
+          attr: {
+            id: throughputAutoPilotRadioId,
+            name: throughputModeRadioName,
+            'aria-checked': isAutoPilotSelected() ? 'true' : 'false'
+          }"
+    />
+    <span
+      class="throughputModeSpace"
+      data-bind="
+          attr: {
+            for: throughputAutoPilotRadioId
+          }"
+      >Autoscale
+    </span>
+
+    <input
+      class="throughputModeRadio nonFirstRadio"
+      aria-label="Manual mode"
+      type="radio"
+      role="radio"
+      tabindex="0"
+      data-bind="
+          checked: isAutoPilotSelected,
+          checkedValue: false,
+          attr: {
+            id:  throughputProvisionedRadioId,
+            name: throughputModeRadioName,
+            'aria-checked': !isAutoPilotSelected() ? 'true' : 'false'
+          }"
+    />
+    <span
+      class="throughputModeSpace"
+      data-bind="attr: {
+          for: throughputProvisionedRadioId
+        }"
+      >Manual
+    </span>
+  </div>
+  <!-- /ko -->
+
+  <div data-bind="visible: isAutoPilotSelected">
+    <p>
+      <span
+        >Provision maximum RU/s required by this resource. Estimate your required RU/s with
+        <a target="_blank" href="https://cosmos.azure.com/capacitycalculator/">capacity calculator</a>.</span
+      >
+    </p>
+    <p>
+      <span>Max RU/s</span>
+    </p>
+    <div data-bind="setTemplateReady: true">
+      <input
+        data-bind="textInput: overrideWithProvisionedThroughputSettings() ? '' : maxAutoPilotThroughputSet, attr:{
+        disabled: overrideWithProvisionedThroughputSettings(),
+        step: step,
+        'class':'migration collid select-font-size',
+        min: minAutoPilotThroughput,
+        'aria-label': 'Max request units per second',
+        type: isAutoscaleThroughputInputFieldRequired() ? 'number' : 'hidden',
+        css: {
+          dirty: maxAutoPilotThroughputSet.editableIsDirty
+      }
+    }"
+      />
+    </div>
+    <p data-bind="visible: overrideWithProvisionedThroughputSettings && !overrideWithProvisionedThroughputSettings()">
+      <span
+        data-bind="
+              html: autoPilotUsageCost"
+      ></span>
+    </p>
+    <p
+      data-bind="visible: costsVisible && overrideWithProvisionedThroughputSettings && !overrideWithProvisionedThroughputSettings()"
+    >
+      <span data-bind="html: requestUnitsUsageCost"></span>
+    </p>
+
+    <!-- ko if: spendAckVisible -->
+    <p class="pkPadding">
+      <input
+        type="checkbox"
+        aria-label="acknowledge spend throughput"
+        data-bind="
+            attr: {
+              title: spendAckText,
+              id: spendAckId
+            },
+            checked: spendAckChecked"
+      />
+      <span data-bind="text: spendAckText, attr: { for: spendAckId }"></span>
+    </p>
+    <!-- /ko -->
+
+    <!-- ko if: isFixed -->
+    <p>Choose unlimited storage capacity for more than 10,000 RU/s.</p>
+    <!-- /ko -->
+  </div>
+
+  <div data-bind="visible: !isAutoPilotSelected()">
+    <p>
+      <span
+        >Estimate your required throughput with
+        <a target="_blank" href="https://cosmos.azure.com/capacitycalculator/">capacity calculator</a></span
+      >
+    </p>
+
+    <div class="inputTooltip">
+      <span
+        data-bind="text: freeTierExceedThroughputTooltip, visible: showFreeTierExceedThroughputTooltip"
+        class="inputTooltipText"
+      ></span>
+    </div>
+
+    <div data-bind="setTemplateReady: true">
+      <input
+        data-bind="
+            textInput: overrideWithAutoPilotSettings() ? maxAutoPilotThroughputSet : value,
+            css: {
+                dirty: value.editableIsDirty
+            },
+            enable: isEnabled,
+            attr:{
+                type: isManualThroughputInputFieldRequired() ? 'number' : 'hidden',
+                'data-test': testId,
+                'class': cssClass,
+                step: step,
+                min: minimum,
+                max: canExceedMaximumValue() ? null : maximum,
+                'aria-label': ariaLabel,
+                disabled: overrideWithAutoPilotSettings(),
+                required: isManualThroughputInputFieldRequired()
+            }"
+      />
+    </div>
+
+    <div class="freeTierInlineWarning" data-bind="visible: showFreeTierExceedThroughputWarning">
+      <span class="freeTierWarningIcon"><img src="/images/warning.svg" alt="Warning" /></span>
+      <span class="freeTierWarningMessage" data-bind="text: freeTierExceedThroughputWarning"></span>
+    </div>
+
+    <p data-bind="visible: costsVisible">
+      <span data-bind="html: requestUnitsUsageCost"></span>
+    </p>
+
+    <!-- ko if: spendAckVisible -->
+    <p class="pkPadding">
+      <input
+        type="checkbox"
+        aria-label="acknowledge spend throughput"
+        data-bind="
+        attr: {
+          title: spendAckText,
+          id: spendAckId
+        },
+        checked: spendAckChecked"
+      />
+      <span data-bind="text: spendAckText, attr: { for: spendAckId }"></span>
+    </p>
+    <!-- /ko -->
+
+    <!-- ko if: isFixed -->
+    <p>Choose unlimited storage capacity for more than 10,000 RU/s.</p>
+    <!-- /ko -->
+  </div>
+</div>

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

@@ -3,7 +3,7 @@
 exports[`ThroughputInput Pane should render Default properly 1`] = `
 <ThroughputInput
   isDatabase={false}
-  isSharded={true}
+  isSharded={false}
   onCostAcknowledgeChange={[Function]}
   setIsAutoscale={[Function]}
   setThroughputValue={[Function]}

src/Explorer/Controls/TreeComponent/TreeComponent.tsx

@@ -12,11 +12,11 @@ import {
   IContextualMenuItemProps,
   IContextualMenuProps,
 } from "@fluentui/react";
+import LoadingIndicator_3Squares from "images/LoadingIndicator_3Squares.gif";
+import TriangleDownIcon from "images/Triangle-down.svg";
+import TriangleRightIcon from "images/Triangle-right.svg";
 import * as React from "react";
 import AnimateHeight from "react-animate-height";
-import LoadingIndicator_3Squares from "../../../../images/LoadingIndicator_3Squares.gif";
-import TriangleDownIcon from "../../../../images/Triangle-down.svg";
-import TriangleRightIcon from "../../../../images/Triangle-right.svg";
 import * as Constants from "../../../Common/Constants";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
@@ -58,7 +58,7 @@ export interface TreeComponentProps {
 export class TreeComponent extends React.Component<TreeComponentProps> {
   public render(): JSX.Element {
     return (
-      <div style={this.props.style} className={`treeComponent ${this.props.className}`} role="tree">
+      <div style={this.props.style} className={`treeComponent ${this.props.className}`}>
         <TreeNodeComponent paddingLeft={0} node={this.props.rootNode} generation={0} />
       </div>
     );
@@ -172,7 +172,6 @@ export class TreeNodeComponent extends React.Component<TreeNodeComponentProps, T
         className={`${this.props.node.className || ""} main${generation} nodeItem ${showSelected ? "selected" : ""}`}
         onClick={(event: React.MouseEvent<HTMLDivElement>) => this.onNodeClick(event, node)}
         onKeyPress={(event: React.KeyboardEvent<HTMLDivElement>) => this.onNodeKeyPress(event, node)}
-        role="treeitem"
       >
         <div
           className={`treeNodeHeader ${this.state.isMenuShowing ? "showingMenu" : ""}`}

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

@@ -3,7 +3,6 @@
 exports[`TreeComponent renders a simple tree 1`] = `
 <div
   className="treeComponent tree"
-  role="tree"
 >
   <TreeNodeComponent
     generation={0}
@@ -38,7 +37,6 @@ exports[`TreeNodeComponent does not render children by default 1`] = `
   className=" main2 nodeItem "
   onClick={[Function]}
   onKeyPress={[Function]}
-  role="treeitem"
 >
   <div
     className="treeNodeHeader "
@@ -139,7 +137,6 @@ exports[`TreeNodeComponent renders a simple node (sorted children, expanded) 1`]
   className="nodeClassname main12 nodeItem "
   onClick={[Function]}
   onKeyPress={[Function]}
-  role="treeitem"
 >
   <div
     className="treeNodeHeader "
@@ -288,7 +285,6 @@ exports[`TreeNodeComponent renders loading icon 1`] = `
   className=" main2 nodeItem "
   onClick={[Function]}
   onKeyPress={[Function]}
-  role="treeitem"
 >
   <div
     className="treeNodeHeader "
@@ -360,7 +356,6 @@ exports[`TreeNodeComponent renders sorted children, expanded, leaves and parents
   className="nodeClassname main12 nodeItem "
   onClick={[Function]}
   onKeyPress={[Function]}
-  role="treeitem"
 >
   <div
     className="treeNodeHeader "
@@ -528,7 +523,6 @@ exports[`TreeNodeComponent renders unsorted children by default 1`] = `
   className=" main2 nodeItem "
   onClick={[Function]}
   onKeyPress={[Function]}
-  role="treeitem"
 >
   <div
     className="treeNodeHeader "

src/Explorer/DataSamples/ContainerSampleGenerator.test.ts

@@ -2,22 +2,22 @@ jest.mock("../Graph/GraphExplorerComponent/GremlinClient");
 jest.mock("../../Common/dataAccess/createCollection");
 jest.mock("../../Common/dataAccess/createDocument");
 import * as ko from "knockout";
+import Q from "q";
 import { createDocument } from "../../Common/dataAccess/createDocument";
 import { DatabaseAccount } from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { updateUserContext } from "../../UserContext";
 import Explorer from "../Explorer";
-import { useDatabases } from "../useDatabases";
 import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
 
 describe("ContainerSampleGenerator", () => {
-  let explorerStub: Explorer;
+  const createExplorerStub = (database: ViewModels.Database): Explorer => {
-
+    const explorerStub = {} as Explorer;
-  beforeAll(() => {
+    explorerStub.databases = ko.observableArray<ViewModels.Database>([database]);
-    explorerStub = {
+    explorerStub.findDatabaseWithId = () => database;
-      refreshAllDatabases: () => {},
+    explorerStub.refreshAllDatabases = () => Q.resolve();
-    } as Explorer;
+    return explorerStub;
-  });
+  };
 
   beforeEach(() => {
     (createDocument as jest.Mock).mockResolvedValue(undefined);
@@ -59,7 +59,8 @@ describe("ContainerSampleGenerator", () => {
       loadCollections: () => {},
     } as ViewModels.Database;
     database.findCollectionWithId = () => collection;
-    useDatabases.getState().addDatabases([database]);
+
+    const explorerStub = createExplorerStub(database);
 
     const generator = await ContainerSampleGenerator.createSampleGeneratorAsync(explorerStub);
     generator.setData(sampleData);
@@ -107,8 +108,8 @@ describe("ContainerSampleGenerator", () => {
     } as ViewModels.Database;
     database.findCollectionWithId = () => collection;
     collection.databaseId = database.id();
-    useDatabases.getState().addDatabases([database]);
 
+    const explorerStub = createExplorerStub(database);
     updateUserContext({
       databaseAccount: {
         properties: {
@@ -125,6 +126,7 @@ describe("ContainerSampleGenerator", () => {
 
   it("should not create any sample for Mongo API account", async () => {
     const experience = "Sample generation not supported for this API Mongo";
+    const explorerStub = createExplorerStub(undefined);
     updateUserContext({
       databaseAccount: {
         properties: {
@@ -139,6 +141,7 @@ describe("ContainerSampleGenerator", () => {
 
   it("should not create any sample for Table API account", async () => {
     const experience = "Sample generation not supported for this API Tables";
+    const explorerStub = createExplorerStub(undefined);
     updateUserContext({
       databaseAccount: {
         properties: {
@@ -160,6 +163,7 @@ describe("ContainerSampleGenerator", () => {
         },
       } as DatabaseAccount,
     });
+    const explorerStub = createExplorerStub(undefined);
     // Rejects with error that contains experience
     await expect(ContainerSampleGenerator.createSampleGeneratorAsync(explorerStub)).rejects.toMatch(experience);
   });

src/Explorer/DataSamples/ContainerSampleGenerator.ts

@@ -7,7 +7,6 @@ import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"
 import GraphTab from ".././Tabs/GraphTab";
 import Explorer from "../Explorer";
 import { GremlinClient } from "../Graph/GraphExplorerComponent/GremlinClient";
-import { useDatabases } from "../useDatabases";
 
 interface SampleDataFile extends DataModels.CreateCollectionParams {
   data: any[];
@@ -60,7 +59,7 @@ export class ContainerSampleGenerator {
 
     await createCollection(createRequest);
     await this.container.refreshAllDatabases();
-    const database = useDatabases.getState().findDatabaseWithId(this.sampleDataFile.databaseId);
+    const database = this.container.findDatabaseWithId(this.sampleDataFile.databaseId);
     if (!database) {
       return undefined;
     }

src/Explorer/DataSamples/DataSamplesUtil.test.ts

@@ -2,7 +2,6 @@ import * as ko from "knockout";
 import * as sinon from "sinon";
 import { Collection, Database } from "../../Contracts/ViewModels";
 import Explorer from "../Explorer";
-import { useDatabases } from "../useDatabases";
 import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
 import { DataSamplesUtil } from "./DataSamplesUtil";
 
@@ -17,7 +16,8 @@ describe("DataSampleUtils", () => {
       collections: ko.observableArray<Collection>([collection]),
     } as Database;
     const explorer = {} as Explorer;
-    useDatabases.getState().addDatabases([database]);
+    explorer.databases = ko.observableArray<Database>([database]);
+    explorer.showOkModalDialog = () => {};
     const dataSamplesUtil = new DataSamplesUtil(explorer);
 
     const fakeGenerator = sinon.createStubInstance<ContainerSampleGenerator>(ContainerSampleGenerator as any);

src/Explorer/DataSamples/DataSamplesUtil.ts

@@ -1,9 +1,7 @@
 import * as ViewModels from "../../Contracts/ViewModels";
 import { userContext } from "../../UserContext";
 import { logConsoleError, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
-import { useDialog } from "../Controls/Dialog";
 import Explorer from "../Explorer";
-import { useDatabases } from "../useDatabases";
 import { ContainerSampleGenerator } from "./ContainerSampleGenerator";
 
 export class DataSamplesUtil {
@@ -19,9 +17,9 @@ export class DataSamplesUtil {
 
     const databaseName = generator.getDatabaseId();
     const containerName = generator.getCollectionId();
-    if (this.hasContainer(databaseName, containerName, useDatabases.getState().databases)) {
+    if (this.hasContainer(databaseName, containerName, this.container.databases())) {
       const msg = `The container ${containerName} in database ${databaseName} already exists. Please delete it and retry.`;
-      useDialog.getState().showOkModalDialog(DataSamplesUtil.DialogTitle, msg);
+      this.container.showOkModalDialog(DataSamplesUtil.DialogTitle, msg);
       logConsoleError(msg);
       return;
     }
@@ -30,7 +28,7 @@ export class DataSamplesUtil {
       .createSampleContainerAsync()
       .catch((error) => logConsoleError(`Error creating sample container: ${error}`));
     const msg = `The sample ${containerName} in database ${databaseName} has been successfully created.`;
-    useDialog.getState().showOkModalDialog(DataSamplesUtil.DialogTitle, msg);
+    this.container.showOkModalDialog(DataSamplesUtil.DialogTitle, msg);
     logConsoleInfo(msg);
   }
 

src/Explorer/Explorer.test.tsx

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

src/Explorer/Graph/GraphExplorerComponent/EditorNeighborsComponent.tsx

@@ -3,9 +3,9 @@
  * Editor for neighbors (targets or sources)
  */
 
+import AddPropertyIcon from "images/Add-property.svg";
+import DeleteIcon from "images/delete.svg";
 import * as React from "react";
-import AddPropertyIcon from "../../../../images/Add-property.svg";
-import DeleteIcon from "../../../../images/delete.svg";
 import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
 import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
 import { EditedEdges, GraphNewEdgeData, NeighborVertexBasicInfo, PossibleVertex } from "./GraphExplorer";
@@ -83,11 +83,11 @@ export class EditorNeighborsComponent extends React.Component<EditorNeighborsCom
   }
 
   private removeCurrentNeighborEdge(index: number): void {
-    const sources = this.props.editedNeighbors.currentNeighbors;
+    let sources = this.props.editedNeighbors.currentNeighbors;
-    const id = sources[index].edgeId;
+    let id = sources[index].edgeId;
     sources.splice(index, 1);
 
-    const droppedIds = this.props.editedNeighbors.droppedIds;
+    let droppedIds = this.props.editedNeighbors.droppedIds;
     droppedIds.push(id);
     this.onUpdateEdges();
   }
@@ -215,7 +215,7 @@ export class EditorNeighborsComponent extends React.Component<EditorNeighborsCom
             </td>
             <td className="actionCol">
               <span className="rightPaneTrashIcon rightPaneBtns">
-                <img src={DeleteIcon} alt="Delete" onClick={() => this.removeAddedEdgeToNeighbor(index)} />
+                <img src={DeleteIcon} alt="Delete" onClick={(e) => this.removeAddedEdgeToNeighbor(index)} />
               </span>
             </td>
           </tr>

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

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

src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.tsx

@@ -3,9 +3,9 @@
  * Read-only properties
  */
 
+import AddIcon from "images/Add-property.svg";
+import DeleteIcon from "images/delete.svg";
 import * as React from "react";
-import AddIcon from "../../../../images/Add-property.svg";
-import DeleteIcon from "../../../../images/delete.svg";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
 import { EditedProperties } from "./GraphExplorer";
@@ -48,7 +48,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
     const editedProperties = this.props.editedProperties;
     // search for it
     for (let i = 0; i < editedProperties.existingProperties.length; i++) {
-      const ip = editedProperties.existingProperties[i];
+      let ip = editedProperties.existingProperties[i];
       if (ip.key === key) {
         editedProperties.existingProperties.splice(i, 1);
         editedProperties.droppedKeys.push(key);
@@ -60,7 +60,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
 
   private removeAddedProperty(index: number): void {
     const editedProperties = this.props.editedProperties;
-    const ap = editedProperties.addedProperties;
+    let ap = editedProperties.addedProperties;
     ap.splice(index, 1);
 
     this.props.onUpdateProperties(editedProperties);
@@ -68,7 +68,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
 
   private addProperty(): void {
     const editedProperties = this.props.editedProperties;
-    const ap = editedProperties.addedProperties;
+    let ap = editedProperties.addedProperties;
     ap.push({ key: "", values: [{ value: "", type: EditorNodePropertiesComponent.DEFAULT_PROPERTY_TYPE }] });
     this.props.onUpdateProperties(editedProperties);
   }
@@ -126,7 +126,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
             onChange={(e) => {
               singleValue.type = e.target.value as ViewModels.InputPropertyValueTypeString;
               if (singleValue.type === "null") {
-                singleValue.value = undefined;
+                singleValue.value = null;
               }
               this.props.onUpdateProperties(this.props.editedProperties);
             }}
@@ -144,7 +144,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
             className="rightPaneTrashIcon rightPaneBtns"
             as="span"
             aria-label="Delete property"
-            onActivated={() => this.removeExistingProperty(key)}
+            onActivated={(e) => this.removeExistingProperty(key)}
           >
             <img src={DeleteIcon} alt="Delete" />
           </AccessibleElement>
@@ -166,7 +166,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
             className="rightPaneTrashIcon rightPaneBtns"
             as="span"
             aria-label="Remove existing property"
-            onActivated={() => this.removeExistingProperty(nodeProp.key)}
+            onActivated={(e) => this.removeExistingProperty(nodeProp.key)}
           >
             <img src={DeleteIcon} alt="Delete" />
           </AccessibleElement>
@@ -206,7 +206,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
                     onChange={(e) => {
                       firstValue.value = e.target.value;
                       if (firstValue.type === "null") {
-                        firstValue.value = undefined;
+                        firstValue.value = null;
                       }
                       this.props.onUpdateProperties(this.props.editedProperties);
                     }}
@@ -235,7 +235,7 @@ export class EditorNodePropertiesComponent extends React.Component<EditorNodePro
                   className="rightPaneTrashIcon rightPaneBtns"
                   as="span"
                   aria-label="Remove property"
-                  onActivated={() => this.removeAddedProperty(index)}
+                  onActivated={(e) => this.removeAddedProperty(index)}
                 >
                   <img src={DeleteIcon} alt="Delete" />
                 </AccessibleElement>

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

@@ -10,7 +10,7 @@ import { queryDocumentsPage } from "../../../Common/dataAccess/queryDocumentsPag
 import * as DataModels from "../../../Contracts/DataModels";
 import * as StorageUtility from "../../../Shared/StorageUtility";
 import { TabComponent } from "../../Controls/Tabs/TabComponent";
-import { ConsoleDataType } from "../../Menus/NotificationConsole/ConsoleData";
+import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
 import GraphTab from "../../Tabs/GraphTab";
 import * as D3ForceGraph from "./D3ForceGraph";
 import { GraphData } from "./GraphData";
@@ -207,11 +207,9 @@ describe("GraphExplorer", () => {
     const gVRU = 123.456;
 
     const disableMonacoEditor = (graphExplorer: GraphExplorer) => {
-      renderResultAsJsonStub = sinon.stub(graphExplorer, "renderResultAsJson").callsFake(
+      renderResultAsJsonStub = sinon.stub(graphExplorer, "renderResultAsJson").callsFake((): JSX.Element => {
-        (): JSX.Element => {
         return <div>[Monaco Editor Stub]</div>;
-        }
+      });
-      );
     };
 
     interface AjaxResponse {

src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx

@@ -1,8 +1,8 @@
 import { FeedOptions, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
+import LoadGraphIcon from "images/LoadGraph.png";
+import LoadingIndicatorIcon from "images/LoadingIndicator_3Squares.gif";
 import * as Q from "q";
 import * as React from "react";
-import LoadGraphIcon from "../../../../images/LoadGraph.png";
-import LoadingIndicatorIcon from "../../../../images/LoadingIndicator_3Squares.gif";
 import * as Constants from "../../../Common/Constants";
 import { queryDocuments } from "../../../Common/dataAccess/queryDocuments";
 import { queryDocumentsPage } from "../../../Common/dataAccess/queryDocumentsPage";
@@ -18,7 +18,7 @@ import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../../Ut
 import { EditorReact } from "../../Controls/Editor/EditorReact";
 import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
 import * as TabComponent from "../../Controls/Tabs/TabComponent";
-import { ConsoleDataType } from "../../Menus/NotificationConsole/ConsoleData";
+import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
 import { IGraphConfig } from "../../Tabs/GraphTab";
 import { ArraysByKeyCache } from "./ArraysByKeyCache";
 import * as D3ForceGraph from "./D3ForceGraph";
@@ -633,8 +633,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       promise = Q.resolve(0);
     }
 
-    promise = promise.then(
+    promise = promise.then((outEPairsNb: number): Q.Promise<number> => {
-      (outEPairsNb: number): Q.Promise<number> => {
       const inEdgesToFetch = totalEdgesToFetch - outEPairsNb;
       if (!vertex._inEAllLoaded && inEdgesToFetch > 0) {
         let start: number;
@@ -665,8 +664,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       } else {
         return Q.resolve(outEPairsNb);
       }
-      }
+    });
-    );
 
     return promise.then((nbPairsFetched: number) => {
       if (offsetIndex >= GraphExplorer.LOAD_PAGE_SIZE || !vertex._outEAllLoaded || !vertex._inEAllLoaded) {
@@ -1221,16 +1219,13 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
 
   private getPossibleRootNodes(): LeftPane.CaptionId[] {
     const key = this.state.igraphConfig.nodeCaption;
-    return $.map(
+    return $.map(this.state.rootMap, (value: any, index: number): LeftPane.CaptionId => {
-      this.state.rootMap,
-      (value: any, index: number): LeftPane.CaptionId => {
       let result = GraphData.GraphData.getNodePropValue(value, key);
       return {
         caption: result !== undefined ? result : value.id,
         id: value.id,
       };
-      }
+    });
-    );
   }
 
   /**

src/Explorer/Graph/GraphExplorerComponent/GraphExplorerAdapter.tsx

@@ -0,0 +1,74 @@
+import * as React from "react";
+import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
+import * as ViewModels from "../../../Contracts/ViewModels";
+import { IGraphConfig } from "../../Tabs/GraphTab";
+import { GraphAccessor, GraphExplorer } from "./GraphExplorer";
+interface Parameter {
+  onIsNewVertexDisabledChange: (isEnabled: boolean) => void;
+  onGraphAccessorCreated: (instance: GraphAccessor) => void;
+  onIsFilterQueryLoading: (isFilterQueryLoading: boolean) => void;
+  onIsValidQuery: (isValidQuery: boolean) => void;
+  onIsPropertyEditing: (isEditing: boolean) => void;
+  onIsGraphDisplayed: (isDisplayed: boolean) => void;
+  onResetDefaultGraphConfigValues: () => void;
+
+  collectionPartitionKeyProperty: string;
+  graphBackendEndpoint: string;
+  databaseId: string;
+  collectionId: string;
+  masterKey: string;
+
+  onLoadStartKey: number;
+  onLoadStartKeyChange: (newKey: number) => void;
+  resourceId: string;
+
+  igraphConfigUiData: ViewModels.IGraphConfigUiData;
+  igraphConfig: IGraphConfig;
+  setIConfigUiData?: (data: string[]) => void;
+}
+
+interface IGraphExplorerProps {
+  isChanged: boolean;
+}
+
+interface IGraphExplorerStates {
+  isChangedState: boolean;
+}
+
+export interface GraphExplorerAdapter
+  extends ReactAdapter,
+    React.Component<IGraphExplorerProps, IGraphExplorerStates> {}
+export class GraphExplorerAdapter implements ReactAdapter {
+  public params: Parameter;
+  public parameters = {};
+  public isNewVertexDisabled: boolean;
+
+  public constructor(params: Parameter, props?: IGraphExplorerProps) {
+    this.params = params;
+  }
+
+  public renderComponent(): JSX.Element {
+    return (
+      <GraphExplorer
+        onIsNewVertexDisabledChange={this.params.onIsNewVertexDisabledChange}
+        onGraphAccessorCreated={this.params.onGraphAccessorCreated}
+        onIsFilterQueryLoadingChange={this.params.onIsFilterQueryLoading}
+        onIsValidQueryChange={this.params.onIsValidQuery}
+        onIsPropertyEditing={this.params.onIsPropertyEditing}
+        onIsGraphDisplayed={this.params.onIsGraphDisplayed}
+        onResetDefaultGraphConfigValues={this.params.onResetDefaultGraphConfigValues}
+        collectionPartitionKeyProperty={this.params.collectionPartitionKeyProperty}
+        graphBackendEndpoint={this.params.graphBackendEndpoint}
+        databaseId={this.params.databaseId}
+        collectionId={this.params.collectionId}
+        masterKey={this.params.masterKey}
+        onLoadStartKey={this.params.onLoadStartKey}
+        onLoadStartKeyChange={this.params.onLoadStartKeyChange}
+        resourceId={this.params.resourceId}
+        igraphConfigUiData={this.params.igraphConfigUiData}
+        igraphConfig={this.params.igraphConfig}
+        setIConfigUiData={this.params.setIConfigUiData}
+      />
+    );
+  }
+}

src/Explorer/Graph/GraphExplorerComponent/GraphUtil.test.ts

@@ -1,7 +1,9 @@
-import * as sinon from "sinon";
-import { GraphData, GremlinEdge, GremlinVertex } from "./GraphData";
-import { GraphExplorer } from "./GraphExplorer";
 import * as GraphUtil from "./GraphUtil";
+import { GraphData, GremlinVertex, GremlinEdge } from "./GraphData";
+import * as sinon from "sinon";
+import { GraphExplorer } from "./GraphExplorer";
+window.$ = window.jQuery = require("jquery");
+
 const OUT_E_MATCHER = "g\\.V\\(.*\\).outE\\(\\).*\\.as\\('e'\\).inV\\(\\)\\.as\\('v'\\)\\.select\\('e', *'v'\\)";
 const IN_E_MATCHER = "g\\.V\\(.*\\).inE\\(\\).*\\.as\\('e'\\).outV\\(\\)\\.as\\('v'\\)\\.select\\('e', *'v'\\)";
 

src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.test.ts

@@ -94,236 +94,16 @@ describe("Gremlin Simple Client", () => {
       result: { data: ["é"], meta: {} },
     };
     const expectedDecodedUint8ArrayValues = [
-      123,
+      123, 34, 114, 101, 113, 117, 101, 115, 116, 73, 100, 34, 58, 34, 100, 55, 55, 50, 102, 56, 57, 55, 45, 48, 100,
-      34,
+      52, 100, 45, 52, 99, 100, 49, 45, 98, 51, 54, 48, 45, 100, 100, 102, 54, 99, 56, 54, 98, 57, 51, 97, 51, 34, 44,
-      114,
+      34, 115, 116, 97, 116, 117, 115, 34, 58, 123, 34, 99, 111, 100, 101, 34, 58, 50, 48, 48, 44, 34, 97, 116, 116,
-      101,
+      114, 105, 98, 117, 116, 101, 115, 34, 58, 123, 34, 103, 114, 97, 112, 104, 69, 120, 101, 99, 117, 116, 105, 111,
-      113,
+      110, 83, 116, 97, 116, 117, 115, 34, 58, 50, 48, 48, 44, 34, 83, 116, 111, 114, 97, 103, 101, 82, 85, 34, 58, 50,
-      117,
+      46, 50, 57, 44, 34, 67, 111, 109, 112, 117, 116, 101, 82, 85, 34, 58, 49, 46, 48, 55, 44, 34, 80, 101, 114, 80,
-      101,
+      97, 114, 116, 105, 116, 105, 111, 110, 67, 111, 109, 112, 117, 116, 101, 67, 104, 97, 114, 103, 101, 115, 34, 58,
-      115,
+      123, 125, 125, 44, 34, 109, 101, 115, 115, 97, 103, 101, 34, 58, 34, 34, 125, 44, 34, 114, 101, 115, 117, 108,
-      116,
+      116, 34, 58, 123, 34, 100, 97, 116, 97, 34, 58, 91, 34, 195, 169, 34, 93, 44, 34, 109, 101, 116, 97, 34, 58, 123,
-      73,
+      125, 125, 125,
-      100,
-      34,
-      58,
-      34,
-      100,
-      55,
-      55,
-      50,
-      102,
-      56,
-      57,
-      55,
-      45,
-      48,
-      100,
-      52,
-      100,
-      45,
-      52,
-      99,
-      100,
-      49,
-      45,
-      98,
-      51,
-      54,
-      48,
-      45,
-      100,
-      100,
-      102,
-      54,
-      99,
-      56,
-      54,
-      98,
-      57,
-      51,
-      97,
-      51,
-      34,
-      44,
-      34,
-      115,
-      116,
-      97,
-      116,
-      117,
-      115,
-      34,
-      58,
-      123,
-      34,
-      99,
-      111,
-      100,
-      101,
-      34,
-      58,
-      50,
-      48,
-      48,
-      44,
-      34,
-      97,
-      116,
-      116,
-      114,
-      105,
-      98,
-      117,
-      116,
-      101,
-      115,
-      34,
-      58,
-      123,
-      34,
-      103,
-      114,
-      97,
-      112,
-      104,
-      69,
-      120,
-      101,
-      99,
-      117,
-      116,
-      105,
-      111,
-      110,
-      83,
-      116,
-      97,
-      116,
-      117,
-      115,
-      34,
-      58,
-      50,
-      48,
-      48,
-      44,
-      34,
-      83,
-      116,
-      111,
-      114,
-      97,
-      103,
-      101,
-      82,
-      85,
-      34,
-      58,
-      50,
-      46,
-      50,
-      57,
-      44,
-      34,
-      67,
-      111,
-      109,
-      112,
-      117,
-      116,
-      101,
-      82,
-      85,
-      34,
-      58,
-      49,
-      46,
-      48,
-      55,
-      44,
-      34,
-      80,
-      101,
-      114,
-      80,
-      97,
-      114,
-      116,
-      105,
-      116,
-      105,
-      111,
-      110,
-      67,
-      111,
-      109,
-      112,
-      117,
-      116,
-      101,
-      67,
-      104,
-      97,
-      114,
-      103,
-      101,
-      115,
-      34,
-      58,
-      123,
-      125,
-      125,
-      44,
-      34,
-      109,
-      101,
-      115,
-      115,
-      97,
-      103,
-      101,
-      34,
-      58,
-      34,
-      34,
-      125,
-      44,
-      34,
-      114,
-      101,
-      115,
-      117,
-      108,
-      116,
-      34,
-      58,
-      123,
-      34,
-      100,
-      97,
-      116,
-      97,
-      34,
-      58,
-      91,
-      34,
-      195,
-      169,
-      34,
-      93,
-      44,
-      34,
-      109,
-      101,
-      116,
-      97,
-      34,
-      58,
-      123,
-      125,
-      125,
-      125,
     ];
     // We do our best here to emulate what the server should return
     const gremlinResponseData = new Uint8Array(<any>expectedDecodedUint8ArrayValues).buffer;

src/Explorer/Graph/GraphExplorerComponent/MiddlePaneComponent.tsx

@@ -1,8 +1,8 @@
+import CollapseArrowIcon from "images/Collapse_arrow_14x14.svg";
+import ExpandIcon from "images/Expand_14x14.svg";
+import LoadingIndicatorIcon from "images/LoadingIndicator_3Squares.gif";
 import * as React from "react";
 import { GraphVizComponent, GraphVizComponentProps } from "./GraphVizComponent";
-import CollapseArrowIcon from "../../../../images/Collapse_arrow_14x14.svg";
-import ExpandIcon from "../../../../images/Expand_14x14.svg";
-import LoadingIndicatorIcon from "../../../../images/LoadingIndicator_3Squares.gif";
 
 interface MiddlePaneComponentProps {
   isTabsContentExpanded: boolean;

src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx

@@ -4,16 +4,16 @@
  * The mode is controlled by the parent of this component
  */
 
+import CancelIcon from "images/cancel.svg";
+import CheckIcon from "images/check1.svg";
+import DeleteIcon from "images/delete.svg";
+import EditIcon from "images/Edit_entity.svg";
 import * as React from "react";
-import CancelIcon from "../../../../images/cancel.svg";
-import CheckIcon from "../../../../images/check-1.svg";
-import DeleteIcon from "../../../../images/delete.svg";
-import EditIcon from "../../../../images/edit-1.svg";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
 import { CollapsiblePanel } from "../../Controls/CollapsiblePanel/CollapsiblePanel";
 import { Item } from "../../Controls/InputTypeahead/InputTypeaheadComponent";
-import { ConsoleDataType } from "../../Menus/NotificationConsole/ConsoleData";
+import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent";
 import * as EditorNeighbors from "./EditorNeighborsComponent";
 import { EditorNodePropertiesComponent } from "./EditorNodePropertiesComponent";
 import {