Update comments-2

* Fix execute sproc pane textfield focus issue

* Update snapshot

.eslintignore

@@ -80,18 +80,10 @@ src/Explorer/Tables/DataTable/CacheBase.ts
 src/Explorer/Tables/DataTable/DataTableBindingManager.ts
 src/Explorer/Tables/DataTable/DataTableBuilder.ts
 src/Explorer/Tables/DataTable/DataTableContextMenu.ts
-# src/Explorer/Tables/DataTable/DataTableOperationManager.ts
-# src/Explorer/Tables/DataTable/DataTableOperations.ts
+src/Explorer/Tables/DataTable/DataTableOperationManager.ts
 src/Explorer/Tables/DataTable/DataTableViewModel.ts
-src/Explorer/Tables/DataTable/TableCommands.ts
-src/Explorer/Tables/DataTable/TableEntityCache.ts
 src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
-src/Explorer/Tables/Entities.ts
-src/Explorer/Tables/QueryBuilder/ClauseGroup.ts
-src/Explorer/Tables/QueryBuilder/ClauseGroupViewModel.ts
 src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.ts
-src/Explorer/Tables/QueryBuilder/QueryBuilderViewModel.ts
-src/Explorer/Tables/QueryBuilder/QueryClauseViewModel.ts
 src/Explorer/Tables/TableDataClient.ts
 src/Explorer/Tables/TableEntityProcessor.ts
 src/Explorer/Tables/Utilities.ts
@@ -115,15 +107,10 @@ 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/WaitsForTemplateViewModel.ts
 src/GitHub/GitHubClient.test.ts
 src/GitHub/GitHubClient.ts
-src/GitHub/GitHubConnector.ts
-src/GitHub/GitHubOAuthService.ts
 src/Index.ts
-src/Juno/JunoClient.test.ts
-src/Juno/JunoClient.ts
 src/Platform/Hosted/Authorization.ts
 src/ReactDevTools.ts
 src/Shared/Constants.ts
@@ -143,20 +130,13 @@ src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
 src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
 src/Explorer/Controls/TreeComponent/TreeComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx
-src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
-src/Explorer/Graph/GraphExplorerComponent/GraphVizComponent.tsx
-src/Explorer/Graph/GraphExplorerComponent/LeftPaneComponent.tsx
-src/Explorer/Graph/GraphExplorerComponent/MiddlePaneComponent.tsx
-src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx
 src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
 src/Explorer/Notebook/NotebookComponent/NotebookComponentAdapter.tsx
-src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx
 src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx
 src/Explorer/Notebook/NotebookComponent/contents/index.tsx
-src/Explorer/Notebook/NotebookRenderer/NotebookReadOnlyRenderer.tsx
 src/Explorer/Notebook/NotebookRenderer/NotebookRenderer.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx

.eslintrc.js

@@ -39,7 +39,6 @@ module.exports = {
     "@typescript-eslint/switch-exhaustiveness-check": "error",
     "@typescript-eslint/no-unused-vars": "error",
     "@typescript-eslint/no-extraneous-class": "error",
-    "no-null/no-null": "error",
     "@typescript-eslint/no-explicit-any": "error",
     "prefer-arrow/prefer-arrow-functions": ["error", { allowStandaloneDeclarations: true }],
     eqeqeq: "error",

.vscode/settings.json

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

configs/mpac.json

@@ -1,3 +1,4 @@
 {
-  "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com"
+  "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com",
+  "IS_MPAC" : true
 }

configs/prod.json

@@ -1,3 +1,4 @@
 {
- "JUNO_ENDPOINT": "https://tools.cosmos.azure.com"
+ "JUNO_ENDPOINT": "https://tools.cosmos.azure.com",
+ "IS_MPAC" : false
 }

jest.config.js

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

less/TableStyles/queryBuilder.less

@@ -3,358 +3,337 @@
 @import "../Common/Constants";
 
 .query-panel {
-  display: table;
-  display: none;
-  width: 100%;
-  border-top: 1px solid #dddddd;
-  /*[{environment-commandbar-toolbar-separator}]*/
-  background-color: #ffffff;
-  /*[{plugin-background-color}]*/
-  padding: 2px 0px 0px 2px;
-  resize: vertical;
+    display: table;
+    display: none;
+    width: 100%;
+    border-top: 1px solid #DDDDDD;
+    /*[{environment-commandbar-toolbar-separator}]*/
+    background-color: #ffffff;
+    /*[{plugin-background-color}]*/
+    padding: 2px 0px 0px 2px;
+    resize: vertical;
 }
 
 .query-panel .row {
-  display: table-row;
+    display: table-row;
 }
 
 .query-panel .row .cell {
-  display: table-cell;
+    display: table-cell;
 }
 
 .query-panel.transition-in {
-  display: table;
-  top: 0px;
-  -webkit-transition: top 2s linear;
-  -ms-transition: top 2s linear;
-  -moz-transition: top 2s linear;
-  -khtml-transition: top 2s linear;
-  -o-transition: top 2s linear;
-  transition: top 2s linear;
+    display: table;
+    top: 0px;
+    -webkit-transition: top 2s linear;
+    -ms-transition: top 2s linear;
+    -moz-transition: top 2s linear;
+    -khtml-transition: top 2s linear;
+    -o-transition: top 2s linear;
+    transition: top 2s linear;
 }
 
 .query-builder {
-  width: 100%;
-  padding-right: @DefaultSpace;
-  border-bottom: 1px solid @BaseMedium;
-  margin-bottom: @DefaultSpace;
+    width:100%;
+    padding-right: @DefaultSpace;
+    border-bottom: 1px solid @BaseMedium;
+    margin-bottom: @DefaultSpace;
 }
 
 .query-builder-toolbar {
-  background-color: #ffffff;
-  /*[{plugin-background-color}]*/
-  min-width: 600px;
-  height: 30px;
-  border-bottom: 1px solid #dddddd;
-  /*[1px solid {environment-commandbar-toolbar-separator}]*/
+    background-color: #ffffff;
+    /*[{plugin-background-color}]*/
+    min-width: 600px;
+    height: 30px;
+    border-bottom: 1px solid #DDDDDD;
+    /*[1px solid {environment-commandbar-toolbar-separator}]*/
 }
 
 .query-builder-toolbar .query-toolbar-group {
-  display: inline-block;
-  height: 24px;
-  margin: 2px 0px;
-  vertical-align: middle;
+    display: inline-block;
+    height: 24px;
+    margin: 2px 0px;
+    vertical-align: middle;
 }
 
 .query-builder-toolbar .query-toolbar-group .query-toolbar-button {
-  min-width: 0px;
-  padding: 0px;
-  margin-left: 2px;
-  background-color: transparent;
-  border: solid transparent;
+    min-width: 0px;
+    padding: 0px;
+    margin-left: 2px;
+    background-color: transparent;
+    border: solid transparent;
 }
 
 .query-builder-toolbar .query-toolbar-group .query-toolbar-button:active {
-  outline: 2px solid dodgerblue;
-  /*[2px solid {common-common-controls-button-border-hover}]*/
+    outline: 2px solid dodgerblue;
+    /*[2px solid {common-common-controls-button-border-hover}]*/
 }
 
 .query-builder-toolbar .query-toolbar-group .query-toolbar-button:hover {
-  background-color: #cccedb;
-  /*[{common-controls-button-hover-background}]*/
+    background-color: #CCCEDB;
+    /*[{common-controls-button-hover-background}]*/
 }
 
 .query-builder-toolbar .query-toolbar-group .query-toolbar-button.active {
-  background-color: #e6e7ed;
-  /*[{common-controls-inner-tab-active-background}]*/
-  outline: none;
+    background-color: #E6E7ED;
+    /*[{common-controls-inner-tab-active-background}]*/
+    outline: none
 }
 
 .query-builder-toolbar .query-toolbar-group .query-toolbar-button:disabled,
 .query-builder-toolbar .query-toolbar-group .query-toolbar-button.disabled {
-  background-color: #ffffff;
-  /*[{common-controls-button-disabled-background}]*/
-  background: transparent;
-  border: 1px solid transparent;
-  outline: none;
-  opacity: 0.4;
+    background-color: #ffffff;
+    /*[{common-controls-button-disabled-background}]*/
+    background: transparent;
+    border: 1px solid transparent;
+    outline: none;
+    opacity: 0.4;
 }
 
 .tableContainer {
-  overflow: hidden;
-  .flex-display();
-  .flex-direction();
-  position: relative;
+    overflow: hidden;
+    .flex-display();
+    .flex-direction();
 }
 
-.tablesQueryTab {
-  padding-left: @MediumSpace;
-  width: 100%;
-  margin-bottom: 60px;
-  position: relative;
-  height: 100%;
+.tablesQueryTab{
+    padding-left: @MediumSpace;
+    width: 100%;
+    margin-bottom:@LargeSpace;
 }
 
 .entity-error-Img {
-  width: @WarningErrorIconSize;
-  height: @WarningErrorIconSize;
-  margin: @DefaultSpace 0px 0px @SmallSpace;
+    width: @WarningErrorIconSize;
+    height: @WarningErrorIconSize;
+    margin: @DefaultSpace 0px 0px @SmallSpace;
 }
 
 .query-editor-panel {
-  margin-right: 16px;
-  margin-left: 16px;
-  margin-top: 25px;
-  position: relative;
-  vertical-align: middle;
-  cursor: default;
+    margin-right: 16px;
+    margin-left: 16px;
+    margin-top: 25px;
+    position: relative;
+    vertical-align: middle;
+    cursor: default;
 }
 
 .query-editor-text {
-  width: 100%;
-  margin: 2px;
-  border: solid 1px #a9acb3;
-  /*[{plugin-textbox-disabled-color}]*/
-  resize: none;
-  margin-top: -39px;
-  background-color: #ddd;
-  padding: 5px;
+    width: 100%;
+    margin: 2px;
+    border: solid 1px #A9ACB3;
+    /*[{plugin-textbox-disabled-color}]*/
+    resize: none;
+    margin-top: -39px;
+    background-color: #ddd;
+    padding: 5px;
 }
 
 .error-bar {
-  padding: @LargeSpace 34px @MediumSpace 24px;
+    padding: @LargeSpace 34px @MediumSpace 24px;
 }
 
 .error-message {
-  background-color: @BaseLow;
-  padding: @DefaultSpace;
-  display: inline-flex;
+    background-color: @BaseLow;
+    padding: @DefaultSpace;
+    display: inline-flex;
 }
 
 .error-text {
-  padding-left: @MediumSpace;
+    padding-left: @MediumSpace;
 }
 
 .query-editor-text-invalid {
-  width: 100%;
-  margin: 2px;
-  border: 1px solid #e51400;
-  resize: none;
-  margin-top: -30px;
+    width: 100%;
+    margin: 2px;
+    border: 1px solid #e51400;
+    resize: none;
+    margin-top: -30px;
 }
 
 .query-editor-panel .warning-bar {
-  width: 100%;
-  height: 20px;
-  background-color: #ffffff;
-  /*[{plugin-background-color}]*/
-  position: absolute;
-  top: -24px;
+    width: 100%;
+    height: 20px;
+    background-color: #ffffff;
+    /*[{plugin-background-color}]*/
+    position: absolute;
+    top: -24px;
 }
 
 .query-editor-panel .warning-bar .warning-message {
-  display: inline-flex;
-  padding-top: 2px;
-  vertical-align: middle;
+    display: inline-flex;
+    padding-top: 2px;
+    vertical-align: middle;
 }
 
 .query-editor-panel .warning-bar .warning-message .warning-text {
-  margin-left: 2px;
+    margin-left: 2px;
 }
 
-.advanced-options-panel {
-  margin-bottom: @DefaultSpace;
+.advanced-options-panel{
+    margin-bottom: @DefaultSpace;
 }
 
 .advanced-options-panel .advanced-heading .advanced-title {
-  display: inline-flex;
-  margin-left: 27px;
-  margin-top: 10px;
-  cursor: default;
+    display: inline-flex;
+    margin-left: 27px;
+    margin-top: 10px;
+    cursor: default;
 }
 
 .advanced-options-panel .advanced-options {
-  margin-left: 32px;
-  margin-top: 5px;
-  border: 1px solid transparent;
+    margin-left: 32px;
+    margin-top: 5px;
+    border: 1px solid transparent;
 }
 
 hr {
-  margin-top: 10px;
-  margin-bottom: 12px;
-  border: 0;
-  border-top: 1px solid #ccc;
+    margin-top: 10px;
+    margin-bottom: 12px;
+    border: 0;
+    border-top: 1px solid #ccc;
 }
 
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
+    -webkit-appearance: none;
 }
 
 .advanced-options-panel .advanced-options .top .top-input {
-  width: 100px;
-  word-spacing: normal;
-  color: #1e1e1e;
-  /*[{common-controls-button-foreground}]*/
-  border: 1px solid #cccedb;
-  /*[1px solid {plugin-textbox-border-color}]*/
-  height: 20px;
-  margin-left: 8px;
+    width: 100px;
+    word-spacing: normal;
+    color: #1E1E1E;
+    /*[{common-controls-button-foreground}]*/
+    border: 1px solid #CCCEDB;
+    /*[1px solid {plugin-textbox-border-color}]*/
+    height: 20px;
+    margin-left: 8px;
 }
 
 .advanced-options-panel .advanced-options .top .invalid-top {
-  color: red;
+    color: red;
 }
 
 .advanced-options-panel .advanced-options .select {
-  margin-top: 18px;
-  display: inline-flex;
+    margin-top: 18px;
+    display: inline-flex;
 }
 
 .advanced-options-icon {
-  margin-left: 2px;
-  vertical-align: sub;
+    margin-left: 2px;
+    vertical-align: sub;
 }
 
 .advanced-options-panel .advanced-options .select .select-options-text {
-  margin-left: 4px;
+    margin-left: 4px;
 }
 
 .advanced-options-panel .advanced-options .select .select-options-link {
-  margin-left: 4px;
-  cursor: pointer;
-  outline: none;
+    margin-left: 4px;
+    cursor: pointer;
+    outline: none;
 }
 
 .query-panel .row .column-headers .Field {
-  padding-left: 95px;
-  padding-right: 0px;
-  padding-bottom: 6px;
+    padding-left: 95px;
+    padding-right: 0px;
+    padding-bottom: 6px;
 }
 
 .clause-table {
-  border-spacing: 0px;
-  display: table;
-  width: 100%;
-  margin-top: -3px;
+    border-spacing: 0px;
+    display: table;
+    width: 100%;
+    margin-top: -3px;
 }
 
 .clause-table-row {
-  display: row;
-  margin-bottom: 10px;
+    display: row;
+    margin-bottom: 10px;
 }
 
 .clause-table-cell {
-  display: table-cell;
-  text-align: left;
-  vertical-align: middle;
+    display: table-cell;
+    text-align: left;
+    vertical-align: middle;
 }
 
-.action-column > button,
-.group-control-header > button,
-.group-indicator-column > button {
-  min-width: 20px;
-  width: 20px;
-  padding: 0px;
-  background-color: transparent;
-  border-color: transparent;
-  cursor: pointer;
+.action-column>button,
+.group-control-header>button,
+.group-indicator-column>button {
+    min-width: 20px;
+    width: 20px;
+    padding: 0px;
+    background-color: transparent;
+    border-color: transparent;
+    cursor: pointer;
 }
 
-.group-control-header > button:disabled {
-  min-width: 20px;
-  width: 20px;
-  padding: 0px;
-  background-color: transparent;
-  border-color: transparent;
-  outline: none;
-  opacity: 0.4;
-  cursor: default;
+.group-control-header>button:disabled {
+    min-width: 20px;
+    width: 20px;
+    padding: 0px;
+    background-color: transparent;
+    border-color: transparent;
+    outline: none;
+    opacity: 0.4;
+    cursor: default;
 }
 
 .clause-table-field {
-  width: 100%;
-  border: 1px solid #bbbbbb;
+    width: 100%;
+    border: 1px solid #bbbbbb;
 }
 
 .clause-table-cell button {
-  height: 20px;
+    height: 20px;
 }
 
 .clause-table-cell input[type="checkbox"] {
-  padding: 0px;
-  margin-bottom: 12px;
+    padding: 0px;
+    margin-bottom: 12px;
 }
 
 .and-or-svg {
-  margin-top: -8px;
-  margin-right: -26px;
-}
-
-.and-or-label {
-  margin-left: 52px;
-}
-
-.field-label {
-  margin-left: 69px;
-}
-.data-type-label {
-  margin-left: 54px;
-}
-
-.operator-label {
-  margin-left: 80px;
-}
-.value-label {
-  margin-left: 62px;
+    margin-top: -8px;
+    margin-right: -5px;
 }
 
 .scroll-box {
-  border-bottom: 1px transparent #ddd;
-  /*[1px solid {plugin-table-border-color}]*/
-  border-top: 1px transparent #ddd;
-  /*[1px solid {plugin-table-border-color}]*/
-  max-height: 20vh;
-  width: 100%;
+    border-bottom: 1px transparent #DDD;
+    /*[1px solid {plugin-table-border-color}]*/
+    border-top: 1px transparent #DDD;
+    /*[1px solid {plugin-table-border-color}]*/
+    max-height: 20vh;
+    width: 100%;
 }
 
 .scrollable {
-  overflow: auto;
-  overflow-x: hidden;
+    overflow: auto;
+    overflow-x: hidden;
 }
 
 .and-or-column,
 .and-or-header {
-  min-width: 65px;
-  padding-right: 10px;
-  padding-left: 5px;
+    min-width: 65px;
+    padding-right: 10px;
+    padding-left: 5px;
 }
 
 .operator-column,
 .operator-header {
-  min-width: 65px;
-  padding-right: 10px;
+    min-width: 65px;
+    padding-right: 10px;
 }
 
 .field-header,
 .field-column {
-  min-width: 125px;
-  padding-right: 10px;
+    min-width: 125px;
+    padding-right: 10px;
 }
 
 .type-header,
 .type-column {
-  min-width: 85px;
+    min-width: 85px;
 }
 
 .and-or-column,
@@ -366,41 +345,41 @@ input::-webkit-inner-spin-button {
 .type-header,
 .type-column,
 .action-header {
-  padding-right: 10px;
-  margin-bottom: 8px;
+    padding-right: 10px;
+    margin-bottom: 8px;
 }
 
 .value-header,
 .value-column,
 .time-column {
-  min-width: 230px;
-  padding: 0px 4px 0px 0px;
-  width: 100%;
-  margin-bottom: 8px;
+    min-width: 230px;
+    padding: 0px 4px 0px 0px;
+    width: 100%;
+    margin-bottom: 8px;
 }
 
 .group-control-header,
 .group-control-column {
-  min-width: 25px;
-  text-align: right;
+    min-width: 25px;
+    text-align: right;
 }
 
 .group-indicator-table {
-  border-spacing: 0px;
-  min-height: 24px;
+    border-spacing: 0px;
+    min-height: 24px
 }
 
 .group-indicator-column {
-  min-width: 21px;
-  padding: 0px;
-  border-style: none;
-  height: 29px;
+    min-width: 21px;
+    padding: 0px;
+    border-style: none;
+    height: 29px;
 }
 
-.clause-table-cell.action-column,
+.clause-table-cell.action-column, 
 .clause-table-cell.action-header {
-  min-width: 60px;
-  padding-left: @SmallSpace;
+    min-width: 60px;
+    padding-left: @SmallSpace;
 }
 
 .action-header,
@@ -409,14 +388,15 @@ input::-webkit-inner-spin-button {
 .operator-header,
 .value-header,
 .and-or-header {
-  padding-right: 4px;
-  padding-bottom: 5px;
+    padding-right: 4px;
+    padding-bottom: 5px;
 }
 
 .header-background {
-  background-color: #ffffff;
+    background-color: #ffffff;
 }
 
+
 /*.type-header {
     padding-right: 4px;
 }
@@ -430,165 +410,111 @@ input::-webkit-inner-spin-button {
 }*/
 
 .clause-table-field[readonly] {
-  background-color: #eeeef2;
-  /*[{plugin-table-header-background-color}]*/
-  border: 1px solid #cccedb;
-  /*[{plugin-table-border-color}]*/
+    background-color: #EEEEF2;
+    /*[{plugin-table-header-background-color}]*/
+    border: 1px solid #CCCEDB;
+    /*[{plugin-table-border-color}]*/
 }
 
 .addClause-title {
-  /*[{common-common-controls-button-border-hover}]*/
-  cursor: pointer;
-  margin-left: -5px;
+    /*[{common-common-controls-button-border-hover}]*/
+    cursor: pointer;
+    margin-left: -5px;
 }
 
 .addClause {
-  width: 125px;
-  padding: 8px 0px 5px 5px;
-  border: 1px solid #fff;
-  margin-left: 5px;
+    width: 125px;
+    padding: 8px 0px 5px 5px;
+    border: 1px solid #fff;
+    margin-left: 5px;
 }
 
 .addClause:hover {
-  .hover();
+    .hover();
 }
 
 .addClause:active {
-  .active();
-  border: 1px dashed @AccentMedium;
+    .active();
+    border: 1px dashed @AccentMedium;
 }
 
 .clause-table-row {
-  min-width: 550px;
-  width: 100%;
+    min-width: 550px;
+    width: 100%;
 }
 
 .clause-table-field field-column {
-  min-width: 75px;
-  height: 30px;
-  width: 100%;
+    min-width: 75px;
+    height: 30px;
+    width: 100%;
 }
 
 .clause-table-field field-input {
-  min-width: 54px;
-  margin-left: -78px;
-  height: 25px;
-  border: none;
+    min-width: 54px;
+    margin-left: -78px;
+    height: 25px;
+    border: none;
 }
 
 .query-panel .row .spacing {
-  padding-bottom: 6px;
+    padding-bottom: 6px;
 }
 
 .query-panel .divider.horizontal {
-  height: 10px;
-  width: 100%;
+    height: 10px;
+    width: 100%
 }
 
 .inline-div {
-  display: inline;
+    display: inline
 }
 
-.querybuilder-addpropertyImg {
-  width: 18px;
-  height: 18px;
-  margin-left: 3px;
-  margin-bottom: 8px;
-  margin-top: 8px;
-}
+.querybuilder-addpropertyImg,
 .querybuilder-cancelImg {
-  width: 14px;
-  height: 14px;
-  margin-left: 3px;
-  margin-bottom: 8px;
-  margin-top: 8px;
+    width: 14px;
+    height: 14px;
+    margin-left: 3px;
+    margin-bottom: 8px;
 }
 
 .addclauseProperty-Img {
-  width: 14px;
-  height: 14px;
-  margin-bottom: 5px;
-  margin-left: 12px;
+    width: 14px;
+    height: 14px;
+    margin-bottom: 5px;
+    margin-left: 12px;
 }
 
 .entity-Add-Cancel {
-  padding: @DefaultSpace @SmallSpace @SmallSpace;
-  cursor: pointer;
+    padding: @DefaultSpace @SmallSpace @SmallSpace;
+    cursor: pointer;
 }
 
 .entity-Add-Cancel:hover {
-  .hover();
+    .hover();
 }
 
 .entity-Add-Cancel:active {
-  .active();
+    .active();
 }
 
 .query-builder-isDisabled {
-  border: 1px solid #cccedb;
-  color: #ccc;
+    border: 1px solid #CCCEDB;
+    color: #ccc;
 }
 
 .edit-value-text {
-  padding-left: @DefaultSpace;
+    padding-left: @DefaultSpace;
 }
 
 .expand-triangle {
-  width: 10px;
-  height: 10px;
+    width: 10px;
+    height: 10px;
 }
 
 .expand-triangle-right {
-  margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 
-.query-document-detail-list {
-  height: 100%;
-}
-.query-table-clause-container {
-  max-height: 150px;
-  overflow: scroll;
-  overflow-x: hidden;
-}
-.query-tab-document-pagination {
-  display: flex;
-  flex-direction: row;
-  position: absolute;
-  bottom: 0;
-  padding-left: 12px;
-  justify-content: space-between;
-  width: 100%;
-  align-items: center;
-  height: 60px;
-}
-.pagination {
-  margin: 15px 0 !important;
-  order: 2;
-  padding-right: 15px;
-  li > .item-link {
-    position: relative;
-    float: left;
-    padding: 6px 12px;
-    margin-left: -1px;
-    line-height: 1.42857143;
-    text-decoration: none;
-    background-color: #fff;
-    border: 1px solid #ddd;
-    cursor: pointer;
-    &:hover {
-      font-weight: bold;
-      background: #eef7ff;
-    }
-  }
-}
-
-.noData {
-  background-color: #e3e2e6;
-  color: #e3e2e6;
-  padding-top: 1px;
-  height: 100%;
-  width: 100%;
-}
 
 /*
 @media only screen and (max-width: 1200px) {
@@ -598,4 +524,4 @@ input::-webkit-inner-spin-button {
         width: 100%;
         padding-top: 10px;
     }
-}*/
+}*/

less/documentDB.less

@@ -2077,7 +2077,7 @@ a:link {
 .resourceTreeAndTabs {
   display: flex;
   flex: 1 1 auto;
-  overflow-x: auto;
+  overflow-x: clip;
   overflow-y: auto;
   height: 100%;
 }
@@ -2245,7 +2245,7 @@ a:link {
 }
 
 .refreshColHeader {
-  padding: 3px 6px 6px 6px;
+  padding: 3px 6px 10px 0px !important;
 }
 
 .refreshColHeader:hover {
@@ -2869,31 +2869,31 @@ a:link {
   }
 }
 
-settings-pane {
-  .settingsSection {
-    border-bottom: 1px solid @BaseMedium;
-    margin-right: 24px;
-    padding: @MediumSpace 0px;
+.settingsSection {
+  border-bottom: 1px solid @BaseMedium;
+  margin-right: 24px;
+  padding: @MediumSpace 0px;
 
-    &:first-child {
-      padding-top: 0px;
-    }
+  &:first-child {
+    padding-top: 0px;
+    padding-bottom: 10px;
+  }
 
-    &:last-child {
-      border-bottom: none;
-    }
+  &:last-child {
+    border-bottom: none;
+  }
 
-    .settingsSectionPart {
-      padding-left: 8px;
-    }
+  .settingsSectionPart {
+    padding-left: 8px;
+  }
 
-    .settingsSectionLabel {
-      margin-bottom: @DefaultSpace;
-    }
+  .settingsSectionLabel {
+    margin-bottom: @DefaultSpace;
+    margin-right: 5px;
+  }
 
-    .pageOptionsPart {
-      padding-bottom: @MediumSpace;
-    }
+  .pageOptionsPart {
+    padding-bottom: @MediumSpace;
   }
 }
 

src/Bindings/BindingHandlersRegisterer.ts

@@ -1,5 +1,7 @@
 import * as ko from "knockout";
 import * as ReactBindingHandler from "./ReactBindingHandler";
+import "../Explorer/Tables/DataTable/DataTableBindingManager";
+
 export class BindingHandlersRegisterer {
   public static registerBindingHandlers() {
     ko.bindingHandlers.setTemplateReady = {

src/Common/Constants.ts

@@ -97,6 +97,7 @@ export class Flights {
   public static readonly PartitionKeyTest = "partitionkeytest";
   public static readonly PKPartitionKeyTest = "pkpartitionkeytest";
   public static readonly Phoenix = "phoenix";
+  public static readonly NotebooksDownBanner = "notebooksdownbanner";
 }
 
 export class AfecFeatures {
@@ -339,9 +340,16 @@ export enum ConflictOperationType {
 }
 
 export enum ConnectionStatusType {
+  Connect = "Connect",
   Connecting = "Connecting",
   Connected = "Connected",
   Failed = "Connection Failed",
+  Reconnect = "Reconnect",
+}
+
+export enum ContainerStatusType {
+  Active = "Active",
+  Disconnected = "Disconnected",
 }
 
 export const EmulatorMasterKey =
@@ -353,15 +361,37 @@ export const StyleConstants = require("less-vars-loader!../../less/Common/Consta
 
 export class Notebook {
   public static readonly defaultBasePath = "./notebooks";
-  public static readonly heartbeatDelayMs = 5000;
+  public static readonly heartbeatDelayMs = 60000;
+  public static readonly containerStatusHeartbeatDelayMs = 30000;
   public static readonly kernelRestartInitialDelayMs = 1000;
   public static readonly kernelRestartMaxDelayMs = 20000;
   public static readonly autoSaveIntervalMs = 120000;
+  public static readonly memoryGuageToGB = 1048576;
+  public static readonly lowMemoryThreshold = 0.8;
+  public static readonly remainingTimeForAlert = 10;
+  public static readonly retryAttempts = 3;
+  public static readonly retryAttemptDelayMs = 5000;
   public static readonly temporarilyDownMsg = "Notebooks is currently not available. We are working on it.";
   public static readonly mongoShellTemporarilyDownMsg =
     "We have identified an issue with the Mongo Shell and it is unavailable right now. We are actively working on the mitigation.";
   public static readonly cassandraShellTemporarilyDownMsg =
     "We have identified an issue with the Cassandra Shell and it is unavailable right now. We are actively working on the mitigation.";
+  public static saveNotebookModalTitle = "Save notebook in temporary workspace";
+  public static saveNotebookModalContent =
+    "This notebook will be saved in the temporary workspace and will be removed when the session expires. To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends.";
+  public static newNotebookModalTitle = "Create notebook in temporary workspace";
+  public static newNotebookUploadModalTitle = "Upload notebook to temporary workspace";
+  public static newNotebookModalContent1 =
+    "A temporary workspace will be created to enable you to work with notebooks. When the session expires, any notebooks in the workspace will be removed.";
+  public static newNotebookModalContent2 =
+    "To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends. ";
+  public static galleryNotebookDownloadContent1 =
+    "To download, run, and make changes to this sample notebook, a temporary workspace will be created. When the session expires, any notebooks in the workspace will be removed.";
+  public static galleryNotebookDownloadContent2 =
+    "To save your work permanently, save your notebooks to a GitHub repository or download the Notebooks to your local machine before the session ends. ";
+  public static cosmosNotebookHomePageUrl = "https://aka.ms/cosmos-notebooks-limits";
+  public static cosmosNotebookGitDocumentationUrl = "https://aka.ms/cosmos-notebooks-github";
+  public static learnMore = "Learn more.";
 }
 
 export class SparkLibrary {
@@ -382,3 +412,11 @@ export class TerminalQueryParams {
   public static readonly SubscriptionId = "subscriptionId";
   public static readonly TerminalEndpoint = "terminalEndpoint";
 }
+
+export class JunoEndpoints {
+  public static readonly Test = "https://juno-test.documents-dev.windows-int.net";
+  public static readonly Test2 = "https://juno-test2.documents-dev.windows-int.net";
+  public static readonly Test3 = "https://juno-test3.documents-dev.windows-int.net";
+  public static readonly Prod = "https://tools.cosmos.azure.com";
+  public static readonly Stage = "https://tools-staging.cosmos.azure.com";
+}

src/Common/EntityValue.tsx

@@ -54,7 +54,7 @@ export const EntityValue: FunctionComponent<TableEntityProps> = ({
     <TextField
       label={entityValueLabel && entityValueLabel}
       className="addEntityTextField"
-      // id="entityValueId"
+      id="entityValueId"
       autoFocus
       disabled={isEntityValueDisable}
       type={entityValueType}

src/Common/TableEntity.tsx

@@ -95,6 +95,7 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({
       <Stack horizontal tokens={sectionStackTokens}>
         <TextField
           label={entityPropertyLabel && entityPropertyLabel}
+          id="entityPropertyId"
           autoFocus
           disabled={isPropertyTypeDisable}
           placeholder={entityPropertyPlaceHolder}
@@ -108,6 +109,7 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({
           onChange={onEntityTypeChange}
           options={options}
           disabled={isPropertyTypeDisable}
+          id="entityTypeId"
           styles={dropdownStyles}
         />
         <EntityValue

src/ConfigContext.ts

@@ -1,3 +1,5 @@
+import { JunoEndpoints } from "Common/Constants";
+
 export enum Platform {
   Portal = "Portal",
   Hosted = "Hosted",
@@ -23,7 +25,9 @@ export interface ConfigContext {
   PROXY_PATH?: string;
   JUNO_ENDPOINT: string;
   GITHUB_CLIENT_ID: string;
+  GITHUB_TEST_ENV_CLIENT_ID: string;
   GITHUB_CLIENT_SECRET?: string; // No need to inject secret for prod. Juno already knows it.
+  IS_MPAC: boolean;
   hostedExplorerURL: string;
   armAPIVersion?: string;
   allowedJunoOrigins: string[];
@@ -52,14 +56,17 @@ let configContext: Readonly<ConfigContext> = {
   GRAPH_API_VERSION: "1.6",
   ARCADIA_ENDPOINT: "https://workspaceartifacts.projectarcadia.net",
   ARCADIA_LIVY_ENDPOINT_DNS_ZONE: "dev.azuresynapse.net",
-  GITHUB_CLIENT_ID: "6cb2f63cf6f7b5cbdeca", // Registered OAuth app: https://github.com/settings/applications/1189306
+  GITHUB_CLIENT_ID: "6cb2f63cf6f7b5cbdeca", // Registered OAuth app: https://github.com/organizations/AzureCosmosDBNotebooks/settings/applications/1189306
+  GITHUB_TEST_ENV_CLIENT_ID: "b63fc8cbf87fd3c6e2eb", // Registered OAuth app: https://github.com/organizations/AzureCosmosDBNotebooks/settings/applications/1777772
+  IS_MPAC: false,
   JUNO_ENDPOINT: "https://tools.cosmos.azure.com",
   BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
   allowedJunoOrigins: [
-    "https://juno-test.documents-dev.windows-int.net",
-    "https://juno-test2.documents-dev.windows-int.net",
-    "https://tools.cosmos.azure.com",
-    "https://tools-staging.cosmos.azure.com",
+    JunoEndpoints.Test,
+    JunoEndpoints.Test2,
+    JunoEndpoints.Test3,
+    JunoEndpoints.Prod,
+    JunoEndpoints.Stage,
     "https://localhost",
   ],
 };

src/Contracts/DataModels.ts

@@ -1,4 +1,4 @@
-import { ConnectionStatusType } from "../Common/Constants";
+import { ConnectionStatusType, ContainerStatusType } from "../Common/Constants";
 
 export interface DatabaseAccount {
   id: string;
@@ -26,6 +26,8 @@ export interface DatabaseAccountExtendedProperties {
   isVirtualNetworkFilterEnabled?: boolean;
   ipRules?: IpRule[];
   privateEndpointConnections?: unknown[];
+  capacity?: { totalThroughputLimit: number };
+  locations?: DatabaseAccountResponseLocation[];
 }
 
 export interface DatabaseAccountResponseLocation {
@@ -426,6 +428,32 @@ export interface OperationStatus {
 export interface NotebookWorkspaceConnectionInfo {
   authToken: string;
   notebookServerEndpoint: string;
+  forwardingId: string;
+}
+
+export interface ContainerInfo {
+  durationLeftInMinutes: number;
+  notebookServerInfo: NotebookWorkspaceConnectionInfo;
+  status: ContainerStatusType;
+}
+
+export interface IProvisionData {
+  cosmosEndpoint: string;
+}
+
+export interface IContainerData {
+  forwardingId: string;
+}
+
+export interface IResponse<T> {
+  status: number;
+  data: T;
+}
+
+export interface IPhoenixConnectionInfoResult {
+  readonly notebookAuthToken?: string;
+  readonly notebookServerUrl?: string;
+  readonly forwardingId?: string;
 }
 
 export interface NotebookWorkspaceFeedResponse {

src/Explorer/ContextMenuButtonFactory.tsx

@@ -83,7 +83,7 @@ export const createCollectionContextMenuButton = (
 
     items.push({
       iconSrc: HostedTerminalIcon,
-      isDisabled: useNotebook.getState().isShellEnabled && userContext.features.notebooksTemporarilyDown,
+      isDisabled: useNotebook.getState().isShellEnabled && !useNotebook.getState().isPhoenix,
       onClick: () => {
         const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
         if (useNotebook.getState().isShellEnabled) {

src/Explorer/Controls/Dialog.tsx

@@ -30,6 +30,7 @@ export interface DialogState {
     onOk: () => void,
     cancelLabel: string,
     onCancel: () => void,
+    contentHtml?: JSX.Element,
     choiceGroupProps?: IChoiceGroupProps,
     textFieldProps?: TextFieldProps,
     primaryButtonDisabled?: boolean
@@ -58,6 +59,7 @@ export const useDialog: UseStore<DialogState> = create((set, get) => ({
     onOk: () => void,
     cancelLabel: string,
     onCancel: () => void,
+    contentHtml?: JSX.Element,
     choiceGroupProps?: IChoiceGroupProps,
     textFieldProps?: TextFieldProps,
     primaryButtonDisabled?: boolean
@@ -76,6 +78,7 @@ export const useDialog: UseStore<DialogState> = create((set, get) => ({
         get().closeDialog();
         onCancel && onCancel();
       },
+      contentHtml,
       choiceGroupProps,
       textFieldProps,
       primaryButtonDisabled,
@@ -124,6 +127,7 @@ export interface DialogProps {
   type?: DialogType;
   showCloseButton?: boolean;
   onDismiss?: () => void;
+  contentHtml?: JSX.Element;
 }
 
 const DIALOG_MIN_WIDTH = "400px";
@@ -150,6 +154,7 @@ export const Dialog: FC = () => {
     type,
     showCloseButton,
     onDismiss,
+    contentHtml,
   } = props || {};
 
   const dialogProps: IDialogProps = {
@@ -191,6 +196,7 @@ export const Dialog: FC = () => {
           {linkProps.linkText} <FontIcon iconName="NavigateExternalInline" />
         </Link>
       )}
+      {contentHtml}
       {progressIndicatorProps && <ProgressIndicator {...progressIndicatorProps} />}
       <DialogFooter>
         <PrimaryButton {...primaryButtonProps} />

src/Explorer/Controls/GitHub/AddRepoComponent.tsx

@@ -1,14 +1,14 @@
 import { DefaultButton, IButtonProps, ITextFieldProps, TextField } from "@fluentui/react";
 import * as React from "react";
 import * as Constants from "../../../Common/Constants";
+import * as UrlUtility from "../../../Common/UrlUtility";
+import { IGitHubRepo } from "../../../GitHub/GitHubClient";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
+import * as GitHubUtils from "../../../Utils/GitHubUtils";
+import Explorer from "../../Explorer";
 import { RepoListItem } from "./GitHubReposComponent";
 import { ChildrenMargin } from "./GitHubStyleConstants";
-import * as GitHubUtils from "../../../Utils/GitHubUtils";
-import { IGitHubRepo } from "../../../GitHub/GitHubClient";
-import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
-import * as UrlUtility from "../../../Common/UrlUtility";
-import Explorer from "../../Explorer";
 
 export interface AddRepoComponentProps {
   container: Explorer;
@@ -27,7 +27,6 @@ export class AddRepoComponent extends React.Component<AddRepoComponentProps, Add
   private static readonly ButtonText = "Add";
   private static readonly TextFieldPlaceholder = "https://github.com/owner/repo/tree/branch";
   private static readonly TextFieldErrorMessage = "Invalid url";
-  private static readonly DefaultBranchName = "master";
 
   constructor(props: AddRepoComponentProps) {
     super(props);
@@ -78,7 +77,7 @@ export class AddRepoComponent extends React.Component<AddRepoComponentProps, Add
     });
     let enteredUrl = this.state.textFieldValue;
     if (enteredUrl.indexOf("/tree/") === -1) {
-      enteredUrl = UrlUtility.createUri(enteredUrl, `tree/${AddRepoComponent.DefaultBranchName}`);
+      enteredUrl = UrlUtility.createUri(enteredUrl, `tree/`);
     }
 
     const repoInfo = GitHubUtils.fromRepoUri(enteredUrl);
@@ -93,11 +92,7 @@ export class AddRepoComponent extends React.Component<AddRepoComponentProps, Add
         const item: RepoListItem = {
           key: GitHubUtils.toRepoFullName(repo.owner, repo.name),
           repo,
-          branches: [
-            {
-              name: repoInfo.branch,
-            },
-          ],
+          branches: repoInfo.branch ? [{ name: repoInfo.branch }] : [],
         };
 
         TelemetryProcessor.traceSuccess(

src/Explorer/Controls/GitHub/ReposListComponent.tsx

@@ -24,11 +24,11 @@ import { RepoListItem } from "./GitHubReposComponent";
 import {
   BranchesDropdownCheckboxStyles,
   BranchesDropdownOptionContainerStyle,
+  BranchesDropdownStyles,
+  BranchesDropdownWidth,
+  ReposListBranchesColumnWidth,
   ReposListCheckboxStyles,
   ReposListRepoColumnMinWidth,
-  ReposListBranchesColumnWidth,
-  BranchesDropdownWidth,
-  BranchesDropdownStyles,
 } from "./GitHubStyleConstants";
 
 export interface ReposListComponentProps {
@@ -44,6 +44,7 @@ export interface BranchesProps {
   lastPageInfo?: IGitHubPageInfo;
   hasMore: boolean;
   isLoading: boolean;
+  defaultBranchName: string;
   loadMore: () => void;
 }
 
@@ -64,7 +65,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
   private static readonly BranchesColumnName = "Branches";
   private static readonly LoadingText = "Loading...";
   private static readonly LoadMoreText = "Load more";
-  private static readonly DefaultBranchName = "master";
+  private static readonly DefaultBranchNames = "master/main";
   private static readonly FooterIndex = -1;
 
   public render(): JSX.Element {
@@ -155,6 +156,10 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
     }
 
     const branchesProps = this.props.branchesProps[GitHubUtils.toRepoFullName(item.repo.owner, item.repo.name)];
+    if (item.branches.length === 0 && branchesProps.defaultBranchName) {
+      item.branches = [{ name: branchesProps.defaultBranchName }];
+    }
+
     const options: IDropdownOption[] = branchesProps.branches.map((branch) => ({
       key: branch.name,
       text: branch.name,
@@ -198,7 +203,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
     const dropdownProps: IDropdownProps = {
       styles: BranchesDropdownStyles,
       options: [],
-      placeholder: ReposListComponent.DefaultBranchName,
+      placeholder: ReposListComponent.DefaultBranchNames,
       disabled: true,
     };
 
@@ -272,7 +277,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
       styles: ReposListCheckboxStyles,
       onChange: () => {
         const repoListItem = { ...item };
-        repoListItem.branches = [{ name: ReposListComponent.DefaultBranchName }];
+        repoListItem.branches = [];
         this.props.pinRepo(repoListItem);
       },
     };

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

@@ -35,16 +35,19 @@ const testCassandraAccount: DataModels.DatabaseAccount = {
 const testNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
   authToken: "authToken",
   notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com",
+  forwardingId: "Id",
 };
 
 const testMongoNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
   authToken: "authToken",
   notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongo",
+  forwardingId: "Id",
 };
 
 const testCassandraNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
   authToken: "authToken",
   notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/cassandra",
+  forwardingId: "Id",
 };
 
 describe("NotebookTerminalComponent", () => {

src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx

@@ -17,6 +17,7 @@ import Explorer from "../../Explorer";
 import { NotebookClientV2 } from "../../Notebook/NotebookClientV2";
 import { NotebookComponentBootstrapper } from "../../Notebook/NotebookComponent/NotebookComponentBootstrapper";
 import NotebookReadOnlyRenderer from "../../Notebook/NotebookRenderer/NotebookReadOnlyRenderer";
+import { useNotebook } from "../../Notebook/useNotebook";
 import { Dialog, TextFieldProps, useDialog } from "../Dialog";
 import { NotebookMetadataComponent } from "./NotebookMetadataComponent";
 import "./NotebookViewerComponent.less";
@@ -51,7 +52,7 @@ export class NotebookViewerComponent
     super(props);
 
     this.clientManager = new NotebookClientV2({
-      connectionInfo: { authToken: undefined, notebookServerEndpoint: undefined },
+      connectionInfo: { authToken: undefined, notebookServerEndpoint: undefined, forwardingId: undefined },
       databaseAccountName: undefined,
       defaultExperience: "NotebookViewer",
       isReadOnly: true,
@@ -146,7 +147,7 @@ export class NotebookViewerComponent
             <NotebookMetadataComponent
               data={this.state.galleryItem}
               isFavorite={this.state.isFavorite}
-              downloadButtonText={this.props.container && "Download to my notebooks"}
+              downloadButtonText={this.props.container && `Download to ${useNotebook.getState().notebookFolderName}`}
               onTagClick={this.props.onTagClick}
               onFavoriteClick={this.favoriteItem}
               onUnfavoriteClick={this.unfavoriteItem}

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -1,4 +1,5 @@
 import { IPivotItemProps, IPivotProps, Pivot, PivotItem } from "@fluentui/react";
+import { useDatabases } from "Explorer/useDatabases";
 import * as React from "react";
 import DiscardIcon from "../../../../images/discard.svg";
 import SaveIcon from "../../../../images/save-cosmos.svg";
@@ -71,6 +72,7 @@ export interface SettingsComponentState {
   wasAutopilotOriginallySet: boolean;
   isScaleSaveable: boolean;
   isScaleDiscardable: boolean;
+  throughputError: string;
 
   timeToLive: TtlType;
   timeToLiveBaseline: TtlType;
@@ -124,6 +126,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
   private changeFeedPolicyVisible: boolean;
   private isFixedContainer: boolean;
   private shouldShowIndexingPolicyEditor: boolean;
+  private totalThroughputUsed: number;
   public mongoDBCollectionResource: MongoDBCollectionResource;
 
   constructor(props: SettingsComponentProps) {
@@ -155,6 +158,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       wasAutopilotOriginallySet: false,
       isScaleSaveable: false,
       isScaleDiscardable: false,
+      throughputError: undefined,
 
       timeToLive: undefined,
       timeToLiveBaseline: undefined,
@@ -208,6 +212,11 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         return true;
       },
     };
+
+    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
+    if (throughputCap && throughputCap !== -1) {
+      this.calculateTotalThroughputUsed();
+    }
   }
 
   componentDidMount(): void {
@@ -254,6 +263,10 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       return false;
     }
 
+    if (this.state.throughputError) {
+      return false;
+    }
+
     return (
       this.state.isScaleSaveable ||
       this.state.isSubSettingsSaveable ||
@@ -481,6 +494,26 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
   private onMongoIndexingPolicyDiscardableChange = (isMongoIndexingPolicyDiscardable: boolean): void =>
     this.setState({ isMongoIndexingPolicyDiscardable });
 
+  private calculateTotalThroughputUsed = (): void => {
+    this.totalThroughputUsed = 0;
+    (useDatabases.getState().databases || []).forEach(async (database) => {
+      if (database.offer()) {
+        const dbThroughput = database.offer().autoscaleMaxThroughput || database.offer().manualThroughput;
+        this.totalThroughputUsed += dbThroughput;
+      }
+
+      (database.collections() || []).forEach(async (collection) => {
+        if (collection.offer()) {
+          const colThroughput = collection.offer().autoscaleMaxThroughput || collection.offer().manualThroughput;
+          this.totalThroughputUsed += colThroughput;
+        }
+      });
+    });
+
+    const numberOfRegions = userContext.databaseAccount?.properties.locations?.length || 1;
+    this.totalThroughputUsed *= numberOfRegions;
+  };
+
   public getAnalyticalStorageTtl = (): number => {
     if (this.isAnalyticalStorageEnabled) {
       if (this.state.analyticalStorageTtlSelection === TtlType.On) {
@@ -643,10 +676,31 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     return buttons;
   };
 
-  private onMaxAutoPilotThroughputChange = (newThroughput: number): void =>
-    this.setState({ autoPilotThroughput: newThroughput });
+  private onMaxAutoPilotThroughputChange = (newThroughput: number): void => {
+    let throughputError = "";
+    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
+    const numberOfRegions = userContext.databaseAccount?.properties.locations?.length || 1;
+    const throughputDelta = (newThroughput - this.offer.autoscaleMaxThroughput) * numberOfRegions;
+    if (throughputCap && throughputCap !== -1 && throughputCap - this.totalThroughputUsed < throughputDelta) {
+      throughputError = `Your account is currently configured with a total throughput limit of ${throughputCap} RU/s. This update isn't possible because it would increase the total throughput to ${
+        this.totalThroughputUsed + throughputDelta
+      } RU/s. Change total throughput limit in cost management.`;
+    }
+    this.setState({ autoPilotThroughput: newThroughput, throughputError });
+  };
 
-  private onThroughputChange = (newThroughput: number): void => this.setState({ throughput: newThroughput });
+  private onThroughputChange = (newThroughput: number): void => {
+    let throughputError = "";
+    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
+    const numberOfRegions = userContext.databaseAccount?.properties.locations?.length || 1;
+    const throughputDelta = (newThroughput - this.offer.manualThroughput) * numberOfRegions;
+    if (throughputCap && throughputCap !== -1 && throughputCap - this.totalThroughputUsed < throughputDelta) {
+      throughputError = `Your account is currently configured with a total throughput limit of ${throughputCap} RU/s. This update isn't possible because it would increase the total throughput to ${
+        this.totalThroughputUsed + throughputDelta
+      } RU/s. Change total throughput limit in cost management.`;
+    }
+    this.setState({ throughput: newThroughput, throughputError });
+  };
 
   private onAutoPilotSelected = (isAutoPilotSelected: boolean): void =>
     this.setState({ isAutoPilotSelected: isAutoPilotSelected });
@@ -893,6 +947,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       onScaleSaveableChange: this.onScaleSaveableChange,
       onScaleDiscardableChange: this.onScaleDiscardableChange,
       initialNotification: this.props.settingsTab.pendingNotification(),
+      throughputError: this.state.throughputError,
     };
 
     if (!this.isCollectionSettingsTab) {

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

@@ -36,6 +36,7 @@ export interface ScaleComponentProps {
   onScaleSaveableChange: (isScaleSaveable: boolean) => void;
   onScaleDiscardableChange: (isScaleDiscardable: boolean) => void;
   initialNotification: DataModels.Notification;
+  throughputError?: string;
 }
 
 export class ScaleComponent extends React.Component<ScaleComponentProps> {
@@ -189,6 +190,7 @@ export class ScaleComponent extends React.Component<ScaleComponentProps> {
       onScaleDiscardableChange={this.props.onScaleDiscardableChange}
       getThroughputWarningMessage={this.getThroughputWarningMessage}
       usageSizeInKB={this.props.collection?.usageSizeInKB()}
+      throughputError={this.props.throughputError}
     />
   );
 

src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx

@@ -75,6 +75,7 @@ export interface ThroughputInputAutoPilotV3Props {
   onScaleDiscardableChange: (isScaleDiscardable: boolean) => void;
   getThroughputWarningMessage: () => JSX.Element;
   usageSizeInKB: number;
+  throughputError?: string;
 }
 
 interface ThroughputInputAutoPilotV3State {
@@ -540,6 +541,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
         value={this.overrideWithProvisionedThroughputSettings() ? "" : this.props.maxAutoPilotThroughput?.toString()}
         onChange={this.onAutoPilotThroughputChange}
         min={minAutoPilotThroughput}
+        errorMessage={this.props.throughputError}
       />
       {!this.overrideWithProvisionedThroughputSettings() && this.getAutoPilotUsageCost()}
       {this.minRUperGBSurvey()}
@@ -579,6 +581,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
         }
         onChange={this.onThroughputChange}
         min={this.props.minimum}
+        errorMessage={this.props.throughputError}
       />
       {this.state.exceedFreeTierThroughput && (
         <MessageBar

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

@@ -34,7 +34,13 @@ exports[`SettingsComponent renders 1`] = `
                 "isTabsContentExpanded": [Function],
                 "onRefreshDatabasesKeyPress": [Function],
                 "onRefreshResourcesClick": [Function],
-                "phoenixClient": PhoenixClient {},
+                "phoenixClient": PhoenixClient {
+                  "retryOptions": Object {
+                    "maxTimeout": 5000,
+                    "minTimeout": 5000,
+                    "retries": 3,
+                  },
+                },
                 "provideFeedbackEmail": [Function],
                 "queriesClient": QueriesClient {
                   "container": [Circular],
@@ -102,7 +108,13 @@ exports[`SettingsComponent renders 1`] = `
                 "isTabsContentExpanded": [Function],
                 "onRefreshDatabasesKeyPress": [Function],
                 "onRefreshResourcesClick": [Function],
-                "phoenixClient": PhoenixClient {},
+                "phoenixClient": PhoenixClient {
+                  "retryOptions": Object {
+                    "maxTimeout": 5000,
+                    "minTimeout": 5000,
+                    "retries": 3,
+                  },
+                },
                 "provideFeedbackEmail": [Function],
                 "queriesClient": QueriesClient {
                   "container": [Circular],

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

@@ -7,6 +7,7 @@ const props = {
   isSharded: true,
   setThroughputValue: () => jest.fn(),
   setIsAutoscale: () => jest.fn(),
+  setIsThroughputCapExceeded: () => jest.fn(),
   onCostAcknowledgeChange: () => jest.fn(),
 };
 describe("ThroughputInput Pane", () => {

src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx

@@ -1,5 +1,6 @@
 import { Checkbox, DirectionalHint, Link, Stack, Text, TextField, TooltipHost } from "@fluentui/react";
-import React, { FunctionComponent, useState } from "react";
+import { useDatabases } from "Explorer/useDatabases";
+import React, { FunctionComponent, useEffect, useState } from "react";
 import * as Constants from "../../../Common/Constants";
 import { InfoTooltip } from "../../../Common/Tooltip/InfoTooltip";
 import * as SharedConstants from "../../../Shared/Constants";
@@ -16,6 +17,7 @@ export interface ThroughputInputProps {
   showFreeTierExceedThroughputTooltip: boolean;
   setThroughputValue: (throughput: number) => void;
   setIsAutoscale: (isAutoscale: boolean) => void;
+  setIsThroughputCapExceeded: (isThroughputCapExceeded: boolean) => void;
   onCostAcknowledgeChange: (isAcknowledged: boolean) => void;
 }
 
@@ -24,6 +26,7 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
   showFreeTierExceedThroughputTooltip,
   setThroughputValue,
   setIsAutoscale,
+  setIsThroughputCapExceeded,
   isSharded,
   onCostAcknowledgeChange,
 }: ThroughputInputProps) => {
@@ -31,10 +34,60 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
   const [throughput, setThroughput] = useState<number>(AutoPilotUtils.minAutoPilotThroughput);
   const [isCostAcknowledged, setIsCostAcknowledged] = useState<boolean>(false);
   const [throughputError, setThroughputError] = useState<string>("");
+  const [totalThroughputUsed, setTotalThroughputUsed] = useState<number>(0);
 
   setIsAutoscale(isAutoscaleSelected);
   setThroughputValue(throughput);
 
+  const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
+  const numberOfRegions = userContext.databaseAccount?.properties.locations?.length || 1;
+
+  useEffect(() => {
+    // throughput cap check for the initial state
+    let totalThroughput = 0;
+    (useDatabases.getState().databases || []).forEach((database) => {
+      if (database.offer()) {
+        const dbThroughput = database.offer().autoscaleMaxThroughput || database.offer().manualThroughput;
+        totalThroughput += dbThroughput;
+      }
+
+      (database.collections() || []).forEach((collection) => {
+        if (collection.offer()) {
+          const colThroughput = collection.offer().autoscaleMaxThroughput || collection.offer().manualThroughput;
+          totalThroughput += colThroughput;
+        }
+      });
+    });
+    totalThroughput *= numberOfRegions;
+    setTotalThroughputUsed(totalThroughput);
+
+    if (throughputCap && throughputCap !== -1 && throughputCap - totalThroughput < throughput) {
+      setThroughputError(
+        `Your account is currently configured with a total throughput limit of ${throughputCap} RU/s. This update isn't possible because it would increase the total throughput to ${
+          totalThroughput + throughput * numberOfRegions
+        } RU/s. Change total throughput limit in cost management.`
+      );
+
+      setIsThroughputCapExceeded(true);
+    }
+  }, []);
+
+  const checkThroughputCap = (newThroughput: number): boolean => {
+    if (throughputCap && throughputCap !== -1 && throughputCap - totalThroughputUsed < newThroughput) {
+      setThroughputError(
+        `Your account is currently configured with a total throughput limit of ${throughputCap} RU/s. This update isn't possible because it would increase the total throughput to ${
+          totalThroughputUsed + newThroughput * numberOfRegions
+        } RU/s. Change total throughput limit in cost management.`
+      );
+      setIsThroughputCapExceeded(true);
+      return false;
+    }
+
+    setThroughputError("");
+    setIsThroughputCapExceeded(false);
+    return true;
+  };
+
   const getThroughputLabelText = (): string => {
     let throughputHeaderText: string;
     if (isAutoscaleSelected) {
@@ -60,11 +113,17 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
     const newThroughput = parseInt(newInput);
     setThroughput(newThroughput);
     setThroughputValue(newThroughput);
+
     if (!isSharded && newThroughput > 10000) {
       setThroughputError("Unsharded collections support up to 10,000 RUs");
-    } else {
-      setThroughputError("");
+      return;
     }
+
+    if (!checkThroughputCap(newThroughput)) {
+      return;
+    }
+
+    setThroughputError("");
   };
 
   const getAutoScaleTooltip = (): string => {
@@ -96,11 +155,13 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
       setIsAutoScaleSelected(true);
       setThroughputValue(AutoPilotUtils.minAutoPilotThroughput);
       setIsAutoscale(true);
+      checkThroughputCap(AutoPilotUtils.minAutoPilotThroughput);
     } else {
       setThroughput(SharedConstants.CollectionCreation.DefaultCollectionRUs400);
       setIsAutoScaleSelected(false);
       setThroughputValue(SharedConstants.CollectionCreation.DefaultCollectionRUs400);
       setIsAutoscale(false);
+      checkThroughputCap(SharedConstants.CollectionCreation.DefaultCollectionRUs400);
     }
   };
 

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

@@ -6,6 +6,7 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
   isSharded={true}
   onCostAcknowledgeChange={[Function]}
   setIsAutoscale={[Function]}
+  setIsThroughputCapExceeded={[Function]}
   setThroughputValue={[Function]}
   showFreeTierExceedThroughputTooltip={true}
 >

src/Explorer/Explorer.tsx

@@ -1,16 +1,25 @@
+import { Link } from "@fluentui/react/lib/Link";
+import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
 import * as ko from "knockout";
 import React from "react";
 import _ from "underscore";
+import shallow from "zustand/shallow";
 import { AuthType } from "../AuthType";
 import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer";
 import * as Constants from "../Common/Constants";
+import { Areas, ConnectionStatusType, HttpStatusCodes, Notebook } from "../Common/Constants";
 import { readCollection } from "../Common/dataAccess/readCollection";
 import { readDatabases } from "../Common/dataAccess/readDatabases";
-import { isPublicInternetAccessAllowed } from "../Common/DatabaseAccountUtility";
 import { getErrorMessage, getErrorStack, handleError } from "../Common/ErrorHandlingUtils";
 import * as Logger from "../Common/Logger";
 import { QueriesClient } from "../Common/QueriesClient";
 import * as DataModels from "../Contracts/DataModels";
+import {
+  ContainerConnectionInfo,
+  IPhoenixConnectionInfoResult,
+  IProvisionData,
+  IResponse,
+} from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import { GitHubOAuthService } from "../GitHub/GitHubOAuthService";
 import { useSidePanel } from "../hooks/useSidePanel";
@@ -26,7 +35,6 @@ import { update } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
 import {
   get as getWorkspace,
   listByDatabaseAccount,
-  listConnectionInfo,
   start,
 } from "../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
 import { stringToBlob } from "../Utils/BlobUtils";
@@ -162,24 +170,9 @@ export default class Explorer {
     );
 
     useNotebook.subscribe(
-      async () => {
-        if (!this.notebookManager) {
-          const NotebookManager = await (
-            await import(/* webpackChunkName: "NotebookManager" */ "./Notebook/NotebookManager")
-          ).default;
-          this.notebookManager = new NotebookManager();
-          this.notebookManager.initialize({
-            container: this,
-            resourceTree: this.resourceTree,
-            refreshCommandBarButtons: () => this.refreshCommandBarButtons(),
-            refreshNotebookList: () => this.refreshNotebookList(),
-          });
-        }
-
-        this.refreshCommandBarButtons();
-        this.refreshNotebookList();
-      },
-      (state) => state.isNotebookEnabled
+      async () => this.initiateAndRefreshNotebookList(),
+      (state) => [state.isNotebookEnabled, state.isRefreshed],
+      shallow
     );
 
     this.resourceTree = new ResourceTreeAdapter(this);
@@ -189,6 +182,7 @@ export default class Explorer {
       useNotebook.getState().setNotebookServerInfo({
         notebookServerEndpoint: userContext.features.notebookServerUrl,
         authToken: userContext.features.notebookServerToken,
+        forwardingId: undefined,
       });
     }
 
@@ -212,6 +206,23 @@ export default class Explorer {
     this.refreshExplorer();
   }
 
+  public async initiateAndRefreshNotebookList(): Promise<void> {
+    if (!this.notebookManager) {
+      const NotebookManager = (await import(/* webpackChunkName: "NotebookManager" */ "./Notebook/NotebookManager"))
+        .default;
+      this.notebookManager = new NotebookManager();
+      this.notebookManager.initialize({
+        container: this,
+        resourceTree: this.resourceTree,
+        refreshCommandBarButtons: () => this.refreshCommandBarButtons(),
+        refreshNotebookList: () => this.refreshNotebookList(),
+      });
+    }
+
+    this.refreshCommandBarButtons();
+    this.refreshNotebookList();
+  }
+
   public openEnableSynapseLinkDialog(): void {
     const addSynapseLinkDialogProps: DialogProps = {
       linkProps: {
@@ -345,44 +356,81 @@ export default class Explorer {
       return;
     }
     this._isInitializingNotebooks = true;
-    if (userContext.features.phoenix) {
-      const provisionData = {
-        cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
-        resourceId: userContext.databaseAccount.id,
-        dbAccountName: userContext.databaseAccount.name,
-        aadToken: userContext.authorizationToken,
-        resourceGroup: userContext.resourceGroup,
-        subscriptionId: userContext.subscriptionId,
-      };
-      const connectionInfo = await this.phoenixClient.containerConnectionInfo(provisionData);
-      if (connectionInfo.data && connectionInfo.data.notebookServerUrl) {
-        useNotebook.getState().setNotebookServerInfo({
-          notebookServerEndpoint: userContext.features.notebookServerUrl || connectionInfo.data.notebookServerUrl,
-          authToken: userContext.features.notebookServerToken || connectionInfo.data.notebookAuthToken,
-        });
-      }
-    } else {
-      await this.ensureNotebookWorkspaceRunning();
-      const connectionInfo = await listConnectionInfo(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        databaseAccount.name,
-        "default"
-      );
-
-      useNotebook.getState().setNotebookServerInfo({
-        notebookServerEndpoint: userContext.features.notebookServerUrl || connectionInfo.notebookServerEndpoint,
-        authToken: userContext.features.notebookServerToken || connectionInfo.authToken,
-      });
-    }
-
-    useNotebook.getState().initializeNotebooksTree(this.notebookManager);
-
     this.refreshNotebookList();
-
     this._isInitializingNotebooks = false;
   }
 
+  public async allocateContainer(): Promise<void> {
+    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+    const isAllocating = useNotebook.getState().isAllocating;
+    if (
+      isAllocating === false &&
+      (notebookServerInfo === undefined ||
+        (notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined))
+    ) {
+      const provisionData: IProvisionData = {
+        cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
+      };
+      const connectionStatus: ContainerConnectionInfo = {
+        status: ConnectionStatusType.Connecting,
+      };
+      useNotebook.getState().setConnectionInfo(connectionStatus);
+      try {
+        TelemetryProcessor.traceStart(Action.PhoenixConnection, {
+          dataExplorerArea: Areas.Notebook,
+        });
+        useNotebook.getState().setIsAllocating(true);
+        const connectionInfo = await this.phoenixClient.allocateContainer(provisionData);
+        if (connectionInfo.status !== HttpStatusCodes.OK) {
+          throw new Error(`Received status code: ${connectionInfo?.status}`);
+        }
+        if (!connectionInfo?.data?.notebookServerUrl) {
+          throw new Error(`NotebookServerUrl is invalid!`);
+        }
+        await this.setNotebookInfo(connectionInfo, connectionStatus);
+        TelemetryProcessor.traceSuccess(Action.PhoenixConnection, {
+          dataExplorerArea: Areas.Notebook,
+        });
+      } catch (error) {
+        TelemetryProcessor.traceFailure(Action.PhoenixConnection, {
+          dataExplorerArea: Areas.Notebook,
+          error: getErrorMessage(error),
+          errorStack: getErrorStack(error),
+        });
+        connectionStatus.status = ConnectionStatusType.Failed;
+        useNotebook.getState().resetContainerConnection(connectionStatus);
+        throw error;
+      } finally {
+        useNotebook.getState().setIsAllocating(false);
+        this.refreshCommandBarButtons();
+        this.refreshNotebookList();
+        this._isInitializingNotebooks = false;
+      }
+    }
+  }
+
+  private async setNotebookInfo(
+    connectionInfo: IResponse<IPhoenixConnectionInfoResult>,
+    connectionStatus: DataModels.ContainerConnectionInfo
+  ) {
+    const containerData = {
+      forwardingId: connectionInfo.data.forwardingId,
+      dbAccountName: userContext.databaseAccount.name,
+    };
+    await this.phoenixClient.initiateContainerHeartBeat(containerData);
+
+    connectionStatus.status = ConnectionStatusType.Connected;
+    useNotebook.getState().setConnectionInfo(connectionStatus);
+    useNotebook.getState().setNotebookServerInfo({
+      notebookServerEndpoint: userContext.features.notebookServerUrl || connectionInfo.data.notebookServerUrl,
+      authToken: userContext.features.notebookServerToken || connectionInfo.data.notebookAuthToken,
+      forwardingId: connectionInfo.data.forwardingId,
+    });
+    this.notebookManager?.notebookClient
+      .getMemoryUsage()
+      .then((memoryUsageInfo) => useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo));
+  }
+
   public resetNotebookWorkspace(): void {
     if (!useNotebook.getState().isNotebookEnabled || !this.notebookManager?.notebookClient) {
       handleError(
@@ -391,11 +439,14 @@ export default class Explorer {
       );
       return;
     }
+    const dialogContent = useNotebook.getState().isPhoenix
+      ? "Notebooks saved in the temporary workspace will be deleted. Do you want to proceed?"
+      : "This lets you keep your notebook files and the workspace will be restored to default. Proceed anyway?";
 
     const resetConfirmationDialogProps: DialogProps = {
       isModal: true,
       title: "Reset Workspace",
-      subText: "This lets you keep your notebook files and the workspace will be restored to default. Proceed anyway?",
+      subText: dialogContent,
       primaryButtonText: "OK",
       secondaryButtonText: "Cancel",
       onPrimaryButtonClick: this._resetNotebookWorkspace,
@@ -453,16 +504,54 @@ export default class Explorer {
   private _resetNotebookWorkspace = async () => {
     useDialog.getState().closeDialog();
     const clearInProgressMessage = logConsoleProgress("Resetting notebook workspace");
+    let connectionStatus: ContainerConnectionInfo;
     try {
-      await this.notebookManager?.notebookClient.resetWorkspace();
+      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+      if (!notebookServerInfo || !notebookServerInfo.notebookServerEndpoint) {
+        const error = "No server endpoint detected";
+        Logger.logError(error, "NotebookContainerClient/resetWorkspace");
+        logConsoleError(error);
+        return;
+      }
+      TelemetryProcessor.traceStart(Action.PhoenixResetWorkspace, {
+        dataExplorerArea: Areas.Notebook,
+      });
+      if (useNotebook.getState().isPhoenix) {
+        useTabs.getState().closeAllNotebookTabs(true);
+        connectionStatus = {
+          status: ConnectionStatusType.Connecting,
+        };
+        useNotebook.getState().setConnectionInfo(connectionStatus);
+      }
+      const connectionInfo = await this.notebookManager?.notebookClient.resetWorkspace();
+      if (connectionInfo?.status !== HttpStatusCodes.OK) {
+        throw new Error(`Reset Workspace: Received status code- ${connectionInfo?.status}`);
+      }
+      if (!connectionInfo?.data?.notebookServerUrl) {
+        throw new Error(`Reset Workspace: NotebookServerUrl is invalid!`);
+      }
+      if (useNotebook.getState().isPhoenix) {
+        await this.setNotebookInfo(connectionInfo, connectionStatus);
+        useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
+      }
       logConsoleInfo("Successfully reset notebook workspace");
-      TelemetryProcessor.traceSuccess(Action.ResetNotebookWorkspace);
+      TelemetryProcessor.traceSuccess(Action.PhoenixResetWorkspace, {
+        dataExplorerArea: Areas.Notebook,
+      });
     } catch (error) {
       logConsoleError(`Failed to reset notebook workspace: ${error}`);
-      TelemetryProcessor.traceFailure(Action.ResetNotebookWorkspace, {
+      TelemetryProcessor.traceFailure(Action.PhoenixResetWorkspace, {
+        dataExplorerArea: Areas.Notebook,
         error: getErrorMessage(error),
         errorStack: getErrorStack(error),
       });
+      if (useNotebook.getState().isPhoenix) {
+        connectionStatus = {
+          status: ConnectionStatusType.Failed,
+        };
+        useNotebook.getState().resetContainerConnection(connectionStatus);
+        useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
+      }
       throw error;
     } finally {
       clearInProgressMessage();
@@ -654,6 +743,9 @@ export default class Explorer {
     if (!notebookContentItem || !notebookContentItem.path) {
       throw new Error(`Invalid notebookContentItem: ${notebookContentItem}`);
     }
+    if (notebookContentItem.type === NotebookContentItemType.Notebook && useNotebook.getState().isPhoenix) {
+      await this.allocateContainer();
+    }
 
     const notebookTabs = useTabs
       .getState()
@@ -875,9 +967,50 @@ export default class Explorer {
       handleError(error, "Explorer/onNewNotebookClicked");
       throw new Error(error);
     }
+    if (useNotebook.getState().isPhoenix) {
+      if (isGithubTree) {
+        async () => {
+          await this.allocateContainer();
+          parent = parent || this.resourceTree.myNotebooksContentRoot;
+          this.createNewNoteBook(parent, isGithubTree);
+        };
+      } else {
+        useDialog.getState().showOkCancelModalDialog(
+          Notebook.newNotebookModalTitle,
+          undefined,
+          "Create",
+          async () => {
+            await this.allocateContainer();
+            parent = parent || this.resourceTree.myNotebooksContentRoot;
+            this.createNewNoteBook(parent, isGithubTree);
+          },
+          "Cancel",
+          undefined,
+          this.getNewNoteWarningText()
+        );
+      }
+    } else {
+      parent = parent || this.resourceTree.myNotebooksContentRoot;
+      this.createNewNoteBook(parent, isGithubTree);
+    }
+  }
 
-    parent = parent || this.resourceTree.myNotebooksContentRoot;
+  private getNewNoteWarningText(): JSX.Element {
+    return (
+      <>
+        <p>{Notebook.newNotebookModalContent1}</p>
+        <br />
+        <p>
+          {Notebook.newNotebookModalContent2}
+          <Link href={Notebook.cosmosNotebookHomePageUrl} target="_blank">
+            {Notebook.learnMore}
+          </Link>
+        </p>
+      </>
+    );
+  }
 
+  private createNewNoteBook(parent?: NotebookContentItem, isGithubTree?: boolean): void {
     const clearInProgressMessage = logConsoleProgress(`Creating new notebook in ${parent.path}`);
     const startKey: number = TelemetryProcessor.traceStart(Action.CreateNewNotebook, {
       dataExplorerArea: Constants.Areas.Notebook,
@@ -924,7 +1057,26 @@ export default class Explorer {
     await this.notebookManager?.notebookContentClient.updateItemChildrenInPlace(item);
   }
 
-  public openNotebookTerminal(kind: ViewModels.TerminalKind): void {
+  public async openNotebookTerminal(kind: ViewModels.TerminalKind): Promise<void> {
+    if (useNotebook.getState().isPhoenix) {
+      await this.allocateContainer();
+      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+      if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint !== undefined) {
+        this.connectToNotebookTerminal(kind);
+      } else {
+        useDialog
+          .getState()
+          .showOkModalDialog(
+            "Failed to connect",
+            "Failed to connect to temporary workspace. This could happen because of network issues. Please refresh the page and try again."
+          );
+      }
+    } else {
+      this.connectToNotebookTerminal(kind);
+    }
+  }
+
+  private connectToNotebookTerminal(kind: ViewModels.TerminalKind): void {
     let title: string;
 
     switch (kind) {
@@ -975,7 +1127,7 @@ export default class Explorer {
     notebookUrl?: string,
     galleryItem?: IGalleryItem,
     isFavorite?: boolean
-  ) {
+  ): Promise<void> {
     const title = "Gallery";
     const GalleryTab = await (await import(/* webpackChunkName: "GalleryTab" */ "./Tabs/GalleryTab")).default;
     const galleryTab = useTabs
@@ -1018,7 +1170,10 @@ export default class Explorer {
           <CassandraAddCollectionPane explorer={this} cassandraApiClient={new CassandraAPIDataClient()} />
         );
     } else {
-      await useDatabases.getState().loadDatabaseOffers();
+      const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
+      throughputCap && throughputCap !== -1
+        ? await useDatabases.getState().loadAllOffers()
+        : await useDatabases.getState().loadDatabaseOffers();
       useSidePanel
         .getState()
         .openSidePanel("New " + getCollectionName(), <AddCollectionPanel explorer={this} databaseId={databaseId} />);
@@ -1044,10 +1199,9 @@ export default class Explorer {
   }
 
   public async handleOpenFileAction(path: string): Promise<void> {
-    if (
-      userContext.features.phoenix === false &&
-      !(await this._containsDefaultNotebookWorkspace(userContext.databaseAccount))
-    ) {
+    if (useNotebook.getState().isPhoenix) {
+      await this.allocateContainer();
+    } else if (!(await this._containsDefaultNotebookWorkspace(userContext.databaseAccount))) {
       this._openSetupNotebooksPaneForQuickstart();
     }
 
@@ -1079,7 +1233,27 @@ export default class Explorer {
   }
 
   public openUploadFilePanel(parent?: NotebookContentItem): void {
-    parent = parent || this.resourceTree.myNotebooksContentRoot;
+    if (useNotebook.getState().isPhoenix) {
+      useDialog.getState().showOkCancelModalDialog(
+        Notebook.newNotebookUploadModalTitle,
+        undefined,
+        "Upload",
+        async () => {
+          await this.allocateContainer();
+          parent = parent || this.resourceTree.myNotebooksContentRoot;
+          this.uploadFilePanel(parent);
+        },
+        "Cancel",
+        undefined,
+        this.getNewNoteWarningText()
+      );
+    } else {
+      parent = parent || this.resourceTree.myNotebooksContentRoot;
+      this.uploadFilePanel(parent);
+    }
+  }
+
+  private uploadFilePanel(parent?: NotebookContentItem): void {
     useSidePanel
       .getState()
       .openSidePanel(
@@ -1088,33 +1262,46 @@ export default class Explorer {
       );
   }
 
+  public getDownloadModalConent(fileName: string): JSX.Element {
+    if (useNotebook.getState().isPhoenix) {
+      return (
+        <>
+          <p>{Notebook.galleryNotebookDownloadContent1}</p>
+          <br />
+          <p>
+            {Notebook.galleryNotebookDownloadContent2}
+            <Link href={Notebook.cosmosNotebookGitDocumentationUrl} target="_blank">
+              {Notebook.learnMore}
+            </Link>
+          </p>
+        </>
+      );
+    }
+    return <p> Download {fileName} from gallery as a copy to your notebooks to run and/or edit the notebook. </p>;
+  }
+
   public async refreshExplorer(): Promise<void> {
     userContext.authType === AuthType.ResourceToken
       ? this.refreshDatabaseForResourceToken()
       : this.refreshAllDatabases();
     await useNotebook.getState().refreshNotebooksEnabledStateForAccount();
-    let isNotebookEnabled = true;
-    if (!userContext.features.phoenix) {
-      isNotebookEnabled =
-        userContext.authType !== AuthType.ResourceToken &&
-        ((await this._containsDefaultNotebookWorkspace(userContext.databaseAccount)) ||
-          userContext.features.enableNotebooks);
+
+    //Disable phoenix in case of Vnet or Firewall was enabled.
+    if (!isPublicInternetAccessAllowed()) {
+      useNotebook.getState().setIsPhoenix(false);
     }
+    // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
+    const isNotebookEnabled = userContext.features.notebooksDownBanner || useNotebook.getState().isPhoenix;
     useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled);
-    useNotebook.getState().setIsShellEnabled(isNotebookEnabled && isPublicInternetAccessAllowed());
+    useNotebook.getState().setIsShellEnabled(useNotebook.getState().isPhoenix && isPublicInternetAccessAllowed());
 
     TelemetryProcessor.trace(Action.NotebookEnabled, ActionModifiers.Mark, {
       isNotebookEnabled,
       dataExplorerArea: Constants.Areas.Notebook,
     });
 
-    if (!userContext.features.notebooksTemporarilyDown) {
-      if (isNotebookEnabled) {
-        await this.initNotebooks(userContext.databaseAccount);
-      } else if (this.notebookToImport) {
-        // if notebooks is not enabled but the user is trying to do a quickstart setup with notebooks, open the SetupNotebooksPane
-        this._openSetupNotebooksPaneForQuickstart();
-      }
+    if (useNotebook.getState().isPhoenix) {
+      await this.initNotebooks(userContext.databaseAccount);
     }
   }
 }

src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.ts

@@ -736,7 +736,7 @@ export class D3ForceGraph implements GraphRenderer {
       .on("dblclick", function (this: Element, _: MouseEvent, d: D3Node) {
         // https://stackoverflow.com/a/41945742 ('this' implicitly has type 'any' because it does not have a type annotation)
         // this is the <g> element
-        return self.onNodeClicked(this.parentNode, d);
+        self.onNodeClicked(this.parentNode, d);
       })
       .on("click", function (this: Element, _: MouseEvent, d: D3Node) {
         // this is the <g> element

src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { FeedOptions, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import * as Q from "q";
 import * as React from "react";
@@ -294,8 +296,6 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       this.setGremlinParams();
     }
 
-    const selectedNode = this.state.highlightedNode;
-
     props.onGraphAccessorCreated({
       applyFilter: this.submitQuery.bind(this),
       addVertex: this.addVertex.bind(this),
@@ -303,7 +303,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     });
   } // constructor
 
-  public shareIGraphConfig(igraphConfig: IGraphConfig) {
+  public shareIGraphConfig(igraphConfig: IGraphConfig): void {
     this.setState({
       igraphConfig: { ...igraphConfig },
     });
@@ -330,10 +330,10 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     const partitionKeyProperty = this.props.collectionPartitionKeyProperty;
 
     // aggregate all the properties, remove dropped ones
-    let finalProperties = editedProperties.existingProperties.concat(editedProperties.addedProperties);
+    const finalProperties = editedProperties.existingProperties.concat(editedProperties.addedProperties);
 
     // Compose the query
-    let pkId = editedProperties.pkId;
+    const pkId = editedProperties.pkId;
     let updateQueryFragment = "";
 
     finalProperties.forEach((p) => {
@@ -422,7 +422,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    * Called from ko binding
    * @param id
    */
-  public selectNode(id: string) {
+  public selectNode(id: string): void {
     if (!this.d3ForceGraph) {
       console.warn("Attempting to select node, but d3ForceGraph not initialized, yet.");
       return;
@@ -431,7 +431,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     this.d3ForceGraph.selectNode(id);
   }
 
-  public deleteHighlightedNode() {
+  public deleteHighlightedNode(): void {
     if (!this.state.highlightedNode) {
       GraphExplorer.reportToConsole(ConsoleDataType.Error, "No highlighted node to remove.");
       return;
@@ -467,23 +467,23 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    * Is of type: {e: GremlinEdge, v: GremlinVertex}[]
    * @param data
    */
-  public static isEdgeVertexPairArray(data: any) {
+  public static isEdgeVertexPairArray(data: any): boolean {
     if (!(data instanceof Array)) {
       GraphExplorer.reportToConsole(ConsoleDataType.Info, "Query result not an array", data);
       return false;
     }
 
-    let pairs: any[] = data;
+    const pairs: any[] = data;
     for (let i = 0; i < pairs.length; i++) {
       const item = pairs[i];
       if (
-        !item.hasOwnProperty("e") ||
-        !item.hasOwnProperty("v") ||
-        !item["e"].hasOwnProperty("id") ||
-        !item["e"].hasOwnProperty("type") ||
+        !Object.prototype.hasOwnProperty.call(item, "e") ||
+        !Object.prototype.hasOwnProperty.call(item, "v") ||
+        !Object.prototype.hasOwnProperty.call(item["e"], "id") ||
+        !Object.prototype.hasOwnProperty.call(item["e"], "type") ||
         item["e"].type !== "edge" ||
-        !item["v"].hasOwnProperty("id") ||
-        !item["v"].hasOwnProperty("type") ||
+        !Object.prototype.hasOwnProperty.call(item["v"], "id") ||
+        !Object.prototype.hasOwnProperty.call(item["e"], "type") ||
         item["v"].type !== "vertex"
       ) {
         return false;
@@ -514,7 +514,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     // Try hitting cache first
     const cache = outE ? this.outECache : this.inECache;
     const pairs = cache.retrieve(vertex.id, startIndex, pageSize);
-    if (pairs != null && pairs.length === pageSize) {
+    if (pairs !== null && pairs.length === pageSize) {
       const msg = `Retrieved ${pairs.length} ${outE ? "outE" : "inE"} edges from cache for vertex id: ${vertex.id}`;
       GraphExplorer.reportToConsole(ConsoleDataType.Info, msg);
       return Q.resolve(pairs);
@@ -588,7 +588,6 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       vertex._outEAllLoaded &&
       vertex._inEAllLoaded
     ) {
-      console.info("No more edges to load for vertex " + vertex.id);
       updateGraphData();
       return Q.resolve(graphData);
     }
@@ -668,7 +667,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       }
     );
 
-    return promise.then((nbPairsFetched: number) => {
+    return promise.then(() => {
       if (offsetIndex >= GraphExplorer.LOAD_PAGE_SIZE || !vertex._outEAllLoaded || !vertex._inEAllLoaded) {
         vertex._pagination = {
           total:
@@ -754,7 +753,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    * Create a new edge in docdb and update graph
    * @param e
    */
-  public createNewEdge(e: GraphNewEdgeData): Q.Promise<any> {
+  public createNewEdge(e: GraphNewEdgeData): Q.Promise<unknown> {
     const q = `g.V('${GraphUtil.escapeSingleQuotes(e.inputOutV)}').addE('${GraphUtil.escapeSingleQuotes(
       e.label
     )}').To(g.V('${GraphUtil.escapeSingleQuotes(e.inputInV)}'))`;
@@ -772,8 +771,8 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
           return;
         }
 
-        let edge = edges[0];
-        let graphData = this.originalGraphData;
+        const edge = edges[0];
+        const graphData = this.originalGraphData;
         graphData.addEdge(edge);
 
         // Allow loadNeighbors to load list new edge
@@ -800,10 +799,10 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    * Manually update in-memory graph.
    * @param edgeId
    */
-  public removeEdge(edgeId: string): Q.Promise<any> {
+  public removeEdge(edgeId: string): Q.Promise<unknown> {
     return this.submitToBackend(`g.E('${GraphUtil.escapeSingleQuotes(edgeId)}').drop()`).then(
       () => {
-        let graphData = this.originalGraphData;
+        const graphData = this.originalGraphData;
         graphData.removeEdge(edgeId, false);
         this.updateGraphData(graphData, this.state.igraphConfig);
       },
@@ -826,10 +825,14 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       return false;
     }
 
-    let vertices: any[] = data;
+    const vertices: any[] = data;
     if (vertices.length > 0) {
-      let v0 = vertices[0];
-      if (!v0.hasOwnProperty("id") || !v0.hasOwnProperty("type") || v0.type !== "vertex") {
+      const v0 = vertices[0];
+      if (
+        !Object.prototype.hasOwnProperty.call(v0, "id") ||
+        !Object.prototype.hasOwnProperty.call(v0, "type") ||
+        v0.type !== "vertex"
+      ) {
         return false;
       }
     }
@@ -837,7 +840,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   }
 
   public processGremlinQueryResults(result: GremlinClient.GremlinRequestResult): void {
-    const data = result.data as any;
+    const data = result.data as GraphData.GremlinVertex[];
     this.setFilterQueryStatus(FilterQueryStatus.GraphEmptyResult);
 
     if (data === null) {
@@ -927,13 +930,13 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
           throw { title: err };
         }
 
-        if (vertices == null || vertices.length < 1) {
+        if (vertices === null || vertices.length < 1) {
           const err = "Failed to create vertex (no vertex in response)";
           GraphExplorer.reportToConsole(ConsoleDataType.Error, err, vertices);
           throw { title: err };
         }
 
-        let vertex = vertices[0];
+        const vertex = vertices[0];
         const graphData = this.originalGraphData;
         graphData.addVertex(vertex);
         this.updateGraphData(graphData, this.state.igraphConfig);
@@ -1022,7 +1025,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     this.gremlinClient.destroy();
   }
   public componentDidMount(): void {
-    if (this.props.onLoadStartKey != null && this.props.onLoadStartKey != undefined) {
+    if (this.props.onLoadStartKey !== null && this.props.onLoadStartKey !== undefined) {
       TelemetryProcessor.traceSuccess(
         Action.Tab,
         {
@@ -1082,7 +1085,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   public static reportToConsole(type: ConsoleDataType.Info, msg: string, ...errorData: any[]): void;
   public static reportToConsole(type: ConsoleDataType.Error, msg: string, ...errorData: any[]): void;
   public static reportToConsole(type: ConsoleDataType, msg: string, ...errorData: any[]): void | (() => void) {
-    let errorDataStr: string = "";
+    let errorDataStr = "";
     if (errorData && errorData.length > 0) {
       console.error(msg, errorData);
       errorDataStr = ": " + JSON.stringify(errorData);
@@ -1161,12 +1164,15 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       )}"`
     ).then(
       (documents: DataModels.DocumentId[]) => {
-        $.each(documents, (index: number, doc: any) => {
-          newIconsMap[doc["_graph_icon_property_value"]] = {
-            data: doc["icon"],
-            format: doc["format"],
-          };
-        });
+        $.each(
+          documents,
+          (index: number, doc: { _graph_icon_property_value: string; icon: string; format: string }) => {
+            newIconsMap[doc["_graph_icon_property_value"]] = {
+              data: doc["icon"],
+              format: doc["format"],
+            };
+          }
+        );
 
         // Update graph configuration
         this.setState({
@@ -1223,8 +1229,8 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     const key = this.state.igraphConfig.nodeCaption;
     return $.map(
       this.state.rootMap,
-      (value: any, index: number): LeftPane.CaptionId => {
-        let result = GraphData.GraphData.getNodePropValue(value, key);
+      (value: any): LeftPane.CaptionId => {
+        const result = GraphData.GraphData.getNodePropValue(value, key);
         return {
           caption: result !== undefined ? result : value.id,
           id: value.id,
@@ -1237,7 +1243,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    * Selecting a root node means
    * @param node
    */
-  private selectRootNode(id: string): Q.Promise<any> {
+  private selectRootNode(id: string): Q.Promise<unknown> {
     if (!this.d3ForceGraph) {
       console.warn("Attempting to reset zoom, but d3ForceGraph not initialized, yet.");
     } else {
@@ -1282,7 +1288,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
         this.collectNodeProperties(this.originalGraphData.vertices);
         this.updatePropertiesPane(id);
       },
-      (reason: any) => {
+      (reason: string) => {
         GraphExplorer.reportToConsole(ConsoleDataType.Error, `Failed to select root node. Reason:${reason}`);
       }
     );
@@ -1349,10 +1355,10 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   private getPkIdFromVertex(v: GraphData.GremlinVertex): string {
     if (
       this.props.collectionPartitionKeyProperty &&
-      v.hasOwnProperty("properties") &&
-      v.properties.hasOwnProperty(this.props.collectionPartitionKeyProperty) &&
+      Object.prototype.hasOwnProperty.call(v, "properties") &&
+      Object.prototype.hasOwnProperty.call(v.properties, this.props.collectionPartitionKeyProperty) &&
       v.properties[this.props.collectionPartitionKeyProperty].length > 0 &&
-      v.properties[this.props.collectionPartitionKeyProperty][0].hasOwnProperty("value")
+      Object.prototype.hasOwnProperty.call(v.properties[this.props.collectionPartitionKeyProperty][0], "value")
     ) {
       const pk = v.properties[this.props.collectionPartitionKeyProperty][0].value;
       return GraphExplorer.generatePkIdPair(pk, v.id);
@@ -1370,8 +1376,8 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   private getPkIdFromNodeData(v: GraphHighlightedNodeData): string {
     if (
       this.props.collectionPartitionKeyProperty &&
-      v.hasOwnProperty("properties") &&
-      v.properties.hasOwnProperty(this.props.collectionPartitionKeyProperty)
+      Object.prototype.hasOwnProperty.call(v, "properties") &&
+      Object.prototype.hasOwnProperty.call(v.properties, this.props.collectionPartitionKeyProperty)
     ) {
       const pk = v.properties[this.props.collectionPartitionKeyProperty];
       return GraphExplorer.generatePkIdPair(pk[0] as PartitionKeyValueType, v.id);
@@ -1388,14 +1394,14 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    * @return id
    */
   public static getPkIdFromDocumentId(d: DataModels.DocumentId, collectionPartitionKeyProperty: string): string {
-    let { id } = d;
+    const { id } = d;
     if (typeof id !== "string") {
       const error = `Vertex id is not a string: ${JSON.stringify(id)}.`;
       logConsoleError(error);
       throw new Error(error);
     }
 
-    if (collectionPartitionKeyProperty && d.hasOwnProperty(collectionPartitionKeyProperty)) {
+    if (collectionPartitionKeyProperty && Object.prototype.hasOwnProperty.call(d, collectionPartitionKeyProperty)) {
       let pk = (d as any)[collectionPartitionKeyProperty];
       if (typeof pk !== "string" && typeof pk !== "number" && typeof pk !== "boolean") {
         if (Array.isArray(pk) && pk.length > 0) {
@@ -1425,7 +1431,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     }"] AS p FROM c WHERE NOT IS_DEFINED(c._isEdge)`;
     return this.executeNonPagedDocDbQuery(q).then(
       (documents: DataModels.DocumentId[]) => {
-        let possibleVertices = [] as PossibleVertex[];
+        const possibleVertices = [] as PossibleVertex[];
         $.each(documents, (index: number, item: any) => {
           if (highlightedNodeId && item.id === highlightedNodeId) {
             // Exclude highlighed node in the list
@@ -1439,7 +1445,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
               caption: item.p,
             });
           } else {
-            if (item.hasOwnProperty("p")) {
+            if (Object.prototype.hasOwnProperty.call(item, "p")) {
               possibleVertices.push({
                 value: item.id,
                 caption: item.p[0]["_value"],
@@ -1462,17 +1468,17 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
    * @param addedEdges
    * @return promise when done
    */
-  private editGraphEdges(editedEdges: EditedEdges): Q.Promise<any> {
-    let promises = [];
+  private editGraphEdges(editedEdges: EditedEdges): Q.Promise<unknown> {
+    const promises = [];
     // Drop edges
     for (let i = 0; i < editedEdges.droppedIds.length; i++) {
-      let id = editedEdges.droppedIds[i];
+      const id = editedEdges.droppedIds[i];
       promises.push(this.removeEdge(id));
     }
 
     // Add edges
     for (let i = 0; i < editedEdges.addedEdges.length; i++) {
-      let e = editedEdges.addedEdges[i];
+      const e = editedEdges.addedEdges[i];
       promises.push(
         this.createNewEdge(e).then(() => {
           // Reload neighbors in case we linked to a vertex that isn't loaded in the graph
@@ -1525,7 +1531,9 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   /**
    * For unit testing purposes
    */
-  public onGraphUpdated(timestamp: number): void {}
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public onGraphUpdated(_timestamp: number): void {}
 
   /**
    * Get node properties for styling purposes. Result is the union of all properties of all nodes.
@@ -1533,17 +1541,17 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   private collectNodeProperties(vertices: GraphData.GremlinVertex[]) {
     const props = {} as any; // Hashset
     $.each(vertices, (index: number, item: GraphData.GremlinVertex) => {
-      for (var p in item) {
+      for (const p in item) {
         // DocDB: Exclude type because it's always 'vertex'
         if (p !== "type" && typeof (item as any)[p] === "string") {
           props[p] = true;
         }
       }
       // Inspect properties
-      if (item.hasOwnProperty("properties")) {
+      if (Object.prototype.hasOwnProperty.call(item, "properties")) {
         // TODO This is DocDB-graph specific
         // Assume each property value is [{value:... }]
-        for (var f in item.properties) {
+        for (const f in item.properties) {
           props[f] = true;
         }
       }
@@ -1570,21 +1578,21 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       return;
     }
 
-    let data = this.originalGraphData.getVertexById(id);
+    const data = this.originalGraphData.getVertexById(id);
 
     // A bit of translation to make it easier to display
-    let props: { [id: string]: ViewModels.GremlinPropertyValueType[] } = {};
-    for (let p in data.properties) {
+    const props: { [id: string]: ViewModels.GremlinPropertyValueType[] } = {};
+    for (const p in data.properties) {
       props[p] = data.properties[p].map((gremlinProperty) => gremlinProperty.value);
     }
 
     // update neighbors
-    let sources: NeighborVertexBasicInfo[] = [];
-    let targets: NeighborVertexBasicInfo[] = [];
+    const sources: NeighborVertexBasicInfo[] = [];
+    const targets: NeighborVertexBasicInfo[] = [];
     this.props.onResetDefaultGraphConfigValues();
-    let nodeCaption = this.state.igraphConfigUiData.nodeCaptionChoice;
+    const nodeCaption = this.state.igraphConfigUiData.nodeCaptionChoice;
     this.updateSelectedNodeNeighbors(data.id, nodeCaption, sources, targets);
-    let sData: GraphHighlightedNodeData = {
+    const sData: GraphHighlightedNodeData = {
       id: data.id,
       label: data.label,
       properties: props,
@@ -1611,16 +1619,16 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     targets: NeighborVertexBasicInfo[]
   ): void {
     // update neighbors
-    let gd = this.originalGraphData;
-    let v = gd.getVertexById(id);
+    const gd = this.originalGraphData;
+    const v = gd.getVertexById(id);
 
     // Clear the array while keeping the references
     sources.length = 0;
     targets.length = 0;
 
-    let possibleEdgeLabels = {} as any; // Collect all edge labels in a hashset
+    const possibleEdgeLabels = {} as any; // Collect all edge labels in a hashset
 
-    for (let p in v.inE) {
+    for (const p in v.inE) {
       possibleEdgeLabels[p] = true;
       const edges = v.inE[p];
       $.each(edges, (index: number, edge: GraphData.GremlinShortInEdge) => {
@@ -1629,7 +1637,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
           // If id not known, it must be an edge node whose neighbor hasn't been loaded into the graph, yet
           return;
         }
-        let caption = GraphData.GraphData.getNodePropValue(gd.getVertexById(neighborId), nodeCaption) as string;
+        const caption = GraphData.GraphData.getNodePropValue(gd.getVertexById(neighborId), nodeCaption) as string;
         sources.push({
           name: caption,
           id: neighborId,
@@ -1639,7 +1647,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       });
     }
 
-    for (let p in v.outE) {
+    for (const p in v.outE) {
       possibleEdgeLabels[p] = true;
       const edges = v.outE[p];
       $.each(edges, (index: number, edge: GraphData.GremlinShortOutEdge) => {
@@ -1648,7 +1656,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
           // If id not known, it must be an edge node whose neighbor hasn't been loaded into the graph, yet
           return;
         }
-        let caption = GraphData.GraphData.getNodePropValue(gd.getVertexById(neighborId), nodeCaption) as string;
+        const caption = GraphData.GraphData.getNodePropValue(gd.getVertexById(neighborId), nodeCaption) as string;
         targets.push({
           name: caption,
           id: neighborId,
@@ -1660,7 +1668,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
 
     this.setState({
       possibleEdgeLabels: Object.keys(possibleEdgeLabels).map(
-        (value: string, index: number, array: string[]): InputTypeaheadComponent.Item => {
+        (value: string): InputTypeaheadComponent.Item => {
           return { caption: value, value: value };
         }
       ),
@@ -1681,20 +1689,20 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       return;
     }
 
-    let updatedVertex = vertices[0];
+    const updatedVertex = vertices[0];
     if (this.originalGraphData.hasVertexId(updatedVertex.id)) {
-      let currentVertex = this.originalGraphData.getVertexById(updatedVertex.id);
+      const currentVertex = this.originalGraphData.getVertexById(updatedVertex.id);
       // Copy updated properties
-      if (currentVertex.hasOwnProperty("properties")) {
+      if (Object.prototype.hasOwnProperty.call(currentVertex, "properties")) {
         delete currentVertex["properties"];
       }
-      for (var p in updatedVertex) {
+      for (const p in updatedVertex) {
         (currentVertex as any)[p] = updatedVertex[p];
       }
     }
 
     // TODO This kind of assumes saveVertexProperty is done from property panes.
-    let hn = this.state.highlightedNode;
+    const hn = this.state.highlightedNode;
     if (hn && hn.id === updatedVertex.id) {
       this.updatePropertiesPane(hn.id);
     }
@@ -1708,7 +1716,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     igraphConfig?: IGraphConfig
   ) {
     this.originalGraphData = graphData;
-    let gd = JSON.parse(JSON.stringify(this.originalGraphData));
+    const gd = JSON.parse(JSON.stringify(this.originalGraphData));
     if (!this.d3ForceGraph) {
       console.warn("Attempting to update graph, but d3ForceGraph not initialized, yet.");
       return;
@@ -1873,7 +1881,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
 
     promise
       .then((result: GremlinClient.GremlinRequestResult) => this.processGremlinQueryResults(result))
-      .catch((error: any) => {
+      .catch((error: Error) => {
         const errorMsg = `Failed to process query result: ${getErrorMessage(error)}`;
         GraphExplorer.reportToConsole(ConsoleDataType.Error, errorMsg);
         this.setState({

src/Explorer/Graph/GraphExplorerComponent/LeftPaneComponent.tsx

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

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

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

src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx

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

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -4,12 +4,10 @@
  * and update any knockout observables passed from the parent.
  */
 import { CommandBar as FluentCommandBar, ICommandBarItemProps } from "@fluentui/react";
+import { useNotebook } from "Explorer/Notebook/useNotebook";
 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 { userContext } from "../../../UserContext";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
 import { useSelectedNode } from "../../useSelectedNode";
@@ -55,16 +53,8 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
   const uiFabricControlButtons = CommandBarUtil.convertButton(controlButtons, backgroundColor);
   uiFabricControlButtons.forEach((btn: ICommandBarItemProps) => (btn.iconOnly = true));
 
-  if (
-    userContext.features.notebooksTemporarilyDown === false &&
-    userContext.features.phoenix === true &&
-    useTabs.getState().activeTab?.tabKind === ViewModels.CollectionTabKind.NotebookV2
-  ) {
-    uiFabricControlButtons.unshift(CommandBarUtil.createConnectionStatus("connectionStatus"));
-  }
-
-  if (useTabs.getState().activeTab?.tabKind === ViewModels.CollectionTabKind.NotebookV2) {
-    uiFabricControlButtons.unshift(CommandBarUtil.createMemoryTracker("memoryTracker"));
+  if (useNotebook.getState().isPhoenix) {
+    uiFabricControlButtons.unshift(CommandBarUtil.createConnectionStatus(container, "connectionStatus"));
   }
 
   return (

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -78,9 +78,10 @@ export function createStaticCommandBarButtons(
     if (container.notebookManager?.gitHubOAuthService) {
       notebookButtons.push(createManageGitHubAccountButton(container));
     }
-
-    notebookButtons.push(createOpenTerminalButton(container));
-    if (userContext.features.phoenix === false) {
+    if (useNotebook.getState().isPhoenix && configContext.IS_MPAC) {
+      notebookButtons.push(createOpenTerminalButton(container));
+    }
+    if (selectedNodeState.isConnectedToContainer()) {
       notebookButtons.push(createNotebookWorkspaceResetButton(container));
     }
     if (
@@ -98,7 +99,7 @@ export function createStaticCommandBarButtons(
     }
 
     notebookButtons.forEach((btn) => {
-      if (userContext.features.notebooksTemporarilyDown) {
+      if (!useNotebook.getState().isPhoenix) {
         if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
           applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
         } else if (btn.commandButtonLabel.indexOf("Mongo") !== -1) {
@@ -110,7 +111,7 @@ export function createStaticCommandBarButtons(
       buttons.push(btn);
     });
   } else {
-    if (!isRunningOnNationalCloud() && !userContext.features.notebooksTemporarilyDown) {
+    if (!isRunningOnNationalCloud() && useNotebook.getState().isPhoenix) {
       buttons.push(createDivider());
       buttons.push(createEnableNotebooksButton(container));
     }
@@ -168,7 +169,7 @@ export function createContextCommandBarButtons(
       onCommandClick: () => {
         const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
         if (useNotebook.getState().isShellEnabled) {
-          if (!userContext.features.notebooksTemporarilyDown) {
+          if (useNotebook.getState().isPhoenix) {
             container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
           }
         } else {
@@ -179,12 +180,12 @@ export function createContextCommandBarButtons(
       ariaLabel: label,
       hasPopup: true,
       tooltipText:
-        useNotebook.getState().isShellEnabled && userContext.features.notebooksTemporarilyDown
+        useNotebook.getState().isShellEnabled && !useNotebook.getState().isPhoenix
           ? Constants.Notebook.mongoShellTemporarilyDownMsg
           : undefined,
       disabled:
         (selectedNodeState.isDatabaseNodeOrNoneSelected() && userContext.apiType === "Mongo") ||
-        (useNotebook.getState().isShellEnabled && userContext.features.notebooksTemporarilyDown),
+        (useNotebook.getState().isShellEnabled && !useNotebook.getState().isPhoenix),
     };
     buttons.push(newMongoShellBtn);
   }
@@ -310,8 +311,13 @@ function createNewDatabase(container: Explorer): CommandButtonComponentProps {
   return {
     iconSrc: AddDatabaseIcon,
     iconAlt: label,
-    onCommandClick: () =>
-      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />),
+    onCommandClick: async () => {
+      const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
+      if (throughputCap && throughputCap !== -1) {
+        await useDatabases.getState().loadAllOffers();
+      }
+      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />);
+    },
     commandButtonLabel: label,
     ariaLabel: label,
     hasPopup: true,
@@ -596,7 +602,7 @@ function createManageGitHubAccountButton(container: Explorer): CommandButtonComp
   return {
     iconSrc: GitHubIcon,
     iconAlt: label,
-    onCommandClick: () =>
+    onCommandClick: () => {
       useSidePanel
         .getState()
         .openSidePanel(
@@ -606,7 +612,8 @@ function createManageGitHubAccountButton(container: Explorer): CommandButtonComp
             gitHubClientProp={container.notebookManager.gitHubClient}
             junoClientProp={junoClient}
           />
-        ),
+        );
+    },
     commandButtonLabel: label,
     hasPopup: false,
     disabled: false,

src/Explorer/Menus/CommandBar/CommandBarUtil.tsx

@@ -13,6 +13,7 @@ import { StyleConstants } from "../../../Common/Constants";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
+import Explorer from "../../Explorer";
 import { ConnectionStatus } from "./ConnectionStatusComponent";
 import { MemoryTracker } from "./MemoryTrackerComponent";
 
@@ -203,9 +204,9 @@ export const createMemoryTracker = (key: string): ICommandBarItemProps => {
   };
 };
 
-export const createConnectionStatus = (key: string): ICommandBarItemProps => {
+export const createConnectionStatus = (container: Explorer, key: string): ICommandBarItemProps => {
   return {
     key,
-    onRender: () => <ConnectionStatus />,
+    onRender: () => <ConnectionStatus container={container} />,
   };
 };

src/Explorer/Menus/CommandBar/ConnectionStatusComponent.less

@@ -3,77 +3,182 @@
 .connectionStatusContainer {
     cursor: default;
     align-items: center;
-    margin: 0 9px;
     border: 1px;
     min-height: 44px;
 
     > span {
         padding-right: 12px;
-        font-size: 13px;
+        font-size: 12px;
         font-family: @DataExplorerFont;
         color: @DefaultFontColor;
     }
+    &:focus{
+        outline: 0px;
+    }
 }
-.connectionStatusFailed{
-    color: #bd1919;
+.commandReactBtn {
+    &:hover {
+        background-color: rgb(238, 247, 255);
+        color: rgb(32, 31, 30);
+        cursor: pointer;
+    }
+    &:focus{
+        outline: 1px dashed #605e5c;
+    }
 }
-.ring-container {
+.connectedReactBtn {
+    &:hover {
+        background-color: rgb(238, 247, 255);
+        color: rgb(32, 31, 30);
+        cursor: pointer;
+    }
+    &:focus{
+        outline: 0px;
+    }
+}
+.connectIcon{
+        margin: 0px 4px;
+        height: 18px;
+        width: 18px;
+        color: rgb(0, 120, 212);
+} 
+  .status {
     position: relative;
-}
-
-.ringringGreen {
-    border: 3px solid green;
-    border-radius: 30px;
-    height: 18px;
-    width: 18px;
+    display: block;
+    margin-right: 8px;
+    width: 1em;
+    height: 1em;
+    font-size: 9px!important;
+    padding: 0px!important;
+    border-radius: 0.5em;
+  }
+  
+  .status::before,
+  .status::after {
     position: absolute;
-    margin: .4285em 0em 0em 0.07477em;
-    animation: pulsate 3s ease-out;
-    animation-iteration-count: infinite; 
-    opacity: 0.0
-}
-.ringringYellow{
-    border: 3px solid #ffbf00;
-    border-radius: 30px;
-    height: 18px;
-    width: 18px;
-    position: absolute;
-    margin: .4285em 0em 0em 0.07477em;
-    animation: pulsate 3s ease-out;
-    animation-iteration-count: infinite; 
-    opacity: 0.0
-}
-.ringringRed{
-    border: 3px solid #bd1919;
-    border-radius: 30px;
-    height: 18px;
-    width: 18px;
-    position: absolute;
-    margin: .4285em 0em 0em 0.07477em;
-    animation: pulsate 3s ease-out;
-    animation-iteration-count: infinite; 
-    opacity: 0.0
-}
-@keyframes pulsate {
-    0% {-webkit-transform: scale(0.1, 0.1); opacity: 0.0;}
-    15% {opacity: 0.8;}
-    25% {opacity: 0.6;}
-    45% {opacity: 0.4;}
-    70% {opacity: 0.3;}
-    100% {-webkit-transform: scale(.7, .7); opacity: 0.1;}
-}
-.locationGreenDot{
-    font-size: 20px;
-    margin-right: 0.07em;
-    color: green;
-}
-.locationYellowDot{
-    font-size: 20px;
-    margin-right: 0.07em;
-    color: #ffbf00;
-}
-.locationRedDot{
-    font-size: 20px;
-    margin-right: 0.07em;
-    color: #bd1919;
-}
+    content: "";
+  }
+  
+  .status::before {
+    top: 0;
+    left: 0;
+    width: 1em;
+    height: 1em;
+    background-color: rgba(#fff, 0.1);
+    border-radius: 100%;
+    opacity: 1;
+    transform: translate3d(0, 0, 0) scale(0);
+  }
+  
+  .connected{
+    background-color: green;
+    box-shadow:
+      0 0 0 0em rgba(green, 0),
+      0em 0.05em 0.1em rgba(#000000, 0.2);
+    transform: translate3d(0, 0, 0) scale(1);
+  }
+  .connecting{
+    background-color:#ffbf00;
+    box-shadow:
+      0 0 0 0em rgba(#ffbf00, 0),
+      0em 0.05em 0.1em rgba(#000000, 0.2);
+    transform: translate3d(0, 0, 0) scale(1);
+  }
+  .failed{
+    background-color:#bd1919;
+    box-shadow:
+      0 0 0 0em rgba(#bd1919, 0),
+      0em 0.05em 0.1em rgba(#000000, 0.2);
+    transform: translate3d(0, 0, 0) scale(1);
+  }
+  
+  .status.connecting.is-animating {
+    animation: status-outer-connecting 3000ms infinite;
+  }
+  .status.failed.is-animating {
+    animation: status-outer-failed 3000ms infinite;
+  }
+  .status.connected.is-animating {
+    animation: status-outer-connected 3000ms infinite;
+  }
+  @keyframes status-outer-connected {
+    
+   0% {
+      transform: translate3d(0, 0, 0) scale(1);
+      box-shadow: 0 0 0 0em #008000, 0em 0.05em 0.1em rgba(0, 0, 0, 0.2);
+    }
+    20% {
+      transform: translate3d(0, 0, 0) scale(1);
+      box-shadow: 0 0 0 0em rgba(0, 128, 0, 0.6), 0em 0.05em 0.1em rgba(0, 0, 0, 0.5);
+    }
+    40% {
+      transform: translate3d(0, 0, 0) scale(1);
+      box-shadow: 0 0 0 0em rgba(0, 128, 0, 0.5), 0em 0.05em 0.1em rgba(0, 0, 0, 0.4);
+    }
+    60% {
+      transform: translate3d(0, 0, 0) scale(1);
+      box-shadow: 0 0 0 0em rgba(0, 128, 0, 0.3), 0em 0.05em 0.1em rgba(0, 0, 0, 0.3);
+    }
+    80% {
+      transform: translate3d(0, 0, 0) scale(1);
+      box-shadow: 0 0 0 0.5em rgba(0, 128, 0, 0.1), 0em 0.05em 0.1em rgba(0, 0, 0, 0.1);
+    }
+    85% {
+      transform: translate3d(0, 0, 0) scale(1);
+      box-shadow: 0 0 0 0em rgba(0, 128, 0, 0), 0em 0.05em 0.1em rgba(0, 0, 0, 0);
+    }
+  }
+  @keyframes status-outer-failed {
+    
+    0% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0em #bd1919, 0em 0.05em 0.1em rgba(0, 0, 0, 0.2);
+     }
+     20% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0em #c52d2d, 0em 0.05em 0.1em rgba(0, 0, 0, 0.5);
+     }
+     40% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0em #b47b7b, 0em 0.05em 0.1em rgba(0, 0, 0, 0.4);
+     }
+     60% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0em rgba(0, 128, 0, 0.3), 0em 0.05em 0.1em rgba(0, 0, 0, 0.3);
+     }
+     80% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0.5em rgba(0, 128, 0, 0.1), 0em 0.05em 0.1em rgba(0, 0, 0, 0.1);
+     }
+     85% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0em rgba(0, 128, 0, 0), 0em 0.05em 0.1em rgba(0, 0, 0, 0);
+     }
+   }
+   @keyframes status-outer-connecting {
+    
+    0% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0em #ffbf00, 0em 0.05em 0.1em rgba(0, 0, 0, 0.2);
+     }
+     20% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0em #f0dfad, 0em 0.05em 0.1em rgba(0, 0, 0, 0.5);
+     }
+     40% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0em rgba(198, 243, 198, 0.5), 0em 0.05em 0.1em rgba(0, 0, 0, 0.4);
+     }
+     60% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0em rgba(213, 241, 213, 0.3), 0em 0.05em 0.1em rgba(0, 0, 0, 0.3);
+     }
+     80% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0.5em rgba(0, 128, 0, 0.1), 0em 0.05em 0.1em rgba(0, 0, 0, 0.1);
+     }
+     85% {
+       transform: translate3d(0, 0, 0) scale(1);
+       box-shadow: 0 0 0 0em rgba(0, 128, 0, 0), 0em 0.05em 0.1em rgba(0, 0, 0, 0);
+     }
+   }

src/Explorer/Menus/CommandBar/ConnectionStatusComponent.tsx

@@ -1,17 +1,54 @@
-import { Icon, ProgressIndicator, Stack, TooltipHost } from "@fluentui/react";
+import {
+  FocusTrapCallout,
+  FocusZone,
+  FocusZoneTabbableElements,
+  FontWeights,
+  Icon,
+  mergeStyleSets,
+  ProgressIndicator,
+  Stack,
+  Text,
+  TooltipHost,
+} from "@fluentui/react";
+import { useId } from "@fluentui/react-hooks";
+import { ActionButton, DefaultButton } from "@fluentui/react/lib/Button";
 import * as React from "react";
-import { ConnectionStatusType } from "../../../Common/Constants";
+import "../../../../less/hostedexplorer.less";
+import { ConnectionStatusType, ContainerStatusType, Notebook } from "../../../Common/Constants";
+import Explorer from "../../Explorer";
 import { useNotebook } from "../../Notebook/useNotebook";
 import "../CommandBar/ConnectionStatusComponent.less";
-
-export const ConnectionStatus: React.FC = (): JSX.Element => {
+interface Props {
+  container: Explorer;
+}
+export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Element => {
+  const connectionInfo = useNotebook((state) => state.connectionInfo);
   const [second, setSecond] = React.useState("00");
   const [minute, setMinute] = React.useState("00");
   const [isActive, setIsActive] = React.useState(false);
   const [counter, setCounter] = React.useState(0);
-  const [statusColor, setStatusColor] = React.useState("locationYellowDot");
-  const [statusColorAnimation, setStatusColorAnimation] = React.useState("ringringYellow");
-  const toolTipContent = "Hosted runtime status.";
+  const [statusColor, setStatusColor] = React.useState("");
+  const [toolTipContent, setToolTipContent] = React.useState("Connect to temporary workspace.");
+  const [isBarDismissed, setIsBarDismissed] = React.useState<boolean>(false);
+  const buttonId = useId("callout-button");
+  const containerInfo = useNotebook((state) => state.containerStatus);
+
+  const styles = mergeStyleSets({
+    callout: {
+      width: 320,
+      padding: "20px 24px",
+    },
+    title: {
+      marginBottom: 12,
+      fontWeight: FontWeights.semilight,
+    },
+    buttons: {
+      display: "flex",
+      justifyContent: "flex-end",
+      marginTop: 20,
+    },
+  });
+
   React.useEffect(() => {
     let intervalId: NodeJS.Timeout;
 
@@ -31,6 +68,15 @@ export const ConnectionStatus: React.FC = (): JSX.Element => {
     return () => clearInterval(intervalId);
   }, [isActive, counter]);
 
+  React.useEffect(() => {
+    if (connectionInfo?.status === ConnectionStatusType.Reconnect) {
+      setToolTipContent("Click here to Reconnect to temporary workspace.");
+    } else if (connectionInfo?.status === ConnectionStatusType.Failed) {
+      setStatusColor("status failed is-animating");
+      setToolTipContent("Click here to Reconnect to temporary workspace.");
+    }
+  }, [connectionInfo.status]);
+
   const stopTimer = () => {
     setIsActive(false);
     setCounter(0);
@@ -38,35 +84,103 @@ export const ConnectionStatus: React.FC = (): JSX.Element => {
     setMinute("00");
   };
 
-  const connectionInfo = useNotebook((state) => state.connectionInfo);
-  if (!connectionInfo) {
-    return <></>;
+  const memoryUsageInfo = useNotebook((state) => state.memoryUsageInfo);
+  const totalGB = memoryUsageInfo ? memoryUsageInfo.totalKB / Notebook.memoryGuageToGB : 0;
+  const usedGB = totalGB > 0 ? totalGB - memoryUsageInfo.freeKB / Notebook.memoryGuageToGB : 0;
+
+  if (
+    connectionInfo &&
+    (connectionInfo.status === ConnectionStatusType.Connect || connectionInfo.status === ConnectionStatusType.Reconnect)
+  ) {
+    return (
+      <ActionButton className="commandReactBtn" onClick={() => container.allocateContainer()}>
+        <TooltipHost content={toolTipContent}>
+          <Stack className="connectionStatusContainer" horizontal>
+            <Icon iconName="ConnectVirtualMachine" className="connectIcon" />
+            <span>{connectionInfo.status}</span>
+          </Stack>
+        </TooltipHost>
+      </ActionButton>
+    );
   }
+
   if (connectionInfo && connectionInfo.status === ConnectionStatusType.Connecting && isActive === false) {
+    stopTimer();
     setIsActive(true);
+    setStatusColor("status connecting is-animating");
+    setToolTipContent("Connecting to temporary workspace.");
   } else if (connectionInfo && connectionInfo.status === ConnectionStatusType.Connected && isActive === true) {
     stopTimer();
-    setStatusColor("locationGreenDot");
-    setStatusColorAnimation("ringringGreen");
+    setStatusColor("status connected is-animating");
+    setToolTipContent("Connected to temporary workspace.");
   } else if (connectionInfo && connectionInfo.status === ConnectionStatusType.Failed && isActive === true) {
     stopTimer();
-    setStatusColor("locationRedDot");
-    setStatusColorAnimation("ringringRed");
+    setStatusColor("status failed is-animating");
+    setToolTipContent("Click here to Reconnect to temporary workspace.");
   }
   return (
-    <TooltipHost content={toolTipContent}>
-      <Stack className="connectionStatusContainer" horizontal>
-        <div className="ring-container">
-          <div className={statusColorAnimation}></div>
-          <Icon iconName="LocationDot" className={statusColor} />
-        </div>
-        <span className={connectionInfo.status === ConnectionStatusType.Failed ? "connectionStatusFailed" : ""}>
-          {connectionInfo.status}
-        </span>
-        {connectionInfo.status === ConnectionStatusType.Connecting && isActive && (
-          <ProgressIndicator description={minute + ":" + second} />
-        )}
-      </Stack>
-    </TooltipHost>
+    <>
+      <TooltipHost
+        content={
+          containerInfo?.status === ContainerStatusType.Active
+            ? `Connected to temporary workspace. This temporary workspace will get disconnected in ${Math.round(
+                containerInfo.durationLeftInMinutes
+              )} minutes.`
+            : toolTipContent
+        }
+      >
+        <ActionButton
+          id={buttonId}
+          className={connectionInfo.status === ConnectionStatusType.Failed ? "commandReactBtn" : "connectedReactBtn"}
+          onClick={(e: React.MouseEvent<HTMLSpanElement>) =>
+            connectionInfo.status === ConnectionStatusType.Failed ? container.allocateContainer() : e.preventDefault()
+          }
+        >
+          <Stack className="connectionStatusContainer" horizontal>
+            <i className={statusColor}></i>
+            <span className={connectionInfo.status === ConnectionStatusType.Failed ? "connectionStatusFailed" : ""}>
+              {connectionInfo.status}
+            </span>
+            {connectionInfo.status === ConnectionStatusType.Connecting && isActive && (
+              <ProgressIndicator description={minute + ":" + second} />
+            )}
+            {connectionInfo.status === ConnectionStatusType.Connected && !isActive && (
+              <ProgressIndicator
+                className={totalGB !== 0 && usedGB / totalGB > 0.8 ? "lowMemory" : ""}
+                description={usedGB.toFixed(1) + " of " + totalGB.toFixed(1) + " GB"}
+                percentComplete={totalGB !== 0 ? usedGB / totalGB : 0}
+              />
+            )}
+          </Stack>
+          {!isBarDismissed &&
+          containerInfo.status &&
+          containerInfo.status === ContainerStatusType.Active &&
+          Math.round(containerInfo.durationLeftInMinutes) <= Notebook.remainingTimeForAlert ? (
+            <FocusTrapCallout
+              role="alertdialog"
+              className={styles.callout}
+              gapSpace={0}
+              target={`#${buttonId}`}
+              onDismiss={() => setIsBarDismissed(true)}
+              setInitialFocus
+            >
+              <Text block variant="xLarge" className={styles.title}>
+                Remaining Time
+              </Text>
+              <Text block variant="small">
+                This temporary workspace will get disconnected in {Math.round(containerInfo.durationLeftInMinutes)}{" "}
+                minutes. To save your work permanently, save your notebooks to a GitHub repository or download the
+                notebooks to your local machine before the session ends.
+              </Text>
+              <FocusZone handleTabKey={FocusZoneTabbableElements.all} isCircularNavigation>
+                <Stack className={styles.buttons} gap={8} horizontal>
+                  <DefaultButton onClick={() => setIsBarDismissed(true)}>Dimiss</DefaultButton>
+                </Stack>
+              </FocusZone>
+            </FocusTrapCallout>
+          ) : undefined}
+        </ActionButton>
+      </TooltipHost>
+    </>
   );
 };

src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { CellId, CellType, ImmutableNotebook } from "@nteract/commutable";
 // Vendor modules
 import {
@@ -30,6 +31,19 @@ export interface NotebookComponentBootstrapperOptions {
   contentRef: ContentRef;
 }
 
+interface IWrapModel {
+  name: string;
+  path: string;
+  last_modified: Date;
+  created: string;
+  content: unknown;
+  format: string;
+  mimetype: unknown;
+  size: number;
+  writeable: boolean;
+  type: string;
+}
+
 export class NotebookComponentBootstrapper {
   public contentRef: ContentRef;
   protected renderExtraComponent: () => JSX.Element;
@@ -41,7 +55,7 @@ export class NotebookComponentBootstrapper {
     this.contentRef = options.contentRef;
   }
 
-  protected static wrapModelIntoContent(name: string, path: string, content: any) {
+  protected static wrapModelIntoContent(name: string, path: string, content: unknown): IWrapModel {
     return {
       name,
       path,
@@ -49,7 +63,7 @@ export class NotebookComponentBootstrapper {
       created: "",
       content,
       format: "json",
-      mimetype: null as any,
+      mimetype: undefined,
       size: 0,
       writeable: false,
       type: "notebook",
@@ -85,7 +99,7 @@ export class NotebookComponentBootstrapper {
     };
   }
 
-  public setContent(name: string, content: any): void {
+  public setContent(name: string, content: unknown): void {
     this.getStore().dispatch(
       actions.fetchContentFulfilled({
         filepath: undefined,
@@ -270,7 +284,6 @@ export class NotebookComponentBootstrapper {
   public isContentDirty(): boolean {
     const content = selectors.content(this.getStore().getState(), { contentRef: this.contentRef });
     if (!content) {
-      console.log("No error");
       return false;
     }
 

src/Explorer/Notebook/NotebookContainerClient.ts

@@ -1,20 +1,32 @@
 /**
  * Notebook container related stuff
  */
+import promiseRetry, { AbortError } from "p-retry";
+import { PhoenixClient } from "Phoenix/PhoenixClient";
 import * as Constants from "../../Common/Constants";
+import { ConnectionStatusType, HttpHeaders, HttpStatusCodes, Notebook } from "../../Common/Constants";
 import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 import * as Logger from "../../Common/Logger";
 import * as DataModels from "../../Contracts/DataModels";
+import { IPhoenixConnectionInfoResult, IProvisionData, IResponse } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
-import { createOrUpdate, destroy } from "../../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
+import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { useNotebook } from "./useNotebook";
 
 export class NotebookContainerClient {
   private clearReconnectionAttemptMessage? = () => {};
   private isResettingWorkspace: boolean;
+  private phoenixClient: PhoenixClient;
+  private retryOptions: promiseRetry.Options;
 
   constructor(private onConnectionLost: () => void) {
+    this.phoenixClient = new PhoenixClient();
+    this.retryOptions = {
+      retries: Notebook.retryAttempts,
+      maxTimeout: Notebook.retryAttemptDelayMs,
+      minTimeout: Notebook.retryAttemptDelayMs,
+    };
     const notebookServerInfo = useNotebook.getState().notebookServerInfo;
     if (notebookServerInfo?.notebookServerEndpoint) {
       this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
@@ -35,14 +47,17 @@ export class NotebookContainerClient {
    * Heartbeat: each ping schedules another ping
    */
   private scheduleHeartbeat(delayMs: number): void {
-    setTimeout(() => {
-      this.getMemoryUsage()
-        .then((memoryUsageInfo) => useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo))
-        .finally(() => this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs));
+    setTimeout(async () => {
+      const memoryUsageInfo = await this.getMemoryUsage();
+      useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo);
+      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+      if (notebookServerInfo?.notebookServerEndpoint) {
+        this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
+      }
     }, delayMs);
   }
 
-  private async getMemoryUsage(): Promise<DataModels.MemoryUsageInfo> {
+  public async getMemoryUsage(): Promise<DataModels.MemoryUsageInfo> {
     const notebookServerInfo = useNotebook.getState().notebookServerInfo;
     if (!notebookServerInfo || !notebookServerInfo.notebookServerEndpoint) {
       const error = "No server endpoint detected";
@@ -56,6 +71,27 @@ export class NotebookContainerClient {
 
     const { notebookServerEndpoint, authToken } = this.getNotebookServerConfig();
     try {
+      const runMemoryAsync = async () => {
+        return await this._getMemoryAsync(notebookServerEndpoint, authToken);
+      };
+      return await promiseRetry(runMemoryAsync, this.retryOptions);
+    } catch (error) {
+      Logger.logError(getErrorMessage(error), "NotebookContainerClient/getMemoryUsage");
+      if (!this.clearReconnectionAttemptMessage) {
+        this.clearReconnectionAttemptMessage = logConsoleProgress(
+          "Connection lost with Notebook server. Attempting to reconnect..."
+        );
+      }
+      this.onConnectionLost();
+      return undefined;
+    }
+  }
+
+  private async _getMemoryAsync(
+    notebookServerEndpoint: string,
+    authToken: string
+  ): Promise<DataModels.MemoryUsageInfo> {
+    if (this.shouldExecuteMemoryCall()) {
       const response = await fetch(`${notebookServerEndpoint}api/metrics/memory`, {
         method: "GET",
         headers: {
@@ -75,31 +111,39 @@ export class NotebookContainerClient {
             freeKB: memoryUsageInfo.free,
           };
         }
+      } else if (response.status === HttpStatusCodes.NotFound) {
+        throw new AbortError(response.statusText);
       }
-      return undefined;
-    } catch (error) {
-      Logger.logError(getErrorMessage(error), "NotebookContainerClient/getMemoryUsage");
-      if (!this.clearReconnectionAttemptMessage) {
-        this.clearReconnectionAttemptMessage = logConsoleProgress(
-          "Connection lost with Notebook server. Attempting to reconnect..."
-        );
-      }
-      this.onConnectionLost();
+      throw new Error(response.statusText);
+    } else {
       return undefined;
     }
   }
 
-  public async resetWorkspace(): Promise<void> {
+  private shouldExecuteMemoryCall(): boolean {
+    if (
+      useNotebook.getState().containerStatus?.status === Constants.ContainerStatusType.Active &&
+      useNotebook.getState().connectionInfo?.status === ConnectionStatusType.Connected
+    ) {
+      return true;
+    }
+    return false;
+  }
+
+  public async resetWorkspace(): Promise<IResponse<IPhoenixConnectionInfoResult>> {
     this.isResettingWorkspace = true;
+    let response: IResponse<IPhoenixConnectionInfoResult>;
     try {
-      await this._resetWorkspace();
+      response = await this._resetWorkspace();
     } catch (error) {
       Promise.reject(error);
+      return response;
     }
     this.isResettingWorkspace = false;
+    return response;
   }
 
-  private async _resetWorkspace(): Promise<void> {
+  private async _resetWorkspace(): Promise<IResponse<IPhoenixConnectionInfoResult>> {
     const notebookServerInfo = useNotebook.getState().notebookServerInfo;
     if (!notebookServerInfo || !notebookServerInfo.notebookServerEndpoint) {
       const error = "No server endpoint detected";
@@ -107,15 +151,17 @@ export class NotebookContainerClient {
       return Promise.reject(error);
     }
 
-    const { notebookServerEndpoint, authToken } = this.getNotebookServerConfig();
     try {
-      await fetch(`${notebookServerEndpoint}/api/shutdown`, {
-        method: "POST",
-        headers: { Authorization: authToken },
-      });
+      if (useNotebook.getState().isPhoenix) {
+        const provisionData: IProvisionData = {
+          cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
+        };
+        return await this.phoenixClient.resetContainer(provisionData);
+      }
+      return null;
     } catch (error) {
       Logger.logError(getErrorMessage(error), "NotebookContainerClient/resetWorkspace");
-      await this.recreateNotebookWorkspaceAsync();
+      throw error;
     }
   }
 
@@ -129,22 +175,11 @@ export class NotebookContainerClient {
     };
   }
 
-  private async recreateNotebookWorkspaceAsync(): Promise<void> {
-    const { databaseAccount } = userContext;
-    if (!databaseAccount?.id) {
-      throw new Error("DataExplorer not initialized");
-    }
-    try {
-      await destroy(userContext.subscriptionId, userContext.resourceGroup, userContext.databaseAccount.name, "default");
-      await createOrUpdate(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        "default"
-      );
-    } catch (error) {
-      Logger.logError(getErrorMessage(error), "NotebookContainerClient/recreateNotebookWorkspaceAsync");
-      return Promise.reject(error);
-    }
+  private getHeaders(): HeadersInit {
+    const authorizationHeader = getAuthorizationHeader();
+    return {
+      [authorizationHeader.header]: authorizationHeader.token,
+      [HttpHeaders.contentType]: "application/json",
+    };
   }
 }

src/Explorer/Notebook/NotebookManager.tsx

@@ -212,6 +212,7 @@ export default class NotebookManager {
         "Cancel",
         () => reject(new Error("Commit dialog canceled")),
         undefined,
+        undefined,
         {
           label: "Commit message",
           autoAdjustHeight: true,

src/Explorer/Notebook/NotebookRenderer/NotebookReadOnlyRenderer.tsx

@@ -16,9 +16,10 @@ import "./NotebookReadOnlyRenderer.less";
 import SandboxOutputs from "./outputs/SandboxOutputs";
 
 export interface NotebookRendererProps {
-  contentRef: any;
+  contentRef: ContentRef;
   hideInputs?: boolean;
   hidePrompts?: boolean;
+  addTransform: (component: React.ComponentType & { MIMETYPE: string }) => void;
 }
 
 /**
@@ -27,7 +28,7 @@ export interface NotebookRendererProps {
 class NotebookReadOnlyRenderer extends React.Component<NotebookRendererProps> {
   componentDidMount() {
     if (!userContext.features.sandboxNotebookOutputs) {
-      loadTransform(this.props as any);
+      loadTransform(this.props as NotebookRendererProps);
     }
   }
 
@@ -59,7 +60,7 @@ class NotebookReadOnlyRenderer extends React.Component<NotebookRendererProps> {
       <div className="NotebookReadOnlyRender">
         <Cells contentRef={this.props.contentRef}>
           {{
-            code: ({ id, contentRef }: { id: any; contentRef: ContentRef }) => (
+            code: ({ id, contentRef }: { id: string; contentRef: ContentRef }) => (
               <CodeCell id={id} contentRef={contentRef}>
                 {{
                   prompt: (props: { id: string; contentRef: string }) => this.renderPrompt(props.id, props.contentRef),
@@ -73,14 +74,14 @@ class NotebookReadOnlyRenderer extends React.Component<NotebookRendererProps> {
                 }}
               </CodeCell>
             ),
-            markdown: ({ id, contentRef }: { id: any; contentRef: ContentRef }) => (
+            markdown: ({ id, contentRef }: { id: string; contentRef: ContentRef }) => (
               <MarkdownCell id={id} contentRef={contentRef} cell_type="markdown">
                 {{
                   editor: {},
                 }}
               </MarkdownCell>
             ),
-            raw: ({ id, contentRef }: { id: any; contentRef: ContentRef }) => (
+            raw: ({ id, contentRef }: { id: string; contentRef: ContentRef }) => (
               <RawCell id={id} contentRef={contentRef} cell_type="raw">
                 {{
                   editor: {
@@ -98,6 +99,7 @@ class NotebookReadOnlyRenderer extends React.Component<NotebookRendererProps> {
   }
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const makeMapDispatchToProps = (initialDispatch: Dispatch, initialProps: NotebookRendererProps) => {
   const mapDispatchToProps = (dispatch: Dispatch) => {
     return {
@@ -114,4 +116,4 @@ const makeMapDispatchToProps = (initialDispatch: Dispatch, initialProps: Noteboo
   return mapDispatchToProps;
 };
 
-export default connect(null, makeMapDispatchToProps)(NotebookReadOnlyRenderer);
+export default connect(undefined, makeMapDispatchToProps)(NotebookReadOnlyRenderer);

src/Explorer/Notebook/notebookClientV2.test.ts

@@ -35,6 +35,7 @@ describe("auto start kernel", () => {
         connectionInfo: {
           authToken: "autToken",
           notebookServerEndpoint: "notebookServerEndpoint",
+          forwardingId: "Id",
         },
         databaseAccountName: undefined,
         defaultExperience: undefined,

src/Explorer/Notebook/useNotebook.ts

@@ -1,11 +1,15 @@
 import { cloneDeep } from "lodash";
+import { PhoenixClient } from "Phoenix/PhoenixClient";
 import create, { UseStore } from "zustand";
 import { AuthType } from "../../AuthType";
 import * as Constants from "../../Common/Constants";
+import { ConnectionStatusType } 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 { ContainerConnectionInfo, ContainerInfo } from "../../Contracts/DataModels";
+import { useTabs } from "../../hooks/useTabs";
 import { IPinnedRepo } from "../../Juno/JunoClient";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
@@ -28,8 +32,12 @@ interface NotebookState {
   myNotebooksContentRoot: NotebookContentItem;
   gitHubNotebooksContentRoot: NotebookContentItem;
   galleryContentRoot: NotebookContentItem;
-  connectionInfo: DataModels.ContainerConnectionInfo;
+  connectionInfo: ContainerConnectionInfo;
   notebookFolderName: string;
+  isAllocating: boolean;
+  isRefreshed: boolean;
+  containerStatus: ContainerInfo;
+  isPhoenix: boolean;
   setIsNotebookEnabled: (isNotebookEnabled: boolean) => void;
   setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => void;
   setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
@@ -46,7 +54,13 @@ interface NotebookState {
   deleteNotebookItem: (item: NotebookContentItem, isGithubTree?: boolean) => void;
   initializeNotebooksTree: (notebookManager: NotebookManager) => Promise<void>;
   initializeGitHubRepos: (pinnedRepos: IPinnedRepo[]) => void;
-  setConnectionInfo: (connectionInfo: DataModels.ContainerConnectionInfo) => void;
+  setConnectionInfo: (connectionInfo: ContainerConnectionInfo) => void;
+  setIsAllocating: (isAllocating: boolean) => void;
+  resetContainerConnection: (connectionStatus: ContainerConnectionInfo) => void;
+  setIsRefreshed: (isAllocating: boolean) => void;
+  setContainerStatus: (containerStatus: ContainerInfo) => void;
+  getPhoenixStatus: () => Promise<void>;
+  setIsPhoenix: (isPhoenix: boolean) => void;
 }
 
 export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
@@ -55,6 +69,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   notebookServerInfo: {
     notebookServerEndpoint: undefined,
     authToken: undefined,
+    forwardingId: undefined,
   },
   sparkClusterConnectionInfo: {
     userName: undefined,
@@ -69,8 +84,18 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   myNotebooksContentRoot: undefined,
   gitHubNotebooksContentRoot: undefined,
   galleryContentRoot: undefined,
-  connectionInfo: undefined,
+  connectionInfo: {
+    status: ConnectionStatusType.Connect,
+  },
   notebookFolderName: undefined,
+  isAllocating: false,
+  isRefreshed: false,
+  containerStatus: {
+    status: undefined,
+    durationLeftInMinutes: undefined,
+    notebookServerInfo: undefined,
+  },
+  isPhoenix: undefined,
   setIsNotebookEnabled: (isNotebookEnabled: boolean) => set({ isNotebookEnabled }),
   setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => set({ isNotebooksEnabledForAccount }),
   setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) =>
@@ -83,6 +108,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   setNotebookBasePath: (notebookBasePath: string) => set({ notebookBasePath }),
   setNotebookFolderName: (notebookFolderName: string) => set({ notebookFolderName }),
   refreshNotebooksEnabledStateForAccount: async (): Promise<void> => {
+    await get().getPhoenixStatus();
     const { databaseAccount, authType } = userContext;
     if (
       authType === AuthType.EncryptedToken ||
@@ -175,7 +201,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
     isGithubTree ? set({ gitHubNotebooksContentRoot: root }) : set({ myNotebooksContentRoot: root });
   },
   initializeNotebooksTree: async (notebookManager: NotebookManager): Promise<void> => {
-    const notebookFolderName = userContext.features.phoenix === true ? "Temporary Notebooks" : "My Notebooks";
+    const notebookFolderName = get().isPhoenix === true ? "Temporary Notebooks" : "My Notebooks";
     set({ notebookFolderName });
     const myNotebooksContentRoot = {
       name: get().notebookFolderName,
@@ -256,5 +282,27 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
       set({ gitHubNotebooksContentRoot });
     }
   },
-  setConnectionInfo: (connectionInfo: DataModels.ContainerConnectionInfo) => set({ connectionInfo }),
+  setConnectionInfo: (connectionInfo: ContainerConnectionInfo) => set({ connectionInfo }),
+  setIsAllocating: (isAllocating: boolean) => set({ isAllocating }),
+  resetContainerConnection: (connectionStatus: ContainerConnectionInfo): void => {
+    useTabs.getState().closeAllNotebookTabs(true);
+    useNotebook.getState().setConnectionInfo(connectionStatus);
+    useNotebook.getState().setNotebookServerInfo(undefined);
+    useNotebook.getState().setIsAllocating(false);
+    useNotebook.getState().setContainerStatus({
+      status: undefined,
+      durationLeftInMinutes: undefined,
+      notebookServerInfo: undefined,
+    });
+  },
+  setIsRefreshed: (isRefreshed: boolean) => set({ isRefreshed }),
+  setContainerStatus: (containerStatus: ContainerInfo) => set({ containerStatus }),
+  getPhoenixStatus: async () => {
+    if (get().isPhoenix === undefined) {
+      const phoenixClient = new PhoenixClient();
+      const isPhoenix = userContext.features.phoenix === true && (await phoenixClient.IsDbAcountWhitelisted());
+      set({ isPhoenix });
+    }
+  },
+  setIsPhoenix: (isPhoenix: boolean) => set({ isPhoenix }),
 }));

src/Explorer/OpenFullScreen.tsx

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

src/Explorer/Panes/AddCollectionPanel.tsx

@@ -13,21 +13,21 @@ import {
   Text,
   TooltipHost,
 } from "@fluentui/react";
+import * as Constants from "Common/Constants";
+import { createCollection } from "Common/dataAccess/createCollection";
+import { getErrorMessage, getErrorStack } from "Common/ErrorHandlingUtils";
+import { configContext, Platform } from "ConfigContext";
+import * as DataModels from "Contracts/DataModels";
+import { SubscriptionType } from "Contracts/SubscriptionType";
+import { useSidePanel } from "hooks/useSidePanel";
 import React from "react";
-import * as Constants from "../../Common/Constants";
-import { createCollection } from "../../Common/dataAccess/createCollection";
-import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
-import { configContext, Platform } from "../../ConfigContext";
-import * as DataModels from "../../Contracts/DataModels";
-import { SubscriptionType } from "../../Contracts/SubscriptionType";
-import { useSidePanel } from "../../hooks/useSidePanel";
-import { CollectionCreation } from "../../Shared/Constants";
-import { Action } from "../../Shared/Telemetry/TelemetryConstants";
-import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
-import { userContext } from "../../UserContext";
-import { getCollectionName } from "../../Utils/APITypeUtils";
-import { isCapabilityEnabled, isServerlessAccount } from "../../Utils/CapabilityUtils";
-import { getUpsellMessage } from "../../Utils/PricingUtils";
+import { CollectionCreation } from "Shared/Constants";
+import { Action } from "Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
+import { userContext } from "UserContext";
+import { getCollectionName } from "Utils/APITypeUtils";
+import { isCapabilityEnabled, isServerlessAccount } from "Utils/CapabilityUtils";
+import { getUpsellMessage } from "Utils/PricingUtils";
 import { CollapsibleSectionComponent } from "../Controls/CollapsiblePanel/CollapsibleSectionComponent";
 import { ThroughputInput } from "../Controls/ThroughputInput/ThroughputInput";
 import Explorer from "../Explorer";
@@ -92,6 +92,7 @@ export interface AddCollectionPanelState {
   errorMessage: string;
   showErrorDetails: boolean;
   isExecuting: boolean;
+  isThroughputCapExceeded: boolean;
 }
 
 export class AddCollectionPanel extends React.Component<AddCollectionPanelProps, AddCollectionPanelState> {
@@ -122,6 +123,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       errorMessage: "",
       showErrorDetails: false,
       isExecuting: false,
+      isThroughputCapExceeded: false,
     };
   }
 
@@ -249,6 +251,9 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                     isSharded={this.state.isSharded}
                     setThroughputValue={(throughput: number) => (this.newDatabaseThroughput = throughput)}
                     setIsAutoscale={(isAutoscale: boolean) => (this.isNewDatabaseAutoscale = isAutoscale)}
+                    setIsThroughputCapExceeded={(isThroughputCapExceeded: boolean) =>
+                      this.setState({ isThroughputCapExceeded })
+                    }
                     onCostAcknowledgeChange={(isAcknowledge: boolean) => (this.isCostAcknowledged = isAcknowledge)}
                   />
                 )}
@@ -480,6 +485,9 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
               isSharded={this.state.isSharded}
               setThroughputValue={(throughput: number) => (this.collectionThroughput = throughput)}
               setIsAutoscale={(isAutoscale: boolean) => (this.isCollectionAutoscale = isAutoscale)}
+              setIsThroughputCapExceeded={(isThroughputCapExceeded: boolean) =>
+                this.setState({ isThroughputCapExceeded })
+              }
               onCostAcknowledgeChange={(isAcknowledged: boolean) => {
                 this.isCostAcknowledged = isAcknowledged;
               }}
@@ -676,7 +684,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
           )}
         </div>
 
-        <PanelFooterComponent buttonLabel="OK" />
+        <PanelFooterComponent buttonLabel="OK" isButtonDisabled={this.state.isThroughputCapExceeded} />
 
         {this.state.isExecuting && <PanelLoadingScreen />}
       </form>
@@ -999,7 +1007,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
 
     const collectionId: string = this.state.collectionId.trim();
     let databaseId = this.state.createNewDatabase ? this.state.newDatabaseId.trim() : this.state.selectedDatabaseId;
-    let partitionKeyString = this.state.partitionKey.trim();
+    let partitionKeyString = this.state.isSharded ? this.state.partitionKey.trim() : undefined;
 
     if (userContext.apiType === "Tables") {
       // Table require fixed Database: TablesDB, and fixed Partition Key: /'$pk'

src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx

@@ -52,6 +52,7 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
   );
   const [formErrors, setFormErrors] = useState<string>("");
   const [isExecuting, setIsExecuting] = useState<boolean>(false);
+  const [isThroughputCapExceeded, setIsThroughputCapExceeded] = useState<boolean>(false);
 
   const isFreeTierAccount: boolean = userContext.databaseAccount?.properties?.enableFreeTier;
 
@@ -79,7 +80,9 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
       dataExplorerArea: Constants.Areas.ContextualPane,
     };
     TelemetryProcessor.trace(Action.CreateDatabase, ActionModifiers.Open, addDatabasePaneOpenMessage);
-    buttonElement.focus();
+    if (buttonElement) {
+      buttonElement.focus();
+    }
   }, []);
 
   const onSubmit = () => {
@@ -169,6 +172,7 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
     formError: formErrors,
     isExecuting,
     submitButtonText: "OK",
+    isSubmitButtonDisabled: isThroughputCapExceeded,
     onSubmit,
   };
 
@@ -239,6 +243,7 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
             isSharded={databaseCreateNewShared}
             setThroughputValue={(newThroughput: number) => (throughput = newThroughput)}
             setIsAutoscale={(isAutoscale: boolean) => (isAutoscaleSelected = isAutoscale)}
+            setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}
             onCostAcknowledgeChange={(isAcknowledged: boolean) => (isCostAcknowledged = isAcknowledged)}
           />
         )}

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

@@ -4,6 +4,7 @@ exports[`AddDatabasePane Pane should render Default properly 1`] = `
 <RightPaneForm
   formError=""
   isExecuting={false}
+  isSubmitButtonDisabled={false}
   onSubmit={[Function]}
   submitButtonText="OK"
 >
@@ -92,6 +93,7 @@ exports[`AddDatabasePane Pane should render Default properly 1`] = `
       isSharded={true}
       onCostAcknowledgeChange={[Function]}
       setIsAutoscale={[Function]}
+      setIsThroughputCapExceeded={[Function]}
       setThroughputValue={[Function]}
     />
   </div>

src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx

@@ -1,14 +1,14 @@
 import { Checkbox, Dropdown, IDropdownOption, Link, Stack, Text, TextField } from "@fluentui/react";
+import * as Constants from "Common/Constants";
+import { getErrorMessage, getErrorStack } from "Common/ErrorHandlingUtils";
+import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
+import { useSidePanel } from "hooks/useSidePanel";
 import React, { FunctionComponent, useState } from "react";
-import * as Constants from "../../../Common/Constants";
-import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
-import { InfoTooltip } from "../../../Common/Tooltip/InfoTooltip";
-import { useSidePanel } from "../../../hooks/useSidePanel";
-import * as SharedConstants from "../../../Shared/Constants";
-import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
-import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
-import { userContext } from "../../../UserContext";
-import { isServerlessAccount } from "../../../Utils/CapabilityUtils";
+import * as SharedConstants from "Shared/Constants";
+import { Action } from "Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
+import { userContext } from "UserContext";
+import { isServerlessAccount } from "Utils/CapabilityUtils";
 import { ThroughputInput } from "../../Controls/ThroughputInput/ThroughputInput";
 import Explorer from "../../Explorer";
 import { CassandraAPIDataClient } from "../../Tables/TableDataClient";
@@ -43,6 +43,7 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
   const [dedicateTableThroughput, setDedicateTableThroughput] = useState<boolean>(false);
   const [isExecuting, setIsExecuting] = useState<boolean>();
   const [formError, setFormError] = useState<string>("");
+  const [isThroughputCapExceeded, setIsThroughputCapExceeded] = useState<boolean>(false);
   const isFreeTierAccount: boolean = userContext.databaseAccount?.properties?.enableFreeTier;
 
   const addCollectionPaneOpenMessage = {
@@ -149,6 +150,7 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
     formError,
     isExecuting,
     submitButtonText: "OK",
+    isSubmitButtonDisabled: isThroughputCapExceeded,
     onSubmit,
   };
 
@@ -262,6 +264,7 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
               isSharded
               setThroughputValue={(throughput: number) => (newKeySpaceThroughput = throughput)}
               setIsAutoscale={(isAutoscale: boolean) => (isNewKeySpaceAutoscale = isAutoscale)}
+              setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}
               onCostAcknowledgeChange={(isAcknowledged: boolean) => (isCostAcknowledged = isAcknowledged)}
             />
           )}
@@ -334,6 +337,7 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
             isSharded={false}
             setThroughputValue={(throughput: number) => (tableThroughput = throughput)}
             setIsAutoscale={(isAutoscale: boolean) => (isTableAutoscale = isAutoscale)}
+            setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}
             onCostAcknowledgeChange={(isAcknowledged: boolean) => (isCostAcknowledged = isAcknowledged)}
           />
         )}

src/Explorer/Panes/CopyNotebookPane/CopyNotebookPane.tsx

@@ -5,7 +5,6 @@ import { getErrorMessage, handleError } from "../../../Common/ErrorHandlingUtils
 import { GitHubOAuthService } from "../../../GitHub/GitHubOAuthService";
 import { useSidePanel } from "../../../hooks/useSidePanel";
 import { IPinnedRepo, JunoClient } from "../../../Juno/JunoClient";
-import { userContext } from "../../../UserContext";
 import * as GitHubUtils from "../../../Utils/GitHubUtils";
 import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
 import Explorer from "../../Explorer";
@@ -76,8 +75,8 @@ export const CopyNotebookPane: FunctionComponent<CopyNotebookPanelProps> = ({
           selectedLocation.owner,
           selectedLocation.repo
         )} - ${selectedLocation.branch}`;
-      } else if (selectedLocation.type === "MyNotebooks" && userContext.features.phoenix) {
-        destination = "My Notebooks Scratch";
+      } else if (selectedLocation.type === "MyNotebooks" && useNotebook.getState().isPhoenix) {
+        destination = useNotebook.getState().notebookFolderName;
       }
 
       clearMessage = NotificationConsoleUtils.logConsoleProgress(`Copying ${name} to ${destination}`);

src/Explorer/Panes/DeleteCollectionConfirmationPane/DeleteCollectionConfirmationPane.tsx

@@ -1,18 +1,18 @@
 import { Text, TextField } from "@fluentui/react";
+import { Areas } from "Common/Constants";
+import { deleteCollection } from "Common/dataAccess/deleteCollection";
+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 React, { FunctionComponent, useState } from "react";
-import { Areas } from "../../../Common/Constants";
-import { deleteCollection } from "../../../Common/dataAccess/deleteCollection";
-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 { 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 { useDatabases } from "../../useDatabases";
 import { useSelectedNode } from "../../useSelectedNode";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";

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

@@ -369,18 +369,21 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
       </div>
       <PanelFooterComponent
         buttonLabel="OK"
+        isButtonDisabled={false}
       >
         <div
           className="panelFooter"
         >
           <CustomizedPrimaryButton
             ariaLabel="OK"
+            disabled={false}
             id="sidePanelOkButton"
             text="OK"
             type="submit"
           >
             <PrimaryButton
               ariaLabel="OK"
+              disabled={false}
               id="sidePanelOkButton"
               text="OK"
               theme={
@@ -660,6 +663,7 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
             >
               <CustomizedDefaultButton
                 ariaLabel="OK"
+                disabled={false}
                 id="sidePanelOkButton"
                 onRenderDescription={[Function]}
                 primary={true}
@@ -941,6 +945,7 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
               >
                 <DefaultButton
                   ariaLabel="OK"
+                  disabled={false}
                   id="sidePanelOkButton"
                   onRenderDescription={[Function]}
                   primary={true}
@@ -1223,6 +1228,7 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
                   <BaseButton
                     ariaLabel="OK"
                     baseClassName="ms-Button"
+                    disabled={false}
                     id="sidePanelOkButton"
                     onRenderDescription={[Function]}
                     primary={true}

src/Explorer/Panes/DeleteDatabaseConfirmationPanel.tsx

@@ -1,18 +1,18 @@
 import { Text, TextField } from "@fluentui/react";
 import { useBoolean } from "@fluentui/react-hooks";
+import { Areas } from "Common/Constants";
+import { deleteDatabase } from "Common/dataAccess/deleteDatabase";
+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 React, { FunctionComponent, useState } from "react";
-import { Areas } from "../../Common/Constants";
-import { deleteDatabase } from "../../Common/dataAccess/deleteDatabase";
-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 { 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 { useDatabases } from "../useDatabases";
 import { useSelectedNode } from "../useSelectedNode";
 import { PanelInfoErrorComponent, PanelInfoErrorProps } from "./PanelInfoErrorComponent";

src/Explorer/Panes/ExecuteSprocParamsPane/ExecuteSprocParamsPane.tsx

@@ -1,6 +1,6 @@
 import { IDropdownOption, IImageProps, Image, Stack, Text } from "@fluentui/react";
 import { useBoolean } from "@fluentui/react-hooks";
-import React, { FunctionComponent, useState } from "react";
+import React, { FunctionComponent, useRef, useState } from "react";
 import AddPropertyIcon from "../../../../images/Add-property.svg";
 import { useSidePanel } from "../../../hooks/useSidePanel";
 import { logConsoleError } from "../../../Utils/NotificationConsoleUtils";
@@ -25,19 +25,16 @@ interface UnwrappedExecuteSprocParam {
 export const ExecuteSprocParamsPane: FunctionComponent<ExecuteSprocParamsPaneProps> = ({
   storedProcedure,
 }: ExecuteSprocParamsPaneProps): JSX.Element => {
+  const paramKeyValuesRef = useRef<UnwrappedExecuteSprocParam[]>([{ key: "string", text: "" }]);
+  const partitionValueRef = useRef<string>();
+  const partitionKeyRef = useRef<string>("string");
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
+  const [numberOfParams, setNumberOfParams] = useState<number>(1);
   const [isLoading, { setTrue: setLoadingTrue, setFalse: setLoadingFalse }] = useBoolean(false);
-  const [paramKeyValues, setParamKeyValues] = useState<UnwrappedExecuteSprocParam[]>([{ key: "string", text: "" }]);
-  const [partitionValue, setPartitionValue] = useState<string>(); // Defaulting to undefined here is important. It is not the same partition key as ""
-  const [selectedKey, setSelectedKey] = React.useState<IDropdownOption>({ key: "string", text: "" });
   const [formError, setFormError] = useState<string>("");
 
-  const onPartitionKeyChange = (event: React.FormEvent<HTMLDivElement>, item: IDropdownOption): void => {
-    setSelectedKey(item);
-  };
-
   const validateUnwrappedParams = (): boolean => {
-    const unwrappedParams: UnwrappedExecuteSprocParam[] = paramKeyValues;
+    const unwrappedParams: UnwrappedExecuteSprocParam[] = paramKeyValuesRef.current;
     for (let i = 0; i < unwrappedParams.length; i++) {
       const { key: paramType, text: paramValue } = unwrappedParams[i];
       if (paramType === "custom" && (paramValue === "" || paramValue === undefined)) {
@@ -53,8 +50,9 @@ export const ExecuteSprocParamsPane: FunctionComponent<ExecuteSprocParamsPanePro
   };
 
   const submit = (): void => {
-    const wrappedSprocParams: UnwrappedExecuteSprocParam[] = paramKeyValues;
-    const { key: partitionKey } = selectedKey;
+    const wrappedSprocParams: UnwrappedExecuteSprocParam[] = paramKeyValuesRef.current;
+    const partitionValue: string = partitionValueRef.current;
+    const partitionKey: string = partitionKeyRef.current;
     if (partitionKey === "custom" && (partitionValue === "" || partitionValue === undefined)) {
       setInvalidParamError(partitionValue);
       return;
@@ -78,37 +76,21 @@ export const ExecuteSprocParamsPane: FunctionComponent<ExecuteSprocParamsPanePro
   };
 
   const deleteParamAtIndex = (indexToRemove: number): void => {
-    const cloneParamKeyValue = [...paramKeyValues];
-    cloneParamKeyValue.splice(indexToRemove, 1);
-    setParamKeyValues(cloneParamKeyValue);
+    paramKeyValuesRef.current.splice(indexToRemove, 1);
+    setNumberOfParams(numberOfParams - 1);
   };
 
   const addNewParamAtIndex = (indexToAdd: number): void => {
-    const cloneParamKeyValue = [...paramKeyValues];
-    cloneParamKeyValue.splice(indexToAdd, 0, { key: "string", text: "" });
-    setParamKeyValues(cloneParamKeyValue);
-  };
-
-  const paramValueChange = (value: string, indexOfInput: number): void => {
-    const cloneParamKeyValue = [...paramKeyValues];
-    cloneParamKeyValue[indexOfInput].text = value;
-    setParamKeyValues(cloneParamKeyValue);
-  };
-
-  const paramKeyChange = (
-    _event: React.FormEvent<HTMLDivElement>,
-    selectedParam: IDropdownOption,
-    indexOfParam: number
-  ): void => {
-    const cloneParamKeyValue = [...paramKeyValues];
-    cloneParamKeyValue[indexOfParam].key = selectedParam.key.toString();
-    setParamKeyValues(cloneParamKeyValue);
+    paramKeyValuesRef.current.splice(indexToAdd, 0, { key: "string", text: "" });
+    setNumberOfParams(numberOfParams + 1);
   };
 
   const addNewParamAtLastIndex = (): void => {
-    const cloneParamKeyValue = [...paramKeyValues];
-    cloneParamKeyValue.splice(cloneParamKeyValue.length, 0, { key: "string", text: "" });
-    setParamKeyValues(cloneParamKeyValue);
+    paramKeyValuesRef.current.push({
+      key: "string",
+      text: "",
+    });
+    setNumberOfParams(numberOfParams + 1);
   };
 
   const props: RightPaneFormProps = {
@@ -118,46 +100,52 @@ export const ExecuteSprocParamsPane: FunctionComponent<ExecuteSprocParamsPanePro
     onSubmit: () => submit(),
   };
 
+  const getInputParameterComponent = (): JSX.Element[] => {
+    const inputParameters: JSX.Element[] = [];
+    for (let i = 0; i < numberOfParams; i++) {
+      const paramKeyValue = paramKeyValuesRef.current[i];
+      inputParameters.push(
+        <InputParameter
+          key={paramKeyValue.text + i}
+          dropdownLabel={i === 0 ? "Key" : ""}
+          inputParameterTitle={i === 0 ? "Enter input parameters (if any)" : ""}
+          inputLabel={i === 0 ? "Param" : ""}
+          isAddRemoveVisible={true}
+          onDeleteParamKeyPress={() => deleteParamAtIndex(i)}
+          onAddNewParamKeyPress={() => addNewParamAtIndex(i + 1)}
+          onParamValueChange={(_event, newInput?: string) => (paramKeyValuesRef.current[i].text = newInput)}
+          onParamKeyChange={(_event, selectedParam: IDropdownOption) =>
+            (paramKeyValuesRef.current[i].key = selectedParam.key.toString())
+          }
+          paramValue={paramKeyValue.text}
+          selectedKey={paramKeyValue.key}
+        />
+      );
+    }
+
+    return inputParameters;
+  };
+
   return (
     <RightPaneForm {...props}>
-      <div className="panelFormWrapper">
-        <div className="panelMainContent">
-          <InputParameter
-            dropdownLabel="Key"
-            inputParameterTitle="Partition key value"
-            inputLabel="Value"
-            isAddRemoveVisible={false}
-            onParamValueChange={(_event, newInput?: string) => {
-              setPartitionValue(newInput);
-            }}
-            onParamKeyChange={onPartitionKeyChange}
-            paramValue={partitionValue}
-            selectedKey={selectedKey.key}
-          />
-          {paramKeyValues.map((paramKeyValue, index) => (
-            <InputParameter
-              key={paramKeyValue && paramKeyValue.text + index}
-              dropdownLabel={!index && "Key"}
-              inputParameterTitle={!index && "Enter input parameters (if any)"}
-              inputLabel={!index && "Param"}
-              isAddRemoveVisible={true}
-              onDeleteParamKeyPress={() => deleteParamAtIndex(index)}
-              onAddNewParamKeyPress={() => addNewParamAtIndex(index + 1)}
-              onParamValueChange={(event, newInput?: string) => {
-                paramValueChange(newInput, index);
-              }}
-              onParamKeyChange={(event: React.FormEvent<HTMLDivElement>, selectedParam: IDropdownOption) => {
-                paramKeyChange(event, selectedParam, index);
-              }}
-              paramValue={paramKeyValue && paramKeyValue.text}
-              selectedKey={paramKeyValue && paramKeyValue.key}
-            />
-          ))}
-          <Stack horizontal onClick={addNewParamAtLastIndex} tabIndex={0}>
-            <Image {...imageProps} src={AddPropertyIcon} alt="Add param" />
-            <Text className="addNewParamStyle">Add New Param</Text>
-          </Stack>
-        </div>
+      <div className="panelMainContent">
+        <InputParameter
+          dropdownLabel="Key"
+          inputParameterTitle="Partition key value"
+          inputLabel="Value"
+          isAddRemoveVisible={false}
+          onParamValueChange={(_event, newInput?: string) => (partitionValueRef.current = newInput)}
+          onParamKeyChange={(_event: React.FormEvent<HTMLDivElement>, item: IDropdownOption) =>
+            (partitionKeyRef.current = item.key.toString())
+          }
+          paramValue={partitionValueRef.current}
+          selectedKey={partitionKeyRef.current}
+        />
+        {getInputParameterComponent()}
+        <Stack horizontal onClick={() => addNewParamAtLastIndex()} tabIndex={0}>
+          <Image {...imageProps} src={AddPropertyIcon} alt="Add param" />
+          <Text className="addNewParamStyle">Add New Param</Text>
+        </Stack>
       </div>
     </RightPaneForm>
   );

src/Explorer/Panes/ExecuteSprocParamsPane/InputParameter.tsx

@@ -55,7 +55,7 @@ export const InputParameter: FunctionComponent<InputParameterProps> = ({
       <Stack horizontal>
         <Dropdown
           label={dropdownLabel && dropdownLabel}
-          selectedKey={selectedKey}
+          defaultSelectedKey={selectedKey}
           onChange={onParamKeyChange}
           options={options}
           styles={dropdownStyles}
@@ -64,8 +64,9 @@ export const InputParameter: FunctionComponent<InputParameterProps> = ({
         <TextField
           label={inputLabel && inputLabel}
           id="confirmCollectionId"
-          value={paramValue}
+          defaultValue={paramValue}
           onChange={onParamValueChange}
+          tabIndex={0}
         />
         {isAddRemoveVisible && (
           <>

src/Explorer/Panes/GitHubReposPanel/GitHubReposPanel.tsx

@@ -35,6 +35,9 @@ interface IGitHubReposPanelState {
 }
 export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IGitHubReposPanelState> {
   private static readonly PageSize = 30;
+  private static readonly MasterBranchName = "master";
+  private static readonly MainBranchName = "main";
+
   private isAddedRepo = false;
   private gitHubClient: GitHubClient;
   private junoClient: JunoClient;
@@ -116,6 +119,8 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
         if (response.status !== HttpStatusCodes.OK) {
           throw new Error(`Received HTTP ${response.status} when saving pinned repos`);
         }
+
+        this.props.explorer.notebookManager?.refreshPinnedRepos();
       } catch (error) {
         handleError(error, "GitHubReposPane/submit", "Failed to save pinned repos");
       }
@@ -207,6 +212,14 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
       if (response.data) {
         branchesProps.branches = branchesProps.branches.concat(response.data);
         branchesProps.lastPageInfo = response.pageInfo;
+        branchesProps.defaultBranchName = branchesProps.branches[0].name;
+        const defaultbranchName = branchesProps.branches.find(
+          (branch) =>
+            branch.name === GitHubReposPanel.MasterBranchName || branch.name === GitHubReposPanel.MainBranchName
+        )?.name;
+        if (defaultbranchName) {
+          branchesProps.defaultBranchName = defaultbranchName;
+        }
       }
     } catch (error) {
       handleError(error, "GitHubReposPane/loadMoreBranches", "Failed to fetch branches");
@@ -298,6 +311,17 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
     const existingRepo = this.pinnedReposProps.repos.find((repo) => repo.key === item.key);
     if (existingRepo) {
       existingRepo.branches = item.branches;
+      this.setState({
+        gitHubReposState: {
+          ...this.state.gitHubReposState,
+          reposListProps: {
+            ...this.state.gitHubReposState.reposListProps,
+            pinnedReposProps: {
+              repos: this.pinnedReposProps.repos,
+            },
+          },
+        },
+      });
     } else {
       this.pinnedReposProps.repos = [...this.pinnedReposProps.repos, item];
     }
@@ -374,6 +398,7 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
           lastPageInfo: undefined,
           hasMore: true,
           isLoading: true,
+          defaultBranchName: undefined,
           loadMore: (): Promise<void> => this.loadMoreBranches(item.repo),
         };
         this.loadMoreBranches(item.repo);

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

@@ -23,7 +23,13 @@ exports[`GitHub Repos Panel should render Default properly 1`] = `
             "isTabsContentExpanded": [Function],
             "onRefreshDatabasesKeyPress": [Function],
             "onRefreshResourcesClick": [Function],
-            "phoenixClient": PhoenixClient {},
+            "phoenixClient": PhoenixClient {
+              "retryOptions": Object {
+                "maxTimeout": 5000,
+                "minTimeout": 5000,
+                "retries": 3,
+              },
+            },
             "provideFeedbackEmail": [Function],
             "queriesClient": QueriesClient {
               "container": [Circular],

src/Explorer/Panes/PanelFooterComponent.tsx

@@ -3,12 +3,20 @@ import React from "react";
 
 export interface PanelFooterProps {
   buttonLabel: string;
+  isButtonDisabled?: boolean;
 }
 
 export const PanelFooterComponent: React.FunctionComponent<PanelFooterProps> = ({
   buttonLabel,
+  isButtonDisabled,
 }: PanelFooterProps): JSX.Element => (
   <div className="panelFooter">
-    <PrimaryButton type="submit" id="sidePanelOkButton" text={buttonLabel} ariaLabel={buttonLabel} />
+    <PrimaryButton
+      type="submit"
+      id="sidePanelOkButton"
+      text={buttonLabel}
+      ariaLabel={buttonLabel}
+      disabled={!!isButtonDisabled}
+    />
   </div>
 );

src/Explorer/Panes/RightPaneForm/RightPaneForm.tsx

@@ -9,6 +9,7 @@ export interface RightPaneFormProps {
   onSubmit: () => void;
   submitButtonText: string;
   isSubmitButtonHidden?: boolean;
+  isSubmitButtonDisabled?: boolean;
   children?: ReactNode;
 }
 
@@ -18,6 +19,7 @@ export const RightPaneForm: FunctionComponent<RightPaneFormProps> = ({
   onSubmit,
   submitButtonText,
   isSubmitButtonHidden = false,
+  isSubmitButtonDisabled = false,
   children,
 }: RightPaneFormProps) => {
   const handleOnSubmit = (event: React.FormEvent<HTMLFormElement>) => {
@@ -30,7 +32,9 @@ export const RightPaneForm: FunctionComponent<RightPaneFormProps> = ({
       <form className="panelFormWrapper" onSubmit={handleOnSubmit}>
         {formError && <PanelInfoErrorComponent messageType="error" message={formError} showErrorDetails={true} />}
         {children}
-        {!isSubmitButtonHidden && <PanelFooterComponent buttonLabel={submitButtonText} />}
+        {!isSubmitButtonHidden && (
+          <PanelFooterComponent buttonLabel={submitButtonText} isButtonDisabled={isSubmitButtonDisabled} />
+        )}
       </form>
       {isExecuting && <PanelLoadingScreen />}
     </>

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

@@ -14,18 +14,21 @@ exports[`Right Pane Form should render Default properly 1`] = `
   >
     <PanelFooterComponent
       buttonLabel="Load"
+      isButtonDisabled={false}
     >
       <div
         className="panelFooter"
       >
         <CustomizedPrimaryButton
           ariaLabel="Load"
+          disabled={false}
           id="sidePanelOkButton"
           text="Load"
           type="submit"
         >
           <PrimaryButton
             ariaLabel="Load"
+            disabled={false}
             id="sidePanelOkButton"
             text="Load"
             theme={
@@ -305,6 +308,7 @@ exports[`Right Pane Form should render Default properly 1`] = `
           >
             <CustomizedDefaultButton
               ariaLabel="Load"
+              disabled={false}
               id="sidePanelOkButton"
               onRenderDescription={[Function]}
               primary={true}
@@ -586,6 +590,7 @@ exports[`Right Pane Form should render Default properly 1`] = `
             >
               <DefaultButton
                 ariaLabel="Load"
+                disabled={false}
                 id="sidePanelOkButton"
                 onRenderDescription={[Function]}
                 primary={true}
@@ -868,6 +873,7 @@ exports[`Right Pane Form should render Default properly 1`] = `
                 <BaseButton
                   ariaLabel="Load"
                   baseClassName="ms-Button"
+                  disabled={false}
                   id="sidePanelOkButton"
                   onRenderDescription={[Function]}
                   primary={true}

src/Explorer/Panes/SettingsPane/SettingsPane.tsx

@@ -1,13 +1,13 @@
-import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton } from "@fluentui/react";
+import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton, Stack, Text } from "@fluentui/react";
+import * as Constants from "Common/Constants";
+import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
+import { configContext } from "ConfigContext";
+import { useSidePanel } from "hooks/useSidePanel";
 import React, { FunctionComponent, MouseEvent, useState } from "react";
-import * as Constants from "../../../Common/Constants";
-import { InfoTooltip } from "../../../Common/Tooltip/InfoTooltip";
-import { configContext } from "../../../ConfigContext";
-import { useSidePanel } from "../../../hooks/useSidePanel";
-import { LocalStorageUtility, StorageKey } from "../../../Shared/StorageUtility";
-import * as StringUtility from "../../../Shared/StringUtility";
-import { userContext } from "../../../UserContext";
-import { logConsoleInfo } from "../../../Utils/NotificationConsoleUtils";
+import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
+import * as StringUtility from "Shared/StringUtility";
+import { userContext } from "UserContext";
+import { logConsoleInfo } from "Utils/NotificationConsoleUtils";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 
 export const SettingsPane: FunctionComponent = () => {
@@ -113,20 +113,44 @@ export const SettingsPane: FunctionComponent = () => {
   const handleOnPageOptionChange = (ev: React.FormEvent<HTMLInputElement>, option: IChoiceGroupOption): void => {
     setPageOption(option.key);
   };
+
+  const choiceButtonStyles = {
+    flexContainer: [
+      {
+        selectors: {
+          ".ms-ChoiceField-wrapper label": {
+            fontSize: 12,
+            paddingTop: 0,
+          },
+          ".ms-ChoiceField": {
+            marginTop: 0,
+          },
+        },
+      },
+    ],
+  };
   return (
     <RightPaneForm {...genericPaneProps}>
       <div className="paneMainContent">
         {shouldShowQueryPageOptions && (
           <div className="settingsSection">
-            <div className="settingsSectionPart pageOptionsPart">
-              <div className="settingsSectionLabel">
-                Page options
+            <div className="settingsSectionPart">
+              <Stack horizontal>
+                <Text id="pageOptions" className="settingsSectionLabel" variant="small">
+                  Page options
+                </Text>
                 <InfoTooltip>
                   Choose Custom to specify a fixed amount of query results to show, or choose Unlimited to show as many
                   query results per page.
                 </InfoTooltip>
-              </div>
-              <ChoiceGroup selectedKey={pageOption} options={pageOptionList} onChange={handleOnPageOptionChange} />
+              </Stack>
+              <ChoiceGroup
+                ariaLabelledBy="pageOptions"
+                selectedKey={pageOption}
+                options={pageOptionList}
+                styles={choiceButtonStyles}
+                onChange={handleOnPageOptionChange}
+              />
             </div>
             <div className="tabs settingsSectionPart">
               {isCustomPageOptionSelected() && (

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

@@ -14,17 +14,24 @@ exports[`Settings Pane should render Default properly 1`] = `
       className="settingsSection"
     >
       <div
-        className="settingsSectionPart pageOptionsPart"
+        className="settingsSectionPart"
       >
-        <div
-          className="settingsSectionLabel"
+        <Stack
+          horizontal={true}
         >
-          Page options
+          <Text
+            className="settingsSectionLabel"
+            id="pageOptions"
+            variant="small"
+          >
+            Page options
+          </Text>
           <InfoTooltip>
             Choose Custom to specify a fixed amount of query results to show, or choose Unlimited to show as many query results per page.
           </InfoTooltip>
-        </div>
+        </Stack>
         <StyledChoiceGroup
+          ariaLabelledBy="pageOptions"
           onChange={[Function]}
           options={
             Array [
@@ -39,6 +46,23 @@ exports[`Settings Pane should render Default properly 1`] = `
             ]
           }
           selectedKey="custom"
+          styles={
+            Object {
+              "flexContainer": Array [
+                Object {
+                  "selectors": Object {
+                    ".ms-ChoiceField": Object {
+                      "marginTop": 0,
+                    },
+                    ".ms-ChoiceField-wrapper label": Object {
+                      "fontSize": 12,
+                      "paddingTop": 0,
+                    },
+                  },
+                },
+              ],
+            }
+          }
         />
       </div>
       <div

src/Explorer/Panes/StringInputPane/StringInputPane.tsx

@@ -1,8 +1,8 @@
 import { TextField } from "@fluentui/react";
+import * as ViewModels from "Contracts/ViewModels";
+import { useTabs } from "hooks/useTabs";
 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 { logConsoleError, logConsoleInfo, logConsoleProgress } from "Utils/NotificationConsoleUtils";
 import * as FileSystemUtil from "../../Notebook/FileSystemUtil";
 import { NotebookContentItem } from "../../Notebook/NotebookContentItem";
 import NotebookV2Tab from "../../Tabs/NotebookV2Tab";

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

@@ -13,7 +13,13 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
       "isTabsContentExpanded": [Function],
       "onRefreshDatabasesKeyPress": [Function],
       "onRefreshResourcesClick": [Function],
-      "phoenixClient": PhoenixClient {},
+      "phoenixClient": PhoenixClient {
+        "retryOptions": Object {
+          "maxTimeout": 5000,
+          "minTimeout": 5000,
+          "retries": 3,
+        },
+      },
       "provideFeedbackEmail": [Function],
       "queriesClient": QueriesClient {
         "container": [Circular],
@@ -675,18 +681,21 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
       </div>
       <PanelFooterComponent
         buttonLabel="Create"
+        isButtonDisabled={false}
       >
         <div
           className="panelFooter"
         >
           <CustomizedPrimaryButton
             ariaLabel="Create"
+            disabled={false}
             id="sidePanelOkButton"
             text="Create"
             type="submit"
           >
             <PrimaryButton
               ariaLabel="Create"
+              disabled={false}
               id="sidePanelOkButton"
               text="Create"
               theme={
@@ -966,6 +975,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
             >
               <CustomizedDefaultButton
                 ariaLabel="Create"
+                disabled={false}
                 id="sidePanelOkButton"
                 onRenderDescription={[Function]}
                 primary={true}
@@ -1247,6 +1257,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
               >
                 <DefaultButton
                   ariaLabel="Create"
+                  disabled={false}
                   id="sidePanelOkButton"
                   onRenderDescription={[Function]}
                   primary={true}
@@ -1529,6 +1540,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                   <BaseButton
                     ariaLabel="Create"
                     baseClassName="ms-Button"
+                    disabled={false}
                     id="sidePanelOkButton"
                     onRenderDescription={[Function]}
                     primary={true}

src/Explorer/Panes/Tables/AddTableEntityPanel.test.tsx

@@ -4,7 +4,7 @@ import React from "react";
 import TableListViewModal from "../../Tables/DataTable/TableEntityListViewModel";
 import * as Entities from "../../Tables/Entities";
 import { CassandraAPIDataClient, TablesAPIDataClient } from "../../Tables/TableDataClient";
-import QueryTablesTab from "../../Tabs/QueryTablesTab/QueryTablesTab";
+import QueryTablesTab from "../../Tabs/QueryTablesTab";
 import { AddTableEntityPanel } from "./AddTableEntityPanel";
 
 describe("Excute Add Table Entity Pane", () => {
@@ -18,8 +18,6 @@ describe("Excute Add Table Entity Pane", () => {
     queryTablesTab: fakeQueryTablesTab,
     tableEntityListViewModel: fakeTableEntityListViewModel,
     cassandraApiClient: fakeCassandraApiClient,
-    reloadEntities: () => "{}",
-    headerItems: ["email"],
   };
 
   it("should render Default properly", () => {
@@ -29,13 +27,13 @@ describe("Excute Add Table Entity Pane", () => {
 
   it("initially display 4 input field, 2 properties and 2 entity values", () => {
     const wrapper = mount(<AddTableEntityPanel {...props} />);
-    expect(wrapper.find("input[type='text']")).toHaveLength(1);
+    expect(wrapper.find("input[type='text']")).toHaveLength(0);
   });
 
   it("add a new entity row", () => {
     const wrapper = mount(<AddTableEntityPanel {...props} />);
     wrapper.find(".addButtonEntiy").last().simulate("click");
-    expect(wrapper.find("input[type='text']")).toHaveLength(2);
+    expect(wrapper.find("input[type='text']")).toHaveLength(1);
   });
 
   it("remove a entity field", () => {
@@ -43,6 +41,6 @@ describe("Excute Add Table Entity Pane", () => {
     // Since default entity row doesn't have delete option, so added row then delete for test cases.
     wrapper.find(".addButtonEntiy").last().simulate("click");
     wrapper.find("#deleteEntity").last().simulate("click");
-    expect(wrapper.find("input[type='text']")).toHaveLength(1);
+    expect(wrapper.find("input[type='text']")).toHaveLength(0);
   });
 });

src/Explorer/Panes/Tables/AddTableEntityPanel.tsx

@@ -1,19 +1,20 @@
 import { IDropdownOption, Image, 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";
 import TableEntityListViewModel from "../../Tables/DataTable/TableEntityListViewModel";
 import * as Entities from "../../Tables/Entities";
 import { CassandraAPIDataClient, CassandraTableKey, TableDataClient } from "../../Tables/TableDataClient";
+import * as TableEntityProcessor from "../../Tables/TableEntityProcessor";
 import * as Utilities from "../../Tables/Utilities";
-import NewQueryTablesTab from "../../Tabs/QueryTablesTab/QueryTablesTab";
+import QueryTablesTab from "../../Tabs/QueryTablesTab";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 import {
   attributeNameLabel,
@@ -35,11 +36,9 @@ import {
 
 interface AddTableEntityPanelProps {
   tableDataClient: TableDataClient;
-  queryTablesTab: NewQueryTablesTab;
+  queryTablesTab: QueryTablesTab;
   tableEntityListViewModel: TableEntityListViewModel;
   cassandraApiClient: CassandraAPIDataClient;
-  reloadEntities: () => void;
-  headerItems: string[];
 }
 
 interface EntityRowType {
@@ -59,10 +58,7 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
   queryTablesTab,
   tableEntityListViewModel,
   cassandraApiClient,
-  reloadEntities,
-  headerItems,
 }: 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>("");
@@ -80,7 +76,7 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
   }, []);
 
   const getDefaultEntitiesAttribute = async (): Promise<void> => {
-    let headers = tableEntityListViewModel.headers?.length > 1 ? tableEntityListViewModel.headers : headerItems;
+    let headers = tableEntityListViewModel.headers;
     if (DataTableUtilities.checkForDefaultHeader(headers)) {
       headers = [];
       if (userContext.apiType === "Tables") {
@@ -120,19 +116,47 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
     const newEntity: Entities.ITableEntity = await tableDataClient.createDocument(queryTablesTab.collection, entity);
     try {
       await tableEntityListViewModel.addEntityToCache(newEntity);
-      reloadEntities();
-      setFormError("");
+      if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
+        tableEntityListViewModel.redrawTableThrottled();
+      }
     } catch (error) {
       const errorMessage = getErrorMessage(error);
       setFormError(errorMessage);
       handleError(errorMessage, "AddTableRow");
       throw error;
     } finally {
-      closeSidePanel();
       setIsExecuting(false);
     }
   };
 
+  const tryInsertNewHeaders = (viewModel: TableEntityListViewModel, newEntity: Entities.ITableEntity): boolean => {
+    let newHeaders: string[] = [];
+    const keys = Object.keys(newEntity);
+    keys &&
+      keys.forEach((key: string) => {
+        if (
+          !_.contains(viewModel.headers, key) &&
+          key !== TableEntityProcessor.keyProperties.attachments &&
+          key !== TableEntityProcessor.keyProperties.etag &&
+          key !== TableEntityProcessor.keyProperties.resourceId &&
+          key !== TableEntityProcessor.keyProperties.self &&
+          (!(userContext.apiType === "Cassandra") || key !== TableConstants.EntityKeyNames.RowKey)
+        ) {
+          newHeaders.push(key);
+        }
+      });
+
+    let newHeadersInserted = false;
+    if (newHeaders.length) {
+      if (!DataTableUtilities.checkForDefaultHeader(viewModel.headers)) {
+        newHeaders = viewModel.headers.concat(newHeaders);
+      }
+      viewModel.updateHeaders(newHeaders, /* notifyColumnChanges */ true, /* enablePrompt */ false);
+      newHeadersInserted = true;
+    }
+    return newHeadersInserted;
+  };
+
   /* Add new entity row */
   const addNewEntity = (): void => {
     const cloneEntities: EntityRowType[] = [...entities];

src/Explorer/Panes/Tables/EditTableEntityPanel.test.tsx

@@ -4,7 +4,7 @@ import React from "react";
 import TableListViewModal from "../../Tables/DataTable/TableEntityListViewModel";
 import * as Entities from "../../Tables/Entities";
 import { CassandraAPIDataClient, TablesAPIDataClient } from "../../Tables/TableDataClient";
-import QueryTablesTab from "../../Tabs/QueryTablesTab/QueryTablesTab";
+import QueryTablesTab from "../../Tabs/QueryTablesTab";
 import { EditTableEntityPanel } from "./EditTableEntityPanel";
 
 describe("Excute Edit Table Entity Pane", () => {
@@ -15,14 +15,11 @@ describe("Excute Edit Table Entity Pane", () => {
   fakeTableEntityListViewModel.headers = [];
   fakeTableEntityListViewModel.selected = ko.observableArray<Entities.ITableEntity>([{}]);
 
-  const fakeSelectedItem = [{ PartitionKey: { _: "test", $: "String" } }];
   const props = {
     tableDataClient: new TablesAPIDataClient(),
     queryTablesTab: fakeQueryTablesTab,
     tableEntityListViewModel: fakeTableEntityListViewModel,
     cassandraApiClient: fakeCassandraApiClient,
-    selectedEntity: fakeSelectedItem,
-    reloadEntities: () => "{}",
   };
 
   it("should render Default properly", () => {
@@ -32,13 +29,13 @@ describe("Excute Edit Table Entity Pane", () => {
 
   it("initially display 4 input field, 2 properties and 1 entity values", () => {
     const wrapper = mount(<EditTableEntityPanel {...props} />);
-    expect(wrapper.find("input[type='text']")).toHaveLength(1);
+    expect(wrapper.find("input[type='text']")).toHaveLength(0);
   });
 
   it("add a new entity row", () => {
     const wrapper = mount(<EditTableEntityPanel {...props} />);
     wrapper.find(".addButtonEntiy").last().simulate("click");
-    expect(wrapper.find("input[type='text']")).toHaveLength(2);
+    expect(wrapper.find("input[type='text']")).toHaveLength(1);
   });
 
   it("remove a entity field", () => {
@@ -46,6 +43,6 @@ describe("Excute Edit Table Entity Pane", () => {
     // Since default entity row doesn't have delete option, so added row then delete for test cases.
     wrapper.find(".addButtonEntiy").last().simulate("click");
     wrapper.find("#deleteEntity").last().simulate("click");
-    expect(wrapper.find("input[type='text']")).toHaveLength(1);
+    expect(wrapper.find("input[type='text']")).toHaveLength(0);
   });
 });

src/Explorer/Panes/Tables/EditTableEntityPanel.tsx

@@ -6,14 +6,14 @@ 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";
 import TableEntityListViewModel from "../../Tables/DataTable/TableEntityListViewModel";
 import * as Entities from "../../Tables/Entities";
 import { CassandraAPIDataClient, TableDataClient } from "../../Tables/TableDataClient";
 import * as TableEntityProcessor from "../../Tables/TableEntityProcessor";
-import NewQueryTablesTab from "../../Tabs/QueryTablesTab/QueryTablesTab";
+import QueryTablesTab from "../../Tabs/QueryTablesTab";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 import {
   attributeNameLabel,
@@ -34,11 +34,9 @@ import {
 
 interface EditTableEntityPanelProps {
   tableDataClient: TableDataClient;
-  queryTablesTab: NewQueryTablesTab;
+  queryTablesTab: QueryTablesTab;
   tableEntityListViewModel: TableEntityListViewModel;
   cassandraApiClient: CassandraAPIDataClient;
-  selectedEntity: Entities.ITableEntity[];
-  reloadEntities: () => void;
 }
 
 interface EntityRowType {
@@ -59,10 +57,7 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
   queryTablesTab,
   tableEntityListViewModel,
   cassandraApiClient,
-  selectedEntity,
-  reloadEntities,
 }: 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>("");
@@ -80,8 +75,8 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let originalDocument: { [key: string]: any } = {};
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const entityAttribute: any = selectedEntity;
-    const entityFormattedAttribute = constructDisplayedAttributes(entityAttribute && entityAttribute[0]);
+    const entityAttribute: any = tableEntityListViewModel.selected();
+    const entityFormattedAttribute = constructDisplayedAttributes(entityAttribute[0]);
     setEntities(entityFormattedAttribute);
 
     if (userContext.apiType === "Tables") {
@@ -91,7 +86,6 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
       originalDocument = entityAttribute;
     }
     setOriginalDocument(originalDocument);
-    //eslint-disable-next-line
   }, []);
 
   const constructDisplayedAttributes = (entity: Entities.ITableEntity): EntityRowType[] => {
@@ -222,8 +216,9 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
         entity
       );
       await tableEntityListViewModel.updateCachedEntity(newEntity);
-      reloadEntities();
-      closeSidePanel();
+      if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
+        tableEntityListViewModel.redrawTableThrottled();
+      }
       tableEntityListViewModel.selected.removeAll();
       tableEntityListViewModel.selected.push(newEntity);
     } catch (error) {
@@ -235,6 +230,34 @@ export const EditTableEntityPanel: FunctionComponent<EditTableEntityPanelProps>
     }
   };
 
+  const tryInsertNewHeaders = (viewModel: TableEntityListViewModel, newEntity: Entities.ITableEntity): boolean => {
+    let newHeaders: string[] = [];
+    const keys = Object.keys(newEntity);
+    keys &&
+      keys.forEach((key: string) => {
+        if (
+          !_.contains(viewModel.headers, key) &&
+          key !== TableEntityProcessor.keyProperties.attachments &&
+          key !== TableEntityProcessor.keyProperties.etag &&
+          key !== TableEntityProcessor.keyProperties.resourceId &&
+          key !== TableEntityProcessor.keyProperties.self &&
+          (!(userContext.apiType === "Cassandra") || key !== TableConstants.EntityKeyNames.RowKey)
+        ) {
+          newHeaders.push(key);
+        }
+      });
+
+    let newHeadersInserted = false;
+    if (newHeaders.length) {
+      if (!DataTableUtilities.checkForDefaultHeader(viewModel.headers)) {
+        newHeaders = viewModel.headers.concat(newHeaders);
+      }
+      viewModel.updateHeaders(newHeaders, /* notifyColumnChanges */ true, /* enablePrompt */ false);
+      newHeadersInserted = true;
+    }
+    return newHeadersInserted;
+  };
+
   // Add new entity row
   const addNewEntity = (): void => {
     const cloneEntities = [...entities];

src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.test.tsx

@@ -1,16 +1,18 @@
 import { mount } from "enzyme";
 import * as ko from "knockout";
 import React from "react";
+import Explorer from "../../../Explorer";
 import QueryViewModel from "../../../Tables/QueryBuilder/QueryViewModel";
 import { TableQuerySelectPanel } from "./TableQuerySelectPanel";
 
 describe("Table query select Panel", () => {
+  const fakeExplorer = {} as Explorer;
   const fakeQueryViewModal = {} as QueryViewModel;
   fakeQueryViewModal.columnOptions = ko.observableArray<string>([""]);
 
   const props = {
-    headers: [""],
-    getSelectMessage: () => "{}",
+    explorer: fakeExplorer,
+    closePanel: (): void => undefined,
     queryViewModel: fakeQueryViewModal,
   };
 

src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.tsx

@@ -8,8 +8,6 @@ import { RightPaneForm, RightPaneFormProps } from "../../RightPaneForm/RightPane
 
 interface TableQuerySelectPanelProps {
   queryViewModel: QueryViewModel;
-  headers: string[];
-  getSelectMessage: (selectMessage: string) => void;
 }
 
 interface ISelectColumn {
@@ -20,8 +18,6 @@ interface ISelectColumn {
 
 export const TableQuerySelectPanel: FunctionComponent<TableQuerySelectPanelProps> = ({
   queryViewModel,
-  headers,
-  getSelectMessage,
 }: TableQuerySelectPanelProps): JSX.Element => {
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
 
@@ -33,7 +29,6 @@ export const TableQuerySelectPanel: FunctionComponent<TableQuerySelectPanelProps
   const onSubmit = (): void => {
     queryViewModel.selectText(getParameters());
     queryViewModel.getSelectMessage();
-    getSelectMessage(queryViewModel.selectMessage());
     closeSidePanel();
   };
 
@@ -57,8 +52,7 @@ export const TableQuerySelectPanel: FunctionComponent<TableQuerySelectPanelProps
   };
 
   useEffect(() => {
-    // queryViewModel && setTableColumns(queryViewModel.columnOptions());
-    headers && setTableColumns(headers);
+    queryViewModel && setTableColumns(queryViewModel.columnOptions());
   }, []);
 
   const setTableColumns = (columnNames: string[]): void => {

src/Explorer/Panes/Tables/TableQuerySelectPanel/__snapshots__/TableQuerySelectPanel.test.tsx.snap

@@ -2,12 +2,8 @@
 
 exports[`Table query select Panel should render Default properly 1`] = `
 <TableQuerySelectPanel
-  getSelectMessage={[Function]}
-  headers={
-    Array [
-      "",
-    ]
-  }
+  closePanel={[Function]}
+  explorer={Object {}}
   queryViewModel={
     Object {
       "columnOptions": [Function],
@@ -1266,18 +1262,21 @@ exports[`Table query select Panel should render Default properly 1`] = `
       </div>
       <PanelFooterComponent
         buttonLabel="OK"
+        isButtonDisabled={false}
       >
         <div
           className="panelFooter"
         >
           <CustomizedPrimaryButton
             ariaLabel="OK"
+            disabled={false}
             id="sidePanelOkButton"
             text="OK"
             type="submit"
           >
             <PrimaryButton
               ariaLabel="OK"
+              disabled={false}
               id="sidePanelOkButton"
               text="OK"
               theme={
@@ -1557,6 +1556,7 @@ exports[`Table query select Panel should render Default properly 1`] = `
             >
               <CustomizedDefaultButton
                 ariaLabel="OK"
+                disabled={false}
                 id="sidePanelOkButton"
                 onRenderDescription={[Function]}
                 primary={true}
@@ -1838,6 +1838,7 @@ exports[`Table query select Panel should render Default properly 1`] = `
               >
                 <DefaultButton
                   ariaLabel="OK"
+                  disabled={false}
                   id="sidePanelOkButton"
                   onRenderDescription={[Function]}
                   primary={true}
@@ -2120,6 +2121,7 @@ exports[`Table query select Panel should render Default properly 1`] = `
                   <BaseButton
                     ariaLabel="OK"
                     baseClassName="ms-Button"
+                    disabled={false}
                     id="sidePanelOkButton"
                     onRenderDescription={[Function]}
                     primary={true}

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

@@ -33,6 +33,7 @@ const {
   Inet,
   Smallint,
   Tinyint,
+  Timestamp,
 } = TableConstants.CassandraType;
 export const cassandraOptions = [
   { key: Text, text: Text },
@@ -50,6 +51,7 @@ export const cassandraOptions = [
   { key: Inet, text: Inet },
   { key: Smallint, text: Smallint },
   { key: Tinyint, text: Tinyint },
+  { key: Timestamp, text: Timestamp },
 ];
 
 export const imageProps: IImageProps = {

src/Explorer/Panes/UploadFilePane/UploadFilePane.tsx

@@ -1,7 +1,7 @@
+import { Upload } from "Common/Upload/Upload";
+import { useSidePanel } from "hooks/useSidePanel";
 import React, { ChangeEvent, FunctionComponent, useState } from "react";
-import { Upload } from "../../../Common/Upload/Upload";
-import { useSidePanel } from "../../../hooks/useSidePanel";
-import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleInfo, logConsoleProgress } from "Utils/NotificationConsoleUtils";
 import { NotebookContentItem } from "../../Notebook/NotebookContentItem";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 

src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx

@@ -1,8 +1,8 @@
 import { DetailsList, DetailsListLayoutMode, IColumn, SelectionMode } from "@fluentui/react";
+import { Upload } from "Common/Upload/Upload";
+import { UploadDetailsRecord } from "Contracts/ViewModels";
 import React, { ChangeEvent, FunctionComponent, useState } from "react";
-import { Upload } from "../../../Common/Upload/Upload";
-import { UploadDetailsRecord } from "../../../Contracts/ViewModels";
-import { logConsoleError } from "../../../Utils/NotificationConsoleUtils";
+import { logConsoleError } from "Utils/NotificationConsoleUtils";
 import { getErrorMessage } from "../../Tables/Utilities";
 import { useSelectedNode } from "../../useSelectedNode";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";

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

@@ -1041,18 +1041,21 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
       </div>
       <PanelFooterComponent
         buttonLabel="OK"
+        isButtonDisabled={false}
       >
         <div
           className="panelFooter"
         >
           <CustomizedPrimaryButton
             ariaLabel="OK"
+            disabled={false}
             id="sidePanelOkButton"
             text="OK"
             type="submit"
           >
             <PrimaryButton
               ariaLabel="OK"
+              disabled={false}
               id="sidePanelOkButton"
               text="OK"
               theme={
@@ -1332,6 +1335,7 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
             >
               <CustomizedDefaultButton
                 ariaLabel="OK"
+                disabled={false}
                 id="sidePanelOkButton"
                 onRenderDescription={[Function]}
                 primary={true}
@@ -1613,6 +1617,7 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
               >
                 <DefaultButton
                   ariaLabel="OK"
+                  disabled={false}
                   id="sidePanelOkButton"
                   onRenderDescription={[Function]}
                   primary={true}
@@ -1895,6 +1900,7 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
                   <BaseButton
                     ariaLabel="OK"
                     baseClassName="ms-Button"
+                    disabled={false}
                     id="sidePanelOkButton"
                     onRenderDescription={[Function]}
                     primary={true}

src/Explorer/SplashScreen/SplashScreen.tsx

@@ -84,9 +84,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
     const mainItems = this.createMainItems();
     const commonTaskItems = this.createCommonTaskItems();
     let recentItems = this.createRecentItems();
-    if (userContext.features.notebooksTemporarilyDown) {
-      recentItems = recentItems.filter((item) => item.description !== "Notebook");
-    }
+    recentItems = recentItems.filter((item) => item.description !== "Notebook");
 
     const tipsItems = this.createTipsItems();
     const onClearRecent = this.clearMostRecent;
@@ -223,7 +221,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
       });
     }
 
-    if (useNotebook.getState().isNotebookEnabled && !userContext.features.notebooksTemporarilyDown) {
+    if (useNotebook.getState().isNotebookEnabled && useNotebook.getState().isPhoenix) {
       heroes.push({
         iconSrc: NewNotebookIcon,
         title: "New Notebook",
@@ -307,23 +305,24 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
         iconSrc: AddDatabaseIcon,
         title: "New " + getDatabaseName(),
         description: undefined,
-        onClick: () => this.openAddDatabasePanel(),
+        onClick: async () => {
+          const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
+          if (throughputCap && throughputCap !== -1) {
+            await useDatabases.getState().loadAllOffers();
+          }
+          useSidePanel
+            .getState()
+            .openSidePanel(
+              "New " + getDatabaseName(),
+              <AddDatabasePanel explorer={this.container} buttonElement={document.activeElement as HTMLElement} />
+            );
+        },
       });
     }
 
     return items;
   }
 
-  private openAddDatabasePanel() {
-    const newDatabaseButton = document.activeElement as HTMLElement;
-    useSidePanel
-      .getState()
-      .openSidePanel(
-        "New " + getDatabaseName(),
-        <AddDatabasePanel explorer={this.container} buttonElement={newDatabaseButton} />
-      );
-  }
-
   private decorateOpenCollectionActivity({ databaseId, collectionId }: MostRecentActivity.OpenCollectionItem) {
     return {
       iconSrc: NotebookIcon,

src/Explorer/Tables/Constants.ts

@@ -19,6 +19,7 @@ export const CassandraType = {
   Float: "Float",
   Int: "Int",
   Text: "Text",
+  Timestamp: "Timestamp",
   Uuid: "Uuid",
   Varchar: "Varchar",
   Varint: "Varint",

src/Explorer/Tables/DataTable/DataTableBindingManager.ts

@@ -0,0 +1,393 @@
+import * as ko from "knockout";
+import * as _ from "underscore";
+
+import * as Constants from "../Constants";
+import * as ViewModels from "../../../Contracts/ViewModels";
+import * as DataTableBuilder from "./DataTableBuilder";
+import DataTableOperationManager from "./DataTableOperationManager";
+import * as DataTableOperations from "./DataTableOperations";
+import QueryTablesTab from "../../Tabs/QueryTablesTab";
+import TableEntityListViewModel from "./TableEntityListViewModel";
+import * as Utilities from "../Utilities";
+import * as Entities from "../Entities";
+
+/**
+ * Custom binding manager of datatable
+ */
+var tableEntityListViewModelMap: {
+  [key: string]: {
+    tableViewModel: TableEntityListViewModel;
+    operationManager: DataTableOperationManager;
+    $dataTable: JQuery;
+  };
+} = {};
+
+function bindDataTable(element: any, valueAccessor: any, allBindings: any, viewModel: any, bindingContext: any) {
+  var tableEntityListViewModel = bindingContext.$data;
+  tableEntityListViewModel.notifyColumnChanges = onTableColumnChange;
+  var $dataTable = $(element);
+  var queryTablesTab = bindingContext.$parent;
+  var operationManager = new DataTableOperationManager(
+    $dataTable,
+    tableEntityListViewModel,
+    queryTablesTab.tableCommands
+  );
+
+  tableEntityListViewModelMap[queryTablesTab.tabId] = {
+    tableViewModel: tableEntityListViewModel,
+    operationManager: operationManager,
+    $dataTable: $dataTable,
+  };
+
+  createDataTable(0, tableEntityListViewModel, queryTablesTab); // Fake a DataTable to start.
+  $(window).resize(updateTableScrollableRegionMetrics);
+  operationManager.focusTable(); // Also selects the first row if needed.
+}
+
+function onTableColumnChange(enablePrompt: boolean = true, queryTablesTab: QueryTablesTab) {
+  var columnsFilter: boolean[] = null;
+  var tableEntityListViewModel = tableEntityListViewModelMap[queryTablesTab.tabId].tableViewModel;
+  if (queryTablesTab.queryViewModel()) {
+    queryTablesTab.queryViewModel().queryBuilderViewModel().updateColumnOptions();
+  }
+  createDataTable(
+    tableEntityListViewModel.tablePageStartIndex,
+    tableEntityListViewModel,
+    queryTablesTab,
+    true,
+    columnsFilter
+  );
+}
+
+function createDataTable(
+  startIndex: number,
+  tableEntityListViewModel: TableEntityListViewModel,
+  queryTablesTab: QueryTablesTab,
+  destroy: boolean = false,
+  columnsFilter: boolean[] = null
+): void {
+  var $dataTable = tableEntityListViewModelMap[queryTablesTab.tabId].$dataTable;
+  if (destroy) {
+    // Find currently displayed columns.
+    var currentColumns: string[] = tableEntityListViewModel.headers;
+
+    // Calculate how many more columns need to added to the current table.
+    var columnsToAdd: number = _.difference(tableEntityListViewModel.headers, currentColumns).length;
+
+    // This is needed as current solution of adding column is more like a workaround
+    // The official support for dynamically add column is not yet there
+    // Please track github issue https://github.com/DataTables/DataTables/issues/273 for its offical support
+    for (var i = 0; i < columnsToAdd; i++) {
+      $(".dataTables_scrollHead table thead tr th").eq(0).after("<th></th>");
+    }
+    tableEntityListViewModel.table.destroy();
+    $dataTable.empty();
+  }
+
+  var jsonColTable = [];
+
+  for (var i = 0; i < tableEntityListViewModel.headers.length; i++) {
+    jsonColTable.push({
+      sTitle: tableEntityListViewModel.headers[i],
+      data: tableEntityListViewModel.headers[i],
+      aTargets: [i],
+      mRender: bindColumn,
+      visible: !!columnsFilter ? columnsFilter[i] : true,
+    });
+  }
+
+  tableEntityListViewModel.table = DataTableBuilder.createDataTable($dataTable, <DataTables.Settings>{
+    // WARNING!!! SECURITY: If you add new columns, make sure you encode them if they are user strings from Azure (see encodeText)
+    // so that they don't get interpreted as HTML in our page.
+    colReorder: true,
+    aoColumnDefs: jsonColTable,
+    stateSave: false,
+    dom: "RZlfrtip",
+    oColReorder: {
+      iFixedColumns: 1,
+    },
+    displayStart: startIndex,
+    bPaginate: true,
+    pagingType: "full_numbers",
+    bProcessing: true,
+    oLanguage: {
+      sInfo: "Results _START_ - _END_ of _TOTAL_",
+      oPaginate: {
+        sFirst: "<<",
+        sNext: ">",
+        sPrevious: "<",
+        sLast: ">>",
+      },
+      sProcessing: '<img style="width: 28px; height: 6px; " src="images/LoadingIndicator_3Squares.gif">',
+      oAria: {
+        sSortAscending: "",
+        sSortDescending: "",
+      },
+    },
+    destroy: destroy,
+    bInfo: true,
+    bLength: false,
+    bLengthChange: false,
+    scrollX: true,
+    scrollCollapse: true,
+    iDisplayLength: 100,
+    serverSide: true,
+    ajax: queryTablesTab.tabId, // Using this settings to make sure for getServerData we update the table based on the appropriate tab
+    fnServerData: getServerData,
+    fnRowCallback: bindClientId,
+    fnInitComplete: initializeTable,
+    fnDrawCallback: updateSelectionStatus,
+  });
+
+  (tableEntityListViewModel.table.table(0).container() as Element)
+    .querySelectorAll(Constants.htmlSelectors.dataTableHeaderTableSelector)
+    .forEach((table) => {
+      table.setAttribute(
+        "summary",
+        `Header for sorting results for container ${tableEntityListViewModel.queryTablesTab.collection.id()}`
+      );
+    });
+
+  (tableEntityListViewModel.table.table(0).container() as Element)
+    .querySelectorAll(Constants.htmlSelectors.dataTableBodyTableSelector)
+    .forEach((table) => {
+      table.setAttribute("summary", `Results for container ${tableEntityListViewModel.queryTablesTab.collection.id()}`);
+    });
+}
+
+function bindColumn(data: any, type: string, full: any) {
+  var displayedValue: any = null;
+  if (data) {
+    displayedValue = data._;
+
+    // SECURITY: Make sure we don't allow cross-site scripting by interpreting the values as HTML
+    displayedValue = Utilities.htmlEncode(displayedValue);
+
+    // Css' empty psuedo class can only tell the difference of whether a cell has values.
+    // A cell has no values no matter it's empty or it has no such a property.
+    // To distinguish between an empty cell and a non-existing property cell,
+    // we add a whitespace to the empty cell so that css will treat it as a cell with values.
+    if (displayedValue === "" && data.$ === Constants.TableType.String) {
+      displayedValue = " ";
+    }
+  }
+  return displayedValue;
+}
+
+function getServerData(sSource: any, aoData: any, fnCallback: any, oSettings: any) {
+  tableEntityListViewModelMap[oSettings.ajax].tableViewModel.renderNextPageAndupdateCache(
+    sSource,
+    aoData,
+    fnCallback,
+    oSettings
+  );
+}
+
+/**
+ * Bind table data information to row element so that we can track back to the table data
+ * from UI elements.
+ */
+function bindClientId(nRow: Node, aData: Entities.ITableEntity) {
+  $(nRow).attr(Constants.htmlAttributeNames.dataTableRowKeyAttr, aData.RowKey._);
+  return nRow;
+}
+
+function selectionChanged(element: any, valueAccessor: any, allBindings: any, viewModel: any, bindingContext: any) {
+  $(".dataTable tr.selected").attr("tabindex", "-1").removeClass("selected");
+
+  const selected =
+    bindingContext && bindingContext.$data && bindingContext.$data.selected && bindingContext.$data.selected();
+  selected &&
+    selected.forEach((b: Entities.ITableEntity) => {
+      var sel = DataTableOperations.getRowSelector([
+        {
+          key: Constants.htmlAttributeNames.dataTableRowKeyAttr,
+          value: b.RowKey && b.RowKey._ && b.RowKey._.toString(),
+        },
+      ]);
+
+      $(sel).attr("tabindex", "0").focus().addClass("selected");
+    });
+  //selected = bindingContext.$data.selected();
+}
+
+function dataChanged(element: any, valueAccessor: any, allBindings: any, viewModel: any, bindingContext: any) {
+  // do nothing for now
+}
+
+function initializeTable(): void {
+  updateTableScrollableRegionMetrics();
+  initializeEventHandlers();
+}
+
+function updateTableScrollableRegionMetrics(): void {
+  updateTableScrollableRegionHeight();
+  updateTableScrollableRegionWidth();
+}
+
+/*
+ * Update the table's scrollable region height. So the pagination control is always shown at the bottom of the page.
+ */
+function updateTableScrollableRegionHeight(): void {
+  $(".tab-pane").each(function (index, tabElement) {
+    if (!$(tabElement).hasClass("tableContainer")) {
+      return;
+    }
+
+    // Add some padding to the table so it doesn't get too close to the container border.
+    var dataTablePaddingBottom = 10;
+    var bodyHeight = $(window).height();
+    var dataTablesScrollBodyPosY = $(tabElement).find(Constants.htmlSelectors.dataTableScrollBodySelector).offset().top;
+    var dataTablesInfoElem = $(tabElement).find(".dataTables_info");
+    var dataTablesPaginateElem = $(tabElement).find(".dataTables_paginate");
+    const notificationConsoleHeight = 32; /** Header height **/
+
+    var scrollHeight =
+      bodyHeight -
+      dataTablesScrollBodyPosY -
+      dataTablesPaginateElem.outerHeight(true) -
+      dataTablePaddingBottom -
+      notificationConsoleHeight;
+
+    //info and paginate control are stacked
+    if (dataTablesInfoElem.offset().top < dataTablesPaginateElem.offset().top) {
+      scrollHeight -= dataTablesInfoElem.outerHeight(true);
+    }
+
+    // TODO This is a work around for setting the outerheight since we don't have access to the JQuery.outerheight(numberValue)
+    // in the current version of JQuery we are using.  Ideally, we would upgrade JQuery and use this line instead:
+    // $(Constants.htmlSelectors.dataTableScrollBodySelector).outerHeight(scrollHeight);
+    var element = $(tabElement).find(Constants.htmlSelectors.dataTableScrollBodySelector)[0];
+    var style = getComputedStyle(element);
+    var actualHeight = parseInt(style.height);
+    var change = element.offsetHeight - scrollHeight;
+    $(tabElement)
+      .find(Constants.htmlSelectors.dataTableScrollBodySelector)
+      .height(actualHeight - change);
+  });
+}
+
+/*
+ * Update the table's scrollable region width to make efficient use of the remaining space.
+ */
+function updateTableScrollableRegionWidth(): void {
+  $(".tab-pane").each(function (index, tabElement) {
+    if (!$(tabElement).hasClass("tableContainer")) {
+      return;
+    }
+
+    var bodyWidth = $(window).width();
+    var dataTablesScrollBodyPosLeft = $(tabElement).find(Constants.htmlSelectors.dataTableScrollBodySelector).offset()
+      .left;
+    var scrollWidth = bodyWidth - dataTablesScrollBodyPosLeft;
+
+    // jquery datatables automatically sets width:100% to both the header and the body when we use it's column autoWidth feature.
+    // We work around that by setting the height for it's container instead.
+    $(tabElement).find(Constants.htmlSelectors.dataTableScrollContainerSelector).width(scrollWidth);
+  });
+}
+
+function initializeEventHandlers(): void {
+  var $headers: JQuery = $(Constants.htmlSelectors.dataTableHeaderTypeSelector);
+  var $firstHeader: JQuery = $headers.first();
+  var firstIndex: string = $firstHeader.attr(Constants.htmlAttributeNames.dataTableHeaderIndex);
+
+  $headers
+    .on("keydown", (event: JQueryEventObject) => {
+      Utilities.onEnter(event, ($sourceElement: JQuery) => {
+        $sourceElement.css("background-color", Constants.cssColors.commonControlsButtonActive);
+      });
+
+      // Bind shift+tab from first header back to search input field
+      Utilities.onTab(
+        event,
+        ($sourceElement: JQuery) => {
+          var sourceIndex: string = $sourceElement.attr(Constants.htmlAttributeNames.dataTableHeaderIndex);
+
+          if (sourceIndex === firstIndex) {
+            event.preventDefault();
+          }
+        },
+        /* metaKey */ null,
+        /* shiftKey */ true,
+        /* altKey */ null
+      );
+
+      // Also reset color if [shift-] tabbing away from button while holding down 'enter'
+      Utilities.onTab(event, ($sourceElement: JQuery) => {
+        $sourceElement.css("background-color", "");
+      });
+    })
+    .on("keyup", (event: JQueryEventObject) => {
+      Utilities.onEnter(event, ($sourceElement: JQuery) => {
+        $sourceElement.css("background-color", "");
+      });
+    });
+}
+
+function updateSelectionStatus(oSettings: any): void {
+  var $dataTableRows: JQuery = $(Constants.htmlSelectors.dataTableAllRowsSelector);
+  if ($dataTableRows) {
+    for (var i = 0; i < $dataTableRows.length; i++) {
+      var $row: JQuery = $dataTableRows.eq(i);
+      var rowKey: string = $row.attr(Constants.htmlAttributeNames.dataTableRowKeyAttr);
+      var table = tableEntityListViewModelMap[oSettings.ajax].tableViewModel;
+      if (table.isItemSelected(table.getTableEntityKeys(rowKey))) {
+        $row.attr("tabindex", "0");
+      }
+    }
+  }
+
+  updateDataTableFocus(oSettings.ajax);
+
+  DataTableOperations.setPaginationButtonEventHandlers();
+}
+
+// TODO consider centralizing this "post-command" logic into some sort of Command Manager entity.
+// See VSO:166520: "[Storage Explorer] Consider adding a 'command manager' to track command post-effects."
+function updateDataTableFocus(queryTablesTabId: string): void {
+  var $activeElement: JQuery = $(document.activeElement);
+  var isFocusLost: boolean = $activeElement.is("body"); // When focus is lost, "body" becomes the active element.
+  var storageExplorerFrameHasFocus: boolean = document.hasFocus();
+  var operationManager = tableEntityListViewModelMap[queryTablesTabId].operationManager;
+  if (operationManager) {
+    if (isFocusLost && storageExplorerFrameHasFocus) {
+      // We get here when no control is active, meaning that the table update was triggered
+      // from a dialog, the context menu or by clicking on a toolbar control or header.
+      // Note that giving focus to the table also selects the first row if needed.
+      // The document.hasFocus() ensures that the table will only get focus when the
+      // focus was lost (i.e. "body has the focus") within the Storage Explorer frame
+      // i.e. not when the focus is lost because it is in another frame
+      // e.g. a daytona dialog or in the Activity Log.
+      operationManager.focusTable();
+    }
+    if ($activeElement.is(".sorting_asc") || $activeElement.is(".sorting_desc")) {
+      // If table header is selected, focus is shifted to the selected element as part of accessibility
+      $activeElement && $activeElement.focus();
+    } else {
+      // If some control is active, we don't give focus back to the table,
+      // just select the first row if needed (empty selection).
+      operationManager.selectFirstIfNeeded();
+    }
+  }
+}
+
+(<any>ko.bindingHandlers).tableSource = {
+  init: bindDataTable,
+  update: dataChanged,
+};
+
+(<any>ko.bindingHandlers).tableSelection = {
+  update: selectionChanged,
+};
+
+(<any>ko.bindingHandlers).readOnly = {
+  update: function (element: any, valueAccessor: any) {
+    var value = ko.utils.unwrapObservable(valueAccessor());
+    if (value) {
+      element.setAttribute("readOnly", true);
+    } else {
+      element.removeAttribute("readOnly");
+    }
+  },
+};

src/Explorer/Tables/DataTable/DataTableBuilder.ts

@@ -0,0 +1,52 @@
+import * as Utilities from "../Utilities";
+
+/**
+ * Wrapper function for creating data tables. Call this method, not the
+ * data tables constructor when you want to create a data table. This
+ * function makes sure that content without a render function is properly
+ * encoded to prevent XSS.
+ * @param{$dataTableElem} JQuery data table element
+ * @param{$settings} Settings to use when creating the data table
+ */
+export function createDataTable($dataTableElem: JQuery, settings: any): DataTables.DataTable {
+  return $dataTableElem.DataTable(applyDefaultRendering(settings));
+}
+
+/**
+ * Go through the settings for a data table and apply a simple HTML encode to any column
+ * without a render function to prevent XSS.
+ * @param{settings} The settings to check
+ * @return The given settings with all columns having a rendering function
+ */
+function applyDefaultRendering(settings: any): DataTables.SettingsLegacy {
+  var tableColumns: DataTables.ColumnLegacy[] = null;
+
+  if (settings.aoColumns) {
+    tableColumns = settings.aoColumns;
+  } else if (settings.aoColumnDefs) {
+    // for tables we use aoColumnDefs instead of aoColumns
+    tableColumns = settings.aoColumnDefs;
+  }
+
+  // either the settings had no columns defined, or they were called
+  // by a property name which we have not used before
+  if (!tableColumns) {
+    return settings;
+  }
+
+  for (var i = 0; i < tableColumns.length; i++) {
+    // the column does not have a render function
+    if (!tableColumns[i].mRender) {
+      tableColumns[i].mRender = defaultDataRender;
+    }
+  }
+  return settings;
+}
+
+/**
+ * Default data render function, whatever is done to data in here
+ * will be done to any data which we do not specify a render for.
+ */
+function defaultDataRender(data: any, type: string, full: any) {
+  return Utilities.htmlEncode(data);
+}

src/Explorer/Tables/DataTable/DataTableOperationManager.ts

@@ -0,0 +1,300 @@
+import ko from "knockout";
+
+import * as DataTableOperations from "./DataTableOperations";
+import * as Constants from "../Constants";
+import TableCommands from "./TableCommands";
+import TableEntityListViewModel from "./TableEntityListViewModel";
+import * as Utilities from "../Utilities";
+import * as Entities from "../Entities";
+
+/*
+ * Base class for data table row selection.
+ */
+export default class DataTableOperationManager {
+  private _tableEntityListViewModel: TableEntityListViewModel;
+  private _tableCommands: TableCommands;
+  private dataTable: JQuery;
+
+  constructor(table: JQuery, viewModel: TableEntityListViewModel, tableCommands: TableCommands) {
+    this.dataTable = table;
+    this._tableEntityListViewModel = viewModel;
+    this._tableCommands = tableCommands;
+
+    this.bind();
+    this._tableEntityListViewModel.bind(this);
+  }
+
+  private click = (event: JQueryEventObject) => {
+    var elem: JQuery = $(event.currentTarget);
+    this.updateLastSelectedItem(elem, event.shiftKey);
+
+    if (Utilities.isEnvironmentCtrlPressed(event)) {
+      this.applyCtrlSelection(elem);
+    } else if (event.shiftKey) {
+      this.applyShiftSelection(elem);
+    } else {
+      this.applySingleSelection(elem);
+    }
+  };
+
+  private doubleClick = (event: JQueryEventObject) => {
+    this.tryOpenEditor();
+  };
+
+  private keyDown = (event: JQueryEventObject): boolean => {
+    var isUpArrowKey: boolean = event.keyCode === Constants.keyCodes.UpArrow,
+      isDownArrowKey: boolean = event.keyCode === Constants.keyCodes.DownArrow,
+      handled: boolean = false;
+
+    if (isUpArrowKey || isDownArrowKey) {
+      var lastSelectedItem: Entities.ITableEntity = this._tableEntityListViewModel.lastSelectedItem;
+      var dataTableRows: JQuery = $(Constants.htmlSelectors.dataTableAllRowsSelector);
+      var maximumIndex = dataTableRows.length - 1;
+
+      // If can't find an index for lastSelectedItem, then either no item is previously selected or it goes across page.
+      // Simply select the first item in this case.
+      var lastSelectedItemIndex = lastSelectedItem
+        ? this._tableEntityListViewModel.getItemIndexFromCurrentPage(
+            this._tableEntityListViewModel.getTableEntityKeys(lastSelectedItem.RowKey._)
+          )
+        : -1;
+      var nextIndex: number = isUpArrowKey ? lastSelectedItemIndex - 1 : lastSelectedItemIndex + 1;
+      var safeIndex: number = Utilities.ensureBetweenBounds(nextIndex, 0, maximumIndex);
+      var selectedRowElement: JQuery = dataTableRows.eq(safeIndex);
+
+      if (selectedRowElement) {
+        if (event.shiftKey) {
+          this.applyShiftSelection(selectedRowElement);
+        } else {
+          this.applySingleSelection(selectedRowElement);
+        }
+
+        this.updateLastSelectedItem(selectedRowElement, event.shiftKey);
+        handled = true;
+        DataTableOperations.scrollToRowIfNeeded(dataTableRows, safeIndex, isUpArrowKey);
+      }
+    } else if (
+      Utilities.isEnvironmentCtrlPressed(event) &&
+      !Utilities.isEnvironmentShiftPressed(event) &&
+      !Utilities.isEnvironmentAltPressed(event) &&
+      event.keyCode === Constants.keyCodes.A
+    ) {
+      this.applySelectAll();
+      handled = true;
+    }
+
+    return !handled;
+  };
+
+  // Note: There is one key up event each time a key is pressed;
+  // in contrast, there may be more than one key down and key
+  // pressed events.
+  private keyUp = (event: JQueryEventObject): boolean => {
+    var handled: boolean = false;
+
+    switch (event.keyCode) {
+      case Constants.keyCodes.Enter:
+        handled = this.tryOpenEditor();
+        break;
+      case Constants.keyCodes.Delete:
+        handled = this.tryHandleDeleteSelected();
+        break;
+    }
+
+    return !handled;
+  };
+
+  private itemDropped = (event: JQueryEventObject): boolean => {
+    var handled: boolean = false;
+    var items = (<any>event.originalEvent).dataTransfer.items;
+
+    if (!items) {
+      // On browsers outside of Chromium
+      // we can't discern between dirs and files
+      // so we will disable drag & drop for now
+      return null;
+    }
+
+    for (var i = 0; i < items.length; i++) {
+      var item = items[i];
+      var entry = item.webkitGetAsEntry();
+
+      if (entry.isFile) {
+        // TODO: parse the file and insert content as entities
+      }
+    }
+
+    return !handled;
+  };
+
+  private tryOpenEditor(): boolean {
+    return this._tableCommands.tryOpenEntityEditor(this._tableEntityListViewModel);
+  }
+
+  private tryHandleDeleteSelected(): boolean {
+    var selectedEntities: Entities.ITableEntity[] = this._tableEntityListViewModel.selected();
+    var handled: boolean = false;
+
+    if (selectedEntities && selectedEntities.length) {
+      this._tableCommands.deleteEntitiesCommand(this._tableEntityListViewModel);
+      handled = true;
+    }
+
+    return handled;
+  }
+
+  private getEntityIdentity($elem: JQuery): Entities.ITableEntityIdentity {
+    return {
+      RowKey: $elem.attr(Constants.htmlAttributeNames.dataTableRowKeyAttr),
+    };
+  }
+
+  private updateLastSelectedItem($elem: JQuery, isShiftSelect: boolean) {
+    var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+    var entity = this._tableEntityListViewModel.getItemFromCurrentPage(
+      this._tableEntityListViewModel.getTableEntityKeys(entityIdentity.RowKey)
+    );
+
+    this._tableEntityListViewModel.lastSelectedItem = entity;
+
+    if (!isShiftSelect) {
+      this._tableEntityListViewModel.lastSelectedAnchorItem = entity;
+    }
+  }
+
+  private applySingleSelection($elem: JQuery) {
+    if ($elem) {
+      var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+
+      this._tableEntityListViewModel.clearSelection();
+      this.addToSelection(entityIdentity.RowKey);
+    }
+  }
+
+  private applySelectAll() {
+    this._tableEntityListViewModel.clearSelection();
+    ko.utils.arrayPushAll<Entities.ITableEntity>(
+      this._tableEntityListViewModel.selected,
+      this._tableEntityListViewModel.getAllItemsInCurrentPage()
+    );
+  }
+
+  private applyCtrlSelection($elem: JQuery): void {
+    var koSelected: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
+      ? this._tableEntityListViewModel.selected
+      : null;
+
+    if (koSelected) {
+      var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+
+      if (
+        !this._tableEntityListViewModel.isItemSelected(
+          this._tableEntityListViewModel.getTableEntityKeys(entityIdentity.RowKey)
+        )
+      ) {
+        // Adding item not previously in selection
+        this.addToSelection(entityIdentity.RowKey);
+      } else {
+        koSelected.remove((item: Entities.ITableEntity) => item.RowKey._ === entityIdentity.RowKey);
+      }
+    }
+  }
+
+  private applyShiftSelection($elem: JQuery): void {
+    var anchorItem = this._tableEntityListViewModel.lastSelectedAnchorItem;
+
+    // If anchor item doesn't exist, use the first available item of current page instead
+    if (!anchorItem && this._tableEntityListViewModel.items().length > 0) {
+      anchorItem = this._tableEntityListViewModel.items()[0];
+    }
+
+    if (anchorItem) {
+      var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+      var elementIndex = this._tableEntityListViewModel.getItemIndexFromAllPages(
+        this._tableEntityListViewModel.getTableEntityKeys(entityIdentity.RowKey)
+      );
+      var anchorIndex = this._tableEntityListViewModel.getItemIndexFromAllPages(
+        this._tableEntityListViewModel.getTableEntityKeys(anchorItem.RowKey._)
+      );
+
+      var startIndex = Math.min(elementIndex, anchorIndex);
+      var endIndex = Math.max(elementIndex, anchorIndex);
+
+      this._tableEntityListViewModel.clearSelection();
+      ko.utils.arrayPushAll<Entities.ITableEntity>(
+        this._tableEntityListViewModel.selected,
+        this._tableEntityListViewModel.getItemsFromAllPagesWithinRange(startIndex, endIndex + 1)
+      );
+    }
+  }
+
+  private applyContextMenuSelection($elem: JQuery) {
+    var entityIdentity: Entities.ITableEntityIdentity = this.getEntityIdentity($elem);
+
+    if (
+      !this._tableEntityListViewModel.isItemSelected(
+        this._tableEntityListViewModel.getTableEntityKeys(entityIdentity.RowKey)
+      )
+    ) {
+      if (this._tableEntityListViewModel.selected().length) {
+        this._tableEntityListViewModel.clearSelection();
+      }
+      this.addToSelection(entityIdentity.RowKey);
+    }
+  }
+
+  private addToSelection(rowKey: string) {
+    var selectedEntity: Entities.ITableEntity = this._tableEntityListViewModel.getItemFromCurrentPage(
+      this._tableEntityListViewModel.getTableEntityKeys(rowKey)
+    );
+
+    if (selectedEntity != null) {
+      this._tableEntityListViewModel.selected.push(selectedEntity);
+    }
+  }
+
+  // Selecting first row if the selection is empty.
+  public selectFirstIfNeeded(): void {
+    var koSelected: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
+      ? this._tableEntityListViewModel.selected
+      : null;
+    var koEntities: ko.ObservableArray<Entities.ITableEntity> = this._tableEntityListViewModel
+      ? this._tableEntityListViewModel.items
+      : null;
+
+    if (!koSelected().length && koEntities().length) {
+      var firstEntity: Entities.ITableEntity = koEntities()[0];
+
+      // Clear last selection: lastSelectedItem and lastSelectedAnchorItem
+      this._tableEntityListViewModel.clearLastSelected();
+
+      this.addToSelection(firstEntity.RowKey._);
+
+      // Update last selection
+      this._tableEntityListViewModel.lastSelectedItem = firstEntity;
+
+      // Finally, make sure first row is visible
+      DataTableOperations.scrollToTopIfNeeded();
+    }
+  }
+
+  public bind() {
+    this.dataTable.on("click", "tr", this.click);
+    this.dataTable.on("dblclick", "tr", this.doubleClick);
+    this.dataTable.on("keydown", "td", this.keyDown);
+    this.dataTable.on("keyup", "td", this.keyUp);
+
+    // Keyboard navigation - selecting first row if the selection is empty when the table gains focus.
+    this.dataTable.on("focus", () => {
+      this.selectFirstIfNeeded();
+      return true;
+    });
+
+    // Bind drag & drop behavior
+    $("body").on("drop", this.itemDropped);
+  }
+
+  public focusTable(): void {
+    this.dataTable.focus();
+  }
+}

src/Explorer/Tables/DataTable/DataTableOperations.ts

@@ -0,0 +1,193 @@
+import Q from "q";
+import _ from "underscore";
+import * as QueryBuilderConstants from "../Constants";
+import * as Entities from "../Entities";
+import * as Utilities from "../Utilities";
+
+export function getRowSelector(selectorSchema: Entities.IProperty[]): string {
+  let selector = "";
+  selectorSchema &&
+    selectorSchema.forEach((p: Entities.IProperty) => {
+      selector += "[" + p.key + '="' + Utilities.jQuerySelectorEscape(p.value) + '"]';
+    });
+  return QueryBuilderConstants.htmlSelectors.dataTableAllRowsSelector + selector;
+}
+
+export function isRowVisible(dataTableScrollBodyQuery: JQuery, element: HTMLElement): boolean {
+  let isVisible = false;
+
+  if (dataTableScrollBodyQuery.length && element) {
+    const elementRect: ClientRect = element.getBoundingClientRect(),
+      dataTableScrollBodyRect: ClientRect = dataTableScrollBodyQuery.get(0).getBoundingClientRect();
+
+    isVisible = elementRect.bottom <= dataTableScrollBodyRect.bottom && dataTableScrollBodyRect.top <= elementRect.top;
+  }
+
+  return isVisible;
+}
+
+export function scrollToRowIfNeeded(dataTableRows: JQuery, currentIndex: number, isScrollUp: boolean): void {
+  if (dataTableRows.length) {
+    const dataTableScrollBodyQuery: JQuery = $(QueryBuilderConstants.htmlSelectors.dataTableScrollBodySelector),
+      selectedRowElement: HTMLElement = dataTableRows.get(currentIndex);
+
+    if (dataTableScrollBodyQuery.length && selectedRowElement) {
+      const isVisible: boolean = isRowVisible(dataTableScrollBodyQuery, selectedRowElement);
+
+      if (!isVisible) {
+        const selectedRowQuery: JQuery = $(selectedRowElement),
+          scrollPosition: number = dataTableScrollBodyQuery.scrollTop(),
+          selectedElementPosition: number = selectedRowQuery.position().top;
+        let newScrollPosition = 0;
+
+        if (isScrollUp) {
+          newScrollPosition = scrollPosition + selectedElementPosition;
+        } else {
+          newScrollPosition =
+            scrollPosition + (selectedElementPosition + selectedRowQuery.height() - dataTableScrollBodyQuery.height());
+        }
+
+        dataTableScrollBodyQuery.scrollTop(newScrollPosition);
+      }
+    }
+  }
+}
+
+export function scrollToTopIfNeeded(): void {
+  const $dataTableRows: JQuery = $(QueryBuilderConstants.htmlSelectors.dataTableAllRowsSelector),
+    $dataTableScrollBody: JQuery = $(QueryBuilderConstants.htmlSelectors.dataTableScrollBodySelector);
+
+  if ($dataTableRows.length && $dataTableScrollBody.length) {
+    $dataTableScrollBody.scrollTop(0);
+  }
+}
+
+export function setPaginationButtonEventHandlers(): void {
+  $(QueryBuilderConstants.htmlSelectors.dataTablePaginationButtonSelector)
+    .on("mousedown", (event: JQueryEventObject) => {
+      // Prevents the table contents from briefly jumping when clicking on "Load more"
+      event.preventDefault();
+    })
+    .attr("role", "button");
+}
+
+export function filterColumns(table: DataTables.DataTable, settings: boolean[]): void {
+  settings &&
+    settings.forEach((value: boolean, index: number) => {
+      table.column(index).visible(value, false);
+    });
+  table.columns.adjust().draw(false);
+}
+
+/**
+ * Reorder columns based on current order.
+ * If no current order is specified, reorder the columns based on intial order.
+ */
+export function reorderColumns(
+  table: DataTables.DataTable,
+  targetOrder: number[],
+  currentOrder?: number[]
+  //eslint-disable-next-line
+): Q.Promise<any> {
+  const columnsCount: number = targetOrder.length;
+  const isCurrentOrderPassedIn = !!currentOrder;
+  if (!isCurrentOrderPassedIn) {
+    currentOrder = getInitialOrder(columnsCount);
+  }
+  const isSameOrder: boolean = Utilities.isEqual(currentOrder, targetOrder);
+
+  // if the targetOrder is the same as current order, do nothing.
+  if (!isSameOrder) {
+    // Otherwise, calculate the transformation order.
+    // If current order not specified, then it'll be set to initial order,
+    //  i.e., either no reorder happened before or reordering to its initial order,
+    //  Then the transformation order will be the same as target order.
+    // If current order is specified, then a transformation order is calculated.
+    //  Refer to calculateTransformationOrder for details about transformation order.
+    const transformationOrder: number[] = isCurrentOrderPassedIn
+      ? calculateTransformationOrder(currentOrder, targetOrder)
+      : targetOrder;
+    try {
+      $.fn.dataTable.ColReorder(table).fnOrder(transformationOrder);
+    } catch (err) {
+      return Q.reject(err);
+    }
+  }
+  return Q.resolve(null);
+}
+
+export function resetColumns(table: DataTables.DataTable): void {
+  $.fn.dataTable.ColReorder(table).fnReset();
+}
+
+/**
+ * A table's initial order is described in the form of a natural ascending order.
+ * E.g., for a table with 9 columns, the initial order will be: [0, 1, 2, 3, 4, 5, 6, 7, 8]
+ */
+export function getInitialOrder(columnsCount: number): number[] {
+  return _.range(columnsCount);
+}
+
+/**
+ * Get current table's column order which is described based on initial table. E.g.,
+ * Initial order:  I = [0, 1, 2, 3, 4, 5, 6, 7, 8]   <---->   {prop0, prop1, prop2, prop3, prop4, prop5, prop6, prop7, prop8}
+ * Current order:  C = [0, 1, 2, 6, 7, 3, 4, 5, 8]   <---->   {prop0, prop1, prop2, prop6, prop7, prop3, prop4, prop5, prop8}
+ */
+export function getCurrentOrder(table: DataTables.DataTable): number[] {
+  return $.fn.dataTable.ColReorder(table).fnOrder();
+}
+
+/**
+ * Switch the index and value for each element of an array. e.g.,
+ * InputArray: [0, 1, 2, 6, 7, 3, 4, 5, 8]
+ * Result:     [0, 1, 2, 5, 6, 7, 3, 4, 8]
+ */
+export function invertIndexValues(inputArray: number[]): number[] {
+  const invertedArray: number[] = [];
+  if (inputArray) {
+    inputArray.forEach((value: number, index: number) => {
+      invertedArray[inputArray[index]] = index;
+    });
+  }
+
+  return invertedArray;
+}
+
+/**
+ * DataTable fnOrder API is based on the current table. So we need to map the order targeting original table to targeting current table.
+ * An detailed example for this. Assume the table has 9 columns.
+ * Initial order (order of the initial table):  I = [0, 1, 2, 3, 4, 5, 6, 7, 8]   <---->   {prop0, prop1, prop2, prop3, prop4, prop5, prop6, prop7, prop8}
+ * Current order (order of the current table):  C = [0, 1, 2, 6, 7, 3, 4, 5, 8]   <---->   {prop0, prop1, prop2, prop6, prop7, prop3, prop4, prop5, prop8}
+ * Target order (order of the targeting table): T = [0, 1, 2, 5, 6, 7, 8, 3, 4]   <---->   {prop0, prop1, prop2, prop5, prop6, prop7, prop8, prop3, prop4}
+ * Transformation order: an order passed to fnOrder API that transforms table from current order to target order.
+ * When the table is constructed, it has the intial order. After an reordering with current order array, now the table is shown in current order, e.g.,
+ * column 3 in the current table is actually column C[3]=6 in the intial table, both indicate the column with header prop6.
+ * Now we want to continue to do another reorder to make the target table in the target order. Directly invoking API with the new order won't work as
+ * the API only do reorder based on the current table like the first time we invoke the API. So an order based on the current table needs to be calulated.
+ * Here is an example of how to calculate the transformation order:
+ * In target table, column 3 should be column T[3]=5 in the intial table with header prop5, while in current table, column with header prop5 is column 7 as C[7]=5.
+ * As a result, in transformation order, column 3 in the target table should be column 7 in the current table, Trans[3] = 7. In the same manner, we can get the
+ * transformation order: Trans = [0, 1, 2, 7, 3, 4, 8, 5, 6]
+ */
+export function calculateTransformationOrder(currentOrder: number[], targetOrder: number[]): number[] {
+  let transformationOrder: number[] = [];
+  if (currentOrder && targetOrder && currentOrder.length === targetOrder.length) {
+    const invertedCurrentOrder: number[] = invertIndexValues(currentOrder);
+    transformationOrder = targetOrder.map((value: number) => invertedCurrentOrder[value]);
+  }
+  return transformationOrder;
+}
+
+export function getDataTableHeaders(table: DataTables.DataTable): string[] {
+  const columns: DataTables.ColumnsMethods = table.columns();
+  let headers: string[] = [];
+  if (columns) {
+    // table.columns() return ColumnsMethods which is an array of arrays
+    //eslint-disable-next-line
+    const columnIndexes: number[] = (<any>columns)[0];
+    if (columnIndexes) {
+      headers = columnIndexes.map((value: number) => $(table.columns(value).header()).html());
+    }
+  }
+  return headers;
+}

src/Explorer/Tables/DataTable/DataTableUtilities.ts

@@ -123,3 +123,10 @@ export function checkForDefaultHeader(headers: string[]): boolean {
 export function forceRecalculateTableSize(): void {
   $("body").trigger("resize");
 }
+
+/**
+ * Turns off the spinning progress indicator on the data table.
+ */
+export function turnOffProgressIndicator(): void {
+  $("div.dataTables_processing").hide();
+}

src/Explorer/Tables/DataTable/DataTableViewModel.ts

@@ -1,12 +1,14 @@
-import { ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import * as ko from "knockout";
 import * as _ from "underscore";
-import * as CommonConstants from "../../../Common/Constants";
+
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
-import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
-import NewQueryTablesTab from "../../Tabs/QueryTablesTab/QueryTablesTab";
-import * as Entities from "../Entities";
 import CacheBase from "./CacheBase";
+import * as CommonConstants from "../../../Common/Constants";
+import * as Constants from "../Constants";
+import * as Entities from "../Entities";
+import QueryTablesTab from "../../Tabs/QueryTablesTab";
+import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
+import { QueryIterator, ItemDefinition, Resource } from "@azure/cosmos";
 
 // This is the format of the data we will have to pass to Datatable render callback,
 // and property names are defined by Datatable as well.
@@ -45,11 +47,19 @@ abstract class DataTableViewModel {
   private pendingRedraw = false;
   private lastRedrawTime = new Date().getTime();
 
-  public queryTablesTab: NewQueryTablesTab;
+  private dataTableOperationManager: IDataTableOperation;
+
+  public queryTablesTab: QueryTablesTab;
 
   constructor() {
     this.items([]);
     this.selected([]);
+    // Late bound
+    this.dataTableOperationManager = null;
+  }
+
+  public bind(dataTableOperationManager: IDataTableOperation): void {
+    this.dataTableOperationManager = dataTableOperationManager;
   }
 
   public clearLastSelected(): void {
@@ -91,6 +101,10 @@ abstract class DataTableViewModel {
     }
   }
 
+  public focusDataTable(): void {
+    this.dataTableOperationManager.focusTable();
+  }
+
   public getItemFromSelectedItems(itemKeys: Entities.IProperty[]): Entities.ITableEntity {
     return _.find(this.selected(), (item: Entities.ITableEntity) => {
       return this.matchesKeys(item, itemKeys);
@@ -156,12 +170,35 @@ abstract class DataTableViewModel {
     this.cache.sortOrder = sortOrder;
   }
 
-  protected renderPage(startIndex: number, pageSize: number) {
+  protected renderPage(
+    renderCallBack: any,
+    draw: number,
+    startIndex: number,
+    pageSize: number,
+    oSettings: any,
+    postRenderTasks: (startIndex: number, pageSize: number) => Promise<void> = null
+  ) {
+    this.updatePaginationControls(oSettings);
+
+    // pageSize < 0 means to show all data
     var endIndex = pageSize < 0 ? this.cache.length : startIndex + pageSize;
     var renderData = this.cache.data.slice(startIndex, endIndex);
 
     this.items(renderData);
 
+    var render: IDataTableRenderData = {
+      draw: draw,
+      aaData: renderData,
+      recordsTotal: this.cache.length,
+      recordsFiltered: this.cache.length,
+    };
+
+    if (!!postRenderTasks) {
+      postRenderTasks(startIndex, pageSize).then(() => {
+        this.table.rows().invalidate();
+      });
+    }
+    renderCallBack(render);
     if (this.queryTablesTab.onLoadStartKey != null && this.queryTablesTab.onLoadStartKey != undefined) {
       TelemetryProcessor.traceSuccess(
         Action.Tab,
@@ -180,6 +217,16 @@ abstract class DataTableViewModel {
   protected matchesKeys(item: Entities.ITableEntity, itemKeys: Entities.IProperty[]): boolean {
     return itemKeys.every((property: Entities.IProperty) => {
       var itemValue = item[property.key];
+
+      // if (itemValue && property.subkey) {
+      //     itemValue = itemValue._[property.subkey];
+      //     if (!itemValue) {
+      //         itemValue = "";
+      //     }
+      // } else if (property.subkey) {
+      //     itemValue = "";
+      // }
+
       return this.stringCompare(itemValue._, property.value);
     });
   }
@@ -191,6 +238,27 @@ abstract class DataTableViewModel {
   protected stringCompare(s1: string, s2: string): boolean {
     return s1 === s2;
   }
+
+  private updatePaginationControls(oSettings: any) {
+    var pageInfo = this.table.page.info();
+    var pageSize = pageInfo.length;
+    var paginateElement = $(oSettings.nTableWrapper).find(Constants.htmlSelectors.paginateSelector);
+
+    if (this.allDownloaded) {
+      if (this.cache.length <= pageSize) {
+        // Hide pagination controls if everything fits in one page!.
+        paginateElement.hide();
+      } else {
+        // Enable pagination controls.
+        paginateElement.show();
+        oSettings.oLanguage.oPaginate.sLast = DataTableViewModel.lastPageLabel;
+      }
+    } else {
+      // Enable pagination controls and show load more button.
+      paginateElement.show();
+      oSettings.oLanguage.oPaginate.sLast = DataTableViewModel.loadMoreLabel;
+    }
+  }
 }
 
 interface IDataTableOperation {

src/Explorer/Tables/DataTable/TableCommands.ts

@@ -8,11 +8,11 @@ import TableEntityListViewModel from "./TableEntityListViewModel";
 
 export default class TableCommands {
   // Command Ids
-  public static editEntityCommand: string = "edit";
-  public static deleteEntitiesCommand: string = "delete";
-  public static reorderColumnsCommand: string = "reorder";
-  public static resetColumnsCommand: string = "reset";
-  public static customizeColumnsCommand: string = "customizeColumns";
+  public static editEntityCommand = "edit";
+  public static deleteEntitiesCommand = "delete";
+  public static reorderColumnsCommand = "reorder";
+  public static resetColumnsCommand = "reset";
+  public static customizeColumnsCommand = "customizeColumns";
 
   private _container: Explorer;
 
@@ -21,8 +21,8 @@ export default class TableCommands {
   }
 
   public isEnabled(commandName: string, selectedEntites: Entities.ITableEntity[]): boolean {
-    var singleItemSelected: boolean = DataTableUtilities.containSingleItem(selectedEntites);
-    var atLeastOneItemSelected: boolean = DataTableUtilities.containItems(selectedEntites);
+    const singleItemSelected = DataTableUtilities.containSingleItem(selectedEntites);
+    const atLeastOneItemSelected = DataTableUtilities.containItems(selectedEntites);
     switch (commandName) {
       case TableCommands.editEntityCommand:
         return singleItemSelected;
@@ -47,6 +47,7 @@ export default class TableCommands {
   /**
    * Edit entity
    */
+  //eslint-disable-next-line
   public editEntityCommand(viewModel: TableEntityListViewModel): Q.Promise<any> {
     if (!viewModel) {
       return null; // Error
@@ -56,12 +57,9 @@ export default class TableCommands {
       return null; // Erorr
     }
 
-    var entityToUpdate: Entities.ITableEntity = viewModel.selected()[0];
-    var originalNumberOfProperties = entityToUpdate ? 0 : Object.keys(entityToUpdate).length - 1; // .metadata is always a property for etag
-
     return null;
   }
-
+  //eslint-disable-next-line
   public deleteEntitiesCommand(viewModel: TableEntityListViewModel): Q.Promise<any> {
     if (!viewModel) {
       return null; // Error
@@ -69,7 +67,7 @@ export default class TableCommands {
     if (!DataTableUtilities.containItems(viewModel.selected())) {
       return null; // Error
     }
-    var entitiesToDelete: Entities.ITableEntity[] = viewModel.selected();
+    const entitiesToDelete: Entities.ITableEntity[] = viewModel.selected();
     const deleteMessage: string =
       userContext.apiType === "Cassandra"
         ? "Are you sure you want to delete the selected rows?"
@@ -82,7 +80,7 @@ export default class TableCommands {
       () => {
         viewModel.queryTablesTab.container.tableDataClient
           .deleteDocuments(viewModel.queryTablesTab.collection, entitiesToDelete)
-          .then((results: any) => {
+          .then(() => {
             return viewModel.removeEntitiesFromCache(entitiesToDelete).then(() => {
               viewModel.redrawTableThrottled();
             });
@@ -94,4 +92,8 @@ export default class TableCommands {
 
     return null;
   }
+
+  public resetColumns(viewModel: TableEntityListViewModel): void {
+    viewModel.reloadTable();
+  }
 }

src/Explorer/Tables/DataTable/TableEntityCache.ts

@@ -1,5 +1,5 @@
-import * as Utilities from "../Utilities";
 import * as Entities from "../Entities";
+import * as Utilities from "../Utilities";
 import CacheBase from "./CacheBase";
 
 export default class TableEntityCache extends CacheBase<Entities.ITableEntity> {
@@ -21,7 +21,7 @@ export default class TableEntityCache extends CacheBase<Entities.ITableEntity> {
     this._tableQuery = Utilities.copyTableQuery(tableQuery);
   }
 
-  public preClear() {
+  public preClear(): void {
     this.tableQuery = null;
   }
 }

src/Explorer/Tables/DataTable/TableEntityListViewModel.ts

@@ -6,7 +6,7 @@ import * as ViewModels from "../../../Contracts/ViewModels";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../../UserContext";
-import NewQueryTablesTab from "../../Tabs/QueryTablesTab/QueryTablesTab";
+import QueryTablesTab from "../../Tabs/QueryTablesTab";
 import * as Constants from "../Constants";
 import { getQuotedCqlIdentifier } from "../CqlUtilities";
 import * as Entities from "../Entities";
@@ -101,8 +101,7 @@ export default class TableEntityListViewModel extends DataTableViewModel {
   public useSetting: boolean = true;
 
   //public tableExplorerContext: TableExplorerContext;
-  public notifyColumnChanges: (enablePrompt: boolean, queryTablesTab: NewQueryTablesTab) => void;
-
+  public notifyColumnChanges: (enablePrompt: boolean, queryTablesTab: QueryTablesTab) => void;
   public tablePageStartIndex: number;
   public tableQuery: Entities.ITableQuery = {};
   public cqlQuery: ko.Observable<string>;
@@ -113,7 +112,7 @@ export default class TableEntityListViewModel extends DataTableViewModel {
   public queryErrorMessage: ko.Observable<string>;
   public id: string;
 
-  constructor(tableCommands: TableCommands, queryTablesTab: NewQueryTablesTab) {
+  constructor(tableCommands: TableCommands, queryTablesTab: QueryTablesTab) {
     super();
     this.cache = new TableEntityCache();
     this.queryErrorMessage = ko.observable<string>();
@@ -132,8 +131,24 @@ export default class TableEntityListViewModel extends DataTableViewModel {
     return [{ key: Constants.EntityKeyNames.RowKey, value: rowKey }];
   }
 
+  public reloadTable(useSetting: boolean = true, resetHeaders: boolean = true): DataTables.DataTable {
+    this.clearCache();
+    this.clearSelection();
+    this.isCancelled = false;
+
+    this.useSetting = useSetting;
+    if (resetHeaders) {
+      this.updateHeaders([Constants.defaultHeader]);
+    }
+    return this.table.ajax.reload();
+  }
+
   public updateHeaders(newHeaders: string[], notifyColumnChanges: boolean = false, enablePrompt: boolean = true): void {
     this.headers = newHeaders;
+    if (notifyColumnChanges) {
+      this.clearSelection();
+      this.notifyColumnChanges(enablePrompt, this.queryTablesTab);
+    }
   }
 
   /**
@@ -143,21 +158,40 @@ export default class TableEntityListViewModel extends DataTableViewModel {
    * fnCallback - is the render callback with data to render.
    * oSetting: current settings used for table initialization.
    */
-
-  public async renderNextPageAndupdateCache(): Promise<Entities.ITableEntity[]> {
+  public renderNextPageAndupdateCache(sSource: any, aoData: any, fnCallback: any, oSettings: any) {
     var tablePageSize: number;
+    var draw: number;
     var prefetchNeeded = true;
+    var columnSortOrder: any;
     // Threshold(pages) for triggering cache prefetch.
     // If number remaining pages in cache falls below prefetchThreshold prefetch will be triggered.
     var prefetchThreshold = 10;
     var tableQuery = this.tableQuery;
+
+    for (var index in aoData) {
+      var data = aoData[index];
+      if (data.name === "length") {
+        tablePageSize = data.value;
+      }
+      if (data.name === "start") {
+        this.tablePageStartIndex = data.value;
+      }
+      if (data.name === "draw") {
+        draw = data.value;
+      }
+      if (data.name === "order") {
+        columnSortOrder = data.value;
+      }
+    }
     // Try cache if valid.
     if (this.isCacheValid(tableQuery)) {
       // Check if prefetch needed.
       if (this.tablePageStartIndex + tablePageSize <= this.cache.length || this.allDownloaded) {
         prefetchNeeded = false;
-        this.tablePageStartIndex = 0;
-        this.renderPage(this.tablePageStartIndex, this.cache.length);
+        if (columnSortOrder && (!this.cache.sortOrder || !_.isEqual(this.cache.sortOrder, columnSortOrder))) {
+          this.sortColumns(columnSortOrder, oSettings);
+        }
+        this.renderPage(fnCallback, draw, this.tablePageStartIndex, tablePageSize, oSettings);
         if (
           !this.allDownloaded &&
           this.tablePageStartIndex > 0 && // This is a case now that we can hit this as we re-construct table when we update column
@@ -174,21 +208,41 @@ export default class TableEntityListViewModel extends DataTableViewModel {
 
     if (prefetchNeeded) {
       var downloadSize = tableQuery.top || this.downloadSize;
-      return await this.prefetchAndRender(tableQuery, 0, tablePageSize, downloadSize);
-    } else {
-      return this.cache.data;
+      this.prefetchAndRender(
+        tableQuery,
+        this.tablePageStartIndex,
+        tablePageSize,
+        downloadSize,
+        draw,
+        fnCallback,
+        oSettings,
+        columnSortOrder
+      );
     }
   }
 
   public addEntityToCache(entity: Entities.ITableEntity): Q.Promise<any> {
     // Delay the add operation if we are fetching data from server, so as to avoid race condition.
     if (this.cache.serverCallInProgress) {
-      Utilities.delay(this.pollingInterval).then(() => {
-        this.updateCachedEntity(entity);
+      return Utilities.delay(this.pollingInterval).then(() => {
+        return this.updateCachedEntity(entity);
       });
     }
 
-    this.cache.data.splice(this.cache.length, 0, entity);
+    // Find the first item which is greater than the added entity.
+    var oSettings: any = (<any>this.table).context[0];
+    var index: number = _.findIndex(this.cache.data, (data: any) => {
+      return this.dataComparer(data, entity, this.cache.sortOrder, oSettings) > 0;
+    });
+
+    // If no such item, then insert at last.
+    var insertIndex: number = Utilities.ensureBetweenBounds(
+      index < 0 ? this.cache.length : index,
+      0,
+      this.cache.length
+    );
+
+    this.cache.data.splice(insertIndex, 0, entity);
 
     // Finally, select newly added entity
     this.clearSelection();
@@ -200,8 +254,8 @@ export default class TableEntityListViewModel extends DataTableViewModel {
   public updateCachedEntity(entity: Entities.ITableEntity): Q.Promise<any> {
     // Delay the add operation if we are fetching data from server, so as to avoid race condition.
     if (this.cache.serverCallInProgress) {
-      Utilities.delay(this.pollingInterval).then(() => {
-        this.updateCachedEntity(entity);
+      return Utilities.delay(this.pollingInterval).then(() => {
+        return this.updateCachedEntity(entity);
       });
     }
     var oldEntityIndex: number = _.findIndex(
@@ -221,8 +275,8 @@ export default class TableEntityListViewModel extends DataTableViewModel {
 
     // Delay the remove operation if we are fetching data from server, so as to avoid race condition.
     if (this.cache.serverCallInProgress) {
-      Utilities.delay(this.pollingInterval).then(() => {
-        this.removeEntitiesFromCache(entities);
+      return Utilities.delay(this.pollingInterval).then(() => {
+        return this.removeEntitiesFromCache(entities);
       });
     }
 
@@ -238,6 +292,14 @@ export default class TableEntityListViewModel extends DataTableViewModel {
       });
     this.clearSelection();
 
+    // Show last available page if there is not enough data
+    var pageInfo = this.table.page.info();
+    if (this.cache.length <= pageInfo.start) {
+      var availablePages = Math.ceil(this.cache.length / pageInfo.length);
+      var pageToShow = availablePages > 0 ? availablePages - 1 : 0;
+      this.table.page(pageToShow);
+    }
+
     return Q.resolve(null);
   }
 
@@ -330,75 +392,86 @@ export default class TableEntityListViewModel extends DataTableViewModel {
     });
   }
 
-  private async prefetchAndRender(
+  private prefetchAndRender(
     tableQuery: Entities.ITableQuery,
     tablePageStartIndex: number,
     tablePageSize: number,
-    downloadSize: number
-  ): Promise<Entities.ITableEntity[]> {
+    downloadSize: number,
+    draw: number,
+    renderCallBack: Function,
+    oSettings: any,
+    columnSortOrder: any
+  ): void {
     this.queryErrorMessage(null);
     if (this.cache.serverCallInProgress) {
-      return undefined;
+      return;
     }
-    try {
-      const result = await this.prefetchData(tableQuery, downloadSize, /* currentRetry */ 0);
-      if (!result) {
-        return undefined;
-      }
-      // Cache is assigned using prefetchData
-      var entities = this.cache.data;
-      if (userContext.apiType === "Cassandra" && DataTableUtilities.checkForDefaultHeader(this.headers)) {
-        (<CassandraAPIDataClient>this.queryTablesTab.container.tableDataClient)
-          .getTableSchema(this.queryTablesTab.collection)
-          .then((headers: CassandraTableKey[]) => {
-            this.updateHeaders(
-              headers.map((header) => header.property),
-              true
-            );
-          });
-      } else {
-        var selectedHeadersUnion: string[] = DataTableUtilities.getPropertyIntersectionFromTableEntities(
-          entities,
-          userContext.apiType === "Cassandra"
-        );
-        var newHeaders: string[] = _.difference(selectedHeadersUnion, this.headers);
-        if (newHeaders.length > 0) {
-          // Any new columns found will be added into headers array, which will trigger a re-render of the DataTable.
-          // So there is no need to call it here.
-          this.updateHeaders(newHeaders, /* notifyColumnChanges */ true);
+    this.prefetchData(tableQuery, downloadSize, /* currentRetry */ 0)
+      .then((result: IListTableEntitiesSegmentedResult) => {
+        if (!result) {
+          return;
         }
-      }
-      this.renderPage(tablePageStartIndex, entities.length);
 
-      return result;
-    } catch (error) {
-      const parsedErrors = parseError(error);
-      var errors = parsedErrors.map((error) => {
-        return <ViewModels.QueryError>{
-          message: error.message,
-          start: error.location ? error.location.start : undefined,
-          end: error.location ? error.location.end : undefined,
-          code: error.code,
-          severity: error.severity,
-        };
+        var entities = this.cache.data;
+        if (userContext.apiType === "Cassandra" && DataTableUtilities.checkForDefaultHeader(this.headers)) {
+          (<CassandraAPIDataClient>this.queryTablesTab.container.tableDataClient)
+            .getTableSchema(this.queryTablesTab.collection)
+            .then((headers: CassandraTableKey[]) => {
+              this.updateHeaders(
+                headers.map((header) => header.property),
+                true
+              );
+            });
+        } else {
+          var selectedHeadersUnion: string[] = DataTableUtilities.getPropertyIntersectionFromTableEntities(
+            entities,
+            userContext.apiType === "Cassandra"
+          );
+          var newHeaders: string[] = _.difference(selectedHeadersUnion, this.headers);
+          if (newHeaders.length > 0) {
+            // Any new columns found will be added into headers array, which will trigger a re-render of the DataTable.
+            // So there is no need to call it here.
+            this.updateHeaders(selectedHeadersUnion, /* notifyColumnChanges */ true);
+          } else {
+            if (columnSortOrder) {
+              this.sortColumns(columnSortOrder, oSettings);
+            }
+            this.renderPage(renderCallBack, draw, tablePageStartIndex, tablePageSize, oSettings);
+          }
+        }
+
+        if (result.ExceedMaximumRetries) {
+          var message: string = "We are having trouble getting your data. Please try again."; // localize
+        }
+      })
+      .catch((error: any) => {
+        const parsedErrors = parseError(error);
+        var errors = parsedErrors.map((error) => {
+          return <ViewModels.QueryError>{
+            message: error.message,
+            start: error.location ? error.location.start : undefined,
+            end: error.location ? error.location.end : undefined,
+            code: error.code,
+            severity: error.severity,
+          };
+        });
+        this.queryErrorMessage(errors[0].message);
+        if (this.queryTablesTab.onLoadStartKey != null && this.queryTablesTab.onLoadStartKey != undefined) {
+          TelemetryProcessor.traceFailure(
+            Action.Tab,
+            {
+              databaseName: this.queryTablesTab.collection.databaseId,
+              collectionName: this.queryTablesTab.collection.id(),
+              dataExplorerArea: Areas.Tab,
+              tabTitle: this.queryTablesTab.tabTitle(),
+              error: error,
+            },
+            this.queryTablesTab.onLoadStartKey
+          );
+          this.queryTablesTab.onLoadStartKey = null;
+        }
+        DataTableUtilities.turnOffProgressIndicator();
       });
-      this.queryErrorMessage(errors[0].message);
-      if (this.queryTablesTab.onLoadStartKey != null && this.queryTablesTab.onLoadStartKey != undefined) {
-        TelemetryProcessor.traceFailure(
-          Action.Tab,
-          {
-            databaseName: this.queryTablesTab.collection.databaseId,
-            collectionName: this.queryTablesTab.collection.id(),
-            dataExplorerArea: Areas.Tab,
-            tabTitle: this.queryTablesTab.tabTitle(),
-            error: error,
-          },
-          this.queryTablesTab.onLoadStartKey
-        );
-        this.queryTablesTab.onLoadStartKey = null;
-      }
-    }
-    return undefined;
   }
 
   /**
@@ -412,52 +485,51 @@ export default class TableEntityListViewModel extends DataTableViewModel {
    * Note that this also means that we can get less entities than the requested download size in a successful call.
    * See Microsoft Azure API Documentation at: https://msdn.microsoft.com/en-us/library/azure/dd135718.aspx
    */
-
-  private async prefetchData(
+  private prefetchData(
     tableQuery: Entities.ITableQuery,
     downloadSize: number,
     currentRetry: number = 0
-  ): Promise<any> {
-    var entities: any;
+  ): Q.Promise<any> {
     if (!this.cache.serverCallInProgress) {
       this.cache.serverCallInProgress = true;
       this.allDownloaded = false;
       this.lastPrefetchTime = new Date().getTime();
       var time = this.lastPrefetchTime;
 
-      try {
-        if (this._documentIterator && this.continuationToken) {
-          // TODO handle Cassandra case
-          const fetchNext = await this._documentIterator.fetchNext();
-          let fetchNextEntities: Entities.ITableEntity[] = TableEntityProcessor.convertDocumentsToEntities(
-            fetchNext.resources
-          );
-          let finalEntities: IListTableEntitiesSegmentedResult = <IListTableEntitiesSegmentedResult>{
-            Results: fetchNextEntities,
-            ContinuationToken: this._documentIterator.hasMoreResults(),
-          };
-          entities = finalEntities;
-        } else if (this.continuationToken && userContext.apiType === "Cassandra") {
-          entities = await this.queryTablesTab.container.tableDataClient.queryDocuments(
+      var promise: Q.Promise<IListTableEntitiesSegmentedResult>;
+      if (this._documentIterator && this.continuationToken) {
+        // TODO handle Cassandra case
+
+        promise = Q(this._documentIterator.fetchNext().then((response) => response.resources)).then(
+          (documents: any[]) => {
+            let entities: Entities.ITableEntity[] = TableEntityProcessor.convertDocumentsToEntities(documents);
+            let finalEntities: IListTableEntitiesSegmentedResult = <IListTableEntitiesSegmentedResult>{
+              Results: entities,
+              ContinuationToken: this._documentIterator.hasMoreResults(),
+            };
+            return Q.resolve(finalEntities);
+          }
+        );
+      } else if (this.continuationToken && userContext.apiType === "Cassandra") {
+        promise = Q(
+          this.queryTablesTab.container.tableDataClient.queryDocuments(
             this.queryTablesTab.collection,
             this.cqlQuery(),
             true,
             this.continuationToken
-          );
-        } else {
-          let query = this.sqlQuery();
-          if (userContext.apiType === "Cassandra") {
-            query = this.cqlQuery();
-          }
-          entities = await this.queryTablesTab.container.tableDataClient.queryDocuments(
-            this.queryTablesTab.collection,
-            query,
-            true
-          );
+          )
+        );
+      } else {
+        let query = this.sqlQuery();
+        if (userContext.apiType === "Cassandra") {
+          query = this.cqlQuery();
         }
-
-        const result = entities;
-        if (result) {
+        promise = Q(
+          this.queryTablesTab.container.tableDataClient.queryDocuments(this.queryTablesTab.collection, query, true)
+        );
+      }
+      return promise
+        .then((result: IListTableEntitiesSegmentedResult) => {
           if (!this._documentIterator) {
             this._documentIterator = result.iterator;
           }
@@ -467,14 +539,14 @@ export default class TableEntityListViewModel extends DataTableViewModel {
           // And as another service call is during process, we don't set serverCallInProgress to false here.
           // Thus, end the prefetch.
           if (this.lastPrefetchTime !== time) {
-            return Promise.resolve(undefined);
+            return Q.resolve(null);
           }
 
           var entities = result.Results;
           actualDownloadSize = entities.length;
 
           // Queries can fetch no results and still return a continuation header. See prefetchAndRender() method.
-          this.continuationToken = this.isCancelled ? undefined : result.ContinuationToken;
+          this.continuationToken = this.isCancelled ? null : result.ContinuationToken;
 
           if (!this.continuationToken) {
             this.allDownloaded = true;
@@ -496,20 +568,30 @@ export default class TableEntityListViewModel extends DataTableViewModel {
             this.allDownloaded = true;
           }
 
+          // There are three possible results for a prefetch:
+          // 1. Continuation token is null or fetched items' size reaches predefined.
+          // 2. Continuation token is not null and fetched items' size hasn't reach predefined.
+          //  2.1 Retry times has reached predefined maximum.
+          //  2.2 Retry times hasn't reached predefined maximum.
+          // Correspondingly,
+          // For #1, end prefetch.
+          // For #2.1, set prefetch exceeds maximum retry number and end prefetch.
+          // For #2.2, go to next round prefetch.
           if (this.allDownloaded || nextDownloadSize === 0) {
-            return Promise.resolve(this.cache.data);
+            return Q.resolve(result);
           }
 
           if (currentRetry >= TableEntityListViewModel._maximumNumberOfPrefetchRetries) {
             result.ExceedMaximumRetries = true;
-            return Promise.resolve(this.cache.data);
+            return Q.resolve(result);
           }
           return this.prefetchData(tableQuery, nextDownloadSize, currentRetry + 1);
-        }
-      } catch (error) {
-        this.cache.serverCallInProgress = false;
-        return Promise.reject(error);
-      }
+        })
+        .catch((error: Error) => {
+          this.cache.serverCallInProgress = false;
+          return Q.reject(error);
+        });
     }
+    return null;
   }
 }

src/Explorer/Tables/Entities.ts

@@ -1,4 +1,4 @@
-import { QueryIterator, ItemDefinition, Resource } from "@azure/cosmos";
+import { ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 
 export interface ITableEntity {
   [property: string]: ITableEntityAttribute;
@@ -17,6 +17,7 @@ export interface ITableEntityAttribute {
 
 export interface IListTableEntitiesResult {
   Results: ITableEntity[];
+  //eslint-disable-next-line
   ContinuationToken: any;
   iterator?: QueryIterator<ItemDefinition & Resource>;
 }

src/Explorer/Tables/QueryBuilder/ClauseGroup.ts

@@ -1,8 +1,9 @@
-import QueryClauseViewModel from "./QueryClauseViewModel";
 import * as Utilities from "../Utilities";
+import QueryClauseViewModel from "./QueryClauseViewModel";
 
 export default class ClauseGroup {
   public isRootGroup: boolean;
+  //eslint-disable-next-line
   public children = new Array();
   public parentGroup: ClauseGroup;
   private _id: string;
@@ -17,7 +18,7 @@ export default class ClauseGroup {
    * Flattens the clause tree into an array, depth-first, left to right.
    */
   public flattenClauses(targetArray: ko.ObservableArray<QueryClauseViewModel>): void {
-    var tempArray = new Array<QueryClauseViewModel>();
+    const tempArray = new Array<QueryClauseViewModel>();
 
     this.flattenClausesImpl(this, tempArray);
     targetArray.removeAll();
@@ -31,10 +32,10 @@ export default class ClauseGroup {
       newClause.clauseGroup = this;
       this.children.push(newClause);
     } else {
-      var targetGroup = insertBefore.clauseGroup;
+      const targetGroup = insertBefore.clauseGroup;
 
       if (targetGroup) {
-        var insertBeforeIndex = targetGroup.children.indexOf(insertBefore);
+        const insertBeforeIndex = targetGroup.children.indexOf(insertBefore);
         newClause.clauseGroup = targetGroup;
         targetGroup.children.splice(insertBeforeIndex, 0, newClause);
       }
@@ -42,19 +43,19 @@ export default class ClauseGroup {
   }
 
   public deleteClause(clause: QueryClauseViewModel): void {
-    var targetGroup = clause.clauseGroup;
+    const targetGroup = clause.clauseGroup;
 
     if (targetGroup) {
-      var index = targetGroup.children.indexOf(clause);
+      const index = targetGroup.children.indexOf(clause);
       targetGroup.children.splice(index, 1);
       clause.dispose();
 
       if (targetGroup.children.length <= 1 && !targetGroup.isRootGroup) {
-        var parent = targetGroup.parentGroup;
-        var targetGroupIndex = parent.children.indexOf(targetGroup);
+        const parent = targetGroup.parentGroup;
+        const targetGroupIndex = parent.children.indexOf(targetGroup);
 
         if (targetGroup.children.length === 1) {
-          var orphan = targetGroup.children.shift();
+          const orphan = targetGroup.children.shift();
 
           if (orphan instanceof QueryClauseViewModel) {
             (<QueryClauseViewModel>orphan).clauseGroup = parent;
@@ -71,14 +72,14 @@ export default class ClauseGroup {
   }
 
   public removeAll(): void {
-    var allClauses: QueryClauseViewModel[] = new Array<QueryClauseViewModel>();
+    const allClauses: QueryClauseViewModel[] = new Array<QueryClauseViewModel>();
 
     this.flattenClausesImpl(this, allClauses);
 
     while (allClauses.length > 0) {
       allClauses.shift().dispose();
     }
-
+    //eslint-disable-next-line
     this.children = new Array<any>();
   }
 
@@ -87,12 +88,12 @@ export default class ClauseGroup {
    */
   public groupSelectedItems(): boolean {
     // Find the selection start & end, also check for gaps between selected items (if found, cannot proceed).
-    var selection = this.getCheckedItemsInfo();
+    const selection = this.getCheckedItemsInfo();
 
     if (selection.canGroup) {
-      var newGroup = new ClauseGroup(false, this);
+      const newGroup = new ClauseGroup(false, this);
       // Replace the selected items with the new group, and then move the selected items into the new group.
-      var groupedItems = this.children.splice(selection.begin, selection.end - selection.begin + 1, newGroup);
+      const groupedItems = this.children.splice(selection.begin, selection.end - selection.begin + 1, newGroup);
 
       groupedItems &&
         groupedItems.forEach((element) => {
@@ -118,13 +119,13 @@ export default class ClauseGroup {
       return;
     }
 
-    var parentGroup = this.parentGroup;
-    var index = parentGroup.children.indexOf(this);
+    const parentGroup = this.parentGroup;
+    let index = parentGroup.children.indexOf(this);
 
     if (index >= 0) {
       parentGroup.children.splice(index, 1);
 
-      var toPromote = this.children.splice(0, this.children.length);
+      const toPromote = this.children.splice(0, this.children.length);
 
       // Move all children one level up.
       toPromote &&
@@ -146,16 +147,16 @@ export default class ClauseGroup {
   }
 
   public findDeepestGroupInChildren(skipIndex?: number): ClauseGroup {
-    var deepest: ClauseGroup = this;
-    var level: number = 0;
-    var func = (currentGroup: ClauseGroup): void => {
+    let deepest = <ClauseGroup>this;
+    let level = 0;
+    const func = (currentGroup: ClauseGroup): void => {
       level++;
       if (currentGroup.getCurrentGroupDepth() > deepest.getCurrentGroupDepth()) {
         deepest = currentGroup;
       }
 
-      for (var i = 0; i < currentGroup.children.length; i++) {
-        var currentItem = currentGroup.children[i];
+      for (let i = 0; i < currentGroup.children.length; i++) {
+        const currentItem = currentGroup.children[i];
 
         if ((i !== skipIndex || level > 1) && currentItem instanceof ClauseGroup) {
           func(currentItem);
@@ -170,16 +171,16 @@ export default class ClauseGroup {
   }
 
   private getCheckedItemsInfo(): { canGroup: boolean; begin: number; end: number } {
-    var beginIndex = -1;
-    var endIndex = -1;
+    let beginIndex = -1;
+    let endIndex = -1;
     // In order to perform group, all selected items must be next to each other.
     // If one or more items are not selected between the first and the last selected item, the gapFlag will be set to True, meaning cannot perform group.
-    var gapFlag = false;
-    var count = 0;
+    let gapFlag = false;
+    let count = 0;
 
-    for (var i = 0; i < this.children.length; i++) {
-      var currentItem = this.children[i];
-      var subGroupSelectionState: { allSelected: boolean; partiallySelected: boolean; nonSelected: boolean };
+    for (let i = 0; i < this.children.length; i++) {
+      const currentItem = this.children[i];
+      let subGroupSelectionState: { allSelected: boolean; partiallySelected: boolean; nonSelected: boolean };
 
       if (currentItem instanceof ClauseGroup) {
         subGroupSelectionState = (<ClauseGroup>currentItem).getSelectionState();
@@ -235,10 +236,10 @@ export default class ClauseGroup {
   }
 
   private getSelectionState(): { allSelected: boolean; partiallySelected: boolean; nonSelected: boolean } {
-    var selectedCount = 0;
+    let selectedCount = 0;
 
-    for (var i = 0; i < this.children.length; i++) {
-      var currentItem = this.children[i];
+    for (let i = 0; i < this.children.length; i++) {
+      const currentItem = this.children[i];
 
       if (currentItem instanceof ClauseGroup && (<ClauseGroup>currentItem).getSelectionState().allSelected) {
         selectedCount++;
@@ -260,8 +261,8 @@ export default class ClauseGroup {
   }
 
   private unselectAll(): void {
-    for (var i = 0; i < this.children.length; i++) {
-      var currentItem = this.children[i];
+    for (let i = 0; i < this.children.length; i++) {
+      const currentItem = this.children[i];
 
       if (currentItem instanceof ClauseGroup) {
         (<ClauseGroup>currentItem).unselectAll();
@@ -278,8 +279,8 @@ export default class ClauseGroup {
       targetArray.splice(0, targetArray.length);
     }
 
-    for (var i = 0; i < queryGroup.children.length; i++) {
-      var currentItem = queryGroup.children[i];
+    for (let i = 0; i < queryGroup.children.length; i++) {
+      const currentItem = queryGroup.children[i];
 
       if (currentItem instanceof ClauseGroup) {
         this.flattenClausesImpl(currentItem, targetArray);
@@ -292,13 +293,13 @@ export default class ClauseGroup {
   }
 
   public getTreeDepth(): number {
-    var currentDepth = this.getCurrentGroupDepth();
+    let currentDepth = this.getCurrentGroupDepth();
 
-    for (var i = 0; i < this.children.length; i++) {
-      var currentItem = this.children[i];
+    for (let i = 0; i < this.children.length; i++) {
+      const currentItem = this.children[i];
 
       if (currentItem instanceof ClauseGroup) {
-        var newDepth = (<ClauseGroup>currentItem).getTreeDepth();
+        const newDepth = (<ClauseGroup>currentItem).getTreeDepth();
 
         if (newDepth > currentDepth) {
           currentDepth = newDepth;
@@ -310,8 +311,8 @@ export default class ClauseGroup {
   }
 
   public getCurrentGroupDepth(): number {
-    var group = <ClauseGroup>this;
-    var depth = 0;
+    let group = <ClauseGroup>this;
+    let depth = 0;
 
     while (!group.isRootGroup) {
       depth++;

src/Explorer/Tables/QueryBuilder/ClauseGroupViewModel.ts

@@ -1,7 +1,7 @@
 import * as ko from "knockout";
+import * as Constants from "../Constants";
 import ClauseGroup from "./ClauseGroup";
 import QueryBuilderViewModel from "./QueryBuilderViewModel";
-import * as Constants from "../Constants";
 
 /**
  * View model for showing group indicators on UI, contains information such as group color and border styles.
@@ -38,7 +38,7 @@ export default class ClauseGroupViewModel {
   };
 
   private getGroupBackgroundColor(group: ClauseGroup): string {
-    var colorCount = Constants.clauseGroupColors.length;
+    const colorCount = Constants.clauseGroupColors.length;
 
     if (group.isRootGroup) {
       return Constants.transparentColor;

src/Explorer/Tables/QueryBuilder/QueryBuilderViewModel.ts

@@ -1,7 +1,6 @@
 import * as ko from "knockout";
 import { KeyCodes } from "../../../Common/Constants";
 import { userContext } from "../../../UserContext";
-import { IQueryTableRowsType } from "../../Tabs/QueryTablesTab/QueryTableTabUtils";
 import * as Constants from "../Constants";
 import { getQuotedCqlIdentifier } from "../CqlUtilities";
 import * as DataTableUtilities from "../DataTable/DataTableUtilities";
@@ -30,7 +29,7 @@ export default class QueryBuilderViewModel {
   public removeThisFilterLine = "Remove this filter line"; // localize
   public groupSelectedClauses = "Group selected clauses"; // localize
   public clauseArray = ko.observableArray<QueryClauseViewModel>(); // This is for storing the clauses in flattened form queryClauses for easier UI data binding.
-  public queryClauses = new ClauseGroup(true, null); // The actual data structure containing the clause information.
+  public queryClauses = new ClauseGroup(true, undefined); // The actual data structure containing the clause information.
   public columnOptions: ko.ObservableArray<string>;
   public canGroupClauses = ko.observable<boolean>(false);
 
@@ -107,14 +106,14 @@ export default class QueryBuilderViewModel {
     });
   }
 
-  public setExample(pk: string, rk: string) {
-    var example1 = new QueryClauseViewModel(
+  public setExample() {
+    const example1 = new QueryClauseViewModel(
       this,
       "",
       "PartitionKey",
       this.edmTypes()[0],
       Constants.Operator.Equal,
-      pk,
+      this.tableEntityListViewModel.items()[0].PartitionKey._,
       false,
       "",
       "",
@@ -122,13 +121,13 @@ export default class QueryBuilderViewModel {
       //null,
       true
     );
-    var example2 = new QueryClauseViewModel(
+    const example2 = new QueryClauseViewModel(
       this,
       "And",
       "RowKey",
       this.edmTypes()[0],
       Constants.Operator.Equal,
-      rk,
+      this.tableEntityListViewModel.items()[0].RowKey._,
       true,
       "",
       "",
@@ -140,32 +139,41 @@ export default class QueryBuilderViewModel {
     this.addClauseImpl(example2, 1);
   }
 
-  public getODataFilterFromClauses = (queryClauses: IQueryTableRowsType[]): string => {
-    var filterString: string = "";
-    if (queryClauses != undefined) {
-      for (var i = 0; i < queryClauses.length; i++) {
-        var currentItem = queryClauses[i];
+  public getODataFilterFromClauses = (): string => {
+    let filterString = "";
+    const treeTraversal = (group: ClauseGroup): void => {
+      for (let i = 0; i < group.children.length; i++) {
+        const currentItem = group.children[i];
 
-        this.timestampToValue(currentItem);
-        filterString = filterString.concat(
-          this.constructODataClause(
-            filterString === "" ? "" : currentItem.selectedOperation,
-            this.generateLeftParentheses(currentItem),
-            currentItem.selectedField,
-            currentItem.selectedEntityType,
-            currentItem.selectedOperator,
-            currentItem.entityValue,
-            this.generateRightParentheses(currentItem)
-          )
-        );
+        if (currentItem instanceof QueryClauseViewModel) {
+          const clause = <QueryClauseViewModel>currentItem;
+          this.timestampToValue(clause);
+          filterString = filterString.concat(
+            this.constructODataClause(
+              filterString === "" ? "" : clause.and_or(),
+              this.generateLeftParentheses(clause),
+              clause.field(),
+              clause.type(),
+              clause.operator(),
+              clause.value(),
+              this.generateRightParentheses(clause)
+            )
+          );
+        }
+
+        if (currentItem instanceof ClauseGroup) {
+          treeTraversal(<ClauseGroup>currentItem);
+        }
       }
-    }
+    };
+
+    treeTraversal(this.queryClauses);
 
     return filterString.trim();
   };
 
-  public getSqlFilterFromClauses = (queryTableRows: IQueryTableRowsType[]): string => {
-    var filterString: string = "SELECT * FROM c";
+  public getSqlFilterFromClauses = (): string => {
+    let filterString = "SELECT * FROM c";
     if (this._queryViewModel.selectText() && this._queryViewModel.selectText().length > 0) {
       filterString = "SELECT";
       const selectText = this._queryViewModel && this._queryViewModel.selectText && this._queryViewModel.selectText();
@@ -187,41 +195,52 @@ export default class QueryBuilderViewModel {
         });
       filterString = filterString.concat(" FROM c");
     }
-    if (queryTableRows.length === 0) {
+    if (this.queryClauses.children.length === 0) {
       return filterString;
     }
     filterString = filterString.concat(" WHERE");
-    var first = true;
-    for (var i = 0; i < queryTableRows.length; i++) {
-      var currentItem = queryTableRows[i];
+    let first = true;
+    const treeTraversal = (group: ClauseGroup): void => {
+      for (let i = 0; i < group.children.length; i++) {
+        const currentItem = group.children[i];
 
-      let timeStampValue: string = this.timestampToSqlValue(currentItem);
-      var value = currentItem.entityValue;
-      if (!currentItem.isValue) {
-        value = timeStampValue;
+        if (currentItem instanceof QueryClauseViewModel) {
+          const clause = <QueryClauseViewModel>currentItem;
+          const timeStampValue: string = this.timestampToSqlValue(clause);
+          let value = clause.value();
+          if (!clause.isValue()) {
+            value = timeStampValue;
+          }
+          filterString = filterString.concat(
+            this.constructSqlClause(
+              first ? "" : clause.and_or(),
+              this.generateLeftParentheses(clause),
+              clause.field(),
+              clause.type(),
+              clause.operator(),
+              value,
+              this.generateRightParentheses(clause)
+            )
+          );
+          first = false;
+        }
+
+        if (currentItem instanceof ClauseGroup) {
+          treeTraversal(<ClauseGroup>currentItem);
+        }
       }
-      filterString = filterString.concat(
-        this.constructSqlClause(
-          first ? "" : currentItem.selectedOperation,
-          this.generateLeftParentheses(currentItem),
-          currentItem.selectedField,
-          currentItem.selectedEntityType,
-          currentItem.selectedOperator,
-          value,
-          this.generateRightParentheses(currentItem)
-        )
-      );
-      first = false;
-    }
+    };
+
+    treeTraversal(this.queryClauses);
 
     return filterString.trim();
   };
 
-  public getCqlFilterFromClauses = (queryTableRows: IQueryTableRowsType[]): string => {
+  public getCqlFilterFromClauses = (): string => {
     const databaseId = this._queryViewModel.queryTablesTab.collection.databaseId;
     const collectionId = this._queryViewModel.queryTablesTab.collection.id();
     const tableToQuery = `${getQuotedCqlIdentifier(databaseId)}.${getQuotedCqlIdentifier(collectionId)}`;
-    var filterString: string = `SELECT * FROM ${tableToQuery}`;
+    let filterString = `SELECT * FROM ${tableToQuery}`;
     if (this._queryViewModel.selectText() && this._queryViewModel.selectText().length > 0) {
       filterString = "SELECT";
       const selectText = this._queryViewModel && this._queryViewModel.selectText && this._queryViewModel.selectText();
@@ -232,44 +251,55 @@ export default class QueryBuilderViewModel {
         });
       filterString = filterString.concat(` FROM ${tableToQuery}`);
     }
-    if (queryTableRows === undefined || queryTableRows.length === 0) {
+    if (this.queryClauses.children.length === 0) {
       return filterString;
     }
     filterString = filterString.concat(" WHERE");
-    var first = true;
-    for (var i = 0; i < queryTableRows.length; i++) {
-      var currentItem = queryTableRows[i];
+    let first = true;
+    const treeTraversal = (group: ClauseGroup): void => {
+      for (let i = 0; i < group.children.length; i++) {
+        const currentItem = group.children[i];
 
-      let timeStampValue: string = this.timestampToSqlValue(currentItem);
-      var value = currentItem.entityValue;
-      if (!currentItem.isValue) {
-        value = timeStampValue;
+        if (currentItem instanceof QueryClauseViewModel) {
+          const clause = <QueryClauseViewModel>currentItem;
+          const timeStampValue = this.timestampToSqlValue(clause);
+          let value = clause.value();
+          if (!clause.isValue()) {
+            value = timeStampValue;
+          }
+          filterString = filterString.concat(
+            this.constructCqlClause(
+              first ? "" : clause.and_or(),
+              this.generateLeftParentheses(clause),
+              clause.field(),
+              clause.type(),
+              clause.operator(),
+              value,
+              this.generateRightParentheses(clause)
+            )
+          );
+          first = false;
+        }
+
+        if (currentItem instanceof ClauseGroup) {
+          treeTraversal(<ClauseGroup>currentItem);
+        }
       }
-      filterString = filterString.concat(
-        this.constructCqlClause(
-          first ? "" : currentItem.selectedOperation,
-          this.generateLeftParentheses(currentItem),
-          currentItem.selectedField,
-          currentItem.selectedEntityType,
-          currentItem.selectedOperator,
-          value,
-          this.generateRightParentheses(currentItem)
-        )
-      );
-      first = false;
-    }
+    };
+
+    treeTraversal(this.queryClauses);
 
     return filterString.trim();
   };
 
   public updateColumnOptions = (): void => {
-    let originalHeaders = this.columnOptions();
-    let newHeaders = this.tableEntityListViewModel.headers;
+    // let originalHeaders = this.columnOptions();
+    const newHeaders = this.tableEntityListViewModel.headers;
     this.columnOptions(newHeaders.sort(DataTableUtilities.compareTableColumns));
   };
 
-  private generateLeftParentheses(clause: IQueryTableRowsType): string {
-    var result = "";
+  private generateLeftParentheses(clause: QueryClauseViewModel): string {
+    let result = "";
 
     if (clause.clauseGroup.isRootGroup || clause.clauseGroup.children.indexOf(clause) !== 0) {
       return result;
@@ -277,7 +307,7 @@ export default class QueryBuilderViewModel {
       result = result.concat("(");
     }
 
-    var currentGroup: ClauseGroup = clause.clauseGroup;
+    let currentGroup: ClauseGroup = clause.clauseGroup;
 
     while (
       !currentGroup.isRootGroup &&
@@ -291,8 +321,8 @@ export default class QueryBuilderViewModel {
     return result;
   }
 
-  private generateRightParentheses(clause: IQueryTableRowsType): string {
-    var result = "";
+  private generateRightParentheses(clause: QueryClauseViewModel): string {
+    let result = "";
 
     if (
       clause.clauseGroup.isRootGroup ||
@@ -303,7 +333,7 @@ export default class QueryBuilderViewModel {
       result = result.concat(")");
     }
 
-    var currentGroup: ClauseGroup = clause.clauseGroup;
+    let currentGroup: ClauseGroup = clause.clauseGroup;
 
     while (
       !currentGroup.isRootGroup &&
@@ -334,14 +364,17 @@ export default class QueryBuilderViewModel {
       case Constants.TableType.String:
         return ` ${clauseRule.toLowerCase()} ${leftParentheses}${propertyName} ${this.operatorConverter(
           operator
+          // eslint-disable-next-line no-useless-escape
         )} \'${value}\'${rightParentheses}`;
       case Constants.TableType.Guid:
         return ` ${clauseRule.toLowerCase()} ${leftParentheses}${propertyName} ${this.operatorConverter(
           operator
+          // eslint-disable-next-line no-useless-escape
         )} guid\'${value}\'${rightParentheses}`;
       case Constants.TableType.Binary:
         return ` ${clauseRule.toLowerCase()} ${leftParentheses}${propertyName} ${this.operatorConverter(
           operator
+          // eslint-disable-next-line no-useless-escape
         )} binary\'${value}\'${rightParentheses}`;
       default:
         return ` ${clauseRule.toLowerCase()} ${leftParentheses}${propertyName} ${this.operatorConverter(
@@ -361,9 +394,11 @@ export default class QueryBuilderViewModel {
   ): string => {
     if (propertyName === Constants.EntityKeyNames.PartitionKey) {
       propertyName = TableEntityProcessor.keyProperties.PartitionKey;
+      // eslint-disable-next-line no-useless-escape
       return ` ${clauseRule.toLowerCase()} ${leftParentheses}c["${propertyName}"] ${operator} \'${value}\'${rightParentheses}`;
     } else if (propertyName === Constants.EntityKeyNames.RowKey) {
       propertyName = TableEntityProcessor.keyProperties.Id;
+      // eslint-disable-next-line no-useless-escape
       return ` ${clauseRule.toLowerCase()} ${leftParentheses}c.${propertyName} ${operator} \'${value}\'${rightParentheses}`;
     } else if (propertyName === Constants.EntityKeyNames.Timestamp) {
       propertyName = TableEntityProcessor.keyProperties.Timestamp;
@@ -373,16 +408,21 @@ export default class QueryBuilderViewModel {
     }
     switch (type) {
       case Constants.TableType.DateTime:
+        // eslint-disable-next-line no-useless-escape
         return ` ${clauseRule.toLowerCase()} ${leftParentheses}c.${propertyName}["$v"] ${operator} \'${DateTimeUtilities.convertJSDateToTicksWithPadding(
           value
+          // eslint-disable-next-line no-useless-escape
         )}\'${rightParentheses}`;
       case Constants.TableType.Int64:
+        // eslint-disable-next-line no-useless-escape
         return ` ${clauseRule.toLowerCase()} ${leftParentheses}c.${propertyName}["$v"] ${operator} \'${Utilities.padLongWithZeros(
           value
+          // eslint-disable-next-line no-useless-escape
         )}\'${rightParentheses}`;
       case Constants.TableType.String:
       case Constants.TableType.Guid:
       case Constants.TableType.Binary:
+        // eslint-disable-next-line no-useless-escape
         return ` ${clauseRule.toLowerCase()} ${leftParentheses}c.${propertyName}["$v"] ${operator} \'${value}\'${rightParentheses}`;
       default:
         return ` ${clauseRule.toLowerCase()} ${leftParentheses}c.${propertyName}["$v"] ${operator} ${value}${rightParentheses}`;
@@ -404,6 +444,7 @@ export default class QueryBuilderViewModel {
       type === Constants.CassandraType.Ascii ||
       type === Constants.CassandraType.Varchar
     ) {
+      // eslint-disable-next-line no-useless-escape
       return ` ${clauseRule.toLowerCase()} ${leftParentheses} ${propertyName} ${operator} \'${value}\'${rightParentheses}`;
     }
     return ` ${clauseRule.toLowerCase()} ${leftParentheses} ${propertyName} ${operator} ${value}${rightParentheses}`;
@@ -424,7 +465,7 @@ export default class QueryBuilderViewModel {
       case Constants.Operator.NotEqualTo:
         return Constants.ODataOperator.NotEqualTo;
     }
-    return null;
+    return undefined;
   };
 
   public groupClauses = (): void => {
@@ -433,11 +474,11 @@ export default class QueryBuilderViewModel {
     this.updateCanGroupClauses();
   };
 
-  public addClauseIndex = (index: number, data: any): void => {
+  public addClauseIndex = (index: number): void => {
     if (index < 0) {
       index = 0;
     }
-    var newClause = new QueryClauseViewModel(
+    const newClause = new QueryClauseViewModel(
       this,
       "And",
       "",
@@ -462,28 +503,28 @@ export default class QueryBuilderViewModel {
 
   // adds a new clause to the end of the array
   public addNewClause = (): void => {
-    this.addClauseIndex(this.clauseArray().length, null);
+    this.addClauseIndex(this.clauseArray().length);
   };
 
-  public onAddClauseKeyDown = (index: number, data: any, event: KeyboardEvent, source: any): boolean => {
+  public onAddClauseKeyDown = (index: number, event: KeyboardEvent): boolean => {
     if (event.keyCode === KeyCodes.Enter || event.keyCode === KeyCodes.Space) {
-      this.addClauseIndex(index, data);
+      this.addClauseIndex(index);
       event.stopPropagation();
       return false;
     }
     return true;
   };
 
-  public onAddNewClauseKeyDown = (event: React.KeyboardEvent<HTMLDivElement>): boolean => {
+  public onAddNewClauseKeyDown = (event: KeyboardEvent): boolean => {
     if (event.keyCode === KeyCodes.Enter || event.keyCode === KeyCodes.Space) {
-      this.addClauseIndex(this.clauseArray().length - 1, null);
+      this.addClauseIndex(this.clauseArray().length - 1);
       event.stopPropagation();
       return false;
     }
     return true;
   };
 
-  public deleteClause = (index: number, data: any): void => {
+  public deleteClause = (index: number): void => {
     this.deleteClauseImpl(index);
     if (this.clauseArray().length !== 0) {
       this.clauseArray()[0].and_or("");
@@ -493,9 +534,9 @@ export default class QueryBuilderViewModel {
     $(window).resize();
   };
 
-  public onDeleteClauseKeyDown = (index: number, data: any, event: KeyboardEvent, source: any): boolean => {
+  public onDeleteClauseKeyDown = (index: number, event: KeyboardEvent): boolean => {
     if (event.keyCode === KeyCodes.Enter || event.keyCode === KeyCodes.Space) {
-      this.deleteClause(index, data);
+      this.deleteClause(index);
       event.stopPropagation();
       return false;
     }
@@ -509,25 +550,26 @@ export default class QueryBuilderViewModel {
    * (transparent) or its parent group view models.
    */
   public getClauseGroupViewModels = (clause: QueryClauseViewModel): ClauseGroupViewModel[] => {
-    var placeHolderGroupViewModel = new ClauseGroupViewModel(this.queryClauses, false, this);
-    var treeDepth = this.queryClauses.getTreeDepth();
-    var groupViewModels = new Array<ClauseGroupViewModel>(treeDepth);
+    const placeHolderGroupViewModel = new ClauseGroupViewModel(this.queryClauses, false, this);
+    const treeDepth = this.queryClauses.getTreeDepth();
+    const groupViewModels = new Array<ClauseGroupViewModel>(treeDepth);
 
     // Prefill the arry with placeholders.
-    for (var i = 0; i < groupViewModels.length; i++) {
+    for (let i = 0; i < groupViewModels.length; i++) {
       groupViewModels[i] = placeHolderGroupViewModel;
     }
 
-    var currentGroup = clause.clauseGroup;
+    let currentGroup = clause.clauseGroup;
 
     // This function determines whether the path from clause to the current group is on the left most.
-    var isLeftMostPath = (): boolean => {
-      var group = clause.clauseGroup;
+    const isLeftMostPath = (): boolean => {
+      let group = clause.clauseGroup;
 
       if (group.children.indexOf(clause) !== 0) {
         return false;
       }
 
+      // eslint-disable-next-line no-constant-condition
       while (true) {
         if (group.getId() === currentGroup.getId()) {
           break;
@@ -543,13 +585,14 @@ export default class QueryBuilderViewModel {
     };
 
     // This function determines whether the path from clause to the current group is on the right most.
-    var isRightMostPath = (): boolean => {
-      var group = clause.clauseGroup;
+    const isRightMostPath = (): boolean => {
+      let group = clause.clauseGroup;
 
       if (group.children.indexOf(clause) !== group.children.length - 1) {
         return false;
       }
 
+      // eslint-disable-next-line no-constant-condition
       while (true) {
         if (group.getId() === currentGroup.getId()) {
           break;
@@ -564,26 +607,26 @@ export default class QueryBuilderViewModel {
       return true;
     };
 
-    var vmIndex = groupViewModels.length - 1;
-    var skipIndex = -1;
-    var lastDepth = clause.groupDepth;
+    let vmIndex = groupViewModels.length - 1;
+    let skipIndex = -1;
+    let lastDepth = clause.groupDepth;
 
     while (!currentGroup.isRootGroup) {
       // The current group will be rendered at least once, and if there are any sibling groups deeper
       // than the current group, we will repeat rendering the current group to fill up the gap between
       // current & deepest sibling.
-      var deepestInSiblings = currentGroup.findDeepestGroupInChildren(skipIndex).getCurrentGroupDepth();
+      const deepestInSiblings = currentGroup.findDeepestGroupInChildren(skipIndex).getCurrentGroupDepth();
       // Find out the depth difference between the deepest group under the siblings of currentGroup and
       // the deepest group under currentGroup. If the result n is a positive number, it means there are
       // deeper groups in siblings and we need to draw n + 1 group blocks on UI to fill up the depth
       // differences. If the result n is a negative number, it means current group contains the deepest
       // sub-group, we only need to draw the group block once.
-      var repeatCount = Math.max(deepestInSiblings - lastDepth, 0);
+      const repeatCount = Math.max(deepestInSiblings - lastDepth, 0);
 
-      for (var i = 0; i <= repeatCount; i++) {
-        var isLeftMost = isLeftMostPath();
-        var isRightMost = isRightMostPath();
-        var groupViewModel = new ClauseGroupViewModel(currentGroup, i === 0 && isLeftMost, this);
+      for (let i = 0; i <= repeatCount; i++) {
+        const isLeftMost = isLeftMostPath();
+        const isRightMost = isRightMostPath();
+        const groupViewModel = new ClauseGroupViewModel(currentGroup, i === 0 && isLeftMost, this);
 
         groupViewModel.showTopBorder(isLeftMost);
         groupViewModel.showBottomBorder(isRightMost);
@@ -600,11 +643,16 @@ export default class QueryBuilderViewModel {
     return groupViewModels;
   };
 
-  public addCustomRange(timestamp: CustomTimestampHelper.ITimestampQuery, clauseToAdd: QueryClauseViewModel): void {
-    var index = this.clauseArray.peek().indexOf(clauseToAdd);
+  public runQuery = (): DataTables.DataTable => {
+    return this._queryViewModel.runQuery();
+  };
 
-    var newClause = new QueryClauseViewModel(
+  public addCustomRange(timestamp: CustomTimestampHelper.ITimestampQuery, clauseToAdd: QueryClauseViewModel): void {
+    const index = this.clauseArray.peek().indexOf(clauseToAdd);
+
+    const newClause = new QueryClauseViewModel(
       this,
+      //this._tableEntityListViewModel.tableExplorerContext.hostProxy,
       "And",
       clauseToAdd.field(),
       "DateTime",
@@ -627,10 +675,10 @@ export default class QueryBuilderViewModel {
   }
 
   private scrollToBottom(): void {
-    var scrollBox = document.getElementById("scroll");
+    const scrollBox = document.getElementById("scroll");
     if (!this.scrollEventListener) {
       scrollBox.addEventListener("scroll", function () {
-        var translate = "translate(0," + this.scrollTop + "px)";
+        const translate = "translate(0," + this.scrollTop + "px)";
         const allTh = <NodeListOf<HTMLElement>>this.querySelectorAll("thead td");
         for (let i = 0; i < allTh.length; i++) {
           allTh[i].style.transform = translate;
@@ -638,7 +686,7 @@ export default class QueryBuilderViewModel {
       });
       this.scrollEventListener = true;
     }
-    var isScrolledToBottom = scrollBox.scrollHeight - scrollBox.clientHeight <= scrollBox.scrollHeight + 1;
+    const isScrolledToBottom = scrollBox.scrollHeight - scrollBox.clientHeight <= scrollBox.scrollHeight + 1;
     if (isScrolledToBottom) {
       scrollBox.scrollTop = scrollBox.scrollHeight - scrollBox.clientHeight;
     }
@@ -650,8 +698,8 @@ export default class QueryBuilderViewModel {
   }
 
   private deleteClauseImpl(index: number): void {
-    var clause = this.clauseArray()[index];
-    var previousClause = index === 0 ? 0 : index - 1;
+    const clause = this.clauseArray()[index];
+    const previousClause = index === 0 ? 0 : index - 1;
     this.queryClauses.deleteClause(clause);
     this.updateClauseArray();
     if (this.clauseArray()[previousClause]) {
@@ -678,67 +726,67 @@ export default class QueryBuilderViewModel {
     //DataTableUtilities.forceRecalculateTableSize();
   }
 
-  private timestampToValue(clause: IQueryTableRowsType): void {
-    if (clause.isValue) {
+  private timestampToValue(clause: QueryClauseViewModel): void {
+    if (clause.isValue()) {
       return;
-    } else if (clause.isTimestamp) {
+    } else if (clause.isTimestamp()) {
       this.getTimeStampToQuery(clause);
       // } else if (clause.isCustomLastTimestamp()) {
       //     clause.value(`datetime'${CustomTimestampHelper._queryLastTime(clause.customLastTimestamp().lastNumber, clause.customLastTimestamp().lastTimeUnit)}'`);
-    } else if (clause.isCustomRangeTimestamp) {
-      if (clause.isLocal) {
-        clause.entityValue = `datetime'${DateTimeUtilities.getUTCDateTime(clause.customTimeValue)}'`;
+    } else if (clause.isCustomRangeTimestamp()) {
+      if (clause.isLocal()) {
+        clause.value(`datetime'${DateTimeUtilities.getUTCDateTime(clause.customTimeValue())}'`);
       } else {
-        clause.entityValue = `datetime'${clause.customTimeValue}Z'`;
+        clause.value(`datetime'${clause.customTimeValue()}Z'`);
       }
     }
   }
 
-  private timestampToSqlValue(clause: IQueryTableRowsType): string {
-    if (clause.isValue) {
-      return null;
-    } else if (clause.isTimestamp) {
+  private timestampToSqlValue(clause: QueryClauseViewModel): string {
+    if (clause.isValue()) {
+      return undefined;
+    } else if (clause.isTimestamp()) {
       return this.getTimeStampToSqlQuery(clause);
       // } else if (clause.isCustomLastTimestamp()) {
       //     clause.value(CustomTimestampHelper._queryLastTime(clause.customLastTimestamp().lastNumber, clause.customLastTimestamp().lastTimeUnit));
-    } else if (clause.isCustomRangeTimestamp) {
-      if (clause.isLocal) {
-        return DateTimeUtilities.getUTCDateTime(clause.customTimeValue);
+    } else if (clause.isCustomRangeTimestamp()) {
+      if (clause.isLocal()) {
+        return DateTimeUtilities.getUTCDateTime(clause.customTimeValue());
       } else {
-        return clause.customTimeValue;
+        return clause.customTimeValue();
       }
     }
-    return null;
+    return undefined;
   }
 
-  private getTimeStampToQuery(clause: IQueryTableRowsType): void {
-    switch (clause.timeValue) {
+  private getTimeStampToQuery(clause: QueryClauseViewModel): void {
+    switch (clause.timeValue()) {
       case Constants.timeOptions.lastHour:
-        clause.entityValue = `datetime'${CustomTimestampHelper._queryLastDaysHours(0, 1)}'`;
+        clause.value(`datetime'${CustomTimestampHelper._queryLastDaysHours(0, 1)}'`);
         break;
       case Constants.timeOptions.last24Hours:
-        clause.entityValue = `datetime'${CustomTimestampHelper._queryLastDaysHours(0, 24)}'`;
+        clause.value(`datetime'${CustomTimestampHelper._queryLastDaysHours(0, 24)}'`);
         break;
       case Constants.timeOptions.last7Days:
-        clause.entityValue = `datetime'${CustomTimestampHelper._queryLastDaysHours(7, 0)}'`;
+        clause.value(`datetime'${CustomTimestampHelper._queryLastDaysHours(7, 0)}'`);
         break;
       case Constants.timeOptions.last31Days:
-        clause.entityValue = `datetime'${CustomTimestampHelper._queryLastDaysHours(31, 0)}'`;
+        clause.value(`datetime'${CustomTimestampHelper._queryLastDaysHours(31, 0)}'`);
         break;
       case Constants.timeOptions.last365Days:
-        clause.entityValue = `datetime'${CustomTimestampHelper._queryLastDaysHours(365, 0)}'`;
+        clause.value(`datetime'${CustomTimestampHelper._queryLastDaysHours(365, 0)}'`);
         break;
       case Constants.timeOptions.currentMonth:
-        clause.entityValue = `datetime'${CustomTimestampHelper._queryCurrentMonthLocal()}'`;
+        clause.value(`datetime'${CustomTimestampHelper._queryCurrentMonthLocal()}'`);
         break;
       case Constants.timeOptions.currentYear:
-        clause.entityValue = `datetime'${CustomTimestampHelper._queryCurrentYearLocal()}'`;
+        clause.value(`datetime'${CustomTimestampHelper._queryCurrentYearLocal()}'`);
         break;
     }
   }
 
-  private getTimeStampToSqlQuery(clause: IQueryTableRowsType): string {
-    switch (clause.timeValue) {
+  private getTimeStampToSqlQuery(clause: QueryClauseViewModel): string {
+    switch (clause.timeValue()) {
       case Constants.timeOptions.lastHour:
         return CustomTimestampHelper._queryLastDaysHours(0, 1);
       case Constants.timeOptions.last24Hours:
@@ -754,7 +802,7 @@ export default class QueryBuilderViewModel {
       case Constants.timeOptions.currentYear:
         return CustomTimestampHelper._queryCurrentYearLocal();
     }
-    return null;
+    return undefined;
   }
 
   public checkIfClauseChanged(): void {

src/Explorer/Tables/QueryBuilder/QueryClauseViewModel.ts

@@ -14,7 +14,7 @@ export default class QueryClauseViewModel {
   public field: ko.Observable<string>;
   public type: ko.Observable<string>;
   public operator: ko.Observable<string>;
-  public value: ko.Observable<any>;
+  public value: ko.Observable<string>;
   public timeValue: ko.Observable<string>;
   public customTimeValue: ko.Observable<string>;
   public canAnd: ko.Observable<boolean>;
@@ -39,7 +39,7 @@ export default class QueryClauseViewModel {
     field: string,
     type: string,
     operator: string,
-    value: any,
+    value: string,
     canAnd: boolean,
     timeValue: string,
     customTimeValue: string,
@@ -88,30 +88,30 @@ export default class QueryClauseViewModel {
         userContext.apiType !== "Cassandra"
     );
 
-    this.and_or.subscribe((value) => {
+    this.and_or.subscribe(() => {
       this._queryBuilderViewModel.checkIfClauseChanged();
     });
-    this.field.subscribe((value) => {
+    this.field.subscribe(() => {
       this.changeField();
     });
-    this.type.subscribe((value) => {
+    this.type.subscribe(() => {
       this.changeType();
     });
-    this.timeValue.subscribe((value) => {
+    this.timeValue.subscribe(() => {
       // if (this.timeValue() === QueryBuilderConstants.timeOptions.custom) {
       //     this.customTimestampDialog();
       // }
     });
-    this.customTimeValue.subscribe((value) => {
+    this.customTimeValue.subscribe(() => {
       this._queryBuilderViewModel.checkIfClauseChanged();
     });
-    this.value.subscribe((value) => {
+    this.value.subscribe(() => {
       this._queryBuilderViewModel.checkIfClauseChanged();
     });
-    this.operator.subscribe((value) => {
+    this.operator.subscribe(() => {
       this._queryBuilderViewModel.checkIfClauseChanged();
     });
-    this._groupCheckSubscription = this.checkedForGrouping.subscribe((value) => {
+    this._groupCheckSubscription = this.checkedForGrouping.subscribe(() => {
       this._queryBuilderViewModel.updateCanGroupClauses();
     });
     this.isAndOrFocused = ko.observable<boolean>(false);
@@ -280,7 +280,7 @@ export default class QueryClauseViewModel {
       this._groupCheckSubscription.dispose();
     }
 
-    this.clauseGroup = null;
-    this._queryBuilderViewModel = null;
+    this.clauseGroup = undefined;
+    this._queryBuilderViewModel = undefined;
   }
 }

src/Explorer/Tables/QueryBuilder/QueryViewModel.tsx

@@ -5,8 +5,7 @@ import { KeyCodes } from "../../../Common/Constants";
 import { useSidePanel } from "../../../hooks/useSidePanel";
 import { userContext } from "../../../UserContext";
 import { TableQuerySelectPanel } from "../../Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel";
-import NewQueryTablesTab from "../../Tabs/QueryTablesTab/QueryTablesTab";
-import { IQueryTableRowsType } from "../../Tabs/QueryTablesTab/QueryTableTabUtils";
+import QueryTablesTab from "../../Tabs/QueryTablesTab";
 import { getQuotedCqlIdentifier } from "../CqlUtilities";
 import * as DataTableUtilities from "../DataTable/DataTableUtilities";
 import TableEntityListViewModel from "../DataTable/TableEntityListViewModel";
@@ -40,14 +39,14 @@ export default class QueryViewModel {
 
   public columnOptions: ko.ObservableArray<string>;
 
-  public queryTablesTab: NewQueryTablesTab;
+  public queryTablesTab: QueryTablesTab;
   public id: string;
   private _tableEntityListViewModel: TableEntityListViewModel;
 
-  constructor(queryTablesTab: NewQueryTablesTab) {
+  constructor(queryTablesTab: QueryTablesTab) {
     this.queryTablesTab = queryTablesTab;
     this.id = `queryViewModel${this.queryTablesTab.tabId}`;
-    this._tableEntityListViewModel = queryTablesTab.tableEntityListViewModel;
+    this._tableEntityListViewModel = queryTablesTab.tableEntityListViewModel();
 
     this.queryTextIsReadOnly = ko.computed<boolean>(() => {
       return userContext.apiType !== "Cassandra";
@@ -104,7 +103,7 @@ export default class QueryViewModel {
     DataTableUtilities.forceRecalculateTableSize();
   };
 
-  public toggleAdvancedOptions = (): void => {
+  public toggleAdvancedOptions = () => {
     this.isExpanded(!this.isExpanded());
     if (this.isExpanded()) {
       this.focusTopResult(true);
@@ -127,19 +126,23 @@ export default class QueryViewModel {
     return this.selectText();
   };
 
-  private setFilter = (queryTableRows?: IQueryTableRowsType[]): string => {
+  private setFilter = (): string => {
     const queryString = this.isEditorActive()
       ? this.queryText()
       : userContext.apiType === "Cassandra"
-      ? this.queryBuilderViewModel().getCqlFilterFromClauses(queryTableRows)
-      : this.queryBuilderViewModel().getODataFilterFromClauses(queryTableRows);
+      ? this.queryBuilderViewModel().getCqlFilterFromClauses()
+      : this.queryBuilderViewModel().getODataFilterFromClauses();
     const filter = queryString;
     this.queryText(filter);
     return this.queryText();
   };
 
-  private setSqlFilter = (queryTableRows: IQueryTableRowsType[]): string => {
-    return this.queryBuilderViewModel().getSqlFilterFromClauses(queryTableRows);
+  private setSqlFilter = (): string => {
+    return this.queryBuilderViewModel().getSqlFilterFromClauses();
+  };
+
+  private setCqlFilter = (): string => {
+    return this.queryBuilderViewModel().getCqlFilterFromClauses();
   };
 
   public isHelperEnabled = ko
@@ -155,9 +158,8 @@ export default class QueryViewModel {
       notify: "always",
     });
 
-  public runQuery = (queryTableRows: IQueryTableRowsType[]): string => {
-    let filter = this.setFilter(queryTableRows);
-
+  public runQuery = (): DataTables.DataTable => {
+    let filter = this.setFilter();
     if (filter && userContext.apiType !== "Cassandra") {
       filter = filter.replace(/"/g, "'");
     }
@@ -168,15 +170,13 @@ export default class QueryViewModel {
     this._tableEntityListViewModel.tableQuery.top = top;
     this._tableEntityListViewModel.tableQuery.select = select;
     this._tableEntityListViewModel.oDataQuery(filter);
-    this._tableEntityListViewModel.sqlQuery(this.setSqlFilter(queryTableRows));
+    this._tableEntityListViewModel.sqlQuery(this.setSqlFilter());
     this._tableEntityListViewModel.cqlQuery(filter);
 
-    return userContext.apiType !== "Cassandra"
-      ? this._tableEntityListViewModel.sqlQuery()
-      : this._tableEntityListViewModel.cqlQuery();
+    return this._tableEntityListViewModel.reloadTable(/*useSetting*/ false, /*resetHeaders*/ false);
   };
 
-  public clearQuery = (): void => {
+  public clearQuery = (): DataTables.DataTable => {
     this.queryText();
     this.topValue();
     this.selectText();
@@ -194,26 +194,16 @@ export default class QueryViewModel {
         this.queryTablesTab.collection.id()
       )}`
     );
+    return this._tableEntityListViewModel.reloadTable(false);
   };
 
-  public selectQueryOptions(headers: string[], getSelectMessage: (selectMessage: string) => void): void {
-    this.columnOptions(headers);
-    useSidePanel
-      .getState()
-      .openSidePanel(
-        "Select Column",
-        <TableQuerySelectPanel queryViewModel={this} headers={headers} getSelectMessage={getSelectMessage} />
-      );
+  public selectQueryOptions() {
+    useSidePanel.getState().openSidePanel("Select Column", <TableQuerySelectPanel queryViewModel={this} />);
   }
 
-  public onselectQueryOptionsKeyDown = (
-    source: string,
-    event: KeyboardEvent,
-    headers: string[],
-    getSelectMessage: (selectMessage: string) => void
-  ): boolean => {
+  public onselectQueryOptionsKeyDown = (source: string, event: KeyboardEvent): boolean => {
     if (event.keyCode === KeyCodes.Enter || event.keyCode === KeyCodes.Space) {
-      this.selectQueryOptions(headers, getSelectMessage);
+      this.selectQueryOptions();
       event.stopPropagation();
       return false;
     }

src/Explorer/Tables/TableDataClient.ts

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

src/Explorer/Tabs/NotebookTabBase.ts

@@ -17,6 +17,7 @@ export interface NotebookTabBaseOptions extends ViewModels.TabOptions {
 
 /**
  * Every notebook-based tab inherits from this class. It holds the static reference to a notebook client (singleton)
+ * Re-initiating the constructor when ever a new container got allocated.
  */
 export default class NotebookTabBase extends TabsBase {
   protected static clientManager: NotebookClientV2;
@@ -27,6 +28,15 @@ export default class NotebookTabBase extends TabsBase {
 
     this.container = options.container;
 
+    useNotebook.subscribe(
+      () => {
+        const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+        if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint) {
+          NotebookTabBase.clientManager = undefined;
+        }
+      },
+      (state) => state.notebookServerInfo
+    );
     if (!NotebookTabBase.clientManager) {
       NotebookTabBase.clientManager = new NotebookClientV2({
         connectionInfo: useNotebook.getState().notebookServerInfo,

src/Explorer/Tabs/NotebookV2Tab.ts

@@ -53,14 +53,16 @@ export default class NotebookTabV2 extends NotebookTabBase {
       onUpdateKernelInfo: this.onKernelUpdate,
     });
   }
-
-  public onCloseTabButtonClick(): Q.Promise<any> {
+  /*
+   * Hard cleaning the workspace(Closing tabs connected with old container connection) when new container got allocated.
+   */
+  public onCloseTabButtonClick(hardClose = false): Q.Promise<any> {
     const cleanup = () => {
       this.notebookComponentAdapter.notebookShutdown();
       super.onCloseTabButtonClick();
     };
 
-    if (this.notebookComponentAdapter.isContentDirty()) {
+    if (this.notebookComponentAdapter.isContentDirty() && hardClose === false) {
       useDialog
         .getState()
         .showOkCancelModalDialog(
@@ -118,7 +120,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
     const saveButtonChildren = [];
     if (this.container.notebookManager?.gitHubOAuthService.isLoggedIn()) {
       saveButtonChildren.push({
-        iconName: "Copy",
+        iconName: copyToLabel,
         onCommandClick: () => this.copyNotebook(),
         commandButtonLabel: copyToLabel,
         hasPopup: false,

src/Explorer/Tabs/QueryTablesTab.html

@@ -0,0 +1,273 @@
+<div class="tab-pane tableContainer" data-bind="attr:{id: tabId}" role="tabpanel">
+  <!-- Tables Query Tab Query Builder - Start-->
+  <div
+    class="query-builder"
+    data-bind="with: queryViewModel, attr: {
+                                                id: queryViewModel.id
+                                            }"
+  >
+    <!-- Tables Query Tab Errors - Start-->
+    <div class="error-bar">
+      <div class="error-message" aria-label="Error Message" data-bind="visible: hasQueryError">
+        <span><img class="entity-error-Img" src="/error_red.svg" /></span>
+        <span class="error-text" role="alert" data-bind="text: queryErrorMessage"></span>
+      </div>
+    </div>
+    <!-- Tables Query Tab Errors - End-->
+    <!-- Tables Query Tab Query Text - Start-->
+    <div class="query-editor-panel" data-bind="visible: isEditorActive">
+      <div>
+        <textarea
+          class="query-editor-text"
+          data-bind="textInput: queryText,
+                css: { 'query-editor-text-invalid': hasQueryError },
+                readOnly: true"
+          name="query-editor"
+          rows="5"
+          cols="100"
+        ></textarea>
+      </div>
+    </div>
+    <!-- Tables Query Tab Query Text - End-->
+    <!-- Tables Query Tab Query Helper - Start-->
+    <div data-bind="visible: isHelperActive" style="padding-left: 13px">
+      <div class="clause-table" data-bind="with: queryBuilderViewModel ">
+        <div class="scroll-box scrollable" id="scroll">
+          <table class="clause-table">
+            <thead>
+              <tr class="clause-table-row">
+                <th class="clause-table-cell header-background action-header">
+                  <span data-bind="text: actionLabel"></span>
+                </th>
+                <th class="clause-table-cell header-background group-control-header">
+                  <button
+                    type="button"
+                    data-bind="enable: canGroupClauses, attr:{title: groupSelectedClauses}, click: groupClauses"
+                  >
+                    <img class="and-or-svg" src="/And-Or.svg" alt="Group selected clauses" />
+                  </button>
+                </th>
+                <th class="clause-table-cell header-background">
+                  <!-- Grouping indicator -->
+                </th>
+                <th class="clause-table-cell header-background and-or-header">
+                  <span data-bind="text: andLabel"></span>
+                </th>
+                <th class="clause-table-cell header-background field-header">
+                  <span data-bind="text: fieldLabel"></span>
+                </th>
+                <th class="clause-table-cell header-background type-header">
+                  <span data-bind="text: dataTypeLabel"></span>
+                </th>
+                <th class="clause-table-cell header-background operator-header">
+                  <span data-bind="text: operatorLabel"></span>
+                </th>
+                <th class="clause-table-cell header-background value-header">
+                  <span data-bind="text: valueLabel"></span>
+                </th>
+              </tr>
+            </thead>
+            <tbody data-bind="template: { name: 'queryClause-template', foreach: clauseArray, as: 'clause' }"></tbody>
+          </table>
+        </div>
+        <div
+          class="addClause"
+          role="button"
+          data-bind="click: addNewClause, event: { keydown: onAddNewClauseKeyDown }, attr: { title: addNewClauseLine }"
+          tabindex="0"
+        >
+          <div class="addClause-heading">
+            <span class="clause-table addClause-title">
+              <img
+                class="addclauseProperty-Img"
+                style="margin-bottom: 5px"
+                src="/Add-property.svg"
+                alt="Add new clause"
+              />
+              <span style="margin-left: 5px" data-bind="text: addNewClauseLine"></span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- Tables Query Tab Query Helper - End-->
+    <!-- Tables Query Tab Advanced Options - Start-->
+    <div class="advanced-options-panel">
+      <div class="advanced-heading">
+        <span
+          class="advanced-title"
+          role="button"
+          data-bind="click:toggleAdvancedOptions, event: { keydown: ontoggleAdvancedOptionsKeyDown }, attr:{ 'aria-expanded': isExpanded() ? 'true' : 'false' }"
+          tabindex="0"
+        >
+          <!-- ko template: { ifnot: isExpanded} -->
+          <div class="themed-images" type="text/html" id="ExpandChevronRight" data-bind="hasFocus: focusExpandIcon">
+            <img class="imgiconwidth expand-triangle expand-triangle-right" src="/Triangle-right.svg" alt="toggle" />
+          </div>
+          <!-- /ko -->
+          <!-- ko template: { if: isExpanded} -->
+          <div class="themed-images" type="text/html" id="ExpandChevronDown">
+            <img class="imgiconwidth expand-triangle" src="/Triangle-down.svg" alt="toggle" />
+          </div>
+          <!-- /ko -->
+          <span>Advanced Options</span>
+        </span>
+      </div>
+      <div class="advanced-options" data-bind="visible: isExpanded">
+        <div class="top">
+          <span>Show top results:</span>
+          <input
+            class="top-input"
+            type="number"
+            data-bind="hasFocus: focusTopResult, textInput: topValue, attr: { title: topValueLimitMessage }"
+            role="textbox"
+            aria-label="Show top results"
+          />
+          <div role="alert" aria-atomic="true" class="inline-div" data-bind="visible: isExceedingLimit">
+            <img class="advanced-options-icon" src="/QueryBuilder/StatusWarning_16x.png" />
+            <span data-bind="text: topValueLimitMessage"></span>
+          </div>
+        </div>
+        <div class="select">
+          <span> Select fields for query: </span>
+          <div data-bind="visible: isSelected">
+            <img class="advanced-options-icon" src="/QueryBuilder/QueryInformation_16x.png" />
+            <span class="select-options-text" data-bind="text: selectMessage" />
+          </div>
+          <a
+            class="select-options-link"
+            data-bind="click: selectQueryOptions, event: { keydown: onselectQueryOptionsKeyDown }"
+            tabindex="0"
+            role="button"
+          >
+            <span>Choose Columns... </span>
+          </a>
+        </div>
+      </div>
+    </div>
+    <!-- Tables Query Tab Advanced Options - End-->
+  </div>
+  <!-- Tables Query Tab Query Builder - End-->
+  <div
+    class="tablesQueryTab tableContainer"
+    data-bind="with: tableEntityListViewModel, attr: {
+                                                id: tableEntityListViewModel.id
+                                            }"
+  >
+    <!-- Keyboard navigation - tabindex is required to make the table focusable. -->
+    <table
+      id="storageTable"
+      class="storage azure-table show-gridlines"
+      tabindex="0"
+      data-bind="tableSource: items, tableSelection: selected"
+    ></table>
+  </div>
+</div>
+
+<!-- Script for each clause in the tables query builder -->
+<script type="text/html" id="queryClause-template">
+  <tr class="clause-table-row">
+    <td class="clause-table-cell action-column">
+      <span
+        class="entity-Add-Cancel"
+        role="button"
+        tabindex="0"
+        data-bind="click: $parent.addClauseIndex.bind($data, $index()), event: { keydown: $parent.onAddClauseKeyDown.bind($data, $index()) }, attr:{title: $parent.insertNewFilterLine}"
+      >
+        <img class="querybuilder-addpropertyImg" src="/Add-property.svg" alt="Add clause" />
+      </span>
+      <span
+        class="entity-Add-Cancel"
+        role="button"
+        tabindex="0"
+        data-bind="hasFocus: isDeleteButtonFocused, click: $parent.deleteClause.bind($data, $index()), event: { keydown: $parent.onDeleteClauseKeyDown.bind($data, $index()) }, attr:{title: $parent.removeThisFilterLine}"
+      >
+        <img class="querybuilder-cancelImg" src="/Entity_cancel.svg" alt="Delete clause" />
+      </span>
+    </td>
+    <td class="clause-table-cell group-control-column">
+      <input type="checkbox" aria-label="And/Or" data-bind="checked: checkedForGrouping" />
+    </td>
+    <td>
+      <table class="group-indicator-table">
+        <tbody>
+          <tr
+            data-bind="template: { name: 'groupIndicator-template', foreach: $parent.getClauseGroupViewModels($data), as: 'gi' }"
+          ></tr>
+        </tbody>
+      </table>
+    </td>
+    <td class="clause-table-cell and-or-column">
+      <select
+        class="clause-table-field and-or-column"
+        data-bind="hasFocus: isAndOrFocused, options: $parent.clauseRules, value: and_or, visible: canAnd, attr:{ 'aria-label': and_or }"
+      ></select>
+    </td>
+    <td class="clause-table-cell field-column" data-bind="click: $parent.updateColumnOptions">
+      <select
+        class="clause-table-field field-column"
+        data-bind="options: $parent.columnOptions, value: field, attr:{ 'aria-label': field }"
+      ></select>
+    </td>
+    <td class="clause-table-cell type-column">
+      <select
+        class="clause-table-field type-column"
+        data-bind="
+                  options: $parent.edmTypes,
+                  enable: isTypeEditable,
+                  value: type,
+                  css: {'query-builder-isDisabled': !isTypeEditable()},
+                  attr: { 'aria-label': type }"
+      ></select>
+    </td>
+    <td class="clause-table-cell operator-column">
+      <select
+        class="clause-table-field operator-column"
+        data-bind="
+                  options: $parent.operators,
+                  enable: isOperaterEditable,
+                  value: operator,
+                  css: {'query-builder-isDisabled': !isOperaterEditable()},
+                  attr: { 'aria-label': operator }"
+      ></select>
+    </td>
+    <td class="clause-table-cell value-column">
+      <!-- ko template: {if: isValue} -->
+      <input
+        type="text"
+        class="clause-table-field value-column"
+        type="search"
+        data-bind="textInput: value, attr: {'aria-label': $parent.valueLabel}"
+      />
+      <!-- /ko -->
+
+      <!-- ko template: {if: isTimestamp} -->
+      <select
+        class="clause-table-field time-column"
+        data-bind="options: $parent.timeOptions, value: timeValue"
+      ></select>
+      <!-- /ko -->
+
+      <!-- ko template: {if: isCustomLastTimestamp} -->
+      <input class="clause-table-field time-column" data-bind="value: customTimeValue, click: customTimestampDialog" />
+      <!-- /ko -->
+      <!-- ko template: {if: isCustomRangeTimestamp} -->
+      <input class="clause-table-field time-column" type="datetime-local" step="1" data-bind="value: customTimeValue" />
+      <!-- /ko -->
+    </td>
+  </tr>
+</script>
+
+<!-- Script for each clause group in the tables query builder -->
+<script type="text/html" id="groupIndicator-template">
+  <td
+    class="group-indicator-column"
+    data-bind="style: {backgroundColor: gi.backgroundColor, borderTop: gi.showTopBorder.peek() ? 'solid thin #CCCCCC' : 'none', borderLeft: gi.showLeftBorder.peek() ? 'solid thin #CCCCCC' : 'none', borderBottom: gi.showBottomBorder.peek() ? 'solid thin #CCCCCC' : gi.borderBackgroundColor}"
+  >
+    <!-- ko template: {if: gi.canUngroup} -->
+    <button type="button" data-bind="click: ungroupClauses, attr: {title: ungroupClausesLabel}">
+      <img src="/QueryBuilder/UngroupClause_16x.png" alt="Ungroup clauses" />
+    </button>
+    <!-- /ko -->
+  </td>
+</script>