split service changes

.env.example

@@ -1 +1,16 @@
+PORTAL_RUNNER_USERNAME=
+PORTAL_RUNNER_PASSWORD=
+PORTAL_RUNNER_SUBSCRIPTION=
+PORTAL_RUNNER_RESOURCE_GROUP=
+PORTAL_RUNNER_DATABASE_ACCOUNT=
+PORTAL_RUNNER_DATABASE_ACCOUNT_KEY=
+PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT=
+PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT_KEY=
+PORTAL_RUNNER_CONNECTION_STRING=
+NOTEBOOKS_TEST_RUNNER_TENANT_ID=
+NOTEBOOKS_TEST_RUNNER_CLIENT_ID=
+NOTEBOOKS_TEST_RUNNER_CLIENT_SECRET=
+CASSANDRA_CONNECTION_STRING=
+MONGO_CONNECTION_STRING=
+TABLES_CONNECTION_STRING=
 DATA_EXPLORER_ENDPOINT=https://localhost:1234/hostedExplorer.html

.eslintignore

@@ -71,6 +71,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 +83,11 @@ src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.test.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.ts
+# src/Explorer/Graph/GraphStyleComponent/GraphStyle.test.ts
+# src/Explorer/Graph/GraphStyleComponent/GraphStyleComponent.ts
+
+src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts
+src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.ts
 src/Explorer/Menus/ContextMenu.ts
 src/Explorer/MostRecentActivity/MostRecentActivity.ts
 src/Explorer/Notebook/NotebookClientV2.ts
@@ -99,10 +105,17 @@ src/Explorer/Notebook/NotebookContentClient.ts
 src/Explorer/Notebook/NotebookContentItem.ts
 src/Explorer/Notebook/NotebookUtil.ts
 src/Explorer/OpenActionsStubs.ts
+src/Explorer/Panes/AddDatabasePane.ts
+src/Explorer/Panes/AddDatabasePane.test.ts
+src/Explorer/Panes/BrowseQueriesPane.ts
+src/Explorer/Panes/RenewAdHocAccessPane.ts
+src/Explorer/Panes/SetupNotebooksPane.ts
+src/Explorer/Panes/SwitchDirectoryPane.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyNameValidator.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyValidationCommon.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyValueValidator.ts
 src/Explorer/SplashScreen/SplashScreen.test.ts
+src/Explorer/Tables/Constants.ts
 src/Explorer/Tables/DataTable/CacheBase.ts
 src/Explorer/Tables/DataTable/DataTableBindingManager.ts
 src/Explorer/Tables/DataTable/DataTableBuilder.ts
@@ -128,47 +141,116 @@ src/Explorer/Tabs/DocumentsTab.test.ts
 src/Explorer/Tabs/DocumentsTab.ts
 src/Explorer/Tabs/GraphTab.ts
 src/Explorer/Tabs/MongoDocumentsTab.ts
+# src/Explorer/Tabs/MongoQueryTab.ts
+# src/Explorer/Tabs/MongoShellTab.ts
 src/Explorer/Tabs/NotebookV2Tab.ts
 src/Explorer/Tabs/ScriptTabBase.ts
+# src/Explorer/Tabs/StoredProcedureTab.ts
 src/Explorer/Tabs/TabComponents.ts
 src/Explorer/Tabs/TabsBase.ts
 src/Explorer/Tabs/TriggerTab.ts
 src/Explorer/Tabs/UserDefinedFunctionTab.ts
 src/Explorer/Tree/AccessibleVerticalList.ts
+src/Explorer/Tree/Collection.test.ts
 src/Explorer/Tree/Collection.ts
 src/Explorer/Tree/ConflictId.ts
+src/Explorer/Tree/Database.ts
 src/Explorer/Tree/DocumentId.ts
 src/Explorer/Tree/ObjectId.ts
 src/Explorer/Tree/ResourceTokenCollection.ts
 src/Explorer/Tree/StoredProcedure.ts
 src/Explorer/Tree/TreeComponents.ts
 src/Explorer/Tree/Trigger.ts
+src/Explorer/Tree/UserDefinedFunction.ts
 src/Explorer/WaitsForTemplateViewModel.ts
 src/GitHub/GitHubClient.test.ts
 src/GitHub/GitHubClient.ts
 src/GitHub/GitHubConnector.ts
+src/GitHub/GitHubContentProvider.test.ts
+src/GitHub/GitHubContentProvider.ts
 src/GitHub/GitHubOAuthService.ts
+src/HostedExplorer.ts
 src/Index.ts
 src/Juno/JunoClient.test.ts
 src/Juno/JunoClient.ts
+src/Main.ts
+src/NotebookWorkspaceManager/NotebookWorkspaceManager.ts
+src/NotebookWorkspaceManager/NotebookWorkspaceResourceProviderMockClients.ts
+src/Platform/Emulator/DataAccessUtility.ts
+src/Platform/Emulator/ExplorerFactory.ts
+src/Platform/Emulator/Main.ts
+src/Platform/Emulator/NotificationsClient.ts
+src/Platform/Hosted/ArmResourceUtils.ts
 src/Platform/Hosted/Authorization.ts
+src/Platform/Hosted/DataAccessUtility.ts
+src/Platform/Hosted/ExplorerFactory.ts
+src/Platform/Hosted/Helpers/ConnectionStringParser.test.ts
+src/Platform/Hosted/Main.ts
+src/Platform/Hosted/Maint.test.ts
+src/Platform/Hosted/NotificationsClient.ts
+src/Platform/Portal/DataAccessUtility.ts
+src/Platform/Portal/ExplorerFactory.ts
+src/Platform/Portal/Main.ts
+src/Platform/Portal/NotificationsClient.ts
+src/PlatformType.ts
 src/ReactDevTools.ts
+src/ResourceProvider/IResourceProviderClient.test.ts
+src/ResourceProvider/IResourceProviderClient.ts
+src/ResourceProvider/ResourceProviderClient.ts
+src/ResourceProvider/ResourceProviderClientFactory.ts
 src/Shared/Constants.ts
 src/Shared/DefaultExperienceUtility.test.ts
 src/Shared/DefaultExperienceUtility.ts
+src/Shared/ExplorerSettings.ts
+src/Shared/PriceEstimateCalculator.ts
+src/Shared/StorageUtility.test.ts
+src/Shared/StorageUtility.ts
 src/Shared/appInsights.ts
 src/SparkClusterManager/ArcadiaResourceManager.ts
 src/SparkClusterManager/SparkClusterManager.ts
 src/Terminal/JupyterLabAppFactory.ts
 src/Terminal/NotebookAppContracts.d.ts
+src/Terminal/index.ts
+src/TokenProviders/PortalTokenProvider.ts
+src/TokenProviders/TokenProviderFactory.ts
+src/Utils/PricingUtils.test.ts
+src/Utils/QueryUtils.test.ts
 src/applyExplorerBindings.ts
 src/global.d.ts
 src/setupTests.ts
+src/Explorer/Controls/AccessibleElement/AccessibleElement.tsx
+src/Explorer/Controls/Accordion/AccordionComponent.tsx
+src/Explorer/Controls/AccountSwitch/AccountSwitchComponent.test.tsx
+src/Explorer/Controls/AccountSwitch/AccountSwitchComponent.tsx
+src/Explorer/Controls/AccountSwitch/AccountSwitchComponentAdapter.tsx
+src/Explorer/Controls/Arcadia/ArcadiaMenuPicker.tsx
+src/Explorer/Controls/CollapsiblePanel/CollapsiblePanel.tsx
+src/Explorer/Controls/CommandButton/CommandButtonComponent.tsx
+src/Explorer/Controls/DialogReactComponent/DialogComponent.tsx
+src/Explorer/Controls/DialogReactComponent/DialogComponentAdapter.tsx
+src/Explorer/Controls/Directory/DefaultDirectoryDropdownComponent.test.tsx
+src/Explorer/Controls/Directory/DefaultDirectoryDropdownComponent.tsx
+src/Explorer/Controls/Directory/DirectoryComponentAdapter.tsx
+src/Explorer/Controls/Directory/DirectoryListComponent.test.tsx
+src/Explorer/Controls/Directory/DirectoryListComponent.tsx
+src/Explorer/Controls/Editor/EditorReact.tsx
 src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
 src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx
 src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
+src/Explorer/Controls/NotebookViewer/NotebookMetadataComponent.tsx
+src/NotebookViewer/NotebookViewer.tsx
 src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
+src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx
+src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponentAdapter.tsx
+src/Explorer/Controls/ResizeSensorReactComponent/ResizeSensorComponent.tsx
+src/Explorer/Controls/Spark/ClusterSettingsComponent.tsx
+src/Explorer/Controls/Spark/ClusterSettingsComponentAdapter.tsx
+src/Explorer/Controls/Tabs/TabComponent.tsx
+src/Explorer/Controls/TreeComponent/TreeComponent.test.tsx
 src/Explorer/Controls/TreeComponent/TreeComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/EditorNeighborsComponent.tsx
+src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.test.tsx
+src/Explorer/Graph/GraphExplorerComponent/EditorNodePropertiesComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
 src/Explorer/Graph/GraphExplorerComponent/GraphVizComponent.tsx
@@ -176,19 +258,46 @@ 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

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
 }

less/documentDB.less

@@ -3068,78 +3068,6 @@ settings-pane {
   display: none;
   height: 0px;
 }
-.react-editor {
-  height: 400px;
-}
-.documentTabSearchBar{
-  width: 80%;
-  margin: 15px;
-}
-.documentSqlTabSearchBar{
-  width: 68%;
-  margin: 15px;
-}
-.documentTabFiltetButton{
-  margin-top: 15px;
-}
-.filterSuggestions {
-  z-index: 1;
-  position: absolute;
-  top: 133px;
-  padding: 10px;
-  margin-left: 10px;
-  background: white;
-  box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
-  transition: 0.3s;
-  width: 20%;
-  height: auto;
-}
-.sqlFilterSuggestions {
-  margin-left: 10%;
-}
-.documentTabSuggestions {
-  padding: 5px;
-  cursor: pointer;
-}
-.documentTabNoFilterView {
-  margin: 15px;
-}
-.noFilterText {
-  margin-right: 10px;
-}
-.documentTabWatermark{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  margin-top: 10%;
-  margin-right: 12%;
-}
-.documentCreateText {
-  margin-top: 10px;
-}
-.documentLoadMore {
-  color: #0078D4;
-  font-size: 12px;
-  cursor: pointer;
-  margin-top: 10px;
-}
-.leftSplitter {
-  align-items: center;
-  text-align: center;
-  flex-direction: column;
-}
-.documentIdItem{
-  cursor: pointer;
-}
-.splitterWrapper .splitter-layout .layout-pane.layout-pane-primary{
-  max-height: 60%;
-}
-.queryText {
-  padding: 20px;
-  padding-left: 10px;
-  padding-right: 0px;
-}
 .spinner {
   width: 100%;
   position: absolute;

less/forms.less

@@ -208,4 +208,4 @@
 }
 .trigger-form {
     padding: 10px 30px 10px 30px;
-}
+}

less/resourceTree.less

@@ -2,7 +2,6 @@
 
 .dataResourceTree {
   margin-left: @MediumSpace;
-  overflow: auto;
 
   .databaseHeader {
     font-size: 14px;

less/tree.less

@@ -1,270 +1,273 @@
 @import "./Common/Constants";
 
+
 .resourceTree {
-  height: 100%;
-  flex: 0 0 auto;
-  .main {
     height: 100%;
-  }
+    width: 20%;
+    flex: 0 0 auto;
+    .main {
+        height: 100%;
+    }
 }
 
 .resourceTreeScroll {
-  height: 100%;
+    height: 100%;
-  display: flex;
+    display: flex;
-  overflow-y: auto;
+    overflow-y: auto;
-  overflow-x: hidden;
+    overflow-x: hidden;
-  padding-right: 10px;
+    padding-right: 10px;
 }
 
 .userSelectNone {
-  -webkit-user-select: none;
+    -webkit-user-select: none;
-  -moz-user-select: none;
+    -moz-user-select: none;
-  -ms-user-select: none;
+    -ms-user-select: none;
 }
 
 .treeHovermargin {
-  margin-left: 16px;
+    margin-left: 16px;
 }
 
 .highlight {
-  padding: @SmallSpace 2px;
+    padding: @SmallSpace 2px;
-  outline: 0;
+    outline: 0;
 
-  &:hover {
+    &:hover {
-    .hover();
+        .hover();
-  }
+    }
 
-  &:active {
+    &:active {
-    .active();
+        .active();
-  }
+    }
 
-  &:focus {
+    &:focus {
-    .focus();
+        .focus();
-  }
+    }
 }
 
 .contextmenushowing {
-  background-color: #eee;
+    background-color: #EEE;
 }
 
 .collectionstree {
-  width: 100%;
+    width: 100%;
-  margin-top: @DefaultSpace;
+    margin-top: @DefaultSpace;
 
-  .databaseList {
-    list-style-type: none;
-    padding-left: 0px;
 
-    .collectionList {
+    .databaseList {
-      padding-left: (2 * @MediumSpace);
+        list-style-type: none;
+        padding-left: 0px;
+
+        .collectionList {
+            padding-left:(2 * @MediumSpace);
+        }
+
+        .collectionChildList {
+            padding-left: @LargeSpace;
+        }
+
+        .databaseDocuments {
+            padding-left: (5 * @MediumSpace);
+        }
     }
-
-    .collectionChildList {
-      padding-left: @LargeSpace;
-    }
-
-    .databaseDocuments {
-      padding-left: (5 * @MediumSpace);
-    }
-  }
 }
 
 .pointerCursor {
-  cursor: pointer;
+    cursor: pointer;
 }
 
 .menuEllipsis {
-  padding-right: 6px;
+    padding-right: 6px;
-  font-weight: bold;
+    font-weight: bold;
-  font-size: 18px;
+    font-size: 18px;
-  position: relative;
+    position: relative;
-  top: -5px;
+    top: -5px;
-  left: 0px;
+    left: 0px;
-  float: right;
+    float: right;
-  display: none;
+    display: none;
-  padding-left: 6px !important;
+    padding-left: 6px!important;
-  line-height: @TreeLineHeight;
+    line-height: @TreeLineHeight;
 }
 
 .databaseMenu {
-  .flex-display();
+    .flex-display();
 }
 
 .databaseMenu:hover .menuEllipsis,
 .databaseMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }
 
 .databaseCollChildTextOverflow {
-  text-overflow: ellipsis;
+    text-overflow: ellipsis;
-  white-space: nowrap;
+    white-space: nowrap;
-  overflow: hidden;
+    overflow: hidden;
-  flex: 1;
+    flex: 1;
 }
 
 .collectionMenu {
-  .flex-display();
+    .flex-display();
 }
 
 .collectionMenu:hover .menuEllipsis,
 .collectionMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }
 
 .documentsMenu:hover .menuEllipsis,
 .documentsMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }
 
 .treeChildMenu {
-  display: flex;
+    display: flex;
 }
 
 .storedProcedureMenu:hover .menuEllipsis,
 .storedProcedureMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }
 
 .childMenu {
-  overflow: hidden;
+    overflow: hidden;
-  text-overflow: ellipsis;
+    text-overflow: ellipsis;
-  white-space: nowrap;
+    white-space: nowrap;
-  padding-left: (6 * @MediumSpace);
+    padding-left: (6 * @MediumSpace);
-  width: 100%;
+    width: 100%;
 }
 
 .storedChildMenu:hover .menuEllipsis,
 .storedChildMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }
 
 .contextmenu6 {
-  top: -29px;
+    top: -29px;
 }
 
 .userDefinedMenu:hover .contextmenu6 {
-  display: block;
+    display: block;
 }
 
 .userDefinedchildMenu:hover .menuEllipsis,
 .userDefinedchildMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }
 
 .triggersMenu:hover .menuEllipsis,
 .triggersMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }
 
 .triggersChildMenu:hover .menuEllipsis,
 .triggersChildMenu:focus .menuEllipsis {
-  display: block;
+    display: block;
 }
 
 .databaseId {
-  font-size: 14px;
+    font-size: 14px;
 }
 
 .storedUdfTriggerMenu {
-  padding-left: 0px;
+    padding-left: 0px;
 }
 
 .collectionstree img {
-  width: 16px;
+    width: 16px;
-  height: 16px;
+    height: 16px;
-  vertical-align: text-top;
+    vertical-align: text-top;
 }
 
 img.collectionsTreeCollapseExpand {
-  width: 10px;
+    width: 10px;
-  height: 10px;
+    height: 10px;
-  vertical-align: middle;
+    vertical-align: middle;
-  margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 
 .collapsed::before {
-  content: "\23F5";
+    content: "\23F5";
-  margin-left: 0px;
+    margin-left: 0px;
-  font-size: 15px;
+    font-size: 15px;
 }
 
 .expanded::before {
-  content: "\23F7";
+    content: '\23F7';
-  margin-left: 0px;
+    margin-left: 0px;
-  font-size: 15px;
+    font-size: 15px;
 }
 
 .collectionMenuChildren {
-  padding-left: 42px;
+    padding-left: 42px;
 }
 
 .main-nav {
-  width: 100vh;
+    width: 100vh;
-  height: 40px;
+    height: 40px;
-  background: white;
+    background: white;
-  transform-origin: left top;
+    transform-origin: left top;
-  -webkit-transform-origin: left top;
+    -webkit-transform-origin: left top;
-  -ms-transform-origin: left top;
+    -ms-transform-origin: left top;
-  transform: rotate(-90deg) translateX(-100%);
+    transform: rotate(-90deg) translateX(-100%);
-  -webkit-transform: rotate(-90deg) translateX(-100%);
+    -webkit-transform: rotate(-90deg) translateX(-100%);
-  -ms-transform: rotate(-90deg) translateX(-100%);
+    -ms-transform: rotate(-90deg) translateX(-100%);
-  border-bottom: 1px solid #ccc;
+    border-bottom: 1px solid #CCC;
 }
 
 .main-nav-img {
-  width: 16px;
+    width: 16px;
-  height: 16px;
+    height: 16px;
-  margin: -32px 0 0 0;
+    margin: -32px 0 0 0;
-  transform: rotate(-90deg) translateX(-100%);
+    transform: rotate(-90deg) translateX(-100%);
-  -webkit-transform: rotate(-90deg) translateX(-100%);
+    -webkit-transform: rotate(-90deg) translateX(-100%);
-  -ms-transform: rotate(-90deg) translateX(-100%);
+    -ms-transform: rotate(-90deg) translateX(-100%);
 }
 
 .main-nav-img.main-nav-sub-img {
-  width: 16px;
+    width: 16px;
-  height: 16px;
+    height: 16px;
-  margin: 0px 0px 0 0;
+    margin: 0px 0px 0 0;
-  transform: rotate(180deg) translateX(0%);
+    transform: rotate(180deg) translateX(0%);
-  -webkit-transform: rotate(180deg) translateX(0%);
+    -webkit-transform: rotate(180deg) translateX(0%);
-  -ms-transform: rotate(180deg) translateX(0%);
+    -ms-transform: rotate(180deg) translateX(0%);
-  position: absolute;
+    position: absolute;
-  right: -8px;
+    right: -8px;
-  top: 16px;
+    top: 16px;
 }
 
 ul.nav {
-  margin: 0 auto;
+    margin: 0 auto;
-  margin-top: 0px;
+    margin-top: 0px;
-  margin-left: 0px;
+    margin-left: 0px;
 }
 
 .mini ul.nav li {
-  float: right;
+    float: right;
-  line-height: 25px;
+    line-height: 25px;
-  height: auto;
+    height: auto;
-  margin-top: 3px;
+    margin-top: 3px;
 }
 
 .spancolchildstyle {
-  padding: 4px;
+    padding: 4px;
 }
 
 .contextmenubutton {
-  float: right;
+    float: right;
-  display: none;
+    display: none;
 }
 
-.highlight:hover > .contextmenubutton {
+.highlight:hover>.contextmenubutton {
-  display: unset;
+    display: unset;
 }
 
-.highlight:hover > .contextmenubutton::after {
+.highlight:hover>.contextmenubutton::after {
-  content: "\2026";
+    content: "\2026";
-  font-size: 12px;
+    font-size: 12px;
 }
 
 .showEllipsis {
-  text-overflow: ellipsis;
+    text-overflow: ellipsis;
-  white-space: nowrap;
+    white-space: nowrap;
-  overflow: hidden;
+    overflow: hidden;
-}
+}

package-lock.json

@@ -5583,11 +5583,6 @@
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
       "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="
     },
-    "@types/lodash": {
-      "version": "4.14.171",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.171.tgz",
-      "integrity": "sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg=="
-    },
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -20623,9 +20618,9 @@
       }
     },
     "playwright": {
-      "version": "1.13.0",
+      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.10.0.tgz",
-      "integrity": "sha512-GA5OyEeKx1v/pRcANmYncCT67Y7Y4N5zLRU5E690dn/Id10sooR5hQZmCDYsjXlutZb/1q0R3sITALnvhEjCjg==",
+      "integrity": "sha512-b7SGBcCPq4W3pb4ImEDmNXtO0ZkJbZMuWiShsaNJd+rGfY/6fqwgllsAojmxGSgFmijYw7WxCoPiAIEDIH16Kw==",
       "dev": true,
       "requires": {
         "commander": "^6.1.0",
@@ -20640,8 +20635,7 @@
         "proxy-from-env": "^1.1.0",
         "rimraf": "^3.0.2",
         "stack-utils": "^2.0.3",
-        "ws": "^7.4.6",
+        "ws": "^7.3.1"
-        "yazl": "^2.5.1"
       },
       "dependencies": {
         "commander": {
@@ -20673,12 +20667,6 @@
           "requires": {
             "escape-string-regexp": "^2.0.0"
           }
-        },
-        "ws": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-          "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
-          "dev": true
         }
       }
     },
@@ -26169,15 +26157,6 @@
         "fd-slicer": "~1.1.0"
       }
     },
-    "yazl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
-      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "~0.2.3"
-      }
-    },
     "yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",

package.json

@@ -42,7 +42,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",
@@ -164,7 +163,7 @@
     "mini-css-extract-plugin": "0.4.3",
     "monaco-editor-webpack-plugin": "1.7.0",
     "node-fetch": "2.6.1",
-    "playwright": "1.13.0",
+    "playwright": "1.10.0",
     "prettier": "2.2.1",
     "raw-loader": "0.5.1",
     "react-dev-utils": "11.0.4",

src/Common/Constants.ts

@@ -94,7 +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";
 }
 
 export class AfecFeatures {

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/ResourceTree.tsx

@@ -2,22 +2,17 @@ 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/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/deleteDocument.ts

@@ -1,9 +1,9 @@
 import { CollectionBase } from "../../Contracts/ViewModels";
-import DocumentId from "../../Explorer/Tree/DocumentId";
-import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
 import { getEntityName } from "../DocumentUtility";
 import { handleError } from "../ErrorHandlingUtils";
+import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import DocumentId from "../../Explorer/Tree/DocumentId";
 
 export const deleteDocument = async (collection: CollectionBase, documentId: DocumentId): Promise<void> => {
   const entityName: string = getEntityName();

src/ConfigContext.ts

@@ -27,6 +27,7 @@ export interface ConfigContext {
   hostedExplorerURL: string;
   armAPIVersion?: string;
   allowedJunoOrigins: string[];
+  enableSchemaAnalyzer: boolean;
   msalRedirectURI?: string;
 }
 
@@ -62,6 +63,7 @@ let configContext: Readonly<ConfigContext> = {
     "https://tools-staging.cosmos.azure.com",
     "https://localhost",
   ],
+  enableSchemaAnalyzer: false,
 };
 
 export function resetConfigContext(): void {

src/Contracts/DataModels.ts

@@ -9,7 +9,6 @@ export interface DatabaseAccount {
 
 export interface DatabaseAccountExtendedProperties {
   documentEndpoint?: string;
-  disableLocalAuth?: boolean;
   tableEndpoint?: string;
   gremlinEndpoint?: string;
   cassandraEndpoint?: string;
@@ -88,9 +87,6 @@ export interface SubscriptionPolicies {
 }
 
 export interface Resource {
-  _partitionKeyValue?: string;
-  _partitionKey?: string;
-  _attachments?: string;
   _rid: string;
   _self: string;
   _etag: string;

src/Contracts/ViewModels.ts

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

src/Explorer/ContextMenuButtonFactory.tsx

@@ -16,7 +16,6 @@ import { userContext } from "../UserContext";
 import { getCollectionName, getDatabaseName } from "../Utils/APITypeUtils";
 import { TreeNodeMenuItem } from "./Controls/TreeComponent/TreeComponent";
 import Explorer from "./Explorer";
-import { useNotebook } from "./Notebook/useNotebook";
 import { DeleteCollectionConfirmationPane } from "./Panes/DeleteCollectionConfirmationPane/DeleteCollectionConfirmationPane";
 import { DeleteDatabaseConfirmationPanel } from "./Panes/DeleteDatabaseConfirmationPanel";
 import StoredProcedure from "./Tree/StoredProcedure";
@@ -50,10 +49,7 @@ export const createDatabaseContextMenu = (container: Explorer, databaseId: strin
       onClick: () =>
         useSidePanel
           .getState()
-          .openSidePanel(
+          .openSidePanel("Delete " + getDatabaseName(), <DeleteDatabaseConfirmationPanel explorer={container} />),
-            "Delete " + getDatabaseName(),
-            <DeleteDatabaseConfirmationPanel refreshDatabases={() => container.refreshAllDatabases()} />
-          ),
       label: `Delete ${getDatabaseName()}`,
       styleClass: "deleteDatabaseMenuItem",
     });
@@ -85,13 +81,13 @@ export const createCollectionContextMenuButton = (
       iconSrc: HostedTerminalIcon,
       onClick: () => {
         const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled) {
+        if (container.isShellEnabled()) {
           container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
         } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
         }
       },
-      label: useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell",
+      label: container.isShellEnabled() ? "Open Mongo Shell" : "New Shell",
     });
   }
 
@@ -109,7 +105,7 @@ export const createCollectionContextMenuButton = (
       iconSrc: AddUdfIcon,
       onClick: () => {
         const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection);
+        selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection, undefined);
       },
       label: "New UDF",
     });
@@ -129,10 +125,7 @@ export const createCollectionContextMenuButton = (
     onClick: () =>
       useSidePanel
         .getState()
-        .openSidePanel(
+        .openSidePanel("Delete " + getCollectionName(), <DeleteCollectionConfirmationPane explorer={container} />),
-          "Delete " + getCollectionName(),
-          <DeleteCollectionConfirmationPane refreshDatabases={() => container.refreshAllDatabases()} />
-        ),
     label: `Delete ${getCollectionName()}`,
     styleClass: "deleteCollectionMenuItem",
   });

src/Explorer/Controls/Accordion/AccordionComponent.tsx

@@ -8,9 +8,7 @@ import TriangleDownIcon from "../../../../images/Triangle-down.svg";
 import TriangleRightIcon from "../../../../images/Triangle-right.svg";
 import * as Constants from "../../../Common/Constants";
 
-export interface AccordionComponentProps {
+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/CommandButton/CommandButtonComponent.tsx

@@ -121,7 +121,8 @@ export class CommandButtonComponent extends React.Component<CommandButtonCompone
     if (!this.dropdownElt || !this.expandButtonElt) {
       return;
     }
-    $(this.dropdownElt).offset({ left: $(this.expandButtonElt).offset().left });
+
+    const dropdownElt = $(this.dropdownElt).offset({ left: $(this.expandButtonElt).offset().left });
   }
 
   private onKeyPress(event: React.KeyboardEvent): boolean {

src/Explorer/Controls/Editor/EditorReact.tsx

@@ -33,20 +33,16 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt
     this.createEditor(this.configureEditor.bind(this));
   }
 
-  public shouldComponentUpdate(): boolean {
+  public componentDidUpdate(previous: EditorReactProps) {
-    return true;
+    if (this.props.content !== previous.content) {
+      this.editor.setValue(this.props.content);
+    }
   }
 
   public componentWillUnmount(): void {
     this.selectionListener && this.selectionListener.dispose();
   }
 
-  public componentDidUpdate(prevProps: EditorReactProps): void {
-    if (this.props.content !== prevProps.content) {
-      this.editor.setValue(this.props.content);
-    }
-  }
-
   public render(): JSX.Element {
     return (
       <React.Fragment>
@@ -60,7 +56,7 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt
     this.editor = editor;
     const queryEditorModel = this.editor.getModel();
     if (!this.props.isReadOnly && this.props.onContentChanged) {
-      queryEditorModel.onDidChangeContent(() => {
+      queryEditorModel.onDidChangeContent((e: monaco.editor.IModelContentChangedEvent) => {
         const queryEditorModel = this.editor.getModel();
         this.props.onContentChanged(queryEditorModel.getValue());
       });

src/Explorer/Controls/GitHub/GitHubReposComponent.tsx

@@ -56,7 +56,7 @@ export class GitHubReposComponent extends React.Component<GitHubReposComponentPr
 
     return (
       <>
-        <div>{content}</div>
+        <div className={"paneMainContent"}>{content}</div>
         {!this.props.showAuthorizeAccess && (
           <>
             <div className={"paneFooter"} style={ContentFooterStyle}>

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

@@ -1,90 +1,154 @@
-import { shallow } from "enzyme";
-import React from "react";
 import * as DataModels from "../../../Contracts/DataModels";
-import { NotebookTerminalComponent, NotebookTerminalComponentProps } from "./NotebookTerminalComponent";
+import { NotebookTerminalComponent } from "./NotebookTerminalComponent";
 
-const testAccount: DataModels.DatabaseAccount = {
+const createTestDatabaseAccount = (): DataModels.DatabaseAccount => {
-  id: "id",
+  return {
-  kind: "kind",
+    id: "testId",
-  location: "location",
+    kind: "testKind",
-  name: "name",
+    location: "testLocation",
-  properties: {
+    name: "testName",
-    documentEndpoint: "https://testDocumentEndpoint.azure.com/",
+    properties: {
-  },
+      cassandraEndpoint: null,
-  type: "type",
+      documentEndpoint: "https://testDocumentEndpoint.azure.com/",
+      gremlinEndpoint: null,
+      tableEndpoint: null,
+    },
+    type: "testType",
+  };
 };
 
-const testMongo32Account: DataModels.DatabaseAccount = {
+const createTestMongo32DatabaseAccount = (): DataModels.DatabaseAccount => {
-  ...testAccount,
+  return {
+    id: "testId",
+    kind: "testKind",
+    location: "testLocation",
+    name: "testName",
+    properties: {
+      cassandraEndpoint: null,
+      documentEndpoint: "https://testDocumentEndpoint.azure.com/",
+      gremlinEndpoint: null,
+      tableEndpoint: null,
+    },
+    type: "testType",
+  };
 };
 
-const testMongo36Account: DataModels.DatabaseAccount = {
+const createTestMongo36DatabaseAccount = (): DataModels.DatabaseAccount => {
-  ...testAccount,
+  return {
-  properties: {
+    id: "testId",
-    mongoEndpoint: "https://testMongoEndpoint.azure.com/",
+    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 {
-  properties: {
+    id: "testId",
-    cassandraEndpoint: "https://testCassandraEndpoint.azure.com/",
+    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({
-  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongo",
+    notebookServerInfo: {
+      authToken: "testAuthToken",
+      notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongo",
+    },
+    databaseAccount: createTestMongo32DatabaseAccount(),
+  });
 };
 
-const testCassandraNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
+const createMongo36Terminal = (): NotebookTerminalComponent => {
-  authToken: "authToken",
+  return new NotebookTerminalComponent({
-  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/cassandra",
+    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(
-    expect(wrapper).toMatchSnapshot();
+      new Map<string, string>([["terminal", "true"]])
+    );
   });
 
-  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");
-  }
 
-  sendPropsToTerminalFrame(): void {
+    const terminalEndpoint: string = this.tryGetTerminalEndpoint();
-    if (!this.terminalWindow) {
+    if (terminalEndpoint) {
-      return;
+      params.set(TerminalQueryParams.TerminalEndpoint, terminalEndpoint);
     }
 
-    const props: TerminalProps = {
+    return params;
-      terminalEndpoint: this.tryGetTerminalEndpoint(),
-      notebookServerEndpoint: this.props.notebookServerInfo?.notebookServerEndpoint,
-      authToken: this.props.notebookServerInfo?.authToken,
-      subscriptionId: userContext.subscriptionId,
-      apiType: userContext.apiType,
-      authType: userContext.authType,
-      databaseAccount: userContext.databaseAccount,
-    };
-
-    postRobot.send(this.terminalWindow, "props", props, {
-      domain: window.location.origin,
-    });
   }
 
-  public tryGetTerminalEndpoint(): string | undefined {
+  public tryGetTerminalEndpoint(): string | null {
-    let terminalEndpoint: string | undefined;
+    let terminalEndpoint: string | null;
 
-    const notebookServerEndpoint = this.props.notebookServerInfo?.notebookServerEndpoint;
+    const notebookServerEndpoint: string = this.props.notebookServerInfo.notebookServerEndpoint;
     if (StringUtils.endsWith(notebookServerEndpoint, "mongo")) {
-      // mongoEndpoint is only available for Mongo 3.6 and higher, fallback to documentEndpoint otherwise
+      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/QueriesGridReactComponent/QueriesGridComponent.tsx

@@ -30,7 +30,7 @@ import * as DataModels from "../../../Contracts/DataModels";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 
-const title = "Open Saved Queries";
+const title: string = "Open Saved Queries";
 
 export interface QueriesGridComponentProps {
   queriesClient: QueriesClient;
@@ -196,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",
@@ -214,15 +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 (
+                    event: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>,
+                    menuItem: any
+                  ) => {
                     if (window.confirm("Are you sure you want to delete this query?")) {
+                      const container = window.dataExplorer;
                       const startKey: number = TelemetryProcessor.traceStart(Action.DeleteSavedQuery, {
                         dataExplorerArea: Constants.Areas.ContextualPane,
                         paneTitle: title,

src/Explorer/Controls/Settings/SettingsComponent.tsx

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

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

@@ -30,8 +30,17 @@ exports[`SettingsComponent renders 1`] = `
               "container": Explorer {
                 "_isInitializingNotebooks": false,
                 "_resetNotebookWorkspace": [Function],
+                "isAccountReady": [Function],
                 "isFixedCollectionWithSharedThroughputSupported": [Function],
+                "isNotebookEnabled": [Function],
+                "isNotebooksEnabledForAccount": [Function],
+                "isSchemaEnabled": [Function],
+                "isShellEnabled": [Function],
+                "isSynapseLinkUpdating": [Function],
                 "isTabsContentExpanded": [Function],
+                "memoryUsageInfo": [Function],
+                "notebookBasePath": [Function],
+                "notebookServerInfo": [Function],
                 "onRefreshDatabasesKeyPress": [Function],
                 "onRefreshResourcesClick": [Function],
                 "provideFeedbackEmail": [Function],
@@ -39,11 +48,21 @@ exports[`SettingsComponent renders 1`] = `
                   "container": [Circular],
                 },
                 "refreshNotebookList": [Function],
+                "resourceTokenCollection": [Function],
                 "resourceTree": ResourceTreeAdapter {
                   "container": [Circular],
                   "copyNotebook": [Function],
                   "parameters": [Function],
                 },
+                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                  "container": [Circular],
+                  "parameters": [Function],
+                },
+                "sparkClusterConnectionInfo": [Function],
+                "tabsManager": TabsManager {
+                  "activeTab": [Function],
+                  "openedTabs": [Function],
+                },
               },
               "databaseId": "test",
               "defaultTtl": [Function],
@@ -97,8 +116,17 @@ exports[`SettingsComponent renders 1`] = `
               "container": Explorer {
                 "_isInitializingNotebooks": false,
                 "_resetNotebookWorkspace": [Function],
+                "isAccountReady": [Function],
                 "isFixedCollectionWithSharedThroughputSupported": [Function],
+                "isNotebookEnabled": [Function],
+                "isNotebooksEnabledForAccount": [Function],
+                "isSchemaEnabled": [Function],
+                "isShellEnabled": [Function],
+                "isSynapseLinkUpdating": [Function],
                 "isTabsContentExpanded": [Function],
+                "memoryUsageInfo": [Function],
+                "notebookBasePath": [Function],
+                "notebookServerInfo": [Function],
                 "onRefreshDatabasesKeyPress": [Function],
                 "onRefreshResourcesClick": [Function],
                 "provideFeedbackEmail": [Function],
@@ -106,11 +134,21 @@ exports[`SettingsComponent renders 1`] = `
                   "container": [Circular],
                 },
                 "refreshNotebookList": [Function],
+                "resourceTokenCollection": [Function],
                 "resourceTree": ResourceTreeAdapter {
                   "container": [Circular],
                   "copyNotebook": [Function],
                   "parameters": [Function],
                 },
+                "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+                  "container": [Circular],
+                  "parameters": [Function],
+                },
+                "sparkClusterConnectionInfo": [Function],
+                "tabsManager": TabsManager {
+                  "activeTab": [Function],
+                  "openedTabs": [Function],
+                },
               },
               "databaseId": "test",
               "defaultTtl": [Function],

src/Explorer/Controls/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/Graph/GraphExplorerComponent/EditorNeighborsComponent.tsx

@@ -4,12 +4,12 @@
  */
 
 import * as React from "react";
-import AddPropertyIcon from "../../../../images/Add-property.svg";
+import { NeighborVertexBasicInfo, EditedEdges, GraphNewEdgeData, PossibleVertex } from "./GraphExplorer";
-import DeleteIcon from "../../../../images/delete.svg";
-import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
-import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
-import { EditedEdges, GraphNewEdgeData, NeighborVertexBasicInfo, PossibleVertex } from "./GraphExplorer";
 import * as GraphUtil from "./GraphUtil";
+import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
+import DeleteIcon from "../../../../images/delete.svg";
+import AddPropertyIcon from "../../../../images/Add-property.svg";
+import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
 
 export interface EditorNeighborsComponentProps {
   isSource: boolean;
@@ -83,11 +83,11 @@ export class EditorNeighborsComponent extends React.Component<EditorNeighborsCom
   }
 
   private removeCurrentNeighborEdge(index: number): void {
-    const sources = this.props.editedNeighbors.currentNeighbors;
+    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

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

src/Explorer/Graph/GraphExplorerComponent/QueryContainerComponent.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
-import CloseIcon from "../../../../images/close-black.svg";
 import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
+import CloseIcon from "../../../../images/close-black.svg";
 
 export interface QueryContainerComponentProps {
   initialQuery: string;
@@ -82,7 +82,7 @@ export class QueryContainerComponent extends React.Component<
         <button
           type="button"
           className="filterbtnstyle queryButton"
-          onClick={() => this.props.onExecuteClick(this.state.query)}
+          onClick={(e) => this.props.onExecuteClick(this.state.query)}
           disabled={this.props.isLoading || !QueryContainerComponent.isQueryValid(this.state.query)}
         >
           Execute Gremlin Query

src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNeighborsComponent.tsx

@@ -4,9 +4,9 @@
  */
 
 import * as React from "react";
-import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
 import { GraphHighlightedNodeData, NeighborVertexBasicInfo } from "./GraphExplorer";
 import * as GraphUtil from "./GraphUtil";
+import { AccessibleElement } from "../../Controls/AccessibleElement/AccessibleElement";
 
 export interface ReadOnlyNeighborsComponentProps {
   node: GraphHighlightedNodeData;
@@ -48,7 +48,7 @@ export class ReadOnlyNeighborsComponent extends React.Component<ReadOnlyNeighbor
                     className="clickableLink"
                     as="a"
                     aria-label={_neighbor.name}
-                    onActivated={() => this.props.selectNode(_neighbor.id)}
+                    onActivated={(e) => this.props.selectNode(_neighbor.id)}
                     title={GraphUtil.getNeighborTitle(_neighbor)}
                   >
                     {_neighbor.name}

src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx

@@ -4,8 +4,8 @@
  */
 
 import * as React from "react";
-import * as ViewModels from "../../../Contracts/ViewModels";
 import { GraphHighlightedNodeData } from "./GraphExplorer";
+import * as ViewModels from "../../../Contracts/ViewModels";
 
 export interface ReadOnlyNodePropertiesComponentProps {
   node: GraphHighlightedNodeData;

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

@@ -37,7 +37,7 @@ exports[`<EditorNodePropertiesComponent /> renders component 1`] = `
       </td>
       <td
         className="valueCol"
-        title="efgh, 1234, true, false, undefined"
+        title="efgh, 1234, true, false, undefined, null"
       >
         <div
           className="propertyValue"
@@ -69,6 +69,12 @@ exports[`<EditorNodePropertiesComponent /> renders component 1`] = `
         >
           undefined
         </div>
+        <div
+          className="propertyValue isNull"
+          key="null"
+        >
+          null
+        </div>
       </td>
     </tr>
     <tr
@@ -172,6 +178,12 @@ exports[`<EditorNodePropertiesComponent /> renders component 1`] = `
         >
           undefined
         </div>
+        <div
+          className="propertyValue isNull"
+          key="null"
+        >
+          null
+        </div>
       </td>
       <td />
       <td

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -8,7 +8,6 @@ import * as React from "react";
 import create, { UseStore } from "zustand";
 import { StyleConstants } from "../../../Common/Constants";
 import * as ViewModels from "../../../Contracts/ViewModels";
-import { useTabs } from "../../../hooks/useTabs";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
 import { useSelectedNode } from "../../useSelectedNode";
@@ -54,8 +53,8 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
   const uiFabricControlButtons = CommandBarUtil.convertButton(controlButtons, backgroundColor);
   uiFabricControlButtons.forEach((btn: ICommandBarItemProps) => (btn.iconOnly = true));
 
-  if (useTabs.getState().activeTab?.tabKind === ViewModels.CollectionTabKind.NotebookV2) {
+  if (container.tabsManager.activeTab()?.tabKind === ViewModels.CollectionTabKind.NotebookV2) {
-    uiFabricControlButtons.unshift(CommandBarUtil.createMemoryTracker("memoryTracker"));
+    uiFabricControlButtons.unshift(CommandBarUtil.createMemoryTracker("memoryTracker", container.memoryUsageInfo));
   }
 
   return (

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts

@@ -6,8 +6,6 @@ import { GitHubOAuthService } from "../../../GitHub/GitHubOAuthService";
 import { updateUserContext } from "../../../UserContext";
 import Explorer from "../../Explorer";
 import NotebookManager from "../../Notebook/NotebookManager";
-import { useNotebook } from "../../Notebook/useNotebook";
-import { useDatabases } from "../../useDatabases";
 import { useSelectedNode } from "../../useSelectedNode";
 import * as CommandBarComponentButtonFactory from "./CommandBarComponentButtonFactory";
 
@@ -29,6 +27,9 @@ describe("CommandBarComponentButtonFactory tests", () => {
           },
         } as DatabaseAccount,
       });
+      mockExplorer.isSynapseLinkUpdating = ko.observable(false);
+      mockExplorer.isNotebookEnabled = ko.observable(false);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(false);
     });
 
     it("Account is not serverless - button should be visible", () => {
@@ -69,19 +70,18 @@ describe("CommandBarComponentButtonFactory tests", () => {
           },
         } as DatabaseAccount,
       });
+      mockExplorer.isSynapseLinkUpdating = ko.observable(false);
     });
 
     afterEach(() => {
       updateUserContext({
         portalEnv: "prod",
       });
-      useNotebook.getState().setIsNotebookEnabled(false);
-      useNotebook.getState().setIsNotebooksEnabledForAccount(false);
     });
 
     it("Notebooks is already enabled - button should be hidden", () => {
-      useNotebook.getState().setIsNotebookEnabled(true);
+      mockExplorer.isNotebookEnabled = ko.observable(true);
-      useNotebook.getState().setIsNotebooksEnabledForAccount(true);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(true);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
@@ -89,6 +89,8 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Account is running on one of the national clouds - button should be hidden", () => {
+      mockExplorer.isNotebookEnabled = ko.observable(false);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(false);
       updateUserContext({
         portalEnv: "mooncake",
       });
@@ -99,7 +101,8 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is not enabled but is available - button should be shown and enabled", () => {
-      useNotebook.getState().setIsNotebooksEnabledForAccount(true);
+      mockExplorer.isNotebookEnabled = ko.observable(false);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(true);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
@@ -109,6 +112,9 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is not enabled and is unavailable - button should be shown and disabled", () => {
+      mockExplorer.isNotebookEnabled = ko.observable(false);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(false);
+
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
       expect(enableNotebookBtn).toBeDefined();
@@ -132,25 +138,24 @@ describe("CommandBarComponentButtonFactory tests", () => {
           },
         } as DatabaseAccount,
       });
+      mockExplorer.isSynapseLinkUpdating = ko.observable(false);
+      mockExplorer.isShellEnabled = ko.observable(true);
     });
 
     afterAll(() => {
       updateUserContext({
         apiType: "SQL",
       });
-      useNotebook.getState().setIsShellEnabled(false);
     });
 
     beforeEach(() => {
       updateUserContext({
         apiType: "Mongo",
       });
-      useNotebook.getState().setIsShellEnabled(true);
+      mockExplorer.isNotebookEnabled = ko.observable(false);
-    });
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(false);
 
-    afterEach(() => {
+      mockExplorer.isShellEnabled = ko.observable(true);
-      useNotebook.getState().setIsNotebookEnabled(false);
-      useNotebook.getState().setIsNotebooksEnabledForAccount(false);
     });
 
     it("Mongo Api not available - button should be hidden", () => {
@@ -179,7 +184,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is not enabled and is available - button should be hidden", () => {
-      useNotebook.getState().setIsNotebooksEnabledForAccount(true);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(true);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
@@ -187,7 +192,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is enabled and is unavailable - button should be shown and enabled", () => {
-      useNotebook.getState().setIsNotebookEnabled(true);
+      mockExplorer.isNotebookEnabled = ko.observable(true);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
@@ -197,8 +202,8 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is enabled and is available - button should be shown and enabled", () => {
-      useNotebook.getState().setIsNotebookEnabled(true);
+      mockExplorer.isNotebookEnabled = ko.observable(true);
-      useNotebook.getState().setIsNotebooksEnabledForAccount(true);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(true);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
@@ -208,9 +213,9 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is enabled and is available, terminal is unavailable due to ipRules - button should be hidden", () => {
-      useNotebook.getState().setIsNotebookEnabled(true);
+      mockExplorer.isNotebookEnabled = ko.observable(true);
-      useNotebook.getState().setIsNotebooksEnabledForAccount(true);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(true);
-      useNotebook.getState().setIsShellEnabled(false);
+      mockExplorer.isShellEnabled = ko.observable(false);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
@@ -231,6 +236,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
           },
         } as DatabaseAccount,
       });
+      mockExplorer.isSynapseLinkUpdating = ko.observable(false);
     });
 
     beforeEach(() => {
@@ -241,11 +247,8 @@ describe("CommandBarComponentButtonFactory tests", () => {
           },
         } as DatabaseAccount,
       });
-    });
+      mockExplorer.isNotebookEnabled = ko.observable(false);
-
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(false);
-    afterEach(() => {
-      useNotebook.getState().setIsNotebookEnabled(false);
-      useNotebook.getState().setIsNotebooksEnabledForAccount(false);
     });
 
     it("Cassandra Api not available - button should be hidden", () => {
@@ -256,6 +259,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
           },
         } as DatabaseAccount,
       });
+      console.log(mockExplorer);
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
       expect(openCassandraShellBtn).toBeUndefined();
@@ -278,7 +282,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is not enabled and is available - button should be shown and enabled", () => {
-      useNotebook.getState().setIsNotebooksEnabledForAccount(true);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(true);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
@@ -286,7 +290,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is enabled and is unavailable - button should be shown and enabled", () => {
-      useNotebook.getState().setIsNotebookEnabled(true);
+      mockExplorer.isNotebookEnabled = ko.observable(true);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
@@ -296,8 +300,8 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is enabled and is available - button should be shown and enabled", () => {
-      useNotebook.getState().setIsNotebookEnabled(true);
+      mockExplorer.isNotebookEnabled = ko.observable(true);
-      useNotebook.getState().setIsNotebooksEnabledForAccount(true);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(true);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
@@ -322,17 +326,23 @@ describe("CommandBarComponentButtonFactory tests", () => {
         } as DatabaseAccount,
       });
 
+      mockExplorer.isSynapseLinkUpdating = ko.observable(false);
+      mockExplorer.isNotebooksEnabledForAccount = ko.observable(false);
+
       mockExplorer.notebookManager = new NotebookManager();
       mockExplorer.notebookManager.gitHubOAuthService = new GitHubOAuthService(undefined);
     });
 
+    beforeEach(() => {
+      mockExplorer.isNotebookEnabled = ko.observable(false);
+    });
+
     afterEach(() => {
       jest.resetAllMocks();
-      useNotebook.getState().setIsNotebookEnabled(false);
     });
 
     it("Notebooks is enabled and GitHubOAuthService is not logged in - connect to github button should be visible", () => {
-      useNotebook.getState().setIsNotebookEnabled(true);
+      mockExplorer.isNotebookEnabled = ko.observable(true);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const connectToGitHubBtn = buttons.find((button) => button.commandButtonLabel === connectToGitHubBtnLabel);
@@ -340,7 +350,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is enabled and GitHubOAuthService is logged in - manage github settings button should be visible", () => {
-      useNotebook.getState().setIsNotebookEnabled(true);
+      mockExplorer.isNotebookEnabled = ko.observable(true);
       mockExplorer.notebookManager.gitHubOAuthService.isLoggedIn = jest.fn().mockReturnValue(true);
 
       const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
@@ -366,11 +376,10 @@ describe("CommandBarComponentButtonFactory tests", () => {
   describe("Resource token", () => {
     const mockCollection = { id: ko.observable("test") } as CollectionBase;
     useSelectedNode.getState().setSelectedNode(mockCollection);
-    useDatabases.setState({ resourceTokenCollection: mockCollection });
     const selectedNodeState = useSelectedNode.getState();
-
     beforeAll(() => {
       mockExplorer = {} as Explorer;
+      mockExplorer.resourceTokenCollection = ko.observable(mockCollection);
 
       updateUserContext({
         authType: AuthType.ResourceToken,

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -22,22 +22,15 @@ import * as Constants from "../../../Common/Constants";
 import { configContext, Platform } from "../../../ConfigContext";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { useSidePanel } from "../../../hooks/useSidePanel";
-import { JunoClient } from "../../../Juno/JunoClient";
 import { userContext } from "../../../UserContext";
 import { getCollectionName, getDatabaseName } from "../../../Utils/APITypeUtils";
 import { isServerlessAccount } from "../../../Utils/CapabilityUtils";
 import { isRunningOnNationalCloud } from "../../../Utils/CloudUtils";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
-import { useNotebook } from "../../Notebook/useNotebook";
 import { OpenFullScreen } from "../../OpenFullScreen";
-import { AddDatabasePanel } from "../../Panes/AddDatabasePanel/AddDatabasePanel";
-import { BrowseQueriesPane } from "../../Panes/BrowseQueriesPane/BrowseQueriesPane";
-import { GitHubReposPanel } from "../../Panes/GitHubReposPanel/GitHubReposPanel";
 import { LoadQueryPane } from "../../Panes/LoadQueryPane/LoadQueryPane";
 import { SettingsPane } from "../../Panes/SettingsPane/SettingsPane";
-import { SetupNoteBooksPanel } from "../../Panes/SetupNotebooksPanel/SetupNotebooksPanel";
-import { useDatabases } from "../../useDatabases";
 import { SelectedNodeState } from "../../useSelectedNode";
 
 let counter = 0;
@@ -69,7 +62,7 @@ export function createStaticCommandBarButtons(
 
   buttons.push(createDivider());
 
-  if (useNotebook.getState().isNotebookEnabled) {
+  if (container.isNotebookEnabled()) {
     const newNotebookButton = createNewNotebookButton(container);
     newNotebookButton.children = [createNewNotebookButton(container), createuploadNotebookButton(container)];
     buttons.push(newNotebookButton);
@@ -81,18 +74,17 @@ export function createStaticCommandBarButtons(
     buttons.push(createOpenTerminalButton(container));
 
     buttons.push(createNotebookWorkspaceResetButton(container));
-    if (
+
-      (userContext.apiType === "Mongo" &&
+    buttons.push(createDivider());
-        useNotebook.getState().isShellEnabled &&
+    buttons.push(createOpenPostgreSQLTerminalButton(container));
-        selectedNodeState.isDatabaseNodeOrNoneSelected()) ||
+
-      userContext.apiType === "Cassandra"
+    if (userContext.apiType === "Mongo" &&
-    ) {
+        container.isShellEnabled() &&
-      buttons.push(createDivider());
+        selectedNodeState.isDatabaseNodeOrNoneSelected()){
-      if (userContext.apiType === "Cassandra") {
-        buttons.push(createOpenCassandraTerminalButton(container));
-      } else {
         buttons.push(createOpenMongoTerminalButton(container));
-      }
+    }
+    if (userContext.apiType === "Cassandra") {
+      buttons.push(createOpenCassandraTerminalButton(container));
     }
   } else {
     if (!isRunningOnNationalCloud()) {
@@ -145,13 +137,13 @@ export function createContextCommandBarButtons(
   const buttons: CommandButtonComponentProps[] = [];
 
   if (!selectedNodeState.isDatabaseNodeOrNoneSelected() && userContext.apiType === "Mongo") {
-    const label = useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell";
+    const label = container.isShellEnabled() ? "Open Mongo Shell" : "New Shell";
     const newMongoShellBtn: CommandButtonComponentProps = {
       iconSrc: HostedTerminalIcon,
       iconAlt: label,
       onCommandClick: () => {
         const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled) {
+        if (container.isShellEnabled()) {
           container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
         } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
@@ -276,7 +268,7 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
     onCommandClick: () => container.openEnableSynapseLinkDialog(),
     commandButtonLabel: label,
     hasPopup: false,
-    disabled: useNotebook.getState().isSynapseLinkUpdating,
+    disabled: container.isSynapseLinkUpdating(),
     ariaLabel: label,
   };
 }
@@ -286,8 +278,9 @@ function createNewDatabase(container: Explorer): CommandButtonComponentProps {
   return {
     iconSrc: AddDatabaseIcon,
     iconAlt: label,
-    onCommandClick: () =>
+    onCommandClick: () => {
-      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />),
+      container.openAddDatabasePane();
+    },
     commandButtonLabel: label,
     ariaLabel: label,
     hasPopup: true,
@@ -419,8 +412,7 @@ function createOpenQueryButton(container: Explorer): CommandButtonComponentProps
   return {
     iconSrc: BrowseQueriesIcon,
     iconAlt: label,
-    onCommandClick: () =>
+    onCommandClick: () => container.openBrowseQueriesPanel(),
-      useSidePanel.getState().openSidePanel("Open Saved Queries", <BrowseQueriesPane explorer={container} />),
     commandButtonLabel: label,
     ariaLabel: label,
     hasPopup: true,
@@ -453,18 +445,12 @@ function createEnableNotebooksButton(container: Explorer): CommandButtonComponen
   return {
     iconSrc: EnableNotebooksIcon,
     iconAlt: label,
-    onCommandClick: () =>
+    onCommandClick: () => container.openSetupNotebooksPanel(label, description),
-      useSidePanel
-        .getState()
-        .openSidePanel(
-          label,
-          <SetupNoteBooksPanel explorer={container} panelTitle={label} panelDescription={description} />
-        ),
     commandButtonLabel: label,
     hasPopup: false,
-    disabled: !useNotebook.getState().isNotebooksEnabledForAccount,
+    disabled: !container.isNotebooksEnabledForAccount(),
     ariaLabel: label,
-    tooltipText: useNotebook.getState().isNotebooksEnabledForAccount ? "" : tooltip,
+    tooltipText: container.isNotebooksEnabledForAccount() ? "" : tooltip,
   };
 }
 
@@ -481,6 +467,19 @@ function createOpenTerminalButton(container: Explorer): CommandButtonComponentPr
   };
 }
 
+function createOpenPostgreSQLTerminalButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open PostgreSQL Shell";
+  return {
+    iconSrc: HostedTerminalIcon,
+    iconAlt: label,
+    onCommandClick: () => container.openNotebookTerminal(ViewModels.TerminalKind.PostgreSQL),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: false,
+    ariaLabel: label,
+  };
+}
+
 function createOpenMongoTerminalButton(container: Explorer): CommandButtonComponentProps {
   const label = "Open Mongo Shell";
   const tooltip =
@@ -488,21 +487,15 @@ function createOpenMongoTerminalButton(container: Explorer): CommandButtonCompon
   const title = "Set up workspace";
   const description =
     "Looks like you have not created a workspace for this account. To proceed and start using features including mongo shell and notebook, we will need to create a default workspace in this account.";
-  const disableButton =
+  const disableButton = !container.isNotebooksEnabledForAccount() && !container.isNotebookEnabled();
-    !useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled;
   return {
     iconSrc: HostedTerminalIcon,
     iconAlt: label,
     onCommandClick: () => {
-      if (useNotebook.getState().isNotebookEnabled) {
+      if (container.isNotebookEnabled()) {
         container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
       } else {
-        useSidePanel
+        container.openSetupNotebooksPanel(title, description);
-          .getState()
-          .openSidePanel(
-            title,
-            <SetupNoteBooksPanel explorer={container} panelTitle={title} panelDescription={description} />
-          );
       }
     },
     commandButtonLabel: label,
@@ -520,21 +513,15 @@ function createOpenCassandraTerminalButton(container: Explorer): CommandButtonCo
   const title = "Set up workspace";
   const description =
     "Looks like you have not created a workspace for this account. To proceed and start using features including cassandra shell and notebook, we will need to create a default workspace in this account.";
-  const disableButton =
+  const disableButton = !container.isNotebooksEnabledForAccount() && !container.isNotebookEnabled();
-    !useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled;
   return {
     iconSrc: HostedTerminalIcon,
     iconAlt: label,
     onCommandClick: () => {
-      if (useNotebook.getState().isNotebookEnabled) {
+      if (container.isNotebookEnabled()) {
         container.openNotebookTerminal(ViewModels.TerminalKind.Cassandra);
       } else {
-        useSidePanel
+        container.openSetupNotebooksPanel(title, description);
-          .getState()
-          .openSidePanel(
-            title,
-            <SetupNoteBooksPanel explorer={container} panelTitle={title} panelDescription={description} />
-          );
       }
     },
     commandButtonLabel: label,
@@ -561,21 +548,10 @@ function createNotebookWorkspaceResetButton(container: Explorer): CommandButtonC
 function createManageGitHubAccountButton(container: Explorer): CommandButtonComponentProps {
   const connectedToGitHub: boolean = container.notebookManager?.gitHubOAuthService.isLoggedIn();
   const label = connectedToGitHub ? "Manage GitHub settings" : "Connect to GitHub";
-  const junoClient = new JunoClient();
   return {
     iconSrc: GitHubIcon,
     iconAlt: label,
-    onCommandClick: () =>
+    onCommandClick: () => container.openGitHubReposPanel(label),
-      useSidePanel
-        .getState()
-        .openSidePanel(
-          label,
-          <GitHubReposPanel
-            explorer={container}
-            gitHubClientProp={container.notebookManager.gitHubClient}
-            junoClientProp={junoClient}
-          />
-        ),
     commandButtonLabel: label,
     hasPopup: false,
     disabled: false,
@@ -590,12 +566,12 @@ function createStaticCommandBarButtonsForResourceToken(
   const newSqlQueryBtn = createNewSQLQueryButton(selectedNodeState);
   const openQueryBtn = createOpenQueryButton(container);
 
-  const resourceTokenCollection: ViewModels.CollectionBase = useDatabases.getState().resourceTokenCollection;
   const isResourceTokenCollectionNodeSelected: boolean =
-    resourceTokenCollection?.id() === selectedNodeState.selectedNode?.id();
+    container.resourceTokenCollection() &&
+    container.resourceTokenCollection().id() === selectedNodeState.selectedNode?.id();
   newSqlQueryBtn.disabled = !isResourceTokenCollectionNodeSelected;
   newSqlQueryBtn.onCommandClick = () => {
-    const resourceTokenCollection: ViewModels.CollectionBase = useDatabases.getState().resourceTokenCollection;
+    const resourceTokenCollection: ViewModels.CollectionBase = container.resourceTokenCollection();
     resourceTokenCollection && resourceTokenCollection.onNewQueryClick(resourceTokenCollection, undefined);
   };
 

src/Explorer/Menus/CommandBar/CommandBarUtil.tsx

@@ -6,14 +6,16 @@ import {
   IDropdownOption,
   IDropdownStyles,
 } from "@fluentui/react";
+import { Observable } from "knockout";
 import * as React from "react";
 import _ from "underscore";
 import ChevronDownIcon from "../../../../images/Chevron_down.svg";
 import { StyleConstants } from "../../../Common/Constants";
+import { MemoryUsageInfo } from "../../../Contracts/DataModels";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
-import { MemoryTracker } from "./MemoryTrackerComponent";
+import { MemoryTrackerComponent } from "./MemoryTrackerComponent";
 
 /**
  * Convert our NavbarButtonConfig to UI Fabric buttons
@@ -183,9 +185,12 @@ export const createDivider = (key: string): ICommandBarItemProps => {
   };
 };
 
-export const createMemoryTracker = (key: string): ICommandBarItemProps => {
+export const createMemoryTracker = (
+  key: string,
+  memoryUsageInfo: Observable<MemoryUsageInfo>
+): ICommandBarItemProps => {
   return {
     key,
-    onRender: () => <MemoryTracker />,
+    onRender: () => <MemoryTrackerComponent memoryUsageInfo={memoryUsageInfo} />,
   };
 };

src/Explorer/Menus/CommandBar/MemoryTrackerComponent.tsx

@@ -1,29 +1,48 @@
 import { ProgressIndicator, Spinner, SpinnerSize, Stack } from "@fluentui/react";
+import { Observable, Subscription } from "knockout";
 import * as React from "react";
-import { useNotebook } from "../../Notebook/useNotebook";
+import { MemoryUsageInfo } from "../../../Contracts/DataModels";
+
+interface MemoryTrackerProps {
+  memoryUsageInfo: Observable<MemoryUsageInfo>;
+}
+
+export class MemoryTrackerComponent extends React.Component<MemoryTrackerProps> {
+  private memoryUsageInfoSubscription: Subscription;
+
+  public componentDidMount(): void {
+    this.memoryUsageInfoSubscription = this.props.memoryUsageInfo.subscribe(() => {
+      this.forceUpdate();
+    });
+  }
+
+  public componentWillUnmount(): void {
+    this.memoryUsageInfoSubscription && this.memoryUsageInfoSubscription.dispose();
+  }
+
+  public render(): JSX.Element {
+    const memoryUsageInfo: MemoryUsageInfo = this.props.memoryUsageInfo();
+    if (!memoryUsageInfo) {
+      return (
+        <Stack className="memoryTrackerContainer" horizontal>
+          <span>Memory</span>
+          <Spinner size={SpinnerSize.medium} />
+        </Stack>
+      );
+    }
+
+    const totalGB = memoryUsageInfo.totalKB / 1048576;
+    const usedGB = totalGB - memoryUsageInfo.freeKB / 1048576;
 
-export const MemoryTracker: React.FC = (): JSX.Element => {
-  const memoryUsageInfo = useNotebook((state) => state.memoryUsageInfo);
-  if (!memoryUsageInfo) {
     return (
       <Stack className="memoryTrackerContainer" horizontal>
         <span>Memory</span>
-        <Spinner size={SpinnerSize.medium} />
+        <ProgressIndicator
+          className={usedGB / totalGB > 0.8 ? "lowMemory" : ""}
+          description={usedGB.toFixed(1) + " of " + totalGB.toFixed(1) + " GB"}
+          percentComplete={usedGB / totalGB}
+        />
       </Stack>
     );
   }
-
+}
-  const totalGB = memoryUsageInfo.totalKB / 1048576;
-  const usedGB = totalGB - memoryUsageInfo.freeKB / 1048576;
-
-  return (
-    <Stack className="memoryTrackerContainer" horizontal>
-      <span>Memory</span>
-      <ProgressIndicator
-        className={usedGB / totalGB > 0.8 ? "lowMemory" : ""}
-        description={usedGB.toFixed(1) + " of " + totalGB.toFixed(1) + " GB"}
-        percentComplete={usedGB / totalGB}
-      />
-    </Stack>
-  );
-};

src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx

@@ -1,5 +1,5 @@
-import { AppState, ContentRef, selectors } from "@nteract/core";
 import * as React from "react";
+import { AppState, ContentRef, selectors } from "@nteract/core";
 import { connect } from "react-redux";
 import * as NteractUtil from "../NTeractUtil";
 

src/Explorer/Notebook/NotebookComponent/contents/file/index.tsx

@@ -2,6 +2,7 @@ import { AppState, ContentRef, selectors } from "@nteract/core";
 import * as React from "react";
 import { connect } from "react-redux";
 import styled from "styled-components";
+
 import NotebookRenderer from "../../../NotebookRenderer/NotebookRenderer";
 import * as TextFile from "./text-file";
 
@@ -31,14 +32,14 @@ interface FileProps {
 
 export class File extends React.PureComponent<FileProps> {
   getChoice = () => {
-    let choice;
+    let choice = null;
 
     // notebooks don't report a mimetype so we'll use the content.type
     if (this.props.type === "notebook") {
       choice = <NotebookRenderer contentRef={this.props.contentRef} />;
     } else if (this.props.type === "dummy") {
-      choice = undefined;
+      choice = null;
-    } else if (this.props.mimetype === undefined || !TextFile.handles(this.props.mimetype)) {
+    } else if (this.props.mimetype == null || !TextFile.handles(this.props.mimetype)) {
       // This should not happen as we intercept mimetype upstream, but just in case
       choice = (
         <PaddedContainer>

src/Explorer/Notebook/NotebookComponent/contents/file/text-file.tsx

@@ -1,10 +1,10 @@
+import * as StringUtils from "../../../../../Utils/StringUtils";
 import { actions, AppState, ContentRef, selectors } from "@nteract/core";
 import { IMonacoProps as MonacoEditorProps } from "@nteract/monaco-editor";
 import * as React from "react";
 import { connect } from "react-redux";
 import { Dispatch } from "redux";
 import styled from "styled-components";
-import * as StringUtils from "../../../../../Utils/StringUtils";
 
 const EditorContainer = styled.div`
   position: absolute;
@@ -37,7 +37,7 @@ interface TextFileState {
 class EditorPlaceholder extends React.PureComponent<MonacoEditorProps> {
   render(): JSX.Element {
     // TODO: Show a little blocky placeholder
-    return undefined;
+    return null;
   }
 }
 
@@ -98,7 +98,7 @@ function makeMapStateToTextFileProps(
 
     return {
       contentRef,
-      mimetype: content.mimetype !== undefined ? content.mimetype : "text/plain",
+      mimetype: content.mimetype != null ? content.mimetype : "text/plain",
       text,
     };
   };

src/Explorer/Notebook/NotebookComponent/epics.ts

@@ -9,7 +9,7 @@ import {
   KernelRef,
   RemoteKernelProps,
   selectors,
-  ServerConfig as JupyterServerConfig,
+  ServerConfig as JupyterServerConfig
 } from "@nteract/core";
 import { Channels, childOf, createMessage, JupyterMessage, message, ofMessageType } from "@nteract/messaging";
 import { RecordOf } from "immutable";
@@ -29,12 +29,11 @@ import {
   switchMap,
   take,
   tap,
-  timeout,
+  timeout
 } from "rxjs/operators";
 import { webSocket } from "rxjs/webSocket";
 import * as Constants from "../../../Common/Constants";
 import { Areas } from "../../../Common/Constants";
-import { useTabs } from "../../../hooks/useTabs";
 import { Action as TelemetryAction, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import { logConsoleError, logConsoleInfo } from "../../../Utils/NotificationConsoleUtils";
@@ -108,7 +107,7 @@ const formWebSocketURL = (serverConfig: NotebookServiceConfig, kernelId: string,
   const q = params.toString();
   const suffix = q !== "" ? `?${q}` : "";
 
-  const url = (serverConfig.endpoint || "") + `api/kernels/${kernelId}/channels${suffix}`;
+  const url = (serverConfig.endpoint.slice(0, -1) || "") + `api/kernels/${kernelId}/channels${suffix}`;
 
   return url.replace(/^http(s)?/, "ws$1");
 };
@@ -777,11 +776,9 @@ const closeUnsupportedMimetypesEpic = (
       if (explorer && !TextFile.handles(mimetype)) {
         const filepath = action.payload.filepath;
         // Close tab and show error message
-        useTabs
+        explorer.tabsManager.closeTabsByComparator(
-          .getState()
+          (tab: any) => (tab as any).notebookPath && FileSystemUtil.isPathEqual((tab as any).notebookPath(), filepath)
-          .closeTabsByComparator(
+        );
-            (tab: any) => (tab as any).notebookPath && FileSystemUtil.isPathEqual((tab as any).notebookPath(), filepath)
-          );
         const msg = `${filepath} cannot be rendered. Please download the file, in order to view it outside of Data Explorer.`;
         explorer.showOkModalDialog("File cannot be rendered", msg);
         logConsoleError(msg);
@@ -807,11 +804,9 @@ const closeContentFailedToFetchEpic = (
       if (explorer) {
         const filepath = action.payload.filepath;
         // Close tab and show error message
-        useTabs
+        explorer.tabsManager.closeTabsByComparator(
-          .getState()
+          (tab: any) => (tab as any).notebookPath && FileSystemUtil.isPathEqual((tab as any).notebookPath(), filepath)
-          .closeTabsByComparator(
+        );
-            (tab: any) => (tab as any).notebookPath && FileSystemUtil.isPathEqual((tab as any).notebookPath(), filepath)
-          );
         const msg = `Failed to load file: ${filepath}.`;
         explorer.showOkModalDialog("Failure to load", msg);
         logConsoleError(msg);

src/Explorer/Notebook/NotebookContainerClient.ts

@@ -6,28 +6,26 @@ import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 import * as Logger from "../../Common/Logger";
 import * as DataModels from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
-import { createOrUpdate, destroy } from "../../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
-import { useNotebook } from "./useNotebook";
 
 export class NotebookContainerClient {
   private clearReconnectionAttemptMessage? = () => {};
   private isResettingWorkspace: boolean;
 
-  constructor(private onConnectionLost: () => void) {
+  constructor(
-    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+    private notebookServerInfo: ko.Observable<DataModels.NotebookWorkspaceConnectionInfo>,
-    if (notebookServerInfo?.notebookServerEndpoint) {
+    private onConnectionLost: () => void,
+    private onMemoryUsageInfoUpdate: (update: DataModels.MemoryUsageInfo) => void
+  ) {
+    if (notebookServerInfo() && notebookServerInfo().notebookServerEndpoint) {
       this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
     } else {
-      const unsub = useNotebook.subscribe(
+      const subscription = notebookServerInfo.subscribe((newServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => {
-        (newServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => {
+        if (newServerInfo && newServerInfo.notebookServerEndpoint) {
-          if (newServerInfo?.notebookServerEndpoint) {
+          this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
-            this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
+        }
-          }
+        subscription.dispose();
-          unsub();
+      });
-        },
-        (state) => state.notebookServerInfo
-      );
     }
   }
 
@@ -37,14 +35,13 @@ export class NotebookContainerClient {
   private scheduleHeartbeat(delayMs: number): void {
     setTimeout(() => {
       this.getMemoryUsage()
-        .then((memoryUsageInfo) => useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo))
+        .then((memoryUsageInfo) => this.onMemoryUsageInfoUpdate(memoryUsageInfo))
         .finally(() => this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs));
     }, delayMs);
   }
 
   private async getMemoryUsage(): Promise<DataModels.MemoryUsageInfo> {
-    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+    if (!this.notebookServerInfo() || !this.notebookServerInfo().notebookServerEndpoint) {
-    if (!notebookServerInfo || !notebookServerInfo.notebookServerEndpoint) {
       const error = "No server endpoint detected";
       Logger.logError(error, "NotebookContainerClient/getMemoryUsage");
       return Promise.reject(error);
@@ -56,7 +53,7 @@ export class NotebookContainerClient {
 
     const { notebookServerEndpoint, authToken } = this.getNotebookServerConfig();
     try {
-      const response = await fetch(`${notebookServerEndpoint}/api/metrics/memory`, {
+      const response = await fetch(`${notebookServerEndpoint}api/metrics/memory`, {
         method: "GET",
         headers: {
           Authorization: authToken,
@@ -100,8 +97,7 @@ export class NotebookContainerClient {
   }
 
   private async _resetWorkspace(): Promise<void> {
-    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+    if (!this.notebookServerInfo() || !this.notebookServerInfo().notebookServerEndpoint) {
-    if (!notebookServerInfo || !notebookServerInfo.notebookServerEndpoint) {
       const error = "No server endpoint detected";
       Logger.logError(error, "NotebookContainerClient/resetWorkspace");
       return Promise.reject(error);
@@ -120,11 +116,15 @@ export class NotebookContainerClient {
   }
 
   private getNotebookServerConfig(): { notebookServerEndpoint: string; authToken: string } {
-    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+    let authToken: string,
-    const authToken: string = notebookServerInfo.authToken ? `Token ${notebookServerInfo.authToken}` : undefined;
+      notebookServerEndpoint = this.notebookServerInfo().notebookServerEndpoint,
+      token = this.notebookServerInfo().authToken;
+    if (token) {
+      authToken = `Token ${token}`;
+    }
 
     return {
-      notebookServerEndpoint: notebookServerInfo.notebookServerEndpoint,
+      notebookServerEndpoint,
       authToken,
     };
   }
@@ -134,6 +134,7 @@ export class NotebookContainerClient {
     if (!databaseAccount?.id) {
       throw new Error("DataExplorer not initialized");
     }
+    /*
     try {
       await destroy(userContext.subscriptionId, userContext.resourceGroup, userContext.databaseAccount.name, "default");
       await createOrUpdate(
@@ -146,5 +147,6 @@ export class NotebookContainerClient {
       Logger.logError(getErrorMessage(error), "NotebookContainerClient/recreateNotebookWorkspaceAsync");
       return Promise.reject(error);
     }
+    */
   }
 }

src/Explorer/Notebook/NotebookContentClient.ts

@@ -1,37 +1,33 @@
 import { stringifyNotebook } from "@nteract/commutable";
 import { FileType, IContent, IContentProvider, IEmptyContent, ServerConfig } from "@nteract/core";
-import { cloneDeep } from "lodash";
 import { AjaxResponse } from "rxjs/ajax";
+import * as DataModels from "../../Contracts/DataModels";
 import * as StringUtils from "../../Utils/StringUtils";
 import * as FileSystemUtil from "./FileSystemUtil";
 import { NotebookContentItem, NotebookContentItemType } from "./NotebookContentItem";
 import { NotebookUtil } from "./NotebookUtil";
-import { useNotebook } from "./useNotebook";
 
 export class NotebookContentClient {
-  constructor(private contentProvider: IContentProvider) {}
+  constructor(
+    private notebookServerInfo: ko.Observable<DataModels.NotebookWorkspaceConnectionInfo>,
+    public notebookBasePath: ko.Observable<string>,
+    private contentProvider: IContentProvider
+  ) { }
 
   /**
    * This updates the item and points all the children's parent to this item
    * @param item
    */
-  public async updateItemChildren(item: NotebookContentItem): Promise<NotebookContentItem> {
+  public updateItemChildren(item: NotebookContentItem): Promise<void> {
-    const subItems = await this.fetchNotebookFiles(item.path);
-    const clonedItem = cloneDeep(item);
-    subItems.forEach((subItem) => (subItem.parent = clonedItem));
-    clonedItem.children = subItems;
-
-    return clonedItem;
-  }
-
-  // TODO: Delete this function when ResourceTreeAdapter is removed.
-  public async updateItemChildrenInPlace(item: NotebookContentItem): Promise<void> {
     return this.fetchNotebookFiles(item.path).then((subItems) => {
       item.children = subItems;
       subItems.forEach((subItem) => (subItem.parent = item));
     });
   }
 
+  private sleep = (milliseconds: number) => {
+    return new Promise(resolve => setTimeout(resolve, milliseconds))
+  }
   /**
    *
    * @param parent parent folder
@@ -42,6 +38,7 @@ export class NotebookContentClient {
     }
 
     const type = "notebook";
+
     return this.contentProvider
       .create<"notebook">(this.getServerConfig(), parent.path, { type })
       .toPromise()
@@ -66,20 +63,18 @@ export class NotebookContentClient {
       });
   }
 
-  public async deleteContentItem(item: NotebookContentItem): Promise<void> {
+  public deleteContentItem(item: NotebookContentItem): Promise<void> {
-    const path = await this.deleteNotebookFile(item.path);
+    return this.deleteNotebookFile(item.path).then((path: string) => {
-    useNotebook.getState().deleteNotebookItem(item);
+      if (!path || path !== item.path) {
+        throw new Error("No path provided");
+      }
 
-    // TODO: Delete once old resource tree is removed
+      if (item.parent && item.parent.children) {
-    if (!path || path !== item.path) {
+        // Remove deleted child
-      throw new Error("No path provided");
+        const newChildren = item.parent.children.filter((child) => child.path !== path);
-    }
+        item.parent.children = newChildren;
-
+      }
-    if (item.parent && item.parent.children) {
+    });
-      // Remove deleted child
-      const newChildren = item.parent.children.filter((child) => child.path !== path);
-      item.parent.children = newChildren;
-    }
   }
 
   /**
@@ -280,10 +275,9 @@ export class NotebookContentClient {
   }
 
   private getServerConfig(): ServerConfig {
-    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
     return {
-      endpoint: notebookServerInfo.notebookServerEndpoint,
+      endpoint: this.notebookServerInfo().notebookServerEndpoint,
-      token: notebookServerInfo.authToken,
+      token: this.notebookServerInfo().authToken,
       crossDomain: true,
     };
   }

src/Explorer/Notebook/NotebookManager.tsx

@@ -4,11 +4,13 @@
 
 import { ImmutableNotebook } from "@nteract/commutable";
 import type { IContentProvider } from "@nteract/core";
+import ko from "knockout";
 import React from "react";
 import { contents } from "rx-jupyter";
 import { Areas, HttpStatusCodes } from "../../Common/Constants";
 import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 import * as Logger from "../../Common/Logger";
+import { MemoryUsageInfo } from "../../Contracts/DataModels";
 import { GitHubClient } from "../../GitHub/GitHubClient";
 import { GitHubContentProvider } from "../../GitHub/GitHubContentProvider";
 import { GitHubOAuthService } from "../../GitHub/GitHubOAuthService";
@@ -20,7 +22,6 @@ import { userContext } from "../../UserContext";
 import { getFullName } from "../../Utils/UserUtils";
 import Explorer from "../Explorer";
 import { CopyNotebookPane } from "../Panes/CopyNotebookPane/CopyNotebookPane";
-import { GitHubReposPanel } from "../Panes/GitHubReposPanel/GitHubReposPanel";
 import { PublishNotebookPane } from "../Panes/PublishNotebookPane/PublishNotebookPane";
 import { ResourceTreeAdapter } from "../Tree/ResourceTreeAdapter";
 import { InMemoryContentProvider } from "./NotebookComponent/ContentProviders/InMemoryContentProvider";
@@ -29,7 +30,6 @@ import { SnapshotRequest } from "./NotebookComponent/types";
 import { NotebookContainerClient } from "./NotebookContainerClient";
 import { NotebookContentClient } from "./NotebookContentClient";
 import { SchemaAnalyzerNotebook } from "./SchemaAnalyzer/SchemaAnalyzerUtils";
-import { useNotebook } from "./useNotebook";
 
 type NotebookPaneContent = string | ImmutableNotebook;
 
@@ -37,6 +37,7 @@ export type { NotebookPaneContent };
 
 export interface NotebookManagerOptions {
   container: Explorer;
+  notebookBasePath: ko.Observable<string>;
   resourceTree: ResourceTreeAdapter;
   refreshCommandBarButtons: () => void;
   refreshNotebookList: () => void;
@@ -80,28 +81,23 @@ export default class NotebookManager {
       contents.JupyterContentProvider
     );
 
-    this.notebookClient = new NotebookContainerClient(() =>
+    this.notebookClient = new NotebookContainerClient(
-      this.params.container.initNotebooks(userContext?.databaseAccount)
+      this.params.container.notebookServerInfo,
+      () => this.params.container.initNotebooks(userContext?.databaseAccount),
+      (update: MemoryUsageInfo) => this.params.container.memoryUsageInfo(update)
     );
 
-    this.notebookContentClient = new NotebookContentClient(this.notebookContentProvider);
+    this.notebookContentClient = new NotebookContentClient(
+      this.params.container.notebookServerInfo,
+      this.params.notebookBasePath,
+      this.notebookContentProvider
+    );
 
     this.gitHubOAuthService.getTokenObservable().subscribe((token) => {
       this.gitHubClient.setToken(token?.access_token);
       if (this?.gitHubOAuthService.isLoggedIn()) {
         useSidePanel.getState().closeSidePanel();
-        setTimeout(() => {
+        this.params.container.openGitHubReposPanel("Manager GitHub settings", this.junoClient);
-          useSidePanel
-            .getState()
-            .openSidePanel(
-              "Manage GitHub settings",
-              <GitHubReposPanel
-                explorer={this.params.container}
-                gitHubClientProp={this.params.container.notebookManager.gitHubClient}
-                junoClientProp={this.junoClient}
-              />
-            );
-        }, 200);
       }
 
       this.params.refreshCommandBarButtons();
@@ -111,7 +107,6 @@ export default class NotebookManager {
     this.junoClient.subscribeToPinnedRepos((pinnedRepos) => {
       this.params.resourceTree.initializeGitHubRepos(pinnedRepos);
       this.params.resourceTree.triggerRender();
-      useNotebook.getState().initializeGitHubRepos(pinnedRepos);
     });
     this.refreshPinnedRepos();
   }
@@ -143,7 +138,6 @@ export default class NotebookManager {
           notebookContentRef={notebookContentRef}
           onTakeSnapshot={onTakeSnapshot}
         />,
-        "440px",
         onClosePanel
       );
   }
@@ -176,17 +170,7 @@ export default class NotebookManager {
         undefined,
         "Cosmos DB cannot access your Github account anymore. Please connect to GitHub again.",
         "Connect to GitHub",
-        () =>
+        () => this.params.container.openGitHubReposPanel("Connect to GitHub"),
-          useSidePanel
-            .getState()
-            .openSidePanel(
-              "Connect to GitHub",
-              <GitHubReposPanel
-                explorer={this.params.container}
-                gitHubClientProp={this.params.container.notebookManager.gitHubClient}
-                junoClientProp={this.junoClient}
-              />
-            ),
         "Cancel",
         undefined
       );

src/Explorer/Notebook/NotebookRenderer/PromptContent.tsx

@@ -5,7 +5,7 @@ import "./Prompt.less";
 
 export const promptContent = (props: PassedPromptProps): JSX.Element => {
   if (props.status === "busy") {
-    const stopButtonText = "Stop cell execution";
+    const stopButtonText: string = "Stop cell execution";
     return (
       <div
         style={{ position: "sticky", width: "100%", maxHeight: "100%", left: 0, top: 0, zIndex: 300 }}
@@ -23,7 +23,7 @@ export const promptContent = (props: PassedPromptProps): JSX.Element => {
       </div>
     );
   } else if (props.isHovered) {
-    const playButtonText = "Run cell";
+    const playButtonText: string = "Run cell";
     return (
       <IconButton
         className="runCellButton"

src/Explorer/Notebook/NotebookRenderer/StatusBar.test.tsx

@@ -1,5 +1,6 @@
 import { shallow } from "enzyme";
 import React from "react";
+
 import { StatusBar } from "./StatusBar";
 
 describe("StatusBar", () => {
@@ -27,8 +28,8 @@ describe("StatusBar", () => {
         kernelSpecDisplayName: "javascript",
         kernelStatus: "kernelStatus",
       },
-      undefined,
+      null,
-      undefined
+      null
     );
     expect(shouldUpdate).toBe(true);
   });
@@ -46,8 +47,8 @@ describe("StatusBar", () => {
         kernelSpecDisplayName: "python3",
         kernelStatus: "kernelStatus",
       },
-      undefined,
+      null,
-      undefined
+      null
     );
     expect(shouldUpdate).toBe(true);
   });

src/Explorer/Notebook/NotebookRenderer/StatusBar.tsx

@@ -2,7 +2,6 @@ import { AppState, ContentRef, selectors } from "@nteract/core";
 import distanceInWordsToNow from "date-fns/distance_in_words_to_now";
 import React from "react";
 import { connect } from "react-redux";
-import styled from "styled-components";
 import { StyleConstants } from "../../../Common/Constants";
 
 interface Props {
@@ -13,6 +12,8 @@ interface Props {
 
 const NOT_CONNECTED = "not connected";
 
+import styled from "styled-components";
+
 export const LeftStatus = styled.div`
   float: left;
   display: block;
@@ -79,7 +80,7 @@ interface InitialProps {
   contentRef: ContentRef;
 }
 
-const makeMapStateToProps = (_initialState: AppState, initialProps: InitialProps): ((state: AppState) => Props) => {
+const makeMapStateToProps = (initialState: AppState, initialProps: InitialProps): ((state: AppState) => Props) => {
   const { contentRef } = initialProps;
 
   const mapStateToProps = (state: AppState) => {
@@ -89,26 +90,26 @@ const makeMapStateToProps = (_initialState: AppState, initialProps: InitialProps
       return {
         kernelStatus: NOT_CONNECTED,
         kernelSpecDisplayName: "no kernel",
-        lastSaved: undefined,
+        lastSaved: null,
       };
     }
 
     const kernelRef = content.model.kernelRef;
-    let kernel;
+    let kernel = null;
     if (kernelRef) {
       kernel = selectors.kernel(state, { kernelRef });
     }
 
-    const lastSaved = content && content.lastSaved ? content.lastSaved : undefined;
+    const lastSaved = content && content.lastSaved ? content.lastSaved : null;
 
-    const kernelStatus = kernel?.status || NOT_CONNECTED;
+    const kernelStatus = kernel != null && kernel.status != null ? kernel.status : NOT_CONNECTED;
 
     // TODO: We need kernels associated to the kernelspec they came from
     //       so we can pluck off the display_name and provide it here
     let kernelSpecDisplayName = " ";
     if (kernelStatus === NOT_CONNECTED) {
       kernelSpecDisplayName = "no kernel";
-    } else if (kernel?.kernelSpecName) {
+    } else if (kernel != null && kernel.kernelSpecName != null) {
       kernelSpecDisplayName = kernel.kernelSpecName;
     } else if (content && content.type === "notebook") {
       kernelSpecDisplayName = selectors.notebook.displayName(content.model) || " ";

src/Explorer/Notebook/NotebookRenderer/Toolbar.tsx

@@ -27,7 +27,7 @@ interface DispatchProps {
   moveCell: (destinationId: CellId, above: boolean) => void;
   clearOutputs: () => void;
   deleteCell: () => void;
-  traceNotebookTelemetry: (action: Action, actionModifier?: string, data?: string) => void;
+  traceNotebookTelemetry: (action: Action, actionModifier?: string, data?: any) => void;
   takeNotebookSnapshot: (payload: SnapshotRequest) => void;
 }
 
@@ -203,7 +203,7 @@ const mapDispatchToProps = (
     dispatch(actions.moveCell({ id, contentRef, destinationId, above })),
   clearOutputs: () => dispatch(actions.clearOutputs({ id, contentRef })),
   deleteCell: () => dispatch(actions.deleteCell({ id, contentRef })),
-  traceNotebookTelemetry: (action: Action, actionModifier?: string, data?: string) =>
+  traceNotebookTelemetry: (action: Action, actionModifier?: string, data?: any) =>
     dispatch(cdbActions.traceNotebookTelemetry({ action, actionModifier, data })),
   takeNotebookSnapshot: (request: SnapshotRequest) => dispatch(cdbActions.takeNotebookSnapshot(request)),
 });

src/Explorer/Notebook/NotebookRenderer/decorators/HoverableCell.tsx

@@ -1,7 +1,8 @@
-import { ContentRef } from "@nteract/core";
 import React from "react";
 import { connect } from "react-redux";
 import { Dispatch } from "redux";
+
+import { ContentRef } from "@nteract/core";
 import * as actions from "../../NotebookComponent/actions";
 
 interface ComponentProps {
@@ -28,7 +29,10 @@ class HoverableCell extends React.Component<ComponentProps & DispatchProps> {
   }
 }
 
-const mapDispatchToProps = (dispatch: Dispatch, { id }: { id: string }): DispatchProps => ({
+const mapDispatchToProps = (
+  dispatch: Dispatch,
+  { id, contentRef }: { id: string; contentRef: ContentRef }
+): DispatchProps => ({
   hover: () => dispatch(actions.setHoveredCell({ cellId: id })),
   unHover: () => dispatch(actions.setHoveredCell({ cellId: undefined })),
 });

src/Explorer/Notebook/useNotebook.ts

@@ -1,235 +0,0 @@
-import { cloneDeep } from "lodash";
-import create, { UseStore } from "zustand";
-import { AuthType } from "../../AuthType";
-import * as Constants from "../../Common/Constants";
-import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
-import * as Logger from "../../Common/Logger";
-import { configContext } from "../../ConfigContext";
-import * as DataModels from "../../Contracts/DataModels";
-import { IPinnedRepo } from "../../Juno/JunoClient";
-import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
-import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
-import { userContext } from "../../UserContext";
-import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
-import * as GitHubUtils from "../../Utils/GitHubUtils";
-import { NotebookContentItem, NotebookContentItemType } from "./NotebookContentItem";
-import NotebookManager from "./NotebookManager";
-
-interface NotebookState {
-  isNotebookEnabled: boolean;
-  isNotebooksEnabledForAccount: boolean;
-  notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo;
-  sparkClusterConnectionInfo: DataModels.SparkClusterConnectionInfo;
-  isSynapseLinkUpdating: boolean;
-  memoryUsageInfo: DataModels.MemoryUsageInfo;
-  isShellEnabled: boolean;
-  notebookBasePath: string;
-  isInitializingNotebooks: boolean;
-  myNotebooksContentRoot: NotebookContentItem;
-  gitHubNotebooksContentRoot: NotebookContentItem;
-  galleryContentRoot: NotebookContentItem;
-  setIsNotebookEnabled: (isNotebookEnabled: boolean) => void;
-  setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => void;
-  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
-  setSparkClusterConnectionInfo: (sparkClusterConnectionInfo: DataModels.SparkClusterConnectionInfo) => void;
-  setIsSynapseLinkUpdating: (isSynapseLinkUpdating: boolean) => void;
-  setMemoryUsageInfo: (memoryUsageInfo: DataModels.MemoryUsageInfo) => void;
-  setIsShellEnabled: (isShellEnabled: boolean) => void;
-  setNotebookBasePath: (notebookBasePath: string) => void;
-  refreshNotebooksEnabledStateForAccount: () => Promise<void>;
-  findItem: (root: NotebookContentItem, item: NotebookContentItem) => NotebookContentItem;
-  updateNotebookItem: (item: NotebookContentItem) => void;
-  deleteNotebookItem: (item: NotebookContentItem) => void;
-  initializeNotebooksTree: (notebookManager: NotebookManager) => Promise<void>;
-  initializeGitHubRepos: (pinnedRepos: IPinnedRepo[]) => void;
-}
-
-export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
-  isNotebookEnabled: false,
-  isNotebooksEnabledForAccount: false,
-  notebookServerInfo: {
-    notebookServerEndpoint: undefined,
-    authToken: undefined,
-  },
-  sparkClusterConnectionInfo: {
-    userName: undefined,
-    password: undefined,
-    endpoints: [],
-  },
-  isSynapseLinkUpdating: false,
-  memoryUsageInfo: undefined,
-  isShellEnabled: false,
-  notebookBasePath: Constants.Notebook.defaultBasePath,
-  isInitializingNotebooks: false,
-  myNotebooksContentRoot: undefined,
-  gitHubNotebooksContentRoot: undefined,
-  galleryContentRoot: undefined,
-  setIsNotebookEnabled: (isNotebookEnabled: boolean) => set({ isNotebookEnabled }),
-  setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => set({ isNotebooksEnabledForAccount }),
-  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) =>
-    set({ notebookServerInfo }),
-  setSparkClusterConnectionInfo: (sparkClusterConnectionInfo: DataModels.SparkClusterConnectionInfo) =>
-    set({ sparkClusterConnectionInfo }),
-  setIsSynapseLinkUpdating: (isSynapseLinkUpdating: boolean) => set({ isSynapseLinkUpdating }),
-  setMemoryUsageInfo: (memoryUsageInfo: DataModels.MemoryUsageInfo) => set({ memoryUsageInfo }),
-  setIsShellEnabled: (isShellEnabled: boolean) => set({ isShellEnabled }),
-  setNotebookBasePath: (notebookBasePath: string) => set({ notebookBasePath }),
-  refreshNotebooksEnabledStateForAccount: async (): Promise<void> => {
-    const { databaseAccount, authType } = userContext;
-    if (
-      authType === AuthType.EncryptedToken ||
-      authType === AuthType.ResourceToken ||
-      authType === AuthType.MasterKey
-    ) {
-      set({ isNotebooksEnabledForAccount: false });
-      return;
-    }
-
-    const firstWriteLocation =
-      databaseAccount?.properties?.writeLocations &&
-      databaseAccount?.properties?.writeLocations[0]?.locationName.toLowerCase();
-    const disallowedLocationsUri = `${configContext.BACKEND_ENDPOINT}/api/disallowedLocations`;
-    const authorizationHeader = getAuthorizationHeader();
-    try {
-      const response = await fetch(disallowedLocationsUri, {
-        method: "POST",
-        body: JSON.stringify({
-          resourceTypes: [Constants.ArmResourceTypes.notebookWorkspaces],
-        }),
-        headers: {
-          [authorizationHeader.header]: authorizationHeader.token,
-          [Constants.HttpHeaders.contentType]: "application/json",
-        },
-      });
-
-      if (!response.ok) {
-        throw new Error("Failed to fetch disallowed locations");
-      }
-
-      const disallowedLocations: string[] = await response.json();
-      if (!disallowedLocations) {
-        Logger.logInfo("No disallowed locations found", "Explorer/isNotebooksEnabledForAccount");
-        set({ isNotebooksEnabledForAccount: true });
-        return;
-      }
-
-      // firstWriteLocation should not be disallowed
-      const isAccountInAllowedLocation = firstWriteLocation && disallowedLocations.indexOf(firstWriteLocation) === -1;
-      set({ isNotebooksEnabledForAccount: isAccountInAllowedLocation });
-    } catch (error) {
-      Logger.logError(getErrorMessage(error), "Explorer/isNotebooksEnabledForAccount");
-      set({ isNotebooksEnabledForAccount: false });
-    }
-  },
-  findItem: (root: NotebookContentItem, item: NotebookContentItem): NotebookContentItem => {
-    const currentItem = root || get().myNotebooksContentRoot;
-
-    if (currentItem) {
-      if (currentItem.path === item.path && currentItem.name === item.name) {
-        return currentItem;
-      }
-
-      if (currentItem.children) {
-        for (const childItem of currentItem.children) {
-          const result = get().findItem(childItem, item);
-          if (result) {
-            return result;
-          }
-        }
-      }
-    }
-
-    return undefined;
-  },
-  updateNotebookItem: (item: NotebookContentItem): void => {
-    const root = cloneDeep(get().myNotebooksContentRoot);
-    const parentItem = get().findItem(root, item.parent);
-    parentItem.children = parentItem.children.filter((child) => child.path !== item.path);
-    parentItem.children.push(item);
-    item.parent = parentItem;
-    set({ myNotebooksContentRoot: root });
-  },
-  deleteNotebookItem: (item: NotebookContentItem): void => {
-    const root = cloneDeep(get().myNotebooksContentRoot);
-    const parentItem = get().findItem(root, item.parent);
-    parentItem.children = parentItem.children.filter((child) => child.path !== item.path);
-    set({ myNotebooksContentRoot: root });
-  },
-  initializeNotebooksTree: async (notebookManager: NotebookManager): Promise<void> => {
-    const myNotebooksContentRoot = {
-      name: "My Notebooks",
-      path: get().notebookBasePath,
-      type: NotebookContentItemType.Directory,
-    };
-    const galleryContentRoot = {
-      name: "Gallery",
-      path: "Gallery",
-      type: NotebookContentItemType.File,
-    };
-    const gitHubNotebooksContentRoot = notebookManager?.gitHubOAuthService?.isLoggedIn()
-      ? {
-          name: "GitHub repos",
-          path: "PsuedoDir",
-          type: NotebookContentItemType.Directory,
-        }
-      : undefined;
-    set({
-      myNotebooksContentRoot,
-      galleryContentRoot,
-      gitHubNotebooksContentRoot,
-    });
-
-    if (get().notebookServerInfo?.notebookServerEndpoint) {
-      const updatedRoot = await notebookManager?.notebookContentClient?.updateItemChildren(myNotebooksContentRoot);
-      set({ myNotebooksContentRoot: updatedRoot });
-
-      if (updatedRoot?.children) {
-        // Count 1st generation children (tree is lazy-loaded)
-        const nodeCounts = { files: 0, notebooks: 0, directories: 0 };
-        updatedRoot.children.forEach((notebookItem) => {
-          switch (notebookItem.type) {
-            case NotebookContentItemType.File:
-              nodeCounts.files++;
-              break;
-            case NotebookContentItemType.Directory:
-              nodeCounts.directories++;
-              break;
-            case NotebookContentItemType.Notebook:
-              nodeCounts.notebooks++;
-              break;
-            default:
-              break;
-          }
-        });
-        TelemetryProcessor.trace(Action.RefreshResourceTreeMyNotebooks, ActionModifiers.Mark, { ...nodeCounts });
-      }
-    }
-  },
-  initializeGitHubRepos: (pinnedRepos: IPinnedRepo[]): void => {
-    const gitHubNotebooksContentRoot = cloneDeep(get().gitHubNotebooksContentRoot);
-    if (gitHubNotebooksContentRoot) {
-      gitHubNotebooksContentRoot.children = [];
-      pinnedRepos?.forEach((pinnedRepo) => {
-        const repoFullName = GitHubUtils.toRepoFullName(pinnedRepo.owner, pinnedRepo.name);
-        const repoTreeItem: NotebookContentItem = {
-          name: repoFullName,
-          path: "PsuedoDir",
-          type: NotebookContentItemType.Directory,
-          children: [],
-        };
-
-        pinnedRepo.branches.forEach((branch) => {
-          repoTreeItem.children.push({
-            name: branch.name,
-            path: GitHubUtils.toContentUri(pinnedRepo.owner, pinnedRepo.name, branch.name, ""),
-            type: NotebookContentItemType.Directory,
-          });
-        });
-
-        gitHubNotebooksContentRoot.children.push(repoTreeItem);
-      });
-
-      set({ gitHubNotebooksContentRoot });
-    }
-  },
-}));

src/Explorer/Panes/AddCollectionPanel.tsx

@@ -113,11 +113,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       collectionId: "",
       enableIndexing: true,
       isSharded: userContext.apiType !== "Tables",
-      partitionKey:
+      partitionKey: "",
-        (userContext.features.partitionKeyDefault && userContext.apiType === "SQL") ||
-        (userContext.features.partitionKeyDefault && userContext.apiType === "Mongo")
-          ? "/id"
-          : "",
       enableDedicatedThroughput: false,
       createMongoWildCardIndex: isCapabilityEnabled("EnableMongo"),
       useHashV2: false,
@@ -417,10 +413,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                 </TooltipHost>
               </Stack>
 
-              <Text variant="small" aria-label="pkDescription">
-                {this.getPartitionKeySubtext()}
-              </Text>
-
               <input
                 type="text"
                 id="addCollection-partitionKeyValue"
@@ -815,17 +807,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
     return tooltipText;
   }
 
-  private getPartitionKeySubtext(): string {
-    if (
-      userContext.features.partitionKeyDefault &&
-      (userContext.apiType === "SQL" || userContext.apiType === "Mongo")
-    ) {
-      const subtext = "For small workloads, the item ID is a suitable choice for the partition key.";
-      return subtext;
-    }
-    return "";
-  }
-
   private getAnalyticalStorageTooltipContent(): JSX.Element {
     return (
       <Text variant="small">

src/Explorer/Panes/BrowseQueriesPane/BrowseQueriesPane.tsx

@@ -4,7 +4,6 @@ import { logError } from "../../../Common/Logger";
 import { Query } from "../../../Contracts/DataModels";
 import { Collection } from "../../../Contracts/ViewModels";
 import { useSidePanel } from "../../../hooks/useSidePanel";
-import { useTabs } from "../../../hooks/useTabs";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import { trace } from "../../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../../UserContext";
@@ -37,7 +36,7 @@ export const BrowseQueriesPane: FunctionComponent<BrowseQueriesPaneProps> = ({
       selectedCollection.onNewQueryClick(selectedCollection, undefined, savedQuery.query);
     }
 
-    const queryTab = useTabs.getState().activeTab as NewQueryTab;
+    const queryTab = explorer && (explorer.tabsManager.activeTab() as NewQueryTab);
     queryTab.tabTitle(savedQuery.queryName);
     queryTab.tabPath(`${selectedCollection.databaseId}>${selectedCollection.id()}>${savedQuery.queryName}`);
 

src/Explorer/Panes/CopyNotebookPane/CopyNotebookPane.tsx

@@ -9,7 +9,6 @@ import * as GitHubUtils from "../../../Utils/GitHubUtils";
 import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
 import Explorer from "../../Explorer";
 import { NotebookContentItem, NotebookContentItemType } from "../../Notebook/NotebookContentItem";
-import { useNotebook } from "../../Notebook/useNotebook";
 import { ResourceTreeAdapter } from "../../Tree/ResourceTreeAdapter";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 import { CopyNotebookPaneComponent, CopyNotebookPaneProps } from "./CopyNotebookPaneComponent";
@@ -102,7 +101,7 @@ export const CopyNotebookPane: FunctionComponent<CopyNotebookPanelProps> = ({
       case "MyNotebooks":
         parent = {
           name: ResourceTreeAdapter.MyNotebooksTitle,
-          path: useNotebook.getState().notebookBasePath,
+          path: container.getNotebookBasePath(),
           type: NotebookContentItemType.Directory,
         };
         break;

src/Explorer/Panes/DeleteCollectionConfirmationPane/DeleteCollectionConfirmationPane.test.tsx

@@ -10,6 +10,7 @@ import { Collection, Database } from "../../../Contracts/ViewModels";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import { updateUserContext } from "../../../UserContext";
+import Explorer from "../../Explorer";
 import { useDatabases } from "../../useDatabases";
 import { useSelectedNode } from "../../useSelectedNode";
 import { DeleteCollectionConfirmationPane } from "./DeleteCollectionConfirmationPane";
@@ -52,7 +53,10 @@ describe("Delete Collection Confirmation Pane", () => {
 
   describe("shouldRecordFeedback()", () => {
     it("should return true if last collection and database does not have shared throughput else false", () => {
-      const wrapper = shallow(<DeleteCollectionConfirmationPane refreshDatabases={() => undefined} />);
+      const fakeExplorer = new Explorer();
+      fakeExplorer.refreshAllDatabases = () => undefined;
+
+      const wrapper = shallow(<DeleteCollectionConfirmationPane explorer={fakeExplorer} />);
       expect(wrapper.exists(".deleteCollectionFeedback")).toBe(false);
 
       const database = { id: ko.observable("testDB") } as Database;
@@ -61,11 +65,11 @@ describe("Delete Collection Confirmation Pane", () => {
       database.isDatabaseShared = ko.computed(() => false);
       useDatabases.getState().addDatabases([database]);
       useSelectedNode.getState().setSelectedNode(database);
-      wrapper.setProps({});
+      wrapper.setProps({ explorer: fakeExplorer });
       expect(wrapper.exists(".deleteCollectionFeedback")).toBe(true);
 
       database.isDatabaseShared = ko.computed(() => true);
-      wrapper.setProps({});
+      wrapper.setProps({ explorer: fakeExplorer });
       expect(wrapper.exists(".deleteCollectionFeedback")).toBe(false);
     });
   });
@@ -73,6 +77,8 @@ describe("Delete Collection Confirmation Pane", () => {
   describe("submit()", () => {
     const selectedCollectionId = "testCol";
     const databaseId = "testDatabase";
+    const fakeExplorer = {} as Explorer;
+    fakeExplorer.refreshAllDatabases = () => undefined;
     const database = { id: ko.observable(databaseId) } as Database;
     const collection = {
       id: ko.observable(selectedCollectionId),
@@ -109,7 +115,7 @@ describe("Delete Collection Confirmation Pane", () => {
     });
 
     it("should call delete collection", () => {
-      const wrapper = mount(<DeleteCollectionConfirmationPane refreshDatabases={() => undefined} />);
+      const wrapper = mount(<DeleteCollectionConfirmationPane explorer={fakeExplorer} />);
       expect(wrapper).toMatchSnapshot();
 
       expect(wrapper.exists("#confirmCollectionId")).toBe(true);
@@ -126,7 +132,7 @@ describe("Delete Collection Confirmation Pane", () => {
     });
 
     it("should record feedback", async () => {
-      const wrapper = mount(<DeleteCollectionConfirmationPane refreshDatabases={() => undefined} />);
+      const wrapper = mount(<DeleteCollectionConfirmationPane explorer={fakeExplorer} />);
       expect(wrapper.exists("#confirmCollectionId")).toBe(true);
       wrapper
         .find("#confirmCollectionId")

src/Explorer/Panes/DeleteCollectionConfirmationPane/DeleteCollectionConfirmationPane.tsx

@@ -6,23 +6,23 @@ import DeleteFeedback from "../../../Common/DeleteFeedback";
 import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
 import { Collection } from "../../../Contracts/ViewModels";
 import { useSidePanel } from "../../../hooks/useSidePanel";
-import { useTabs } from "../../../hooks/useTabs";
 import { DefaultExperienceUtility } from "../../../Shared/DefaultExperienceUtility";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../../UserContext";
 import { getCollectionName } from "../../../Utils/APITypeUtils";
 import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
+import Explorer from "../../Explorer";
 import { useDatabases } from "../../useDatabases";
 import { useSelectedNode } from "../../useSelectedNode";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 
 export interface DeleteCollectionConfirmationPaneProps {
-  refreshDatabases: () => Promise<void>;
+  explorer: Explorer;
 }
 
 export const DeleteCollectionConfirmationPane: FunctionComponent<DeleteCollectionConfirmationPaneProps> = ({
-  refreshDatabases,
+  explorer,
 }: DeleteCollectionConfirmationPaneProps) => {
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
   const [deleteCollectionFeedback, setDeleteCollectionFeedback] = useState<string>("");
@@ -31,7 +31,8 @@ export const DeleteCollectionConfirmationPane: FunctionComponent<DeleteCollectio
   const [isExecuting, setIsExecuting] = useState(false);
 
   const shouldRecordFeedback = (): boolean =>
-    useDatabases.getState().isLastCollection() && !useDatabases.getState().findSelectedDatabase()?.isDatabaseShared();
+    useDatabases.getState().isLastCollection() &&
+    !useSelectedNode.getState().findSelectedDatabase()?.isDatabaseShared();
 
   const collectionName = getCollectionName().toLocaleLowerCase();
   const paneTitle = "Delete " + collectionName;
@@ -62,12 +63,10 @@ export const DeleteCollectionConfirmationPane: FunctionComponent<DeleteCollectio
 
       setIsExecuting(false);
       useSelectedNode.getState().setSelectedNode(collection.database);
-      useTabs
+      explorer.tabsManager?.closeTabsByComparator(
-        .getState()
+        (tab) => tab.node?.id() === collection.id() && (tab.node as Collection).databaseId === collection.databaseId
-        .closeTabsByComparator(
+      );
-          (tab) => tab.node?.id() === collection.id() && (tab.node as Collection).databaseId === collection.databaseId
+      explorer.refreshAllDatabases();
-        );
-      refreshDatabases();
 
       TelemetryProcessor.traceSuccess(Action.DeleteCollection, paneInfo, startKey);
 

src/Explorer/Panes/DeleteCollectionConfirmationPane/__snapshots__/DeleteCollectionConfirmationPane.test.tsx.snap

@@ -2,7 +2,11 @@
 
 exports[`Delete Collection Confirmation Pane submit() should call delete collection 1`] = `
 <DeleteCollectionConfirmationPane
-  refreshDatabases={[Function]}
+  explorer={
+    Object {
+      "refreshAllDatabases": [Function],
+    }
+  }
 >
   <RightPaneForm
     formError=""

src/Explorer/Panes/DeleteDatabaseConfirmationPanel.test.tsx

@@ -10,12 +10,15 @@ import { Collection, Database } from "../../Contracts/ViewModels";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { updateUserContext } from "../../UserContext";
+import Explorer from "../Explorer";
+import { TabsManager } from "../Tabs/TabsManager";
 import { useDatabases } from "../useDatabases";
 import { useSelectedNode } from "../useSelectedNode";
 import { DeleteDatabaseConfirmationPanel } from "./DeleteDatabaseConfirmationPanel";
 
 describe("Delete Database Confirmation Pane", () => {
   const selectedDatabaseId = "testDatabase";
+  let fakeExplorer: Explorer;
   let database: Database;
 
   beforeAll(() => {
@@ -34,6 +37,10 @@ describe("Delete Database Confirmation Pane", () => {
   });
 
   beforeEach(() => {
+    fakeExplorer = {} as Explorer;
+    fakeExplorer.refreshAllDatabases = () => undefined;
+    fakeExplorer.tabsManager = new TabsManager();
+
     database = {} as Database;
     database.collections = ko.observableArray<Collection>([{ id: ko.observable("testCollection") } as Collection]);
     database.id = ko.observable<string>(selectedDatabaseId);
@@ -49,17 +56,17 @@ describe("Delete Database Confirmation Pane", () => {
   });
 
   it("shouldRecordFeedback() should return true if last non empty database or is last database that has shared throughput", () => {
-    const wrapper = shallow(<DeleteDatabaseConfirmationPanel refreshDatabases={() => undefined} />);
+    const wrapper = shallow(<DeleteDatabaseConfirmationPanel explorer={fakeExplorer} />);
     expect(wrapper.exists(".deleteDatabaseFeedback")).toBe(true);
 
     useDatabases.getState().addDatabases([database]);
-    wrapper.setProps({});
+    wrapper.setProps({ explorer: fakeExplorer });
     expect(wrapper.exists(".deleteDatabaseFeedback")).toBe(false);
     useDatabases.getState().clearDatabases();
   });
 
   it("Should call delete database", () => {
-    const wrapper = mount(<DeleteDatabaseConfirmationPanel refreshDatabases={() => undefined} />);
+    const wrapper = mount(<DeleteDatabaseConfirmationPanel explorer={fakeExplorer} />);
     expect(wrapper).toMatchSnapshot();
     expect(wrapper.exists("#confirmDatabaseId")).toBe(true);
 
@@ -74,7 +81,7 @@ describe("Delete Database Confirmation Pane", () => {
   });
 
   it("should record feedback", async () => {
-    const wrapper = mount(<DeleteDatabaseConfirmationPanel refreshDatabases={() => undefined} />);
+    const wrapper = mount(<DeleteDatabaseConfirmationPanel explorer={fakeExplorer} />);
     expect(wrapper.exists("#confirmDatabaseId")).toBe(true);
     wrapper
       .find("#confirmDatabaseId")

src/Explorer/Panes/DeleteDatabaseConfirmationPanel.tsx

@@ -7,23 +7,23 @@ import DeleteFeedback from "../../Common/DeleteFeedback";
 import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
 import { Collection, Database } from "../../Contracts/ViewModels";
 import { useSidePanel } from "../../hooks/useSidePanel";
-import { useTabs } from "../../hooks/useTabs";
 import { DefaultExperienceUtility } from "../../Shared/DefaultExperienceUtility";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../UserContext";
 import { logConsoleError } from "../../Utils/NotificationConsoleUtils";
+import Explorer from "../Explorer";
 import { useDatabases } from "../useDatabases";
 import { useSelectedNode } from "../useSelectedNode";
 import { PanelInfoErrorComponent, PanelInfoErrorProps } from "./PanelInfoErrorComponent";
 import { RightPaneForm, RightPaneFormProps } from "./RightPaneForm/RightPaneForm";
 
 interface DeleteDatabaseConfirmationPanelProps {
-  refreshDatabases: () => Promise<void>;
+  explorer: Explorer;
 }
 
 export const DeleteDatabaseConfirmationPanel: FunctionComponent<DeleteDatabaseConfirmationPanelProps> = ({
-  refreshDatabases,
+  explorer,
 }: DeleteDatabaseConfirmationPanelProps): JSX.Element => {
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
   const isLastNonEmptyDatabase = useDatabases((state) => state.isLastNonEmptyDatabase);
@@ -32,7 +32,7 @@ export const DeleteDatabaseConfirmationPanel: FunctionComponent<DeleteDatabaseCo
   const [formError, setFormError] = useState<string>("");
   const [databaseInput, setDatabaseInput] = useState<string>("");
   const [databaseFeedbackInput, setDatabaseFeedbackInput] = useState<string>("");
-  const selectedDatabase: Database = useDatabases.getState().findSelectedDatabase();
+  const selectedDatabase: Database = useSelectedNode.getState().findSelectedDatabase();
 
   const submit = async (): Promise<void> => {
     if (selectedDatabase?.id() && databaseInput !== selectedDatabase.id()) {
@@ -52,18 +52,15 @@ export const DeleteDatabaseConfirmationPanel: FunctionComponent<DeleteDatabaseCo
     try {
       await deleteDatabase(selectedDatabase.id());
       closeSidePanel();
-      refreshDatabases();
+      explorer.refreshAllDatabases();
-      useTabs.getState().closeTabsByComparator((tab) => tab.node?.id() === selectedDatabase.id());
+      explorer.tabsManager.closeTabsByComparator((tab) => tab.node?.id() === selectedDatabase.id());
       useSelectedNode.getState().setSelectedNode(undefined);
       selectedDatabase
         .collections()
         .forEach((collection: Collection) =>
-          useTabs
+          explorer.tabsManager.closeTabsByComparator(
-            .getState()
+            (tab) => tab.node?.id() === collection.id() && (tab.node as Collection).databaseId === collection.databaseId
-            .closeTabsByComparator(
+          )
-              (tab) =>
-                tab.node?.id() === collection.id() && (tab.node as Collection).databaseId === collection.databaseId
-            )
         );
       TelemetryProcessor.traceSuccess(
         Action.DeleteDatabase,

src/Explorer/Panes/GitHubReposPanel/GitHubReposPanel.tsx

@@ -120,7 +120,6 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
         handleError(error, "GitHubReposPane/submit", "Failed to save pinned repos");
       }
     }
-    useSidePanel.getState().closeSidePanel();
   }
 
   public resetData(): void {
@@ -145,18 +144,11 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
 
   private setup(forceShowConnectToGitHub = false): void {
     forceShowConnectToGitHub || !this.props.explorer.notebookManager?.gitHubOAuthService.isLoggedIn()
-      ? this.setupForConnectToGitHub(forceShowConnectToGitHub)
+      ? this.setupForConnectToGitHub()
       : this.setupForManageRepos();
   }
 
-  private setupForConnectToGitHub(forceShowConnectToGitHub: boolean): void {
+  private setupForConnectToGitHub(): void {
-    if (forceShowConnectToGitHub) {
-      const newState = { ...this.state.gitHubReposState };
-      newState.showAuthorizeAccess = forceShowConnectToGitHub;
-      this.setState({
-        gitHubReposState: newState,
-      });
-    }
     this.setState({
       isExecuting: false,
     });
@@ -376,28 +368,46 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
           isLoading: true,
           loadMore: (): Promise<void> => this.loadMoreBranches(item.repo),
         };
+        this.setState({
+          gitHubReposState: {
+            ...this.state.gitHubReposState,
+            reposListProps: {
+              ...this.state.gitHubReposState.reposListProps,
+              branchesProps: {
+                ...this.state.gitHubReposState.reposListProps.branchesProps,
+                [GitHubUtils.toRepoFullName(item.repo.owner, item.repo.name)]: this.branchesProps[item.key],
+              },
+              pinnedReposProps: {
+                repos: this.pinnedReposProps.repos,
+              },
+              unpinnedReposProps: {
+                ...this.state.gitHubReposState.reposListProps.unpinnedReposProps,
+                repos: this.unpinnedReposProps.repos,
+              },
+            },
+          },
+        });
         this.loadMoreBranches(item.repo);
+      } else {
+        if (this.isAddedRepo === false) {
+          this.setState({
+            gitHubReposState: {
+              ...this.state.gitHubReposState,
+              reposListProps: {
+                ...this.state.gitHubReposState.reposListProps,
+                pinnedReposProps: {
+                  repos: this.pinnedReposProps.repos,
+                },
+                unpinnedReposProps: {
+                  ...this.state.gitHubReposState.reposListProps.unpinnedReposProps,
+                  repos: this.unpinnedReposProps.repos,
+                },
+              },
+            },
+          });
+        }
       }
     });
-
-    this.setState({
-      gitHubReposState: {
-        ...this.state.gitHubReposState,
-        reposListProps: {
-          ...this.state.gitHubReposState.reposListProps,
-          branchesProps: {
-            ...this.branchesProps,
-          },
-          pinnedReposProps: {
-            repos: this.pinnedReposProps.repos,
-          },
-          unpinnedReposProps: {
-            ...this.state.gitHubReposState.reposListProps.unpinnedReposProps,
-            repos: this.unpinnedReposProps.repos,
-          },
-        },
-      },
-    });
     this.isAddedRepo = false;
   }
 

src/Explorer/Panes/GitHubReposPanel/__snapshots__/GitHubReposPanel.test.tsx.snap

@@ -19,8 +19,17 @@ exports[`GitHub Repos Panel should render Default properly 1`] = `
           "container": Explorer {
             "_isInitializingNotebooks": false,
             "_resetNotebookWorkspace": [Function],
+            "isAccountReady": [Function],
             "isFixedCollectionWithSharedThroughputSupported": [Function],
+            "isNotebookEnabled": [Function],
+            "isNotebooksEnabledForAccount": [Function],
+            "isSchemaEnabled": [Function],
+            "isShellEnabled": [Function],
+            "isSynapseLinkUpdating": [Function],
             "isTabsContentExpanded": [Function],
+            "memoryUsageInfo": [Function],
+            "notebookBasePath": [Function],
+            "notebookServerInfo": [Function],
             "onRefreshDatabasesKeyPress": [Function],
             "onRefreshResourcesClick": [Function],
             "provideFeedbackEmail": [Function],
@@ -28,11 +37,21 @@ exports[`GitHub Repos Panel should render Default properly 1`] = `
               "container": [Circular],
             },
             "refreshNotebookList": [Function],
+            "resourceTokenCollection": [Function],
             "resourceTree": ResourceTreeAdapter {
               "container": [Circular],
               "copyNotebook": [Function],
               "parameters": [Function],
             },
+            "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+              "container": [Circular],
+              "parameters": [Function],
+            },
+            "sparkClusterConnectionInfo": [Function],
+            "tabsManager": TabsManager {
+              "activeTab": [Function],
+              "openedTabs": [Function],
+            },
           },
           "getRepo": [Function],
           "pinRepo": [Function],

src/Explorer/Panes/PanelComponent.less

@@ -150,6 +150,9 @@
 .backImageIcon {
   margin-top: 8px;
 }
+.entityValueTextField {
+  margin: 24px;
+}
 .addEntityDatePicker {
   max-width: 145px;
 }

src/Explorer/Panes/PanelContainerComponent.tsx

@@ -4,8 +4,8 @@ import { useNotificationConsole } from "../../hooks/useNotificationConsole";
 import { useSidePanel } from "../../hooks/useSidePanel";
 
 export interface PanelContainerProps {
-  headerText?: string;
+  headerText: string;
-  panelContent?: JSX.Element;
+  panelContent: JSX.Element;
   isConsoleExpanded: boolean;
   isOpen: boolean;
   panelWidth?: string;
@@ -66,8 +66,8 @@ export class PanelContainerComponent extends React.Component<PanelContainerProps
     );
   }
 
-  private onDissmiss = (ev?: KeyboardEvent | React.SyntheticEvent<HTMLElement>): void => {
+  private onDissmiss = (ev?: React.SyntheticEvent<HTMLElement>): void => {
-    if (ev && (ev.target as HTMLElement).id === "notificationConsoleHeader") {
+    if ((ev.target as HTMLElement).id === "notificationConsoleHeader") {
       ev.preventDefault();
     } else {
       useSidePanel.getState().closeSidePanel();
@@ -85,12 +85,11 @@ export class PanelContainerComponent extends React.Component<PanelContainerProps
 
 export const SidePanel: React.FC = () => {
   const isConsoleExpanded = useNotificationConsole((state) => state.isExpanded);
-  const { isOpen, panelContent, panelWidth, headerText } = useSidePanel((state) => {
+  const { isOpen, panelContent, headerText } = useSidePanel((state) => {
     return {
       isOpen: state.isOpen,
       panelContent: state.panelContent,
       headerText: state.headerText,
-      panelWidth: state.panelWidth,
     };
   });
   // TODO Refactor PanelContainerComponent into a functional component and remove this wrapper
@@ -101,7 +100,6 @@ export const SidePanel: React.FC = () => {
       panelContent={panelContent}
       headerText={headerText}
       isConsoleExpanded={isConsoleExpanded}
-      panelWidth={panelWidth}
     />
   );
 };

src/Explorer/Panes/SaveQueryPane/SaveQueryPane.tsx

@@ -5,7 +5,6 @@ import { Areas, SavedQueries } from "../../../Common/Constants";
 import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
 import { Query } from "../../../Contracts/DataModels";
 import { useSidePanel } from "../../../hooks/useSidePanel";
-import { useTabs } from "../../../hooks/useTabs";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
 import { traceFailure, traceStart, traceSuccess } from "../../../Shared/Telemetry/TelemetryProcessor";
 import { logConsoleError } from "../../../Utils/NotificationConsoleUtils";
@@ -35,7 +34,7 @@ export const SaveQueryPane: FunctionComponent<SaveQueryPaneProps> = ({ explorer
       logConsoleError("Failed to save query: account not setup to save queries");
     }
 
-    const queryTab = useTabs.getState().activeTab as NewQueryTab;
+    const queryTab = explorer && (explorer.tabsManager.activeTab() as NewQueryTab);
     const query: string = queryTab && queryTab.iTabAccessor.onSaveClickEvent();
 
     if (!queryName || queryName.length === 0) {

src/Explorer/Panes/SetupNotebooksPanel/SetupNotebooksPanel.tsx

@@ -63,7 +63,7 @@ export const SetupNoteBooksPanel: FunctionComponent<SetupNoteBooksPanelProps> =
         userContext.databaseAccount.name,
         "default"
       );
-      explorer.refreshExplorer();
+      explorer.isAccountReady.valueHasMutated(); // re-trigger init notebooks
 
       closeSidePanel();
 

src/Explorer/Panes/StringInputPane/StringInputPane.tsx

@@ -1,14 +1,15 @@
 import { TextField } from "@fluentui/react";
 import React, { FormEvent, FunctionComponent, useState } from "react";
 import * as ViewModels from "../../../Contracts/ViewModels";
-import { useTabs } from "../../../hooks/useTabs";
 import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../../Utils/NotificationConsoleUtils";
+import Explorer from "../../Explorer";
 import * as FileSystemUtil from "../../Notebook/FileSystemUtil";
 import { NotebookContentItem } from "../../Notebook/NotebookContentItem";
 import NotebookV2Tab from "../../Tabs/NotebookV2Tab";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 
 export interface StringInputPanelProps {
+  explorer: Explorer;
   closePanel: () => void;
   errorMessage: string;
   inProgressMessage: string;
@@ -22,6 +23,7 @@ export interface StringInputPanelProps {
 }
 
 export const StringInputPane: FunctionComponent<StringInputPanelProps> = ({
+  explorer: container,
   closePanel,
   errorMessage,
   inProgressMessage,
@@ -53,12 +55,10 @@ export const StringInputPane: FunctionComponent<StringInputPanelProps> = ({
       logConsoleInfo(`${successMessage}: ${stringInput}`);
       const originalPath = notebookFile.path;
 
-      const notebookTabs = useTabs
+      const notebookTabs = container.tabsManager.getTabs(
-        .getState()
+        ViewModels.CollectionTabKind.NotebookV2,
-        .getTabs(
+        (tab: NotebookV2Tab) => tab.notebookPath && FileSystemUtil.isPathEqual(tab.notebookPath(), originalPath)
-          ViewModels.CollectionTabKind.NotebookV2,
+      );
-          (tab: NotebookV2Tab) => tab.notebookPath && FileSystemUtil.isPathEqual(tab.notebookPath(), originalPath)
-        );
       notebookTabs.forEach((tab) => {
         tab.tabTitle(newNotebookFile.name);
         tab.tabPath(newNotebookFile.path);

src/Explorer/Panes/StringInputPane/__snapshots__/StringInputPane.test.tsx.snap

@@ -9,8 +9,17 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
     Explorer {
       "_isInitializingNotebooks": false,
       "_resetNotebookWorkspace": [Function],
+      "isAccountReady": [Function],
       "isFixedCollectionWithSharedThroughputSupported": [Function],
+      "isNotebookEnabled": [Function],
+      "isNotebooksEnabledForAccount": [Function],
+      "isSchemaEnabled": [Function],
+      "isShellEnabled": [Function],
+      "isSynapseLinkUpdating": [Function],
       "isTabsContentExpanded": [Function],
+      "memoryUsageInfo": [Function],
+      "notebookBasePath": [Function],
+      "notebookServerInfo": [Function],
       "onRefreshDatabasesKeyPress": [Function],
       "onRefreshResourcesClick": [Function],
       "provideFeedbackEmail": [Function],
@@ -18,11 +27,21 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
         "container": [Circular],
       },
       "refreshNotebookList": [Function],
+      "resourceTokenCollection": [Function],
       "resourceTree": ResourceTreeAdapter {
         "container": [Circular],
         "copyNotebook": [Function],
         "parameters": [Function],
       },
+      "resourceTreeForResourceToken": ResourceTreeAdapterForResourceToken {
+        "container": [Circular],
+        "parameters": [Function],
+      },
+      "sparkClusterConnectionInfo": [Function],
+      "tabsManager": TabsManager {
+        "activeTab": [Function],
+        "openedTabs": [Function],
+      },
     }
   }
   inProgressMessage="Creating directory "

src/Explorer/Panes/Tables/AddTableEntityPanel.tsx

@@ -1,11 +1,11 @@
-import { IDropdownOption, Image, Label, Stack, Text, TextField } from "@fluentui/react";
+import { IDropdownOption, Image, IPanelProps, IRenderFunction, Label, Stack, Text, TextField } from "@fluentui/react";
 import { useBoolean } from "@fluentui/react-hooks";
 import React, { FunctionComponent, useEffect, useState } from "react";
 import * as _ from "underscore";
 import AddPropertyIcon from "../../../../images/Add-property.svg";
 import RevertBackIcon from "../../../../images/RevertBack.svg";
-import { getErrorMessage, handleError } from "../../../Common/ErrorHandlingUtils";
 import { TableEntity } from "../../../Common/TableEntity";
+import { useSidePanel } from "../../../hooks/useSidePanel";
 import { userContext } from "../../../UserContext";
 import * as TableConstants from "../../Tables/Constants";
 import * as DataTableUtilities from "../../Tables/DataTable/DataTableUtilities";
@@ -15,7 +15,7 @@ import { CassandraAPIDataClient, CassandraTableKey, TableDataClient } from "../.
 import * as TableEntityProcessor from "../../Tables/TableEntityProcessor";
 import * as Utilities from "../../Tables/Utilities";
 import QueryTablesTab from "../../Tabs/QueryTablesTab";
-import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
+import { PanelContainerComponent } from "../PanelContainerComponent";
 import {
   attributeNameLabel,
   attributeValueLabel,
@@ -30,7 +30,9 @@ import {
   getCassandraDefaultEntities,
   getDefaultEntities,
   getEntityValuePlaceholder,
+  getPanelTitle,
   imageProps,
+  isValidEntities,
   options,
 } from "./Validators/EntityTableHelper";
 
@@ -59,6 +61,7 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
   tableEntityListViewModel,
   cassandraApiClient,
 }: AddTableEntityPanelProps): JSX.Element => {
+  const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
   const [entities, setEntities] = useState<EntityRowType[]>([]);
   const [selectedRow, setSelectedRow] = useState<number>(0);
   const [entityAttributeValue, setEntityAttributeValue] = useState<string>("");
@@ -67,8 +70,6 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
     isEntityValuePanelOpen,
     { setTrue: setIsEntityValuePanelTrue, setFalse: setIsEntityValuePanelFalse },
   ] = useBoolean(false);
-  const [formError, setFormError] = useState<string>("");
-  const [isExecuting, setIsExecuting] = useState<boolean>(false);
 
   /* Get default and previous saved entity headers */
   useEffect(() => {
@@ -97,36 +98,19 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
   };
 
   /* Add new entity attribute */
-  const onSubmit = async (): Promise<void> => {
+  const submit = async (event: React.FormEvent<HTMLInputElement>): Promise<void> => {
-    for (let i = 0; i < entities.length; i++) {
+    if (!isValidEntities(entities)) {
-      const { property, type } = entities[i];
+      return undefined;
-      if (property === "" || property === undefined) {
-        setFormError(`Property name cannot be empty. Please enter a property name`);
-        return;
-      }
-
-      if (!type) {
-        setFormError(`Property type cannot be empty. Please select a type from the dropdown for property ${property}`);
-        return;
-      }
     }
+    event.preventDefault();
 
-    setIsExecuting(true);
     const entity: Entities.ITableEntity = entityFromAttributes(entities);
     const newEntity: Entities.ITableEntity = await tableDataClient.createDocument(queryTablesTab.collection, entity);
-    try {
+    await tableEntityListViewModel.addEntityToCache(newEntity);
-      await tableEntityListViewModel.addEntityToCache(newEntity);
+    if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
-      if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
+      tableEntityListViewModel.redrawTableThrottled();
-        tableEntityListViewModel.redrawTableThrottled();
-      }
-    } catch (error) {
-      const errorMessage = getErrorMessage(error);
-      setFormError(errorMessage);
-      handleError(errorMessage, "AddTableRow");
-      throw error;
-    } finally {
-      setIsExecuting(false);
     }
+    closeSidePanel();
   };
 
   const tryInsertNewHeaders = (viewModel: TableEntityListViewModel, newEntity: Entities.ITableEntity): boolean => {
@@ -216,80 +200,110 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
     setIsEntityValuePanelTrue();
   };
 
+  const renderPanelContent = (): JSX.Element => {
+    return (
+      <form className="panelFormWrapper">
+        <div className="panelFormWrapper">
+          <div className="panelMainContent">
+            {entities.map((entity, index) => {
+              return (
+                <TableEntity
+                  key={"" + entity.id + index}
+                  isDeleteOptionVisible={entity.isDeleteOptionVisible}
+                  entityTypeLabel={index === 0 && dataTypeLabel}
+                  entityPropertyLabel={index === 0 && attributeNameLabel}
+                  entityValueLabel={index === 0 && attributeValueLabel}
+                  options={userContext.apiType === "Cassandra" ? cassandraOptions : options}
+                  isPropertyTypeDisable={entity.isPropertyTypeDisable}
+                  entityProperty={entity.property}
+                  selectedKey={entity.type}
+                  entityPropertyPlaceHolder={detailedHelp}
+                  entityValuePlaceholder={entity.entityValuePlaceholder}
+                  entityValue={entity.value}
+                  isEntityTypeDate={entity.isEntityTypeDate}
+                  entityTimeValue={entity.entityTimeValue}
+                  onEditEntity={() => editEntity(index)}
+                  onSelectDate={(date: Date) => {
+                    entityChange(date, index, "value");
+                  }}
+                  onDeleteEntity={() => deleteEntityAtIndex(index)}
+                  onEntityPropertyChange={(event, newInput?: string) => {
+                    entityChange(newInput, index, "property");
+                  }}
+                  onEntityTypeChange={(event: React.FormEvent<HTMLDivElement>, selectedParam: IDropdownOption) => {
+                    entityTypeChange(event, selectedParam, index);
+                  }}
+                  onEntityValueChange={(event, newInput?: string) => {
+                    entityChange(newInput, index, "value");
+                  }}
+                  onEntityTimeValueChange={(event, newInput?: string) => {
+                    entityChange(newInput, index, "time");
+                  }}
+                />
+              );
+            })}
+            {userContext.apiType !== "Cassandra" && (
+              <Stack horizontal onClick={addNewEntity} className="addButtonEntiy">
+                <Image {...imageProps} src={AddPropertyIcon} alt="Add Entity" />
+                <Text className="addNewParamStyle">{getAddButtonLabel(userContext.apiType)}</Text>
+              </Stack>
+            )}
+          </div>
+          <div className="paneFooter">
+            <div className="leftpanel-okbut">
+              <input
+                type="submit"
+                onClick={submit}
+                className="genericPaneSubmitBtn"
+                value={getButtonLabel(userContext.apiType)}
+              />
+            </div>
+          </div>
+        </div>
+      </form>
+    );
+  };
+
+  const onRenderNavigationContent: IRenderFunction<IPanelProps> = () => {
+    return (
+      <Stack horizontal {...columnProps}>
+        <Image {...backImageProps} src={RevertBackIcon} alt="back" onClick={() => setIsEntityValuePanelFalse()} />
+        <Label>{entityAttributeProperty}</Label>
+      </Stack>
+    );
+  };
+
   if (isEntityValuePanelOpen) {
     return (
-      <Stack style={{ padding: "20px 34px" }}>
+      <PanelContainerComponent
-        <Stack horizontal {...columnProps}>
+        headerText=""
-          <Image {...backImageProps} src={RevertBackIcon} alt="back" onClick={() => setIsEntityValuePanelFalse()} />
+        onRenderNavigationContent={onRenderNavigationContent}
-          <Label>{entityAttributeProperty}</Label>
+        panelWidth="700px"
-        </Stack>
+        isOpen={true}
-        <TextField
+        panelContent={
-          multiline
+          <TextField
-          rows={5}
+            multiline
-          value={entityAttributeValue}
+            rows={5}
-          onChange={(event, newInput?: string) => {
+            className="entityValueTextField"
-            entityChange(newInput, selectedRow, "value");
+            value={entityAttributeValue}
-            setEntityAttributeValue(newInput);
+            onChange={(event, newInput?: string) => {
-          }}
+              entityChange(newInput, selectedRow, "value");
-        />
+              setEntityAttributeValue(newInput);
-      </Stack>
+            }}
+          />
+        }
+        isConsoleExpanded={false}
+      />
     );
   }
 
-  const props: RightPaneFormProps = {
-    formError,
-    isExecuting,
-    submitButtonText: getButtonLabel(userContext.apiType),
-    onSubmit,
-  };
-
   return (
-    <RightPaneForm {...props}>
+    <PanelContainerComponent
-      <div className="panelMainContent">
+      headerText={getPanelTitle(userContext.apiType)}
-        {entities.map((entity, index) => {
+      panelWidth="700px"
-          return (
+      isOpen={true}
-            <TableEntity
+      panelContent={renderPanelContent()}
-              key={"" + entity.id + index}
+      isConsoleExpanded={false}
-              isDeleteOptionVisible={entity.isDeleteOptionVisible}
+    />
-              entityTypeLabel={index === 0 && dataTypeLabel}
-              entityPropertyLabel={index === 0 && attributeNameLabel}
-              entityValueLabel={index === 0 && attributeValueLabel}
-              options={userContext.apiType === "Cassandra" ? cassandraOptions : options}
-              isPropertyTypeDisable={entity.isPropertyTypeDisable}
-              entityProperty={entity.property}
-              selectedKey={entity.type}
-              entityPropertyPlaceHolder={detailedHelp}
-              entityValuePlaceholder={entity.entityValuePlaceholder}
-              entityValue={entity.value}
-              isEntityTypeDate={entity.isEntityTypeDate}
-              entityTimeValue={entity.entityTimeValue}
-              onEditEntity={() => editEntity(index)}
-              onSelectDate={(date: Date) => {
-                entityChange(date, index, "value");
-              }}
-              onDeleteEntity={() => deleteEntityAtIndex(index)}
-              onEntityPropertyChange={(event, newInput?: string) => {
-                entityChange(newInput, index, "property");
-              }}
-              onEntityTypeChange={(event: React.FormEvent<HTMLDivElement>, selectedParam: IDropdownOption) => {
-                entityTypeChange(event, selectedParam, index);
-              }}
-              onEntityValueChange={(event, newInput?: string) => {
-                entityChange(newInput, index, "value");
-              }}
-              onEntityTimeValueChange={(event, newInput?: string) => {
-                entityChange(newInput, index, "time");
-              }}
-            />
-          );
-        })}
-        {userContext.apiType !== "Cassandra" && (
-          <Stack horizontal onClick={addNewEntity} className="addButtonEntiy">
-            <Image {...imageProps} src={AddPropertyIcon} alt="Add Entity" />
-            <Text className="addNewParamStyle">{getAddButtonLabel(userContext.apiType)}</Text>
-          </Stack>
-        )}
-      </div>
-    </RightPaneForm>
   );
 };

src/Explorer/Panes/Tables/EditTableEntityPanel.tsx

@@ -1,11 +1,11 @@
-import { IDropdownOption, Image, Label, Stack, Text, TextField } from "@fluentui/react";
+import { IDropdownOption, Image, IPanelProps, IRenderFunction, Label, Stack, Text, TextField } from "@fluentui/react";
 import { useBoolean } from "@fluentui/react-hooks";
 import React, { FunctionComponent, useEffect, useState } from "react";
 import * as _ from "underscore";
 import AddPropertyIcon from "../../../../images/Add-property.svg";
 import RevertBackIcon from "../../../../images/RevertBack.svg";
-import { getErrorMessage, handleError } from "../../../Common/ErrorHandlingUtils";
 import { TableEntity } from "../../../Common/TableEntity";
+import { useSidePanel } from "../../../hooks/useSidePanel";
 import { userContext } from "../../../UserContext";
 import * as TableConstants from "../../Tables/Constants";
 import * as DataTableUtilities from "../../Tables/DataTable/DataTableUtilities";
@@ -14,7 +14,7 @@ import * as Entities from "../../Tables/Entities";
 import { CassandraAPIDataClient, TableDataClient } from "../../Tables/TableDataClient";
 import * as TableEntityProcessor from "../../Tables/TableEntityProcessor";
 import QueryTablesTab from "../../Tabs/QueryTablesTab";
-import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
+import { PanelContainerComponent } from "../PanelContainerComponent";
 import {
   attributeNameLabel,
   attributeValueLabel,
@@ -29,6 +29,7 @@ import {
   getEntityValuePlaceholder,
   getFormattedTime,
   imageProps,
+  isValidEntities,
   options,
 } from "./Validators/EntityTableHelper";
 
@@ -58,13 +59,12 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
   tableEntityListViewModel,
   cassandraApiClient,
 }: EditTableEntityPanelProps): JSX.Element => {
+  const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
   const [entities, setEntities] = useState<EntityRowType[]>([]);
   const [selectedRow, setSelectedRow] = useState<number>(0);
   const [entityAttributeValue, setEntityAttributeValue] = useState<string>("");
   const [originalDocument, setOriginalDocument] = useState<Entities.ITableEntity>({});
   const [entityAttributeProperty, setEntityAttributeProperty] = useState<string>("");
-  const [formError, setFormError] = useState<string>("");
-  const [isExecuting, setIsExecuting] = useState<boolean>(false);
 
   const [
     isEntityValuePanelOpen,
@@ -190,44 +190,26 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
     return displayValue;
   };
 
-  const onSubmit = async (): Promise<void> => {
+  const submit = async (event: React.FormEvent<HTMLInputElement>): Promise<void> => {
-    for (let i = 0; i < entities.length; i++) {
+    if (!isValidEntities(entities)) {
-      const { property, type } = entities[i];
+      return undefined;
-      if (property === "" || property === undefined) {
-        setFormError(`Property name cannot be empty. Please enter a property name`);
-        return;
-      }
-
-      if (!type) {
-        setFormError(`Property type cannot be empty. Please select a type from the dropdown for property ${property}`);
-        return;
-      }
     }
-
+    event.preventDefault();
-    setIsExecuting(true);
     const entity: Entities.ITableEntity = entityFromAttributes(entities);
     const newTableDataClient = userContext.apiType === "Cassandra" ? cassandraApiClient : tableDataClient;
     const originalDocumentData = userContext.apiType === "Cassandra" ? originalDocument[0] : originalDocument;
-
+    const newEntity: Entities.ITableEntity = await newTableDataClient.updateDocument(
-    try {
+      queryTablesTab.collection,
-      const newEntity: Entities.ITableEntity = await newTableDataClient.updateDocument(
+      originalDocumentData,
-        queryTablesTab.collection,
+      entity
-        originalDocumentData,
+    );
-        entity
+    await tableEntityListViewModel.updateCachedEntity(newEntity);
-      );
+    if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
-      await tableEntityListViewModel.updateCachedEntity(newEntity);
+      tableEntityListViewModel.redrawTableThrottled();
-      if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
-        tableEntityListViewModel.redrawTableThrottled();
-      }
-      tableEntityListViewModel.selected.removeAll();
-      tableEntityListViewModel.selected.push(newEntity);
-    } catch (error) {
-      const errorMessage = getErrorMessage(error);
-      handleError(errorMessage, "EditTableRow");
-      throw error;
-    } finally {
-      setIsExecuting(false);
     }
+    tableEntityListViewModel.selected.removeAll();
+    tableEntityListViewModel.selected.push(newEntity);
+    closeSidePanel();
   };
 
   const tryInsertNewHeaders = (viewModel: TableEntityListViewModel, newEntity: Entities.ITableEntity): boolean => {
@@ -317,81 +299,109 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
     setIsEntityValuePanelTrue();
   };
 
+  const renderPanelContent = (): JSX.Element => {
+    return (
+      <form className="panelFormWrapper">
+        <div className="panelFormWrapper">
+          <div className="panelMainContent">
+            {entities.map((entity, index) => {
+              return (
+                <TableEntity
+                  key={"" + entity.id + index}
+                  isDeleteOptionVisible={entity.isDeleteOptionVisible}
+                  entityTypeLabel={index === 0 && dataTypeLabel}
+                  entityPropertyLabel={index === 0 && attributeNameLabel}
+                  entityValueLabel={index === 0 && attributeValueLabel}
+                  options={userContext.apiType === "Cassandra" ? cassandraOptions : options}
+                  isPropertyTypeDisable={entity.isPropertyTypeDisable}
+                  entityProperty={entity.property}
+                  selectedKey={entity.type}
+                  entityPropertyPlaceHolder={detailedHelp}
+                  entityValuePlaceholder={entity.entityValuePlaceholder}
+                  entityValue={entity.value?.toString()}
+                  isEntityTypeDate={entity.isEntityTypeDate}
+                  entityTimeValue={entity.entityTimeValue}
+                  isEntityValueDisable={entity.isEntityValueDisable}
+                  onEditEntity={() => editEntity(index)}
+                  onSelectDate={(date: Date) => {
+                    entityChange(date, index, "value");
+                  }}
+                  onDeleteEntity={() => deleteEntityAtIndex(index)}
+                  onEntityPropertyChange={(event, newInput?: string) => {
+                    entityChange(newInput, index, "property");
+                  }}
+                  onEntityTypeChange={(event: React.FormEvent<HTMLDivElement>, selectedParam: IDropdownOption) => {
+                    entityTypeChange(event, selectedParam, index);
+                  }}
+                  onEntityValueChange={(event, newInput?: string) => {
+                    entityChange(newInput, index, "value");
+                  }}
+                  onEntityTimeValueChange={(event, newInput?: string) => {
+                    entityChange(newInput, index, "time");
+                  }}
+                />
+              );
+            })}
+            {userContext.apiType !== "Cassandra" && (
+              <Stack horizontal onClick={addNewEntity} className="addButtonEntiy">
+                <Image {...imageProps} src={AddPropertyIcon} alt="Add Entity" />
+                <Text className="addNewParamStyle">{getAddButtonLabel(userContext.apiType)}</Text>
+              </Stack>
+            )}
+          </div>
+          {renderPanelFooter()}
+        </div>
+      </form>
+    );
+  };
+
+  const renderPanelFooter = (): JSX.Element => {
+    return (
+      <div className="paneFooter">
+        <div className="leftpanel-okbut">
+          <input type="submit" onClick={submit} className="genericPaneSubmitBtn" value="Update Entity" />
+        </div>
+      </div>
+    );
+  };
+
+  const onRenderNavigationContent: IRenderFunction<IPanelProps> = () => (
+    <Stack horizontal {...columnProps}>
+      <Image {...backImageProps} src={RevertBackIcon} alt="back" onClick={() => setIsEntityValuePanelFalse()} />
+      <Label>{entityAttributeProperty}</Label>
+    </Stack>
+  );
   if (isEntityValuePanelOpen) {
     return (
-      <Stack style={{ padding: "20px 34px" }}>
+      <PanelContainerComponent
-        <Stack horizontal {...columnProps}>
+        headerText=""
-          <Image {...backImageProps} src={RevertBackIcon} alt="back" onClick={() => setIsEntityValuePanelFalse()} />
+        onRenderNavigationContent={onRenderNavigationContent}
-          <Label>{entityAttributeProperty}</Label>
+        panelWidth="700px"
-        </Stack>
+        isOpen={true}
-        <TextField
+        panelContent={
-          multiline
+          <TextField
-          rows={5}
+            multiline
-          value={entityAttributeValue}
+            rows={5}
-          onChange={(event, newInput?: string) => {
+            className="entityValueTextField"
-            setEntityAttributeValue(newInput);
+            value={entityAttributeValue}
-            entityChange(newInput, selectedRow, "value");
+            onChange={(event, newInput?: string) => {
-          }}
+              setEntityAttributeValue(newInput);
-        />
+              entityChange(newInput, selectedRow, "value");
-      </Stack>
+            }}
+          />
+        }
+        isConsoleExpanded={false}
+      />
     );
   }
 
-  const props: RightPaneFormProps = {
-    formError,
-    isExecuting,
-    submitButtonText: "Update",
-    onSubmit,
-  };
-
   return (
-    <RightPaneForm {...props}>
+    <PanelContainerComponent
-      <div className="panelMainContent">
+      headerText="Edit Table Entity"
-        {entities.map((entity, index) => {
+      panelWidth="700px"
-          return (
+      isOpen={true}
-            <TableEntity
+      panelContent={renderPanelContent()}
-              key={"" + entity.id + index}
+      isConsoleExpanded={false}
-              isDeleteOptionVisible={entity.isDeleteOptionVisible}
+    />
-              entityTypeLabel={index === 0 && dataTypeLabel}
-              entityPropertyLabel={index === 0 && attributeNameLabel}
-              entityValueLabel={index === 0 && attributeValueLabel}
-              options={userContext.apiType === "Cassandra" ? cassandraOptions : options}
-              isPropertyTypeDisable={entity.isPropertyTypeDisable}
-              entityProperty={entity.property}
-              selectedKey={entity.type}
-              entityPropertyPlaceHolder={detailedHelp}
-              entityValuePlaceholder={entity.entityValuePlaceholder}
-              entityValue={entity.value?.toString()}
-              isEntityTypeDate={entity.isEntityTypeDate}
-              entityTimeValue={entity.entityTimeValue}
-              isEntityValueDisable={entity.isEntityValueDisable}
-              onEditEntity={() => editEntity(index)}
-              onSelectDate={(date: Date) => {
-                entityChange(date, index, "value");
-              }}
-              onDeleteEntity={() => deleteEntityAtIndex(index)}
-              onEntityPropertyChange={(event, newInput?: string) => {
-                entityChange(newInput, index, "property");
-              }}
-              onEntityTypeChange={(event: React.FormEvent<HTMLDivElement>, selectedParam: IDropdownOption) => {
-                entityTypeChange(event, selectedParam, index);
-              }}
-              onEntityValueChange={(event, newInput?: string) => {
-                entityChange(newInput, index, "value");
-              }}
-              onEntityTimeValueChange={(event, newInput?: string) => {
-                entityChange(newInput, index, "time");
-              }}
-            />
-          );
-        })}
-        {userContext.apiType !== "Cassandra" && (
-          <Stack horizontal onClick={addNewEntity} className="addButtonEntiy">
-            <Image {...imageProps} src={AddPropertyIcon} alt="Add Entity" />
-            <Text className="addNewParamStyle">{getAddButtonLabel(userContext.apiType)}</Text>
-          </Stack>
-        )}
-      </div>
-    </RightPaneForm>
   );
 };

src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx

@@ -80,7 +80,7 @@ export const int64Placeholder = "Enter a signed 64-bit integer, in the range (-2
 
 export const columnProps: Partial<IStackProps> = {
   tokens: { childrenGap: 10 },
-  styles: { root: { marginBottom: 8 } },
+  styles: { root: { width: 680 } },
 };
 
 // helper functions
@@ -134,8 +134,8 @@ export const getEntityValuePlaceholder = (entityType: string | number): string =
 
 export const isValidEntities = (entities: EntityRowType[]): boolean => {
   for (let i = 0; i < entities.length; i++) {
-    const { property, type } = entities[i];
+    const { property } = entities[i];
-    if (property === "" || property === undefined || !type) {
+    if (property === "" || property === undefined) {
       return false;
     }
   }
@@ -170,6 +170,13 @@ export const getDefaultEntities = (headers: string[], entityTypes: EntityType):
   return defaultEntities;
 };
 
+export const getPanelTitle = (apiType: string): string => {
+  if (apiType === "Cassandra") {
+    return "Add Table Row";
+  }
+  return "Add Table Row";
+};
+
 export const getAddButtonLabel = (apiType: string): string => {
   if (apiType === "Cassandra") {
     return "Add Row";

src/Explorer/Panes/__snapshots__/DeleteDatabaseConfirmationPanel.test.tsx.snap

@@ -2,7 +2,15 @@
 
 exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
 <DeleteDatabaseConfirmationPanel
-  refreshDatabases={[Function]}
+  explorer={
+    Object {
+      "refreshAllDatabases": [Function],
+      "tabsManager": TabsManager {
+        "activeTab": [Function],
+        "openedTabs": [Function],
+      },
+    }
+  }
 >
   <RightPaneForm
     formError=""

src/Explorer/SplashScreen/SplashScreen.test.ts

@@ -1,10 +1,14 @@
+import * as ko from "knockout";
 import { DataSamplesUtil } from "../DataSamples/DataSamplesUtil";
 import Explorer from "../Explorer";
+import { TabsManager } from "../Tabs/TabsManager";
 import { SplashScreen } from "./SplashScreen";
 jest.mock("../Explorer");
 
 const createExplorer = () => {
   const mock = new Explorer();
+  mock.isNotebookEnabled = ko.observable(false);
+  mock.tabsManager = new TabsManager();
   return mock as jest.Mocked<Explorer>;
 };
 

src/Explorer/SplashScreen/SplashScreen.tsx

@@ -16,16 +16,12 @@ import CollectionIcon from "../../../images/tree-collection.svg";
 import { AuthType } from "../../AuthType";
 import * as Constants from "../../Common/Constants";
 import * as ViewModels from "../../Contracts/ViewModels";
-import { useSidePanel } from "../../hooks/useSidePanel";
 import { userContext } from "../../UserContext";
 import { getCollectionName, getDatabaseName } from "../../Utils/APITypeUtils";
 import { FeaturePanelLauncher } from "../Controls/FeaturePanel/FeaturePanelLauncher";
 import { DataSamplesUtil } from "../DataSamples/DataSamplesUtil";
 import Explorer from "../Explorer";
 import * as MostRecentActivity from "../MostRecentActivity/MostRecentActivity";
-import { useNotebook } from "../Notebook/useNotebook";
-import { AddDatabasePanel } from "../Panes/AddDatabasePanel/AddDatabasePanel";
-import { BrowseQueriesPane } from "../Panes/BrowseQueriesPane/BrowseQueriesPane";
 import { useDatabases } from "../useDatabases";
 import { useSelectedNode } from "../useSelectedNode";
 
@@ -65,13 +61,8 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
 
   public componentDidMount() {
     this.subscriptions.push(
-      {
+      { dispose: useSelectedNode.subscribe(() => this.setState({})) },
-        dispose: useNotebook.subscribe(
+      this.container.isNotebookEnabled.subscribe(() => this.setState({}))
-          () => this.setState({}),
-          (state) => state.isNotebookEnabled
-        ),
-      },
-      { dispose: useSelectedNode.subscribe(() => this.setState({})) }
     );
   }
 
@@ -176,7 +167,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
                   </li>
                 ))}
                 <li>
-                  <a role="link" href={SplashScreen.seeMoreItemUrl} rel="noreferrer" target="_blank" tabIndex={0}>
+                  <a role="link" href={SplashScreen.seeMoreItemUrl} target="_blank" tabIndex={0}>
                     {SplashScreen.seeMoreItemTitle}
                   </a>
                 </li>
@@ -219,7 +210,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
       });
     }
 
-    if (useNotebook.getState().isNotebookEnabled) {
+    if (this.container.isNotebookEnabled()) {
       heroes.push({
         iconSrc: NewNotebookIcon,
         title: "New Notebook",
@@ -244,20 +235,20 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
           iconSrc: NewQueryIcon,
           onClick: () => {
             const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-            selectedCollection && selectedCollection.onNewQueryClick(selectedCollection, undefined);
+            selectedCollection && selectedCollection.onNewQueryClick(selectedCollection, null);
           },
           title: "New SQL Query",
-          description: undefined,
+          description: null,
         });
       } else if (userContext.apiType === "Mongo") {
         items.push({
           iconSrc: NewQueryIcon,
           onClick: () => {
             const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-            selectedCollection && selectedCollection.onNewMongoQueryClick(selectedCollection, undefined);
+            selectedCollection && selectedCollection.onNewMongoQueryClick(selectedCollection, null);
           },
           title: "New Query",
-          description: undefined,
+          description: null,
         });
       }
 
@@ -265,11 +256,8 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
         items.push({
           iconSrc: OpenQueryIcon,
           title: "Open Query",
-          description: undefined,
+          description: null,
-          onClick: () =>
+          onClick: () => this.container.openBrowseQueriesPanel(),
-            useSidePanel
-              .getState()
-              .openSidePanel("Open Saved Queries", <BrowseQueriesPane explorer={this.container} />),
         });
       }
 
@@ -277,22 +265,22 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
         items.push({
           iconSrc: NewStoredProcedureIcon,
           title: "New Stored Procedure",
-          description: undefined,
+          description: null,
           onClick: () => {
             const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-            selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection, undefined);
+            selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection, null);
           },
         });
       }
 
       /* Scale & Settings */
-      const isShared = useDatabases.getState().findSelectedDatabase()?.isDatabaseShared();
+      const isShared = useSelectedNode.getState().findSelectedDatabase()?.isDatabaseShared();
 
       const label = isShared ? "Settings" : "Scale & Settings";
       items.push({
         iconSrc: ScaleAndSettingsIcon,
         title: label,
-        description: undefined,
+        description: null,
         onClick: () => {
           const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
           selectedCollection && selectedCollection.onSettingsClick();
@@ -302,11 +290,8 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
       items.push({
         iconSrc: AddDatabaseIcon,
         title: "New " + getDatabaseName(),
-        description: undefined,
+        description: null,
-        onClick: () =>
+        onClick: () => this.container.openAddDatabasePane(),
-          useSidePanel
-            .getState()
-            .openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={this.container} />),
       });
     }
 
@@ -357,19 +342,19 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
   private createTipsItems(): SplashScreenItem[] {
     return [
       {
-        iconSrc: undefined,
+        iconSrc: null,
         title: "Data Modeling",
         description: "Learn more about modeling",
         onClick: () => window.open(SplashScreen.dataModelingUrl),
       },
       {
-        iconSrc: undefined,
+        iconSrc: null,
         title: "Cost & Throughput Calculation",
         description: "Learn more about cost calculation",
         onClick: () => window.open(SplashScreen.throughputEstimatorUrl),
       },
       {
-        iconSrc: undefined,
+        iconSrc: null,
         title: "Configure automatic failover",
         description: "Learn more about Cosmos DB high-availability",
         onClick: () => window.open(SplashScreen.failoverUrl),

src/Explorer/Tables/Constants.ts

@@ -1,4 +1,4 @@
-export const TableType = {
+export var TableType = {
   String: "String",
   Boolean: "Boolean",
   Binary: "Binary",
@@ -9,7 +9,7 @@ export const TableType = {
   Int64: "Int64",
 };
 
-export const CassandraType = {
+export var CassandraType = {
   Ascii: "Ascii",
   Bigint: "Bigint",
   Blob: "Blob",
@@ -27,12 +27,12 @@ export const CassandraType = {
   Tinyint: "Tinyint",
 };
 
-export const ClauseRule = {
+export var ClauseRule = {
   And: "And",
   Or: "Or",
 };
 
-export const Operator = {
+export var Operator = {
   EqualTo: "==",
   GreaterThan: ">",
   GreaterThanOrEqualTo: ">=",
@@ -42,7 +42,7 @@ export const Operator = {
   Equal: "=",
 };
 
-export const ODataOperator = {
+export var ODataOperator = {
   EqualTo: "eq",
   GreaterThan: "gt",
   GreaterThanOrEqualTo: "ge",
@@ -51,7 +51,7 @@ export const ODataOperator = {
   NotEqualTo: "ne",
 };
 
-export const timeOptions = {
+export var timeOptions = {
   lastHour: "Last hour",
   last24Hours: "Last 24 hours",
   last7Days: "Last 7 days",
@@ -62,7 +62,7 @@ export const timeOptions = {
   custom: "Custom...",
 };
 
-export const htmlSelectors = {
+export var htmlSelectors = {
   dataTableSelector: "#storageTable",
   dataTableAllRowsSelector: "#storageTable tbody tr",
   dataTableHeadRowSelector: ".dataTable thead tr",
@@ -84,9 +84,9 @@ export const htmlSelectors = {
   selectAllDropdownSelector: "#select-all-dropdown",
 };
 
-export const defaultHeader = " ";
+export var defaultHeader = " ";
 
-export const EntityKeyNames = {
+export var EntityKeyNames = {
   PartitionKey: "PartitionKey",
   RowKey: "RowKey",
   Timestamp: "Timestamp",
@@ -94,7 +94,7 @@ export const EntityKeyNames = {
   Etag: "etag",
 };
 
-export const htmlAttributeNames = {
+export var htmlAttributeNames = {
   dataTableNameAttr: "name_attr",
   dataTableContentTypeAttr: "contentType_attr",
   dataTableSnapshotAttr: "snapshot_attr",
@@ -103,14 +103,14 @@ export const htmlAttributeNames = {
   dataTableHeaderIndex: "data-column-index",
 };
 
-export const cssColors = {
+export var cssColors = {
   commonControlsButtonActive: "#B4C7DC" /* A darker shade of [{common-controls-button-hover-background}] */,
 };
 
-export const clauseGroupColors = ["#ffe1ff", "#fffacd", "#f0ffff", "#ffefd5", "#f0fff0"];
+export var clauseGroupColors = ["#ffe1ff", "#fffacd", "#f0ffff", "#ffefd5", "#f0fff0"];
-export const transparentColor = "transparent";
+export var transparentColor = "transparent";
 
-export const keyCodes = {
+export var keyCodes = {
   RightClick: 3,
   Enter: 13,
   Esc: 27,
@@ -163,7 +163,7 @@ export const keyCodes = {
   Dash: 189,
 };
 
-export const InputType = {
+export var InputType = {
   Text: "text",
   // Chrome doesn't support datetime, instead, datetime-local is supported.
   DateTime: "datetime-local",

src/Explorer/Tables/CqlUtilities.ts

@@ -1,5 +1,4 @@
-// Added return type optional undefined because passing undefined from test cases.
+export function getQuotedCqlIdentifier(identifier: string): string {
-export function getQuotedCqlIdentifier(identifier: string | undefined): string | undefined {
   let result = identifier;
   if (!identifier) {
     return result;

src/Explorer/Tabs/DocumentTabUtils.tsx

@@ -1,145 +0,0 @@
-import { extractPartitionKey, PartitionKeyDefinition } from "@azure/cosmos";
-import { IColumn, IImageProps, ImageFit } from "@fluentui/react";
-import { Resource } from "../../../src/Contracts/DataModels";
-import * as DataModels from "../../Contracts/DataModels";
-import DocumentId from "../Tree/DocumentId";
-
-export interface IDocumentsTabContentState {
-  columns: IColumn[];
-  isModalSelection: boolean;
-  isCompactMode: boolean;
-  announcedMessage?: string;
-  isSuggestionVisible: boolean;
-  filter: string;
-  isFilterOptionVisible: boolean;
-  isEditorVisible: boolean;
-  documentContent: string;
-  selectedSqlDocumentContent: string;
-  documentIds: Array<DocumentId>;
-  documentSqlIds: Array<Resource>;
-  selectedDocumentId?: DocumentId;
-  selectedSqlDocumentId?: DocumentId;
-  isEditorContentEdited: boolean;
-  isAllDocumentsVisible: boolean;
-}
-
-export interface IDocument {
-  value: string;
-  id: string;
-}
-
-export interface IButton {
-  visible: boolean;
-  enabled: boolean;
-  isSelected?: boolean;
-}
-
-export const imageProps: Partial<IImageProps> = {
-  imageFit: ImageFit.centerContain,
-  width: 40,
-  height: 40,
-  style: { marginTop: "15px" },
-};
-
-export function hasShardKeySpecified(
-  document: string,
-  partitionKey: DataModels.PartitionKey,
-  partitionKeyProperty: string
-): boolean {
-  return Boolean(
-    extractPartitionKey(
-      document,
-      getPartitionKeyDefinition(partitionKey, partitionKeyProperty) as PartitionKeyDefinition
-    )
-  );
-}
-
-export function getPartitionKeyDefinition(
-  partitionKey: DataModels.PartitionKey,
-  partitionKeyProperty: string
-): DataModels.PartitionKey {
-  if (partitionKey?.paths?.[0]?.indexOf("$v") > -1) {
-    // Convert BsonSchema2 to /path format
-    partitionKey = {
-      kind: partitionKey.kind,
-      paths: ["/" + partitionKeyProperty.replace(/\./g, "/")],
-      version: partitionKey.version,
-    };
-  }
-  return partitionKey;
-}
-
-export function formatDocumentContent(row: DocumentId): string {
-  const { partitionKeyProperty, partitionKeyValue, id } = row;
-  const documentContent = JSON.stringify({
-    _id: id(),
-    [partitionKeyProperty]: partitionKeyValue || "",
-  });
-  const formattedDocumentContent = documentContent.replace(/,/g, ",\n").replace("{", "{\n").replace("}", "\n}");
-  return formattedDocumentContent;
-}
-
-export function formatSqlDocumentContent(row: Resource): string {
-  const { id, _rid, _self, _ts, _etag, _partitionKey, _attachments } = row;
-  const documentContent = JSON.stringify({
-    id: id || "",
-    _rid: _rid || "",
-    _self: _self || "",
-    _ts: _ts || "",
-    _etag: _etag || "",
-    _attachments: _attachments || "",
-    _partitionKey: _partitionKey || "",
-  });
-  const formattedDocumentContent = documentContent.replace(/,/g, ",\n").replace("{", "{\n").replace("}", "\n}");
-  return formattedDocumentContent;
-}
-
-export function getFilterPlaceholder(isPreferredApiMongoDB: boolean): string {
-  const filterPlaceholder = isPreferredApiMongoDB
-    ? "Type a query predicate (e.g., {´a´:´foo´}), or choose one from the drop down list, or leave empty to query all documents."
-    : "Type a query predicate (e.g., WHERE c.id=´1´), or choose one from the drop down list, or leave empty to query all documents.";
-  return filterPlaceholder;
-}
-
-export function getFilterSuggestions(isPreferredApiMongoDB: boolean): { value: string }[] {
-  const filterSuggestions = isPreferredApiMongoDB
-    ? [{ value: `{"_id": "foo"}` }, { value: "{ qty: { $gte: 20 } }" }]
-    : [
-        { value: 'WHERE c.id = "foo"' },
-        { value: "ORDER BY c._ts DESC" },
-        { value: 'WHERE c.id = "foo" ORDER BY c._ts DESC' },
-      ];
-  return filterSuggestions;
-}
-
-export function getDocumentItems(
-  isPreferredApiMongoDB: boolean,
-  documentIds: Array<DocumentId>,
-  documentSqlIds: Array<Resource>,
-  isAllDocumentsVisible: boolean
-): Array<DocumentId> | Array<Resource> {
-  if (isPreferredApiMongoDB) {
-    return isAllDocumentsVisible ? documentIds : documentIds.slice(0, 5);
-  }
-  return isAllDocumentsVisible ? documentSqlIds : documentSqlIds.slice(0, 5);
-}
-
-export const assignTabButtonVisibility = (
-  visible: boolean,
-  enabled: boolean
-): { visible: boolean; enabled: boolean } => {
-  return {
-    visible,
-    enabled,
-  };
-};
-
-export const getfilterText = (isPreferredApiMongoDB: boolean, filter: string): string => {
-  if (isPreferredApiMongoDB) {
-    if (filter) {
-      return `Filter : ${filter}`;
-    }
-    return "No filter applied";
-  }
-  return `Select * from C ${filter}`;
-};

src/Explorer/Tabs/DocumentsTab.html

@@ -0,0 +1,221 @@
+<div
+  class="tab-pane active tabdocuments flexContainer"
+  data-bind="
+    setTemplateReady: true,
+    attr:{
+        id: tabId
+    },
+    visible: isActive"
+  role="tabpanel"
+>
+  <!-- ko if: false -->
+  <!-- Messagebox Ok Cancel- Start -->
+  <div class="messagebox-background">
+    <div class="messagebox">
+      <h2 class="messagebox-title">Title</h2>
+      <div class="messagebox-text" tabindex="0">Text</div>
+      <div class="messagebox-buttons">
+        <div class="messagebox-buttons-container">
+          <button value="ok" class="messagebox-button-primary">Ok</button>
+          <button value="cancel" class="messagebox-button-default">Cancel</button>
+        </div>
+      </div>
+    </div>
+  </div>
+  <!-- Messagebox OK Cancel - End -->
+  <!-- /ko -->
+
+  <!-- Filter - Start -->
+  <div class="filterdivs" data-bind="visible: isFilterCreated">
+    <!-- Read-only Filter - Start -->
+    <div class="filterDocCollapsed" data-bind="visible: !isFilterExpanded() && !isPreferredApiMongoDB">
+      <span class="selectQuery">SELECT * FROM c</span>
+      <span class="appliedQuery" data-bind="text: appliedFilter"></span>
+      <button class="filterbtnstyle queryButton" data-bind="click: onShowFilterClick">Edit Filter</button>
+    </div>
+    <div
+      class="filterDocCollapsed"
+      data-bind="
+                visible: !isFilterExpanded() && isPreferredApiMongoDB"
+    >
+      <span
+        class="selectQuery"
+        data-bind="
+                visible: appliedFilter().length > 0"
+        >Filter :
+      </span>
+      <span
+        class="noFilterApplied"
+        data-bind="
+                visible: !appliedFilter().length > 0"
+        >No filter applied</span
+      >
+      <span class="appliedQuery" data-bind="text: appliedFilter"></span>
+      <button
+        class="filterbtnstyle queryButton"
+        data-bind="
+                    click: onShowFilterClick"
+      >
+        Edit Filter
+      </button>
+    </div>
+    <!-- Read-only Filter - End -->
+
+    <!-- Editable Filter - start -->
+    <div
+      class="filterDocExpanded"
+      data-bind="
+                visible: isFilterExpanded"
+    >
+      <div>
+        <div class="editFilterContainer">
+          <span class="filterspan" data-bind="visible: !isPreferredApiMongoDB"> SELECT * FROM c </span>
+          <input
+            type="text"
+            list="filtersList"
+            class="querydropdown"
+            title="Type a query predicate or choose one from the list."
+            data-bind="
+                                attr:{
+                                    placeholder:isPreferredApiMongoDB?'Type a query predicate (e.g., {´a´:´foo´}), or choose one from the drop down list, or leave empty to query all documents.':'Type a query predicate (e.g., WHERE c.id=´1´), or choose one from the drop down list, or leave empty to query all documents.'
+                                },
+                                css: { placeholderVisible: filterContent().length === 0 },
+                                textInput: filterContent"
+          />
+
+          <datalist
+            id="filtersList"
+            data-bind="
+                            foreach: lastFilterContents"
+          >
+            <option
+              data-bind="
+                                value: $data"
+            ></option>
+          </datalist>
+
+          <span class="filterbuttonpad">
+            <button
+              class="filterbtnstyle queryButton"
+              data-bind="
+                                click: refreshDocumentsGrid,
+                                enable: applyFilterButton.enabled"
+              aria-label="Apply filter"
+              tabindex="0"
+            >
+              Apply Filter
+            </button>
+          </span>
+          <span
+            class="filterclose"
+            role="button"
+            aria-label="close filter"
+            tabindex="0"
+            data-bind="
+                            click: onHideFilterClick, event: { keydown: onCloseButtonKeyDown }"
+          >
+            <img src="/close-black.svg" style="height: 14px; width: 14px" alt="Hide filter" />
+          </span>
+        </div>
+      </div>
+    </div>
+    <!-- Editable Filter - End -->
+  </div>
+  <!-- Filter - End -->
+
+  <!-- Ids and Editor - Start -->
+  <div class="documentsTabGridAndEditor">
+    <div class="documentsContainerWithSplitter" , data-bind="attr: { id: documentContentsContainerId }">
+      <div class="flexContainer">
+        <!-- Document Ids - Start -->
+        <div
+          class="documentsGridHeaderContainer tabdocuments scrollable"
+          data-bind="
+                attr: {
+                    id: documentContentsGridId,
+                    tabindex: documentIds().length <= 0 ? -1 : 0
+                },
+                style: { height: dataContentsGridScrollHeight },
+                event: { keydown: accessibleDocumentList.onKeyDown }"
+        >
+          <table id="tabsTable" class="table table-hover can-select dataTable">
+            <thead id="theadcontent">
+              <tr>
+                <th class="documentsGridHeader" data-bind="text: idHeader" tabindex="0"></th>
+                <!-- ko if: showPartitionKey -->
+                <th
+                  class="documentsGridHeader documentsGridPartition evenlySpacedHeader"
+                  data-bind="
+                                              attr: {
+                                                  title: partitionKeyPropertyHeader
+                                              },
+                                              text: partitionKeyPropertyHeader"
+                  tabindex="0"
+                ></th>
+                <!-- /ko -->
+                <th
+                  class="refreshColHeader"
+                  role="button"
+                  aria-label="Refresh documents"
+                  data-bind="event: { keydown: onRefreshButtonKeyDown }"
+                >
+                  <img
+                    class="refreshcol"
+                    src="/refresh-cosmos.svg"
+                    data-bind="click: refreshDocumentsGrid"
+                    alt="Refresh documents"
+                    tabindex="0"
+                  />
+                </th>
+              </tr>
+            </thead>
+            <tbody id="tbodycontent">
+              <!-- ko foreach: documentIds -->
+              <tr
+                class="pointer accessibleListElement"
+                data-bind="
+                                click: $data.click,
+                                css: {
+                                    gridRowSelected: $parent.selectedDocumentId && $parent.selectedDocumentId() && $parent.selectedDocumentId().rid === $data.rid,
+                                    gridRowHighlighted: $parent.accessibleDocumentList.currentItem() && $parent.accessibleDocumentList.currentItem().rid === $data.rid
+                                }"
+                tabindex="0"
+              >
+                <td class="tabdocumentsGridElement"><a data-bind="text: $data.id, attr: { title: $data.id }"></a></td>
+                <!-- ko if: $data.partitionKeyProperty -->
+                <td class="tabdocumentsGridElement" colspan="2">
+                  <a
+                    data-bind="text: $data.stringPartitionKeyValue, attr: { title: $data.stringPartitionKeyValue }"
+                  ></a>
+                </td>
+                <!-- /ko -->
+              </tr>
+              <!-- /ko -->
+            </tbody>
+          </table>
+        </div>
+        <div class="loadMore">
+          <a role="button" data-bind="click: loadNextPage, event: { keypress: onLoadMoreKeyInput }" tabindex="0"
+            >Load more</a
+          >
+        </div>
+        <!-- Document Ids - End -->
+        <!-- Splitter -->
+      </div>
+      <div class="splitter ui-resizable-handle ui-resizable-e colResizePointer" id="h_splitter2"></div>
+    </div>
+    <div class="documentWaterMark" data-bind="visible: !shouldShowEditor()">
+      <p><img src="/DocumentWaterMark.svg" alt="Document WaterMark" /></p>
+      <p class="documentWaterMarkText">Create new or work with existing document(s).</p>
+    </div>
+    <!-- Editor - Start -->
+    <json-editor
+      class="editorDivContent"
+      data-bind="visible: shouldShowEditor, css: { mongoDocumentEditor: isPreferredApiMongoDB }"
+      params="{content: initialDocumentContent, isReadOnly: false,lineNumbers: 'on',ariaLabel: 'Document editor',
+            updatedContent: selectedDocumentContent}"
+    ></json-editor>
+    <!-- Editor - End -->
+  </div>
+  <!-- Ids and Editor - End -->
+</div>

src/Explorer/Tabs/DocumentsTab.test.ts

@@ -0,0 +1,152 @@
+import * as ko from "knockout";
+import { DatabaseAccount } from "../../Contracts/DataModels";
+import * as ViewModels from "../../Contracts/ViewModels";
+import { updateUserContext } from "../../UserContext";
+import Explorer from "../Explorer";
+import DocumentId from "../Tree/DocumentId";
+import DocumentsTab from "./DocumentsTab";
+
+describe("Documents tab", () => {
+  describe("buildQuery", () => {
+    it("should generate the right select query for SQL API", () => {
+      const documentsTab = new DocumentsTab({
+        partitionKey: null,
+        documentIds: ko.observableArray<DocumentId>(),
+        tabKind: ViewModels.CollectionTabKind.Documents,
+        title: "",
+        tabPath: "",
+      });
+
+      expect(documentsTab.buildQuery("")).toContain("select");
+    });
+  });
+
+  describe("showPartitionKey", () => {
+    const explorer = new Explorer();
+    const mongoExplorer = new Explorer();
+    updateUserContext({
+      databaseAccount: {
+        properties: {
+          capabilities: [{ name: "EnableGremlin" }],
+        },
+      } as DatabaseAccount,
+    });
+
+    const collectionWithoutPartitionKey = <ViewModels.Collection>(<unknown>{
+      id: ko.observable<string>("foo"),
+      database: {
+        id: ko.observable<string>("foo"),
+      },
+      container: explorer,
+    });
+
+    const collectionWithSystemPartitionKey = <ViewModels.Collection>(<unknown>{
+      id: ko.observable<string>("foo"),
+      database: {
+        id: ko.observable<string>("foo"),
+      },
+      partitionKey: {
+        paths: ["/foo"],
+        kind: "Hash",
+        version: 2,
+        systemKey: true,
+      },
+      container: explorer,
+    });
+
+    const collectionWithNonSystemPartitionKey = <ViewModels.Collection>(<unknown>{
+      id: ko.observable<string>("foo"),
+      database: {
+        id: ko.observable<string>("foo"),
+      },
+      partitionKey: {
+        paths: ["/foo"],
+        kind: "Hash",
+        version: 2,
+        systemKey: false,
+      },
+      container: explorer,
+    });
+
+    const mongoCollectionWithSystemPartitionKey = <ViewModels.Collection>(<unknown>{
+      id: ko.observable<string>("foo"),
+      database: {
+        id: ko.observable<string>("foo"),
+      },
+      partitionKey: {
+        paths: ["/foo"],
+        kind: "Hash",
+        version: 2,
+        systemKey: true,
+      },
+      container: mongoExplorer,
+    });
+
+    it("should be false for null or undefined collection", () => {
+      const documentsTab = new DocumentsTab({
+        partitionKey: null,
+        documentIds: ko.observableArray<DocumentId>(),
+        tabKind: ViewModels.CollectionTabKind.Documents,
+        title: "",
+        tabPath: "",
+      });
+
+      expect(documentsTab.showPartitionKey).toBe(false);
+    });
+
+    it("should be false for null or undefined partitionKey", () => {
+      const documentsTab = new DocumentsTab({
+        collection: collectionWithoutPartitionKey,
+        partitionKey: null,
+        documentIds: ko.observableArray<DocumentId>(),
+        tabKind: ViewModels.CollectionTabKind.Documents,
+        title: "",
+        tabPath: "",
+      });
+
+      expect(documentsTab.showPartitionKey).toBe(false);
+    });
+
+    it("should be true for non-Mongo accounts with system partitionKey", () => {
+      const documentsTab = new DocumentsTab({
+        collection: collectionWithSystemPartitionKey,
+        partitionKey: null,
+        documentIds: ko.observableArray<DocumentId>(),
+        tabKind: ViewModels.CollectionTabKind.Documents,
+        title: "",
+        tabPath: "",
+      });
+
+      expect(documentsTab.showPartitionKey).toBe(true);
+    });
+
+    it("should be false for Mongo accounts with system partitionKey", () => {
+      updateUserContext({
+        apiType: "Mongo",
+      });
+      const documentsTab = new DocumentsTab({
+        collection: mongoCollectionWithSystemPartitionKey,
+        partitionKey: null,
+        documentIds: ko.observableArray<DocumentId>(),
+        tabKind: ViewModels.CollectionTabKind.Documents,
+        title: "",
+        tabPath: "",
+      });
+
+      expect(documentsTab.showPartitionKey).toBe(false);
+    });
+
+    it("should be true for non-system partitionKey", () => {
+      const documentsTab = new DocumentsTab({
+        collection: collectionWithNonSystemPartitionKey,
+        partitionKey: null,
+        documentIds: ko.observableArray<DocumentId>(),
+        tabKind: ViewModels.CollectionTabKind.Documents,
+        title: "",
+        tabPath: "",
+      });
+
+      expect(documentsTab.showPartitionKey).toBe(true);
+    });
+  });
+});

src/Explorer/Tabs/DocumentsTab.ts

@@ -0,0 +1,924 @@
+import { extractPartitionKey, ItemDefinition, PartitionKeyDefinition, QueryIterator, Resource } from "@azure/cosmos";
+import * as ko from "knockout";
+import Q from "q";
+import DeleteDocumentIcon from "../../../images/DeleteDocument.svg";
+import DiscardIcon from "../../../images/discard.svg";
+import NewDocumentIcon from "../../../images/NewDocument.svg";
+import SaveIcon from "../../../images/save-cosmos.svg";
+import UploadIcon from "../../../images/Upload_16x16.svg";
+import * as Constants from "../../Common/Constants";
+import { DocumentsGridMetrics, KeyCodes } from "../../Common/Constants";
+import { createDocument } from "../../Common/dataAccess/createDocument";
+import { deleteDocument } from "../../Common/dataAccess/deleteDocument";
+import { queryDocuments } from "../../Common/dataAccess/queryDocuments";
+import { readDocument } from "../../Common/dataAccess/readDocument";
+import { updateDocument } from "../../Common/dataAccess/updateDocument";
+import editable from "../../Common/EditableUtility";
+import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
+import * as HeadersUtility from "../../Common/HeadersUtility";
+import { Splitter, SplitterBounds, SplitterDirection } from "../../Common/Splitter";
+import * as DataModels from "../../Contracts/DataModels";
+import * as ViewModels from "../../Contracts/ViewModels";
+import { Action } from "../../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
+import { userContext } from "../../UserContext";
+import { logConsoleError } from "../../Utils/NotificationConsoleUtils";
+import * as QueryUtils from "../../Utils/QueryUtils";
+import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
+import Explorer from "../Explorer";
+import { AccessibleVerticalList } from "../Tree/AccessibleVerticalList";
+import DocumentId from "../Tree/DocumentId";
+import { useSelectedNode } from "../useSelectedNode";
+import template from "./DocumentsTab.html";
+import TabsBase from "./TabsBase";
+
+export default class DocumentsTab extends TabsBase {
+  public readonly html = template;
+  public selectedDocumentId: ko.Observable<DocumentId>;
+  public selectedDocumentContent: ViewModels.Editable<string>;
+  public initialDocumentContent: ko.Observable<string>;
+  public documentContentsGridId: string;
+  public documentContentsContainerId: string;
+  public filterContent: ko.Observable<string>;
+  public appliedFilter: ko.Observable<string>;
+  public lastFilterContents: ko.ObservableArray<string>;
+  public isFilterExpanded: ko.Observable<boolean>;
+  public isFilterCreated: ko.Observable<boolean>;
+  public applyFilterButton: ViewModels.Button;
+  public isEditorDirty: ko.Computed<boolean>;
+  public editorState: ko.Observable<ViewModels.DocumentExplorerState>;
+  public newDocumentButton: ViewModels.Button;
+  public saveNewDocumentButton: ViewModels.Button;
+  public saveExisitingDocumentButton: ViewModels.Button;
+  public discardNewDocumentChangesButton: ViewModels.Button;
+  public discardExisitingDocumentChangesButton: ViewModels.Button;
+  public deleteExisitingDocumentButton: ViewModels.Button;
+  public displayedError: ko.Observable<string>;
+  public accessibleDocumentList: AccessibleVerticalList;
+  public dataContentsGridScrollHeight: ko.Observable<string>;
+  public isPreferredApiMongoDB: boolean;
+  public shouldShowEditor: ko.Computed<boolean>;
+  public splitter: Splitter;
+  public showPartitionKey: boolean;
+  public idHeader: string;
+
+  // TODO need to refactor
+  public partitionKey: DataModels.PartitionKey;
+  public partitionKeyPropertyHeader: string;
+  public partitionKeyProperty: string;
+  public documentIds: ko.ObservableArray<DocumentId>;
+
+  private _documentsIterator: QueryIterator<ItemDefinition & Resource>;
+  private _resourceTokenPartitionKey: string;
+
+  constructor(options: ViewModels.DocumentsTabOptions) {
+    super(options);
+    this.isPreferredApiMongoDB = userContext.apiType === "Mongo" || options.isPreferredApiMongoDB;
+
+    this.idHeader = this.isPreferredApiMongoDB ? "_id" : "id";
+
+    this.documentContentsGridId = `documentContentsGrid${this.tabId}`;
+    this.documentContentsContainerId = `documentContentsContainer${this.tabId}`;
+    this.editorState = ko.observable<ViewModels.DocumentExplorerState>(
+      ViewModels.DocumentExplorerState.noDocumentSelected
+    );
+    this.selectedDocumentId = ko.observable<DocumentId>();
+    this.selectedDocumentContent = editable.observable<string>("");
+    this.initialDocumentContent = ko.observable<string>("");
+    this.partitionKey = options.partitionKey || (this.collection && this.collection.partitionKey);
+    this._resourceTokenPartitionKey = options.resourceTokenPartitionKey;
+    this.documentIds = options.documentIds;
+
+    this.partitionKeyPropertyHeader =
+      (this.collection && this.collection.partitionKeyPropertyHeader) || this._getPartitionKeyPropertyHeader();
+    this.partitionKeyProperty = !!this.partitionKeyPropertyHeader
+      ? this.partitionKeyPropertyHeader.replace(/[/]+/g, ".").substr(1).replace(/[']+/g, "")
+      : null;
+
+    this.isFilterExpanded = ko.observable<boolean>(false);
+    this.isFilterCreated = ko.observable<boolean>(true);
+    this.filterContent = ko.observable<string>("");
+    this.appliedFilter = ko.observable<string>("");
+    this.displayedError = ko.observable<string>("");
+    this.lastFilterContents = ko.observableArray<string>([
+      'WHERE c.id = "foo"',
+      "ORDER BY c._ts DESC",
+      'WHERE c.id = "foo" ORDER BY c._ts DESC',
+    ]);
+
+    this.dataContentsGridScrollHeight = ko.observable<string>(null);
+
+    // initialize splitter only after template has been loaded so dom elements are accessible
+    super.onTemplateReady((isTemplateReady: boolean) => {
+      if (isTemplateReady) {
+        const tabContainer: HTMLElement = document.getElementById("content");
+        const splitterBounds: SplitterBounds = {
+          min: Constants.DocumentsGridMetrics.DocumentEditorMinWidthRatio * tabContainer.clientWidth,
+          max: Constants.DocumentsGridMetrics.DocumentEditorMaxWidthRatio * tabContainer.clientWidth,
+        };
+        this.splitter = new Splitter({
+          splitterId: "h_splitter2",
+          leftId: this.documentContentsContainerId,
+          bounds: splitterBounds,
+          direction: SplitterDirection.Vertical,
+        });
+      }
+    });
+
+    this.accessibleDocumentList = new AccessibleVerticalList(this.documentIds());
+    this.accessibleDocumentList.setOnSelect(
+      (selectedDocument: DocumentId) => selectedDocument && selectedDocument.click()
+    );
+    this.selectedDocumentId.subscribe((newSelectedDocumentId: DocumentId) =>
+      this.accessibleDocumentList.updateCurrentItem(newSelectedDocumentId)
+    );
+    this.documentIds.subscribe((newDocuments: DocumentId[]) => {
+      this.accessibleDocumentList.updateItemList(newDocuments);
+      if (newDocuments.length > 0) {
+        this.dataContentsGridScrollHeight(
+          newDocuments.length * DocumentsGridMetrics.IndividualRowHeight + DocumentsGridMetrics.BufferHeight + "px"
+        );
+      } else {
+        this.dataContentsGridScrollHeight(
+          DocumentsGridMetrics.IndividualRowHeight + DocumentsGridMetrics.BufferHeight + "px"
+        );
+      }
+    });
+
+    this.isEditorDirty = ko.computed<boolean>(() => {
+      switch (this.editorState()) {
+        case ViewModels.DocumentExplorerState.noDocumentSelected:
+        case ViewModels.DocumentExplorerState.exisitingDocumentNoEdits:
+          return false;
+
+        case ViewModels.DocumentExplorerState.newDocumentValid:
+        case ViewModels.DocumentExplorerState.newDocumentInvalid:
+        case ViewModels.DocumentExplorerState.exisitingDocumentDirtyInvalid:
+          return true;
+
+        case ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid:
+          return (
+            this.selectedDocumentContent.getEditableOriginalValue() !==
+            this.selectedDocumentContent.getEditableCurrentValue()
+          );
+
+        default:
+          return false;
+      }
+    });
+
+    this.newDocumentButton = {
+      enabled: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.noDocumentSelected:
+          case ViewModels.DocumentExplorerState.exisitingDocumentNoEdits:
+            return true;
+        }
+
+        return false;
+      }),
+
+      visible: ko.computed<boolean>(() => {
+        return true;
+      }),
+    };
+
+    this.saveNewDocumentButton = {
+      enabled: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.newDocumentValid:
+            return true;
+        }
+
+        return false;
+      }),
+
+      visible: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.newDocumentValid:
+          case ViewModels.DocumentExplorerState.newDocumentInvalid:
+            return true;
+        }
+
+        return false;
+      }),
+    };
+
+    this.discardNewDocumentChangesButton = {
+      enabled: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.newDocumentValid:
+          case ViewModels.DocumentExplorerState.newDocumentInvalid:
+            return true;
+        }
+
+        return false;
+      }),
+
+      visible: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.newDocumentValid:
+          case ViewModels.DocumentExplorerState.newDocumentInvalid:
+            return true;
+        }
+
+        return false;
+      }),
+    };
+
+    this.saveExisitingDocumentButton = {
+      enabled: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid:
+            return true;
+        }
+
+        return false;
+      }),
+
+      visible: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.exisitingDocumentNoEdits:
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyInvalid:
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid:
+            return true;
+        }
+
+        return false;
+      }),
+    };
+
+    this.discardExisitingDocumentChangesButton = {
+      enabled: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyInvalid:
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid:
+            return true;
+        }
+
+        return false;
+      }),
+
+      visible: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.exisitingDocumentNoEdits:
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyInvalid:
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid:
+            return true;
+        }
+
+        return false;
+      }),
+    };
+
+    this.deleteExisitingDocumentButton = {
+      enabled: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.exisitingDocumentNoEdits:
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyInvalid:
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid:
+            return true;
+        }
+
+        return false;
+      }),
+
+      visible: ko.computed<boolean>(() => {
+        switch (this.editorState()) {
+          case ViewModels.DocumentExplorerState.exisitingDocumentNoEdits:
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyInvalid:
+          case ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid:
+            return true;
+        }
+
+        return false;
+      }),
+    };
+
+    this.applyFilterButton = {
+      enabled: ko.computed<boolean>(() => {
+        return true;
+      }),
+
+      visible: ko.computed<boolean>(() => {
+        return true;
+      }),
+    };
+    this.buildCommandBarOptions();
+    this.shouldShowEditor = ko.computed<boolean>(() => {
+      const documentHasContent: boolean =
+        this.selectedDocumentContent() != null && this.selectedDocumentContent().length > 0;
+      const isNewDocument: boolean =
+        this.editorState() === ViewModels.DocumentExplorerState.newDocumentValid ||
+        this.editorState() === ViewModels.DocumentExplorerState.newDocumentInvalid;
+
+      return documentHasContent || isNewDocument;
+    });
+    this.selectedDocumentContent.subscribe((newContent: string) => this._onEditorContentChange(newContent));
+
+    this.showPartitionKey = this._shouldShowPartitionKey();
+  }
+
+  private _shouldShowPartitionKey(): boolean {
+    if (!this.collection) {
+      return false;
+    }
+
+    if (!this.collection.partitionKey) {
+      return false;
+    }
+
+    if (this.collection.partitionKey.systemKey && this.isPreferredApiMongoDB) {
+      return false;
+    }
+
+    return true;
+  }
+
+  public onShowFilterClick(): Q.Promise<any> {
+    this.isFilterCreated(true);
+    this.isFilterExpanded(true);
+
+    $(".filterDocExpanded").addClass("active");
+    $("#content").addClass("active");
+    $(".querydropdown").focus();
+
+    return Q();
+  }
+
+  public onHideFilterClick(): Q.Promise<any> {
+    this.isFilterExpanded(false);
+
+    $(".filterDocExpanded").removeClass("active");
+    $("#content").removeClass("active");
+    $(".queryButton").focus();
+    return Q();
+  }
+
+  public onCloseButtonKeyDown = (source: any, event: KeyboardEvent): boolean => {
+    if (event.keyCode === KeyCodes.Enter || event.keyCode === KeyCodes.Space) {
+      this.onHideFilterClick();
+      event.stopPropagation();
+      return false;
+    }
+    return true;
+  };
+
+  public async refreshDocumentsGrid(): Promise<void> {
+    // clear documents grid
+    this.documentIds([]);
+
+    try {
+      // reset iterator
+      this._documentsIterator = this.createIterator();
+      // load documents
+      await this.loadNextPage();
+      // collapse filter
+      this.appliedFilter(this.filterContent());
+      this.isFilterExpanded(false);
+      document.getElementById("errorStatusIcon")?.focus();
+    } catch (error) {
+      window.alert(getErrorMessage(error));
+    }
+  }
+
+  public onRefreshButtonKeyDown = (source: any, event: KeyboardEvent): boolean => {
+    if (event.keyCode === KeyCodes.Enter || event.keyCode === KeyCodes.Space) {
+      this.refreshDocumentsGrid();
+      event.stopPropagation();
+      return false;
+    }
+    return true;
+  };
+
+  public onDocumentIdClick(clickedDocumentId: DocumentId): Q.Promise<any> {
+    if (this.editorState() !== ViewModels.DocumentExplorerState.noDocumentSelected) {
+      return Q();
+    }
+
+    this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
+
+    return Q();
+  }
+
+  public onNewDocumentClick = (): Q.Promise<any> => {
+    if (this.isEditorDirty() && !this._isIgnoreDirtyEditor()) {
+      return Q();
+    }
+    this.selectedDocumentId(null);
+
+    const defaultDocument: string = this.renderObjectForEditor({ id: "replace_with_new_document_id" }, null, 4);
+    this.initialDocumentContent(defaultDocument);
+    this.selectedDocumentContent.setBaseline(defaultDocument);
+    this.editorState(ViewModels.DocumentExplorerState.newDocumentValid);
+
+    return Q();
+  };
+
+  public onSaveNewDocumentClick = (): Promise<any> => {
+    this.isExecutionError(false);
+    const startKey: number = TelemetryProcessor.traceStart(Action.CreateDocument, {
+      dataExplorerArea: Constants.Areas.Tab,
+      tabTitle: this.tabTitle(),
+    });
+    const document = JSON.parse(this.selectedDocumentContent());
+    this.isExecuting(true);
+    return createDocument(this.collection, document)
+      .then(
+        (savedDocument: any) => {
+          const value: string = this.renderObjectForEditor(savedDocument || {}, null, 4);
+          this.selectedDocumentContent.setBaseline(value);
+          this.initialDocumentContent(value);
+          const partitionKeyValueArray = extractPartitionKey(
+            savedDocument,
+            this.partitionKey as PartitionKeyDefinition
+          );
+          const partitionKeyValue = partitionKeyValueArray && partitionKeyValueArray[0];
+          let id = new DocumentId(this, savedDocument, partitionKeyValue);
+          let ids = this.documentIds();
+          ids.push(id);
+
+          this.selectedDocumentId(id);
+          this.documentIds(ids);
+          this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
+          TelemetryProcessor.traceSuccess(
+            Action.CreateDocument,
+            {
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+            },
+            startKey
+          );
+        },
+        (error) => {
+          this.isExecutionError(true);
+          const errorMessage = getErrorMessage(error);
+          window.alert(errorMessage);
+          TelemetryProcessor.traceFailure(
+            Action.CreateDocument,
+            {
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+              error: errorMessage,
+              errorStack: getErrorStack(error),
+            },
+            startKey
+          );
+        }
+      )
+      .finally(() => this.isExecuting(false));
+  };
+
+  public onRevertNewDocumentClick = (): Q.Promise<any> => {
+    this.initialDocumentContent("");
+    this.selectedDocumentContent("");
+    this.editorState(ViewModels.DocumentExplorerState.noDocumentSelected);
+
+    return Q();
+  };
+
+  public onSaveExisitingDocumentClick = (): Promise<any> => {
+    const selectedDocumentId = this.selectedDocumentId();
+    const documentContent = JSON.parse(this.selectedDocumentContent());
+
+    const partitionKeyValueArray = extractPartitionKey(documentContent, this.partitionKey as PartitionKeyDefinition);
+    const partitionKeyValue = partitionKeyValueArray && partitionKeyValueArray[0];
+
+    selectedDocumentId.partitionKeyValue = partitionKeyValue;
+
+    this.isExecutionError(false);
+    const startKey: number = TelemetryProcessor.traceStart(Action.UpdateDocument, {
+      dataExplorerArea: Constants.Areas.Tab,
+      tabTitle: this.tabTitle(),
+    });
+    this.isExecuting(true);
+    return updateDocument(this.collection, selectedDocumentId, documentContent)
+      .then(
+        (updatedDocument: any) => {
+          const value: string = this.renderObjectForEditor(updatedDocument || {}, null, 4);
+          this.selectedDocumentContent.setBaseline(value);
+          this.initialDocumentContent(value);
+          this.documentIds().forEach((documentId: DocumentId) => {
+            if (documentId.rid === updatedDocument._rid) {
+              documentId.id(updatedDocument.id);
+            }
+          });
+          this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
+          TelemetryProcessor.traceSuccess(
+            Action.UpdateDocument,
+            {
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+            },
+            startKey
+          );
+        },
+        (error) => {
+          this.isExecutionError(true);
+          const errorMessage = getErrorMessage(error);
+          window.alert(errorMessage);
+          TelemetryProcessor.traceFailure(
+            Action.UpdateDocument,
+            {
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+              error: errorMessage,
+              errorStack: getErrorStack(error),
+            },
+            startKey
+          );
+        }
+      )
+      .finally(() => this.isExecuting(false));
+  };
+
+  public onRevertExisitingDocumentClick = (): Q.Promise<any> => {
+    this.selectedDocumentContent.setBaseline(this.initialDocumentContent());
+    this.initialDocumentContent.valueHasMutated();
+    this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
+
+    return Q();
+  };
+
+  public onDeleteExisitingDocumentClick = async (): Promise<void> => {
+    const selectedDocumentId = this.selectedDocumentId();
+    const msg = !this.isPreferredApiMongoDB
+      ? "Are you sure you want to delete the selected item ?"
+      : "Are you sure you want to delete the selected document ?";
+
+    if (window.confirm(msg)) {
+      await this._deleteDocument(selectedDocumentId);
+    }
+  };
+
+  public onValidDocumentEdit(): Q.Promise<any> {
+    if (
+      this.editorState() === ViewModels.DocumentExplorerState.newDocumentInvalid ||
+      this.editorState() === ViewModels.DocumentExplorerState.newDocumentValid
+    ) {
+      this.editorState(ViewModels.DocumentExplorerState.newDocumentValid);
+      return Q();
+    }
+
+    this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid);
+    return Q();
+  }
+
+  public onInvalidDocumentEdit(): Q.Promise<any> {
+    if (
+      this.editorState() === ViewModels.DocumentExplorerState.newDocumentInvalid ||
+      this.editorState() === ViewModels.DocumentExplorerState.newDocumentValid
+    ) {
+      this.editorState(ViewModels.DocumentExplorerState.newDocumentInvalid);
+      return Q();
+    }
+
+    if (
+      this.editorState() === ViewModels.DocumentExplorerState.exisitingDocumentNoEdits ||
+      this.editorState() === ViewModels.DocumentExplorerState.exisitingDocumentDirtyValid
+    ) {
+      this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentDirtyInvalid);
+      return Q();
+    }
+
+    return Q();
+  }
+
+  public onTabClick(): void {
+    super.onTabClick();
+    this.collection && this.collection.selectedSubnodeKind(ViewModels.CollectionTabKind.Documents);
+  }
+
+  public async onActivate(): Promise<void> {
+    super.onActivate();
+
+    if (!this._documentsIterator) {
+      try {
+        this._documentsIterator = this.createIterator();
+        await this.loadNextPage();
+      } catch (error) {
+        if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
+          TelemetryProcessor.traceFailure(
+            Action.Tab,
+            {
+              databaseName: this.collection.databaseId,
+              collectionName: this.collection.id(),
+
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+              error: getErrorMessage(error),
+              errorStack: getErrorStack(error),
+            },
+            this.onLoadStartKey
+          );
+          this.onLoadStartKey = null;
+        }
+      }
+    }
+  }
+
+  private _isIgnoreDirtyEditor = (): boolean => {
+    var msg: string = "Changes will be lost. Do you want to continue?";
+    return window.confirm(msg);
+  };
+
+  protected __deleteDocument(documentId: DocumentId): Promise<void> {
+    return deleteDocument(this.collection, documentId);
+  }
+
+  private _deleteDocument(selectedDocumentId: DocumentId): Promise<void> {
+    this.isExecutionError(false);
+    const startKey: number = TelemetryProcessor.traceStart(Action.DeleteDocument, {
+      dataExplorerArea: Constants.Areas.Tab,
+      tabTitle: this.tabTitle(),
+    });
+    this.isExecuting(true);
+    return this.__deleteDocument(selectedDocumentId)
+      .then(
+        () => {
+          this.documentIds.remove((documentId: DocumentId) => documentId.rid === selectedDocumentId.rid);
+          this.selectedDocumentContent("");
+          this.selectedDocumentId(null);
+          this.editorState(ViewModels.DocumentExplorerState.noDocumentSelected);
+          TelemetryProcessor.traceSuccess(
+            Action.DeleteDocument,
+            {
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+            },
+            startKey
+          );
+        },
+        (error) => {
+          this.isExecutionError(true);
+          console.error(error);
+          TelemetryProcessor.traceFailure(
+            Action.DeleteDocument,
+            {
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+              error: getErrorMessage(error),
+              errorStack: getErrorStack(error),
+            },
+            startKey
+          );
+        }
+      )
+      .finally(() => this.isExecuting(false));
+  }
+
+  public createIterator(): QueryIterator<ItemDefinition & Resource> {
+    let filters = this.lastFilterContents();
+    const filter: string = this.filterContent().trim();
+    const query: string = this.buildQuery(filter);
+    let options: any = {};
+    options.enableCrossPartitionQuery = HeadersUtility.shouldEnableCrossPartitionKey();
+
+    if (this._resourceTokenPartitionKey) {
+      options.partitionKey = this._resourceTokenPartitionKey;
+    }
+
+    return queryDocuments(this.collection.databaseId, this.collection.id(), query, options);
+  }
+
+  public async selectDocument(documentId: DocumentId): Promise<void> {
+    this.selectedDocumentId(documentId);
+    const content = await readDocument(this.collection, documentId);
+    this.initDocumentEditor(documentId, content);
+  }
+
+  public loadNextPage(): Q.Promise<any> {
+    this.isExecuting(true);
+    this.isExecutionError(false);
+    return this._loadNextPageInternal()
+      .then(
+        (documentsIdsResponse = []) => {
+          const currentDocuments = this.documentIds();
+          const currentDocumentsRids = currentDocuments.map((currentDocument) => currentDocument.rid);
+          const nextDocumentIds = documentsIdsResponse
+            // filter documents already loaded in observable
+            .filter((d: any) => {
+              return currentDocumentsRids.indexOf(d._rid) < 0;
+            })
+            // map raw response to view model
+            .map((rawDocument: any) => {
+              const partitionKeyValue = rawDocument._partitionKeyValue;
+              return new DocumentId(this, rawDocument, partitionKeyValue);
+            });
+
+          const merged = currentDocuments.concat(nextDocumentIds);
+          this.documentIds(merged);
+          if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
+            TelemetryProcessor.traceSuccess(
+              Action.Tab,
+              {
+                databaseName: this.collection.databaseId,
+                collectionName: this.collection.id(),
+
+                dataExplorerArea: Constants.Areas.Tab,
+                tabTitle: this.tabTitle(),
+              },
+              this.onLoadStartKey
+            );
+            this.onLoadStartKey = null;
+          }
+        },
+        (error) => {
+          this.isExecutionError(true);
+          const errorMessage = getErrorMessage(error);
+          logConsoleError(errorMessage);
+          if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
+            TelemetryProcessor.traceFailure(
+              Action.Tab,
+              {
+                databaseName: this.collection.databaseId,
+                collectionName: this.collection.id(),
+
+                dataExplorerArea: Constants.Areas.Tab,
+                tabTitle: this.tabTitle(),
+                error: errorMessage,
+                errorStack: getErrorStack(error),
+              },
+              this.onLoadStartKey
+            );
+            this.onLoadStartKey = null;
+          }
+        }
+      )
+      .finally(() => this.isExecuting(false));
+  }
+
+  public onLoadMoreKeyInput = (source: any, event: KeyboardEvent): void => {
+    if (event.key === " " || event.key === "Enter") {
+      const focusElement = document.getElementById(this.documentContentsGridId);
+      this.loadNextPage();
+      focusElement && focusElement.focus();
+      event.stopPropagation();
+      event.preventDefault();
+    }
+  };
+
+  protected _loadNextPageInternal(): Q.Promise<DataModels.DocumentId[]> {
+    return Q(this._documentsIterator.fetchNext().then((response) => response.resources));
+  }
+
+  protected _onEditorContentChange(newContent: string) {
+    try {
+      let parsed: any = JSON.parse(newContent);
+      this.onValidDocumentEdit();
+    } catch (e) {
+      this.onInvalidDocumentEdit();
+    }
+  }
+
+  public initDocumentEditor(documentId: DocumentId, documentContent: any): Q.Promise<any> {
+    if (documentId) {
+      const content: string = this.renderObjectForEditor(documentContent, null, 4);
+      this.selectedDocumentContent.setBaseline(content);
+      this.initialDocumentContent(content);
+      const newState = documentId
+        ? ViewModels.DocumentExplorerState.exisitingDocumentNoEdits
+        : ViewModels.DocumentExplorerState.newDocumentValid;
+      this.editorState(newState);
+    }
+
+    return Q();
+  }
+
+  public buildQuery(filter: string): string {
+    return QueryUtils.buildDocumentsQuery(filter, this.partitionKeyProperty, this.partitionKey);
+  }
+
+  protected getTabsButtons(): CommandButtonComponentProps[] {
+    const buttons: CommandButtonComponentProps[] = [];
+    const label = !this.isPreferredApiMongoDB ? "New Item" : "New Document";
+    if (this.newDocumentButton.visible()) {
+      buttons.push({
+        iconSrc: NewDocumentIcon,
+        iconAlt: label,
+        onCommandClick: this.onNewDocumentClick,
+        commandButtonLabel: label,
+        ariaLabel: label,
+        hasPopup: false,
+        disabled: !this.newDocumentButton.enabled(),
+      });
+    }
+
+    if (this.saveNewDocumentButton.visible()) {
+      const label = "Save";
+      buttons.push({
+        iconSrc: SaveIcon,
+        iconAlt: label,
+        onCommandClick: this.onSaveNewDocumentClick,
+        commandButtonLabel: label,
+        ariaLabel: label,
+        hasPopup: false,
+        disabled: !this.saveNewDocumentButton.enabled(),
+      });
+    }
+
+    if (this.discardNewDocumentChangesButton.visible()) {
+      const label = "Discard";
+      buttons.push({
+        iconSrc: DiscardIcon,
+        iconAlt: label,
+        onCommandClick: this.onRevertNewDocumentClick,
+        commandButtonLabel: label,
+        ariaLabel: label,
+        hasPopup: false,
+        disabled: !this.discardNewDocumentChangesButton.enabled(),
+      });
+    }
+
+    if (this.saveExisitingDocumentButton.visible()) {
+      const label = "Update";
+      buttons.push({
+        iconSrc: SaveIcon,
+        iconAlt: label,
+        onCommandClick: this.onSaveExisitingDocumentClick,
+        commandButtonLabel: label,
+        ariaLabel: label,
+        hasPopup: false,
+        disabled: !this.saveExisitingDocumentButton.enabled(),
+      });
+    }
+
+    if (this.discardExisitingDocumentChangesButton.visible()) {
+      const label = "Discard";
+      buttons.push({
+        iconSrc: DiscardIcon,
+        iconAlt: label,
+        onCommandClick: this.onRevertExisitingDocumentClick,
+        commandButtonLabel: label,
+        ariaLabel: label,
+        hasPopup: false,
+        disabled: !this.discardExisitingDocumentChangesButton.enabled(),
+      });
+    }
+
+    if (this.deleteExisitingDocumentButton.visible()) {
+      const label = "Delete";
+      buttons.push({
+        iconSrc: DeleteDocumentIcon,
+        iconAlt: label,
+        onCommandClick: this.onDeleteExisitingDocumentClick,
+        commandButtonLabel: label,
+        ariaLabel: label,
+        hasPopup: false,
+        disabled: !this.deleteExisitingDocumentButton.enabled(),
+      });
+    }
+
+    if (!this.isPreferredApiMongoDB) {
+      buttons.push(DocumentsTab._createUploadButton(this.collection.container));
+    }
+
+    return buttons;
+  }
+
+  protected buildCommandBarOptions(): void {
+    ko.computed(() =>
+      ko.toJSON([
+        this.newDocumentButton.visible,
+        this.newDocumentButton.enabled,
+        this.saveNewDocumentButton.visible,
+        this.saveNewDocumentButton.enabled,
+        this.discardNewDocumentChangesButton.visible,
+        this.discardNewDocumentChangesButton.enabled,
+        this.saveExisitingDocumentButton.visible,
+        this.saveExisitingDocumentButton.enabled,
+        this.discardExisitingDocumentChangesButton.visible,
+        this.discardExisitingDocumentChangesButton.enabled,
+        this.deleteExisitingDocumentButton.visible,
+        this.deleteExisitingDocumentButton.enabled,
+      ])
+    ).subscribe(() => this.updateNavbarWithTabsButtons());
+    this.updateNavbarWithTabsButtons();
+  }
+
+  private _getPartitionKeyPropertyHeader(): string {
+    return (
+      (this.partitionKey &&
+        this.partitionKey.paths &&
+        this.partitionKey.paths.length > 0 &&
+        this.partitionKey.paths[0]) ||
+      null
+    );
+  }
+
+  public static _createUploadButton(container: Explorer): CommandButtonComponentProps {
+    const label = "Upload Item";
+    return {
+      iconSrc: UploadIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
+        selectedCollection && container.openUploadItemsPanePane();
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled: useSelectedNode.getState().isDatabaseNodeOrNoneSelected(),
+    };
+  }
+}

src/Explorer/Tabs/DocumentsTab.tsx

@@ -1,50 +0,0 @@
-import * as ko from "knockout";
-import React from "react";
-import "react-splitter-layout/lib/index.css";
-import * as DataModels from "../../Contracts/DataModels";
-import * as ViewModels from "../../Contracts/ViewModels";
-import DocumentsTabContent from "./DocumentsTabContent";
-import TabsBase from "./TabsBase";
-
-export default class DocumentsTab extends TabsBase {
-  public documentContentsGridId: string;
-  public documentContentsContainerId: string;
-  public displayedError: ko.Observable<string>;
-  public partitionKey: DataModels.PartitionKey;
-  public partitionKeyPropertyHeader: string;
-  public partitionKeyProperty: string;
-  public _resourceTokenPartitionKey: string;
-
-  constructor(options: ViewModels.DocumentsTabOptions) {
-    super(options);
-    this.documentContentsGridId = `documentContentsGrid${this.tabId}`;
-    this.documentContentsContainerId = `documentContentsContainer${this.tabId}`;
-    this.partitionKey = options.partitionKey || (this.collection && this.collection.partitionKey);
-    this._resourceTokenPartitionKey = options.resourceTokenPartitionKey;
-
-    this.partitionKeyPropertyHeader =
-      (this.collection && this.collection.partitionKeyPropertyHeader) || this._getPartitionKeyPropertyHeader();
-    this.partitionKeyProperty = this.partitionKeyPropertyHeader
-      ? this.partitionKeyPropertyHeader.replace(/[/]+/g, ".").substr(1).replace(/[']+/g, "")
-      : undefined;
-
-    this.displayedError = ko.observable<string>("");
-  }
-
-  public onTabClick(): void {
-    super.onTabClick();
-    this.collection && this.collection.selectedSubnodeKind(ViewModels.CollectionTabKind.Documents);
-  }
-
-  protected buildCommandBarOptions(): void {
-    this.updateNavbarWithTabsButtons();
-  }
-
-  private _getPartitionKeyPropertyHeader(): string {
-    return this.partitionKey?.paths?.[0];
-  }
-
-  render(): JSX.Element {
-    return <DocumentsTabContent {...this} />;
-  }
-}

src/Explorer/Tabs/DocumentsTabContent.tsx

@@ -1,793 +0,0 @@
-import { extractPartitionKey, PartitionKeyDefinition } from "@azure/cosmos";
-import {
-  DetailsList,
-  DetailsListLayoutMode,
-  IColumn,
-  IIconProps,
-  Image,
-  List,
-  PrimaryButton,
-  SelectionMode,
-  Stack,
-  Text,
-  TextField,
-} from "@fluentui/react";
-import * as React from "react";
-import SplitterLayout from "react-splitter-layout";
-import CloseIcon from "../../../images/close-black.svg";
-import DeleteDocumentIcon from "../../../images/DeleteDocument.svg";
-import DiscardIcon from "../../../images/discard.svg";
-import DocumentWaterMark from "../../../images/DocumentWaterMark.svg";
-import NewDocumentIcon from "../../../images/NewDocument.svg";
-import SaveIcon from "../../../images/save-cosmos.svg";
-import UploadIcon from "../../../images/Upload_16x16.svg";
-import { Resource } from "../../../src/Contracts/DataModels";
-import * as NotificationConsoleUtils from "../../../src/Utils/NotificationConsoleUtils";
-import { Areas } from "../../Common/Constants";
-import { createDocument as createSqlDocuments } from "../../Common/dataAccess/createDocument";
-import { deleteDocument as deleteSqlDocument } from "../../Common/dataAccess/deleteDocument";
-import { queryDocuments as querySqlDocuments } from "../../Common/dataAccess/queryDocuments";
-import { readDocument } from "../../Common/dataAccess/readDocument";
-import { updateDocument as updateSqlDocuments } from "../../Common/dataAccess/updateDocument";
-import { getEntityName } from "../../Common/DocumentUtility";
-import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
-import * as HeadersUtility from "../../Common/HeadersUtility";
-import { logError } from "../../Common/Logger";
-import { createDocument, deleteDocument, queryDocuments, updateDocument } from "../../Common/MongoProxyClient";
-import * as ViewModels from "../../Contracts/ViewModels";
-import { Action } from "../../Shared/Telemetry/TelemetryConstants";
-import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
-import { userContext } from "../../UserContext";
-import * as QueryUtils from "../../Utils/QueryUtils";
-import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
-import { EditorReact } from "../Controls/Editor/EditorReact";
-import { useCommandBar } from "../Menus/CommandBar/CommandBarComponentAdapter";
-import DocumentId from "../Tree/DocumentId";
-import ObjectId from "../Tree/ObjectId";
-import { useSelectedNode } from "../useSelectedNode";
-import DocumentsTab from "./DocumentsTab";
-import {
-  assignTabButtonVisibility,
-  formatDocumentContent,
-  formatSqlDocumentContent,
-  getDocumentItems,
-  getFilterPlaceholder,
-  getFilterSuggestions,
-  getfilterText,
-  getPartitionKeyDefinition,
-  hasShardKeySpecified,
-  IDocumentsTabContentState,
-  imageProps,
-} from "./DocumentTabUtils";
-
-const filterIcon: IIconProps = { iconName: "Filter" };
-let newDocumentButton = assignTabButtonVisibility(true, true);
-let saveNewDocumentButton = assignTabButtonVisibility(false, true);
-let discardNewDocumentChangesButton = assignTabButtonVisibility(false, false);
-let saveExisitingDocumentButton = assignTabButtonVisibility(false, false);
-let discardExisitingDocumentChangesButton = assignTabButtonVisibility(false, false);
-let deleteExisitingDocumentButton = assignTabButtonVisibility(false, false);
-
-export default class DocumentsTabContent extends React.Component<DocumentsTab, IDocumentsTabContentState> {
-  public initialDocumentContent: string;
-
-  constructor(props: DocumentsTab) {
-    super(props);
-    const isPreferredApiMongoDB = userContext.apiType === "Mongo";
-
-    const columns: IColumn[] = [
-      {
-        key: "_id",
-        name: isPreferredApiMongoDB ? "_id" : "id",
-        minWidth: 50,
-        maxWidth: 100,
-        isResizable: true,
-        isCollapsible: true,
-        data: "string",
-        onRender: (item: DocumentId) => {
-          return (
-            <div onClick={() => this.handleRow(item)} className="documentIdItem">
-              {isPreferredApiMongoDB ? item.id() : item.id}
-            </div>
-          );
-        },
-        isPadded: true,
-      },
-      {
-        key: "column2",
-        name: props.partitionKeyPropertyHeader,
-        minWidth: 50,
-        maxWidth: 100,
-        isResizable: true,
-        isCollapsible: true,
-        data: "number",
-        onRender: (item: DocumentId) => {
-          return (
-            <div onClick={() => this.handleRow(item)} className="documentIdItem">
-              {isPreferredApiMongoDB ? item.partitionKeyValue : item._partitionKeyValue}
-            </div>
-          );
-        },
-      },
-    ];
-
-    this.initialDocumentContent = `{ \n ${
-      isPreferredApiMongoDB ? '"_id"' : '"id"'
-    }: "replace_with_new_document_id" \n }`;
-
-    this.state = {
-      columns: columns,
-      isModalSelection: false,
-      isCompactMode: false,
-      announcedMessage: undefined,
-      isSuggestionVisible: false,
-      filter: "",
-      isFilterOptionVisible: true,
-      isEditorVisible: false,
-      documentContent: this.initialDocumentContent,
-      documentIds: [],
-      documentSqlIds: [],
-      isEditorContentEdited: false,
-      isAllDocumentsVisible: false,
-      selectedSqlDocumentContent: this.initialDocumentContent,
-    };
-  }
-
-  componentDidMount(): void {
-    this.props.isExecuting(true);
-    this.updateTabButton();
-    if (userContext.apiType === "Mongo") {
-      this.queryDocumentsData();
-    } else {
-      this.querySqlDocumentsData();
-    }
-  }
-
-  public buildQuery(filter: string): string {
-    return QueryUtils.buildDocumentsQuery(filter, this.props.partitionKeyProperty, this.props.partitionKey);
-  }
-
-  private querySqlDocumentsData = async (): Promise<void> => {
-    this.props.isExecuting(true);
-    this.props.isExecutionError(false);
-    const { filter } = this.state;
-    const query: string = this.buildQuery(filter);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const options: any = {};
-    options.enableCrossPartitionQuery = HeadersUtility.shouldEnableCrossPartitionKey();
-    if (this.props._resourceTokenPartitionKey) {
-      options.partitionKey = this.props._resourceTokenPartitionKey;
-    }
-
-    try {
-      const sqlQuery = querySqlDocuments(this.props.collection.databaseId, this.props.collection.id(), query, options);
-      const querySqlDocumentsData = await sqlQuery.fetchNext();
-      this.setState({ documentSqlIds: querySqlDocumentsData.resources?.length ? querySqlDocumentsData.resources : [] });
-    } catch (error) {
-      this.props.isExecutionError(true);
-      const errorMessage = getErrorMessage(error);
-      NotificationConsoleUtils.logConsoleError(errorMessage);
-    } finally {
-      this.props.isExecuting(false);
-    }
-  };
-
-  private queryDocumentsData = async (): Promise<void> => {
-    this.props.isExecuting(true);
-    this.props.isExecutionError(false);
-    try {
-      const { filter } = this.state;
-      const query: string = filter || "{}";
-      const queryDocumentsData = await queryDocuments(
-        this.props.collection.databaseId,
-        this.props.collection as ViewModels.Collection,
-        true,
-        query,
-        undefined
-      );
-      if (queryDocumentsData) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const nextDocumentIds = queryDocumentsData.documents.map((rawDocument: any) => {
-          const partitionKeyValue = rawDocument._partitionKeyValue;
-          return new DocumentId(this.props as DocumentsTab, rawDocument, partitionKeyValue);
-        });
-        this.setState({ documentIds: nextDocumentIds });
-      }
-      if (this.props.onLoadStartKey !== undefined) {
-        TelemetryProcessor.traceSuccess(
-          Action.Tab,
-          {
-            databaseName: this.props.collection.databaseId,
-            collectionName: this.props.collection.id(),
-            dataExplorerArea: Areas.Tab,
-            tabTitle: this.props.tabTitle(),
-          },
-          this.props.onLoadStartKey
-        );
-      }
-    } catch (error) {
-      if (this.props.onLoadStartKey !== undefined) {
-        TelemetryProcessor.traceFailure(
-          Action.Tab,
-          {
-            databaseName: this.props.collection.databaseId,
-            collectionName: this.props.collection.id(),
-            dataExplorerArea: Areas.Tab,
-            tabTitle: this.props.tabTitle(),
-            error: getErrorMessage(error),
-            errorStack: getErrorStack(error),
-          },
-          this.props.onLoadStartKey
-        );
-      }
-    } finally {
-      this.props.isExecuting(false);
-    }
-  };
-
-  private handleRow = (row: DocumentId | Resource): void => {
-    if (this.state.isEditorContentEdited) {
-      this.props.collection.container.showOkCancelModalDialog(
-        "Are you sure you want to continue?",
-        "Your unsaved changes will be lost.",
-        "Okay",
-        () => {
-          this.handleRowContent(row);
-          this.setState({ isEditorContentEdited: false });
-          return;
-        },
-        "Cancel",
-        undefined
-      );
-    } else {
-      this.handleRowContent(row);
-    }
-  };
-
-  private handleRowContent = (row: DocumentId | Resource): void => {
-    userContext.apiType === "Mongo"
-      ? this.updateContent(row as DocumentId, formatDocumentContent(row as DocumentId))
-      : this.updateSqlContent(row as Resource);
-    this.setDefaultUpdateTabButtonVisibility();
-  };
-
-  private updateContent = (row: DocumentId, formattedDocumentContent: string): void => {
-    this.setState(
-      {
-        documentContent: formattedDocumentContent,
-        isEditorVisible: true,
-        selectedDocumentId: row,
-      },
-      () => {
-        this.updateTabButton();
-      }
-    );
-  };
-
-  private updateSqlContent = async (row: Resource): Promise<void> => {
-    const selectedDocumentId: DocumentId = new DocumentId(this.props as DocumentsTab, row, row._partitionKeyValue);
-
-    const content = await readDocument(this.props.collection, selectedDocumentId);
-    const formattedDocumentContent = formatSqlDocumentContent((content as unknown) as Resource);
-    this.setState(
-      {
-        documentContent: formattedDocumentContent,
-        isEditorVisible: true,
-        selectedSqlDocumentContent: formattedDocumentContent,
-        selectedSqlDocumentId: selectedDocumentId,
-      },
-      () => {
-        this.updateTabButton();
-      }
-    );
-  };
-
-  private handleFilter = (): void => {
-    userContext.apiType === "Mongo" ? this.queryDocumentsData() : this.querySqlDocumentsData();
-    this.setState({
-      isSuggestionVisible: false,
-    });
-  };
-
-  async updateSqlDocument(): Promise<void> {
-    const { isExecutionError, isExecuting, collection } = this.props;
-    const { documentContent, selectedSqlDocumentId } = this.state;
-    isExecutionError(false);
-    const startKey: number = this.getStartKey(Action.UpdateDocument);
-    try {
-      isExecuting(true);
-      const updateSqlDocumentRes = await updateSqlDocuments(
-        collection as ViewModels.Collection,
-        selectedSqlDocumentId,
-        JSON.parse(documentContent)
-      );
-      if (updateSqlDocumentRes) {
-        this.setTraceSuccess(Action.UpdateDocument, startKey);
-        this.querySqlDocumentsData();
-      }
-    } catch (error) {
-      NotificationConsoleUtils.logConsoleError(getErrorMessage(error));
-      this.setTraceFail(Action.UpdateDocument, startKey, error);
-    }
-  }
-
-  private async updateMongoDocument(): Promise<void> {
-    const { selectedDocumentId, documentContent, documentIds } = this.state;
-    const { isExecutionError, isExecuting, collection, partitionKey, partitionKeyProperty } = this.props;
-    isExecutionError(false);
-    isExecuting(true);
-    const startKey: number = this.getStartKey(Action.UpdateDocument);
-    try {
-      const updatedDocument = await updateDocument(
-        collection.databaseId,
-        collection as ViewModels.Collection,
-        selectedDocumentId,
-        documentContent
-      );
-
-      documentIds.forEach((documentId: DocumentId) => {
-        if (documentId.rid === updatedDocument._rid) {
-          const partitionKeyArray = extractPartitionKey(
-            updatedDocument,
-            getPartitionKeyDefinition(partitionKey, partitionKeyProperty) as PartitionKeyDefinition
-          );
-          const partitionKeyValue = partitionKeyArray && partitionKeyArray[0];
-          const id = new ObjectId(this.props as DocumentsTab, updatedDocument, partitionKeyValue);
-          documentId.id(id.id());
-        }
-      });
-      this.setTraceSuccess(Action.UpdateDocument, startKey);
-      this.setState({ isEditorContentEdited: false });
-    } catch (error) {
-      NotificationConsoleUtils.logConsoleError(getErrorMessage(error));
-      this.setTraceFail(Action.UpdateDocument, startKey, error);
-    }
-  }
-
-  protected getTabsButtons(): CommandButtonComponentProps[] {
-    const buttons: CommandButtonComponentProps[] = [];
-    const label = `New ${getEntityName()}`;
-    if (newDocumentButton.visible) {
-      buttons.push({
-        iconSrc: NewDocumentIcon,
-        iconAlt: label,
-        onCommandClick: this.onNewDocumentClick,
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: false,
-        disabled: !newDocumentButton.enabled,
-      });
-    }
-
-    if (saveNewDocumentButton.visible) {
-      const label = "Save";
-      buttons.push({
-        iconSrc: SaveIcon,
-        iconAlt: label,
-        onCommandClick: this.onSaveNewDocumentClick,
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: false,
-        disabled: !saveNewDocumentButton.enabled,
-      });
-    }
-
-    if (discardNewDocumentChangesButton.visible) {
-      const label = "Discard";
-      buttons.push({
-        iconSrc: DiscardIcon,
-        iconAlt: label,
-        onCommandClick: this.onRevertNewDocumentClick,
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: false,
-        disabled: !discardNewDocumentChangesButton.enabled,
-      });
-    }
-
-    if (saveExisitingDocumentButton.visible) {
-      const label = "Update";
-      buttons.push({
-        ...this,
-        updateMongoDocument: this.updateMongoDocument,
-        updateSqlDocument: this.updateSqlDocument,
-        setState: this.setState,
-        iconSrc: SaveIcon,
-        iconAlt: label,
-        onCommandClick: this.onSaveExisitingDocumentClick,
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: false,
-        disabled: !saveExisitingDocumentButton.enabled,
-      });
-    }
-
-    if (discardExisitingDocumentChangesButton.visible) {
-      const label = "Discard";
-      buttons.push({
-        ...this,
-        setState: this.setState,
-        iconSrc: DiscardIcon,
-        iconAlt: label,
-        onCommandClick: this.onRevertExisitingDocumentClick,
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: false,
-        disabled: !discardExisitingDocumentChangesButton.enabled,
-      });
-    }
-
-    if (deleteExisitingDocumentButton.visible) {
-      const label = "Delete";
-      buttons.push({
-        ...this,
-        setState: this.setState,
-        iconSrc: DeleteDocumentIcon,
-        iconAlt: label,
-        onCommandClick: this.onDeleteExisitingDocumentClick,
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: false,
-        disabled: !deleteExisitingDocumentButton.enabled,
-      });
-    }
-    if (userContext.apiType !== "Mongo") {
-      const { collection } = this.props;
-      const label = "Upload Item";
-      buttons.push({
-        iconSrc: UploadIcon,
-        iconAlt: label,
-        onCommandClick: () => {
-          const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-          selectedCollection && collection.container.openUploadItemsPanePane();
-        },
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: true,
-        disabled: useSelectedNode.getState().isDatabaseNodeOrNoneSelected(),
-      });
-    }
-    return buttons;
-  }
-
-  private onSaveExisitingDocumentClick(): void {
-    userContext.apiType === "Mongo" ? this.updateMongoDocument() : this.updateSqlDocument();
-  }
-
-  private async onDeleteExisitingDocumentClick(): Promise<void> {
-    const confirmationMessage = `Are you sure you want to delete the selected ${getEntityName()} ?`;
-    const { isExecuting, collection } = this.props;
-    const startKey: number = this.getStartKey(Action.DeleteDocument);
-    this.props.collection.container.showOkCancelModalDialog(
-      confirmationMessage,
-      `This ${getEntityName()} will be deleted immediately. You can't undo this action`,
-      "Delete",
-      async () => {
-        try {
-          isExecuting(true);
-          if (userContext.apiType === "Mongo") {
-            await deleteDocument(
-              collection.databaseId,
-              collection as ViewModels.Collection,
-              this.state.selectedDocumentId
-            );
-            this.queryDocumentsData();
-          } else {
-            const { selectedSqlDocumentId } = this.state;
-            await deleteSqlDocument(collection as ViewModels.Collection, selectedSqlDocumentId);
-            this.querySqlDocumentsData();
-          }
-          this.setTraceSuccess(Action.DeleteDocument, startKey);
-          this.setState({ isEditorVisible: false });
-        } catch (error) {
-          this.setTraceFail(Action.DeleteDocument, startKey, error);
-        }
-      },
-      "Cancel",
-      undefined
-    );
-  }
-
-  private onRevertExisitingDocumentClick(): void {
-    const { selectedDocumentId, selectedSqlDocumentContent } = this.state;
-    const documentContent =
-      userContext.apiType === "Mongo" ? formatDocumentContent(selectedDocumentId) : selectedSqlDocumentContent;
-    this.setState({
-      documentContent: documentContent,
-    });
-    discardExisitingDocumentChangesButton = assignTabButtonVisibility(true, false);
-    saveExisitingDocumentButton = assignTabButtonVisibility(true, false);
-    this.updateTabButton();
-  }
-
-  private onNewDocumentClick = () => {
-    newDocumentButton = assignTabButtonVisibility(true, false);
-    saveNewDocumentButton = assignTabButtonVisibility(true, true);
-    discardNewDocumentChangesButton = assignTabButtonVisibility(true, true);
-    saveExisitingDocumentButton = assignTabButtonVisibility(false, false);
-    discardExisitingDocumentChangesButton = assignTabButtonVisibility(false, false);
-    deleteExisitingDocumentButton = assignTabButtonVisibility(false, false);
-
-    this.updateTabButton();
-    this.setState({
-      documentContent: this.initialDocumentContent,
-      isEditorVisible: true,
-    });
-  };
-
-  private onSaveNewDocumentClick = () => {
-    if (userContext.apiType === "Mongo") {
-      this.onSaveNewMongoDocumentClick();
-    } else {
-      this.onSaveSqlNewMongoDocumentClick();
-    }
-  };
-
-  public onSaveSqlNewMongoDocumentClick = async (): Promise<void> => {
-    const { isExecutionError, isExecuting, collection } = this.props;
-    isExecutionError(false);
-    const startKey: number = this.getStartKey(Action.CreateDocument);
-    const document = JSON.parse(this.state.documentContent);
-    isExecuting(true);
-    try {
-      const savedDocument = await createSqlDocuments(collection, document);
-      if (savedDocument) {
-        const formattedDocumentContent = formatSqlDocumentContent((savedDocument as unknown) as Resource);
-        this.setState({ documentContent: formattedDocumentContent });
-        this.setDefaultUpdateTabButtonVisibility();
-        this.setTraceSuccess(Action.CreateDocument, startKey);
-      }
-      this.querySqlDocumentsData();
-    } catch (error) {
-      NotificationConsoleUtils.logConsoleError(getErrorMessage(error));
-      this.setTraceFail(Action.CreateDocument, startKey, error);
-    }
-  };
-
-  private setDefaultUpdateTabButtonVisibility = (): void => {
-    newDocumentButton = assignTabButtonVisibility(true, true);
-    saveNewDocumentButton = assignTabButtonVisibility(false, false);
-    discardNewDocumentChangesButton = assignTabButtonVisibility(false, false);
-    saveExisitingDocumentButton = assignTabButtonVisibility(true, false);
-    discardExisitingDocumentChangesButton = assignTabButtonVisibility(true, false);
-    deleteExisitingDocumentButton = assignTabButtonVisibility(true, true);
-    this.updateTabButton();
-  };
-
-  public onSaveNewMongoDocumentClick = async (): Promise<void> => {
-    const parsedDocumentContent = JSON.parse(this.state.documentContent);
-    const {
-      partitionKey,
-      partitionKeyProperty,
-      displayedError,
-      isExecutionError,
-      isExecuting,
-      collection,
-    } = this.props;
-    displayedError("");
-    const startKey: number = this.getStartKey(Action.CreateDocument);
-    if (
-      partitionKeyProperty &&
-      partitionKeyProperty !== "_id" &&
-      !hasShardKeySpecified(parsedDocumentContent, partitionKey, partitionKeyProperty)
-    ) {
-      const message = `The document is lacking the shard property: ${partitionKeyProperty}`;
-      displayedError(message);
-      this.setTraceFail(Action.CreateDocument, startKey, message);
-      logError("Failed to save new document: Document shard key not defined", "MongoDocumentsTab");
-      throw new Error("Document without shard key");
-    }
-    isExecutionError(false);
-    isExecuting(true);
-    try {
-      const savedDocument = await createDocument(
-        collection.databaseId,
-        collection as ViewModels.Collection,
-        partitionKeyProperty,
-        parsedDocumentContent
-      );
-      if (savedDocument) {
-        this.handleLoadMoreDocument();
-        this.setDefaultUpdateTabButtonVisibility();
-        this.setTraceSuccess(Action.CreateDocument, startKey);
-      }
-      this.setState({ isEditorContentEdited: false });
-      this.queryDocumentsData();
-    } catch (error) {
-      window.alert(getErrorMessage(error));
-      this.setTraceFail(Action.CreateDocument, startKey, error);
-    }
-  };
-
-  private getStartKey = (action: number): number => {
-    const startKey: number = TelemetryProcessor.traceStart(action, {
-      dataExplorerArea: Areas.Tab,
-      tabTitle: this.props.tabTitle(),
-    });
-    return startKey;
-  };
-
-  private setTraceSuccess = (action: number, startKey: number): void => {
-    const { isExecuting, tabTitle } = this.props;
-    TelemetryProcessor.traceSuccess(
-      action,
-      {
-        dataExplorerArea: Areas.Tab,
-        tabTitle: tabTitle(),
-      },
-      startKey
-    );
-    isExecuting(false);
-  };
-
-  private setTraceFail = (action: number, startKey: number, error: Error | string): void => {
-    const { isExecuting, tabTitle, isExecutionError } = this.props;
-    TelemetryProcessor.traceFailure(
-      action,
-      {
-        dataExplorerArea: Areas.Tab,
-        tabTitle: tabTitle(),
-        error: getErrorMessage(error),
-        errorStack: getErrorStack(error),
-      },
-      startKey
-    );
-    isExecuting(false);
-    isExecutionError(true);
-  };
-
-  private onRevertNewDocumentClick = () => {
-    newDocumentButton = assignTabButtonVisibility(true, true);
-    saveNewDocumentButton = assignTabButtonVisibility(true, false);
-    discardNewDocumentChangesButton = assignTabButtonVisibility(true, false);
-
-    this.updateTabButton();
-    this.setState({
-      isEditorVisible: false,
-      isEditorContentEdited: false,
-    });
-  };
-
-  private onRenderCell = (item: { value: string }): JSX.Element => {
-    return (
-      <div
-        className="documentTabSuggestions"
-        onClick={() =>
-          this.setState({
-            filter: item.value,
-            isSuggestionVisible: false,
-          })
-        }
-      >
-        <Text>{item.value}</Text>
-      </div>
-    );
-  };
-
-  private handleLoadMoreDocument = (): void => {
-    userContext.apiType === "Mongo" ? this.queryDocumentsData() : this.querySqlDocumentsData();
-    this.setState({
-      isSuggestionVisible: false,
-      isAllDocumentsVisible: true,
-    });
-  };
-
-  private updateTabButton = (): void => {
-    useCommandBar.getState().setContextButtons(this.getTabsButtons());
-  };
-
-  private getKey(item: DocumentId): string {
-    return item.rid;
-  }
-
-  private handleDocumentContentChange = (newContent: string): void => {
-    if (saveExisitingDocumentButton.visible && newContent !== this.state.documentContent) {
-      saveExisitingDocumentButton = assignTabButtonVisibility(true, true);
-      discardExisitingDocumentChangesButton = assignTabButtonVisibility(true, true);
-    }
-
-    this.setState(
-      {
-        documentContent: newContent,
-        isEditorContentEdited: true,
-      },
-      () => {
-        this.updateTabButton();
-      }
-    );
-  };
-
-  public render(): JSX.Element {
-    const {
-      columns,
-      isCompactMode,
-      isSuggestionVisible,
-      filter,
-      isFilterOptionVisible,
-      isEditorVisible,
-      documentContent,
-      documentIds,
-      documentSqlIds,
-      isAllDocumentsVisible,
-    } = this.state;
-    const isPreferredApiMongoDB = userContext.apiType === "Mongo";
-
-    return (
-      <>
-        {isFilterOptionVisible && (
-          <>
-            <div>
-              <Stack horizontal verticalFill wrap>
-                {!isPreferredApiMongoDB && <Text className="queryText">SELECT * FROM c</Text>}
-                <TextField
-                  iconProps={filterIcon}
-                  placeholder={getFilterPlaceholder(isPreferredApiMongoDB)}
-                  className={isPreferredApiMongoDB ? "documentTabSearchBar" : "documentSqlTabSearchBar"}
-                  onFocus={() => this.setState({ isSuggestionVisible: true })}
-                  onChange={(_event, newInput?: string) => {
-                    this.setState({ filter: newInput });
-                  }}
-                  value={filter}
-                />
-                <PrimaryButton text="Apply Filter" onClick={this.handleFilter} className="documentTabFiltetButton" />
-                <Image
-                  src={CloseIcon}
-                  alt="Close icon"
-                  {...imageProps}
-                  onClick={() => this.setState({ isFilterOptionVisible: false })}
-                />
-              </Stack>
-            </div>
-            {isSuggestionVisible && (
-              <div className={isPreferredApiMongoDB ? "filterSuggestions" : "filterSuggestions sqlFilterSuggestions"}>
-                <List items={getFilterSuggestions(isPreferredApiMongoDB)} onRenderCell={this.onRenderCell} />
-              </div>
-            )}
-          </>
-        )}
-        {!isFilterOptionVisible && (
-          <Stack horizontal verticalFill wrap className="documentTabNoFilterView">
-            <Text className="noFilterText">{getfilterText(isPreferredApiMongoDB, filter)}</Text>
-            <PrimaryButton text="Edit Filter" onClick={() => this.setState({ isFilterOptionVisible: true })} />
-          </Stack>
-        )}
-        <div className="splitterWrapper" onClick={() => this.setState({ isSuggestionVisible: false })}>
-          <SplitterLayout primaryIndex={0} secondaryInitialSize={1000}>
-            <div className="leftSplitter">
-              <DetailsList
-                items={getDocumentItems(isPreferredApiMongoDB, documentIds, documentSqlIds, isAllDocumentsVisible)}
-                compact={isCompactMode}
-                columns={columns}
-                selectionMode={SelectionMode.none}
-                getKey={this.getKey}
-                setKey="none"
-                layoutMode={DetailsListLayoutMode.justified}
-                isHeaderVisible={true}
-              />
-              <Text onClick={this.handleLoadMoreDocument} className="documentLoadMore" block={true}>
-                Load More
-              </Text>
-            </div>
-            {isEditorVisible ? (
-              <div className="react-editor">
-                <EditorReact
-                  language={"json"}
-                  content={documentContent}
-                  isReadOnly={false}
-                  ariaLabel={"Document json"}
-                  onContentChanged={this.handleDocumentContentChange}
-                  lineNumbers="on"
-                />
-              </div>
-            ) : (
-              <div className="documentTabWatermark">
-                <Image src={DocumentWaterMark} alt="Document watermark" />
-                <Text className="documentCreateText">Create new or work with existing document(s).</Text>
-              </div>
-            )}
-          </SplitterLayout>
-        </div>
-      </>
-    );
-  }
-}

src/Explorer/Tabs/DocumentsTabUtils.test.tsx

@@ -1,90 +0,0 @@
-import * as ko from "knockout";
-import { PartitionKey, Resource } from "../../../src/Contracts/DataModels";
-import DocumentId from "../Tree/DocumentId";
-import * as DocumentTabUtils from "./DocumentTabUtils";
-
-describe("DocumentTabUtils", () => {
-  describe("getfilterText()", () => {
-    it("Should return filter if isPreferredApiMongoDB is true and filter is applied ", () => {
-      const filteredText: string = DocumentTabUtils.getfilterText(true, `{"_id": "foo"}`);
-      expect(filteredText).toBe(`Filter : {"_id": "foo"}`);
-    });
-    it("Should return `No filter applied` if isPreferredApiMongoDB is true and filter is not applied ", () => {
-      const filteredText: string = DocumentTabUtils.getfilterText(true, "");
-      expect(filteredText).toBe("No filter applied");
-    });
-    it("Should return `Select * from C` with filter if isPreferredApiMongoDB is false and filter is applied ", () => {
-      const filteredText: string = DocumentTabUtils.getfilterText(false, `WHERE c.id = "foo"`);
-      expect(filteredText).toBe(`Select * from C WHERE c.id = "foo"`);
-    });
-  });
-
-  describe("formatDocumentContent()", () => {
-    const fakeDocumentData = {} as DocumentId;
-    fakeDocumentData.partitionKeyProperty = "test";
-    fakeDocumentData.id = ko.observable("id");
-
-    it("should return formatted content with new line each property.", () => {
-      fakeDocumentData.partitionKeyValue = "partitionValue";
-      const formattedContent: string = DocumentTabUtils.formatDocumentContent(fakeDocumentData);
-      expect(formattedContent).toBe(`{\n"_id":"id",\n"test":"partitionValue"\n}`);
-    });
-
-    it("should return formatted content with empty partitionKeyValue when partitionKeyValue is undefined.", () => {
-      fakeDocumentData.partitionKeyValue = undefined;
-      const formattedContent: string = DocumentTabUtils.formatDocumentContent(fakeDocumentData);
-      expect(formattedContent).toBe(`{\n"_id":"id",\n"test":""\n}`);
-    });
-  });
-
-  describe("formatSqlDocumentContent()", () => {
-    const fakeDocumentData = {} as Resource;
-    it("should return formatted content with new line each property.", () => {
-      fakeDocumentData.id = "testId";
-      fakeDocumentData._rid = "testRid";
-      fakeDocumentData._self = "testSelf";
-      fakeDocumentData._ts = "testTs";
-      fakeDocumentData._etag = "testEtag";
-      fakeDocumentData._attachments = "testAttachments";
-      fakeDocumentData._partitionKey = "testPartitionKey";
-
-      const formattedContent: string = DocumentTabUtils.formatSqlDocumentContent(fakeDocumentData);
-      expect(formattedContent).toBe(
-        `{\n"id":"testId",\n"_rid":"testRid",\n"_self":"testSelf",\n"_ts":"testTs",\n"_etag":"testEtag",\n"_attachments":"testAttachments",\n"_partitionKey":"testPartitionKey"\n}`
-      );
-    });
-
-    it("should return formatted content with empty value when key value is undefined.", () => {
-      fakeDocumentData.id = undefined;
-      fakeDocumentData._rid = undefined;
-      fakeDocumentData._self = undefined;
-      fakeDocumentData._ts = undefined;
-      fakeDocumentData._etag = undefined;
-      fakeDocumentData._attachments = undefined;
-      fakeDocumentData._partitionKey = undefined;
-      const formattedContent: string = DocumentTabUtils.formatSqlDocumentContent(fakeDocumentData);
-      expect(formattedContent).toBe(
-        `{\n"id":"",\n"_rid":"",\n"_self":"",\n"_ts":"",\n"_etag":"",\n"_attachments":"",\n"_partitionKey":""\n}`
-      );
-    });
-  });
-  describe("getPartitionKeyDefinition()", () => {
-    const partitionKey = {} as PartitionKey;
-    partitionKey.kind = "Hash";
-    partitionKey.version = 1;
-    partitionKey.systemKey = true;
-    const partitionKeyProperty = "testPartitionKey";
-
-    it("should return formatted partitionKey with formatted path.", () => {
-      partitionKey.paths = ["test"];
-      const formattedPartitionKey = DocumentTabUtils.getPartitionKeyDefinition(partitionKey, partitionKeyProperty);
-      expect(formattedPartitionKey).toEqual({ kind: "Hash", version: 1, systemKey: true, paths: ["test"] });
-    });
-
-    it("should return partitionKey with undefined paths if paths is undefined.", () => {
-      partitionKey.paths = undefined;
-      const formattedPartitionKey = DocumentTabUtils.getPartitionKeyDefinition(partitionKey, partitionKeyProperty);
-      expect(formattedPartitionKey).toEqual({ kind: "Hash", version: 1, systemKey: true, paths: undefined });
-    });
-  });
-});

src/Explorer/Tabs/MongoDocumentsTab.ts

@@ -1,10 +1,33 @@
+import { extractPartitionKey, PartitionKeyDefinition } from "@azure/cosmos";
+import * as ko from "knockout";
+import Q from "q";
+import * as Constants from "../../Common/Constants";
+import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
+import * as Logger from "../../Common/Logger";
+import {
+  createDocument,
+  deleteDocument,
+  queryDocuments,
+  readDocument,
+  updateDocument,
+} from "../../Common/MongoProxyClient";
+import MongoUtility from "../../Common/MongoUtility";
+import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
+import { Action } from "../../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
+import DocumentId from "../Tree/DocumentId";
+import ObjectId from "../Tree/ObjectId";
 import DocumentsTab from "./DocumentsTab";
 
 export default class MongoDocumentsTab extends DocumentsTab {
   public collection: ViewModels.Collection;
+  private continuationToken: string;
+
   constructor(options: ViewModels.DocumentsTabOptions) {
     super(options);
+    this.lastFilterContents = ko.observableArray<string>(['{"id":"foo"}', "{ qty: { $gte: 20 } }"]);
+
     if (this.partitionKeyProperty && ~this.partitionKeyProperty.indexOf(`"`)) {
       this.partitionKeyProperty = this.partitionKeyProperty.replace(/["]+/g, "");
     }
@@ -15,7 +38,279 @@ export default class MongoDocumentsTab extends DocumentsTab {
       this.partitionKeyPropertyHeader = "/" + this.partitionKeyProperty;
     }
 
+    this.isFilterExpanded = ko.observable<boolean>(true);
     super.buildCommandBarOptions.bind(this);
     super.buildCommandBarOptions();
   }
+
+  public onSaveNewDocumentClick = (): Promise<any> => {
+    const documentContent = JSON.parse(this.selectedDocumentContent());
+    this.displayedError("");
+    const startKey: number = TelemetryProcessor.traceStart(Action.CreateDocument, {
+      dataExplorerArea: Constants.Areas.Tab,
+      tabTitle: this.tabTitle(),
+    });
+
+    if (
+      this.partitionKeyProperty &&
+      this.partitionKeyProperty !== "_id" &&
+      !this._hasShardKeySpecified(documentContent)
+    ) {
+      const message = `The document is lacking the shard property: ${this.partitionKeyProperty}`;
+      this.displayedError(message);
+      let that = this;
+      setTimeout(() => {
+        that.displayedError("");
+      }, Constants.ClientDefaults.errorNotificationTimeoutMs);
+      this.isExecutionError(true);
+      TelemetryProcessor.traceFailure(
+        Action.CreateDocument,
+        {
+          dataExplorerArea: Constants.Areas.Tab,
+          tabTitle: this.tabTitle(),
+          error: message,
+        },
+        startKey
+      );
+      Logger.logError("Failed to save new document: Document shard key not defined", "MongoDocumentsTab");
+      throw new Error("Document without shard key");
+    }
+
+    this.isExecutionError(false);
+    this.isExecuting(true);
+    return createDocument(this.collection.databaseId, this.collection, this.partitionKeyProperty, documentContent)
+      .then(
+        (savedDocument: any) => {
+          let partitionKeyArray = extractPartitionKey(
+            savedDocument,
+            this._getPartitionKeyDefinition() as PartitionKeyDefinition
+          );
+
+          let partitionKeyValue = partitionKeyArray && partitionKeyArray[0];
+
+          let id = new ObjectId(this, savedDocument, partitionKeyValue);
+          let ids = this.documentIds();
+          ids.push(id);
+          delete savedDocument._self;
+
+          let value: string = this.renderObjectForEditor(savedDocument || {}, null, 4);
+          this.selectedDocumentContent.setBaseline(value);
+
+          this.selectedDocumentId(id);
+          this.documentIds(ids);
+          this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
+          TelemetryProcessor.traceSuccess(
+            Action.CreateDocument,
+            {
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+            },
+            startKey
+          );
+        },
+        (error) => {
+          this.isExecutionError(true);
+          const errorMessage = getErrorMessage(error);
+          window.alert(errorMessage);
+          TelemetryProcessor.traceFailure(
+            Action.CreateDocument,
+            {
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+              error: errorMessage,
+              errorStack: getErrorStack(error),
+            },
+            startKey
+          );
+        }
+      )
+      .finally(() => this.isExecuting(false));
+  };
+
+  public onSaveExisitingDocumentClick = (): Promise<any> => {
+    const selectedDocumentId = this.selectedDocumentId();
+    const documentContent = this.selectedDocumentContent();
+    this.isExecutionError(false);
+    this.isExecuting(true);
+    const startKey: number = TelemetryProcessor.traceStart(Action.UpdateDocument, {
+      dataExplorerArea: Constants.Areas.Tab,
+      tabTitle: this.tabTitle(),
+    });
+
+    return updateDocument(this.collection.databaseId, this.collection, selectedDocumentId, documentContent)
+      .then(
+        (updatedDocument: any) => {
+          let value: string = this.renderObjectForEditor(updatedDocument || {}, null, 4);
+          this.selectedDocumentContent.setBaseline(value);
+
+          this.documentIds().forEach((documentId: DocumentId) => {
+            if (documentId.rid === updatedDocument._rid) {
+              const partitionKeyArray = extractPartitionKey(
+                updatedDocument,
+                this._getPartitionKeyDefinition() as PartitionKeyDefinition
+              );
+
+              let partitionKeyValue = partitionKeyArray && partitionKeyArray[0];
+
+              const id = new ObjectId(this, updatedDocument, partitionKeyValue);
+              documentId.id(id.id());
+            }
+          });
+          this.editorState(ViewModels.DocumentExplorerState.exisitingDocumentNoEdits);
+          TelemetryProcessor.traceSuccess(
+            Action.UpdateDocument,
+            {
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+            },
+            startKey
+          );
+        },
+        (error) => {
+          this.isExecutionError(true);
+          const errorMessage = getErrorMessage(error);
+          window.alert(errorMessage);
+          TelemetryProcessor.traceFailure(
+            Action.UpdateDocument,
+            {
+              dataExplorerArea: Constants.Areas.Tab,
+              tabTitle: this.tabTitle(),
+              error: errorMessage,
+              errorStack: getErrorStack(error),
+            },
+            startKey
+          );
+        }
+      )
+      .finally(() => this.isExecuting(false));
+  };
+
+  public buildQuery(filter: string): string {
+    return filter || "{}";
+  }
+
+  public async selectDocument(documentId: DocumentId): Promise<void> {
+    this.selectedDocumentId(documentId);
+    const content = await readDocument(this.collection.databaseId, this.collection, documentId);
+    this.initDocumentEditor(documentId, content);
+  }
+
+  public loadNextPage(): Q.Promise<any> {
+    this.isExecuting(true);
+    this.isExecutionError(false);
+    const filter: string = this.filterContent().trim();
+    const query: string = this.buildQuery(filter);
+
+    return Q(queryDocuments(this.collection.databaseId, this.collection, true, query, this.continuationToken))
+      .then(
+        ({ continuationToken, documents }) => {
+          this.continuationToken = continuationToken;
+          let currentDocuments = this.documentIds();
+          const currentDocumentsRids = currentDocuments.map((currentDocument) => currentDocument.rid);
+          const nextDocumentIds = documents
+            .filter((d: any) => {
+              return currentDocumentsRids.indexOf(d._rid) < 0;
+            })
+            .map((rawDocument: any) => {
+              const partitionKeyValue = rawDocument._partitionKeyValue;
+              return new DocumentId(this, rawDocument, partitionKeyValue);
+            });
+
+          const merged = currentDocuments.concat(nextDocumentIds);
+
+          this.documentIds(merged);
+          currentDocuments = this.documentIds();
+          if (this.filterContent().length > 0 && currentDocuments.length > 0) {
+            currentDocuments[0].click();
+          } else {
+            this.selectedDocumentContent("");
+            this.selectedDocumentId(null);
+            this.editorState(ViewModels.DocumentExplorerState.noDocumentSelected);
+          }
+          if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
+            TelemetryProcessor.traceSuccess(
+              Action.Tab,
+              {
+                databaseName: this.collection.databaseId,
+                collectionName: this.collection.id(),
+
+                dataExplorerArea: Constants.Areas.Tab,
+                tabTitle: this.tabTitle(),
+              },
+              this.onLoadStartKey
+            );
+            this.onLoadStartKey = null;
+          }
+        },
+        (error: any) => {
+          if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
+            TelemetryProcessor.traceFailure(
+              Action.Tab,
+              {
+                databaseName: this.collection.databaseId,
+                collectionName: this.collection.id(),
+
+                dataExplorerArea: Constants.Areas.Tab,
+                tabTitle: this.tabTitle(),
+                error: getErrorMessage(error),
+                errorStack: getErrorStack(error),
+              },
+              this.onLoadStartKey
+            );
+            this.onLoadStartKey = null;
+          }
+        }
+      )
+      .finally(() => this.isExecuting(false));
+  }
+
+  protected _onEditorContentChange(newContent: string) {
+    try {
+      if (
+        this.editorState() === ViewModels.DocumentExplorerState.newDocumentValid ||
+        this.editorState() === ViewModels.DocumentExplorerState.newDocumentInvalid
+      ) {
+        let parsed: any = JSON.parse(newContent);
+      }
+
+      // Mongo uses BSON format for _id, trying to parse it as JSON blocks normal flow in an edit
+      this.onValidDocumentEdit();
+    } catch (e) {
+      this.onInvalidDocumentEdit();
+    }
+  }
+
+  /** Renders a Javascript object to be displayed inside Monaco Editor */
+  public renderObjectForEditor(value: any, replacer: any, space: string | number): string {
+    return MongoUtility.tojson(value, null, false);
+  }
+
+  private _hasShardKeySpecified(document: any): boolean {
+    return Boolean(extractPartitionKey(document, this._getPartitionKeyDefinition() as PartitionKeyDefinition));
+  }
+
+  private _getPartitionKeyDefinition(): DataModels.PartitionKey {
+    let partitionKey: DataModels.PartitionKey = this.partitionKey;
+
+    if (
+      this.partitionKey &&
+      this.partitionKey.paths &&
+      this.partitionKey.paths.length &&
+      this.partitionKey.paths.length > 0 &&
+      this.partitionKey.paths[0].indexOf("$v") > -1
+    ) {
+      // Convert BsonSchema2 to /path format
+      partitionKey = {
+        kind: partitionKey.kind,
+        paths: ["/" + this.partitionKeyProperty.replace(/\./g, "/")],
+        version: partitionKey.version,
+      };
+    }
+
+    return partitionKey;
+  }
+
+  protected __deleteDocument(documentId: DocumentId): Promise<void> {
+    return deleteDocument(this.collection.databaseId, this.collection, documentId);
+  }
 }

src/Explorer/Tabs/MongoShellTab/MongoShellTab.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import * as DataModels from "../../../Contracts/DataModels";
 import type { TabOptions } from "../../../Contracts/ViewModels";
-import { useTabs } from "../../../hooks/useTabs";
 import Explorer from "../../Explorer";
 import TabsBase from "../TabsBase";
 import MongoShellTabComponent, { IMongoShellTabAccessor, IMongoShellTabComponentProps } from "./MongoShellTabComponent";
@@ -34,7 +33,7 @@ export class NewMongoShellTab extends TabsBase {
   }
 
   public onTabClick(): void {
-    useTabs.getState().activateTab(this);
+    this.manager?.activateTab(this);
     this.iMongoShellTabAccessor.onTabClickEvent();
   }
 }

src/Explorer/Tabs/NotebookTabBase.ts

@@ -6,7 +6,6 @@ import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../UserContext";
 import Explorer from "../Explorer";
 import { NotebookClientV2 } from "../Notebook/NotebookClientV2";
-import { useNotebook } from "../Notebook/useNotebook";
 import TabsBase from "./TabsBase";
 
 export interface NotebookTabBaseOptions extends ViewModels.TabOptions {
@@ -29,7 +28,7 @@ export default class NotebookTabBase extends TabsBase {
 
     if (!NotebookTabBase.clientManager) {
       NotebookTabBase.clientManager = new NotebookClientV2({
-        connectionInfo: useNotebook.getState().notebookServerInfo,
+        connectionInfo: this.container.notebookServerInfo(),
         databaseAccountName: userContext?.databaseAccount?.name,
         defaultExperience: userContext.apiType,
         contentProvider: this.container.notebookManager?.notebookContentProvider,

src/Explorer/Tabs/NotebookV2Tab.ts

@@ -14,7 +14,6 @@ import SaveIcon from "../../../images/save-cosmos.svg";
 import { useNotebookSnapshotStore } from "../../hooks/useNotebookSnapshotStore";
 import { Action, ActionModifiers, Source } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
-import * as NotebookConfigurationUtils from "../../Utils/NotebookConfigurationUtils";
 import { logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
 import * as CommandBarComponentButtonFactory from "../Menus/CommandBar/CommandBarComponentButtonFactory";
@@ -23,7 +22,6 @@ import * as CdbActions from "../Notebook/NotebookComponent/actions";
 import { NotebookComponentAdapter } from "../Notebook/NotebookComponent/NotebookComponentAdapter";
 import { CdbAppState, SnapshotRequest } from "../Notebook/NotebookComponent/types";
 import { NotebookContentItem } from "../Notebook/NotebookContentItem";
-import { useNotebook } from "../Notebook/useNotebook";
 import NotebookTabBase, { NotebookTabBaseOptions } from "./NotebookTabBase";
 
 export interface NotebookTabOptions extends NotebookTabBaseOptions {
@@ -40,13 +38,10 @@ export default class NotebookTabV2 extends NotebookTabBase {
 
     this.container = options.container;
     this.notebookPath = ko.observable(options.notebookContentItem.path);
-    useNotebook.subscribe(
+    this.container.notebookServerInfo.subscribe(() => logConsoleInfo("New notebook server info received."));
-      () => logConsoleInfo("New notebook server info received."),
-      (state) => state.notebookServerInfo
-    );
     this.notebookComponentAdapter = new NotebookComponentAdapter({
       contentItem: options.notebookContentItem,
-      notebooksBasePath: useNotebook.getState().notebookBasePath,
+      notebooksBasePath: this.container.getNotebookBasePath(),
       notebookClient: NotebookTabBase.clientManager,
       onUpdateKernelInfo: this.onKernelUpdate,
     });
@@ -363,14 +358,16 @@ export default class NotebookTabV2 extends NotebookTabBase {
   };
 
   private async configureServiceEndpoints(kernelName: string) {
-    const notebookConnectionInfo = useNotebook.getState().notebookServerInfo;
+    const notebookConnectionInfo = this.container && this.container.notebookServerInfo();
-    const sparkClusterConnectionInfo = useNotebook.getState().sparkClusterConnectionInfo;
+    const sparkClusterConnectionInfo = this.container && this.container.sparkClusterConnectionInfo();
+    /*
     await NotebookConfigurationUtils.configureServiceEndpoints(
       this.notebookPath(),
       notebookConnectionInfo,
       kernelName,
       sparkClusterConnectionInfo
     );
+    */
   }
 
   private publishToGallery = async () => {

src/Explorer/Tabs/QueryTab/QueryTab.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import * as DataModels from "../../../Contracts/DataModels";
 import type { QueryTabOptions } from "../../../Contracts/ViewModels";
-import { useTabs } from "../../../hooks/useTabs";
 import Explorer from "../../Explorer";
 import { IQueryTabComponentProps, ITabAccessor } from "../../Tabs/QueryTab/QueryTabComponent";
 import TabsBase from "../TabsBase";
@@ -41,12 +40,12 @@ export class NewQueryTab extends TabsBase {
   }
 
   public onTabClick(): void {
-    useTabs.getState().activateTab(this);
+    this.manager?.activateTab(this);
     this.iTabAccessor.onTabClickEvent();
   }
 
   public onCloseTabButtonClick(): void {
-    useTabs.getState().closeTab(this);
+    this.manager?.closeTab(this);
     if (this.iTabAccessor) {
       this.iTabAccessor.onCloseClickEvent(true);
     }

src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx

@@ -22,16 +22,14 @@ import { InfoTooltip } from "../../../Common/Tooltip/InfoTooltip";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { useNotificationConsole } from "../../../hooks/useNotificationConsole";
-import { useSidePanel } from "../../../hooks/useSidePanel";
 import { userContext } from "../../../UserContext";
 import * as QueryUtils from "../../../Utils/QueryUtils";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import { EditorReact } from "../../Controls/Editor/EditorReact";
 import Explorer from "../../Explorer";
 import { useCommandBar } from "../../Menus/CommandBar/CommandBarComponentAdapter";
-import { BrowseQueriesPane } from "../../Panes/BrowseQueriesPane/BrowseQueriesPane";
-import { SaveQueryPane } from "../../Panes/SaveQueryPane/SaveQueryPane";
 import TabsBase from "../TabsBase";
+import { TabsManager } from "../TabsManager";
 import "./QueryTabComponent.less";
 
 enum ToggleState {
@@ -67,6 +65,7 @@ export interface IQueryTabComponentProps {
   partitionKey: DataModels.PartitionKey;
   container: Explorer;
   activeTab?: TabsBase;
+  tabManager?: TabsManager;
   onTabAccessor: (instance: ITabAccessor) => void;
   isPreferredApiMongoDB?: boolean;
   monacoEditorSetting?: string;
@@ -392,13 +391,13 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
   };
 
   public onSaveQueryClick = (): void => {
-    useSidePanel.getState().openSidePanel("Save Query", <SaveQueryPane explorer={this.props.collection.container} />);
+    this.props.collection && this.props.collection.container && this.props.collection.container.openSaveQueryPanel();
   };
 
   public onSavedQueriesClick = (): void => {
-    useSidePanel
+    this.props.collection &&
-      .getState()
+      this.props.collection.container &&
-      .openSidePanel("Open Saved Queries", <BrowseQueriesPane explorer={this.props.collection.container} />);
+      this.props.collection.container.openBrowseQueriesPanel();
   };
 
   public async onFetchNextPageClick(): Promise<void> {

src/Explorer/Tabs/QueryTablesTab.tsx

@@ -137,14 +137,13 @@ export default class QueryTablesTab extends TabsBase {
     useSidePanel
       .getState()
       .openSidePanel(
-        "Add Table Row",
+        "Add Table Entity",
         <AddTableEntityPanel
           tableDataClient={this.tableDataClient}
           queryTablesTab={this}
           tableEntityListViewModel={this.tableEntityListViewModel()}
           cassandraApiClient={new CassandraAPIDataClient()}
-        />,
+        />
-        "700px"
       );
   };
 
@@ -158,8 +157,7 @@ export default class QueryTablesTab extends TabsBase {
           queryTablesTab={this}
           tableEntityListViewModel={this.tableEntityListViewModel()}
           cassandraApiClient={new CassandraAPIDataClient()}
-        />,
+        />
-        "700px"
       );
   };
 

src/Explorer/Tabs/StoredProcedureTab/StoredProcedureTab.tsx

@@ -2,7 +2,6 @@ import React from "react";
 import { ExecuteSprocResult } from "../../../Common/dataAccess/executeStoredProcedure";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as ViewModels from "../../../Contracts/ViewModels";
-import { useTabs } from "../../../hooks/useTabs";
 import Explorer from "../../Explorer";
 import StoredProcedure from "../../Tree/StoredProcedure";
 import ScriptTabBase from "../ScriptTabBase";
@@ -52,12 +51,12 @@ export class NewStoredProcedureTab extends ScriptTabBase {
   }
 
   public onTabClick(): void {
-    useTabs.getState().activateTab(this);
+    this.manager?.activateTab(this);
     this.iStoreProcAccessor.onTabClickEvent();
   }
 
   public onCloseTabButtonClick(): void {
-    useTabs.getState().closeTab(this);
+    this.manager?.closeTab(this);
   }
 
   public onExecuteSprocsResult(result: ExecuteSprocResult): void {

src/Explorer/Tabs/StoredProcedureTab/StoredProcedureTabComponent.tsx

@@ -10,7 +10,6 @@ import { ExecuteSprocResult } from "../../../Common/dataAccess/executeStoredProc
 import { updateStoredProcedure } from "../../../Common/dataAccess/updateStoredProcedure";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { useNotificationConsole } from "../../../hooks/useNotificationConsole";
-import { useTabs } from "../../../hooks/useTabs";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import { EditorReact } from "../../Controls/Editor/EditorReact";
 import Explorer from "../../Explorer";
@@ -145,7 +144,7 @@ export default class StoredProcedureTabComponent extends React.Component<
   }
 
   public onTabClick(): void {
-    if (useTabs.getState().openedTabs.length > 0) {
+    if (this.props.container.tabsManager.openedTabs().length > 0) {
       useCommandBar.getState().setContextButtons(this.getTabsButtons());
     }
   }
@@ -397,8 +396,10 @@ export default class StoredProcedureTabComponent extends React.Component<
           editorModel && editorModel.setValue(createdResource.body as string);
           this.props.scriptTabBaseInstance.editorContent.setBaseline(createdResource.body as string);
           this.node = this.collection.createStoredProcedureNode(createdResource);
-          this.props.scriptTabBaseInstance.node = this.node;
+          this.props.container.tabsManager.openedTabs()[
-          useTabs.getState().updateTab(this.props.scriptTabBaseInstance);
+            this.props.container.tabsManager.openedTabs().length - 1
+          ].node = this.node;
+
           this.props.scriptTabBaseInstance.editorState(ViewModels.ScriptEditorState.exisitingNoEdits);
 
           this.setState({

src/Explorer/Tabs/Tabs.tsx

@@ -3,32 +3,28 @@ import React, { useEffect, useRef, useState } from "react";
 import loadingIcon from "../../../images/circular_loader_black_16x16.gif";
 import errorIcon from "../../../images/close-black.svg";
 import { useObservable } from "../../hooks/useObservable";
-import { useTabs } from "../../hooks/useTabs";
 import TabsBase from "./TabsBase";
 
 type Tab = TabsBase | (TabsBase & { render: () => JSX.Element });
 
-export const Tabs = (): JSX.Element => {
+export const Tabs = ({ tabs, activeTab }: { tabs: readonly Tab[]; activeTab: Tab }): JSX.Element => (
-  const { openedTabs, activeTab } = useTabs();
+  <div className="tabsManagerContainer">
-  return (
+    <div id="content" className="flexContainer hideOverflows">
-    <div className="tabsManagerContainer">
+      <div className="nav-tabs-margin">
-      <div id="content" className="flexContainer hideOverflows">
+        <ul className="nav nav-tabs level navTabHeight" id="navTabs" role="tablist">
-        <div className="nav-tabs-margin">
+          {tabs.map((tab) => (
-          <ul className="nav nav-tabs level navTabHeight" id="navTabs" role="tablist">
+            <TabNav key={tab.tabId} tab={tab} active={activeTab === tab} />
-            {openedTabs.map((tab) => (
-              <TabNav key={tab.tabId} tab={tab} active={activeTab === tab} />
-            ))}
-          </ul>
-        </div>
-        <div className="tabPanesContainer">
-          {openedTabs.map((tab) => (
-            <TabPane key={tab.tabId} tab={tab} active={activeTab === tab} />
           ))}
-        </div>
+        </ul>
+      </div>
+      <div className="tabPanesContainer">
+        {tabs.map((tab) => (
+          <TabPane key={tab.tabId} tab={tab} active={activeTab === tab} />
+        ))}
       </div>
     </div>
-  );
+  </div>
-};
+);
 
 function TabNav({ tab, active }: { tab: Tab; active: boolean }) {
   const [hovering, setHovering] = useState(false);