Updating string for partition key size checkbox

2025-12-23 02:41:39 +00:00 · 2021-12-08 12:53:12 -08:00
59 changed files with 7539 additions and 5776 deletions
--- 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/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/less/documentDB.less
+++ b/less/documentDB.less
@@ -2895,14 +2895,6 @@ a:link {
  .pageOptionsPart {
    padding-bottom: @MediumSpace;
  }
-
-  .legendLabel {
-    border-bottom: 0px;
-    width: auto;
-    font-size: @mediumFontSize;
-    display: inline !important;
-    float: left;
-  }
 }

 // TODO: Remove these styles once we refactor all buttons to use the command button component
--- a/package-lock.json
+++ b/package-lock.json
@@ -6326,8 +6326,8 @@
    },
    "@webpack-cli/serve": {
      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz",
-      "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==",
+      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/AzurePortal/npm/registry/@webpack-cli/serve/-/serve-1.5.2.tgz",
+      "integrity": "sha1-6lhLY3/2PFpHf28hYEtaIFtyyew=",
      "dev": true
    },
    "@xtuc/ieee754": {
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -96,8 +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 Phoenix = "phoenix";
  public static readonly NotebooksDownBanner = "notebooksdownbanner";
 }

@@ -366,7 +365,7 @@ export class Notebook {
  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;
@@ -379,7 +378,7 @@ export class Notebook {
    "We have identified an issue with the Cassandra Shell and it is unavailable right now. We are actively working on the mitigation.";
  public static saveNotebookModalTitle = "Save notebook in temporary workspace";
  public static saveNotebookModalContent =
-    "This notebook will be saved in the temporary workspace and will be removed when the session expires.";
+    "This notebook will be saved in the temporary workspace and will be removed when the session expires. To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends.";
  public static newNotebookModalTitle = "Create notebook in temporary workspace";
  public static newNotebookUploadModalTitle = "Upload notebook to temporary workspace";
  public static newNotebookModalContent1 =
--- a/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,16 +1,4 @@
-import {
-  allowedAadEndpoints,
-  allowedArcadiaEndpoints,
-  allowedArmEndpoints,
-  allowedBackendEndpoints,
-  allowedEmulatorEndpoints,
-  allowedGraphEndpoints,
-  allowedHostedExplorerEndpoints,
-  allowedJunoOrigins,
-  allowedMongoBackendEndpoints,
-  allowedMsalRedirectEndpoints,
-  validateEndpoint,
-} from "Utils/EndpointValidation";
+import { JunoEndpoints } from "Common/Constants";

 export enum Platform {
  Portal = "Portal",
@@ -20,7 +8,7 @@ export enum Platform {

 export interface ConfigContext {
  platform: Platform;
-  allowedParentFrameOrigins: ReadonlyArray<string>;
+  allowedParentFrameOrigins: string[];
  gitSha?: string;
  proxyPath?: string;
  AAD_ENDPOINT: string;
@@ -39,9 +27,9 @@ export interface ConfigContext {
  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 +43,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/",
@@ -70,7 +59,14 @@ let configContext: Readonly<ConfigContext> = {
  GITHUB_TEST_ENV_CLIENT_ID: "b63fc8cbf87fd3c6e2eb", // Registered OAuth app: https://github.com/organizations/AzureCosmosDBNotebooks/settings/applications/1777772
  JUNO_ENDPOINT: "https://tools.cosmos.azure.com",
  BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
-  isTerminalEnabled: false,
+  allowedJunoOrigins: [
+    JunoEndpoints.Test,
+    JunoEndpoints.Test2,
+    JunoEndpoints.Test3,
+    JunoEndpoints.Prod,
+    JunoEndpoints.Stage,
+    "https://localhost",
+  ],
 };

 export function resetConfigContext(): void {
@@ -81,50 +77,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 +100,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
@@ -438,10 +438,14 @@ export interface ContainerInfo {
 }

 export interface IProvisionData {
+  subscriptionId: string;
+  resourceGroup: string;
+  dbAccountName: string;
  cosmosEndpoint: string;
 }

 export interface IContainerData {
+  dbAccountName: string;
  forwardingId: string;
 }

--- 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/Notebook/NotebookTerminalComponent.test.tsx
+++ b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx
@@ -55,7 +55,6 @@ describe("NotebookTerminalComponent", () => {
    const props: NotebookTerminalComponentProps = {
      databaseAccount: testAccount,
      notebookServerInfo: testNotebookServerInfo,
-      tabId: undefined,
    };

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

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

    const wrapper = shallow(<NotebookTerminalComponent {...props} />);
@@ -88,7 +85,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";
@@ -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/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -1,10 +1,8 @@
 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";
@@ -16,16 +14,12 @@ import { getErrorMessage, getErrorStack, handleError } from "../Common/ErrorHand
 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, IPhoenixConnectionInfoResult, IResponse } 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 +27,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 +46,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";
@@ -174,11 +174,7 @@ export default class Explorer {
    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,
@@ -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,7 +352,24 @@ 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,
+        forwardingId: undefined,
+      });
+    }
+
    this.refreshNotebookList();
+
    this._isInitializingNotebooks = false;
  }

@@ -355,7 +381,10 @@ export default class Explorer {
      (notebookServerInfo === undefined ||
        (notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined))
    ) {
-      const provisionData: IProvisionData = {
+      const provisionData = {
+        subscriptionId: userContext.subscriptionId,
+        resourceGroup: userContext.resourceGroup,
+        dbAccountName: userContext.databaseAccount.name,
        cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
      };
      const connectionStatus: ContainerConnectionInfo = {
@@ -409,10 +438,7 @@ export default class Explorer {
    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,
    });
@@ -429,7 +455,7 @@ export default class Explorer {
      );
      return;
    }
-    const dialogContent = useNotebook.getState().isPhoenixNotebooks
+    const dialogContent = NotebookUtil.isPhoenixEnabled()
      ? "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?";

@@ -462,6 +488,35 @@ 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");
@@ -477,7 +532,7 @@ export default class Explorer {
      TelemetryProcessor.traceStart(Action.PhoenixResetWorkspace, {
        dataExplorerArea: Areas.Notebook,
      });
-      if (useNotebook.getState().isPhoenixNotebooks) {
+      if (NotebookUtil.isPhoenixEnabled()) {
        useTabs.getState().closeAllNotebookTabs(true);
        connectionStatus = {
          status: ConnectionStatusType.Connecting,
@@ -491,7 +546,7 @@ export default class Explorer {
      if (!connectionInfo?.data?.notebookServerUrl) {
        throw new Error(`Reset Workspace: NotebookServerUrl is invalid!`);
      }
-      if (useNotebook.getState().isPhoenixNotebooks) {
+      if (NotebookUtil.isPhoenixEnabled()) {
        await this.setNotebookInfo(connectionInfo, connectionStatus);
        useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
      }
@@ -506,7 +561,7 @@ export default class Explorer {
        error: getErrorMessage(error),
        errorStack: getErrorStack(error),
      });
-      if (useNotebook.getState().isPhoenixNotebooks) {
+      if (NotebookUtil.isPhoenixEnabled()) {
        connectionStatus = {
          status: ConnectionStatusType.Failed,
        };
@@ -704,7 +759,7 @@ export default class Explorer {
    if (!notebookContentItem || !notebookContentItem.path) {
      throw new Error(`Invalid notebookContentItem: ${notebookContentItem}`);
    }
-    if (notebookContentItem.type === NotebookContentItemType.Notebook && useNotebook.getState().isPhoenixNotebooks) {
+    if (notebookContentItem.type === NotebookContentItemType.Notebook && NotebookUtil.isPhoenixEnabled()) {
      await this.allocateContainer();
    }

@@ -922,17 +977,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) {
-        await this.allocateContainer();
-        parent = parent || this.resourceTree.myNotebooksContentRoot;
-        this.createNewNoteBook(parent, isGithubTree);
+        async () => {
+          await this.allocateContainer();
+          parent = parent || this.resourceTree.myNotebooksContentRoot;
+          this.createNewNoteBook(parent, isGithubTree);
+        };
      } else {
        useDialog.getState().showOkCancelModalDialog(
          Notebook.newNotebookModalTitle,
@@ -1017,7 +1075,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) {
@@ -1057,7 +1115,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) {
@@ -1148,12 +1206,20 @@ export default class Explorer {
    }
  }

+  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} />);
+  }
+
  public async handleOpenFileAction(path: string): Promise<void> {
-    if (useNotebook.getState().isPhoenixNotebooks === undefined) {
-      await useNotebook.getState().getPhoenixStatus();
-    }
-    if (useNotebook.getState().isPhoenixNotebooks) {
+    if (userContext.features.phoenix) {
      await this.allocateContainer();
+    } else if (!(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 +1250,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 +1280,7 @@ export default class Explorer {
  }

  public getDownloadModalConent(fileName: string): JSX.Element {
-    if (useNotebook.getState().isPhoenixNotebooks) {
+    if (NotebookUtil.isPhoenixEnabled()) {
      return (
        <>
          <p>{Notebook.galleryNotebookDownloadContent1}</p>
@@ -1238,19 +1304,22 @@ export default class Explorer {
    await useNotebook.getState().refreshNotebooksEnabledStateForAccount();

    // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
-    const isNotebookEnabled = userContext.features.notebooksDownBanner || useNotebook.getState().isPhoenixNotebooks;
+    const isNotebookEnabled = userContext.features.notebooksDownBanner || userContext.features.phoenix;
    useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled);
-    useNotebook
-      .getState()
-      .setIsShellEnabled(useNotebook.getState().isPhoenixFeatures && isPublicInternetAccessAllowed());
+    useNotebook.getState().setIsShellEnabled(userContext.features.phoenix && isPublicInternetAccessAllowed());

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

-    if (useNotebook.getState().isPhoenixNotebooks) {
-      await this.initNotebooks(userContext.databaseAccount);
+    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/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()) {
+
+    notebookButtons.push(createOpenTerminalButton(container));
+    if (selectedNodeState.isConnectedToContainer()) {
      notebookButtons.push(createNotebookWorkspaceResetButton(container));
    }
    if (
@@ -96,19 +98,22 @@ export function createStaticCommandBarButtons(
    }

    notebookButtons.forEach((btn) => {
-      if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
-        if (!useNotebook.getState().isPhoenixFeatures) {
+      if (userContext.features.notebooksTemporarilyDown) {
+        if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
-        }
-      } else if (btn.commandButtonLabel.indexOf("Mongo") !== -1) {
-        if (!useNotebook.getState().isPhoenixFeatures) {
+        } else if (btn.commandButtonLabel.indexOf("Mongo") !== -1) {
          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
+        } else {
+          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
        }
-      } else if (!useNotebook.getState().isPhoenixNotebooks) {
-        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) {
-          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
+          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;
  }
@@ -459,6 +477,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 +521,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 +532,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 +553,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 +564,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/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx
+++ b/src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Link } from "@fluentui/react";
 import { CellId, CellType, ImmutableNotebook } from "@nteract/commutable";
 // Vendor modules
 import {
@@ -15,15 +14,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";
@@ -102,10 +99,6 @@ 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 {
    this.getStore().dispatch(
      actions.fetchContentFulfilled({
@@ -137,32 +130,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,
-        })
-      );
-    }
+    this.getStore().dispatch(
+      actions.save({
+        contentRef: this.contentRef,
+      })
+    );
  }

  public notebookChangeKernel(kernelSpecName: string): void {
@@ -369,19 +341,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
@@ -8,10 +8,17 @@ import { ConnectionStatusType, HttpHeaders, HttpStatusCodes, Notebook } from "..
 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,
+  IPhoenixConnectionInfoResult,
+  IProvisionData,
+  IResponse,
+} from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
+import { createOrUpdate, destroy } from "../../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
 import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { NotebookUtil } from "./NotebookUtil";
 import { useNotebook } from "./useNotebook";

 export class NotebookContainerClient {
@@ -48,11 +55,21 @@ export class NotebookContainerClient {
   */
  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);
+      try {
+        const memoryUsageInfo = await this.getMemoryUsage();
+        useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo);
+        const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+        if (notebookServerInfo?.notebookServerEndpoint) {
+          this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
+        }
+      } catch (exception) {
+        if (NotebookUtil.isPhoenixEnabled()) {
+          const connectionStatus: ContainerConnectionInfo = {
+            status: ConnectionStatusType.Failed,
+          };
+          useNotebook.getState().resetContainerConnection(connectionStatus);
+          useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
+        }
      }
    }, delayMs);
  }
@@ -91,7 +108,7 @@ export class NotebookContainerClient {
    notebookServerEndpoint: string,
    authToken: string
  ): Promise<DataModels.MemoryUsageInfo> {
-    if (this.shouldExecuteMemoryCall()) {
+    if (this.checkStatus()) {
      const response = await fetch(`${notebookServerEndpoint}api/metrics/memory`, {
        method: "GET",
        headers: {
@@ -114,17 +131,24 @@ export class NotebookContainerClient {
      } else if (response.status === HttpStatusCodes.NotFound) {
        throw new AbortError(response.statusText);
      }
-      throw new Error(response.statusText);
+      throw new Error();
    } else {
      return undefined;
    }
  }

-  private shouldExecuteMemoryCall(): boolean {
-    return (
-      useNotebook.getState().containerStatus?.status === Constants.ContainerStatusType.Active &&
-      useNotebook.getState().connectionInfo?.status === ConnectionStatusType.Connected
-    );
+  private checkStatus(): boolean {
+    if (NotebookUtil.isPhoenixEnabled()) {
+      if (useNotebook.getState().containerStatus?.status === Constants.ContainerStatusType.Disconnected) {
+        const connectionStatus: ContainerConnectionInfo = {
+          status: ConnectionStatusType.Reconnect,
+        };
+        useNotebook.getState().resetContainerConnection(connectionStatus);
+        useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
+        return false;
+      }
+    }
+    return true;
  }

  public async resetWorkspace(): Promise<IResponse<IPhoenixConnectionInfoResult>> {
@@ -149,8 +173,11 @@ export class NotebookContainerClient {
    }

    try {
-      if (useNotebook.getState().isPhoenixNotebooks) {
+      if (NotebookUtil.isPhoenixEnabled()) {
        const provisionData: IProvisionData = {
+          subscriptionId: userContext.subscriptionId,
+          resourceGroup: userContext.resourceGroup,
+          dbAccountName: userContext.databaseAccount.name,
          cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
        };
        return await this.phoenixClient.resetContainer(provisionData);
@@ -158,6 +185,9 @@ export class NotebookContainerClient {
      return null;
    } catch (error) {
      Logger.logError(getErrorMessage(error), "NotebookContainerClient/resetWorkspace");
+      if (!NotebookUtil.isPhoenixEnabled()) {
+        await this.recreateNotebookWorkspaceAsync();
+      }
      throw error;
    }
  }
@@ -172,6 +202,25 @@ export class NotebookContainerClient {
    };
  }

+  private async recreateNotebookWorkspaceAsync(): Promise<void> {
+    const { databaseAccount } = userContext;
+    if (!databaseAccount?.id) {
+      throw new Error("DataExplorer not initialized");
+    }
+    try {
+      await destroy(userContext.subscriptionId, userContext.resourceGroup, userContext.databaseAccount.name, "default");
+      await createOrUpdate(
+        userContext.subscriptionId,
+        userContext.resourceGroup,
+        userContext.databaseAccount.name,
+        "default"
+      );
+    } catch (error) {
+      Logger.logError(getErrorMessage(error), "NotebookContainerClient/recreateNotebookWorkspaceAsync");
+      return Promise.reject(error);
+    }
+  }
+
  private getHeaders(): HeadersInit {
    const authorizationHeader = getAuthorizationHeader();
    return {
--- 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/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";
@@ -19,6 +17,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;
@@ -38,8 +37,6 @@ interface NotebookState {
  isAllocating: boolean;
  isRefreshed: boolean;
  containerStatus: ContainerInfo;
-  isPhoenixNotebooks: boolean;
-  isPhoenixFeatures: boolean;
  setIsNotebookEnabled: (isNotebookEnabled: boolean) => void;
  setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => void;
  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
@@ -61,9 +58,6 @@ interface NotebookState {
  resetContainerConnection: (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) => ({
@@ -98,8 +92,6 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
    durationLeftInMinutes: undefined,
    notebookServerInfo: undefined,
  },
-  isPhoenixNotebooks: undefined,
-  isPhoenixFeatures: undefined,
  setIsNotebookEnabled: (isNotebookEnabled: boolean) => set({ isNotebookEnabled }),
  setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => set({ isNotebooksEnabledForAccount }),
  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) =>
@@ -112,7 +104,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 +196,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,
@@ -301,21 +292,4 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
  },
  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
@@ -25,7 +25,6 @@ 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);
@@ -44,7 +43,6 @@ 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);
--- a/src/Explorer/Panes/AddCollectionPanel.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel.tsx
@@ -11,7 +11,7 @@ import {
  Separator,
  Stack,
  Text,
-  TooltipHost,
+  TooltipHost
 } from "@fluentui/react";
 import * as Constants from "Common/Constants";
 import { createCollection } from "Common/dataAccess/createCollection";
@@ -279,7 +279,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}
@@ -468,8 +468,8 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                directionalHint={DirectionalHint.bottomLeftEdge}
                content={`You can optionally provision dedicated throughput for a ${getCollectionName().toLocaleLowerCase()} within a database that has throughput
                  provisioned. This dedicated throughput amount will not be shared with other ${getCollectionName(
-                    true
-                  ).toLocaleLowerCase()} in the database and
+                  true
+                ).toLocaleLowerCase()} in the database and
                  does not count towards the throughput you provisioned for the database. This throughput amount will be
                  billed in addition to the throughput amount you provisioned at the database level.`}
              >
@@ -887,6 +887,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      return false;
    }

+    if (isServerlessAccount()) {
+      return false;
+    }
+
    switch (userContext.apiType) {
      case "SQL":
      case "Mongo":
@@ -1015,10 +1019,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
    const partitionKeyVersion = this.state.useHashV2 ? 2 : undefined;
    const partitionKey: DataModels.PartitionKey = partitionKeyString
      ? {
-          paths: [partitionKeyString],
-          kind: "Hash",
-          version: partitionKeyVersion,
-        }
+        paths: [partitionKeyString],
+        kind: "Hash",
+        version: partitionKeyVersion,
+      }
      : undefined;

    const indexingPolicy: DataModels.IndexingPolicy = this.state.enableIndexing
--- a/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
+++ b/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
@@ -306,7 +306,7 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
            multiline
            id="editor-area"
            rows={5}
-            ariaLabel="Table Schema"
+            aria-label="Table Schema"
            value={userTableQuery}
            onChange={(e, newValue) => setUserTableQuery(newValue)}
          />
@@ -334,7 +334,7 @@ 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)}
--- 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
@@ -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/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,52 +118,46 @@ 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="panelMainContent">
-        <InputParameter
-          dropdownLabel="Key"
-          inputParameterTitle="Partition key value"
-          inputLabel="Value"
-          isAddRemoveVisible={false}
-          onParamValueChange={(_event, newInput?: string) => (partitionValueRef.current = newInput)}
-          onParamKeyChange={(_event: React.FormEvent<HTMLDivElement>, item: IDropdownOption) =>
-            (partitionKeyRef.current = item.key.toString())
-          }
-          paramValue={partitionValueRef.current}
-          selectedKey={partitionKeyRef.current}
-        />
-        {getInputParameterComponent()}
-        <Stack horizontal onClick={() => addNewParamAtLastIndex()} tabIndex={0}>
-          <Image {...imageProps} src={AddPropertyIcon} alt="Add param" />
-          <Text className="addNewParamStyle">Add New Param</Text>
-        </Stack>
+      <div className="panelFormWrapper">
+        <div className="panelMainContent">
+          <InputParameter
+            dropdownLabel="Key"
+            inputParameterTitle="Partition key value"
+            inputLabel="Value"
+            isAddRemoveVisible={false}
+            onParamValueChange={(_event, newInput?: string) => {
+              setPartitionValue(newInput);
+            }}
+            onParamKeyChange={onPartitionKeyChange}
+            paramValue={partitionValue}
+            selectedKey={selectedKey.key}
+          />
+          {paramKeyValues.map((paramKeyValue, index) => (
+            <InputParameter
+              key={paramKeyValue && paramKeyValue.text + index}
+              dropdownLabel={!index && "Key"}
+              inputParameterTitle={!index && "Enter input parameters (if any)"}
+              inputLabel={!index && "Param"}
+              isAddRemoveVisible={true}
+              onDeleteParamKeyPress={() => deleteParamAtIndex(index)}
+              onAddNewParamKeyPress={() => addNewParamAtIndex(index + 1)}
+              onParamValueChange={(event, newInput?: string) => {
+                paramValueChange(newInput, index);
+              }}
+              onParamKeyChange={(event: React.FormEvent<HTMLDivElement>, selectedParam: IDropdownOption) => {
+                paramKeyChange(event, selectedParam, index);
+              }}
+              paramValue={paramKeyValue && paramKeyValue.text}
+              selectedKey={paramKeyValue && paramKeyValue.key}
+            />
+          ))}
+          <Stack horizontal onClick={addNewParamAtLastIndex} tabIndex={0}>
+            <Image {...imageProps} src={AddPropertyIcon} alt="Add param" />
+            <Text className="addNewParamStyle">Add New Param</Text>
+          </Stack>
+        </div>
      </div>
    </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
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -1,4 +1,4 @@
-import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton } from "@fluentui/react";
+import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton, Stack, Text } from "@fluentui/react";
 import * as Constants from "Common/Constants";
 import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { configContext } from "ConfigContext";
@@ -115,15 +115,9 @@ export const SettingsPane: FunctionComponent = () => {
  };

  const choiceButtonStyles = {
-    root: {
-      clear: "both",
-    },
    flexContainer: [
      {
        selectors: {
-          ".ms-ChoiceFieldGroup root-133": {
-            clear: "both",
-          },
          ".ms-ChoiceField-wrapper label": {
            fontSize: 12,
            paddingTop: 0,
@@ -141,22 +135,22 @@ export const SettingsPane: FunctionComponent = () => {
        {shouldShowQueryPageOptions && (
          <div className="settingsSection">
            <div className="settingsSectionPart">
-              <fieldset>
-                <legend id="pageOptions" className="settingsSectionLabel legendLabel">
-                  Page Options
-                </legend>
+              <Stack horizontal>
+                <Text id="pageOptions" className="settingsSectionLabel" variant="small">
+                  Page options
+                </Text>
                <InfoTooltip>
                  Choose Custom to specify a fixed amount of query results to show, or choose Unlimited to show as many
                  query results per page.
                </InfoTooltip>
-                <ChoiceGroup
-                  ariaLabelledBy="pageOptions"
-                  selectedKey={pageOption}
-                  options={pageOptionList}
-                  styles={choiceButtonStyles}
-                  onChange={handleOnPageOptionChange}
-                />
-              </fieldset>
+              </Stack>
+              <ChoiceGroup
+                ariaLabelledBy="pageOptions"
+                selectedKey={pageOption}
+                options={pageOptionList}
+                styles={choiceButtonStyles}
+                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
@@ -16,57 +16,54 @@ exports[`Settings Pane should render Default properly 1`] = `
      <div
        className="settingsSectionPart"
      >
-        <fieldset>
-          <legend
-            className="settingsSectionLabel legendLabel"
+        <Stack
+          horizontal={true}
+        >
+          <Text
+            className="settingsSectionLabel"
            id="pageOptions"
+            variant="small"
          >
-            Page Options
-          </legend>
+            Page options
+          </Text>
          <InfoTooltip>
            Choose Custom to specify a fixed amount of query results to show, or choose Unlimited to show as many query results per page.
          </InfoTooltip>
-          <StyledChoiceGroup
-            ariaLabelledBy="pageOptions"
-            onChange={[Function]}
-            options={
-              Array [
-                Object {
-                  "key": "custom",
-                  "text": "Custom",
-                },
-                Object {
-                  "key": "unlimited",
-                  "text": "Unlimited",
-                },
-              ]
-            }
-            selectedKey="custom"
-            styles={
+        </Stack>
+        <StyledChoiceGroup
+          ariaLabelledBy="pageOptions"
+          onChange={[Function]}
+          options={
+            Array [
              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",
-                      },
+                "key": "custom",
+                "text": "Custom",
+              },
+              Object {
+                "key": "unlimited",
+                "text": "Unlimited",
+              },
+            ]
+          }
+          selectedKey="custom"
+          styles={
+            Object {
+              "flexContainer": Array [
+                Object {
+                  "selectors": Object {
+                    ".ms-ChoiceField": Object {
+                      "marginTop": 0,
+                    },
+                    ".ms-ChoiceField-wrapper label": Object {
+                      "fontSize": 12,
+                      "paddingTop": 0,
                    },
                  },
-                ],
-                "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/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,
@@ -42,7 +41,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 },
--- 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();
-    recentItems = recentItems.filter((item) => item.description !== "Notebook");
+    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",
--- a/src/Explorer/Tables/Constants.ts
+++ b/src/Explorer/Tables/Constants.ts
@@ -14,7 +14,6 @@ export const CassandraType = {
  Bigint: "Bigint",
  Blob: "Blob",
  Boolean: "Boolean",
-  Date: "Date",
  Decimal: "Decimal",
  Double: "Double",
  Float: "Float",
--- a/src/Explorer/Tables/TableDataClient.ts
+++ b/src/Explorer/Tables/TableDataClient.ts
@@ -536,8 +536,7 @@ export class CassandraAPIDataClient extends TableDataClient {
      dataType === TableConstants.CassandraType.Inet ||
      dataType === TableConstants.CassandraType.Ascii ||
      dataType === TableConstants.CassandraType.Varchar ||
-      dataType === TableConstants.CassandraType.Timestamp ||
-      dataType === TableConstants.CassandraType.Date
+      dataType === TableConstants.CassandraType.Timestamp
    );
  }

--- a/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
@@ -215,13 +215,13 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
      {
        metric: "Request Charge",
        value: this.state.requestChargeDisplayText,
-        toolTip: "Request Charge",
+        toolTip: "",
        isQueryMetricsEnabled: true,
      },
      {
        metric: "Showing Results",
        value: this.state.showingDocumentsDisplayText,
-        toolTip: "Showing Results",
+        toolTip: "",
        isQueryMetricsEnabled: true,
      },
      {
@@ -364,11 +364,13 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
  }

  public onTabClick(): void {
-    if (!this.isCloseClicked) {
-      useCommandBar.getState().setContextButtons(this.getTabsButtons());
-    } else {
-      this.isCloseClicked = false;
-    }
+    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 (
--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -1,5 +1,5 @@
 import { Resource, StoredProcedureDefinition, TriggerDefinition, UserDefinedFunctionDefinition } from "@azure/cosmos";
-import { useNotebook } from "Explorer/Notebook/useNotebook";
+import { NotebookUtil } from "Explorer/Notebook/NotebookUtil";
 import * as ko from "knockout";
 import * as _ from "underscore";
 import * as Constants from "../../Common/Constants";
@@ -529,7 +529,7 @@ export default class Collection implements ViewModels.Collection {
  };

  public onSchemaAnalyzerClick = async () => {
-    if (useNotebook.getState().isPhoenixFeatures) {
+    if (NotebookUtil.isPhoenixEnabled()) {
      await this.container.allocateContainer();
    }
    useSelectedNode.getState().setSelectedNode(this);
--- 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/Juno/JunoClient.ts
+++ b/src/Juno/JunoClient.ts
@@ -1,5 +1,4 @@
 import ko from "knockout";
-import { allowedJunoOrigins, validateEndpoint } from "Utils/EndpointValidation";
 import { GetGithubClientId } from "Utils/GitHubUtils";
 import { HttpHeaders, HttpStatusCodes } from "../Common/Constants";
 import { configContext } from "../ConfigContext";
@@ -485,7 +484,7 @@ export class JunoClient {
  // public for tests
  public static getJunoEndpoint(): string {
    const junoEndpoint = userContext.features.junoEndpoint ?? configContext.JUNO_ENDPOINT;
-    if (!validateEndpoint(junoEndpoint, allowedJunoOrigins)) {
+    if (configContext.allowedJunoOrigins.indexOf(new URL(junoEndpoint).origin) === -1) {
      const error = `${junoEndpoint} not allowed as juno endpoint`;
      console.error(error);
      throw new Error(error);
--- a/src/Phoenix/PhoenixClient.ts
+++ b/src/Phoenix/PhoenixClient.ts
@@ -1,19 +1,9 @@
 import promiseRetry, { AbortError } from "p-retry";
-import { Action } from "Shared/Telemetry/TelemetryConstants";
-import { allowedJunoOrigins, validateEndpoint } from "Utils/EndpointValidation";
-import {
-  Areas,
-  ConnectionStatusType,
-  ContainerStatusType,
-  HttpHeaders,
-  HttpStatusCodes,
-  Notebook,
-} from "../Common/Constants";
+import { ContainerStatusType, HttpHeaders, HttpStatusCodes, Notebook } from "../Common/Constants";
 import { getErrorMessage } from "../Common/ErrorHandlingUtils";
 import * as Logger from "../Common/Logger";
 import { configContext } from "../ConfigContext";
 import {
-  ContainerConnectionInfo,
  ContainerInfo,
  IContainerData,
  IPhoenixConnectionInfoResult,
@@ -21,7 +11,6 @@ import {
  IResponse,
 } from "../Contracts/DataModels";
 import { useNotebook } from "../Explorer/Notebook/useNotebook";
-import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../UserContext";
 import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";

@@ -46,8 +35,8 @@ export class PhoenixClient {
    operation: string
  ): Promise<IResponse<IPhoenixConnectionInfoResult>> {
    try {
-      const response = await fetch(`${this.getPhoenixControlPlanePathPrefix()}/containerconnections`, {
-        method: operation === "allocate" ? "POST" : "PATCH",
+      const response = await fetch(`${this.getPhoenixContainerPoolingEndPoint()}/${operation}`, {
+        method: "POST",
        headers: PhoenixClient.getHeaders(),
        body: JSON.stringify(provisionData),
      });
@@ -66,7 +55,7 @@ export class PhoenixClient {
    }
  }

-  public async initiateContainerHeartBeat(containerData: IContainerData) {
+  public async initiateContainerHeartBeat(containerData: { forwardingId: string; dbAccountName: string }) {
    if (this.containerHealthHandler) {
      clearTimeout(this.containerHealthHandler);
    }
@@ -83,7 +72,7 @@ export class PhoenixClient {
    try {
      const runContainerStatusAsync = async () => {
        const response = await window.fetch(
-          `${this.getPhoenixControlPlanePathPrefix()}/${containerData.forwardingId}`,
+          `${this.getPhoenixContainerPoolingEndPoint()}/${containerData.dbAccountName}/${containerData.forwardingId}`,
          {
            method: "GET",
            headers: PhoenixClient.getHeaders(),
@@ -97,32 +86,13 @@ export class PhoenixClient {
            status: ContainerStatusType.Active,
          };
        } else if (response.status === HttpStatusCodes.NotFound) {
-          const error = "Disconnected from compute workspace";
-          Logger.logError(error, "");
-          const connectionStatus: ContainerConnectionInfo = {
-            status: ConnectionStatusType.Reconnect,
-          };
-          TelemetryProcessor.traceMark(Action.PhoenixHeartBeat, {
-            dataExplorerArea: Areas.Notebook,
-            message: getErrorMessage(error),
-          });
-          useNotebook.getState().resetContainerConnection(connectionStatus);
-          useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
          throw new AbortError(response.statusText);
        }
        throw new Error(response.statusText);
      };
      return await promiseRetry(runContainerStatusAsync, this.retryOptions);
    } catch (error) {
-      TelemetryProcessor.traceFailure(Action.PhoenixHeartBeat, {
-        dataExplorerArea: Areas.Notebook,
-      });
-      Logger.logError(getErrorMessage(error), "");
-      const connectionStatus: ContainerConnectionInfo = {
-        status: ConnectionStatusType.Failed,
-      };
-      useNotebook.getState().resetContainerConnection(connectionStatus);
-      useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
+      Logger.logError(getErrorMessage(error), "PhoenixClient/getContainerStatus");
      return {
        durationLeftInMinutes: undefined,
        notebookServerInfo: undefined,
@@ -131,31 +101,26 @@ export class PhoenixClient {
    }
  }

-  private async getContainerHealth(delayMs: number, containerData: IContainerData) {
-    const containerInfo = await this.getContainerStatusAsync(containerData);
-    useNotebook.getState().setContainerStatus(containerInfo);
-    if (useNotebook.getState().containerStatus?.status === ContainerStatusType.Active) {
-      this.scheduleContainerHeartbeat(delayMs, containerData);
-    }
-  }
-
-  public async isDbAcountWhitelisted(): Promise<boolean> {
+  private async getContainerHealth(delayMs: number, containerData: { forwardingId: string; dbAccountName: string }) {
    try {
-      const response = await window.fetch(`${this.getPhoenixControlPlanePathPrefix()}`, {
-        method: "GET",
-        headers: PhoenixClient.getHeaders(),
+      const containerInfo = await this.getContainerStatusAsync(containerData);
+      useNotebook.getState().setContainerStatus(containerInfo);
+      if (useNotebook.getState().containerStatus?.status === ContainerStatusType.Active) {
+        this.scheduleContainerHeartbeat(delayMs, containerData);
+      }
+    } catch (exception) {
+      useNotebook.getState().setContainerStatus({
+        durationLeftInMinutes: undefined,
+        notebookServerInfo: undefined,
+        status: ContainerStatusType.Disconnected,
      });
-      return response.status === HttpStatusCodes.OK;
-    } catch (error) {
-      Logger.logError(getErrorMessage(error), "PhoenixClient/IsDbAcountWhitelisted");
-      return false;
    }
  }

  public static getPhoenixEndpoint(): string {
    const phoenixEndpoint =
      userContext.features.phoenixEndpoint ?? userContext.features.junoEndpoint ?? configContext.JUNO_ENDPOINT;
-    if (!validateEndpoint(phoenixEndpoint, allowedJunoOrigins)) {
+    if (configContext.allowedJunoOrigins.indexOf(new URL(phoenixEndpoint).origin) === -1) {
      const error = `${phoenixEndpoint} not allowed as juno endpoint`;
      console.error(error);
      throw new Error(error);
@@ -164,10 +129,8 @@ export class PhoenixClient {
    return phoenixEndpoint;
  }

-  public getPhoenixControlPlanePathPrefix(): string {
-    return `${PhoenixClient.getPhoenixEndpoint()}/api/controlplane/toolscontainer/cosmosaccounts${
-      userContext.databaseAccount.id
-    }`;
+  public getPhoenixContainerPoolingEndPoint(): string {
+    return `${PhoenixClient.getPhoenixEndpoint()}/api/controlplane/toolscontainer`;
  }

  private static getHeaders(): HeadersInit {
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -11,8 +11,7 @@ export type Features = {
  autoscaleDefault: boolean;
  partitionKeyDefault: boolean;
  partitionKeyDefault2: boolean;
-  phoenixNotebooks: boolean;
-  phoenixFeatures: boolean;
+  phoenix: boolean;
  notebooksDownBanner: boolean;
  readonly enableSDKoperations: boolean;
  readonly enableSpark: boolean;
@@ -23,6 +22,7 @@ export type Features = {
  readonly hostedDataExplorer: boolean;
  readonly junoEndpoint?: string;
  readonly phoenixEndpoint?: string;
+  readonly livyEndpoint?: string;
  readonly notebookBasePath?: string;
  readonly notebookServerToken?: string;
  readonly notebookServerUrl?: string;
@@ -33,6 +33,7 @@ export type Features = {
  readonly ttl90Days: boolean;
  readonly mongoProxyEndpoint?: string;
  readonly mongoProxyAPIs?: string;
+  readonly notebooksTemporarilyDown: boolean;
  readonly enableThroughputCap: boolean;
 };

@@ -71,6 +72,7 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
    mongoProxyAPIs: get("mongoproxyapis"),
    junoEndpoint: get("junoendpoint"),
    phoenixEndpoint: get("phoenixendpoint"),
+    livyEndpoint: get("livyendpoint"),
    notebookBasePath: get("notebookbasepath"),
    notebookServerToken: get("notebookservertoken"),
    notebookServerUrl: get("notebookserverurl"),
@@ -82,8 +84,8 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
    autoscaleDefault: "true" === get("autoscaledefault"),
    partitionKeyDefault: "true" === get("partitionkeytest"),
    partitionKeyDefault2: "true" === get("pkpartitionkeytest"),
-    phoenixNotebooks: "true" === get("phoenixnotebooks"),
-    phoenixFeatures: "true" === get("phoenixfeatures"),
+    notebooksTemporarilyDown: "true" === get("notebookstemporarilydown", "true"),
+    phoenix: "true" === get("phoenix"),
    notebooksDownBanner: "true" === get("notebooksDownBanner"),
    enableThroughputCap: "true" === get("enablethroughputcap"),
  };
--- a/src/Shared/Telemetry/TelemetryConstants.ts
+++ b/src/Shared/Telemetry/TelemetryConstants.ts
@@ -82,7 +82,6 @@ export enum Action {
  NotebooksMoveCellUpFromMenu,
  NotebooksMoveCellDownFromMenu,
  PhoenixConnection,
-  PhoenixHeartBeat,
  PhoenixResetWorkspace,
  DeleteCellFromMenu,
  OpenTerminal,
--- a/src/Terminal/JupyterLabAppFactory.ts
+++ b/src/Terminal/JupyterLabAppFactory.ts
@@ -2,61 +2,15 @@
 * JupyterLab applications based on jupyterLab components
 */
 import { ServerConnection, TerminalManager } from "@jupyterlab/services";
-import { IMessage } from "@jupyterlab/services/lib/terminal/terminal";
 import { Terminal } from "@jupyterlab/terminal";
 import { Panel, Widget } from "@phosphor/widgets";
-import { userContext } from "UserContext";

 export class JupyterLabAppFactory {
-  private isShellStarted: boolean | undefined;
-  private checkShellStarted: ((content: string | undefined) => void) | undefined;
-  private onShellExited: () => void;
-
-  private isShellExited(content: string | undefined) {
-    return content?.includes("cosmosuser@");
-  }
-
-  private isMongoShellStarted(content: string | undefined) {
-    this.isShellStarted = content?.includes("MongoDB shell version");
-  }
-
-  private isCassandraShellStarted(content: string | undefined) {
-    this.isShellStarted = content?.includes("Connected to") && content?.includes("cqlsh");
-  }
-
-  constructor(closeTab: () => void) {
-    this.onShellExited = closeTab;
-    this.isShellStarted = false;
-    this.checkShellStarted = undefined;
-
-    switch (userContext.apiType) {
-      case "Mongo":
-        this.checkShellStarted = this.isMongoShellStarted;
-        break;
-      case "Cassandra":
-        this.checkShellStarted = this.isCassandraShellStarted;
-        break;
-    }
-  }
-
-  public async createTerminalApp(serverSettings: ServerConnection.ISettings) {
+  public static async createTerminalApp(serverSettings: ServerConnection.ISettings) {
    const manager = new TerminalManager({
      serverSettings: serverSettings,
    });
    const session = await manager.startNew();
-    session.messageReceived.connect(async (_, message: IMessage) => {
-      const content = message.content && message.content[0]?.toString();
-
-      if (this.checkShellStarted && message.type == "stdout") {
-        //Close the terminal tab once the shell closed messages are received
-        if (!this.isShellStarted) {
-          this.checkShellStarted(content);
-        } else if (this.isShellExited(content)) {
-          this.onShellExited();
-        }
-      }
-    }, this);
-
    const term = new Terminal(session, { theme: "dark", shutdownOnClose: true });

    if (!term) {
--- a/src/Terminal/TerminalProps.ts
+++ b/src/Terminal/TerminalProps.ts
@@ -10,5 +10,4 @@ export interface TerminalProps {
  authType: AuthType;
  apiType: ApiType;
  subscriptionId: string;
-  tabId: string;
 }
--- a/src/Terminal/index.ts
+++ b/src/Terminal/index.ts
@@ -1,6 +1,5 @@
 import { ServerConnection } from "@jupyterlab/services";
 import "@jupyterlab/terminal/style/index.css";
-import { MessageTypes } from "Contracts/ExplorerContracts";
 import postRobot from "post-robot";
 import { HttpHeaders } from "../Common/Constants";
 import { Action } from "../Shared/Telemetry/TelemetryConstants";
@@ -55,20 +54,13 @@ const initTerminal = async (props: TerminalProps) => {
  const startTime = TelemetryProcessor.traceStart(Action.OpenTerminal, data);

  try {
-    await new JupyterLabAppFactory(() => closeTab(props.tabId)).createTerminalApp(serverSettings);
+    await JupyterLabAppFactory.createTerminalApp(serverSettings);
    TelemetryProcessor.traceSuccess(Action.OpenTerminal, data, startTime);
  } catch (error) {
    TelemetryProcessor.traceFailure(Action.OpenTerminal, data, startTime);
  }
 };

-const closeTab = (tabId: string): void => {
-  window.parent.postMessage(
-    { type: MessageTypes.CloseTab, data: { tabId: tabId }, signature: "pcIframe" },
-    window.document.referrer
-  );
-};
-
 const main = async (): Promise<void> => {
  postRobot.on(
    "props",
--- a/src/Utils/EndpointValidation.ts
+++ b/src/Utils/EndpointValidation.ts
@@ -1,87 +0,0 @@
-import { JunoEndpoints } from "Common/Constants";
-import * as Logger from "../Common/Logger";
-
-export function validateEndpoint(
-  endpointToValidate: string | undefined,
-  allowedEndpoints: ReadonlyArray<string>
-): boolean {
-  try {
-    return validateEndpointInternal(
-      endpointToValidate,
-      allowedEndpoints.map((e) => e)
-    );
-  } catch (reason) {
-    Logger.logError(`${endpointToValidate} not allowed`, "validateEndpoint");
-    Logger.logError(`${JSON.stringify(reason)}`, "validateEndpoint");
-    return false;
-  }
-}
-
-function validateEndpointInternal(
-  endpointToValidate: string | undefined,
-  allowedEndpoints: ReadonlyArray<string>
-): boolean {
-  if (endpointToValidate === undefined) {
-    return false;
-  }
-
-  const originToValidate: string = new URL(endpointToValidate).origin;
-  const allowedOrigins: string[] = allowedEndpoints.map((allowedEndpoint) => new URL(allowedEndpoint).origin) || [];
-  const valid = allowedOrigins.indexOf(originToValidate) >= 0;
-
-  if (!valid) {
-    throw new Error(
-      `${endpointToValidate} is not an allowed endpoint. Allowed endpoints are ${allowedEndpoints.toString()}`
-    );
-  }
-
-  return valid;
-}
-
-export const allowedArmEndpoints: ReadonlyArray<string> = [
-  "https://management.azure.com",
-  "https://management.usgovcloudapi.net",
-  "https://management.chinacloudapi.cn",
-];
-
-export const allowedAadEndpoints: ReadonlyArray<string> = ["https://login.microsoftonline.com/"];
-
-export const allowedBackendEndpoints: ReadonlyArray<string> = [
-  "https://main.documentdb.ext.azure.com",
-  "https://main.documentdb.ext.azure.cn",
-  "https://main.documentdb.ext.azure.us",
-  "https://localhost:12901",
-  "https://localhost:1234",
-];
-
-export const allowedMongoProxyEndpoints: ReadonlyArray<string> = [
-  "https://main.documentdb.ext.azure.com",
-  "https://main.documentdb.ext.azure.cn",
-  "https://main.documentdb.ext.azure.us",
-  "https://localhost:12901",
-];
-
-export const allowedEmulatorEndpoints: ReadonlyArray<string> = ["https://localhost:8081"];
-
-export const allowedMongoBackendEndpoints: ReadonlyArray<string> = ["https://localhost:1234"];
-
-export const allowedGraphEndpoints: ReadonlyArray<string> = ["https://graph.windows.net"];
-
-export const allowedArcadiaEndpoints: ReadonlyArray<string> = ["https://workspaceartifacts.projectarcadia.net"];
-
-export const allowedHostedExplorerEndpoints: ReadonlyArray<string> = ["https://cosmos.azure.com/"];
-
-export const allowedMsalRedirectEndpoints: ReadonlyArray<string> = [
-  "https://cosmos-explorer-preview.azurewebsites.net/",
-];
-
-export const allowedJunoOrigins: ReadonlyArray<string> = [
-  JunoEndpoints.Test,
-  JunoEndpoints.Test2,
-  JunoEndpoints.Test3,
-  JunoEndpoints.Prod,
-  JunoEndpoints.Stage,
-  "https://localhost",
-];
-
-export const allowedNotebookServerUrls: ReadonlyArray<string> = [];
--- a/src/Utils/GalleryUtils.ts
+++ b/src/Utils/GalleryUtils.ts
@@ -10,6 +10,7 @@ import {
  SortBy,
 } from "../Explorer/Controls/NotebookGallery/GalleryViewerComponent";
 import Explorer from "../Explorer/Explorer";
+import { NotebookUtil } from "../Explorer/Notebook/NotebookUtil";
 import { useNotebook } from "../Explorer/Notebook/useNotebook";
 import { IGalleryItem, JunoClient } from "../Juno/JunoClient";
 import { Action, ActionModifiers } from "../Shared/Telemetry/TelemetryConstants";
@@ -228,7 +229,7 @@ export function downloadItem(
    undefined,
    "Download",
    async () => {
-      if (useNotebook.getState().isPhoenixNotebooks) {
+      if (NotebookUtil.isPhoenixEnabled()) {
        await container.allocateContainer();
      }
      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
--- a/src/Utils/MessageValidation.ts
+++ b/src/Utils/MessageValidation.ts
@@ -4,7 +4,7 @@ export function isInvalidParentFrameOrigin(event: MessageEvent): boolean {
  return !isValidOrigin(configContext.allowedParentFrameOrigins, event);
 }

-function isValidOrigin(allowedOrigins: ReadonlyArray<string>, event: MessageEvent): boolean {
+function isValidOrigin(allowedOrigins: string[], event: MessageEvent): boolean {
  const eventOrigin = (event && event.origin) || "";
  const windowOrigin = (window && window.origin) || "";
  if (eventOrigin === windowOrigin) {
--- a/src/hooks/useKnockoutExplorer.ts
+++ b/src/hooks/useKnockoutExplorer.ts
@@ -1,4 +1,3 @@
-import { useTabs } from "hooks/useTabs";
 import { useEffect, useState } from "react";
 import { applyExplorerBindings } from "../applyExplorerBindings";
 import { AuthType } from "../AuthType";
@@ -70,38 +69,16 @@ export function useKnockoutExplorer(platform: Platform): Explorer {

 async function configureHosted(): Promise<Explorer> {
  const win = (window as unknown) as HostedExplorerChildFrame;
-  let explorer: Explorer;
  if (win.hostedConfig.authType === AuthType.EncryptedToken) {
-    explorer = configureHostedWithEncryptedToken(win.hostedConfig);
+    return configureHostedWithEncryptedToken(win.hostedConfig);
  } else if (win.hostedConfig.authType === AuthType.ResourceToken) {
-    explorer = configureHostedWithResourceToken(win.hostedConfig);
+    return configureHostedWithResourceToken(win.hostedConfig);
  } else if (win.hostedConfig.authType === AuthType.ConnectionString) {
-    explorer = configureHostedWithConnectionString(win.hostedConfig);
+    return configureHostedWithConnectionString(win.hostedConfig);
  } else if (win.hostedConfig.authType === AuthType.AAD) {
-    explorer = await configureHostedWithAAD(win.hostedConfig);
-  } else {
-    throw new Error(`Unknown hosted config: ${win.hostedConfig}`);
+    return configureHostedWithAAD(win.hostedConfig);
  }
-
-  window.addEventListener(
-    "message",
-    (event) => {
-      if (isInvalidParentFrameOrigin(event)) {
-        return;
-      }
-
-      if (!shouldProcessMessage(event)) {
-        return;
-      }
-
-      if (event.data?.type === MessageTypes.CloseTab) {
-        useTabs.getState().closeTabsByComparator((tab) => tab.tabId === event.data?.data?.tabId);
-      }
-    },
-    false
-  );
-
-  return explorer;
+  throw new Error(`Unknown hosted config: ${win.hostedConfig}`);
 }

 async function configureHostedWithAAD(config: AAD): Promise<Explorer> {
@@ -284,8 +261,6 @@ async function configurePortal(): Promise<Explorer> {
          }
        } else if (shouldForwardMessage(message, event.origin)) {
          sendMessage(message);
-        } else if (event.data?.type === MessageTypes.CloseTab) {
-          useTabs.getState().closeTabsByComparator((tab) => tab.tabId === event.data?.data?.tabId);
        }
      },
      false
@@ -364,11 +339,8 @@ function updateContextsFromPortalMessage(inputs: DataExplorerInputsFrame) {
    if (inputs.flights.indexOf(Flights.PKPartitionKeyTest) !== -1) {
      userContext.features.partitionKeyDefault2 = true;
    }
-    if (inputs.flights.indexOf(Flights.PhoenixNotebooks) !== -1) {
-      userContext.features.phoenixNotebooks = true;
-    }
-    if (inputs.flights.indexOf(Flights.PhoenixFeatures) !== -1) {
-      userContext.features.phoenixFeatures = true;
+    if (inputs.flights.indexOf(Flights.Phoenix) !== -1) {
+      userContext.features.phoenix = true;
    }
    if (inputs.flights.indexOf(Flights.NotebooksDownBanner) !== -1) {
      userContext.features.notebooksDownBanner = true;