Fixed eslint issue of githuvClient and NotebookRenderer files

2025-12-23 10:51:30 +00:00 · 2021-10-05 13:29:21 +05:30
125 changed files with 8100 additions and 7141 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -81,9 +81,17 @@ 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/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
@@ -98,7 +106,6 @@ src/Explorer/Tabs/ScriptTabBase.ts
 src/Explorer/Tabs/TabComponents.ts
 src/Explorer/Tabs/TabsBase.ts
 src/Explorer/Tabs/TriggerTab.ts
-src/Explorer/Tabs/UserDefinedFunctionTab.ts
 src/Explorer/Tree/AccessibleVerticalList.ts
 src/Explorer/Tree/Collection.ts
 src/Explorer/Tree/ConflictId.ts
@@ -107,12 +114,15 @@ 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
 src/Shared/DefaultExperienceUtility.test.ts
 src/Shared/DefaultExperienceUtility.ts
@@ -130,14 +140,20 @@ 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/NotebookRenderer.tsx
+src/Explorer/Notebook/NotebookRenderer/NotebookReadOnlyRenderer.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/hijack-scroll/index.tsx
 src/Explorer/Notebook/NotebookRenderer/decorators/kbd-shortcuts/index.tsx
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -39,6 +39,7 @@ module.exports = {
    "@typescript-eslint/switch-exhaustiveness-check": "error",
    "@typescript-eslint/no-unused-vars": "error",
    "@typescript-eslint/no-extraneous-class": "error",
+    "no-null/no-null": "error",
    "@typescript-eslint/no-explicit-any": "error",
    "prefer-arrow/prefer-arrow-functions": ["error", { allowStandaloneDeclarations: true }],
    eqeqeq: "error",
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,8 +12,7 @@
        "--inspect-brk",
        "${workspaceRoot}/node_modules/jest/bin/jest.js",
        "--runInBand",
-        "--coverage",
-        "false"
+        "--coverage", "false"
      ],
      "console": "integratedTerminal",
      "internalConsoleOptions": "neverOpen",
@@ -27,8 +26,7 @@
        "--inspect-brk",
        "${workspaceRoot}/node_modules/jest/bin/jest.js",
        "${fileBasenameNoExtension}",
-        "--coverage",
-        "false",
+        "--coverage", "false",
        // "--watch",
        // // --no-cache only used to make --watch work. Otherwise jest ignores the breakpoints.
        // // https://github.com/facebook/jest/issues/6683
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -22,6 +22,5 @@
  "editor.codeActionsOnSave": {
    "source.fixAll.eslint": true,
    "source.organizeImports": true
-  },
-  "typescript.preferences.importModuleSpecifier": "non-relative"
+  }
 }
--- a/configs/mpac.json
+++ b/configs/mpac.json
@@ -1,4 +1,3 @@
 {
-  "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com",
-  "isTerminalEnabled" : true
+  "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com"
 }
--- a/configs/prod.json
+++ b/configs/prod.json
@@ -1,4 +1,3 @@
 {
- "JUNO_ENDPOINT": "https://tools.cosmos.azure.com",
- "isTerminalEnabled" : false
+ "JUNO_ENDPOINT": "https://tools.cosmos.azure.com"
 }
--- a/jest.config.js
+++ b/jest.config.js
@@ -37,8 +37,8 @@ module.exports = {
    global: {
      branches: 25,
      functions: 25,
-      lines: 29,
-      statements: 29,
+      lines: 29.5,
+      statements: 29.5,
    },
  },

@@ -129,8 +129,6 @@ module.exports = {
  // The test environment that will be used for testing
  // testEnvironment: "jest-environment-jsdom",

-  modulePaths: ["node_modules", "<rootDir>/src"],
-
  // Options that will be passed to the testEnvironment
  // testEnvironmentOptions: {},

--- a/less/documentDB.less
+++ b/less/documentDB.less
@@ -2077,7 +2077,7 @@ a:link {
 .resourceTreeAndTabs {
  display: flex;
  flex: 1 1 auto;
-  overflow-x: clip;
+  overflow-x: auto;
  overflow-y: auto;
  height: 100%;
 }
@@ -2245,7 +2245,7 @@ a:link {
 }

 .refreshColHeader {
-  padding: 3px 6px 10px 0px !important;
+  padding: 3px 6px 6px 6px;
 }

 .refreshColHeader:hover {
@@ -2869,6 +2869,7 @@ a:link {
  }
 }

+settings-pane {
  .settingsSection {
    border-bottom: 1px solid @BaseMedium;
    margin-right: 24px;
@@ -2876,7 +2877,6 @@ a:link {

    &:first-child {
      padding-top: 0px;
-    padding-bottom: 10px;
    }

    &:last-child {
@@ -2889,19 +2889,11 @@ a:link {

    .settingsSectionLabel {
      margin-bottom: @DefaultSpace;
-    margin-right: 5px;
    }

    .pageOptionsPart {
      padding-bottom: @MediumSpace;
    }
-
-  .legendLabel {
-    border-bottom: 0px;
-    width: auto;
-    font-size: @mediumFontSize;
-    display: inline !important;
-    float: left;
  }
 }

--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -96,9 +96,7 @@ export class Flights {
  public static readonly AutoscaleTest = "autoscaletest";
  public static readonly PartitionKeyTest = "partitionkeytest";
  public static readonly PKPartitionKeyTest = "pkpartitionkeytest";
-  public static readonly PhoenixNotebooks = "phoenixnotebooks";
-  public static readonly PhoenixFeatures = "phoenixfeatures";
-  public static readonly NotebooksDownBanner = "notebooksdownbanner";
+  public static readonly Phoenix = "phoenix";
 }

 export class AfecFeatures {
@@ -345,12 +343,7 @@ export enum ConnectionStatusType {
  Connecting = "Connecting",
  Connected = "Connected",
  Failed = "Connection Failed",
-  Reconnect = "Reconnect",
-}
-
-export enum ContainerStatusType {
-  Active = "Active",
-  Disconnected = "Disconnected",
+  ReConnect = "Reconnect",
 }

 export const EmulatorMasterKey =
@@ -363,25 +356,20 @@ export const StyleConstants = require("less-vars-loader!../../less/Common/Consta
 export class Notebook {
  public static readonly defaultBasePath = "./notebooks";
  public static readonly heartbeatDelayMs = 60000;
-  public static readonly containerStatusHeartbeatDelayMs = 30000;
  public static readonly kernelRestartInitialDelayMs = 1000;
  public static readonly kernelRestartMaxDelayMs = 20000;
-  public static readonly autoSaveIntervalMs = 300000;
+  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 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.";
-  public static newNotebookModalTitle = "Create notebook in temporary workspace";
-  public static newNotebookUploadModalTitle = "Upload notebook to temporary workspace";
+    "This notebook will be saved in the temporary workspace and will be removed when the session expires. To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends.";
+  public static newNotebookModalTitle = "Create Notebook in temporary workspace";
+  public static newNotebookUploadModalTitle = "Upload Notebook in temporary workspace";
  public static newNotebookModalContent1 =
    "A temporary workspace will be created to enable you to work with notebooks. When the session expires, any notebooks in the workspace will be removed.";
  public static newNotebookModalContent2 =
@@ -413,11 +401,3 @@ 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";
-}
--- a/src/Common/CosmosClient.ts
+++ b/src/Common/CosmosClient.ts
@@ -1,6 +1,5 @@
 import * as Cosmos from "@azure/cosmos";
 import { RequestInfo, setAuthorizationTokenHeaderUsingMasterKey } from "@azure/cosmos";
-import { CosmosHeaders } from "@azure/cosmos/dist-esm";
 import { configContext, Platform } from "../ConfigContext";
 import { userContext } from "../UserContext";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
@@ -78,21 +77,10 @@ export async function getTokenFromAuthService(verb: string, resourceType: string
  }
 }

-// The Capability is a bitmap, which cosmosdb backend decodes as per the below enum
-enum SDKSupportedCapabilities {
-  None = 0,
-  PartitionMerge = 1 << 0,
-}
-
 let _client: Cosmos.CosmosClient;

 export function client(): Cosmos.CosmosClient {
  if (_client) return _client;
-
-  let _defaultHeaders: CosmosHeaders = {};
-  _defaultHeaders["x-ms-cosmos-sdk-supported-capabilities"] =
-    SDKSupportedCapabilities.None | SDKSupportedCapabilities.PartitionMerge;
-
  const options: Cosmos.CosmosClientOptions = {
    endpoint: endpoint() || "https://cosmos.azure.com", // CosmosClient gets upset if we pass a bad URL. This should never actually get called
    key: userContext.masterKey,
@@ -101,7 +89,6 @@ export function client(): Cosmos.CosmosClient {
      enableEndpointDiscovery: false,
    },
    userAgentSuffix: "Azure Portal",
-    defaultHeaders: _defaultHeaders,
  };

  if (configContext.PROXY_PATH !== undefined) {
--- a/src/Common/MongoProxyClient.test.ts
+++ b/src/Common/MongoProxyClient.test.ts
@@ -236,12 +236,13 @@ describe("MongoProxyClient", () => {
    });

    it("returns a production endpoint", () => {
-      const endpoint = getEndpoint("https://main.documentdb.ext.azure.com");
+      const endpoint = getEndpoint();
      expect(endpoint).toEqual("https://main.documentdb.ext.azure.com/api/mongo/explorer");
    });

    it("returns a development endpoint", () => {
-      const endpoint = getEndpoint("https://localhost:1234");
+      updateConfigContext({ MONGO_BACKEND_ENDPOINT: "https://localhost:1234" });
+      const endpoint = getEndpoint();
      expect(endpoint).toEqual("https://localhost:1234/api/mongo/explorer");
    });

@@ -249,7 +250,7 @@ describe("MongoProxyClient", () => {
      updateUserContext({
        authType: AuthType.EncryptedToken,
      });
-      const endpoint = getEndpoint("https://main.documentdb.ext.azure.com");
+      const endpoint = getEndpoint();
      expect(endpoint).toEqual("https://main.documentdb.ext.azure.com/api/guest/mongo/explorer");
    });
  });
--- a/src/Common/MongoProxyClient.ts
+++ b/src/Common/MongoProxyClient.ts
@@ -1,6 +1,5 @@
 import { Constants as CosmosSDKConstants } from "@azure/cosmos";
 import queryString from "querystring";
-import { allowedMongoProxyEndpoints, validateEndpoint } from "Utils/EndpointValidation";
 import { AuthType } from "../AuthType";
 import { configContext } from "../ConfigContext";
 import * as DataModels from "../Contracts/DataModels";
@@ -337,17 +336,14 @@ export function createMongoCollectionWithProxy(
 }

 export function getFeatureEndpointOrDefault(feature: string): string {
-  const endpoint =
-    hasFlag(userContext.features.mongoProxyAPIs, feature) &&
-    validateEndpoint(userContext.features.mongoProxyEndpoint, allowedMongoProxyEndpoints)
-      ? userContext.features.mongoProxyEndpoint
-      : configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT;
-
-  return getEndpoint(endpoint);
+  return hasFlag(userContext.features.mongoProxyAPIs, feature)
+    ? getEndpoint(userContext.features.mongoProxyEndpoint)
+    : getEndpoint();
 }

-export function getEndpoint(endpoint: string): string {
-  let url = endpoint + "/api/mongo/explorer";
+export function getEndpoint(customEndpoint?: string): string {
+  let url = customEndpoint ? customEndpoint : configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT;
+  url += "/api/mongo/explorer";

  if (userContext.authType === AuthType.EncryptedToken) {
    url = url.replace("api/mongo", "api/guest/mongo");
--- a/src/ConfigContext.ts
+++ b/src/ConfigContext.ts
@@ -1,17 +1,3 @@
-import {
-  allowedAadEndpoints,
-  allowedArcadiaEndpoints,
-  allowedArmEndpoints,
-  allowedBackendEndpoints,
-  allowedEmulatorEndpoints,
-  allowedGraphEndpoints,
-  allowedHostedExplorerEndpoints,
-  allowedJunoOrigins,
-  allowedMongoBackendEndpoints,
-  allowedMsalRedirectEndpoints,
-  validateEndpoint,
-} from "Utils/EndpointValidation";
-
 export enum Platform {
  Portal = "Portal",
  Hosted = "Hosted",
@@ -20,7 +6,7 @@ export enum Platform {

 export interface ConfigContext {
  platform: Platform;
-  allowedParentFrameOrigins: ReadonlyArray<string>;
+  allowedParentFrameOrigins: string[];
  gitSha?: string;
  proxyPath?: string;
  AAD_ENDPOINT: string;
@@ -37,11 +23,10 @@ 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.
-  isTerminalEnabled: boolean;
  hostedExplorerURL: string;
  armAPIVersion?: string;
+  allowedJunoOrigins: string[];
  msalRedirectURI?: string;
 }

@@ -55,7 +40,8 @@ let configContext: Readonly<ConfigContext> = {
    `^https:\\/\\/[\\.\\w]*ext\\.azure\\.(com|cn|us)$`,
    `^https:\\/\\/[\\.\\w]*\\.ext\\.microsoftazure\\.de$`,
    `^https://cosmos-db-dataexplorer-germanycentral.azurewebsites.de$`,
-  ], // Webpack injects this at build time
+  ],
+  // Webpack injects this at build time
  gitSha: process.env.GIT_SHA,
  hostedExplorerURL: "https://cosmos.azure.com/",
  AAD_ENDPOINT: "https://login.microsoftonline.com/",
@@ -66,11 +52,16 @@ 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/organizations/AzureCosmosDBNotebooks/settings/applications/1189306
-  GITHUB_TEST_ENV_CLIENT_ID: "b63fc8cbf87fd3c6e2eb", // Registered OAuth app: https://github.com/organizations/AzureCosmosDBNotebooks/settings/applications/1777772
+  GITHUB_CLIENT_ID: "6cb2f63cf6f7b5cbdeca", // Registered OAuth app: https://github.com/settings/applications/1189306
  JUNO_ENDPOINT: "https://tools.cosmos.azure.com",
  BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
-  isTerminalEnabled: false,
+  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",
+    "https://localhost",
+  ],
 };

 export function resetConfigContext(): void {
@@ -81,50 +72,6 @@ export function resetConfigContext(): void {
 }

 export function updateConfigContext(newContext: Partial<ConfigContext>): void {
-  if (!newContext) {
-    return;
-  }
-
-  if (!validateEndpoint(newContext.ARM_ENDPOINT, allowedArmEndpoints)) {
-    delete newContext.ARM_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.AAD_ENDPOINT, allowedAadEndpoints)) {
-    delete newContext.AAD_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.EMULATOR_ENDPOINT, allowedEmulatorEndpoints)) {
-    delete newContext.EMULATOR_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.GRAPH_ENDPOINT, allowedGraphEndpoints)) {
-    delete newContext.GRAPH_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.ARCADIA_ENDPOINT, allowedArcadiaEndpoints)) {
-    delete newContext.ARCADIA_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.BACKEND_ENDPOINT, allowedBackendEndpoints)) {
-    delete newContext.BACKEND_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.MONGO_BACKEND_ENDPOINT, allowedMongoBackendEndpoints)) {
-    delete newContext.MONGO_BACKEND_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.JUNO_ENDPOINT, allowedJunoOrigins)) {
-    delete newContext.JUNO_ENDPOINT;
-  }
-
-  if (!validateEndpoint(newContext.hostedExplorerURL, allowedHostedExplorerEndpoints)) {
-    delete newContext.hostedExplorerURL;
-  }
-
-  if (!validateEndpoint(newContext.msalRedirectURI, allowedMsalRedirectEndpoints)) {
-    delete newContext.msalRedirectURI;
-  }
-
  Object.assign(configContext, newContext);
 }

@@ -148,8 +95,18 @@ export async function initializeConfiguration(): Promise<ConfigContext> {
    });
    if (response.status === 200) {
      try {
-        const { ...externalConfig } = await response.json();
-        updateConfigContext(externalConfig);
+        const { allowedParentFrameOrigins, allowedJunoOrigins, ...externalConfig } = await response.json();
+        Object.assign(configContext, externalConfig);
+        if (allowedParentFrameOrigins && allowedParentFrameOrigins.length > 0) {
+          updateConfigContext({
+            allowedParentFrameOrigins: [...configContext.allowedParentFrameOrigins, ...allowedParentFrameOrigins],
+          });
+        }
+        if (allowedJunoOrigins && allowedJunoOrigins.length > 0) {
+          updateConfigContext({
+            allowedJunoOrigins: [...configContext.allowedJunoOrigins, ...allowedJunoOrigins],
+          });
+        }
      } catch (error) {
        console.error("Unable to parse json in config file");
        console.error(error);
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -1,4 +1,4 @@
-import { ConnectionStatusType, ContainerStatusType } from "../Common/Constants";
+import { ConnectionStatusType } from "../Common/Constants";

 export interface DatabaseAccount {
  id: string;
@@ -26,8 +26,6 @@ export interface DatabaseAccountExtendedProperties {
  isVirtualNetworkFilterEnabled?: boolean;
  ipRules?: IpRule[];
  privateEndpointConnections?: unknown[];
-  capacity?: { totalThroughputLimit: number };
-  locations?: DatabaseAccountResponseLocation[];
 }

 export interface DatabaseAccountResponseLocation {
@@ -428,32 +426,6 @@ 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 {
--- a/src/Contracts/ExplorerContracts.ts
+++ b/src/Contracts/ExplorerContracts.ts
@@ -33,7 +33,6 @@ export enum MessageTypes {
  CreateWorkspace,
  CreateSparkPool,
  RefreshDatabaseAccount,
-  CloseTab,
 }

 export { Versions, ActionContracts, Diagnostics };
--- a/src/Explorer/ContextMenuButtonFactory.tsx
+++ b/src/Explorer/ContextMenuButtonFactory.tsx
@@ -83,6 +83,7 @@ export const createCollectionContextMenuButton = (

    items.push({
      iconSrc: HostedTerminalIcon,
+      isDisabled: useNotebook.getState().isShellEnabled && userContext.features.notebooksTemporarilyDown,
      onClick: () => {
        const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
        if (useNotebook.getState().isShellEnabled) {
--- a/src/Explorer/Controls/Dialog.tsx
+++ b/src/Explorer/Controls/Dialog.tsx
@@ -13,6 +13,7 @@ import {
  Link,
  PrimaryButton,
  ProgressIndicator,
+  Text,
  TextField,
 } from "@fluentui/react";
 import React, { FC } from "react";
@@ -196,7 +197,7 @@ export const Dialog: FC = () => {
          {linkProps.linkText} <FontIcon iconName="NavigateExternalInline" />
        </Link>
      )}
-      {contentHtml}
+      {contentHtml && <Text>{contentHtml}</Text>}
      {progressIndicatorProps && <ProgressIndicator {...progressIndicatorProps} />}
      <DialogFooter>
        <PrimaryButton {...primaryButtonProps} />
--- a/src/Explorer/Controls/GitHub/AddRepoComponent.tsx
+++ b/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,6 +27,7 @@ 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);
@@ -77,7 +78,7 @@ export class AddRepoComponent extends React.Component<AddRepoComponentProps, Add
    });
    let enteredUrl = this.state.textFieldValue;
    if (enteredUrl.indexOf("/tree/") === -1) {
-      enteredUrl = UrlUtility.createUri(enteredUrl, `tree/`);
+      enteredUrl = UrlUtility.createUri(enteredUrl, `tree/${AddRepoComponent.DefaultBranchName}`);
    }

    const repoInfo = GitHubUtils.fromRepoUri(enteredUrl);
@@ -92,7 +93,11 @@ export class AddRepoComponent extends React.Component<AddRepoComponentProps, Add
        const item: RepoListItem = {
          key: GitHubUtils.toRepoFullName(repo.owner, repo.name),
          repo,
-          branches: repoInfo.branch ? [{ name: repoInfo.branch }] : [],
+          branches: [
+            {
+              name: repoInfo.branch,
+            },
+          ],
        };

        TelemetryProcessor.traceSuccess(
--- a/src/Explorer/Controls/GitHub/ReposListComponent.tsx
+++ b/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,7 +44,6 @@ export interface BranchesProps {
  lastPageInfo?: IGitHubPageInfo;
  hasMore: boolean;
  isLoading: boolean;
-  defaultBranchName: string;
  loadMore: () => void;
 }

@@ -65,7 +64,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 DefaultBranchNames = "master/main";
+  private static readonly DefaultBranchName = "master";
  private static readonly FooterIndex = -1;

  public render(): JSX.Element {
@@ -156,10 +155,6 @@ 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,
@@ -203,7 +198,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
    const dropdownProps: IDropdownProps = {
      styles: BranchesDropdownStyles,
      options: [],
-      placeholder: ReposListComponent.DefaultBranchNames,
+      placeholder: ReposListComponent.DefaultBranchName,
      disabled: true,
    };

@@ -277,7 +272,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
      styles: ReposListCheckboxStyles,
      onChange: () => {
        const repoListItem = { ...item };
-        repoListItem.branches = [];
+        repoListItem.branches = [{ name: ReposListComponent.DefaultBranchName }];
        this.props.pinRepo(repoListItem);
      },
    };
--- a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx
+++ b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx
@@ -35,19 +35,16 @@ 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", () => {
@@ -55,7 +52,6 @@ describe("NotebookTerminalComponent", () => {
    const props: NotebookTerminalComponentProps = {
      databaseAccount: testAccount,
      notebookServerInfo: testNotebookServerInfo,
-      tabId: undefined,
    };

    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
@@ -66,7 +62,6 @@ describe("NotebookTerminalComponent", () => {
    const props: NotebookTerminalComponentProps = {
      databaseAccount: testMongo32Account,
      notebookServerInfo: testMongoNotebookServerInfo,
-      tabId: undefined,
    };

    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
@@ -77,7 +72,6 @@ describe("NotebookTerminalComponent", () => {
    const props: NotebookTerminalComponentProps = {
      databaseAccount: testMongo36Account,
      notebookServerInfo: testMongoNotebookServerInfo,
-      tabId: undefined,
    };

    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
@@ -88,7 +82,6 @@ describe("NotebookTerminalComponent", () => {
    const props: NotebookTerminalComponentProps = {
      databaseAccount: testCassandraAccount,
      notebookServerInfo: testCassandraNotebookServerInfo,
-      tabId: undefined,
    };

    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
--- a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
+++ b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx
@@ -12,7 +12,6 @@ import * as StringUtils from "../../../Utils/StringUtils";
 export interface NotebookTerminalComponentProps {
  notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo;
  databaseAccount: DataModels.DatabaseAccount;
-  tabId: string;
 }

 export class NotebookTerminalComponent extends React.Component<NotebookTerminalComponentProps> {
@@ -56,7 +55,6 @@ export class NotebookTerminalComponent extends React.Component<NotebookTerminalC
      apiType: userContext.apiType,
      authType: userContext.authType,
      databaseAccount: userContext.databaseAccount,
-      tabId: this.props.tabId,
    };

    postRobot.send(this.terminalWindow, "props", props, {
--- a/src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
+++ b/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 { NotebookUtil } from "../../Notebook/NotebookUtil";
 import { useNotebook } from "../../Notebook/useNotebook";
 import { Dialog, TextFieldProps, useDialog } from "../Dialog";
 import { NotebookMetadataComponent } from "./NotebookMetadataComponent";
@@ -52,7 +53,7 @@ export class NotebookViewerComponent
    super(props);

    this.clientManager = new NotebookClientV2({
-      connectionInfo: { authToken: undefined, notebookServerEndpoint: undefined, forwardingId: undefined },
+      connectionInfo: { authToken: undefined, notebookServerEndpoint: undefined },
      databaseAccountName: undefined,
      defaultExperience: "NotebookViewer",
      isReadOnly: true,
@@ -147,7 +148,9 @@ export class NotebookViewerComponent
            <NotebookMetadataComponent
              data={this.state.galleryItem}
              isFavorite={this.state.isFavorite}
-              downloadButtonText={this.props.container && `Download to ${useNotebook.getState().notebookFolderName}`}
+              downloadButtonText={
+                this.props.container && NotebookUtil.getNotebookBtnTitle(useNotebook.getState().notebookFolderName)
+              }
              onTagClick={this.props.onTagClick}
              onFavoriteClick={this.favoriteItem}
              onUnfavoriteClick={this.unfavoriteItem}
--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -1,5 +1,4 @@
 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";
@@ -72,7 +71,6 @@ export interface SettingsComponentState {
  wasAutopilotOriginallySet: boolean;
  isScaleSaveable: boolean;
  isScaleDiscardable: boolean;
-  throughputError: string;

  timeToLive: TtlType;
  timeToLiveBaseline: TtlType;
@@ -126,7 +124,6 @@ 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) {
@@ -158,7 +155,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      wasAutopilotOriginallySet: false,
      isScaleSaveable: false,
      isScaleDiscardable: false,
-      throughputError: undefined,

      timeToLive: undefined,
      timeToLiveBaseline: undefined,
@@ -212,11 +208,6 @@ 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 {
@@ -263,10 +254,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      return false;
    }

-    if (this.state.throughputError) {
-      return false;
-    }
-
    return (
      this.state.isScaleSaveable ||
      this.state.isSubSettingsSaveable ||
@@ -494,26 +481,6 @@ 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) {
@@ -676,31 +643,10 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
    return buttons;
  };

-  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 onMaxAutoPilotThroughputChange = (newThroughput: number): void =>
+    this.setState({ autoPilotThroughput: 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 onThroughputChange = (newThroughput: number): void => this.setState({ throughput: newThroughput });

  private onAutoPilotSelected = (isAutoPilotSelected: boolean): void =>
    this.setState({ isAutoPilotSelected: isAutoPilotSelected });
@@ -947,7 +893,6 @@ 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) {
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx
@@ -36,7 +36,6 @@ export interface ScaleComponentProps {
  onScaleSaveableChange: (isScaleSaveable: boolean) => void;
  onScaleDiscardableChange: (isScaleDiscardable: boolean) => void;
  initialNotification: DataModels.Notification;
-  throughputError?: string;
 }

 export class ScaleComponent extends React.Component<ScaleComponentProps> {
@@ -190,7 +189,6 @@ export class ScaleComponent extends React.Component<ScaleComponentProps> {
      onScaleDiscardableChange={this.props.onScaleDiscardableChange}
      getThroughputWarningMessage={this.getThroughputWarningMessage}
      usageSizeInKB={this.props.collection?.usageSizeInKB()}
-      throughputError={this.props.throughputError}
    />
  );

--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
@@ -75,7 +75,6 @@ export interface ThroughputInputAutoPilotV3Props {
  onScaleDiscardableChange: (isScaleDiscardable: boolean) => void;
  getThroughputWarningMessage: () => JSX.Element;
  usageSizeInKB: number;
-  throughputError?: string;
 }

 interface ThroughputInputAutoPilotV3State {
@@ -541,7 +540,6 @@ 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()}
@@ -581,7 +579,6 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
        }
        onChange={this.onThroughputChange}
        min={this.props.minimum}
-        errorMessage={this.props.throughputError}
      />
      {this.state.exceedFreeTierThroughput && (
        <MessageBar
--- a/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
@@ -34,13 +34,7 @@ exports[`SettingsComponent renders 1`] = `
                "isTabsContentExpanded": [Function],
                "onRefreshDatabasesKeyPress": [Function],
                "onRefreshResourcesClick": [Function],
-                "phoenixClient": PhoenixClient {
-                  "retryOptions": Object {
-                    "maxTimeout": 5000,
-                    "minTimeout": 5000,
-                    "retries": 3,
-                  },
-                },
+                "phoenixClient": PhoenixClient {},
                "provideFeedbackEmail": [Function],
                "queriesClient": QueriesClient {
                  "container": [Circular],
@@ -108,13 +102,7 @@ exports[`SettingsComponent renders 1`] = `
                "isTabsContentExpanded": [Function],
                "onRefreshDatabasesKeyPress": [Function],
                "onRefreshResourcesClick": [Function],
-                "phoenixClient": PhoenixClient {
-                  "retryOptions": Object {
-                    "maxTimeout": 5000,
-                    "minTimeout": 5000,
-                    "retries": 3,
-                  },
-                },
+                "phoenixClient": PhoenixClient {},
                "provideFeedbackEmail": [Function],
                "queriesClient": QueriesClient {
                  "container": [Circular],
--- a/src/Explorer/Controls/ThroughputInput/ThroughputInput.test.tsx
+++ b/src/Explorer/Controls/ThroughputInput/ThroughputInput.test.tsx
@@ -7,7 +7,6 @@ const props = {
  isSharded: true,
  setThroughputValue: () => jest.fn(),
  setIsAutoscale: () => jest.fn(),
-  setIsThroughputCapExceeded: () => jest.fn(),
  onCostAcknowledgeChange: () => jest.fn(),
 };
 describe("ThroughputInput Pane", () => {
--- a/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
+++ b/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
@@ -1,6 +1,5 @@
 import { Checkbox, DirectionalHint, Link, Stack, Text, TextField, TooltipHost } from "@fluentui/react";
-import { useDatabases } from "Explorer/useDatabases";
-import React, { FunctionComponent, useEffect, useState } from "react";
+import React, { FunctionComponent, useState } from "react";
 import * as Constants from "../../../Common/Constants";
 import { InfoTooltip } from "../../../Common/Tooltip/InfoTooltip";
 import * as SharedConstants from "../../../Shared/Constants";
@@ -17,7 +16,6 @@ export interface ThroughputInputProps {
  showFreeTierExceedThroughputTooltip: boolean;
  setThroughputValue: (throughput: number) => void;
  setIsAutoscale: (isAutoscale: boolean) => void;
-  setIsThroughputCapExceeded: (isThroughputCapExceeded: boolean) => void;
  onCostAcknowledgeChange: (isAcknowledged: boolean) => void;
 }

@@ -26,7 +24,6 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
  showFreeTierExceedThroughputTooltip,
  setThroughputValue,
  setIsAutoscale,
-  setIsThroughputCapExceeded,
  isSharded,
  onCostAcknowledgeChange,
 }: ThroughputInputProps) => {
@@ -34,60 +31,10 @@ 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) {
@@ -113,17 +60,11 @@ 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");
-      return;
-    }
-
-    if (!checkThroughputCap(newThroughput)) {
-      return;
-    }
-
+    } else {
      setThroughputError("");
+    }
  };

  const getAutoScaleTooltip = (): string => {
@@ -155,13 +96,11 @@ 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);
    }
  };

--- a/src/Explorer/Controls/ThroughputInput/snapshots/ThroughputInput.test.tsx.snap
+++ b/src/Explorer/Controls/ThroughputInput/snapshots/ThroughputInput.test.tsx.snap
@@ -6,7 +6,6 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
  isSharded={true}
  onCostAcknowledgeChange={[Function]}
  setIsAutoscale={[Function]}
-  setIsThroughputCapExceeded={[Function]}
  setThroughputValue={[Function]}
  showFreeTierExceedThroughputTooltip={true}
 >
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -1,31 +1,24 @@
 import { Link } from "@fluentui/react/lib/Link";
-import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
-import { IGalleryItem } from "Juno/JunoClient";
 import * as ko from "knockout";
 import React from "react";
 import _ from "underscore";
-import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointValidation";
-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 { 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 { ContainerConnectionInfo } from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import { GitHubOAuthService } from "../GitHub/GitHubOAuthService";
 import { useSidePanel } from "../hooks/useSidePanel";
 import { useTabs } from "../hooks/useTabs";
+import { IGalleryItem } from "../Juno/JunoClient";
 import { PhoenixClient } from "../Phoenix/PhoenixClient";
 import * as ExplorerSettings from "../Shared/ExplorerSettings";
 import { Action, ActionModifiers } from "../Shared/Telemetry/TelemetryConstants";
@@ -33,7 +26,12 @@ import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../UserContext";
 import { getCollectionName, getUploadName } from "../Utils/APITypeUtils";
 import { update } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
-import { listByDatabaseAccount } from "../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
+import {
+  get as getWorkspace,
+  listByDatabaseAccount,
+  listConnectionInfo,
+  start,
+} from "../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
 import { stringToBlob } from "../Utils/BlobUtils";
 import { isCapabilityEnabled } from "../Utils/CapabilityUtils";
 import { fromContentUri, toRawContentUri } from "../Utils/GitHubUtils";
@@ -47,12 +45,13 @@ import * as FileSystemUtil from "./Notebook/FileSystemUtil";
 import { SnapshotRequest } from "./Notebook/NotebookComponent/types";
 import { NotebookContentItem, NotebookContentItemType } from "./Notebook/NotebookContentItem";
 import type NotebookManager from "./Notebook/NotebookManager";
-import { NotebookPaneContent } from "./Notebook/NotebookManager";
+import type { NotebookPaneContent } from "./Notebook/NotebookManager";
 import { NotebookUtil } from "./Notebook/NotebookUtil";
 import { useNotebook } from "./Notebook/useNotebook";
 import { AddCollectionPanel } from "./Panes/AddCollectionPanel";
 import { CassandraAddCollectionPane } from "./Panes/CassandraAddCollectionPane/CassandraAddCollectionPane";
 import { ExecuteSprocParamsPane } from "./Panes/ExecuteSprocParamsPane/ExecuteSprocParamsPane";
+import { SetupNoteBooksPanel } from "./Panes/SetupNotebooksPanel/SetupNotebooksPanel";
 import { StringInputPane } from "./Panes/StringInputPane/StringInputPane";
 import { UploadFilePane } from "./Panes/UploadFilePane/UploadFilePane";
 import { UploadItemsPane } from "./Panes/UploadItemsPane/UploadItemsPane";
@@ -166,23 +165,20 @@ export default class Explorer {
    );

    useNotebook.subscribe(
-      async () => this.initiateAndRefreshNotebookList(),
-      (state) => [state.isNotebookEnabled, state.isRefreshed],
-      shallow
+      async () => {
+        this.initiateAndRefreshNotebookList();
+        useNotebook.getState().setIsRefreshed(false);
+      },
+      (state) => state.isNotebookEnabled || state.isRefreshed
    );

    this.resourceTree = new ResourceTreeAdapter(this);

    // Override notebook server parameters from URL parameters
-    if (
-      userContext.features.notebookServerUrl &&
-      validateEndpoint(userContext.features.notebookServerUrl, allowedNotebookServerUrls) &&
-      userContext.features.notebookServerToken
-    ) {
+    if (userContext.features.notebookServerUrl && userContext.features.notebookServerToken) {
      useNotebook.getState().setNotebookServerInfo({
        notebookServerEndpoint: userContext.features.notebookServerUrl,
        authToken: userContext.features.notebookServerToken,
-        forwardingId: undefined,
      });
    }

@@ -190,6 +186,19 @@ export default class Explorer {
      useNotebook.getState().setNotebookBasePath(userContext.features.notebookBasePath);
    }

+    if (userContext.features.livyEndpoint) {
+      useNotebook.getState().setSparkClusterConnectionInfo({
+        userName: undefined,
+        password: undefined,
+        endpoints: [
+          {
+            endpoint: userContext.features.livyEndpoint,
+            kind: DataModels.SparkClusterEndpointKind.Livy,
+          },
+        ],
+      });
+    }
+
    this.refreshExplorer();
  }

@@ -343,19 +352,35 @@ export default class Explorer {
      return;
    }
    this._isInitializingNotebooks = true;
+    if (userContext.features.phoenix === false) {
+      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,
+      });
+    }
+
    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 = {
+    if (isAllocating === false && notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined) {
+      const provisionData = {
+        aadToken: userContext.authorizationToken,
+        subscriptionId: userContext.subscriptionId,
+        resourceGroup: userContext.resourceGroup,
+        dbAccountName: userContext.databaseAccount.name,
        cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
      };
      const connectionStatus: ContainerConnectionInfo = {
@@ -363,62 +388,36 @@ export default class Explorer {
      };
      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 connectionInfo = await this.phoenixClient.containerConnectionInfo(provisionData);
+        if (
+          connectionInfo.status === HttpStatusCodes.OK &&
+          connectionInfo.data &&
+          connectionInfo.data.notebookServerUrl
        ) {
-    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:
-        (validateEndpoint(userContext.features.notebookServerUrl, allowedNotebookServerUrls) &&
-          userContext.features.notebookServerUrl) ||
-        connectionInfo.data.notebookServerUrl,
+            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));
+          useNotebook.getState().setIsAllocating(false);
+        } else {
+          connectionStatus.status = ConnectionStatusType.Failed;
+          useNotebook.getState().resetConatinerConnection(connectionStatus);
+        }
+      } catch (error) {
+        connectionStatus.status = ConnectionStatusType.Failed;
+        useNotebook.getState().resetConatinerConnection(connectionStatus);
+        throw error;
+      }
+      this.refreshNotebookList();
+
+      this._isInitializingNotebooks = false;
+    }
  }

  public resetNotebookWorkspace(): void {
@@ -429,14 +428,11 @@ export default class Explorer {
      );
      return;
    }
-    const dialogContent = useNotebook.getState().isPhoenixNotebooks
-      ? "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: dialogContent,
+      subText: "This lets you keep your notebook files and the workspace will be restored to default. Proceed anyway?",
      primaryButtonText: "OK",
      secondaryButtonText: "Cancel",
      onPrimaryButtonClick: this._resetNotebookWorkspace,
@@ -462,57 +458,48 @@ export default class Explorer {
    }
  }

+  private async ensureNotebookWorkspaceRunning() {
+    if (!userContext.databaseAccount) {
+      return;
+    }
+
+    let clearMessage;
+    try {
+      const notebookWorkspace = await getWorkspace(
+        userContext.subscriptionId,
+        userContext.resourceGroup,
+        userContext.databaseAccount.name,
+        "default"
+      );
+      if (
+        notebookWorkspace &&
+        notebookWorkspace.properties &&
+        notebookWorkspace.properties.status &&
+        notebookWorkspace.properties.status.toLowerCase() === "stopped"
+      ) {
+        clearMessage = NotificationConsoleUtils.logConsoleProgress("Initializing notebook workspace");
+        await start(userContext.subscriptionId, userContext.resourceGroup, userContext.databaseAccount.name, "default");
+      }
+    } catch (error) {
+      handleError(error, "Explorer/ensureNotebookWorkspaceRunning", "Failed to initialize notebook workspace");
+    } finally {
+      clearMessage && clearMessage();
+    }
+  }
+
  private _resetNotebookWorkspace = async () => {
    useDialog.getState().closeDialog();
    const clearInProgressMessage = logConsoleProgress("Resetting notebook workspace");
-    let connectionStatus: ContainerConnectionInfo;
    try {
-      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().isPhoenixNotebooks) {
-        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().isPhoenixNotebooks) {
-        await this.setNotebookInfo(connectionInfo, connectionStatus);
-        useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
-      }
+      await this.notebookManager?.notebookClient.resetWorkspace();
      logConsoleInfo("Successfully reset notebook workspace");
-      TelemetryProcessor.traceSuccess(Action.PhoenixResetWorkspace, {
-        dataExplorerArea: Areas.Notebook,
-      });
+      TelemetryProcessor.traceSuccess(Action.ResetNotebookWorkspace);
    } catch (error) {
      logConsoleError(`Failed to reset notebook workspace: ${error}`);
-      TelemetryProcessor.traceFailure(Action.PhoenixResetWorkspace, {
-        dataExplorerArea: Areas.Notebook,
+      TelemetryProcessor.traceFailure(Action.ResetNotebookWorkspace, {
        error: getErrorMessage(error),
        errorStack: getErrorStack(error),
      });
-      if (useNotebook.getState().isPhoenixNotebooks) {
-        connectionStatus = {
-          status: ConnectionStatusType.Failed,
-        };
-        useNotebook.getState().resetContainerConnection(connectionStatus);
-        useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
-      }
      throw error;
    } finally {
      clearInProgressMessage();
@@ -704,8 +691,8 @@ export default class Explorer {
    if (!notebookContentItem || !notebookContentItem.path) {
      throw new Error(`Invalid notebookContentItem: ${notebookContentItem}`);
    }
-    if (notebookContentItem.type === NotebookContentItemType.Notebook && useNotebook.getState().isPhoenixNotebooks) {
-      await this.allocateContainer();
+    if (notebookContentItem.type === NotebookContentItemType.Notebook && NotebookUtil.isPhoenixEnabled()) {
+      this.allocateContainer();
    }

    const notebookTabs = useTabs
@@ -922,17 +909,20 @@ export default class Explorer {
  /**
   * This creates a new notebook file, then opens the notebook
   */
-  public async onNewNotebookClicked(parent?: NotebookContentItem, isGithubTree?: boolean): Promise<void> {
+  public onNewNotebookClicked(parent?: NotebookContentItem, isGithubTree?: boolean): void {
    if (!useNotebook.getState().isNotebookEnabled || !this.notebookManager?.notebookContentClient) {
      const error = "Attempt to create new notebook, but notebook is not enabled";
      handleError(error, "Explorer/onNewNotebookClicked");
      throw new Error(error);
    }
-    if (useNotebook.getState().isPhoenixNotebooks) {
+    const isPhoenixEnabled = NotebookUtil.isPhoenixEnabled();
+    if (isPhoenixEnabled) {
      if (isGithubTree) {
+        async () => {
          await this.allocateContainer();
          parent = parent || this.resourceTree.myNotebooksContentRoot;
          this.createNewNoteBook(parent, isGithubTree);
+        };
      } else {
        useDialog.getState().showOkCancelModalDialog(
          Notebook.newNotebookModalTitle,
@@ -1017,7 +1007,7 @@ export default class Explorer {
  }

  public async openNotebookTerminal(kind: ViewModels.TerminalKind): Promise<void> {
-    if (useNotebook.getState().isPhoenixFeatures) {
+    if (NotebookUtil.isPhoenixEnabled()) {
      await this.allocateContainer();
      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
      if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint !== undefined) {
@@ -1026,8 +1016,8 @@ export default class Explorer {
        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."
+            "Failed to Connect",
+            "Failed to connect temporary workspace, this could happen because of network issue please refresh and try again."
          );
      }
    } else {
@@ -1057,7 +1047,7 @@ export default class Explorer {

    const terminalTabs: TerminalTab[] = useTabs
      .getState()
-      .getTabs(ViewModels.CollectionTabKind.Terminal, (tab) => tab.tabTitle().startsWith(title)) as TerminalTab[];
+      .getTabs(ViewModels.CollectionTabKind.Terminal, (tab) => tab.tabTitle() === title) as TerminalTab[];

    let index = 1;
    if (terminalTabs.length > 0) {
@@ -1129,10 +1119,7 @@ export default class Explorer {
          <CassandraAddCollectionPane explorer={this} cassandraApiClient={new CassandraAPIDataClient()} />
        );
    } else {
-      const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-      throughputCap && throughputCap !== -1
-        ? await useDatabases.getState().loadAllOffers()
-        : await useDatabases.getState().loadDatabaseOffers();
+      await useDatabases.getState().loadDatabaseOffers();
      useSidePanel
        .getState()
        .openSidePanel("New " + getCollectionName(), <AddCollectionPanel explorer={this} databaseId={databaseId} />);
@@ -1148,12 +1135,21 @@ export default class Explorer {
    }
  }

-  public async handleOpenFileAction(path: string): Promise<void> {
-    if (useNotebook.getState().isPhoenixNotebooks === undefined) {
-      await useNotebook.getState().getPhoenixStatus();
+  private _openSetupNotebooksPaneForQuickstart(): void {
+    const title = "Enable Notebooks (Preview)";
+    const description =
+      "You have not yet created a notebooks workspace for this account. To proceed and start using notebooks, we'll need to create a default notebooks workspace in this account.";
+    useSidePanel
+      .getState()
+      .openSidePanel(title, <SetupNoteBooksPanel explorer={this} panelTitle={title} panelDescription={description} />);
  }
-    if (useNotebook.getState().isPhoenixNotebooks) {
-      await this.allocateContainer();
+
+  public async handleOpenFileAction(path: string): Promise<void> {
+    if (
+      userContext.features.phoenix === false &&
+      !(await this._containsDefaultNotebookWorkspace(userContext.databaseAccount))
+    ) {
+      this._openSetupNotebooksPaneForQuickstart();
    }

    // We still use github urls like https://github.com/Azure-Samples/cosmos-notebooks/blob/master/CSharp_quickstarts/GettingStarted_CSharp.ipynb
@@ -1184,7 +1180,7 @@ export default class Explorer {
  }

  public openUploadFilePanel(parent?: NotebookContentItem): void {
-    if (useNotebook.getState().isPhoenixNotebooks) {
+    if (NotebookUtil.isPhoenixEnabled()) {
      useDialog.getState().showOkCancelModalDialog(
        Notebook.newNotebookUploadModalTitle,
        undefined,
@@ -1214,7 +1210,7 @@ export default class Explorer {
  }

  public getDownloadModalConent(fileName: string): JSX.Element {
-    if (useNotebook.getState().isPhoenixNotebooks) {
+    if (NotebookUtil.isPhoenixEnabled()) {
      return (
        <>
          <p>{Notebook.galleryNotebookDownloadContent1}</p>
@@ -1236,21 +1232,28 @@ export default class Explorer {
      ? this.refreshDatabaseForResourceToken()
      : this.refreshAllDatabases();
    await useNotebook.getState().refreshNotebooksEnabledStateForAccount();
-
-    // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
-    const isNotebookEnabled = userContext.features.notebooksDownBanner || useNotebook.getState().isPhoenixNotebooks;
+    let isNotebookEnabled = true;
+    if (!userContext.features.phoenix) {
+      isNotebookEnabled =
+        userContext.authType !== AuthType.ResourceToken &&
+        ((await this._containsDefaultNotebookWorkspace(userContext.databaseAccount)) ||
+          userContext.features.enableNotebooks);
+    }
    useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled);
-    useNotebook
-      .getState()
-      .setIsShellEnabled(useNotebook.getState().isPhoenixFeatures && isPublicInternetAccessAllowed());
+    useNotebook.getState().setIsShellEnabled(isNotebookEnabled && isPublicInternetAccessAllowed());

    TelemetryProcessor.trace(Action.NotebookEnabled, ActionModifiers.Mark, {
      isNotebookEnabled,
      dataExplorerArea: Constants.Areas.Notebook,
    });

-    if (useNotebook.getState().isPhoenixNotebooks) {
+    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();
+      }
    }
  }
 }
--- a/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { FeedOptions, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import * as Q from "q";
 import * as React from "react";
@@ -296,6 +294,8 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
      this.setGremlinParams();
    }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    promise
      .then((result: GremlinClient.GremlinRequestResult) => this.processGremlinQueryResults(result))
-      .catch((error: Error) => {
+      .catch((error: any) => {
        const errorMsg = `Failed to process query result: ${getErrorMessage(error)}`;
        GraphExplorer.reportToConsole(ConsoleDataType.Error, errorMsg);
        this.setState({
--- a/src/Explorer/Graph/GraphExplorerComponent/LeftPaneComponent.tsx
+++ b/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={() => this.props.onRootNodeSelected(node.id)}
+        onActivated={(e) => this.props.onRootNodeSelected(node.id)}
        key={node.id}
      >
        <td className="resultItem">
--- a/src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.test.tsx
+++ b/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 React from "react";
-import { GraphHighlightedNodeData, PossibleVertex } from "./GraphExplorer";
-import { Mode, NodePropertiesComponent, NodePropertiesComponentProps } from "./NodePropertiesComponent";
+import { NodePropertiesComponent, NodePropertiesComponentProps, Mode } from "./NodePropertiesComponent";
+import { GraphHighlightedNodeData, EditedProperties, EditedEdges, PossibleVertex } from "./GraphExplorer";

 describe("Property pane", () => {
  const title = "My Title";
@@ -37,18 +37,17 @@ describe("Property pane", () => {
    return {
      expandedTitle: title,
      isCollapsed: false,
-      onCollapsedChanged: jest.fn(),
+      onCollapsedChanged: (newValue: boolean): void => {},
      node: highlightedNode,
-      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(),
+      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 => {},
      viewMode: Mode.READONLY_PROP,
    };
  };
--- a/src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx
+++ b/src/Explorer/Graph/GraphExplorerComponent/NodePropertiesComponent.tsx
@@ -72,7 +72,7 @@ export class NodePropertiesComponent extends React.Component<
    super(props);
    this.state = {
      editedProperties: {
-        pkId: undefined,
+        pkId: null,
        readOnlyProperties: [],
        existingProperties: [],
        addedProperties: [],
@@ -98,12 +98,15 @@ export class NodePropertiesComponent extends React.Component<
    };
  }

-  public static getDerivedStateFromProps(props: NodePropertiesComponentProps): Partial<NodePropertiesComponentState> {
+  public static getDerivedStateFromProps(
+    props: NodePropertiesComponentProps,
+    state: NodePropertiesComponentState
+  ): Partial<NodePropertiesComponentState> {
    if (props.viewMode !== Mode.READONLY_PROP) {
      return { isDeleteConfirm: false };
    }

-    return undefined;
+    return null;
  }

  public render(): JSX.Element {
@@ -135,10 +138,10 @@ export class NodePropertiesComponent extends React.Component<
   * @param value
   */
  private static getTypeOption(value: any): ViewModels.InputPropertyValueTypeString {
-    if (value === undefined) {
+    if (value == null) {
      return "null";
    }
-    const type = typeof value;
+    let type = typeof value;
    switch (type) {
      case "number":
      case "boolean":
@@ -169,9 +172,10 @@ export class NodePropertiesComponent extends React.Component<
    ];

    const existingProps: ViewModels.InputProperty[] = [];
+
    if (this.props.node.hasOwnProperty("properties")) {
      const hProps = this.props.node["properties"];
-      for (const p in hProps) {
+      for (let p in hProps) {
        const propValues = hProps[p];
        (p === partitionKeyProperty ? readOnlyProps : existingProps).push({
          key: p,
@@ -433,7 +437,7 @@ export class NodePropertiesComponent extends React.Component<
        </div>
      );
    } else {
-      return undefined;
+      return null;
    }
  }

--- a/src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
@@ -4,12 +4,15 @@
 * 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 { NotebookUtil } from "../../Notebook/NotebookUtil";
 import { useSelectedNode } from "../../useSelectedNode";
 import * as CommandBarComponentButtonFactory from "./CommandBarComponentButtonFactory";
 import * as CommandBarUtil from "./CommandBarUtil";
@@ -53,10 +56,18 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
  const uiFabricControlButtons = CommandBarUtil.convertButton(controlButtons, backgroundColor);
  uiFabricControlButtons.forEach((btn: ICommandBarItemProps) => (btn.iconOnly = true));

-  if (useNotebook.getState().isPhoenixNotebooks || useNotebook.getState().isPhoenixFeatures) {
+  if (NotebookUtil.isPhoenixEnabled()) {
    uiFabricControlButtons.unshift(CommandBarUtil.createConnectionStatus(container, "connectionStatus"));
  }

+  if (
+    userContext.features.phoenix === false &&
+    userContext.features.notebooksTemporarilyDown === false &&
+    useTabs.getState().activeTab?.tabKind === ViewModels.CollectionTabKind.NotebookV2
+  ) {
+    uiFabricControlButtons.unshift(CommandBarUtil.createMemoryTracker("memoryTracker"));
+  }
+
  return (
    <div className="commandBarContainer">
      <FluentCommandBar
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts
@@ -31,13 +31,28 @@ describe("CommandBarComponentButtonFactory tests", () => {
      });
    });

-    it("Button should be visible", () => {
+    it("Account is not serverless - button should be visible", () => {
      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
      const enableAzureSynapseLinkBtn = buttons.find(
        (button) => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel
      );
      expect(enableAzureSynapseLinkBtn).toBeDefined();
    });
+
+    it("Account is serverless - button should be hidden", () => {
+      updateUserContext({
+        databaseAccount: {
+          properties: {
+            capabilities: [{ name: "EnableServerless" }],
+          },
+        } as DatabaseAccount,
+      });
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const enableAzureSynapseLinkBtn = buttons.find(
+        (button) => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel
+      );
+      expect(enableAzureSynapseLinkBtn).toBeUndefined();
+    });
  });

  describe("Enable notebook button", () => {
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
@@ -10,6 +10,7 @@ import CosmosTerminalIcon from "../../../../images/Cosmos-Terminal.svg";
 import FeedbackIcon from "../../../../images/Feedback-Command.svg";
 import GitHubIcon from "../../../../images/github.svg";
 import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
+import EnableNotebooksIcon from "../../../../images/notebook/Notebook-enable.svg";
 import NewNotebookIcon from "../../../../images/notebook/Notebook-new.svg";
 import ResetWorkspaceIcon from "../../../../images/notebook/Notebook-reset-workspace.svg";
 import OpenInTabIcon from "../../../../images/open-in-tab.svg";
@@ -24,6 +25,7 @@ import { useSidePanel } from "../../../hooks/useSidePanel";
 import { JunoClient } from "../../../Juno/JunoClient";
 import { userContext } from "../../../UserContext";
 import { getCollectionName, getDatabaseName } from "../../../Utils/APITypeUtils";
+import { isServerlessAccount } from "../../../Utils/CapabilityUtils";
 import { isRunningOnNationalCloud } from "../../../Utils/CloudUtils";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
@@ -34,6 +36,7 @@ import { BrowseQueriesPane } from "../../Panes/BrowseQueriesPane/BrowseQueriesPa
 import { GitHubReposPanel } from "../../Panes/GitHubReposPanel/GitHubReposPanel";
 import { LoadQueryPane } from "../../Panes/LoadQueryPane/LoadQueryPane";
 import { SettingsPane } from "../../Panes/SettingsPane/SettingsPane";
+import { SetupNoteBooksPanel } from "../../Panes/SetupNotebooksPanel/SetupNotebooksPanel";
 import { useDatabases } from "../../useDatabases";
 import { SelectedNodeState } from "../../useSelectedNode";

@@ -75,10 +78,9 @@ export function createStaticCommandBarButtons(
    if (container.notebookManager?.gitHubOAuthService) {
      notebookButtons.push(createManageGitHubAccountButton(container));
    }
-    if (useNotebook.getState().isPhoenixFeatures && configContext.isTerminalEnabled) {
+
    notebookButtons.push(createOpenTerminalButton(container));
-    }
-    if (useNotebook.getState().isPhoenixNotebooks && selectedNodeState.isConnectedToContainer()) {
+    if (userContext.features.phoenix === false) {
      notebookButtons.push(createNotebookWorkspaceResetButton(container));
    }
    if (
@@ -96,19 +98,22 @@ export function createStaticCommandBarButtons(
    }

    notebookButtons.forEach((btn) => {
+      if (userContext.features.notebooksTemporarilyDown) {
        if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
-        if (!useNotebook.getState().isPhoenixFeatures) {
          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
-        }
        } else if (btn.commandButtonLabel.indexOf("Mongo") !== -1) {
-        if (!useNotebook.getState().isPhoenixFeatures) {
          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
-        }
-      } else if (!useNotebook.getState().isPhoenixNotebooks) {
+        } else {
          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
        }
+      }
      buttons.push(btn);
    });
+  } else {
+    if (!isRunningOnNationalCloud() && !userContext.features.notebooksTemporarilyDown) {
+      buttons.push(createDivider());
+      buttons.push(createEnableNotebooksButton(container));
+    }
  }

  if (!selectedNodeState.isDatabaseNodeOrNoneSelected()) {
@@ -163,7 +168,9 @@ export function createContextCommandBarButtons(
      onCommandClick: () => {
        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
        if (useNotebook.getState().isShellEnabled) {
+          if (!userContext.features.notebooksTemporarilyDown) {
            container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
+          }
        } else {
          selectedCollection && selectedCollection.onNewMongoShellClick();
        }
@@ -171,6 +178,13 @@ export function createContextCommandBarButtons(
      commandButtonLabel: label,
      ariaLabel: label,
      hasPopup: true,
+      tooltipText:
+        useNotebook.getState().isShellEnabled && userContext.features.notebooksTemporarilyDown
+          ? Constants.Notebook.mongoShellTemporarilyDownMsg
+          : undefined,
+      disabled:
+        (selectedNodeState.isDatabaseNodeOrNoneSelected() && userContext.apiType === "Mongo") ||
+        (useNotebook.getState().isShellEnabled && userContext.features.notebooksTemporarilyDown),
    };
    buttons.push(newMongoShellBtn);
  }
@@ -266,6 +280,10 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
    return undefined;
  }

+  if (isServerlessAccount()) {
+    return undefined;
+  }
+
  if (userContext?.databaseAccount?.properties?.enableAnalyticalStorage) {
    return undefined;
  }
@@ -292,13 +310,8 @@ function createNewDatabase(container: Explorer): CommandButtonComponentProps {
  return {
    iconSrc: AddDatabaseIcon,
    iconAlt: label,
-    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} />);
-    },
+    onCommandClick: () =>
+      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />),
    commandButtonLabel: label,
    ariaLabel: label,
    hasPopup: true,
@@ -459,6 +472,33 @@ function createOpenQueryFromDiskButton(): CommandButtonComponentProps {
  };
 }

+function createEnableNotebooksButton(container: Explorer): CommandButtonComponentProps {
+  if (configContext.platform === Platform.Emulator) {
+    return undefined;
+  }
+  const label = "Enable Notebooks (Preview)";
+  const tooltip =
+    "Notebooks are not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
+  const description =
+    "Looks like you have not yet created a notebooks workspace for this account. To proceed and start using notebooks, we'll need to create a default notebooks workspace in this account.";
+  return {
+    iconSrc: EnableNotebooksIcon,
+    iconAlt: label,
+    onCommandClick: () =>
+      useSidePanel
+        .getState()
+        .openSidePanel(
+          label,
+          <SetupNoteBooksPanel explorer={container} panelTitle={label} panelDescription={description} />
+        ),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: !useNotebook.getState().isNotebooksEnabledForAccount,
+    ariaLabel: label,
+    tooltipText: useNotebook.getState().isNotebooksEnabledForAccount ? "" : tooltip,
+  };
+}
+
 function createOpenTerminalButton(container: Explorer): CommandButtonComponentProps {
  const label = "Open Terminal";
  return {
@@ -476,6 +516,9 @@ function createOpenMongoTerminalButton(container: Explorer): CommandButtonCompon
  const label = "Open Mongo Shell";
  const tooltip =
    "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
+  const title = "Set up workspace";
+  const description =
+    "Looks like you have not created a workspace for this account. To proceed and start using features including mongo shell and notebook, we will need to create a default workspace in this account.";
  const disableButton =
    !useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled;
  return {
@@ -484,6 +527,13 @@ function createOpenMongoTerminalButton(container: Explorer): CommandButtonCompon
    onCommandClick: () => {
      if (useNotebook.getState().isNotebookEnabled) {
        container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
+      } else {
+        useSidePanel
+          .getState()
+          .openSidePanel(
+            title,
+            <SetupNoteBooksPanel explorer={container} panelTitle={title} panelDescription={description} />
+          );
      }
    },
    commandButtonLabel: label,
@@ -498,6 +548,9 @@ function createOpenCassandraTerminalButton(container: Explorer): CommandButtonCo
  const label = "Open Cassandra Shell";
  const tooltip =
    "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
+  const title = "Set up workspace";
+  const description =
+    "Looks like you have not created a workspace for this account. To proceed and start using features including cassandra shell and notebook, we will need to create a default workspace in this account.";
  const disableButton =
    !useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled;
  return {
@@ -506,6 +559,13 @@ function createOpenCassandraTerminalButton(container: Explorer): CommandButtonCo
    onCommandClick: () => {
      if (useNotebook.getState().isNotebookEnabled) {
        container.openNotebookTerminal(ViewModels.TerminalKind.Cassandra);
+      } else {
+        useSidePanel
+          .getState()
+          .openSidePanel(
+            title,
+            <SetupNoteBooksPanel explorer={container} panelTitle={title} panelDescription={description} />
+          );
      }
    },
    commandButtonLabel: label,
--- a/src/Explorer/Menus/CommandBar/ConnectionStatusComponent.tsx
+++ b/src/Explorer/Menus/CommandBar/ConnectionStatusComponent.tsx
@@ -1,20 +1,8 @@
-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 { Icon, ProgressIndicator, Stack, TooltipHost } from "@fluentui/react";
+import { ActionButton } from "@fluentui/react/lib/Button";
 import * as React from "react";
 import "../../../../less/hostedexplorer.less";
-import { ConnectionStatusType, ContainerStatusType, Notebook } from "../../../Common/Constants";
+import { ConnectionStatusType, Notebook } from "../../../Common/Constants";
 import Explorer from "../../Explorer";
 import { useNotebook } from "../../Notebook/useNotebook";
 import "../CommandBar/ConnectionStatusComponent.less";
@@ -22,33 +10,12 @@ 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("");
  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;

@@ -68,15 +35,6 @@ export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Ele
    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);
@@ -84,13 +42,15 @@ export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Ele
    setMinute("00");
  };

+  const connectionInfo = useNotebook((state) => state.connectionInfo);
  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)
+    (connectionInfo.status === ConnectionStatusType.Connect || connectionInfo.status === ConnectionStatusType.ReConnect)
  ) {
    return (
      <ActionButton className="commandReactBtn" onClick={() => container.allocateContainer()}>
@@ -105,7 +65,6 @@ export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Ele
  }

  if (connectionInfo && connectionInfo.status === ConnectionStatusType.Connecting && isActive === false) {
-    stopTimer();
    setIsActive(true);
    setStatusColor("status connecting is-animating");
    setToolTipContent("Connecting to temporary workspace.");
@@ -119,23 +78,13 @@ export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Ele
    setToolTipContent("Click here to Reconnect to temporary workspace.");
  }
  return (
-    <>
-      <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()
      }
    >
+      <TooltipHost content={toolTipContent}>
        <Stack className="connectionStatusContainer" horizontal>
          <i className={statusColor}></i>
          <span className={connectionInfo.status === ConnectionStatusType.Failed ? "connectionStatusFailed" : ""}>
@@ -146,41 +95,13 @@ export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Ele
          )}
          {connectionInfo.status === ConnectionStatusType.Connected && !isActive && (
            <ProgressIndicator
-                className={totalGB !== 0 && usedGB / totalGB > 0.8 ? "lowMemory" : ""}
+              className={usedGB / totalGB > 0.8 ? "lowMemory" : ""}
              description={usedGB.toFixed(1) + " of " + totalGB.toFixed(1) + " GB"}
-                percentComplete={totalGB !== 0 ? usedGB / totalGB : 0}
+              percentComplete={usedGB / totalGB}
            />
          )}
        </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>
-    </>
+    </ActionButton>
  );
 };
--- a/src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx
+++ b/src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { Link } from "@fluentui/react";
 import { CellId, CellType, ImmutableNotebook } from "@nteract/commutable";
 // Vendor modules
 import {
@@ -15,15 +13,13 @@ import "@nteract/styles/editor-overrides.css";
 import "@nteract/styles/global-variables.css";
 import "codemirror/addon/hint/show-hint.css";
 import "codemirror/lib/codemirror.css";
-import { Notebook } from "Common/Constants";
-import { useDialog } from "Explorer/Controls/Dialog";
 import * as Immutable from "immutable";
 import * as React from "react";
 import { Provider } from "react-redux";
 import "react-table/react-table.css";
 import { AnyAction, Store } from "redux";
 import { NotebookClientV2 } from "../NotebookClientV2";
-import { NotebookContentProviderType, NotebookUtil } from "../NotebookUtil";
+import { NotebookUtil } from "../NotebookUtil";
 import * as NteractUtil from "../NTeractUtil";
 import * as CdbActions from "./actions";
 import { NotebookComponent } from "./NotebookComponent";
@@ -34,19 +30,6 @@ 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;
@@ -58,7 +41,7 @@ export class NotebookComponentBootstrapper {
    this.contentRef = options.contentRef;
  }

-  protected static wrapModelIntoContent(name: string, path: string, content: unknown): IWrapModel {
+  protected static wrapModelIntoContent(name: string, path: string, content: any) {
    return {
      name,
      path,
@@ -66,7 +49,7 @@ export class NotebookComponentBootstrapper {
      created: "",
      content,
      format: "json",
-      mimetype: undefined,
+      mimetype: null as any,
      size: 0,
      writeable: false,
      type: "notebook",
@@ -102,11 +85,7 @@ export class NotebookComponentBootstrapper {
    };
  }

-  public getNotebookPath(): string {
-    return this.getStore().getState().core.entities.contents.byRef.get(this.contentRef)?.filepath;
-  }
-
-  public setContent(name: string, content: unknown): void {
+  public setContent(name: string, content: any): void {
    this.getStore().dispatch(
      actions.fetchContentFulfilled({
        filepath: undefined,
@@ -137,32 +116,11 @@ export class NotebookComponentBootstrapper {

  /* Notebook operations. See nteract/packages/connected-components/src/notebook-menu/index.tsx */
  public notebookSave(): void {
-    if (
-      NotebookUtil.getContentProviderType(this.getNotebookPath()) ===
-      NotebookContentProviderType.JupyterContentProviderType
-    ) {
-      useDialog.getState().showOkCancelModalDialog(
-        Notebook.saveNotebookModalTitle,
-        undefined,
-        "Save",
-        async () => {
    this.getStore().dispatch(
      actions.save({
        contentRef: this.contentRef,
      })
    );
-        },
-        "Cancel",
-        undefined,
-        this.getSaveNotebookSubText()
-      );
-    } else {
-      this.getStore().dispatch(
-        actions.save({
-          contentRef: this.contentRef,
-        })
-      );
-    }
  }

  public notebookChangeKernel(kernelSpecName: string): void {
@@ -312,6 +270,7 @@ export class NotebookComponentBootstrapper {
  public isContentDirty(): boolean {
    const content = selectors.content(this.getStore().getState(), { contentRef: this.contentRef });
    if (!content) {
+      console.log("No error");
      return false;
    }

@@ -369,19 +328,4 @@ export class NotebookComponentBootstrapper {
  protected getStore(): Store<AppState, AnyAction> {
    return this.notebookClient.getStore();
  }
-
-  private getSaveNotebookSubText(): JSX.Element {
-    return (
-      <>
-        <p>{Notebook.saveNotebookModalContent}</p>
-        <br />
-        <p>
-          {Notebook.newNotebookModalContent2}
-          <Link href={Notebook.cosmosNotebookHomePageUrl} target="_blank">
-            {Notebook.learnMore}
-          </Link>
-        </p>
-      </>
-    );
-  }
 }
--- a/src/Explorer/Notebook/NotebookComponent/epics.ts
+++ b/src/Explorer/Notebook/NotebookComponent/epics.ts
@@ -12,12 +12,11 @@ import {
  ServerConfig as JupyterServerConfig,
 } from "@nteract/core";
 import { Channels, childOf, createMessage, JupyterMessage, message, ofMessageType } from "@nteract/messaging";
-import { defineConfigOption } from "@nteract/mythic-configuration";
 import { RecordOf } from "immutable";
-import { Action, AnyAction } from "redux";
+import { AnyAction } from "redux";
 import { ofType, StateObservable } from "redux-observable";
 import { kernels, sessions } from "rx-jupyter";
-import { concat, EMPTY, from, interval, merge, Observable, Observer, of, Subject, Subscriber, timer } from "rxjs";
+import { concat, EMPTY, from, merge, Observable, Observer, of, Subject, Subscriber, timer } from "rxjs";
 import {
  catchError,
  concatMap,
@@ -42,7 +41,7 @@ import { logConsoleError, logConsoleInfo } from "../../../Utils/NotificationCons
 import { useDialog } from "../../Controls/Dialog";
 import * as FileSystemUtil from "../FileSystemUtil";
 import * as cdbActions from "../NotebookComponent/actions";
-import { NotebookContentProviderType, NotebookUtil } from "../NotebookUtil";
+import { NotebookUtil } from "../NotebookUtil";
 import * as CdbActions from "./actions";
 import * as TextFile from "./contents/file/text-file";
 import { CdbAppState } from "./types";
@@ -949,54 +948,6 @@ const resetCellStatusOnExecuteCanceledEpic = (
  );
 };

-const { selector: autoSaveInterval } = defineConfigOption({
-  key: "autoSaveInterval",
-  label: "Auto-save interval",
-  defaultValue: 120_000,
-});
-
-/**
- * Override autoSaveCurrentContentEpic to disable auto save for notebooks under temporary workspace.
- * @param action$
- */
-export function autoSaveCurrentContentEpic(
-  action$: Observable<Action>,
-  state$: StateObservable<AppState>
-): Observable<actions.Save> {
-  return state$.pipe(
-    map((state) => autoSaveInterval(state)),
-    switchMap((time) => interval(time)),
-    mergeMap(() => {
-      const state = state$.value;
-      return from(
-        selectors
-          .contentByRef(state)
-          .filter(
-            /*
-             * Only save contents that are files or notebooks with
-             * a filepath already set.
-             */
-            (content) => (content.type === "file" || content.type === "notebook") && content.filepath !== ""
-          )
-          .keys()
-      );
-    }),
-    filter((contentRef: ContentRef) => {
-      const model = selectors.model(state$.value, { contentRef });
-      const content = selectors.content(state$.value, { contentRef });
-      if (
-        model &&
-        model.type === "notebook" &&
-        NotebookUtil.getContentProviderType(content.filepath) !== NotebookContentProviderType.JupyterContentProviderType
-      ) {
-        return selectors.notebook.isDirty(model);
-      }
-      return false;
-    }),
-    map((contentRef: ContentRef) => actions.save({ contentRef }))
-  );
-}
-
 export const allEpics = [
  addInitialCodeCellEpic,
  focusInitialCodeCellEpic,
@@ -1014,5 +965,4 @@ export const allEpics = [
  traceNotebookInfoEpic,
  traceNotebookKernelEpic,
  resetCellStatusOnExecuteCanceledEpic,
-  autoSaveCurrentContentEpic,
 ];
--- a/src/Explorer/Notebook/NotebookComponent/store.ts
+++ b/src/Explorer/Notebook/NotebookComponent/store.ts
@@ -1,12 +1,12 @@
-import { AppState, epics as coreEpics, IContentProvider, reducers } from "@nteract/core";
+import { AppState, epics as coreEpics, reducers, IContentProvider } from "@nteract/core";
+import { compose, Store, AnyAction, Middleware, Dispatch, MiddlewareAPI } from "redux";
+import { Epic } from "redux-observable";
+import { allEpics } from "./epics";
+import { coreReducer, cdbReducer } from "./reducers";
+import { catchError } from "rxjs/operators";
+import { Observable } from "rxjs";
 import { configuration } from "@nteract/mythic-configuration";
 import { makeConfigureStore } from "@nteract/myths";
-import { AnyAction, compose, Dispatch, Middleware, MiddlewareAPI, Store } from "redux";
-import { Epic } from "redux-observable";
-import { Observable } from "rxjs";
-import { catchError } from "rxjs/operators";
-import { allEpics } from "./epics";
-import { cdbReducer, coreReducer } from "./reducers";
 import { CdbAppState } from "./types";

 const composeEnhancers = (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
@@ -81,6 +81,7 @@ export const getCoreEpics = (autoStartKernelOnNotebookOpen: boolean): Epic[] =>
  // This list needs to be consistent and in sync with core.allEpics until we figure
  // out how to safely filter out the ones we are overriding here.
  const filteredCoreEpics = [
+    coreEpics.autoSaveCurrentContentEpic,
    coreEpics.executeCellEpic,
    coreEpics.executeFocusedCellEpic,
    coreEpics.executeCellAfterKernelLaunchEpic,
--- a/src/Explorer/Notebook/NotebookContainerClient.ts
+++ b/src/Explorer/Notebook/NotebookContainerClient.ts
@@ -1,32 +1,23 @@
 /**
 * 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 { ConnectionStatusType } 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 { ContainerConnectionInfo } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
-import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
+import { createOrUpdate, destroy } from "../../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { NotebookUtil } from "./NotebookUtil";
 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);
@@ -47,13 +38,10 @@ export class NotebookContainerClient {
   * Heartbeat: each ping schedules another ping
   */
  private scheduleHeartbeat(delayMs: number): void {
-    setTimeout(async () => {
-      const memoryUsageInfo = await this.getMemoryUsage();
-      useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo);
-      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
-      if (notebookServerInfo?.notebookServerEndpoint) {
-        this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
-      }
+    setTimeout(() => {
+      this.getMemoryUsage()
+        .then((memoryUsageInfo) => useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo))
+        .finally(() => this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs));
    }, delayMs);
  }

@@ -71,27 +59,6 @@ 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: {
@@ -111,36 +78,44 @@ export class NotebookContainerClient {
            freeKB: memoryUsageInfo.free,
          };
        }
-      } else if (response.status === HttpStatusCodes.NotFound) {
-        throw new AbortError(response.statusText);
+      } else if (NotebookUtil.isPhoenixEnabled()) {
+        const connectionStatus: ContainerConnectionInfo = {
+          status: ConnectionStatusType.ReConnect,
+        };
+        useNotebook.getState().resetConatinerConnection(connectionStatus);
+        useNotebook.getState().setIsRefreshed(true);
      }
-      throw new Error(response.statusText);
-    } else {
+      return undefined;
+    } catch (error) {
+      Logger.logError(getErrorMessage(error), "NotebookContainerClient/getMemoryUsage");
+      if (!this.clearReconnectionAttemptMessage) {
+        this.clearReconnectionAttemptMessage = logConsoleProgress(
+          "Connection lost with Notebook server. Attempting to reconnect..."
+        );
+      }
+      if (NotebookUtil.isPhoenixEnabled()) {
+        const connectionStatus: ContainerConnectionInfo = {
+          status: ConnectionStatusType.Failed,
+        };
+        useNotebook.getState().resetConatinerConnection(connectionStatus);
+        useNotebook.getState().setIsRefreshed(true);
+      }
+      this.onConnectionLost();
      return undefined;
    }
  }

-  private shouldExecuteMemoryCall(): boolean {
-    return (
-      useNotebook.getState().containerStatus?.status === Constants.ContainerStatusType.Active &&
-      useNotebook.getState().connectionInfo?.status === ConnectionStatusType.Connected
-    );
-  }
-
-  public async resetWorkspace(): Promise<IResponse<IPhoenixConnectionInfoResult>> {
+  public async resetWorkspace(): Promise<void> {
    this.isResettingWorkspace = true;
-    let response: IResponse<IPhoenixConnectionInfoResult>;
    try {
-      response = await this._resetWorkspace();
+      await this._resetWorkspace();
    } catch (error) {
      Promise.reject(error);
-      return response;
    }
    this.isResettingWorkspace = false;
-    return response;
  }

-  private async _resetWorkspace(): Promise<IResponse<IPhoenixConnectionInfoResult>> {
+  private async _resetWorkspace(): Promise<void> {
    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
    if (!notebookServerInfo || !notebookServerInfo.notebookServerEndpoint) {
      const error = "No server endpoint detected";
@@ -148,17 +123,15 @@ export class NotebookContainerClient {
      return Promise.reject(error);
    }

+    const { notebookServerEndpoint, authToken } = this.getNotebookServerConfig();
    try {
-      if (useNotebook.getState().isPhoenixNotebooks) {
-        const provisionData: IProvisionData = {
-          cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
-        };
-        return await this.phoenixClient.resetContainer(provisionData);
-      }
-      return null;
+      await fetch(`${notebookServerEndpoint}/api/shutdown`, {
+        method: "POST",
+        headers: { Authorization: authToken },
+      });
    } catch (error) {
      Logger.logError(getErrorMessage(error), "NotebookContainerClient/resetWorkspace");
-      throw error;
+      await this.recreateNotebookWorkspaceAsync();
    }
  }

@@ -172,11 +145,22 @@ export class NotebookContainerClient {
    };
  }

-  private getHeaders(): HeadersInit {
-    const authorizationHeader = getAuthorizationHeader();
-    return {
-      [authorizationHeader.header]: authorizationHeader.token,
-      [HttpHeaders.contentType]: "application/json",
-    };
+  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);
+    }
  }
 }
--- a/src/Explorer/Notebook/NotebookRenderer/NotebookReadOnlyRenderer.tsx
+++ b/src/Explorer/Notebook/NotebookRenderer/NotebookReadOnlyRenderer.tsx
@@ -16,10 +16,9 @@ import "./NotebookReadOnlyRenderer.less";
 import SandboxOutputs from "./outputs/SandboxOutputs";

 export interface NotebookRendererProps {
-  contentRef: ContentRef;
+  contentRef: any;
  hideInputs?: boolean;
  hidePrompts?: boolean;
-  addTransform: (component: React.ComponentType & { MIMETYPE: string }) => void;
 }

 /**
@@ -28,7 +27,7 @@ export interface NotebookRendererProps {
 class NotebookReadOnlyRenderer extends React.Component<NotebookRendererProps> {
  componentDidMount() {
    if (!userContext.features.sandboxNotebookOutputs) {
-      loadTransform(this.props as NotebookRendererProps);
+      loadTransform(this.props as any);
    }
  }

@@ -60,7 +59,7 @@ class NotebookReadOnlyRenderer extends React.Component<NotebookRendererProps> {
      <div className="NotebookReadOnlyRender">
        <Cells contentRef={this.props.contentRef}>
          {{
-            code: ({ id, contentRef }: { id: string; contentRef: ContentRef }) => (
+            code: ({ id, contentRef }: { id: any; contentRef: ContentRef }) => (
              <CodeCell id={id} contentRef={contentRef}>
                {{
                  prompt: (props: { id: string; contentRef: string }) => this.renderPrompt(props.id, props.contentRef),
@@ -74,14 +73,14 @@ class NotebookReadOnlyRenderer extends React.Component<NotebookRendererProps> {
                }}
              </CodeCell>
            ),
-            markdown: ({ id, contentRef }: { id: string; contentRef: ContentRef }) => (
+            markdown: ({ id, contentRef }: { id: any; contentRef: ContentRef }) => (
              <MarkdownCell id={id} contentRef={contentRef} cell_type="markdown">
                {{
                  editor: {},
                }}
              </MarkdownCell>
            ),
-            raw: ({ id, contentRef }: { id: string; contentRef: ContentRef }) => (
+            raw: ({ id, contentRef }: { id: any; contentRef: ContentRef }) => (
              <RawCell id={id} contentRef={contentRef} cell_type="raw">
                {{
                  editor: {
@@ -99,7 +98,6 @@ 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 {
@@ -116,4 +114,4 @@ const makeMapDispatchToProps = (initialDispatch: Dispatch, initialProps: Noteboo
  return mapDispatchToProps;
 };

-export default connect(undefined, makeMapDispatchToProps)(NotebookReadOnlyRenderer);
+export default connect(null, makeMapDispatchToProps)(NotebookReadOnlyRenderer);
--- a/src/Explorer/Notebook/NotebookRenderer/NotebookRenderer.tsx
+++ b/src/Explorer/Notebook/NotebookRenderer/NotebookRenderer.tsx
@@ -31,12 +31,13 @@ import StatusBar from "./StatusBar";
 import CellToolbar from "./Toolbar";

 export interface NotebookRendererBaseProps {
-  contentRef: any;
+  contentRef: ContentRef;
 }

 interface NotebookRendererDispatchProps {
  storeNotebookSnapshot: (imageSrc: string, requestId: string) => void;
  notebookSnapshotError: (error: string) => void;
+  addTransform: (transform: React.ComponentType & { MIMETYPE: string }) => void;
 }

 interface StateProps {
@@ -73,7 +74,7 @@ class BaseNotebookRenderer extends React.Component<NotebookRendererProps> {

  componentDidMount() {
    if (!userContext.features.sandboxNotebookOutputs) {
-      loadTransform(this.props as any);
+      loadTransform(this.props as NotebookRendererProps);
    }
  }

@@ -138,7 +139,7 @@ class BaseNotebookRenderer extends React.Component<NotebookRendererProps> {
                          }}
                        </CodeCell>
                      ),
-                    markdown: ({ id, contentRef }: { id: any; contentRef: ContentRef }) =>
+                    markdown: ({ id, contentRef }: { id: CellId; contentRef: ContentRef }) =>
                      decorate(
                        id,
                        contentRef,
@@ -155,7 +156,7 @@ class BaseNotebookRenderer extends React.Component<NotebookRendererProps> {
                        </MarkdownCell>
                      ),

-                    raw: ({ id, contentRef }: { id: any; contentRef: ContentRef }) =>
+                    raw: ({ id, contentRef }: { id: CellId; contentRef: ContentRef }) =>
                      decorate(
                        id,
                        contentRef,
@@ -202,7 +203,8 @@ export const makeMapStateToProps = (
  return mapStateToProps;
 };

-const makeMapDispatchToProps = (initialDispatch: Dispatch, initialProps: NotebookRendererBaseProps) => {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const makeMapDispatchToProps = (_initialDispatch: Dispatch, _initialProps: NotebookRendererBaseProps) => {
  const mapDispatchToProps = (dispatch: Dispatch) => {
    return {
      addTransform: (transform: React.ComponentType & { MIMETYPE: string }) =>
--- a/src/Explorer/Notebook/NotebookUtil.ts
+++ b/src/Explorer/Notebook/NotebookUtil.ts
@@ -3,19 +3,14 @@ import { AppState, selectors } from "@nteract/core";
 import domtoimage from "dom-to-image";
 import Html2Canvas from "html2canvas";
 import path from "path";
+import { userContext } from "../../UserContext";
 import * as GitHubUtils from "../../Utils/GitHubUtils";
 import * as StringUtils from "../../Utils/StringUtils";
-import * as InMemoryContentProviderUtils from "../Notebook/NotebookComponent/ContentProviders/InMemoryContentProviderUtils";
 import { SnapshotFragment } from "./NotebookComponent/types";
 import { NotebookContentItem, NotebookContentItemType } from "./NotebookContentItem";

 // Must match rx-jupyter' FileType
 export type FileType = "directory" | "file" | "notebook";
-export enum NotebookContentProviderType {
-  GitHubContentProviderType,
-  InMemoryContentProviderType,
-  JupyterContentProviderType,
-}
 // Utilities for notebooks
 export class NotebookUtil {
  public static UntrustedNotebookRunHint = "Please trust notebook first before running any code cells";
@@ -132,18 +127,6 @@ export class NotebookUtil {
    return relativePath.split("/").pop();
  }

-  public static getContentProviderType(path: string): NotebookContentProviderType {
-    if (InMemoryContentProviderUtils.fromContentUri(path)) {
-      return NotebookContentProviderType.InMemoryContentProviderType;
-    }
-
-    if (GitHubUtils.fromContentUri(path)) {
-      return NotebookContentProviderType.GitHubContentProviderType;
-    }
-
-    return NotebookContentProviderType.JupyterContentProviderType;
-  }
-
  public static replaceName(path: string, newName: string): string {
    const contentInfo = GitHubUtils.fromContentUri(path);
    if (contentInfo) {
@@ -346,4 +329,16 @@ export class NotebookUtil {
    link.click();
    document.body.removeChild(link);
  }
+
+  public static getNotebookBtnTitle(fileName: string): string {
+    if (this.isPhoenixEnabled()) {
+      return `Download to ${fileName}`;
+    } else {
+      return `Download to my notebooks`;
+    }
+  }
+
+  public static isPhoenixEnabled(): boolean {
+    return userContext.features.notebooksTemporarilyDown === false && userContext.features.phoenix === true;
+  }
 }
--- a/src/Explorer/Notebook/notebookClientV2.test.ts
+++ b/src/Explorer/Notebook/notebookClientV2.test.ts
@@ -35,7 +35,6 @@ describe("auto start kernel", () => {
        connectionInfo: {
          authToken: "autToken",
          notebookServerEndpoint: "notebookServerEndpoint",
-          forwardingId: "Id",
        },
        databaseAccountName: undefined,
        defaultExperience: undefined,
--- a/src/Explorer/Notebook/useNotebook.ts
+++ b/src/Explorer/Notebook/useNotebook.ts
@@ -1,6 +1,4 @@
-import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
 import { cloneDeep } from "lodash";
-import { PhoenixClient } from "Phoenix/PhoenixClient";
 import create, { UseStore } from "zustand";
 import { AuthType } from "../../AuthType";
 import * as Constants from "../../Common/Constants";
@@ -9,8 +7,7 @@ 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 { ContainerConnectionInfo } from "../../Contracts/DataModels";
 import { IPinnedRepo } from "../../Juno/JunoClient";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
@@ -19,6 +16,7 @@ import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
 import * as GitHubUtils from "../../Utils/GitHubUtils";
 import { NotebookContentItem, NotebookContentItemType } from "./NotebookContentItem";
 import NotebookManager from "./NotebookManager";
+import { NotebookUtil } from "./NotebookUtil";

 interface NotebookState {
  isNotebookEnabled: boolean;
@@ -37,9 +35,6 @@ interface NotebookState {
  notebookFolderName: string;
  isAllocating: boolean;
  isRefreshed: boolean;
-  containerStatus: ContainerInfo;
-  isPhoenixNotebooks: boolean;
-  isPhoenixFeatures: boolean;
  setIsNotebookEnabled: (isNotebookEnabled: boolean) => void;
  setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => void;
  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
@@ -58,12 +53,8 @@ interface NotebookState {
  initializeGitHubRepos: (pinnedRepos: IPinnedRepo[]) => void;
  setConnectionInfo: (connectionInfo: ContainerConnectionInfo) => void;
  setIsAllocating: (isAllocating: boolean) => void;
-  resetContainerConnection: (connectionStatus: ContainerConnectionInfo) => void;
+  resetConatinerConnection: (connectionStatus: ContainerConnectionInfo) => void;
  setIsRefreshed: (isAllocating: boolean) => void;
-  setContainerStatus: (containerStatus: ContainerInfo) => void;
-  getPhoenixStatus: () => Promise<void>;
-  setIsPhoenixNotebooks: (isPhoenixNotebooks: boolean) => void;
-  setIsPhoenixFeatures: (isPhoenixFeatures: boolean) => void;
 }

 export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
@@ -72,7 +63,6 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
  notebookServerInfo: {
    notebookServerEndpoint: undefined,
    authToken: undefined,
-    forwardingId: undefined,
  },
  sparkClusterConnectionInfo: {
    userName: undefined,
@@ -93,13 +83,6 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
  notebookFolderName: undefined,
  isAllocating: false,
  isRefreshed: false,
-  containerStatus: {
-    status: undefined,
-    durationLeftInMinutes: undefined,
-    notebookServerInfo: undefined,
-  },
-  isPhoenixNotebooks: undefined,
-  isPhoenixFeatures: undefined,
  setIsNotebookEnabled: (isNotebookEnabled: boolean) => set({ isNotebookEnabled }),
  setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => set({ isNotebooksEnabledForAccount }),
  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) =>
@@ -112,7 +95,6 @@ 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 ||
@@ -205,7 +187,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
    isGithubTree ? set({ gitHubNotebooksContentRoot: root }) : set({ myNotebooksContentRoot: root });
  },
  initializeNotebooksTree: async (notebookManager: NotebookManager): Promise<void> => {
-    const notebookFolderName = get().isPhoenixNotebooks ? "Temporary Notebooks" : "My Notebooks";
+    const notebookFolderName = NotebookUtil.isPhoenixEnabled() === true ? "Temporary Notebooks" : "My Notebooks";
    set({ notebookFolderName });
    const myNotebooksContentRoot = {
      name: get().notebookFolderName,
@@ -288,34 +270,13 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
  },
  setConnectionInfo: (connectionInfo: ContainerConnectionInfo) => set({ connectionInfo }),
  setIsAllocating: (isAllocating: boolean) => set({ isAllocating }),
-  resetContainerConnection: (connectionStatus: ContainerConnectionInfo): void => {
-    useTabs.getState().closeAllNotebookTabs(true);
+  resetConatinerConnection: (connectionStatus: ContainerConnectionInfo): void => {
    useNotebook.getState().setConnectionInfo(connectionStatus);
-    useNotebook.getState().setNotebookServerInfo(undefined);
-    useNotebook.getState().setIsAllocating(false);
-    useNotebook.getState().setContainerStatus({
-      status: undefined,
-      durationLeftInMinutes: undefined,
-      notebookServerInfo: undefined,
+    useNotebook.getState().setNotebookServerInfo({
+      notebookServerEndpoint: undefined,
+      authToken: undefined,
    });
+    useNotebook.getState().setIsAllocating(false);
  },
  setIsRefreshed: (isRefreshed: boolean) => set({ isRefreshed }),
-  setContainerStatus: (containerStatus: ContainerInfo) => set({ containerStatus }),
-  getPhoenixStatus: async () => {
-    if (get().isPhoenixNotebooks === undefined || get().isPhoenixFeatures === undefined) {
-      let isPhoenix = false;
-      if (userContext.features.phoenixNotebooks || userContext.features.phoenixFeatures) {
-        const phoenixClient = new PhoenixClient();
-        isPhoenix = isPublicInternetAccessAllowed() && (await phoenixClient.isDbAcountWhitelisted());
-      }
-
-      const isPhoenixNotebooks = userContext.features.phoenixNotebooks && isPhoenix;
-      const isPhoenixFeatures = userContext.features.phoenixFeatures && isPhoenix;
-
-      set({ isPhoenixNotebooks: isPhoenixNotebooks });
-      set({ isPhoenixFeatures: isPhoenixFeatures });
-    }
-  },
-  setIsPhoenixNotebooks: (isPhoenixNotebooks: boolean) => set({ isPhoenixNotebooks: isPhoenixNotebooks }),
-  setIsPhoenixFeatures: (isPhoenixFeatures: boolean) => set({ isPhoenixFeatures: isPhoenixFeatures }),
 }));
--- a/src/Explorer/OpenFullScreen.tsx
+++ b/src/Explorer/OpenFullScreen.tsx
@@ -4,8 +4,6 @@ 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,12 +23,10 @@ export const OpenFullScreen: React.FunctionComponent = () => {
        <TextField label="Read and Write" readOnly defaultValue={readWriteUrl} />
        <Stack horizontal tokens={{ childrenGap: 10 }}>
          <DefaultButton
-            ariaLabel={isReadWriteUrlCopy ? "Copied url" : "Copy"}
            onClick={() => {
              copyToClipboard(readWriteUrl);
-              setIsReadWriteUrlCopy(true);
            }}
-            text={isReadWriteUrlCopy ? "Copied" : "Copy"}
+            text="Copy"
            iconProps={{ iconName: "Copy" }}
          />
          <PrimaryButton
@@ -44,12 +40,10 @@ export const OpenFullScreen: React.FunctionComponent = () => {
        <TextField label="Read Only" readOnly defaultValue={readUrl} />
        <Stack horizontal tokens={{ childrenGap: 10 }}>
          <DefaultButton
-            ariaLabel={isReadUrlCopy ? "Copied url" : "Copy"}
            onClick={() => {
-              setIsReadUrlCopy(true);
              copyToClipboard(readUrl);
            }}
-            text={isReadUrlCopy ? "Copied" : "Copy"}
+            text="Copy"
            iconProps={{ iconName: "Copy" }}
          />
          <PrimaryButton
--- a/src/Explorer/Panes/AddCollectionPanel.tsx
+++ b/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 { 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 * 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 { CollapsibleSectionComponent } from "../Controls/CollapsiblePanel/CollapsibleSectionComponent";
 import { ThroughputInput } from "../Controls/ThroughputInput/ThroughputInput";
 import Explorer from "../Explorer";
@@ -92,7 +92,6 @@ export interface AddCollectionPanelState {
  errorMessage: string;
  showErrorDetails: boolean;
  isExecuting: boolean;
-  isThroughputCapExceeded: boolean;
 }

 export class AddCollectionPanel extends React.Component<AddCollectionPanelProps, AddCollectionPanelState> {
@@ -123,7 +122,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      errorMessage: "",
      showErrorDetails: false,
      isExecuting: false,
-      isThroughputCapExceeded: false,
    };
  }

@@ -251,9 +249,6 @@ 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)}
                  />
                )}
@@ -279,7 +274,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
            <Stack horizontal>
              <span className="mandatoryStar">*&nbsp;</span>
              <Text className="panelTextBold" variant="small">
-                {`${getCollectionName()} id`}
+                {`${getCollectionName()} ${userContext.apiType === "Mongo" ? "name" : "id"}`}
              </Text>
              <TooltipHost
                directionalHint={DirectionalHint.bottomLeftEdge}
@@ -485,9 +480,6 @@ 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;
              }}
@@ -667,7 +659,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,

                {userContext.apiType === "SQL" && (
                  <Checkbox
-                    label="My partition key is larger than 101 bytes"
+                    label="My partition key is larger than 100 bytes"
                    checked={this.state.useHashV2}
                    styles={{
                      text: { fontSize: 12 },
@@ -684,7 +676,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
          )}
        </div>

-        <PanelFooterComponent buttonLabel="OK" isButtonDisabled={this.state.isThroughputCapExceeded} />
+        <PanelFooterComponent buttonLabel="OK" />

        {this.state.isExecuting && <PanelLoadingScreen />}
      </form>
@@ -887,6 +879,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      return false;
    }

+    if (isServerlessAccount()) {
+      return false;
+    }
+
    switch (userContext.apiType) {
      case "SQL":
      case "Mongo":
@@ -1003,7 +999,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.isSharded ? this.state.partitionKey.trim() : undefined;
+    let partitionKeyString = this.state.partitionKey.trim();

    if (userContext.apiType === "Tables") {
      // Table require fixed Database: TablesDB, and fixed Partition Key: /'$pk'
--- a/src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx
+++ b/src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx
@@ -52,7 +52,6 @@ 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;

@@ -80,9 +79,7 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
      dataExplorerArea: Constants.Areas.ContextualPane,
    };
    TelemetryProcessor.trace(Action.CreateDatabase, ActionModifiers.Open, addDatabasePaneOpenMessage);
-    if (buttonElement) {
    buttonElement.focus();
-    }
  }, []);

  const onSubmit = () => {
@@ -172,7 +169,6 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
    formError: formErrors,
    isExecuting,
    submitButtonText: "OK",
-    isSubmitButtonDisabled: isThroughputCapExceeded,
    onSubmit,
  };

@@ -243,7 +239,6 @@ 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)}
          />
        )}
--- a/src/Explorer/Panes/AddDatabasePanel/snapshots/AddDatabasePanel.test.tsx.snap
+++ b/src/Explorer/Panes/AddDatabasePanel/snapshots/AddDatabasePanel.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`AddDatabasePane Pane should render Default properly 1`] = `
 <RightPaneForm
  formError=""
  isExecuting={false}
-  isSubmitButtonDisabled={false}
  onSubmit={[Function]}
  submitButtonText="OK"
 >
@@ -93,7 +92,6 @@ exports[`AddDatabasePane Pane should render Default properly 1`] = `
      isSharded={true}
      onCostAcknowledgeChange={[Function]}
      setIsAutoscale={[Function]}
-      setIsThroughputCapExceeded={[Function]}
      setThroughputValue={[Function]}
    />
  </div>
--- a/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
+++ b/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 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 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 { ThroughputInput } from "../../Controls/ThroughputInput/ThroughputInput";
 import Explorer from "../../Explorer";
 import { CassandraAPIDataClient } from "../../Tables/TableDataClient";
@@ -43,7 +43,6 @@ 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 = {
@@ -150,7 +149,6 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
    formError,
    isExecuting,
    submitButtonText: "OK",
-    isSubmitButtonDisabled: isThroughputCapExceeded,
    onSubmit,
  };

@@ -264,7 +262,6 @@ 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,10 +331,9 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
          <ThroughputInput
            showFreeTierExceedThroughputTooltip={isFreeTierAccount && !useDatabases.getState().isFirstResourceCreated()}
            isDatabase={false}
-            isSharded
+            isSharded={false}
            setThroughputValue={(throughput: number) => (tableThroughput = throughput)}
            setIsAutoscale={(isAutoscale: boolean) => (isTableAutoscale = isAutoscale)}
-            setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}
            onCostAcknowledgeChange={(isAcknowledged: boolean) => (isCostAcknowledged = isAcknowledged)}
          />
        )}
--- a/src/Explorer/Panes/CopyNotebookPane/CopyNotebookPane.tsx
+++ b/src/Explorer/Panes/CopyNotebookPane/CopyNotebookPane.tsx
@@ -5,6 +5,7 @@ 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";
@@ -75,7 +76,7 @@ export const CopyNotebookPane: FunctionComponent<CopyNotebookPanelProps> = ({
          selectedLocation.owner,
          selectedLocation.repo
        )} - ${selectedLocation.branch}`;
-      } else if (selectedLocation.type === "MyNotebooks" && useNotebook.getState().isPhoenixNotebooks) {
+      } else if (selectedLocation.type === "MyNotebooks" && userContext.features.phoenix) {
        destination = useNotebook.getState().notebookFolderName;
      }

--- a/src/Explorer/Panes/DeleteCollectionConfirmationPane/DeleteCollectionConfirmationPane.tsx
+++ b/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 { 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 { 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 { useDatabases } from "../../useDatabases";
 import { useSelectedNode } from "../../useSelectedNode";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
@@ -38,7 +38,7 @@ export const DeleteCollectionConfirmationPane: FunctionComponent<DeleteCollectio
  const onSubmit = async (): Promise<void> => {
    const collection = useSelectedNode.getState().findSelectedCollection();
    if (!collection || inputCollectionName !== collection.id()) {
-      const errorMessage = "Input " + collectionName + " id does not match the selected " + collectionName;
+      const errorMessage = "Input " + collectionName + " name does not match the selected " + collectionName;
      setFormError(errorMessage);
      NotificationConsoleUtils.logConsoleError(
        `Error while deleting ${collectionName} ${collection.id()}: ${errorMessage}`
--- a/src/Explorer/Panes/DeleteCollectionConfirmationPane/snapshots/DeleteCollectionConfirmationPane.test.tsx.snap
+++ b/src/Explorer/Panes/DeleteCollectionConfirmationPane/snapshots/DeleteCollectionConfirmationPane.test.tsx.snap
@@ -369,21 +369,18 @@ 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={
@@ -663,7 +660,6 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
            >
              <CustomizedDefaultButton
                ariaLabel="OK"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -945,7 +941,6 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
              >
                <DefaultButton
                  ariaLabel="OK"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -1228,7 +1223,6 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
                  <BaseButton
                    ariaLabel="OK"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/DeleteDatabaseConfirmationPanel.tsx
+++ b/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 { 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 { 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 { useDatabases } from "../useDatabases";
 import { useSelectedNode } from "../useSelectedNode";
 import { PanelInfoErrorComponent, PanelInfoErrorProps } from "./PanelInfoErrorComponent";
--- a/src/Explorer/Panes/ExecuteSprocParamsPane/ExecuteSprocParamsPane.tsx
+++ b/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, useRef, useState } from "react";
+import React, { FunctionComponent, useState } from "react";
 import AddPropertyIcon from "../../../../images/Add-property.svg";
 import { useSidePanel } from "../../../hooks/useSidePanel";
 import { logConsoleError } from "../../../Utils/NotificationConsoleUtils";
@@ -25,16 +25,19 @@ 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[] = paramKeyValuesRef.current;
+    const unwrappedParams: UnwrappedExecuteSprocParam[] = paramKeyValues;
    for (let i = 0; i < unwrappedParams.length; i++) {
      const { key: paramType, text: paramValue } = unwrappedParams[i];
      if (paramType === "custom" && (paramValue === "" || paramValue === undefined)) {
@@ -50,9 +53,8 @@ export const ExecuteSprocParamsPane: FunctionComponent<ExecuteSprocParamsPanePro
  };

  const submit = (): void => {
-    const wrappedSprocParams: UnwrappedExecuteSprocParam[] = paramKeyValuesRef.current;
-    const partitionValue: string = partitionValueRef.current;
-    const partitionKey: string = partitionKeyRef.current;
+    const wrappedSprocParams: UnwrappedExecuteSprocParam[] = paramKeyValues;
+    const { key: partitionKey } = selectedKey;
    if (partitionKey === "custom" && (partitionValue === "" || partitionValue === undefined)) {
      setInvalidParamError(partitionValue);
      return;
@@ -76,21 +78,37 @@ export const ExecuteSprocParamsPane: FunctionComponent<ExecuteSprocParamsPanePro
  };

  const deleteParamAtIndex = (indexToRemove: number): void => {
-    paramKeyValuesRef.current.splice(indexToRemove, 1);
-    setNumberOfParams(numberOfParams - 1);
+    const cloneParamKeyValue = [...paramKeyValues];
+    cloneParamKeyValue.splice(indexToRemove, 1);
+    setParamKeyValues(cloneParamKeyValue);
  };

  const addNewParamAtIndex = (indexToAdd: number): void => {
-    paramKeyValuesRef.current.splice(indexToAdd, 0, { key: "string", text: "" });
-    setNumberOfParams(numberOfParams + 1);
+    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);
  };

  const addNewParamAtLastIndex = (): void => {
-    paramKeyValuesRef.current.push({
-      key: "string",
-      text: "",
-    });
-    setNumberOfParams(numberOfParams + 1);
+    const cloneParamKeyValue = [...paramKeyValues];
+    cloneParamKeyValue.splice(cloneParamKeyValue.length, 0, { key: "string", text: "" });
+    setParamKeyValues(cloneParamKeyValue);
  };

  const props: RightPaneFormProps = {
@@ -100,53 +118,47 @@ 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) => (partitionValueRef.current = newInput)}
-          onParamKeyChange={(_event: React.FormEvent<HTMLDivElement>, item: IDropdownOption) =>
-            (partitionKeyRef.current = item.key.toString())
-          }
-          paramValue={partitionValueRef.current}
-          selectedKey={partitionKeyRef.current}
+            onParamValueChange={(_event, newInput?: string) => {
+              setPartitionValue(newInput);
+            }}
+            onParamKeyChange={onPartitionKeyChange}
+            paramValue={partitionValue}
+            selectedKey={selectedKey.key}
          />
-        {getInputParameterComponent()}
-        <Stack horizontal onClick={() => addNewParamAtLastIndex()} tabIndex={0}>
+          {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>
    </RightPaneForm>
  );
 };
--- a/src/Explorer/Panes/ExecuteSprocParamsPane/InputParameter.tsx
+++ b/src/Explorer/Panes/ExecuteSprocParamsPane/InputParameter.tsx
@@ -55,7 +55,7 @@ export const InputParameter: FunctionComponent<InputParameterProps> = ({
      <Stack horizontal>
        <Dropdown
          label={dropdownLabel && dropdownLabel}
-          defaultSelectedKey={selectedKey}
+          selectedKey={selectedKey}
          onChange={onParamKeyChange}
          options={options}
          styles={dropdownStyles}
@@ -64,9 +64,8 @@ export const InputParameter: FunctionComponent<InputParameterProps> = ({
        <TextField
          label={inputLabel && inputLabel}
          id="confirmCollectionId"
-          defaultValue={paramValue}
+          value={paramValue}
          onChange={onParamValueChange}
-          tabIndex={0}
        />
        {isAddRemoveVisible && (
          <>
--- a/src/Explorer/Panes/ExecuteSprocParamsPane/snapshots/ExecuteSprocParamsPane.test.tsx.snap
+++ b/src/Explorer/Panes/ExecuteSprocParamsPane/snapshots/ExecuteSprocParamsPane.test.tsx.snap
@@ -15,6 +15,9 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
    <form
      className="panelFormWrapper"
      onSubmit={[Function]}
+    >
+      <div
+        className="panelFormWrapper"
      >
        <div
          className="panelMainContent"
@@ -319,7 +322,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                className="ms-Stack css-54"
              >
                <Dropdown
-                defaultSelectedKey="string"
                  key=".0:$.0"
                  label="Key"
                  onChange={[Function]}
@@ -335,6 +337,7 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                      },
                    ]
                  }
+                  selectedKey="string"
                  styles={
                    Object {
                      "dropdown": Object {
@@ -345,7 +348,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                  tabIndex={0}
                >
                  <DropdownBase
-                  defaultSelectedKey="string"
                    label="Key"
                    onChange={[Function]}
                    options={
@@ -360,6 +362,7 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                        },
                      ]
                    }
+                    selectedKey="string"
                    styles={[Function]}
                    tabIndex={0}
                    theme={
@@ -637,7 +640,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                    }
                  >
                    <DropdownInternal
-                    defaultSelectedKey="string"
                      hoisted={
                        Object {
                          "rootRef": [Function],
@@ -662,6 +664,7 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                        ]
                      }
                      responsiveMode={3}
+                      selectedKey="string"
                      styles={[Function]}
                      tabIndex={0}
                      theme={
@@ -1566,7 +1569,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                  key=".0:$.1"
                  label="Value"
                  onChange={[Function]}
-                tabIndex={0}
                >
                  <TextFieldBase
                    deferredValidationTime={200}
@@ -1575,7 +1577,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                    onChange={[Function]}
                    resizable={true}
                    styles={[Function]}
-                  tabIndex={0}
                    theme={
                      Object {
                        "disableGlobalClassNames": false,
@@ -2161,7 +2162,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                            onChange={[Function]}
                            onFocus={[Function]}
                            onInput={[Function]}
-                          tabIndex={0}
                            type="text"
                            value=""
                          />
@@ -2477,7 +2477,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                className="ms-Stack css-54"
              >
                <Dropdown
-                defaultSelectedKey="string"
                  key=".0:$.0"
                  label="Key"
                  onChange={[Function]}
@@ -2493,6 +2492,7 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                      },
                    ]
                  }
+                  selectedKey="string"
                  styles={
                    Object {
                      "dropdown": Object {
@@ -2503,7 +2503,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                  tabIndex={0}
                >
                  <DropdownBase
-                  defaultSelectedKey="string"
                    label="Key"
                    onChange={[Function]}
                    options={
@@ -2518,6 +2517,7 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                        },
                      ]
                    }
+                    selectedKey="string"
                    styles={[Function]}
                    tabIndex={0}
                    theme={
@@ -2795,7 +2795,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                    }
                  >
                    <DropdownInternal
-                    defaultSelectedKey="string"
                      hoisted={
                        Object {
                          "rootRef": [Function],
@@ -2820,6 +2819,7 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                        ]
                      }
                      responsiveMode={3}
+                      selectedKey="string"
                      styles={[Function]}
                      tabIndex={0}
                      theme={
@@ -3720,22 +3720,19 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                  </DropdownBase>
                </Dropdown>
                <StyledTextFieldBase
-                defaultValue=""
                  id="confirmCollectionId"
                  key=".0:$.1"
                  label="Param"
                  onChange={[Function]}
-                tabIndex={0}
+                  value=""
                >
                  <TextFieldBase
-                  defaultValue=""
                    deferredValidationTime={200}
                    id="confirmCollectionId"
                    label="Param"
                    onChange={[Function]}
                    resizable={true}
                    styles={[Function]}
-                  tabIndex={0}
                    theme={
                      Object {
                        "disableGlobalClassNames": false,
@@ -4010,6 +4007,7 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                      }
                    }
                    validateOnLoad={true}
+                    value=""
                  >
                    <div
                      className="ms-TextField root-75"
@@ -4321,7 +4319,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                            onChange={[Function]}
                            onFocus={[Function]}
                            onInput={[Function]}
-                          tabIndex={0}
                            type="text"
                            value=""
                          />
@@ -5305,23 +5302,21 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
            </div>
          </Stack>
        </div>
+      </div>
      <PanelFooterComponent
        buttonLabel="Execute"
-        isButtonDisabled={false}
      >
        <div
          className="panelFooter"
        >
          <CustomizedPrimaryButton
            ariaLabel="Execute"
-            disabled={false}
            id="sidePanelOkButton"
            text="Execute"
            type="submit"
          >
            <PrimaryButton
              ariaLabel="Execute"
-              disabled={false}
              id="sidePanelOkButton"
              text="Execute"
              theme={
@@ -5601,7 +5596,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="Execute"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -5883,7 +5877,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
              >
                <DefaultButton
                  ariaLabel="Execute"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -6166,7 +6159,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                  <BaseButton
                    ariaLabel="Execute"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/GitHubReposPanel/GitHubReposPanel.tsx
+++ b/src/Explorer/Panes/GitHubReposPanel/GitHubReposPanel.tsx
@@ -35,9 +35,6 @@ 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;
@@ -119,8 +116,6 @@ 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");
      }
@@ -212,14 +207,6 @@ 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");
@@ -311,17 +298,6 @@ 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];
    }
@@ -398,7 +374,6 @@ 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);
--- a/src/Explorer/Panes/GitHubReposPanel/snapshots/GitHubReposPanel.test.tsx.snap
+++ b/src/Explorer/Panes/GitHubReposPanel/snapshots/GitHubReposPanel.test.tsx.snap
@@ -23,13 +23,7 @@ exports[`GitHub Repos Panel should render Default properly 1`] = `
            "isTabsContentExpanded": [Function],
            "onRefreshDatabasesKeyPress": [Function],
            "onRefreshResourcesClick": [Function],
-            "phoenixClient": PhoenixClient {
-              "retryOptions": Object {
-                "maxTimeout": 5000,
-                "minTimeout": 5000,
-                "retries": 3,
-              },
-            },
+            "phoenixClient": PhoenixClient {},
            "provideFeedbackEmail": [Function],
            "queriesClient": QueriesClient {
              "container": [Circular],
--- a/src/Explorer/Panes/PanelFooterComponent.tsx
+++ b/src/Explorer/Panes/PanelFooterComponent.tsx
@@ -3,20 +3,12 @@ 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}
-      disabled={!!isButtonDisabled}
-    />
+    <PrimaryButton type="submit" id="sidePanelOkButton" text={buttonLabel} ariaLabel={buttonLabel} />
  </div>
 );
--- a/src/Explorer/Panes/RightPaneForm/RightPaneForm.tsx
+++ b/src/Explorer/Panes/RightPaneForm/RightPaneForm.tsx
@@ -9,7 +9,6 @@ export interface RightPaneFormProps {
  onSubmit: () => void;
  submitButtonText: string;
  isSubmitButtonHidden?: boolean;
-  isSubmitButtonDisabled?: boolean;
  children?: ReactNode;
 }

@@ -19,7 +18,6 @@ export const RightPaneForm: FunctionComponent<RightPaneFormProps> = ({
  onSubmit,
  submitButtonText,
  isSubmitButtonHidden = false,
-  isSubmitButtonDisabled = false,
  children,
 }: RightPaneFormProps) => {
  const handleOnSubmit = (event: React.FormEvent<HTMLFormElement>) => {
@@ -32,9 +30,7 @@ export const RightPaneForm: FunctionComponent<RightPaneFormProps> = ({
      <form className="panelFormWrapper" onSubmit={handleOnSubmit}>
        {formError && <PanelInfoErrorComponent messageType="error" message={formError} showErrorDetails={true} />}
        {children}
-        {!isSubmitButtonHidden && (
-          <PanelFooterComponent buttonLabel={submitButtonText} isButtonDisabled={isSubmitButtonDisabled} />
-        )}
+        {!isSubmitButtonHidden && <PanelFooterComponent buttonLabel={submitButtonText} />}
      </form>
      {isExecuting && <PanelLoadingScreen />}
    </>
--- a/src/Explorer/Panes/RightPaneForm/snapshots/RightPaneForm.test.tsx.snap
+++ b/src/Explorer/Panes/RightPaneForm/snapshots/RightPaneForm.test.tsx.snap
@@ -14,21 +14,18 @@ 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={
@@ -308,7 +305,6 @@ exports[`Right Pane Form should render Default properly 1`] = `
          >
            <CustomizedDefaultButton
              ariaLabel="Load"
-              disabled={false}
              id="sidePanelOkButton"
              onRenderDescription={[Function]}
              primary={true}
@@ -590,7 +586,6 @@ exports[`Right Pane Form should render Default properly 1`] = `
            >
              <DefaultButton
                ariaLabel="Load"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -873,7 +868,6 @@ exports[`Right Pane Form should render Default properly 1`] = `
                <BaseButton
                  ariaLabel="Load"
                  baseClassName="ms-Button"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -1,13 +1,13 @@
 import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton } 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 { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
-import * as StringUtility from "Shared/StringUtility";
-import { userContext } from "UserContext";
-import { logConsoleInfo } from "Utils/NotificationConsoleUtils";
+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 { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";

 export const SettingsPane: FunctionComponent = () => {
@@ -113,50 +113,20 @@ export const SettingsPane: FunctionComponent = () => {
  const handleOnPageOptionChange = (ev: React.FormEvent<HTMLInputElement>, option: IChoiceGroupOption): void => {
    setPageOption(option.key);
  };
-
-  const choiceButtonStyles = {
-    root: {
-      clear: "both",
-    },
-    flexContainer: [
-      {
-        selectors: {
-          ".ms-ChoiceFieldGroup root-133": {
-            clear: "both",
-          },
-          ".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">
-              <fieldset>
-                <legend id="pageOptions" className="settingsSectionLabel legendLabel">
-                  Page Options
-                </legend>
+            <div className="settingsSectionPart pageOptionsPart">
+              <div className="settingsSectionLabel">
+                Page options
                <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>
-                <ChoiceGroup
-                  ariaLabelledBy="pageOptions"
-                  selectedKey={pageOption}
-                  options={pageOptionList}
-                  styles={choiceButtonStyles}
-                  onChange={handleOnPageOptionChange}
-                />
-              </fieldset>
+              </div>
+              <ChoiceGroup selectedKey={pageOption} options={pageOptionList} onChange={handleOnPageOptionChange} />
            </div>
            <div className="tabs settingsSectionPart">
              {isCustomPageOptionSelected() && (
--- a/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
+++ b/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
@@ -14,20 +14,17 @@ exports[`Settings Pane should render Default properly 1`] = `
      className="settingsSection"
    >
      <div
-        className="settingsSectionPart"
+        className="settingsSectionPart pageOptionsPart"
      >
-        <fieldset>
-          <legend
-            className="settingsSectionLabel legendLabel"
-            id="pageOptions"
+        <div
+          className="settingsSectionLabel"
        >
-            Page Options
-          </legend>
+          Page options
          <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>
        <StyledChoiceGroup
-            ariaLabelledBy="pageOptions"
          onChange={[Function]}
          options={
            Array [
@@ -42,31 +39,7 @@ 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,
-                      },
-                      ".ms-ChoiceFieldGroup root-133": Object {
-                        "clear": "both",
-                      },
-                    },
-                  },
-                ],
-                "root": Object {
-                  "clear": "both",
-                },
-              }
-            }
        />
-        </fieldset>
      </div>
      <div
        className="tabs settingsSectionPart"
--- a/src/Explorer/Panes/SetupNotebooksPanel/SetupNotebooksPanel.test.tsx
+++ b/src/Explorer/Panes/SetupNotebooksPanel/SetupNotebooksPanel.test.tsx
@@ -0,0 +1,50 @@
+import { PrimaryButton } from "@fluentui/react";
+import { mount } from "enzyme";
+import React from "react";
+import Explorer from "../../Explorer";
+import { SetupNoteBooksPanel } from "./SetupNotebooksPanel";
+
+describe("Setup Notebooks Panel", () => {
+  it("should render Default properly", () => {
+    const fakeExplorer = {} as Explorer;
+    const props = {
+      explorer: fakeExplorer,
+      closePanel: (): void => undefined,
+      openNotificationConsole: (): void => undefined,
+      panelTitle: "",
+      panelDescription: "",
+    };
+    const wrapper = mount(<SetupNoteBooksPanel {...props} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should render button", () => {
+    const fakeExplorer = {} as Explorer;
+    const props = {
+      explorer: fakeExplorer,
+      closePanel: (): void => undefined,
+      openNotificationConsole: (): void => undefined,
+      panelTitle: "",
+      panelDescription: "",
+    };
+    const wrapper = mount(<SetupNoteBooksPanel {...props} />);
+    const button = wrapper.find("PrimaryButton").first();
+    expect(button).toBeDefined();
+  });
+
+  it("Button onClick should call onCompleteSetup", () => {
+    const onCompleteSetupClick = jest.fn();
+    const wrapper = mount(<PrimaryButton onClick={onCompleteSetupClick} />);
+    wrapper.find("button").simulate("click");
+
+    expect(onCompleteSetupClick).toHaveBeenCalled();
+  });
+
+  it("Button onKeyPress should call onCompleteSetupKeyPress", () => {
+    const onCompleteSetupKeyPress = jest.fn();
+    const wrapper = mount(<PrimaryButton onKeyPress={onCompleteSetupKeyPress} />);
+    wrapper.find("button").simulate("keypress");
+
+    expect(onCompleteSetupKeyPress).toHaveBeenCalled();
+  });
+});
--- a/src/Explorer/Panes/SetupNotebooksPanel/SetupNotebooksPanel.tsx
+++ b/src/Explorer/Panes/SetupNotebooksPanel/SetupNotebooksPanel.tsx
@@ -0,0 +1,121 @@
+import { PrimaryButton } from "@fluentui/react";
+import { useBoolean } from "@fluentui/react-hooks";
+import React, { FunctionComponent, KeyboardEvent, useState } from "react";
+import { Areas, NormalizedEventKey } from "../../../Common/Constants";
+import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
+import { useSidePanel } from "../../../hooks/useSidePanel";
+import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
+import { userContext } from "../../../UserContext";
+import { createOrUpdate } from "../../../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
+import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils";
+import Explorer from "../../Explorer";
+import { PanelInfoErrorComponent } from "../PanelInfoErrorComponent";
+import { PanelLoadingScreen } from "../PanelLoadingScreen";
+interface SetupNoteBooksPanelProps {
+  explorer: Explorer;
+  panelTitle: string;
+  panelDescription: string;
+}
+
+export const SetupNoteBooksPanel: FunctionComponent<SetupNoteBooksPanelProps> = ({
+  explorer,
+  panelTitle,
+  panelDescription,
+}: SetupNoteBooksPanelProps): JSX.Element => {
+  const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
+
+  const description = panelDescription;
+  const [isLoading, { setTrue: setLoadingTrue, setFalse: setLoadingFalse }] = useBoolean(false);
+  const [errorMessage, setErrorMessage] = useState<string>("");
+  const [showErrorDetails, setShowErrorDetails] = useState<boolean>(false);
+
+  const onCompleteSetupClick = async () => {
+    await setupNotebookWorkspace();
+  };
+
+  const onCompleteSetupKeyPress = async (event: KeyboardEvent<HTMLButtonElement>) => {
+    if (event.key === " " || event.key === NormalizedEventKey.Enter) {
+      await setupNotebookWorkspace();
+      event.stopPropagation();
+      return false;
+    }
+    return true;
+  };
+
+  const setupNotebookWorkspace = async (): Promise<void> => {
+    if (!explorer) {
+      return;
+    }
+
+    const startKey: number = TelemetryProcessor.traceStart(Action.CreateNotebookWorkspace, {
+      dataExplorerArea: Areas.ContextualPane,
+      paneTitle: panelTitle,
+    });
+
+    const clear = NotificationConsoleUtils.logConsoleProgress("Creating a new default notebook workspace");
+
+    try {
+      setLoadingTrue();
+      await createOrUpdate(
+        userContext.subscriptionId,
+        userContext.resourceGroup,
+        userContext.databaseAccount.name,
+        "default"
+      );
+      explorer.refreshExplorer();
+
+      closeSidePanel();
+
+      TelemetryProcessor.traceSuccess(
+        Action.CreateNotebookWorkspace,
+        {
+          dataExplorerArea: Areas.ContextualPane,
+          paneTitle: panelTitle,
+        },
+        startKey
+      );
+      NotificationConsoleUtils.logConsoleInfo("Successfully created a default notebook workspace for the account");
+    } catch (error) {
+      const errorMessage = getErrorMessage(error);
+      TelemetryProcessor.traceFailure(
+        Action.CreateNotebookWorkspace,
+        {
+          dataExplorerArea: Areas.ContextualPane,
+          paneTitle: panelTitle,
+          error: errorMessage,
+          errorStack: getErrorStack(error),
+        },
+        startKey
+      );
+      setErrorMessage(`Failed to setup a default notebook workspace: ${errorMessage}`);
+      setShowErrorDetails(true);
+      NotificationConsoleUtils.logConsoleError(`Failed to create a default notebook workspace: ${errorMessage}`);
+    } finally {
+      setLoadingFalse();
+      clear();
+    }
+  };
+
+  return (
+    <form className="panelFormWrapper">
+      {errorMessage && (
+        <PanelInfoErrorComponent message={errorMessage} messageType="error" showErrorDetails={showErrorDetails} />
+      )}
+      <div className="panelMainContent">
+        <div className="pkPadding">
+          <div>{description}</div>
+          <PrimaryButton
+            id="completeSetupBtn"
+            className="btncreatecoll1 btnSetupQueries"
+            text="Complete Setup"
+            onClick={onCompleteSetupClick}
+            onKeyPress={onCompleteSetupKeyPress}
+            aria-label="Complete setup"
+          />
+        </div>
+      </div>
+      {isLoading && <PanelLoadingScreen />}
+    </form>
+  );
+};
--- a/src/Explorer/Panes/SetupNotebooksPanel/snapshots/SetupNotebooksPanel.test.tsx.snap
+++ b/src/Explorer/Panes/SetupNotebooksPanel/snapshots/SetupNotebooksPanel.test.tsx.snap
--- a/src/Explorer/Panes/StringInputPane/StringInputPane.tsx
+++ b/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 { logConsoleError, logConsoleInfo, logConsoleProgress } from "Utils/NotificationConsoleUtils";
+import * as ViewModels from "../../../Contracts/ViewModels";
+import { useTabs } from "../../../hooks/useTabs";
+import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../../Utils/NotificationConsoleUtils";
 import * as FileSystemUtil from "../../Notebook/FileSystemUtil";
 import { NotebookContentItem } from "../../Notebook/NotebookContentItem";
 import NotebookV2Tab from "../../Tabs/NotebookV2Tab";
--- a/src/Explorer/Panes/StringInputPane/snapshots/StringInputPane.test.tsx.snap
+++ b/src/Explorer/Panes/StringInputPane/snapshots/StringInputPane.test.tsx.snap
@@ -13,13 +13,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
      "isTabsContentExpanded": [Function],
      "onRefreshDatabasesKeyPress": [Function],
      "onRefreshResourcesClick": [Function],
-      "phoenixClient": PhoenixClient {
-        "retryOptions": Object {
-          "maxTimeout": 5000,
-          "minTimeout": 5000,
-          "retries": 3,
-        },
-      },
+      "phoenixClient": PhoenixClient {},
      "provideFeedbackEmail": [Function],
      "queriesClient": QueriesClient {
        "container": [Circular],
@@ -681,21 +675,18 @@ 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={
@@ -975,7 +966,6 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="Create"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -1257,7 +1247,6 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
              >
                <DefaultButton
                  ariaLabel="Create"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -1540,7 +1529,6 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                  <BaseButton
                    ariaLabel="Create"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/Tables/TableQuerySelectPanel/snapshots/TableQuerySelectPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/TableQuerySelectPanel/snapshots/TableQuerySelectPanel.test.tsx.snap
@@ -1262,21 +1262,18 @@ 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={
@@ -1556,7 +1553,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="OK"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -1838,7 +1834,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
              >
                <DefaultButton
                  ariaLabel="OK"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -2121,7 +2116,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
                  <BaseButton
                    ariaLabel="OK"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx
+++ b/src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx
@@ -24,7 +24,6 @@ const {
  Ascii,
  Bigint,
  Blob,
-  Date: DateType,
  Decimal,
  Float,
  Int,
@@ -34,7 +33,6 @@ const {
  Inet,
  Smallint,
  Tinyint,
-  Timestamp,
 } = TableConstants.CassandraType;
 export const cassandraOptions = [
  { key: Text, text: Text },
@@ -42,7 +40,6 @@ export const cassandraOptions = [
  { key: Bigint, text: Bigint },
  { key: Blob, text: Blob },
  { key: Boolean, text: Boolean },
-  { key: DateType, text: DateType },
  { key: Decimal, text: Decimal },
  { key: Double, text: Double },
  { key: Float, text: Float },
@@ -53,7 +50,6 @@ export const cassandraOptions = [
  { key: Inet, text: Inet },
  { key: Smallint, text: Smallint },
  { key: Tinyint, text: Tinyint },
-  { key: Timestamp, text: Timestamp },
 ];

 export const imageProps: IImageProps = {
--- a/src/Explorer/Panes/Tables/snapshots/AddTableEntityPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/snapshots/AddTableEntityPanel.test.tsx.snap
@@ -356,21 +356,18 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
      </div>
      <PanelFooterComponent
        buttonLabel="Add Entity"
-        isButtonDisabled={false}
      >
        <div
          className="panelFooter"
        >
          <CustomizedPrimaryButton
            ariaLabel="Add Entity"
-            disabled={false}
            id="sidePanelOkButton"
            text="Add Entity"
            type="submit"
          >
            <PrimaryButton
              ariaLabel="Add Entity"
-              disabled={false}
              id="sidePanelOkButton"
              text="Add Entity"
              theme={
@@ -650,7 +647,6 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="Add Entity"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -932,7 +928,6 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
              >
                <DefaultButton
                  ariaLabel="Add Entity"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -1215,7 +1210,6 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
                  <BaseButton
                    ariaLabel="Add Entity"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/Tables/snapshots/EditTableEntityPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/snapshots/EditTableEntityPanel.test.tsx.snap
@@ -357,21 +357,18 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
      </div>
      <PanelFooterComponent
        buttonLabel="Update"
-        isButtonDisabled={false}
      >
        <div
          className="panelFooter"
        >
          <CustomizedPrimaryButton
            ariaLabel="Update"
-            disabled={false}
            id="sidePanelOkButton"
            text="Update"
            type="submit"
          >
            <PrimaryButton
              ariaLabel="Update"
-              disabled={false}
              id="sidePanelOkButton"
              text="Update"
              theme={
@@ -651,7 +648,6 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="Update"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -933,7 +929,6 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
              >
                <DefaultButton
                  ariaLabel="Update"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -1216,7 +1211,6 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
                  <BaseButton
                    ariaLabel="Update"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/UploadFilePane/UploadFilePane.tsx
+++ b/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 { logConsoleError, logConsoleInfo, logConsoleProgress } from "Utils/NotificationConsoleUtils";
+import { Upload } from "../../../Common/Upload/Upload";
+import { useSidePanel } from "../../../hooks/useSidePanel";
+import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../../Utils/NotificationConsoleUtils";
 import { NotebookContentItem } from "../../Notebook/NotebookContentItem";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";

--- a/src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx
+++ b/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 { logConsoleError } from "Utils/NotificationConsoleUtils";
+import { Upload } from "../../../Common/Upload/Upload";
+import { UploadDetailsRecord } from "../../../Contracts/ViewModels";
+import { logConsoleError } from "../../../Utils/NotificationConsoleUtils";
 import { getErrorMessage } from "../../Tables/Utilities";
 import { useSelectedNode } from "../../useSelectedNode";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
--- a/src/Explorer/Panes/snapshots/DeleteDatabaseConfirmationPanel.test.tsx.snap
+++ b/src/Explorer/Panes/snapshots/DeleteDatabaseConfirmationPanel.test.tsx.snap
@@ -1041,21 +1041,18 @@ 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={
@@ -1335,7 +1332,6 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="OK"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -1617,7 +1613,6 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
              >
                <DefaultButton
                  ariaLabel="OK"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -1900,7 +1895,6 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
                  <BaseButton
                    ariaLabel="OK"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/SplashScreen/SplashScreen.tsx
+++ b/src/Explorer/SplashScreen/SplashScreen.tsx
@@ -84,7 +84,9 @@ 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");
+    }

    const tipsItems = this.createTipsItems();
    const onClearRecent = this.clearMostRecent;
@@ -221,7 +223,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
      });
    }

-    if (useNotebook.getState().isPhoenixNotebooks) {
+    if (useNotebook.getState().isNotebookEnabled && !userContext.features.notebooksTemporarilyDown) {
      heroes.push({
        iconSrc: NewNotebookIcon,
        title: "New Notebook",
@@ -305,24 +307,23 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
        iconSrc: AddDatabaseIcon,
        title: "New " + getDatabaseName(),
        description: undefined,
-        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} />
-            );
-        },
+        onClick: () => this.openAddDatabasePanel(),
      });
    }

    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,
--- a/src/Explorer/Tables/Constants.ts
+++ b/src/Explorer/Tables/Constants.ts
@@ -14,13 +14,11 @@ export const CassandraType = {
  Bigint: "Bigint",
  Blob: "Blob",
  Boolean: "Boolean",
-  Date: "Date",
  Decimal: "Decimal",
  Double: "Double",
  Float: "Float",
  Int: "Int",
  Text: "Text",
-  Timestamp: "Timestamp",
  Uuid: "Uuid",
  Varchar: "Varchar",
  Varint: "Varint",
--- a/src/Explorer/Tables/DataTable/DataTableOperations.ts
+++ b/src/Explorer/Tables/DataTable/DataTableOperations.ts
@@ -1,11 +1,12 @@
-import Q from "q";
 import _ from "underscore";
-import * as QueryBuilderConstants from "../Constants";
+import Q from "q";
+
 import * as Entities from "../Entities";
+import * as QueryBuilderConstants from "../Constants";
 import * as Utilities from "../Utilities";

 export function getRowSelector(selectorSchema: Entities.IProperty[]): string {
-  let selector = "";
+  var selector: string = "";
  selectorSchema &&
    selectorSchema.forEach((p: Entities.IProperty) => {
      selector += "[" + p.key + '="' + Utilities.jQuerySelectorEscape(p.value) + '"]';
@@ -14,10 +15,10 @@ export function getRowSelector(selectorSchema: Entities.IProperty[]): string {
 }

 export function isRowVisible(dataTableScrollBodyQuery: JQuery, element: HTMLElement): boolean {
-  let isVisible = false;
+  var isVisible = false;

  if (dataTableScrollBodyQuery.length && element) {
-    const elementRect: ClientRect = element.getBoundingClientRect(),
+    var elementRect: ClientRect = element.getBoundingClientRect(),
      dataTableScrollBodyRect: ClientRect = dataTableScrollBodyQuery.get(0).getBoundingClientRect();

    isVisible = elementRect.bottom <= dataTableScrollBodyRect.bottom && dataTableScrollBodyRect.top <= elementRect.top;
@@ -28,17 +29,17 @@ export function isRowVisible(dataTableScrollBodyQuery: JQuery, element: HTMLElem

 export function scrollToRowIfNeeded(dataTableRows: JQuery, currentIndex: number, isScrollUp: boolean): void {
  if (dataTableRows.length) {
-    const dataTableScrollBodyQuery: JQuery = $(QueryBuilderConstants.htmlSelectors.dataTableScrollBodySelector),
+    var dataTableScrollBodyQuery: JQuery = $(QueryBuilderConstants.htmlSelectors.dataTableScrollBodySelector),
      selectedRowElement: HTMLElement = dataTableRows.get(currentIndex);

    if (dataTableScrollBodyQuery.length && selectedRowElement) {
-      const isVisible: boolean = isRowVisible(dataTableScrollBodyQuery, selectedRowElement);
+      var isVisible: boolean = isRowVisible(dataTableScrollBodyQuery, selectedRowElement);

      if (!isVisible) {
-        const selectedRowQuery: JQuery = $(selectedRowElement),
+        var selectedRowQuery: JQuery = $(selectedRowElement),
          scrollPosition: number = dataTableScrollBodyQuery.scrollTop(),
-          selectedElementPosition: number = selectedRowQuery.position().top;
-        let newScrollPosition = 0;
+          selectedElementPosition: number = selectedRowQuery.position().top,
+          newScrollPosition: number = 0;

        if (isScrollUp) {
          newScrollPosition = scrollPosition + selectedElementPosition;
@@ -54,7 +55,7 @@ export function scrollToRowIfNeeded(dataTableRows: JQuery, currentIndex: number,
 }

 export function scrollToTopIfNeeded(): void {
-  const $dataTableRows: JQuery = $(QueryBuilderConstants.htmlSelectors.dataTableAllRowsSelector),
+  var $dataTableRows: JQuery = $(QueryBuilderConstants.htmlSelectors.dataTableAllRowsSelector),
    $dataTableScrollBody: JQuery = $(QueryBuilderConstants.htmlSelectors.dataTableScrollBodySelector);

  if ($dataTableRows.length && $dataTableScrollBody.length) {
@@ -87,14 +88,13 @@ 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;
+  var columnsCount: number = targetOrder.length;
+  var isCurrentOrderPassedIn: boolean = !!currentOrder;
  if (!isCurrentOrderPassedIn) {
    currentOrder = getInitialOrder(columnsCount);
  }
-  const isSameOrder: boolean = Utilities.isEqual(currentOrder, targetOrder);
+  var isSameOrder: boolean = Utilities.isEqual(currentOrder, targetOrder);

  // if the targetOrder is the same as current order, do nothing.
  if (!isSameOrder) {
@@ -104,7 +104,7 @@ export function reorderColumns(
    //  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
+    var transformationOrder: number[] = isCurrentOrderPassedIn
      ? calculateTransformationOrder(currentOrder, targetOrder)
      : targetOrder;
    try {
@@ -143,7 +143,7 @@ export function getCurrentOrder(table: DataTables.DataTable): number[] {
 * Result:     [0, 1, 2, 5, 6, 7, 3, 4, 8]
 */
 export function invertIndexValues(inputArray: number[]): number[] {
-  const invertedArray: number[] = [];
+  var invertedArray: number[] = [];
  if (inputArray) {
    inputArray.forEach((value: number, index: number) => {
      invertedArray[inputArray[index]] = index;
@@ -170,21 +170,20 @@ export function invertIndexValues(inputArray: number[]): number[] {
 * transformation order: Trans = [0, 1, 2, 7, 3, 4, 8, 5, 6]
 */
 export function calculateTransformationOrder(currentOrder: number[], targetOrder: number[]): number[] {
-  let transformationOrder: number[] = [];
+  var transformationOrder: number[] = [];
  if (currentOrder && targetOrder && currentOrder.length === targetOrder.length) {
-    const invertedCurrentOrder: number[] = invertIndexValues(currentOrder);
+    var 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[] = [];
+  var columns: DataTables.ColumnsMethods = table.columns();
+  var headers: string[] = [];
  if (columns) {
    // table.columns() return ColumnsMethods which is an array of arrays
-    //eslint-disable-next-line
-    const columnIndexes: number[] = (<any>columns)[0];
+    var columnIndexes: number[] = (<any>columns)[0];
    if (columnIndexes) {
      headers = columnIndexes.map((value: number) => $(table.columns(value).header()).html());
    }
--- a/src/Explorer/Tables/DataTable/TableCommands.ts
+++ b/src/Explorer/Tables/DataTable/TableCommands.ts
@@ -8,11 +8,11 @@ import TableEntityListViewModel from "./TableEntityListViewModel";

 export default class TableCommands {
  // Command Ids
-  public static editEntityCommand = "edit";
-  public static deleteEntitiesCommand = "delete";
-  public static reorderColumnsCommand = "reorder";
-  public static resetColumnsCommand = "reset";
-  public static customizeColumnsCommand = "customizeColumns";
+  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";

  private _container: Explorer;

@@ -21,8 +21,8 @@ export default class TableCommands {
  }

  public isEnabled(commandName: string, selectedEntites: Entities.ITableEntity[]): boolean {
-    const singleItemSelected = DataTableUtilities.containSingleItem(selectedEntites);
-    const atLeastOneItemSelected = DataTableUtilities.containItems(selectedEntites);
+    var singleItemSelected: boolean = DataTableUtilities.containSingleItem(selectedEntites);
+    var atLeastOneItemSelected: boolean = DataTableUtilities.containItems(selectedEntites);
    switch (commandName) {
      case TableCommands.editEntityCommand:
        return singleItemSelected;
@@ -47,7 +47,6 @@ export default class TableCommands {
  /**
   * Edit entity
   */
-  //eslint-disable-next-line
  public editEntityCommand(viewModel: TableEntityListViewModel): Q.Promise<any> {
    if (!viewModel) {
      return null; // Error
@@ -57,9 +56,12 @@ 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
@@ -67,7 +69,7 @@ export default class TableCommands {
    if (!DataTableUtilities.containItems(viewModel.selected())) {
      return null; // Error
    }
-    const entitiesToDelete: Entities.ITableEntity[] = viewModel.selected();
+    var entitiesToDelete: Entities.ITableEntity[] = viewModel.selected();
    const deleteMessage: string =
      userContext.apiType === "Cassandra"
        ? "Are you sure you want to delete the selected rows?"
@@ -80,7 +82,7 @@ export default class TableCommands {
      () => {
        viewModel.queryTablesTab.container.tableDataClient
          .deleteDocuments(viewModel.queryTablesTab.collection, entitiesToDelete)
-          .then(() => {
+          .then((results: any) => {
            return viewModel.removeEntitiesFromCache(entitiesToDelete).then(() => {
              viewModel.redrawTableThrottled();
            });
--- a/src/Explorer/Tables/DataTable/TableEntityCache.ts
+++ b/src/Explorer/Tables/DataTable/TableEntityCache.ts
@@ -1,5 +1,5 @@
-import * as Entities from "../Entities";
 import * as Utilities from "../Utilities";
+import * as Entities from "../Entities";
 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(): void {
+  public preClear() {
    this.tableQuery = null;
  }
 }
--- a/src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
+++ b/src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
@@ -431,7 +431,7 @@ export default class TableEntityListViewModel extends DataTableViewModel {
          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);
+            this.updateHeaders(newHeaders, /* notifyColumnChanges */ true);
          } else {
            if (columnSortOrder) {
              this.sortColumns(columnSortOrder, oSettings);
--- a/src/Explorer/Tables/Entities.ts
+++ b/src/Explorer/Tables/Entities.ts
@@ -1,4 +1,4 @@
-import { ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
+import { QueryIterator, ItemDefinition, Resource } from "@azure/cosmos";

 export interface ITableEntity {
  [property: string]: ITableEntityAttribute;
@@ -17,7 +17,6 @@ export interface ITableEntityAttribute {

 export interface IListTableEntitiesResult {
  Results: ITableEntity[];
-  //eslint-disable-next-line
  ContinuationToken: any;
  iterator?: QueryIterator<ItemDefinition & Resource>;
 }
--- a/src/Explorer/Tables/QueryBuilder/ClauseGroup.ts
+++ b/src/Explorer/Tables/QueryBuilder/ClauseGroup.ts
@@ -1,9 +1,8 @@
-import * as Utilities from "../Utilities";
 import QueryClauseViewModel from "./QueryClauseViewModel";
+import * as Utilities from "../Utilities";

 export default class ClauseGroup {
  public isRootGroup: boolean;
-  //eslint-disable-next-line
  public children = new Array();
  public parentGroup: ClauseGroup;
  private _id: string;
@@ -18,7 +17,7 @@ export default class ClauseGroup {
   * Flattens the clause tree into an array, depth-first, left to right.
   */
  public flattenClauses(targetArray: ko.ObservableArray<QueryClauseViewModel>): void {
-    const tempArray = new Array<QueryClauseViewModel>();
+    var tempArray = new Array<QueryClauseViewModel>();

    this.flattenClausesImpl(this, tempArray);
    targetArray.removeAll();
@@ -32,10 +31,10 @@ export default class ClauseGroup {
      newClause.clauseGroup = this;
      this.children.push(newClause);
    } else {
-      const targetGroup = insertBefore.clauseGroup;
+      var targetGroup = insertBefore.clauseGroup;

      if (targetGroup) {
-        const insertBeforeIndex = targetGroup.children.indexOf(insertBefore);
+        var insertBeforeIndex = targetGroup.children.indexOf(insertBefore);
        newClause.clauseGroup = targetGroup;
        targetGroup.children.splice(insertBeforeIndex, 0, newClause);
      }
@@ -43,19 +42,19 @@ export default class ClauseGroup {
  }

  public deleteClause(clause: QueryClauseViewModel): void {
-    const targetGroup = clause.clauseGroup;
+    var targetGroup = clause.clauseGroup;

    if (targetGroup) {
-      const index = targetGroup.children.indexOf(clause);
+      var index = targetGroup.children.indexOf(clause);
      targetGroup.children.splice(index, 1);
      clause.dispose();

      if (targetGroup.children.length <= 1 && !targetGroup.isRootGroup) {
-        const parent = targetGroup.parentGroup;
-        const targetGroupIndex = parent.children.indexOf(targetGroup);
+        var parent = targetGroup.parentGroup;
+        var targetGroupIndex = parent.children.indexOf(targetGroup);

        if (targetGroup.children.length === 1) {
-          const orphan = targetGroup.children.shift();
+          var orphan = targetGroup.children.shift();

          if (orphan instanceof QueryClauseViewModel) {
            (<QueryClauseViewModel>orphan).clauseGroup = parent;
@@ -72,14 +71,14 @@ export default class ClauseGroup {
  }

  public removeAll(): void {
-    const allClauses: QueryClauseViewModel[] = new Array<QueryClauseViewModel>();
+    var 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>();
  }

@@ -88,12 +87,12 @@ export default class ClauseGroup {
   */
  public groupSelectedItems(): boolean {
    // Find the selection start & end, also check for gaps between selected items (if found, cannot proceed).
-    const selection = this.getCheckedItemsInfo();
+    var selection = this.getCheckedItemsInfo();

    if (selection.canGroup) {
-      const newGroup = new ClauseGroup(false, this);
+      var newGroup = new ClauseGroup(false, this);
      // Replace the selected items with the new group, and then move the selected items into the new group.
-      const groupedItems = this.children.splice(selection.begin, selection.end - selection.begin + 1, newGroup);
+      var groupedItems = this.children.splice(selection.begin, selection.end - selection.begin + 1, newGroup);

      groupedItems &&
        groupedItems.forEach((element) => {
@@ -119,13 +118,13 @@ export default class ClauseGroup {
      return;
    }

-    const parentGroup = this.parentGroup;
-    let index = parentGroup.children.indexOf(this);
+    var parentGroup = this.parentGroup;
+    var index = parentGroup.children.indexOf(this);

    if (index >= 0) {
      parentGroup.children.splice(index, 1);

-      const toPromote = this.children.splice(0, this.children.length);
+      var toPromote = this.children.splice(0, this.children.length);

      // Move all children one level up.
      toPromote &&
@@ -147,16 +146,16 @@ export default class ClauseGroup {
  }

  public findDeepestGroupInChildren(skipIndex?: number): ClauseGroup {
-    let deepest = <ClauseGroup>this;
-    let level = 0;
-    const func = (currentGroup: ClauseGroup): void => {
+    var deepest: ClauseGroup = this;
+    var level: number = 0;
+    var func = (currentGroup: ClauseGroup): void => {
      level++;
      if (currentGroup.getCurrentGroupDepth() > deepest.getCurrentGroupDepth()) {
        deepest = currentGroup;
      }

-      for (let i = 0; i < currentGroup.children.length; i++) {
-        const currentItem = currentGroup.children[i];
+      for (var i = 0; i < currentGroup.children.length; i++) {
+        var currentItem = currentGroup.children[i];

        if ((i !== skipIndex || level > 1) && currentItem instanceof ClauseGroup) {
          func(currentItem);
@@ -171,16 +170,16 @@ export default class ClauseGroup {
  }

  private getCheckedItemsInfo(): { canGroup: boolean; begin: number; end: number } {
-    let beginIndex = -1;
-    let endIndex = -1;
+    var beginIndex = -1;
+    var 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.
-    let gapFlag = false;
-    let count = 0;
+    var gapFlag = false;
+    var count = 0;

-    for (let i = 0; i < this.children.length; i++) {
-      const currentItem = this.children[i];
-      let subGroupSelectionState: { allSelected: boolean; partiallySelected: boolean; nonSelected: boolean };
+    for (var i = 0; i < this.children.length; i++) {
+      var currentItem = this.children[i];
+      var subGroupSelectionState: { allSelected: boolean; partiallySelected: boolean; nonSelected: boolean };

      if (currentItem instanceof ClauseGroup) {
        subGroupSelectionState = (<ClauseGroup>currentItem).getSelectionState();
@@ -236,10 +235,10 @@ export default class ClauseGroup {
  }

  private getSelectionState(): { allSelected: boolean; partiallySelected: boolean; nonSelected: boolean } {
-    let selectedCount = 0;
+    var selectedCount = 0;

-    for (let i = 0; i < this.children.length; i++) {
-      const currentItem = this.children[i];
+    for (var i = 0; i < this.children.length; i++) {
+      var currentItem = this.children[i];

      if (currentItem instanceof ClauseGroup && (<ClauseGroup>currentItem).getSelectionState().allSelected) {
        selectedCount++;
@@ -261,8 +260,8 @@ export default class ClauseGroup {
  }

  private unselectAll(): void {
-    for (let i = 0; i < this.children.length; i++) {
-      const currentItem = this.children[i];
+    for (var i = 0; i < this.children.length; i++) {
+      var currentItem = this.children[i];

      if (currentItem instanceof ClauseGroup) {
        (<ClauseGroup>currentItem).unselectAll();
@@ -279,8 +278,8 @@ export default class ClauseGroup {
      targetArray.splice(0, targetArray.length);
    }

-    for (let i = 0; i < queryGroup.children.length; i++) {
-      const currentItem = queryGroup.children[i];
+    for (var i = 0; i < queryGroup.children.length; i++) {
+      var currentItem = queryGroup.children[i];

      if (currentItem instanceof ClauseGroup) {
        this.flattenClausesImpl(currentItem, targetArray);
@@ -293,13 +292,13 @@ export default class ClauseGroup {
  }

  public getTreeDepth(): number {
-    let currentDepth = this.getCurrentGroupDepth();
+    var currentDepth = this.getCurrentGroupDepth();

-    for (let i = 0; i < this.children.length; i++) {
-      const currentItem = this.children[i];
+    for (var i = 0; i < this.children.length; i++) {
+      var currentItem = this.children[i];

      if (currentItem instanceof ClauseGroup) {
-        const newDepth = (<ClauseGroup>currentItem).getTreeDepth();
+        var newDepth = (<ClauseGroup>currentItem).getTreeDepth();

        if (newDepth > currentDepth) {
          currentDepth = newDepth;
@@ -311,8 +310,8 @@ export default class ClauseGroup {
  }

  public getCurrentGroupDepth(): number {
-    let group = <ClauseGroup>this;
-    let depth = 0;
+    var group = <ClauseGroup>this;
+    var depth = 0;

    while (!group.isRootGroup) {
      depth++;
--- a/src/Explorer/Tables/QueryBuilder/ClauseGroupViewModel.ts
+++ b/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 {
-    const colorCount = Constants.clauseGroupColors.length;
+    var colorCount = Constants.clauseGroupColors.length;

    if (group.isRootGroup) {
      return Constants.transparentColor;
--- a/src/Explorer/Tables/QueryBuilder/QueryBuilderViewModel.ts
+++ b/src/Explorer/Tables/QueryBuilder/QueryBuilderViewModel.ts
@@ -29,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, undefined); // The actual data structure containing the clause information.
+  public queryClauses = new ClauseGroup(true, null); // The actual data structure containing the clause information.
  public columnOptions: ko.ObservableArray<string>;
  public canGroupClauses = ko.observable<boolean>(false);

@@ -107,7 +107,7 @@ export default class QueryBuilderViewModel {
  }

  public setExample() {
-    const example1 = new QueryClauseViewModel(
+    var example1 = new QueryClauseViewModel(
      this,
      "",
      "PartitionKey",
@@ -121,7 +121,7 @@ export default class QueryBuilderViewModel {
      //null,
      true
    );
-    const example2 = new QueryClauseViewModel(
+    var example2 = new QueryClauseViewModel(
      this,
      "And",
      "RowKey",
@@ -140,13 +140,13 @@ export default class QueryBuilderViewModel {
  }

  public getODataFilterFromClauses = (): string => {
-    let filterString = "";
-    const treeTraversal = (group: ClauseGroup): void => {
-      for (let i = 0; i < group.children.length; i++) {
-        const currentItem = group.children[i];
+    var filterString: string = "";
+    var treeTraversal = (group: ClauseGroup): void => {
+      for (var i = 0; i < group.children.length; i++) {
+        var currentItem = group.children[i];

        if (currentItem instanceof QueryClauseViewModel) {
-          const clause = <QueryClauseViewModel>currentItem;
+          var clause = <QueryClauseViewModel>currentItem;
          this.timestampToValue(clause);
          filterString = filterString.concat(
            this.constructODataClause(
@@ -173,7 +173,7 @@ export default class QueryBuilderViewModel {
  };

  public getSqlFilterFromClauses = (): string => {
-    let filterString = "SELECT * FROM c";
+    var filterString: string = "SELECT * FROM c";
    if (this._queryViewModel.selectText() && this._queryViewModel.selectText().length > 0) {
      filterString = "SELECT";
      const selectText = this._queryViewModel && this._queryViewModel.selectText && this._queryViewModel.selectText();
@@ -199,15 +199,15 @@ export default class QueryBuilderViewModel {
      return filterString;
    }
    filterString = filterString.concat(" WHERE");
-    let first = true;
-    const treeTraversal = (group: ClauseGroup): void => {
-      for (let i = 0; i < group.children.length; i++) {
-        const currentItem = group.children[i];
+    var first = true;
+    var treeTraversal = (group: ClauseGroup): void => {
+      for (var i = 0; i < group.children.length; i++) {
+        var currentItem = group.children[i];

        if (currentItem instanceof QueryClauseViewModel) {
-          const clause = <QueryClauseViewModel>currentItem;
-          const timeStampValue: string = this.timestampToSqlValue(clause);
-          let value = clause.value();
+          var clause = <QueryClauseViewModel>currentItem;
+          let timeStampValue: string = this.timestampToSqlValue(clause);
+          var value = clause.value();
          if (!clause.isValue()) {
            value = timeStampValue;
          }
@@ -240,7 +240,7 @@ export default class QueryBuilderViewModel {
    const databaseId = this._queryViewModel.queryTablesTab.collection.databaseId;
    const collectionId = this._queryViewModel.queryTablesTab.collection.id();
    const tableToQuery = `${getQuotedCqlIdentifier(databaseId)}.${getQuotedCqlIdentifier(collectionId)}`;
-    let filterString = `SELECT * FROM ${tableToQuery}`;
+    var filterString: string = `SELECT * FROM ${tableToQuery}`;
    if (this._queryViewModel.selectText() && this._queryViewModel.selectText().length > 0) {
      filterString = "SELECT";
      const selectText = this._queryViewModel && this._queryViewModel.selectText && this._queryViewModel.selectText();
@@ -255,15 +255,15 @@ export default class QueryBuilderViewModel {
      return filterString;
    }
    filterString = filterString.concat(" WHERE");
-    let first = true;
-    const treeTraversal = (group: ClauseGroup): void => {
-      for (let i = 0; i < group.children.length; i++) {
-        const currentItem = group.children[i];
+    var first = true;
+    var treeTraversal = (group: ClauseGroup): void => {
+      for (var i = 0; i < group.children.length; i++) {
+        var currentItem = group.children[i];

        if (currentItem instanceof QueryClauseViewModel) {
-          const clause = <QueryClauseViewModel>currentItem;
-          const timeStampValue = this.timestampToSqlValue(clause);
-          let value = clause.value();
+          var clause = <QueryClauseViewModel>currentItem;
+          let timeStampValue: string = this.timestampToSqlValue(clause);
+          var value = clause.value();
          if (!clause.isValue()) {
            value = timeStampValue;
          }
@@ -293,13 +293,13 @@ export default class QueryBuilderViewModel {
  };

  public updateColumnOptions = (): void => {
-    // let originalHeaders = this.columnOptions();
-    const newHeaders = this.tableEntityListViewModel.headers;
+    let originalHeaders = this.columnOptions();
+    let newHeaders = this.tableEntityListViewModel.headers;
    this.columnOptions(newHeaders.sort(DataTableUtilities.compareTableColumns));
  };

  private generateLeftParentheses(clause: QueryClauseViewModel): string {
-    let result = "";
+    var result = "";

    if (clause.clauseGroup.isRootGroup || clause.clauseGroup.children.indexOf(clause) !== 0) {
      return result;
@@ -307,7 +307,7 @@ export default class QueryBuilderViewModel {
      result = result.concat("(");
    }

-    let currentGroup: ClauseGroup = clause.clauseGroup;
+    var currentGroup: ClauseGroup = clause.clauseGroup;

    while (
      !currentGroup.isRootGroup &&
@@ -322,7 +322,7 @@ export default class QueryBuilderViewModel {
  }

  private generateRightParentheses(clause: QueryClauseViewModel): string {
-    let result = "";
+    var result = "";

    if (
      clause.clauseGroup.isRootGroup ||
@@ -333,7 +333,7 @@ export default class QueryBuilderViewModel {
      result = result.concat(")");
    }

-    let currentGroup: ClauseGroup = clause.clauseGroup;
+    var currentGroup: ClauseGroup = clause.clauseGroup;

    while (
      !currentGroup.isRootGroup &&
@@ -364,17 +364,14 @@ 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(
@@ -394,11 +391,9 @@ 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;
@@ -408,21 +403,16 @@ 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}`;
@@ -444,7 +434,6 @@ 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}`;
@@ -465,7 +454,7 @@ export default class QueryBuilderViewModel {
      case Constants.Operator.NotEqualTo:
        return Constants.ODataOperator.NotEqualTo;
    }
-    return undefined;
+    return null;
  };

  public groupClauses = (): void => {
@@ -474,11 +463,11 @@ export default class QueryBuilderViewModel {
    this.updateCanGroupClauses();
  };

-  public addClauseIndex = (index: number): void => {
+  public addClauseIndex = (index: number, data: any): void => {
    if (index < 0) {
      index = 0;
    }
-    const newClause = new QueryClauseViewModel(
+    var newClause = new QueryClauseViewModel(
      this,
      "And",
      "",
@@ -503,28 +492,28 @@ export default class QueryBuilderViewModel {

  // adds a new clause to the end of the array
  public addNewClause = (): void => {
-    this.addClauseIndex(this.clauseArray().length);
+    this.addClauseIndex(this.clauseArray().length, null);
  };

-  public onAddClauseKeyDown = (index: number, event: KeyboardEvent): boolean => {
+  public onAddClauseKeyDown = (index: number, data: any, event: KeyboardEvent, source: any): boolean => {
    if (event.keyCode === KeyCodes.Enter || event.keyCode === KeyCodes.Space) {
-      this.addClauseIndex(index);
+      this.addClauseIndex(index, data);
      event.stopPropagation();
      return false;
    }
    return true;
  };

-  public onAddNewClauseKeyDown = (event: KeyboardEvent): boolean => {
+  public onAddNewClauseKeyDown = (source: any, event: KeyboardEvent): boolean => {
    if (event.keyCode === KeyCodes.Enter || event.keyCode === KeyCodes.Space) {
-      this.addClauseIndex(this.clauseArray().length - 1);
+      this.addClauseIndex(this.clauseArray().length - 1, null);
      event.stopPropagation();
      return false;
    }
    return true;
  };

-  public deleteClause = (index: number): void => {
+  public deleteClause = (index: number, data: any): void => {
    this.deleteClauseImpl(index);
    if (this.clauseArray().length !== 0) {
      this.clauseArray()[0].and_or("");
@@ -534,9 +523,9 @@ export default class QueryBuilderViewModel {
    $(window).resize();
  };

-  public onDeleteClauseKeyDown = (index: number, event: KeyboardEvent): boolean => {
+  public onDeleteClauseKeyDown = (index: number, data: any, event: KeyboardEvent, source: any): boolean => {
    if (event.keyCode === KeyCodes.Enter || event.keyCode === KeyCodes.Space) {
-      this.deleteClause(index);
+      this.deleteClause(index, data);
      event.stopPropagation();
      return false;
    }
@@ -550,26 +539,25 @@ export default class QueryBuilderViewModel {
   * (transparent) or its parent group view models.
   */
  public getClauseGroupViewModels = (clause: QueryClauseViewModel): ClauseGroupViewModel[] => {
-    const placeHolderGroupViewModel = new ClauseGroupViewModel(this.queryClauses, false, this);
-    const treeDepth = this.queryClauses.getTreeDepth();
-    const groupViewModels = new Array<ClauseGroupViewModel>(treeDepth);
+    var placeHolderGroupViewModel = new ClauseGroupViewModel(this.queryClauses, false, this);
+    var treeDepth = this.queryClauses.getTreeDepth();
+    var groupViewModels = new Array<ClauseGroupViewModel>(treeDepth);

    // Prefill the arry with placeholders.
-    for (let i = 0; i < groupViewModels.length; i++) {
+    for (var i = 0; i < groupViewModels.length; i++) {
      groupViewModels[i] = placeHolderGroupViewModel;
    }

-    let currentGroup = clause.clauseGroup;
+    var currentGroup = clause.clauseGroup;

    // This function determines whether the path from clause to the current group is on the left most.
-    const isLeftMostPath = (): boolean => {
-      let group = clause.clauseGroup;
+    var isLeftMostPath = (): boolean => {
+      var 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;
@@ -585,14 +573,13 @@ export default class QueryBuilderViewModel {
    };

    // This function determines whether the path from clause to the current group is on the right most.
-    const isRightMostPath = (): boolean => {
-      let group = clause.clauseGroup;
+    var isRightMostPath = (): boolean => {
+      var 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;
@@ -607,26 +594,26 @@ export default class QueryBuilderViewModel {
      return true;
    };

-    let vmIndex = groupViewModels.length - 1;
-    let skipIndex = -1;
-    let lastDepth = clause.groupDepth;
+    var vmIndex = groupViewModels.length - 1;
+    var skipIndex = -1;
+    var 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.
-      const deepestInSiblings = currentGroup.findDeepestGroupInChildren(skipIndex).getCurrentGroupDepth();
+      var 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.
-      const repeatCount = Math.max(deepestInSiblings - lastDepth, 0);
+      var repeatCount = Math.max(deepestInSiblings - lastDepth, 0);

-      for (let i = 0; i <= repeatCount; i++) {
-        const isLeftMost = isLeftMostPath();
-        const isRightMost = isRightMostPath();
-        const groupViewModel = new ClauseGroupViewModel(currentGroup, i === 0 && isLeftMost, this);
+      for (var i = 0; i <= repeatCount; i++) {
+        var isLeftMost = isLeftMostPath();
+        var isRightMost = isRightMostPath();
+        var groupViewModel = new ClauseGroupViewModel(currentGroup, i === 0 && isLeftMost, this);

        groupViewModel.showTopBorder(isLeftMost);
        groupViewModel.showBottomBorder(isRightMost);
@@ -648,9 +635,9 @@ export default class QueryBuilderViewModel {
  };

  public addCustomRange(timestamp: CustomTimestampHelper.ITimestampQuery, clauseToAdd: QueryClauseViewModel): void {
-    const index = this.clauseArray.peek().indexOf(clauseToAdd);
+    var index = this.clauseArray.peek().indexOf(clauseToAdd);

-    const newClause = new QueryClauseViewModel(
+    var newClause = new QueryClauseViewModel(
      this,
      //this._tableEntityListViewModel.tableExplorerContext.hostProxy,
      "And",
@@ -675,10 +662,10 @@ export default class QueryBuilderViewModel {
  }

  private scrollToBottom(): void {
-    const scrollBox = document.getElementById("scroll");
+    var scrollBox = document.getElementById("scroll");
    if (!this.scrollEventListener) {
      scrollBox.addEventListener("scroll", function () {
-        const translate = "translate(0," + this.scrollTop + "px)";
+        var 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;
@@ -686,7 +673,7 @@ export default class QueryBuilderViewModel {
      });
      this.scrollEventListener = true;
    }
-    const isScrolledToBottom = scrollBox.scrollHeight - scrollBox.clientHeight <= scrollBox.scrollHeight + 1;
+    var isScrolledToBottom = scrollBox.scrollHeight - scrollBox.clientHeight <= scrollBox.scrollHeight + 1;
    if (isScrolledToBottom) {
      scrollBox.scrollTop = scrollBox.scrollHeight - scrollBox.clientHeight;
    }
@@ -698,8 +685,8 @@ export default class QueryBuilderViewModel {
  }

  private deleteClauseImpl(index: number): void {
-    const clause = this.clauseArray()[index];
-    const previousClause = index === 0 ? 0 : index - 1;
+    var clause = this.clauseArray()[index];
+    var previousClause = index === 0 ? 0 : index - 1;
    this.queryClauses.deleteClause(clause);
    this.updateClauseArray();
    if (this.clauseArray()[previousClause]) {
@@ -744,7 +731,7 @@ export default class QueryBuilderViewModel {

  private timestampToSqlValue(clause: QueryClauseViewModel): string {
    if (clause.isValue()) {
-      return undefined;
+      return null;
    } else if (clause.isTimestamp()) {
      return this.getTimeStampToSqlQuery(clause);
      // } else if (clause.isCustomLastTimestamp()) {
@@ -756,7 +743,7 @@ export default class QueryBuilderViewModel {
        return clause.customTimeValue();
      }
    }
-    return undefined;
+    return null;
  }

  private getTimeStampToQuery(clause: QueryClauseViewModel): void {
@@ -802,7 +789,7 @@ export default class QueryBuilderViewModel {
      case Constants.timeOptions.currentYear:
        return CustomTimestampHelper._queryCurrentYearLocal();
    }
-    return undefined;
+    return null;
  }

  public checkIfClauseChanged(): void {
--- a/src/Explorer/Tables/QueryBuilder/QueryClauseViewModel.ts
+++ b/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<string>;
+  public value: ko.Observable<any>;
  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: string,
+    value: any,
    canAnd: boolean,
    timeValue: string,
    customTimeValue: string,
@@ -88,30 +88,30 @@ export default class QueryClauseViewModel {
        userContext.apiType !== "Cassandra"
    );

-    this.and_or.subscribe(() => {
+    this.and_or.subscribe((value) => {
      this._queryBuilderViewModel.checkIfClauseChanged();
    });
-    this.field.subscribe(() => {
+    this.field.subscribe((value) => {
      this.changeField();
    });
-    this.type.subscribe(() => {
+    this.type.subscribe((value) => {
      this.changeType();
    });
-    this.timeValue.subscribe(() => {
+    this.timeValue.subscribe((value) => {
      // if (this.timeValue() === QueryBuilderConstants.timeOptions.custom) {
      //     this.customTimestampDialog();
      // }
    });
-    this.customTimeValue.subscribe(() => {
+    this.customTimeValue.subscribe((value) => {
      this._queryBuilderViewModel.checkIfClauseChanged();
    });
-    this.value.subscribe(() => {
+    this.value.subscribe((value) => {
      this._queryBuilderViewModel.checkIfClauseChanged();
    });
-    this.operator.subscribe(() => {
+    this.operator.subscribe((value) => {
      this._queryBuilderViewModel.checkIfClauseChanged();
    });
-    this._groupCheckSubscription = this.checkedForGrouping.subscribe(() => {
+    this._groupCheckSubscription = this.checkedForGrouping.subscribe((value) => {
      this._queryBuilderViewModel.updateCanGroupClauses();
    });
    this.isAndOrFocused = ko.observable<boolean>(false);
@@ -280,7 +280,7 @@ export default class QueryClauseViewModel {
      this._groupCheckSubscription.dispose();
    }

-    this.clauseGroup = undefined;
-    this._queryBuilderViewModel = undefined;
+    this.clauseGroup = null;
+    this._queryBuilderViewModel = null;
  }
 }
--- a/src/Explorer/Tables/TableDataClient.ts
+++ b/src/Explorer/Tables/TableDataClient.ts
@@ -202,21 +202,14 @@ 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()
        ) {
-          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;
+          updateQuery += this.isStringType(newEntity[property].$)
+            ? ` SET ${property} = '${newEntity[property]._}',`
+            : ` SET ${property} = ${newEntity[property]._},`;
          isPropertyUpdated = true;
        }
      }
@@ -535,9 +528,7 @@ export class CassandraAPIDataClient extends TableDataClient {
      dataType === TableConstants.CassandraType.Text ||
      dataType === TableConstants.CassandraType.Inet ||
      dataType === TableConstants.CassandraType.Ascii ||
-      dataType === TableConstants.CassandraType.Varchar ||
-      dataType === TableConstants.CassandraType.Timestamp ||
-      dataType === TableConstants.CassandraType.Date
+      dataType === TableConstants.CassandraType.Varchar
    );
  }

--- a/src/Explorer/Tabs/NotebookTabBase.ts
+++ b/src/Explorer/Tabs/NotebookTabBase.ts
@@ -17,7 +17,6 @@ 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;
@@ -28,15 +27,6 @@ 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,
--- a/src/Explorer/Tabs/NotebookV2Tab.ts
+++ b/src/Explorer/Tabs/NotebookV2Tab.ts
@@ -53,16 +53,14 @@ export default class NotebookTabV2 extends NotebookTabBase {
      onUpdateKernelInfo: this.onKernelUpdate,
    });
  }
-  /*
-   * Hard cleaning the workspace(Closing tabs connected with old container connection) when new container got allocated.
-   */
-  public onCloseTabButtonClick(hardClose = false): Q.Promise<any> {
+
+  public onCloseTabButtonClick(): Q.Promise<any> {
    const cleanup = () => {
      this.notebookComponentAdapter.notebookShutdown();
      super.onCloseTabButtonClick();
    };

-    if (this.notebookComponentAdapter.isContentDirty() && hardClose === false) {
+    if (this.notebookComponentAdapter.isContentDirty()) {
      useDialog
        .getState()
        .showOkCancelModalDialog(
@@ -120,7 +118,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
    const saveButtonChildren = [];
    if (this.container.notebookManager?.gitHubOAuthService.isLoggedIn()) {
      saveButtonChildren.push({
-        iconName: copyToLabel,
+        iconName: "Copy",
        onCommandClick: () => this.copyNotebook(),
        commandButtonLabel: copyToLabel,
        hasPopup: false,
--- a/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
@@ -364,11 +364,13 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
  }

  public onTabClick(): void {
+    setTimeout(() => {
      if (!this.isCloseClicked) {
        useCommandBar.getState().setContextButtons(this.getTabsButtons());
      } else {
        this.isCloseClicked = false;
      }
+    }, 0);
  }

  public onExecuteQueryClick = async (): Promise<void> => {
@@ -873,11 +875,9 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
    useCommandBar.getState().setContextButtons(this.getTabsButtons());
  }

-  componentDidMount(): void {
-    useCommandBar.getState().setContextButtons(this.getTabsButtons());
-  }
-
  render(): JSX.Element {
+    useCommandBar.getState().setContextButtons(this.getTabsButtons());
+
    return (
      <Fragment>
        <div className="tab-pane" id={this.props.tabId} role="tabpanel">
--- a/src/Explorer/Tabs/TerminalTab.tsx
+++ b/src/Explorer/Tabs/TerminalTab.tsx
@@ -25,8 +25,7 @@ class NotebookTerminalComponentAdapter implements ReactAdapter {
  public parameters: ko.Computed<boolean>;
  constructor(
    private getNotebookServerInfo: () => DataModels.NotebookWorkspaceConnectionInfo,
-    private getDatabaseAccount: () => DataModels.DatabaseAccount,
-    private getTabId: () => string
+    private getDatabaseAccount: () => DataModels.DatabaseAccount
  ) {}

  public renderComponent(): JSX.Element {
@@ -34,7 +33,6 @@ class NotebookTerminalComponentAdapter implements ReactAdapter {
      <NotebookTerminalComponent
        notebookServerInfo={this.getNotebookServerInfo()}
        databaseAccount={this.getDatabaseAccount()}
-        tabId={this.getTabId()}
      />
    ) : (
      <Spinner styles={{ root: { marginTop: 10 } }} size={SpinnerSize.large}></Spinner>
@@ -52,8 +50,7 @@ export default class TerminalTab extends TabsBase {
    this.container = options.container;
    this.notebookTerminalComponentAdapter = new NotebookTerminalComponentAdapter(
      () => this.getNotebookServerInfo(options),
-      () => userContext?.databaseAccount,
-      () => this.tabId
+      () => userContext?.databaseAccount
    );
    this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
      if (
@@ -103,7 +100,6 @@ export default class TerminalTab extends TabsBase {
    return {
      authToken: info.authToken,
      notebookServerEndpoint: `${info.notebookServerEndpoint.replace(/\/+$/, "")}/${endpointSuffix}`,
-      forwardingId: info.forwardingId,
    };
  }
 }
--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -1,5 +1,4 @@
 import { Resource, StoredProcedureDefinition, TriggerDefinition, UserDefinedFunctionDefinition } from "@azure/cosmos";
-import { useNotebook } from "Explorer/Notebook/useNotebook";
 import * as ko from "knockout";
 import * as _ from "underscore";
 import * as Constants from "../../Common/Constants";
@@ -529,9 +528,6 @@ export default class Collection implements ViewModels.Collection {
  };

  public onSchemaAnalyzerClick = async () => {
-    if (useNotebook.getState().isPhoenixFeatures) {
-      await this.container.allocateContainer();
-    }
    useSelectedNode.getState().setSelectedNode(this);
    this.selectedSubnodeKind(ViewModels.CollectionTabKind.SchemaAnalyzer);
    const SchemaAnalyzerTab = await (await import("../Tabs/SchemaAnalyzerTab")).default;
@@ -576,8 +572,7 @@ export default class Collection implements ViewModels.Collection {

  public onSettingsClick = async (): Promise<void> => {
    useSelectedNode.getState().setSelectedNode(this);
-    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-    throughputCap && throughputCap !== -1 ? await useDatabases.getState().loadAllOffers() : await this.loadOffer();
+    await this.loadOffer();
    this.selectedSubnodeKind(ViewModels.CollectionTabKind.Settings);
    TelemetryProcessor.trace(Action.SelectItem, ActionModifiers.Mark, {
      description: "Settings node",
--- a/src/Explorer/Tree/Database.tsx
+++ b/src/Explorer/Tree/Database.tsx
@@ -57,7 +57,7 @@ export default class Database implements ViewModels.Database {
    this.isOfferRead = false;
  }

-  public onSettingsClick = async (): Promise<void> => {
+  public onSettingsClick = (): void => {
    useSelectedNode.getState().setSelectedNode(this);
    this.selectedSubnodeKind(ViewModels.CollectionTabKind.DatabaseSettings);
    TelemetryProcessor.trace(Action.SelectItem, ActionModifiers.Mark, {
@@ -66,11 +66,6 @@ export default class Database implements ViewModels.Database {
      dataExplorerArea: Constants.Areas.ResourceTree,
    });

-    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-    if (throughputCap && throughputCap !== -1) {
-      await useDatabases.getState().loadAllOffers();
-    }
-
    const pendingNotificationsPromise: Promise<DataModels.Notification> = this.getPendingThroughputSplitNotification();
    const tabKind = ViewModels.CollectionTabKind.DatabaseSettingsV2;
    const matchingTabs = useTabs.getState().getTabs(tabKind, (tab) => tab.node?.id() === this.id());
--- a/src/Explorer/Tree/ResourceTree.tsx
+++ b/src/Explorer/Tree/ResourceTree.tsx
@@ -121,7 +121,7 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
      children: [],
    };

-    if (!useNotebook.getState().isPhoenixNotebooks) {
+    if (userContext.features.notebooksTemporarilyDown) {
      notebooksTree.children.push(buildNotebooksTemporarilyDownTree());
    } else {
      if (galleryContentRoot) {
@@ -130,8 +130,9 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc

      if (
        myNotebooksContentRoot &&
-        useNotebook.getState().isPhoenixNotebooks &&
-        useNotebook.getState().connectionInfo.status === ConnectionStatusType.Connected
+        ((NotebookUtil.isPhoenixEnabled() &&
+          useNotebook.getState().connectionInfo.status === ConnectionStatusType.Connected) ||
+          userContext.features.phoenix === false)
      ) {
        notebooksTree.children.push(buildMyNotebooksTree());
      }
@@ -165,7 +166,15 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
    const myNotebooksTree: TreeNode = buildNotebookDirectoryNode(
      myNotebooksContentRoot,
      (item: NotebookContentItem) => {
-        container.openNotebook(item);
+        container.openNotebook(item).then((hasOpened) => {
+          if (
+            hasOpened &&
+            userContext.features.notebooksTemporarilyDown === false &&
+            userContext.features.phoenix === false
+          ) {
+            mostRecentActivity.notebookWasItemOpened(userContext.databaseAccount?.id, item);
+          }
+        });
      }
    );

@@ -180,7 +189,15 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
    const gitHubNotebooksTree: TreeNode = buildNotebookDirectoryNode(
      gitHubNotebooksContentRoot,
      (item: NotebookContentItem) => {
-        container.openNotebook(item);
+        container.openNotebook(item).then((hasOpened) => {
+          if (
+            hasOpened &&
+            userContext.features.notebooksTemporarilyDown === false &&
+            userContext.features.phoenix === false
+          ) {
+            mostRecentActivity.notebookWasItemOpened(userContext.databaseAccount?.id, item);
+          }
+        });
      },
      true
    );
@@ -380,11 +397,6 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
      },
    ];

-    //disallow renaming of temporary notebook workspace
-    if (item?.path === useNotebook.getState().notebookBasePath) {
-      items = items.filter((item) => item.label !== "Rename");
-    }
-
    // For GitHub paths remove "Delete", "Rename", "New Directory", "Upload File"
    if (GitHubUtils.fromContentUri(item.path)) {
      items = items.filter(
@@ -516,7 +528,7 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
      isNotebookEnabled &&
      userContext.apiType === "Mongo" &&
      isPublicInternetAccessAllowed() &&
-      useNotebook.getState().isPhoenixFeatures
+      !userContext.features.notebooksTemporarilyDown
    ) {
      children.push({
        label: "Schema (Preview)",
--- a/src/Explorer/Tree/ResourceTreeAdapter.tsx
+++ b/src/Explorer/Tree/ResourceTreeAdapter.tsx
@@ -808,11 +808,6 @@ export class ResourceTreeAdapter implements ReactAdapter {
      },
    ];

-    //disallow renaming of temporary notebook workspace
-    if (item?.path === useNotebook.getState().notebookBasePath) {
-      items = items.filter((item) => item.label !== "Rename");
-    }
-
    // For GitHub paths remove "Delete", "Rename", "New Directory", "Upload File"
    if (GitHubUtils.fromContentUri(item.path)) {
      items = items.filter(
--- a/src/Explorer/Tree/Trigger.ts
+++ b/src/Explorer/Tree/Trigger.ts
@@ -22,7 +22,6 @@ export default class Trigger {
  public triggerType: ko.Observable<string>;
  public triggerOperation: ko.Observable<string>;

-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  constructor(container: Explorer, collection: ViewModels.Collection, data: any) {
    this.nodeKind = "Trigger";
    this.container = container;
@@ -35,7 +34,7 @@ export default class Trigger {
    this.triggerType = ko.observable(data.triggerType);
  }

-  public select(): void {
+  public select() {
    useSelectedNode.getState().setSelectedNode(this);
    TelemetryProcessor.trace(Action.SelectItem, ActionModifiers.Mark, {
      description: "Trigger node",
@@ -44,8 +43,7 @@ export default class Trigger {
    });
  }

-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public static create(source: ViewModels.Collection, _event: MouseEvent): void {
+  public static create(source: ViewModels.Collection, event: MouseEvent) {
    const id = useTabs.getState().getTabs(ViewModels.CollectionTabKind.Triggers).length + 1;
    const trigger = <StoredProcedureDefinition>{
      id: "",
@@ -101,7 +99,7 @@ export default class Trigger {
    }
  };

-  public delete(): void {
+  public delete() {
    useDialog.getState().showOkCancelModalDialog(
      "Confirm delete",
      "Are you sure you want to delete the trigger?",
@@ -112,8 +110,7 @@ export default class Trigger {
            useTabs.getState().closeTabsByComparator((tab) => tab.node && tab.node.rid === this.rid);
            this.collection.children.remove(this);
          },
-          // eslint-disable-next-line @typescript-eslint/no-empty-function
-          () => {}
+          (reason) => {}
        );
      },
      "Cancel",
--- a/src/Explorer/useDatabases.ts
+++ b/src/Explorer/useDatabases.ts
@@ -18,7 +18,6 @@ interface DatabasesState {
  findCollection: (databaseId: string, collectionId: string) => ViewModels.Collection;
  isLastCollection: () => boolean;
  loadDatabaseOffers: () => Promise<void>;
-  loadAllOffers: () => Promise<void>;
  isFirstResourceCreated: () => boolean;
  findSelectedDatabase: () => ViewModels.Database;
  validateDatabaseId: (id: string) => boolean;
@@ -98,19 +97,6 @@ export const useDatabases: UseStore<DatabasesState> = create((set, get) => ({
      })
    );
  },
-  loadAllOffers: async () => {
-    await Promise.all(
-      get().databases?.map(async (database: ViewModels.Database) => {
-        await database.loadOffer();
-        await database.loadCollections();
-        await Promise.all(
-          (database.collections() || []).map(async (collection: ViewModels.Collection) => {
-            await collection.loadOffer();
-          })
-        );
-      })
-    );
-  },
  isFirstResourceCreated: () => {
    const databases = get().databases;

--- a/Show More
+++ b/Show More