Updated 1 test snapshot

* removing serverless check to show synapse link enablement

* fixing tests

* fixing fomatting

Co-authored-by: Asier Isayas <aisayas@microsoft.com>

configs/mpac.json

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

configs/prod.json

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

less/documentDB.less

@@ -2895,6 +2895,14 @@ 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

package-lock.json

@@ -6326,8 +6326,8 @@
     },
     "@webpack-cli/serve": {
       "version": "1.5.2",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/AzurePortal/npm/registry/@webpack-cli/serve/-/serve-1.5.2.tgz",
-      "integrity": "sha1-6lhLY3/2PFpHf28hYEtaIFtyyew=",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz",
+      "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==",
       "dev": true
     },
     "@xtuc/ieee754": {

src/Common/Constants.ts

@@ -96,7 +96,8 @@ export class Flights {
   public static readonly AutoscaleTest = "autoscaletest";
   public static readonly PartitionKeyTest = "partitionkeytest";
   public static readonly PKPartitionKeyTest = "pkpartitionkeytest";
-  public static readonly Phoenix = "phoenix";
+  public static readonly PhoenixNotebooks = "phoenixnotebooks";
+  public static readonly PhoenixFeatures = "phoenixfeatures";
   public static readonly NotebooksDownBanner = "notebooksdownbanner";
 }
 
@@ -365,7 +366,7 @@ export class Notebook {
   public static readonly containerStatusHeartbeatDelayMs = 30000;
   public static readonly kernelRestartInitialDelayMs = 1000;
   public static readonly kernelRestartMaxDelayMs = 20000;
-  public static readonly autoSaveIntervalMs = 120000;
+  public static readonly autoSaveIntervalMs = 300000;
   public static readonly memoryGuageToGB = 1048576;
   public static readonly lowMemoryThreshold = 0.8;
   public static readonly remainingTimeForAlert = 10;
@@ -378,7 +379,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. To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends.";
+    "This notebook will be saved in the temporary workspace and will be removed when the session expires.";
   public static newNotebookModalTitle = "Create notebook in temporary workspace";
   public static newNotebookUploadModalTitle = "Upload notebook to temporary workspace";
   public static newNotebookModalContent1 =

src/Common/CosmosClient.ts

@@ -1,5 +1,6 @@
 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";
@@ -77,10 +78,21 @@ 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,
@@ -89,6 +101,7 @@ export function client(): Cosmos.CosmosClient {
       enableEndpointDiscovery: false,
     },
     userAgentSuffix: "Azure Portal",
+    defaultHeaders: _defaultHeaders,
   };
 
   if (configContext.PROXY_PATH !== undefined) {

src/ConfigContext.ts

@@ -27,6 +27,7 @@ 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[];
@@ -59,6 +60,7 @@ 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,

src/Contracts/DataModels.ts

@@ -438,14 +438,10 @@ export interface ContainerInfo {
 }
 
 export interface IProvisionData {
-  subscriptionId: string;
-  resourceGroup: string;
-  dbAccountName: string;
   cosmosEndpoint: string;
 }
 
 export interface IContainerData {
-  dbAccountName: string;
   forwardingId: string;
 }
 

src/Contracts/ExplorerContracts.ts

@@ -33,6 +33,7 @@ export enum MessageTypes {
   CreateWorkspace,
   CreateSparkPool,
   RefreshDatabaseAccount,
+  CloseTab,
 }
 
 export { Versions, ActionContracts, Diagnostics };

src/Explorer/ContextMenuButtonFactory.tsx

@@ -83,7 +83,6 @@ 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) {

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

@@ -55,6 +55,7 @@ describe("NotebookTerminalComponent", () => {
     const props: NotebookTerminalComponentProps = {
       databaseAccount: testAccount,
       notebookServerInfo: testNotebookServerInfo,
+      tabId: undefined,
     };
 
     const wrapper = shallow(<NotebookTerminalComponent {...props} />);
@@ -65,6 +66,7 @@ describe("NotebookTerminalComponent", () => {
     const props: NotebookTerminalComponentProps = {
       databaseAccount: testMongo32Account,
       notebookServerInfo: testMongoNotebookServerInfo,
+      tabId: undefined,
     };
 
     const wrapper = shallow(<NotebookTerminalComponent {...props} />);
@@ -75,6 +77,7 @@ describe("NotebookTerminalComponent", () => {
     const props: NotebookTerminalComponentProps = {
       databaseAccount: testMongo36Account,
       notebookServerInfo: testMongoNotebookServerInfo,
+      tabId: undefined,
     };
 
     const wrapper = shallow(<NotebookTerminalComponent {...props} />);
@@ -85,6 +88,7 @@ describe("NotebookTerminalComponent", () => {
     const props: NotebookTerminalComponentProps = {
       databaseAccount: testCassandraAccount,
       notebookServerInfo: testCassandraNotebookServerInfo,
+      tabId: undefined,
     };
 
     const wrapper = shallow(<NotebookTerminalComponent {...props} />);

src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx

@@ -12,6 +12,7 @@ import * as StringUtils from "../../../Utils/StringUtils";
 export interface NotebookTerminalComponentProps {
   notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo;
   databaseAccount: DataModels.DatabaseAccount;
+  tabId: string;
 }
 
 export class NotebookTerminalComponent extends React.Component<NotebookTerminalComponentProps> {
@@ -55,6 +56,7 @@ 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, {

src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx

@@ -17,7 +17,6 @@ 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";
@@ -148,9 +147,7 @@ export class NotebookViewerComponent
             <NotebookMetadataComponent
               data={this.state.galleryItem}
               isFavorite={this.state.isFavorite}
-              downloadButtonText={
-                this.props.container && NotebookUtil.getNotebookBtnTitle(useNotebook.getState().notebookFolderName)
-              }
+              downloadButtonText={this.props.container && `Download to ${useNotebook.getState().notebookFolderName}`}
               onTagClick={this.props.onTagClick}
               onFavoriteClick={this.favoriteItem}
               onUnfavoriteClick={this.unfavoriteItem}

src/Explorer/Explorer.tsx

@@ -14,7 +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, IResponse } from "../Contracts/DataModels";
+import {
+  ContainerConnectionInfo,
+  IPhoenixConnectionInfoResult,
+  IProvisionData,
+  IResponse,
+} from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import { GitHubOAuthService } from "../GitHub/GitHubOAuthService";
 import { useSidePanel } from "../hooks/useSidePanel";
@@ -30,7 +35,6 @@ import { update } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
 import {
   get as getWorkspace,
   listByDatabaseAccount,
-  listConnectionInfo,
   start,
 } from "../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
 import { stringToBlob } from "../Utils/BlobUtils";
@@ -352,24 +356,7 @@ 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;
   }
 
@@ -381,10 +368,7 @@ export default class Explorer {
       (notebookServerInfo === undefined ||
         (notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined))
     ) {
-      const provisionData = {
-        subscriptionId: userContext.subscriptionId,
-        resourceGroup: userContext.resourceGroup,
-        dbAccountName: userContext.databaseAccount.name,
+      const provisionData: IProvisionData = {
         cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
       };
       const connectionStatus: ContainerConnectionInfo = {
@@ -455,7 +439,7 @@ export default class Explorer {
       );
       return;
     }
-    const dialogContent = NotebookUtil.isPhoenixEnabled()
+    const dialogContent = useNotebook.getState().isPhoenixNotebooks
       ? "Notebooks saved in the temporary workspace will be deleted. Do you want to proceed?"
       : "This lets you keep your notebook files and the workspace will be restored to default. Proceed anyway?";
 
@@ -532,7 +516,7 @@ export default class Explorer {
       TelemetryProcessor.traceStart(Action.PhoenixResetWorkspace, {
         dataExplorerArea: Areas.Notebook,
       });
-      if (NotebookUtil.isPhoenixEnabled()) {
+      if (useNotebook.getState().isPhoenixNotebooks) {
         useTabs.getState().closeAllNotebookTabs(true);
         connectionStatus = {
           status: ConnectionStatusType.Connecting,
@@ -546,7 +530,7 @@ export default class Explorer {
       if (!connectionInfo?.data?.notebookServerUrl) {
         throw new Error(`Reset Workspace: NotebookServerUrl is invalid!`);
       }
-      if (NotebookUtil.isPhoenixEnabled()) {
+      if (useNotebook.getState().isPhoenixNotebooks) {
         await this.setNotebookInfo(connectionInfo, connectionStatus);
         useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
       }
@@ -561,7 +545,7 @@ export default class Explorer {
         error: getErrorMessage(error),
         errorStack: getErrorStack(error),
       });
-      if (NotebookUtil.isPhoenixEnabled()) {
+      if (useNotebook.getState().isPhoenixNotebooks) {
         connectionStatus = {
           status: ConnectionStatusType.Failed,
         };
@@ -759,7 +743,7 @@ export default class Explorer {
     if (!notebookContentItem || !notebookContentItem.path) {
       throw new Error(`Invalid notebookContentItem: ${notebookContentItem}`);
     }
-    if (notebookContentItem.type === NotebookContentItemType.Notebook && NotebookUtil.isPhoenixEnabled()) {
+    if (notebookContentItem.type === NotebookContentItemType.Notebook && useNotebook.getState().isPhoenixNotebooks) {
       await this.allocateContainer();
     }
 
@@ -977,20 +961,17 @@ export default class Explorer {
   /**
    * This creates a new notebook file, then opens the notebook
    */
-  public onNewNotebookClicked(parent?: NotebookContentItem, isGithubTree?: boolean): void {
+  public async onNewNotebookClicked(parent?: NotebookContentItem, isGithubTree?: boolean): Promise<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);
     }
-    const isPhoenixEnabled = NotebookUtil.isPhoenixEnabled();
-    if (isPhoenixEnabled) {
+    if (useNotebook.getState().isPhoenixNotebooks) {
       if (isGithubTree) {
-        async () => {
-          await this.allocateContainer();
-          parent = parent || this.resourceTree.myNotebooksContentRoot;
-          this.createNewNoteBook(parent, isGithubTree);
-        };
+        await this.allocateContainer();
+        parent = parent || this.resourceTree.myNotebooksContentRoot;
+        this.createNewNoteBook(parent, isGithubTree);
       } else {
         useDialog.getState().showOkCancelModalDialog(
           Notebook.newNotebookModalTitle,
@@ -1075,7 +1056,7 @@ export default class Explorer {
   }
 
   public async openNotebookTerminal(kind: ViewModels.TerminalKind): Promise<void> {
-    if (NotebookUtil.isPhoenixEnabled()) {
+    if (useNotebook.getState().isPhoenixFeatures) {
       await this.allocateContainer();
       const notebookServerInfo = useNotebook.getState().notebookServerInfo;
       if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint !== undefined) {
@@ -1115,7 +1096,7 @@ export default class Explorer {
 
     const terminalTabs: TerminalTab[] = useTabs
       .getState()
-      .getTabs(ViewModels.CollectionTabKind.Terminal, (tab) => tab.tabTitle() === title) as TerminalTab[];
+      .getTabs(ViewModels.CollectionTabKind.Terminal, (tab) => tab.tabTitle().startsWith(title)) as TerminalTab[];
 
     let index = 1;
     if (terminalTabs.length > 0) {
@@ -1216,7 +1197,7 @@ export default class Explorer {
   }
 
   public async handleOpenFileAction(path: string): Promise<void> {
-    if (userContext.features.phoenix) {
+    if (useNotebook.getState().isPhoenixNotebooks) {
       await this.allocateContainer();
     } else if (!(await this._containsDefaultNotebookWorkspace(userContext.databaseAccount))) {
       this._openSetupNotebooksPaneForQuickstart();
@@ -1250,7 +1231,7 @@ export default class Explorer {
   }
 
   public openUploadFilePanel(parent?: NotebookContentItem): void {
-    if (NotebookUtil.isPhoenixEnabled()) {
+    if (useNotebook.getState().isPhoenixNotebooks) {
       useDialog.getState().showOkCancelModalDialog(
         Notebook.newNotebookUploadModalTitle,
         undefined,
@@ -1280,7 +1261,7 @@ export default class Explorer {
   }
 
   public getDownloadModalConent(fileName: string): JSX.Element {
-    if (NotebookUtil.isPhoenixEnabled()) {
+    if (useNotebook.getState().isPhoenixNotebooks) {
       return (
         <>
           <p>{Notebook.galleryNotebookDownloadContent1}</p>
@@ -1304,22 +1285,19 @@ export default class Explorer {
     await useNotebook.getState().refreshNotebooksEnabledStateForAccount();
 
     // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
-    const isNotebookEnabled = userContext.features.notebooksDownBanner || userContext.features.phoenix;
+    const isNotebookEnabled = userContext.features.notebooksDownBanner || useNotebook.getState().isPhoenixNotebooks;
     useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled);
-    useNotebook.getState().setIsShellEnabled(userContext.features.phoenix && isPublicInternetAccessAllowed());
+    useNotebook
+      .getState()
+      .setIsShellEnabled(useNotebook.getState().isPhoenixFeatures && isPublicInternetAccessAllowed());
 
     TelemetryProcessor.trace(Action.NotebookEnabled, ActionModifiers.Mark, {
       isNotebookEnabled,
       dataExplorerArea: Constants.Areas.Notebook,
     });
 
-    if (!userContext.features.notebooksTemporarilyDown) {
-      if (isNotebookEnabled) {
-        await this.initNotebooks(userContext.databaseAccount);
-      } else if (this.notebookToImport) {
-        // if notebooks is not enabled but the user is trying to do a quickstart setup with notebooks, open the SetupNotebooksPane
-        this._openSetupNotebooksPaneForQuickstart();
-      }
+    if (useNotebook.getState().isPhoenixNotebooks) {
+      await this.initNotebooks(userContext.databaseAccount);
     }
   }
 }

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -4,15 +4,12 @@
  * 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";
@@ -56,18 +53,10 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
   const uiFabricControlButtons = CommandBarUtil.convertButton(controlButtons, backgroundColor);
   uiFabricControlButtons.forEach((btn: ICommandBarItemProps) => (btn.iconOnly = true));
 
-  if (NotebookUtil.isPhoenixEnabled()) {
+  if (useNotebook.getState().isPhoenixNotebooks || useNotebook.getState().isPhoenixFeatures) {
     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

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

@@ -31,28 +31,13 @@ describe("CommandBarComponentButtonFactory tests", () => {
       });
     });
 
-    it("Account is not serverless - button should be visible", () => {
+    it("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", () => {

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -25,7 +25,6 @@ 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";
@@ -78,9 +77,10 @@ export function createStaticCommandBarButtons(
     if (container.notebookManager?.gitHubOAuthService) {
       notebookButtons.push(createManageGitHubAccountButton(container));
     }
-
-    notebookButtons.push(createOpenTerminalButton(container));
-    if (selectedNodeState.isConnectedToContainer()) {
+    if (useNotebook.getState().isPhoenixFeatures && configContext.isTerminalEnabled) {
+      notebookButtons.push(createOpenTerminalButton(container));
+    }
+    if (useNotebook.getState().isPhoenixNotebooks && selectedNodeState.isConnectedToContainer()) {
       notebookButtons.push(createNotebookWorkspaceResetButton(container));
     }
     if (
@@ -98,19 +98,21 @@ export function createStaticCommandBarButtons(
     }
 
     notebookButtons.forEach((btn) => {
-      if (userContext.features.notebooksTemporarilyDown) {
-        if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
+      if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
+        if (!useNotebook.getState().isPhoenixFeatures) {
           applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
-        } else if (btn.commandButtonLabel.indexOf("Mongo") !== -1) {
-          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
-        } else {
-          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
         }
+      } else if (btn.commandButtonLabel.indexOf("Mongo") !== -1) {
+        if (!useNotebook.getState().isPhoenixFeatures) {
+          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
+        }
+      } else if (!useNotebook.getState().isPhoenixNotebooks) {
+        applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
       }
       buttons.push(btn);
     });
   } else {
-    if (!isRunningOnNationalCloud() && !userContext.features.notebooksTemporarilyDown) {
+    if (!isRunningOnNationalCloud() && useNotebook.getState().isPhoenixNotebooks) {
       buttons.push(createDivider());
       buttons.push(createEnableNotebooksButton(container));
     }
@@ -168,9 +170,7 @@ export function createContextCommandBarButtons(
       onCommandClick: () => {
         const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
         if (useNotebook.getState().isShellEnabled) {
-          if (!userContext.features.notebooksTemporarilyDown) {
-            container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
-          }
+          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
         } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
         }
@@ -178,13 +178,6 @@ 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);
   }
@@ -280,10 +273,6 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
     return undefined;
   }
 
-  if (isServerlessAccount()) {
-    return undefined;
-  }
-
   if (userContext?.databaseAccount?.properties?.enableAnalyticalStorage) {
     return undefined;
   }

src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import { Link } from "@fluentui/react";
 import { CellId, CellType, ImmutableNotebook } from "@nteract/commutable";
 // Vendor modules
 import {
@@ -14,13 +15,15 @@ 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 { NotebookUtil } from "../NotebookUtil";
+import { NotebookContentProviderType, NotebookUtil } from "../NotebookUtil";
 import * as NteractUtil from "../NTeractUtil";
 import * as CdbActions from "./actions";
 import { NotebookComponent } from "./NotebookComponent";
@@ -99,6 +102,10 @@ 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({
@@ -130,11 +137,32 @@ export class NotebookComponentBootstrapper {
 
   /* Notebook operations. See nteract/packages/connected-components/src/notebook-menu/index.tsx */
   public notebookSave(): void {
-    this.getStore().dispatch(
-      actions.save({
-        contentRef: this.contentRef,
-      })
-    );
+    if (
+      NotebookUtil.getContentProviderType(this.getNotebookPath()) ===
+      NotebookContentProviderType.JupyterContentProviderType
+    ) {
+      useDialog.getState().showOkCancelModalDialog(
+        Notebook.saveNotebookModalTitle,
+        undefined,
+        "Save",
+        async () => {
+          this.getStore().dispatch(
+            actions.save({
+              contentRef: this.contentRef,
+            })
+          );
+        },
+        "Cancel",
+        undefined,
+        this.getSaveNotebookSubText()
+      );
+    } else {
+      this.getStore().dispatch(
+        actions.save({
+          contentRef: this.contentRef,
+        })
+      );
+    }
   }
 
   public notebookChangeKernel(kernelSpecName: string): void {
@@ -341,4 +369,19 @@ 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>
+      </>
+    );
+  }
 }

src/Explorer/Notebook/NotebookComponent/epics.ts

@@ -12,11 +12,12 @@ 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 { AnyAction } from "redux";
+import { Action, AnyAction } from "redux";
 import { ofType, StateObservable } from "redux-observable";
 import { kernels, sessions } from "rx-jupyter";
-import { concat, EMPTY, from, merge, Observable, Observer, of, Subject, Subscriber, timer } from "rxjs";
+import { concat, EMPTY, from, interval, merge, Observable, Observer, of, Subject, Subscriber, timer } from "rxjs";
 import {
   catchError,
   concatMap,
@@ -41,7 +42,7 @@ import { logConsoleError, logConsoleInfo } from "../../../Utils/NotificationCons
 import { useDialog } from "../../Controls/Dialog";
 import * as FileSystemUtil from "../FileSystemUtil";
 import * as cdbActions from "../NotebookComponent/actions";
-import { NotebookUtil } from "../NotebookUtil";
+import { NotebookContentProviderType, NotebookUtil } from "../NotebookUtil";
 import * as CdbActions from "./actions";
 import * as TextFile from "./contents/file/text-file";
 import { CdbAppState } from "./types";
@@ -948,6 +949,54 @@ 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,
@@ -965,4 +1014,5 @@ export const allEpics = [
   traceNotebookInfoEpic,
   traceNotebookKernelEpic,
   resetCellStatusOnExecuteCanceledEpic,
+  autoSaveCurrentContentEpic,
 ];

src/Explorer/Notebook/NotebookComponent/store.ts

@@ -1,12 +1,12 @@
-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 { AppState, epics as coreEpics, IContentProvider, reducers } from "@nteract/core";
 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,7 +81,6 @@ 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,

src/Explorer/Notebook/NotebookContainerClient.ts

@@ -8,17 +8,10 @@ import { ConnectionStatusType, HttpHeaders, HttpStatusCodes, Notebook } from "..
 import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 import * as Logger from "../../Common/Logger";
 import * as DataModels from "../../Contracts/DataModels";
-import {
-  ContainerConnectionInfo,
-  IPhoenixConnectionInfoResult,
-  IProvisionData,
-  IResponse,
-} from "../../Contracts/DataModels";
+import { IPhoenixConnectionInfoResult, IProvisionData, IResponse } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
-import { createOrUpdate, destroy } from "../../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
 import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
-import { NotebookUtil } from "./NotebookUtil";
 import { useNotebook } from "./useNotebook";
 
 export class NotebookContainerClient {
@@ -55,21 +48,11 @@ export class NotebookContainerClient {
    */
   private scheduleHeartbeat(delayMs: number): void {
     setTimeout(async () => {
-      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);
-        }
+      const memoryUsageInfo = await this.getMemoryUsage();
+      useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo);
+      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+      if (notebookServerInfo?.notebookServerEndpoint) {
+        this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
       }
     }, delayMs);
   }
@@ -108,7 +91,7 @@ export class NotebookContainerClient {
     notebookServerEndpoint: string,
     authToken: string
   ): Promise<DataModels.MemoryUsageInfo> {
-    if (this.checkStatus()) {
+    if (this.shouldExecuteMemoryCall()) {
       const response = await fetch(`${notebookServerEndpoint}api/metrics/memory`, {
         method: "GET",
         headers: {
@@ -131,24 +114,17 @@ export class NotebookContainerClient {
       } else if (response.status === HttpStatusCodes.NotFound) {
         throw new AbortError(response.statusText);
       }
-      throw new Error();
+      throw new Error(response.statusText);
     } else {
       return undefined;
     }
   }
 
-  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;
+  private shouldExecuteMemoryCall(): boolean {
+    return (
+      useNotebook.getState().containerStatus?.status === Constants.ContainerStatusType.Active &&
+      useNotebook.getState().connectionInfo?.status === ConnectionStatusType.Connected
+    );
   }
 
   public async resetWorkspace(): Promise<IResponse<IPhoenixConnectionInfoResult>> {
@@ -173,11 +149,8 @@ export class NotebookContainerClient {
     }
 
     try {
-      if (NotebookUtil.isPhoenixEnabled()) {
+      if (useNotebook.getState().isPhoenixNotebooks) {
         const provisionData: IProvisionData = {
-          subscriptionId: userContext.subscriptionId,
-          resourceGroup: userContext.resourceGroup,
-          dbAccountName: userContext.databaseAccount.name,
           cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
         };
         return await this.phoenixClient.resetContainer(provisionData);
@@ -185,9 +158,6 @@ export class NotebookContainerClient {
       return null;
     } catch (error) {
       Logger.logError(getErrorMessage(error), "NotebookContainerClient/resetWorkspace");
-      if (!NotebookUtil.isPhoenixEnabled()) {
-        await this.recreateNotebookWorkspaceAsync();
-      }
       throw error;
     }
   }
@@ -202,25 +172,6 @@ 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 {

src/Explorer/Notebook/NotebookUtil.ts

@@ -3,14 +3,19 @@ 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";
@@ -127,6 +132,18 @@ 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) {
@@ -329,16 +346,4 @@ 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;
-  }
 }

src/Explorer/Notebook/useNotebook.ts

@@ -1,4 +1,6 @@
+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";
@@ -17,7 +19,6 @@ import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
 import * as GitHubUtils from "../../Utils/GitHubUtils";
 import { NotebookContentItem, NotebookContentItemType } from "./NotebookContentItem";
 import NotebookManager from "./NotebookManager";
-import { NotebookUtil } from "./NotebookUtil";
 
 interface NotebookState {
   isNotebookEnabled: boolean;
@@ -37,6 +38,8 @@ 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;
@@ -58,6 +61,9 @@ 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) => ({
@@ -92,6 +98,8 @@ 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) =>
@@ -104,6 +112,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   setNotebookBasePath: (notebookBasePath: string) => set({ notebookBasePath }),
   setNotebookFolderName: (notebookFolderName: string) => set({ notebookFolderName }),
   refreshNotebooksEnabledStateForAccount: async (): Promise<void> => {
+    await get().getPhoenixStatus();
     const { databaseAccount, authType } = userContext;
     if (
       authType === AuthType.EncryptedToken ||
@@ -196,7 +205,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
     isGithubTree ? set({ gitHubNotebooksContentRoot: root }) : set({ myNotebooksContentRoot: root });
   },
   initializeNotebooksTree: async (notebookManager: NotebookManager): Promise<void> => {
-    const notebookFolderName = NotebookUtil.isPhoenixEnabled() === true ? "Temporary Notebooks" : "My Notebooks";
+    const notebookFolderName = get().isPhoenixNotebooks ? "Temporary Notebooks" : "My Notebooks";
     set({ notebookFolderName });
     const myNotebooksContentRoot = {
       name: get().notebookFolderName,
@@ -292,4 +301,21 @@ 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 }),
 }));

src/Explorer/OpenFullScreen.tsx

@@ -25,6 +25,7 @@ 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);
@@ -43,6 +44,7 @@ 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);

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()} ${userContext.apiType === "Mongo" ? "name" : "id"}`}
+                {`${getCollectionName()} 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,10 +887,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       return false;
     }
 
-    if (isServerlessAccount()) {
-      return false;
-    }
-
     switch (userContext.apiType) {
       case "SQL":
       case "Mongo":
@@ -1019,10 +1015,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

src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx

@@ -334,7 +334,7 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
           <ThroughputInput
             showFreeTierExceedThroughputTooltip={isFreeTierAccount && !useDatabases.getState().isFirstResourceCreated()}
             isDatabase={false}
-            isSharded={false}
+            isSharded
             setThroughputValue={(throughput: number) => (tableThroughput = throughput)}
             setIsAutoscale={(isAutoscale: boolean) => (isTableAutoscale = isAutoscale)}
             setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}

src/Explorer/Panes/CopyNotebookPane/CopyNotebookPane.tsx

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

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 + " name does not match the selected " + collectionName;
+      const errorMessage = "Input " + collectionName + " id does not match the selected " + collectionName;
       setFormError(errorMessage);
       NotificationConsoleUtils.logConsoleError(
         `Error while deleting ${collectionName} ${collection.id()}: ${errorMessage}`

src/Explorer/Panes/ExecuteSprocParamsPane/ExecuteSprocParamsPane.tsx

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

src/Explorer/Panes/ExecuteSprocParamsPane/InputParameter.tsx

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

src/Explorer/Panes/SettingsPane/SettingsPane.tsx

@@ -1,4 +1,4 @@
-import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton, Stack, Text } from "@fluentui/react";
+import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton } from "@fluentui/react";
 import * as Constants from "Common/Constants";
 import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { configContext } from "ConfigContext";
@@ -115,9 +115,15 @@ 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,
@@ -135,22 +141,22 @@ export const SettingsPane: FunctionComponent = () => {
         {shouldShowQueryPageOptions && (
           <div className="settingsSection">
             <div className="settingsSectionPart">
-              <Stack horizontal>
-                <Text id="pageOptions" className="settingsSectionLabel" variant="small">
-                  Page options
-                </Text>
+              <fieldset>
+                <legend id="pageOptions" className="settingsSectionLabel legendLabel">
+                  Page Options
+                </legend>
                 <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>
-              </Stack>
-              <ChoiceGroup
-                ariaLabelledBy="pageOptions"
-                selectedKey={pageOption}
-                options={pageOptionList}
-                styles={choiceButtonStyles}
-                onChange={handleOnPageOptionChange}
-              />
+                <ChoiceGroup
+                  ariaLabelledBy="pageOptions"
+                  selectedKey={pageOption}
+                  options={pageOptionList}
+                  styles={choiceButtonStyles}
+                  onChange={handleOnPageOptionChange}
+                />
+              </fieldset>
             </div>
             <div className="tabs settingsSectionPart">
               {isCustomPageOptionSelected() && (

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

@@ -16,54 +16,57 @@ exports[`Settings Pane should render Default properly 1`] = `
       <div
         className="settingsSectionPart"
       >
-        <Stack
-          horizontal={true}
-        >
-          <Text
-            className="settingsSectionLabel"
+        <fieldset>
+          <legend
+            className="settingsSectionLabel legendLabel"
             id="pageOptions"
-            variant="small"
           >
-            Page options
-          </Text>
+            Page Options
+          </legend>
           <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>
-        </Stack>
-        <StyledChoiceGroup
-          ariaLabelledBy="pageOptions"
-          onChange={[Function]}
-          options={
-            Array [
-              Object {
-                "key": "custom",
-                "text": "Custom",
-              },
-              Object {
-                "key": "unlimited",
-                "text": "Unlimited",
-              },
-            ]
-          }
-          selectedKey="custom"
-          styles={
-            Object {
-              "flexContainer": Array [
+          <StyledChoiceGroup
+            ariaLabelledBy="pageOptions"
+            onChange={[Function]}
+            options={
+              Array [
                 Object {
-                  "selectors": Object {
-                    ".ms-ChoiceField": Object {
-                      "marginTop": 0,
-                    },
-                    ".ms-ChoiceField-wrapper label": Object {
-                      "fontSize": 12,
-                      "paddingTop": 0,
+                  "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,
+                      },
+                      ".ms-ChoiceFieldGroup root-133": Object {
+                        "clear": "both",
+                      },
                     },
                   },
+                ],
+                "root": Object {
+                  "clear": "both",
                 },
-              ],
+              }
             }
-          }
-        />
+          />
+        </fieldset>
       </div>
       <div
         className="tabs settingsSectionPart"

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

@@ -24,6 +24,7 @@ const {
   Ascii,
   Bigint,
   Blob,
+  Date: DateType,
   Decimal,
   Float,
   Int,
@@ -41,6 +42,7 @@ 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 },

src/Explorer/SplashScreen/SplashScreen.tsx

@@ -84,9 +84,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
     const mainItems = this.createMainItems();
     const commonTaskItems = this.createCommonTaskItems();
     let recentItems = this.createRecentItems();
-    if (userContext.features.notebooksTemporarilyDown) {
-      recentItems = recentItems.filter((item) => item.description !== "Notebook");
-    }
+    recentItems = recentItems.filter((item) => item.description !== "Notebook");
 
     const tipsItems = this.createTipsItems();
     const onClearRecent = this.clearMostRecent;
@@ -223,7 +221,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
       });
     }
 
-    if (useNotebook.getState().isNotebookEnabled && !userContext.features.notebooksTemporarilyDown) {
+    if (useNotebook.getState().isPhoenixNotebooks) {
       heroes.push({
         iconSrc: NewNotebookIcon,
         title: "New Notebook",

src/Explorer/Tables/Constants.ts

@@ -14,6 +14,7 @@ export const CassandraType = {
   Bigint: "Bigint",
   Blob: "Blob",
   Boolean: "Boolean",
+  Date: "Date",
   Decimal: "Decimal",
   Double: "Double",
   Float: "Float",

src/Explorer/Tables/TableDataClient.ts

@@ -536,7 +536,8 @@ export class CassandraAPIDataClient extends TableDataClient {
       dataType === TableConstants.CassandraType.Inet ||
       dataType === TableConstants.CassandraType.Ascii ||
       dataType === TableConstants.CassandraType.Varchar ||
-      dataType === TableConstants.CassandraType.Timestamp
+      dataType === TableConstants.CassandraType.Timestamp ||
+      dataType === TableConstants.CassandraType.Date
     );
   }
 

src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx

@@ -364,13 +364,11 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
   }
 
   public onTabClick(): void {
-    setTimeout(() => {
-      if (!this.isCloseClicked) {
-        useCommandBar.getState().setContextButtons(this.getTabsButtons());
-      } else {
-        this.isCloseClicked = false;
-      }
-    }, 0);
+    if (!this.isCloseClicked) {
+      useCommandBar.getState().setContextButtons(this.getTabsButtons());
+    } else {
+      this.isCloseClicked = false;
+    }
   }
 
   public onExecuteQueryClick = async (): Promise<void> => {
@@ -875,9 +873,11 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
     useCommandBar.getState().setContextButtons(this.getTabsButtons());
   }
 
-  render(): JSX.Element {
+  componentDidMount(): void {
     useCommandBar.getState().setContextButtons(this.getTabsButtons());
+  }
 
+  render(): JSX.Element {
     return (
       <Fragment>
         <div className="tab-pane" id={this.props.tabId} role="tabpanel">

src/Explorer/Tabs/TerminalTab.tsx

@@ -25,7 +25,8 @@ class NotebookTerminalComponentAdapter implements ReactAdapter {
   public parameters: ko.Computed<boolean>;
   constructor(
     private getNotebookServerInfo: () => DataModels.NotebookWorkspaceConnectionInfo,
-    private getDatabaseAccount: () => DataModels.DatabaseAccount
+    private getDatabaseAccount: () => DataModels.DatabaseAccount,
+    private getTabId: () => string
   ) {}
 
   public renderComponent(): JSX.Element {
@@ -33,6 +34,7 @@ class NotebookTerminalComponentAdapter implements ReactAdapter {
       <NotebookTerminalComponent
         notebookServerInfo={this.getNotebookServerInfo()}
         databaseAccount={this.getDatabaseAccount()}
+        tabId={this.getTabId()}
       />
     ) : (
       <Spinner styles={{ root: { marginTop: 10 } }} size={SpinnerSize.large}></Spinner>
@@ -50,7 +52,8 @@ export default class TerminalTab extends TabsBase {
     this.container = options.container;
     this.notebookTerminalComponentAdapter = new NotebookTerminalComponentAdapter(
       () => this.getNotebookServerInfo(options),
-      () => userContext?.databaseAccount
+      () => userContext?.databaseAccount,
+      () => this.tabId
     );
     this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
       if (

src/Explorer/Tree/Collection.ts

@@ -1,5 +1,5 @@
 import { Resource, StoredProcedureDefinition, TriggerDefinition, UserDefinedFunctionDefinition } from "@azure/cosmos";
-import { NotebookUtil } from "Explorer/Notebook/NotebookUtil";
+import { useNotebook } from "Explorer/Notebook/useNotebook";
 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 (NotebookUtil.isPhoenixEnabled()) {
+    if (useNotebook.getState().isPhoenixFeatures) {
       await this.container.allocateContainer();
     }
     useSelectedNode.getState().setSelectedNode(this);

src/Explorer/Tree/ResourceTree.tsx

@@ -121,7 +121,7 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
       children: [],
     };
 
-    if (userContext.features.notebooksTemporarilyDown) {
+    if (!useNotebook.getState().isPhoenixNotebooks) {
       notebooksTree.children.push(buildNotebooksTemporarilyDownTree());
     } else {
       if (galleryContentRoot) {
@@ -130,9 +130,8 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
 
       if (
         myNotebooksContentRoot &&
-        ((NotebookUtil.isPhoenixEnabled() &&
-          useNotebook.getState().connectionInfo.status === ConnectionStatusType.Connected) ||
-          userContext.features.phoenix === false)
+        useNotebook.getState().isPhoenixNotebooks &&
+        useNotebook.getState().connectionInfo.status === ConnectionStatusType.Connected
       ) {
         notebooksTree.children.push(buildMyNotebooksTree());
       }
@@ -166,15 +165,7 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
     const myNotebooksTree: TreeNode = buildNotebookDirectoryNode(
       myNotebooksContentRoot,
       (item: NotebookContentItem) => {
-        container.openNotebook(item).then((hasOpened) => {
-          if (
-            hasOpened &&
-            userContext.features.notebooksTemporarilyDown === false &&
-            userContext.features.phoenix === false
-          ) {
-            mostRecentActivity.notebookWasItemOpened(userContext.databaseAccount?.id, item);
-          }
-        });
+        container.openNotebook(item);
       }
     );
 
@@ -189,15 +180,7 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
     const gitHubNotebooksTree: TreeNode = buildNotebookDirectoryNode(
       gitHubNotebooksContentRoot,
       (item: NotebookContentItem) => {
-        container.openNotebook(item).then((hasOpened) => {
-          if (
-            hasOpened &&
-            userContext.features.notebooksTemporarilyDown === false &&
-            userContext.features.phoenix === false
-          ) {
-            mostRecentActivity.notebookWasItemOpened(userContext.databaseAccount?.id, item);
-          }
-        });
+        container.openNotebook(item);
       },
       true
     );
@@ -397,6 +380,11 @@ 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(
@@ -528,7 +516,7 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
       isNotebookEnabled &&
       userContext.apiType === "Mongo" &&
       isPublicInternetAccessAllowed() &&
-      !userContext.features.notebooksTemporarilyDown
+      useNotebook.getState().isPhoenixFeatures
     ) {
       children.push({
         label: "Schema (Preview)",

src/Explorer/Tree/ResourceTreeAdapter.tsx

@@ -808,6 +808,11 @@ 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(

src/Phoenix/PhoenixClient.ts

@@ -1,9 +1,18 @@
 import promiseRetry, { AbortError } from "p-retry";
-import { ContainerStatusType, HttpHeaders, HttpStatusCodes, Notebook } from "../Common/Constants";
+import { Action } from "Shared/Telemetry/TelemetryConstants";
+import {
+  Areas,
+  ConnectionStatusType,
+  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,
@@ -11,6 +20,7 @@ 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";
 
@@ -35,8 +45,8 @@ export class PhoenixClient {
     operation: string
   ): Promise<IResponse<IPhoenixConnectionInfoResult>> {
     try {
-      const response = await fetch(`${this.getPhoenixContainerPoolingEndPoint()}/${operation}`, {
-        method: "POST",
+      const response = await fetch(`${this.getPhoenixControlPlanePathPrefix()}/containerconnections`, {
+        method: operation === "allocate" ? "POST" : "PATCH",
         headers: PhoenixClient.getHeaders(),
         body: JSON.stringify(provisionData),
       });
@@ -55,7 +65,7 @@ export class PhoenixClient {
     }
   }
 
-  public async initiateContainerHeartBeat(containerData: { forwardingId: string; dbAccountName: string }) {
+  public async initiateContainerHeartBeat(containerData: IContainerData) {
     if (this.containerHealthHandler) {
       clearTimeout(this.containerHealthHandler);
     }
@@ -72,7 +82,7 @@ export class PhoenixClient {
     try {
       const runContainerStatusAsync = async () => {
         const response = await window.fetch(
-          `${this.getPhoenixContainerPoolingEndPoint()}/${containerData.dbAccountName}/${containerData.forwardingId}`,
+          `${this.getPhoenixControlPlanePathPrefix()}/${containerData.forwardingId}`,
           {
             method: "GET",
             headers: PhoenixClient.getHeaders(),
@@ -86,13 +96,32 @@ 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) {
-      Logger.logError(getErrorMessage(error), "PhoenixClient/getContainerStatus");
+      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);
       return {
         durationLeftInMinutes: undefined,
         notebookServerInfo: undefined,
@@ -101,19 +130,24 @@ export class PhoenixClient {
     }
   }
 
-  private async getContainerHealth(delayMs: number, containerData: { forwardingId: string; dbAccountName: string }) {
+  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> {
     try {
-      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,
+      const response = await window.fetch(`${this.getPhoenixControlPlanePathPrefix()}`, {
+        method: "GET",
+        headers: PhoenixClient.getHeaders(),
       });
+      return response.status === HttpStatusCodes.OK;
+    } catch (error) {
+      Logger.logError(getErrorMessage(error), "PhoenixClient/IsDbAcountWhitelisted");
+      return false;
     }
   }
 
@@ -129,8 +163,10 @@ export class PhoenixClient {
     return phoenixEndpoint;
   }
 
-  public getPhoenixContainerPoolingEndPoint(): string {
-    return `${PhoenixClient.getPhoenixEndpoint()}/api/controlplane/toolscontainer`;
+  public getPhoenixControlPlanePathPrefix(): string {
+    return `${PhoenixClient.getPhoenixEndpoint()}/api/controlplane/toolscontainer/cosmosaccounts${
+      userContext.databaseAccount.id
+    }`;
   }
 
   private static getHeaders(): HeadersInit {

src/Platform/Hosted/extractFeatures.ts

@@ -11,7 +11,8 @@ export type Features = {
   autoscaleDefault: boolean;
   partitionKeyDefault: boolean;
   partitionKeyDefault2: boolean;
-  phoenix: boolean;
+  phoenixNotebooks: boolean;
+  phoenixFeatures: boolean;
   notebooksDownBanner: boolean;
   readonly enableSDKoperations: boolean;
   readonly enableSpark: boolean;
@@ -33,7 +34,6 @@ export type Features = {
   readonly ttl90Days: boolean;
   readonly mongoProxyEndpoint?: string;
   readonly mongoProxyAPIs?: string;
-  readonly notebooksTemporarilyDown: boolean;
   readonly enableThroughputCap: boolean;
 };
 
@@ -84,8 +84,8 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     autoscaleDefault: "true" === get("autoscaledefault"),
     partitionKeyDefault: "true" === get("partitionkeytest"),
     partitionKeyDefault2: "true" === get("pkpartitionkeytest"),
-    notebooksTemporarilyDown: "true" === get("notebookstemporarilydown", "true"),
-    phoenix: "true" === get("phoenix"),
+    phoenixNotebooks: "true" === get("phoenixnotebooks"),
+    phoenixFeatures: "true" === get("phoenixfeatures"),
     notebooksDownBanner: "true" === get("notebooksDownBanner"),
     enableThroughputCap: "true" === get("enablethroughputcap"),
   };

src/Shared/Telemetry/TelemetryConstants.ts

@@ -82,6 +82,7 @@ export enum Action {
   NotebooksMoveCellUpFromMenu,
   NotebooksMoveCellDownFromMenu,
   PhoenixConnection,
+  PhoenixHeartBeat,
   PhoenixResetWorkspace,
   DeleteCellFromMenu,
   OpenTerminal,

src/Terminal/JupyterLabAppFactory.ts

@@ -2,15 +2,61 @@
  * 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 {
-  public static async createTerminalApp(serverSettings: ServerConnection.ISettings) {
+  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) {
     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) {

src/Terminal/TerminalProps.ts

@@ -10,4 +10,5 @@ export interface TerminalProps {
   authType: AuthType;
   apiType: ApiType;
   subscriptionId: string;
+  tabId: string;
 }

src/Terminal/index.ts

@@ -1,5 +1,6 @@
 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";
@@ -54,13 +55,20 @@ const initTerminal = async (props: TerminalProps) => {
   const startTime = TelemetryProcessor.traceStart(Action.OpenTerminal, data);
 
   try {
-    await JupyterLabAppFactory.createTerminalApp(serverSettings);
+    await new JupyterLabAppFactory(() => closeTab(props.tabId)).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",

src/Utils/GalleryUtils.ts

@@ -10,7 +10,6 @@ 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";
@@ -229,7 +228,7 @@ export function downloadItem(
     undefined,
     "Download",
     async () => {
-      if (NotebookUtil.isPhoenixEnabled()) {
+      if (useNotebook.getState().isPhoenixNotebooks) {
         await container.allocateContainer();
       }
       const notebookServerInfo = useNotebook.getState().notebookServerInfo;

src/hooks/useKnockoutExplorer.ts

@@ -1,3 +1,4 @@
+import { useTabs } from "hooks/useTabs";
 import { useEffect, useState } from "react";
 import { applyExplorerBindings } from "../applyExplorerBindings";
 import { AuthType } from "../AuthType";
@@ -69,16 +70,38 @@ 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) {
-    return configureHostedWithEncryptedToken(win.hostedConfig);
+    explorer = configureHostedWithEncryptedToken(win.hostedConfig);
   } else if (win.hostedConfig.authType === AuthType.ResourceToken) {
-    return configureHostedWithResourceToken(win.hostedConfig);
+    explorer = configureHostedWithResourceToken(win.hostedConfig);
   } else if (win.hostedConfig.authType === AuthType.ConnectionString) {
-    return configureHostedWithConnectionString(win.hostedConfig);
+    explorer = configureHostedWithConnectionString(win.hostedConfig);
   } else if (win.hostedConfig.authType === AuthType.AAD) {
-    return configureHostedWithAAD(win.hostedConfig);
+    explorer = await configureHostedWithAAD(win.hostedConfig);
+  } else {
+    throw new Error(`Unknown hosted config: ${win.hostedConfig}`);
   }
-  throw new Error(`Unknown hosted config: ${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;
 }
 
 async function configureHostedWithAAD(config: AAD): Promise<Explorer> {
@@ -261,6 +284,8 @@ 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
@@ -339,8 +364,11 @@ function updateContextsFromPortalMessage(inputs: DataExplorerInputsFrame) {
     if (inputs.flights.indexOf(Flights.PKPartitionKeyTest) !== -1) {
       userContext.features.partitionKeyDefault2 = true;
     }
-    if (inputs.flights.indexOf(Flights.Phoenix) !== -1) {
-      userContext.features.phoenix = 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.NotebooksDownBanner) !== -1) {
       userContext.features.notebooksDownBanner = true;