fixed eslint of TableDataClient file

.eslintignore

@@ -84,7 +84,6 @@ src/Explorer/Tables/DataTable/DataTableOperationManager.ts
 src/Explorer/Tables/DataTable/DataTableViewModel.ts
 src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
 src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.ts
-src/Explorer/Tables/TableDataClient.ts
 src/Explorer/Tables/TableEntityProcessor.ts
 src/Explorer/Tables/Utilities.ts
 src/Explorer/Tabs/ConflictsTab.ts

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"
 }

configs/prod.json

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

less/documentDB.less

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

package-lock.json

@@ -22220,9 +22220,9 @@
       "dev": true
     },
     "shelljs": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz",
-      "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
+      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
       "dev": true,
       "requires": {
         "glob": "^7.0.0",

src/Common/Constants.ts

@@ -96,9 +96,7 @@ export class Flights {
   public static readonly AutoscaleTest = "autoscaletest";
   public static readonly PartitionKeyTest = "partitionkeytest";
   public static readonly PKPartitionKeyTest = "pkpartitionkeytest";
-  public static readonly PhoenixNotebooks = "phoenixnotebooks";
-  public static readonly PhoenixFeatures = "phoenixfeatures";
-  public static readonly NotebooksDownBanner = "notebooksdownbanner";
+  public static readonly Phoenix = "phoenix";
 }
 
 export class AfecFeatures {
@@ -345,12 +343,7 @@ export enum ConnectionStatusType {
   Connecting = "Connecting",
   Connected = "Connected",
   Failed = "Connection Failed",
-  Reconnect = "Reconnect",
-}
-
-export enum ContainerStatusType {
-  Active = "Active",
-  Disconnected = "Disconnected",
+  ReConnect = "Reconnect",
 }
 
 export const EmulatorMasterKey =
@@ -363,25 +356,20 @@ export const StyleConstants = require("less-vars-loader!../../less/Common/Consta
 export class Notebook {
   public static readonly defaultBasePath = "./notebooks";
   public static readonly heartbeatDelayMs = 60000;
-  public static readonly containerStatusHeartbeatDelayMs = 30000;
   public static readonly kernelRestartInitialDelayMs = 1000;
   public static readonly kernelRestartMaxDelayMs = 20000;
-  public static readonly autoSaveIntervalMs = 300000;
+  public static readonly autoSaveIntervalMs = 120000;
   public static readonly memoryGuageToGB = 1048576;
-  public static readonly lowMemoryThreshold = 0.8;
-  public static readonly remainingTimeForAlert = 10;
-  public static readonly retryAttempts = 3;
-  public static readonly retryAttemptDelayMs = 5000;
   public static readonly temporarilyDownMsg = "Notebooks is currently not available. We are working on it.";
   public static readonly mongoShellTemporarilyDownMsg =
     "We have identified an issue with the Mongo Shell and it is unavailable right now. We are actively working on the mitigation.";
   public static readonly cassandraShellTemporarilyDownMsg =
     "We have identified an issue with the Cassandra Shell and it is unavailable right now. We are actively working on the mitigation.";
-  public static saveNotebookModalTitle = "Save notebook in temporary workspace";
+  public static saveNotebookModalTitle = "Save Notebook in temporary workspace";
   public static saveNotebookModalContent =
-    "This notebook will be saved in the temporary workspace and will be removed when the session expires.";
-  public static newNotebookModalTitle = "Create notebook in temporary workspace";
-  public static newNotebookUploadModalTitle = "Upload notebook to temporary workspace";
+    "This notebook will be saved in the temporary workspace and will be removed when the session expires. To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends.";
+  public static newNotebookModalTitle = "Create Notebook in temporary workspace";
+  public static newNotebookUploadModalTitle = "Upload Notebook in temporary workspace";
   public static newNotebookModalContent1 =
     "A temporary workspace will be created to enable you to work with notebooks. When the session expires, any notebooks in the workspace will be removed.";
   public static newNotebookModalContent2 =
@@ -413,11 +401,3 @@ export class TerminalQueryParams {
   public static readonly SubscriptionId = "subscriptionId";
   public static readonly TerminalEndpoint = "terminalEndpoint";
 }
-
-export class JunoEndpoints {
-  public static readonly Test = "https://juno-test.documents-dev.windows-int.net";
-  public static readonly Test2 = "https://juno-test2.documents-dev.windows-int.net";
-  public static readonly Test3 = "https://juno-test3.documents-dev.windows-int.net";
-  public static readonly Prod = "https://tools.cosmos.azure.com";
-  public static readonly Stage = "https://tools-staging.cosmos.azure.com";
-}

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) {

src/ConfigContext.ts

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

src/Contracts/DataModels.ts

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

src/Contracts/ExplorerContracts.ts

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

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) {

src/Explorer/Controls/Dialog.tsx

@@ -13,6 +13,7 @@ import {
   Link,
   PrimaryButton,
   ProgressIndicator,
+  Text,
   TextField,
 } from "@fluentui/react";
 import React, { FC } from "react";
@@ -196,7 +197,7 @@ export const Dialog: FC = () => {
           {linkProps.linkText} <FontIcon iconName="NavigateExternalInline" />
         </Link>
       )}
-      {contentHtml}
+      {contentHtml && <Text>{contentHtml}</Text>}
       {progressIndicatorProps && <ProgressIndicator {...progressIndicatorProps} />}
       <DialogFooter>
         <PrimaryButton {...primaryButtonProps} />

src/Explorer/Controls/GitHub/AddRepoComponent.tsx

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

src/Explorer/Controls/GitHub/ReposListComponent.tsx

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

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

@@ -35,19 +35,16 @@ const testCassandraAccount: DataModels.DatabaseAccount = {
 const testNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
   authToken: "authToken",
   notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com",
-  forwardingId: "Id",
 };
 
 const testMongoNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
   authToken: "authToken",
   notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongo",
-  forwardingId: "Id",
 };
 
 const testCassandraNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
   authToken: "authToken",
   notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/cassandra",
-  forwardingId: "Id",
 };
 
 describe("NotebookTerminalComponent", () => {
@@ -55,7 +52,6 @@ describe("NotebookTerminalComponent", () => {
     const props: NotebookTerminalComponentProps = {
       databaseAccount: testAccount,
       notebookServerInfo: testNotebookServerInfo,
-      tabId: undefined,
     };
 
     const wrapper = shallow(<NotebookTerminalComponent {...props} />);
@@ -66,7 +62,6 @@ describe("NotebookTerminalComponent", () => {
     const props: NotebookTerminalComponentProps = {
       databaseAccount: testMongo32Account,
       notebookServerInfo: testMongoNotebookServerInfo,
-      tabId: undefined,
     };
 
     const wrapper = shallow(<NotebookTerminalComponent {...props} />);
@@ -77,7 +72,6 @@ describe("NotebookTerminalComponent", () => {
     const props: NotebookTerminalComponentProps = {
       databaseAccount: testMongo36Account,
       notebookServerInfo: testMongoNotebookServerInfo,
-      tabId: undefined,
     };
 
     const wrapper = shallow(<NotebookTerminalComponent {...props} />);
@@ -88,7 +82,6 @@ describe("NotebookTerminalComponent", () => {
     const props: NotebookTerminalComponentProps = {
       databaseAccount: testCassandraAccount,
       notebookServerInfo: testCassandraNotebookServerInfo,
-      tabId: undefined,
     };
 
     const wrapper = shallow(<NotebookTerminalComponent {...props} />);

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, {

src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx

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

src/Explorer/Controls/Settings/SettingsComponent.tsx

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

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

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

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

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

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

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

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

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

src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx

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

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

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

src/Explorer/Explorer.tsx

@@ -1,25 +1,19 @@
 import { Link } from "@fluentui/react/lib/Link";
-import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
 import * as ko from "knockout";
 import React from "react";
 import _ from "underscore";
-import shallow from "zustand/shallow";
 import { AuthType } from "../AuthType";
 import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer";
 import * as Constants from "../Common/Constants";
-import { Areas, ConnectionStatusType, HttpStatusCodes, Notebook } from "../Common/Constants";
+import { ConnectionStatusType, HttpStatusCodes, Notebook } from "../Common/Constants";
 import { readCollection } from "../Common/dataAccess/readCollection";
 import { readDatabases } from "../Common/dataAccess/readDatabases";
+import { isPublicInternetAccessAllowed } from "../Common/DatabaseAccountUtility";
 import { getErrorMessage, getErrorStack, handleError } from "../Common/ErrorHandlingUtils";
 import * as Logger from "../Common/Logger";
 import { QueriesClient } from "../Common/QueriesClient";
 import * as DataModels from "../Contracts/DataModels";
-import {
-  ContainerConnectionInfo,
-  IPhoenixConnectionInfoResult,
-  IProvisionData,
-  IResponse,
-} from "../Contracts/DataModels";
+import { ContainerConnectionInfo } from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import { GitHubOAuthService } from "../GitHub/GitHubOAuthService";
 import { useSidePanel } from "../hooks/useSidePanel";
@@ -35,6 +29,7 @@ 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";
@@ -170,9 +165,11 @@ export default class Explorer {
     );
 
     useNotebook.subscribe(
-      async () => this.initiateAndRefreshNotebookList(),
-      (state) => [state.isNotebookEnabled, state.isRefreshed],
-      shallow
+      async () => {
+        this.initiateAndRefreshNotebookList();
+        useNotebook.getState().setIsRefreshed(false);
+      },
+      (state) => state.isNotebookEnabled || state.isRefreshed
     );
 
     this.resourceTree = new ResourceTreeAdapter(this);
@@ -182,7 +179,6 @@ export default class Explorer {
       useNotebook.getState().setNotebookServerInfo({
         notebookServerEndpoint: userContext.features.notebookServerUrl,
         authToken: userContext.features.notebookServerToken,
-        forwardingId: undefined,
       });
     }
 
@@ -356,19 +352,35 @@ export default class Explorer {
       return;
     }
     this._isInitializingNotebooks = true;
+    if (userContext.features.phoenix === false) {
+      await this.ensureNotebookWorkspaceRunning();
+      const connectionInfo = await listConnectionInfo(
+        userContext.subscriptionId,
+        userContext.resourceGroup,
+        databaseAccount.name,
+        "default"
+      );
+
+      useNotebook.getState().setNotebookServerInfo({
+        notebookServerEndpoint: userContext.features.notebookServerUrl || connectionInfo.notebookServerEndpoint,
+        authToken: userContext.features.notebookServerToken || connectionInfo.authToken,
+      });
+    }
+
     this.refreshNotebookList();
+
     this._isInitializingNotebooks = false;
   }
 
   public async allocateContainer(): Promise<void> {
     const notebookServerInfo = useNotebook.getState().notebookServerInfo;
     const isAllocating = useNotebook.getState().isAllocating;
-    if (
-      isAllocating === false &&
-      (notebookServerInfo === undefined ||
-        (notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined))
-    ) {
-      const provisionData: IProvisionData = {
+    if (isAllocating === false && notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined) {
+      const provisionData = {
+        aadToken: userContext.authorizationToken,
+        subscriptionId: userContext.subscriptionId,
+        resourceGroup: userContext.resourceGroup,
+        dbAccountName: userContext.databaseAccount.name,
         cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
       };
       const connectionStatus: ContainerConnectionInfo = {
@@ -376,61 +388,38 @@ export default class Explorer {
       };
       useNotebook.getState().setConnectionInfo(connectionStatus);
       try {
-        TelemetryProcessor.traceStart(Action.PhoenixConnection, {
-          dataExplorerArea: Areas.Notebook,
-        });
         useNotebook.getState().setIsAllocating(true);
-        const connectionInfo = await this.phoenixClient.allocateContainer(provisionData);
-        if (connectionInfo.status !== HttpStatusCodes.OK) {
-          throw new Error(`Received status code: ${connectionInfo?.status}`);
+        const connectionInfo = await this.phoenixClient.containerConnectionInfo(provisionData);
+        if (
+          connectionInfo.status === HttpStatusCodes.OK &&
+          connectionInfo.data &&
+          connectionInfo.data.notebookServerUrl
+        ) {
+          connectionStatus.status = ConnectionStatusType.Connected;
+          useNotebook.getState().setConnectionInfo(connectionStatus);
+          useNotebook.getState().setNotebookServerInfo({
+            notebookServerEndpoint: userContext.features.notebookServerUrl || connectionInfo.data.notebookServerUrl,
+            authToken: userContext.features.notebookServerToken || connectionInfo.data.notebookAuthToken,
+          });
+          this.notebookManager?.notebookClient
+            .getMemoryUsage()
+            .then((memoryUsageInfo) => useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo));
+          useNotebook.getState().setIsAllocating(false);
+        } else {
+          connectionStatus.status = ConnectionStatusType.Failed;
+          useNotebook.getState().resetConatinerConnection(connectionStatus);
         }
-        if (!connectionInfo?.data?.notebookServerUrl) {
-          throw new Error(`NotebookServerUrl is invalid!`);
-        }
-        await this.setNotebookInfo(connectionInfo, connectionStatus);
-        TelemetryProcessor.traceSuccess(Action.PhoenixConnection, {
-          dataExplorerArea: Areas.Notebook,
-        });
       } catch (error) {
-        TelemetryProcessor.traceFailure(Action.PhoenixConnection, {
-          dataExplorerArea: Areas.Notebook,
-          error: getErrorMessage(error),
-          errorStack: getErrorStack(error),
-        });
         connectionStatus.status = ConnectionStatusType.Failed;
-        useNotebook.getState().resetContainerConnection(connectionStatus);
+        useNotebook.getState().resetConatinerConnection(connectionStatus);
         throw error;
-      } finally {
-        useNotebook.getState().setIsAllocating(false);
-        this.refreshCommandBarButtons();
-        this.refreshNotebookList();
-        this._isInitializingNotebooks = false;
       }
+      this.refreshNotebookList();
+
+      this._isInitializingNotebooks = false;
     }
   }
 
-  private async setNotebookInfo(
-    connectionInfo: IResponse<IPhoenixConnectionInfoResult>,
-    connectionStatus: DataModels.ContainerConnectionInfo
-  ) {
-    const containerData = {
-      forwardingId: connectionInfo.data.forwardingId,
-      dbAccountName: userContext.databaseAccount.name,
-    };
-    await this.phoenixClient.initiateContainerHeartBeat(containerData);
-
-    connectionStatus.status = ConnectionStatusType.Connected;
-    useNotebook.getState().setConnectionInfo(connectionStatus);
-    useNotebook.getState().setNotebookServerInfo({
-      notebookServerEndpoint: userContext.features.notebookServerUrl || connectionInfo.data.notebookServerUrl,
-      authToken: userContext.features.notebookServerToken || connectionInfo.data.notebookAuthToken,
-      forwardingId: connectionInfo.data.forwardingId,
-    });
-    this.notebookManager?.notebookClient
-      .getMemoryUsage()
-      .then((memoryUsageInfo) => useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo));
-  }
-
   public resetNotebookWorkspace(): void {
     if (!useNotebook.getState().isNotebookEnabled || !this.notebookManager?.notebookClient) {
       handleError(
@@ -439,14 +428,11 @@ export default class Explorer {
       );
       return;
     }
-    const dialogContent = useNotebook.getState().isPhoenixNotebooks
-      ? "Notebooks saved in the temporary workspace will be deleted. Do you want to proceed?"
-      : "This lets you keep your notebook files and the workspace will be restored to default. Proceed anyway?";
 
     const resetConfirmationDialogProps: DialogProps = {
       isModal: true,
       title: "Reset Workspace",
-      subText: dialogContent,
+      subText: "This lets you keep your notebook files and the workspace will be restored to default. Proceed anyway?",
       primaryButtonText: "OK",
       secondaryButtonText: "Cancel",
       onPrimaryButtonClick: this._resetNotebookWorkspace,
@@ -504,54 +490,16 @@ export default class Explorer {
   private _resetNotebookWorkspace = async () => {
     useDialog.getState().closeDialog();
     const clearInProgressMessage = logConsoleProgress("Resetting notebook workspace");
-    let connectionStatus: ContainerConnectionInfo;
     try {
-      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
-      if (!notebookServerInfo || !notebookServerInfo.notebookServerEndpoint) {
-        const error = "No server endpoint detected";
-        Logger.logError(error, "NotebookContainerClient/resetWorkspace");
-        logConsoleError(error);
-        return;
-      }
-      TelemetryProcessor.traceStart(Action.PhoenixResetWorkspace, {
-        dataExplorerArea: Areas.Notebook,
-      });
-      if (useNotebook.getState().isPhoenixNotebooks) {
-        useTabs.getState().closeAllNotebookTabs(true);
-        connectionStatus = {
-          status: ConnectionStatusType.Connecting,
-        };
-        useNotebook.getState().setConnectionInfo(connectionStatus);
-      }
-      const connectionInfo = await this.notebookManager?.notebookClient.resetWorkspace();
-      if (connectionInfo?.status !== HttpStatusCodes.OK) {
-        throw new Error(`Reset Workspace: Received status code- ${connectionInfo?.status}`);
-      }
-      if (!connectionInfo?.data?.notebookServerUrl) {
-        throw new Error(`Reset Workspace: NotebookServerUrl is invalid!`);
-      }
-      if (useNotebook.getState().isPhoenixNotebooks) {
-        await this.setNotebookInfo(connectionInfo, connectionStatus);
-        useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
-      }
+      await this.notebookManager?.notebookClient.resetWorkspace();
       logConsoleInfo("Successfully reset notebook workspace");
-      TelemetryProcessor.traceSuccess(Action.PhoenixResetWorkspace, {
-        dataExplorerArea: Areas.Notebook,
-      });
+      TelemetryProcessor.traceSuccess(Action.ResetNotebookWorkspace);
     } catch (error) {
       logConsoleError(`Failed to reset notebook workspace: ${error}`);
-      TelemetryProcessor.traceFailure(Action.PhoenixResetWorkspace, {
-        dataExplorerArea: Areas.Notebook,
+      TelemetryProcessor.traceFailure(Action.ResetNotebookWorkspace, {
         error: getErrorMessage(error),
         errorStack: getErrorStack(error),
       });
-      if (useNotebook.getState().isPhoenixNotebooks) {
-        connectionStatus = {
-          status: ConnectionStatusType.Failed,
-        };
-        useNotebook.getState().resetContainerConnection(connectionStatus);
-        useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
-      }
       throw error;
     } finally {
       clearInProgressMessage();
@@ -743,8 +691,8 @@ export default class Explorer {
     if (!notebookContentItem || !notebookContentItem.path) {
       throw new Error(`Invalid notebookContentItem: ${notebookContentItem}`);
     }
-    if (notebookContentItem.type === NotebookContentItemType.Notebook && useNotebook.getState().isPhoenixNotebooks) {
-      await this.allocateContainer();
+    if (notebookContentItem.type === NotebookContentItemType.Notebook && NotebookUtil.isPhoenixEnabled()) {
+      this.allocateContainer();
     }
 
     const notebookTabs = useTabs
@@ -961,17 +909,20 @@ export default class Explorer {
   /**
    * This creates a new notebook file, then opens the notebook
    */
-  public async onNewNotebookClicked(parent?: NotebookContentItem, isGithubTree?: boolean): Promise<void> {
+  public onNewNotebookClicked(parent?: NotebookContentItem, isGithubTree?: boolean): void {
     if (!useNotebook.getState().isNotebookEnabled || !this.notebookManager?.notebookContentClient) {
       const error = "Attempt to create new notebook, but notebook is not enabled";
       handleError(error, "Explorer/onNewNotebookClicked");
       throw new Error(error);
     }
-    if (useNotebook.getState().isPhoenixNotebooks) {
+    const isPhoenixEnabled = NotebookUtil.isPhoenixEnabled();
+    if (isPhoenixEnabled) {
       if (isGithubTree) {
-        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,
@@ -1056,7 +1007,7 @@ export default class Explorer {
   }
 
   public async openNotebookTerminal(kind: ViewModels.TerminalKind): Promise<void> {
-    if (useNotebook.getState().isPhoenixFeatures) {
+    if (NotebookUtil.isPhoenixEnabled()) {
       await this.allocateContainer();
       const notebookServerInfo = useNotebook.getState().notebookServerInfo;
       if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint !== undefined) {
@@ -1065,8 +1016,8 @@ export default class Explorer {
         useDialog
           .getState()
           .showOkModalDialog(
-            "Failed to connect",
-            "Failed to connect to temporary workspace. This could happen because of network issues. Please refresh the page and try again."
+            "Failed to Connect",
+            "Failed to connect temporary workspace, this could happen because of network issue please refresh and try again."
           );
       }
     } else {
@@ -1096,7 +1047,7 @@ export default class Explorer {
 
     const terminalTabs: TerminalTab[] = useTabs
       .getState()
-      .getTabs(ViewModels.CollectionTabKind.Terminal, (tab) => tab.tabTitle().startsWith(title)) as TerminalTab[];
+      .getTabs(ViewModels.CollectionTabKind.Terminal, (tab) => tab.tabTitle() === title) as TerminalTab[];
 
     let index = 1;
     if (terminalTabs.length > 0) {
@@ -1168,10 +1119,7 @@ export default class Explorer {
           <CassandraAddCollectionPane explorer={this} cassandraApiClient={new CassandraAPIDataClient()} />
         );
     } else {
-      const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-      throughputCap && throughputCap !== -1
-        ? await useDatabases.getState().loadAllOffers()
-        : await useDatabases.getState().loadDatabaseOffers();
+      await useDatabases.getState().loadDatabaseOffers();
       useSidePanel
         .getState()
         .openSidePanel("New " + getCollectionName(), <AddCollectionPanel explorer={this} databaseId={databaseId} />);
@@ -1197,9 +1145,10 @@ export default class Explorer {
   }
 
   public async handleOpenFileAction(path: string): Promise<void> {
-    if (useNotebook.getState().isPhoenixNotebooks) {
-      await this.allocateContainer();
-    } else if (!(await this._containsDefaultNotebookWorkspace(userContext.databaseAccount))) {
+    if (
+      userContext.features.phoenix === false &&
+      !(await this._containsDefaultNotebookWorkspace(userContext.databaseAccount))
+    ) {
       this._openSetupNotebooksPaneForQuickstart();
     }
 
@@ -1231,7 +1180,7 @@ export default class Explorer {
   }
 
   public openUploadFilePanel(parent?: NotebookContentItem): void {
-    if (useNotebook.getState().isPhoenixNotebooks) {
+    if (NotebookUtil.isPhoenixEnabled()) {
       useDialog.getState().showOkCancelModalDialog(
         Notebook.newNotebookUploadModalTitle,
         undefined,
@@ -1261,7 +1210,7 @@ export default class Explorer {
   }
 
   public getDownloadModalConent(fileName: string): JSX.Element {
-    if (useNotebook.getState().isPhoenixNotebooks) {
+    if (NotebookUtil.isPhoenixEnabled()) {
       return (
         <>
           <p>{Notebook.galleryNotebookDownloadContent1}</p>
@@ -1283,21 +1232,28 @@ export default class Explorer {
       ? this.refreshDatabaseForResourceToken()
       : this.refreshAllDatabases();
     await useNotebook.getState().refreshNotebooksEnabledStateForAccount();
-
-    // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
-    const isNotebookEnabled = userContext.features.notebooksDownBanner || useNotebook.getState().isPhoenixNotebooks;
+    let isNotebookEnabled = true;
+    if (!userContext.features.phoenix) {
+      isNotebookEnabled =
+        userContext.authType !== AuthType.ResourceToken &&
+        ((await this._containsDefaultNotebookWorkspace(userContext.databaseAccount)) ||
+          userContext.features.enableNotebooks);
+    }
     useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled);
-    useNotebook
-      .getState()
-      .setIsShellEnabled(useNotebook.getState().isPhoenixFeatures && isPublicInternetAccessAllowed());
+    useNotebook.getState().setIsShellEnabled(isNotebookEnabled && isPublicInternetAccessAllowed());
 
     TelemetryProcessor.trace(Action.NotebookEnabled, ActionModifiers.Mark, {
       isNotebookEnabled,
       dataExplorerArea: Constants.Areas.Notebook,
     });
 
-    if (useNotebook.getState().isPhoenixNotebooks) {
-      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();
+      }
     }
   }
 }

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

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", () => {

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -25,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";
@@ -77,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 (userContext.features.phoenix === false) {
       notebookButtons.push(createNotebookWorkspaceResetButton(container));
     }
     if (
@@ -98,21 +98,19 @@ 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() && useNotebook.getState().isPhoenixNotebooks) {
+    if (!isRunningOnNationalCloud() && !userContext.features.notebooksTemporarilyDown) {
       buttons.push(createDivider());
       buttons.push(createEnableNotebooksButton(container));
     }
@@ -170,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();
         }
@@ -178,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);
   }
@@ -273,6 +280,10 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
     return undefined;
   }
 
+  if (isServerlessAccount()) {
+    return undefined;
+  }
+
   if (userContext?.databaseAccount?.properties?.enableAnalyticalStorage) {
     return undefined;
   }
@@ -299,13 +310,8 @@ function createNewDatabase(container: Explorer): CommandButtonComponentProps {
   return {
     iconSrc: AddDatabaseIcon,
     iconAlt: label,
-    onCommandClick: async () => {
-      const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-      if (throughputCap && throughputCap !== -1) {
-        await useDatabases.getState().loadAllOffers();
-      }
-      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />);
-    },
+    onCommandClick: () =>
+      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />),
     commandButtonLabel: label,
     ariaLabel: label,
     hasPopup: true,

src/Explorer/Menus/CommandBar/ConnectionStatusComponent.tsx

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

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>
-      </>
-    );
-  }
 }

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,
 ];

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,

src/Explorer/Notebook/NotebookContainerClient.ts

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

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;
+  }
 }

src/Explorer/Notebook/notebookClientV2.test.ts

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

src/Explorer/Notebook/useNotebook.ts

@@ -1,6 +1,4 @@
-import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
 import { cloneDeep } from "lodash";
-import { PhoenixClient } from "Phoenix/PhoenixClient";
 import create, { UseStore } from "zustand";
 import { AuthType } from "../../AuthType";
 import * as Constants from "../../Common/Constants";
@@ -9,8 +7,7 @@ import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 import * as Logger from "../../Common/Logger";
 import { configContext } from "../../ConfigContext";
 import * as DataModels from "../../Contracts/DataModels";
-import { ContainerConnectionInfo, ContainerInfo } from "../../Contracts/DataModels";
-import { useTabs } from "../../hooks/useTabs";
+import { ContainerConnectionInfo } from "../../Contracts/DataModels";
 import { IPinnedRepo } from "../../Juno/JunoClient";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
@@ -19,6 +16,7 @@ import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
 import * as GitHubUtils from "../../Utils/GitHubUtils";
 import { NotebookContentItem, NotebookContentItemType } from "./NotebookContentItem";
 import NotebookManager from "./NotebookManager";
+import { NotebookUtil } from "./NotebookUtil";
 
 interface NotebookState {
   isNotebookEnabled: boolean;
@@ -37,9 +35,6 @@ interface NotebookState {
   notebookFolderName: string;
   isAllocating: boolean;
   isRefreshed: boolean;
-  containerStatus: ContainerInfo;
-  isPhoenixNotebooks: boolean;
-  isPhoenixFeatures: boolean;
   setIsNotebookEnabled: (isNotebookEnabled: boolean) => void;
   setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => void;
   setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
@@ -58,12 +53,8 @@ interface NotebookState {
   initializeGitHubRepos: (pinnedRepos: IPinnedRepo[]) => void;
   setConnectionInfo: (connectionInfo: ContainerConnectionInfo) => void;
   setIsAllocating: (isAllocating: boolean) => void;
-  resetContainerConnection: (connectionStatus: ContainerConnectionInfo) => void;
+  resetConatinerConnection: (connectionStatus: ContainerConnectionInfo) => void;
   setIsRefreshed: (isAllocating: boolean) => void;
-  setContainerStatus: (containerStatus: ContainerInfo) => void;
-  getPhoenixStatus: () => Promise<void>;
-  setIsPhoenixNotebooks: (isPhoenixNotebooks: boolean) => void;
-  setIsPhoenixFeatures: (isPhoenixFeatures: boolean) => void;
 }
 
 export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
@@ -72,7 +63,6 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   notebookServerInfo: {
     notebookServerEndpoint: undefined,
     authToken: undefined,
-    forwardingId: undefined,
   },
   sparkClusterConnectionInfo: {
     userName: undefined,
@@ -93,13 +83,6 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   notebookFolderName: undefined,
   isAllocating: false,
   isRefreshed: false,
-  containerStatus: {
-    status: undefined,
-    durationLeftInMinutes: undefined,
-    notebookServerInfo: undefined,
-  },
-  isPhoenixNotebooks: undefined,
-  isPhoenixFeatures: undefined,
   setIsNotebookEnabled: (isNotebookEnabled: boolean) => set({ isNotebookEnabled }),
   setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => set({ isNotebooksEnabledForAccount }),
   setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) =>
@@ -112,7 +95,6 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   setNotebookBasePath: (notebookBasePath: string) => set({ notebookBasePath }),
   setNotebookFolderName: (notebookFolderName: string) => set({ notebookFolderName }),
   refreshNotebooksEnabledStateForAccount: async (): Promise<void> => {
-    await get().getPhoenixStatus();
     const { databaseAccount, authType } = userContext;
     if (
       authType === AuthType.EncryptedToken ||
@@ -205,7 +187,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
     isGithubTree ? set({ gitHubNotebooksContentRoot: root }) : set({ myNotebooksContentRoot: root });
   },
   initializeNotebooksTree: async (notebookManager: NotebookManager): Promise<void> => {
-    const notebookFolderName = get().isPhoenixNotebooks ? "Temporary Notebooks" : "My Notebooks";
+    const notebookFolderName = NotebookUtil.isPhoenixEnabled() === true ? "Temporary Notebooks" : "My Notebooks";
     set({ notebookFolderName });
     const myNotebooksContentRoot = {
       name: get().notebookFolderName,
@@ -288,34 +270,13 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   },
   setConnectionInfo: (connectionInfo: ContainerConnectionInfo) => set({ connectionInfo }),
   setIsAllocating: (isAllocating: boolean) => set({ isAllocating }),
-  resetContainerConnection: (connectionStatus: ContainerConnectionInfo): void => {
-    useTabs.getState().closeAllNotebookTabs(true);
+  resetConatinerConnection: (connectionStatus: ContainerConnectionInfo): void => {
     useNotebook.getState().setConnectionInfo(connectionStatus);
-    useNotebook.getState().setNotebookServerInfo(undefined);
-    useNotebook.getState().setIsAllocating(false);
-    useNotebook.getState().setContainerStatus({
-      status: undefined,
-      durationLeftInMinutes: undefined,
-      notebookServerInfo: undefined,
+    useNotebook.getState().setNotebookServerInfo({
+      notebookServerEndpoint: undefined,
+      authToken: undefined,
     });
+    useNotebook.getState().setIsAllocating(false);
   },
   setIsRefreshed: (isRefreshed: boolean) => set({ isRefreshed }),
-  setContainerStatus: (containerStatus: ContainerInfo) => set({ containerStatus }),
-  getPhoenixStatus: async () => {
-    if (get().isPhoenixNotebooks === undefined || get().isPhoenixFeatures === undefined) {
-      let isPhoenix = false;
-      if (userContext.features.phoenixNotebooks || userContext.features.phoenixFeatures) {
-        const phoenixClient = new PhoenixClient();
-        isPhoenix = isPublicInternetAccessAllowed() && (await phoenixClient.isDbAcountWhitelisted());
-      }
-
-      const isPhoenixNotebooks = userContext.features.phoenixNotebooks && isPhoenix;
-      const isPhoenixFeatures = userContext.features.phoenixFeatures && isPhoenix;
-
-      set({ isPhoenixNotebooks: isPhoenixNotebooks });
-      set({ isPhoenixFeatures: isPhoenixFeatures });
-    }
-  },
-  setIsPhoenixNotebooks: (isPhoenixNotebooks: boolean) => set({ isPhoenixNotebooks: isPhoenixNotebooks }),
-  setIsPhoenixFeatures: (isPhoenixFeatures: boolean) => set({ isPhoenixFeatures: isPhoenixFeatures }),
 }));

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);

src/Explorer/Panes/AddCollectionPanel.tsx

@@ -92,7 +92,6 @@ export interface AddCollectionPanelState {
   errorMessage: string;
   showErrorDetails: boolean;
   isExecuting: boolean;
-  isThroughputCapExceeded: boolean;
 }
 
 export class AddCollectionPanel extends React.Component<AddCollectionPanelProps, AddCollectionPanelState> {
@@ -123,7 +122,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       errorMessage: "",
       showErrorDetails: false,
       isExecuting: false,
-      isThroughputCapExceeded: false,
     };
   }
 
@@ -251,9 +249,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                     isSharded={this.state.isSharded}
                     setThroughputValue={(throughput: number) => (this.newDatabaseThroughput = throughput)}
                     setIsAutoscale={(isAutoscale: boolean) => (this.isNewDatabaseAutoscale = isAutoscale)}
-                    setIsThroughputCapExceeded={(isThroughputCapExceeded: boolean) =>
-                      this.setState({ isThroughputCapExceeded })
-                    }
                     onCostAcknowledgeChange={(isAcknowledge: boolean) => (this.isCostAcknowledged = isAcknowledge)}
                   />
                 )}
@@ -279,7 +274,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
             <Stack horizontal>
               <span className="mandatoryStar">*&nbsp;</span>
               <Text className="panelTextBold" variant="small">
-                {`${getCollectionName()} id`}
+                {`${getCollectionName()} ${userContext.apiType === "Mongo" ? "name" : "id"}`}
               </Text>
               <TooltipHost
                 directionalHint={DirectionalHint.bottomLeftEdge}
@@ -485,9 +480,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
               isSharded={this.state.isSharded}
               setThroughputValue={(throughput: number) => (this.collectionThroughput = throughput)}
               setIsAutoscale={(isAutoscale: boolean) => (this.isCollectionAutoscale = isAutoscale)}
-              setIsThroughputCapExceeded={(isThroughputCapExceeded: boolean) =>
-                this.setState({ isThroughputCapExceeded })
-              }
               onCostAcknowledgeChange={(isAcknowledged: boolean) => {
                 this.isCostAcknowledged = isAcknowledged;
               }}
@@ -667,7 +659,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
 
                 {userContext.apiType === "SQL" && (
                   <Checkbox
-                    label="My partition key is larger than 101 bytes"
+                    label="My partition key is larger than 100 bytes"
                     checked={this.state.useHashV2}
                     styles={{
                       text: { fontSize: 12 },
@@ -684,7 +676,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
           )}
         </div>
 
-        <PanelFooterComponent buttonLabel="OK" isButtonDisabled={this.state.isThroughputCapExceeded} />
+        <PanelFooterComponent buttonLabel="OK" />
 
         {this.state.isExecuting && <PanelLoadingScreen />}
       </form>
@@ -887,6 +879,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       return false;
     }
 
+    if (isServerlessAccount()) {
+      return false;
+    }
+
     switch (userContext.apiType) {
       case "SQL":
       case "Mongo":

src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx

@@ -23,12 +23,10 @@ import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneFor
 
 export interface AddDatabasePaneProps {
   explorer: Explorer;
-  buttonElement?: HTMLElement;
 }
 
 export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
   explorer: container,
-  buttonElement,
 }: AddDatabasePaneProps) => {
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
   let throughput: number;
@@ -52,7 +50,6 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
   );
   const [formErrors, setFormErrors] = useState<string>("");
   const [isExecuting, setIsExecuting] = useState<boolean>(false);
-  const [isThroughputCapExceeded, setIsThroughputCapExceeded] = useState<boolean>(false);
 
   const isFreeTierAccount: boolean = userContext.databaseAccount?.properties?.enableFreeTier;
 
@@ -80,9 +77,6 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
       dataExplorerArea: Constants.Areas.ContextualPane,
     };
     TelemetryProcessor.trace(Action.CreateDatabase, ActionModifiers.Open, addDatabasePaneOpenMessage);
-    if (buttonElement) {
-      buttonElement.focus();
-    }
   }, []);
 
   const onSubmit = () => {
@@ -172,7 +166,6 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
     formError: formErrors,
     isExecuting,
     submitButtonText: "OK",
-    isSubmitButtonDisabled: isThroughputCapExceeded,
     onSubmit,
   };
 
@@ -243,7 +236,6 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
             isSharded={databaseCreateNewShared}
             setThroughputValue={(newThroughput: number) => (throughput = newThroughput)}
             setIsAutoscale={(isAutoscale: boolean) => (isAutoscaleSelected = isAutoscale)}
-            setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}
             onCostAcknowledgeChange={(isAcknowledged: boolean) => (isCostAcknowledged = isAcknowledged)}
           />
         )}

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

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

src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx

@@ -43,7 +43,6 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
   const [dedicateTableThroughput, setDedicateTableThroughput] = useState<boolean>(false);
   const [isExecuting, setIsExecuting] = useState<boolean>();
   const [formError, setFormError] = useState<string>("");
-  const [isThroughputCapExceeded, setIsThroughputCapExceeded] = useState<boolean>(false);
   const isFreeTierAccount: boolean = userContext.databaseAccount?.properties?.enableFreeTier;
 
   const addCollectionPaneOpenMessage = {
@@ -150,7 +149,6 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
     formError,
     isExecuting,
     submitButtonText: "OK",
-    isSubmitButtonDisabled: isThroughputCapExceeded,
     onSubmit,
   };
 
@@ -264,7 +262,6 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
               isSharded
               setThroughputValue={(throughput: number) => (newKeySpaceThroughput = throughput)}
               setIsAutoscale={(isAutoscale: boolean) => (isNewKeySpaceAutoscale = isAutoscale)}
-              setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}
               onCostAcknowledgeChange={(isAcknowledged: boolean) => (isCostAcknowledged = isAcknowledged)}
             />
           )}
@@ -334,10 +331,9 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
           <ThroughputInput
             showFreeTierExceedThroughputTooltip={isFreeTierAccount && !useDatabases.getState().isFirstResourceCreated()}
             isDatabase={false}
-            isSharded
+            isSharded={false}
             setThroughputValue={(throughput: number) => (tableThroughput = throughput)}
             setIsAutoscale={(isAutoscale: boolean) => (isTableAutoscale = isAutoscale)}
-            setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}
             onCostAcknowledgeChange={(isAcknowledged: boolean) => (isCostAcknowledged = isAcknowledged)}
           />
         )}

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;
       }
 

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}`

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

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

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>
   );

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 && (
           <>

src/Explorer/Panes/GitHubReposPanel/GitHubReposPanel.tsx

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

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

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

src/Explorer/Panes/PanelFooterComponent.tsx

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

src/Explorer/Panes/RightPaneForm/RightPaneForm.tsx

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

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

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

src/Explorer/Panes/SettingsPane/SettingsPane.tsx

@@ -113,50 +113,20 @@ export const SettingsPane: FunctionComponent = () => {
   const handleOnPageOptionChange = (ev: React.FormEvent<HTMLInputElement>, option: IChoiceGroupOption): void => {
     setPageOption(option.key);
   };
-
-  const choiceButtonStyles = {
-    root: {
-      clear: "both",
-    },
-    flexContainer: [
-      {
-        selectors: {
-          ".ms-ChoiceFieldGroup root-133": {
-            clear: "both",
-          },
-          ".ms-ChoiceField-wrapper label": {
-            fontSize: 12,
-            paddingTop: 0,
-          },
-          ".ms-ChoiceField": {
-            marginTop: 0,
-          },
-        },
-      },
-    ],
-  };
   return (
     <RightPaneForm {...genericPaneProps}>
       <div className="paneMainContent">
         {shouldShowQueryPageOptions && (
           <div className="settingsSection">
-            <div className="settingsSectionPart">
-              <fieldset>
-                <legend id="pageOptions" className="settingsSectionLabel legendLabel">
-                  Page Options
-                </legend>
+            <div className="settingsSectionPart pageOptionsPart">
+              <div className="settingsSectionLabel">
+                Page options
                 <InfoTooltip>
                   Choose Custom to specify a fixed amount of query results to show, or choose Unlimited to show as many
                   query results per page.
                 </InfoTooltip>
-                <ChoiceGroup
-                  ariaLabelledBy="pageOptions"
-                  selectedKey={pageOption}
-                  options={pageOptionList}
-                  styles={choiceButtonStyles}
-                  onChange={handleOnPageOptionChange}
-                />
-              </fieldset>
+              </div>
+              <ChoiceGroup selectedKey={pageOption} options={pageOptionList} onChange={handleOnPageOptionChange} />
             </div>
             <div className="tabs settingsSectionPart">
               {isCustomPageOptionSelected() && (

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

@@ -14,59 +14,32 @@ exports[`Settings Pane should render Default properly 1`] = `
       className="settingsSection"
     >
       <div
-        className="settingsSectionPart"
+        className="settingsSectionPart pageOptionsPart"
       >
-        <fieldset>
-          <legend
-            className="settingsSectionLabel legendLabel"
-            id="pageOptions"
-          >
-            Page Options
-          </legend>
+        <div
+          className="settingsSectionLabel"
+        >
+          Page options
           <InfoTooltip>
             Choose Custom to specify a fixed amount of query results to show, or choose Unlimited to show as many query results per page.
           </InfoTooltip>
-          <StyledChoiceGroup
-            ariaLabelledBy="pageOptions"
-            onChange={[Function]}
-            options={
-              Array [
-                Object {
-                  "key": "custom",
-                  "text": "Custom",
-                },
-                Object {
-                  "key": "unlimited",
-                  "text": "Unlimited",
-                },
-              ]
-            }
-            selectedKey="custom"
-            styles={
+        </div>
+        <StyledChoiceGroup
+          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",
-                      },
-                    },
-                  },
-                ],
-                "root": Object {
-                  "clear": "both",
-                },
-              }
-            }
-          />
-        </fieldset>
+                "key": "custom",
+                "text": "Custom",
+              },
+              Object {
+                "key": "unlimited",
+                "text": "Unlimited",
+              },
+            ]
+          }
+          selectedKey="custom"
+        />
       </div>
       <div
         className="tabs settingsSectionPart"

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

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

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

@@ -1262,21 +1262,18 @@ exports[`Table query select Panel should render Default properly 1`] = `
       </div>
       <PanelFooterComponent
         buttonLabel="OK"
-        isButtonDisabled={false}
       >
         <div
           className="panelFooter"
         >
           <CustomizedPrimaryButton
             ariaLabel="OK"
-            disabled={false}
             id="sidePanelOkButton"
             text="OK"
             type="submit"
           >
             <PrimaryButton
               ariaLabel="OK"
-              disabled={false}
               id="sidePanelOkButton"
               text="OK"
               theme={
@@ -1556,7 +1553,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
             >
               <CustomizedDefaultButton
                 ariaLabel="OK"
-                disabled={false}
                 id="sidePanelOkButton"
                 onRenderDescription={[Function]}
                 primary={true}
@@ -1838,7 +1834,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
               >
                 <DefaultButton
                   ariaLabel="OK"
-                  disabled={false}
                   id="sidePanelOkButton"
                   onRenderDescription={[Function]}
                   primary={true}
@@ -2121,7 +2116,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
                   <BaseButton
                     ariaLabel="OK"
                     baseClassName="ms-Button"
-                    disabled={false}
                     id="sidePanelOkButton"
                     onRenderDescription={[Function]}
                     primary={true}

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

@@ -24,7 +24,6 @@ const {
   Ascii,
   Bigint,
   Blob,
-  Date: DateType,
   Decimal,
   Float,
   Int,
@@ -34,7 +33,6 @@ const {
   Inet,
   Smallint,
   Tinyint,
-  Timestamp,
 } = TableConstants.CassandraType;
 export const cassandraOptions = [
   { key: Text, text: Text },
@@ -42,7 +40,6 @@ export const cassandraOptions = [
   { key: Bigint, text: Bigint },
   { key: Blob, text: Blob },
   { key: Boolean, text: Boolean },
-  { key: DateType, text: DateType },
   { key: Decimal, text: Decimal },
   { key: Double, text: Double },
   { key: Float, text: Float },
@@ -53,7 +50,6 @@ export const cassandraOptions = [
   { key: Inet, text: Inet },
   { key: Smallint, text: Smallint },
   { key: Tinyint, text: Tinyint },
-  { key: Timestamp, text: Timestamp },
 ];
 
 export const imageProps: IImageProps = {

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

@@ -356,21 +356,18 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
       </div>
       <PanelFooterComponent
         buttonLabel="Add Entity"
-        isButtonDisabled={false}
       >
         <div
           className="panelFooter"
         >
           <CustomizedPrimaryButton
             ariaLabel="Add Entity"
-            disabled={false}
             id="sidePanelOkButton"
             text="Add Entity"
             type="submit"
           >
             <PrimaryButton
               ariaLabel="Add Entity"
-              disabled={false}
               id="sidePanelOkButton"
               text="Add Entity"
               theme={
@@ -650,7 +647,6 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
             >
               <CustomizedDefaultButton
                 ariaLabel="Add Entity"
-                disabled={false}
                 id="sidePanelOkButton"
                 onRenderDescription={[Function]}
                 primary={true}
@@ -932,7 +928,6 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
               >
                 <DefaultButton
                   ariaLabel="Add Entity"
-                  disabled={false}
                   id="sidePanelOkButton"
                   onRenderDescription={[Function]}
                   primary={true}
@@ -1215,7 +1210,6 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
                   <BaseButton
                     ariaLabel="Add Entity"
                     baseClassName="ms-Button"
-                    disabled={false}
                     id="sidePanelOkButton"
                     onRenderDescription={[Function]}
                     primary={true}

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

@@ -357,21 +357,18 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
       </div>
       <PanelFooterComponent
         buttonLabel="Update"
-        isButtonDisabled={false}
       >
         <div
           className="panelFooter"
         >
           <CustomizedPrimaryButton
             ariaLabel="Update"
-            disabled={false}
             id="sidePanelOkButton"
             text="Update"
             type="submit"
           >
             <PrimaryButton
               ariaLabel="Update"
-              disabled={false}
               id="sidePanelOkButton"
               text="Update"
               theme={
@@ -651,7 +648,6 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
             >
               <CustomizedDefaultButton
                 ariaLabel="Update"
-                disabled={false}
                 id="sidePanelOkButton"
                 onRenderDescription={[Function]}
                 primary={true}
@@ -933,7 +929,6 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
               >
                 <DefaultButton
                   ariaLabel="Update"
-                  disabled={false}
                   id="sidePanelOkButton"
                   onRenderDescription={[Function]}
                   primary={true}
@@ -1216,7 +1211,6 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
                   <BaseButton
                     ariaLabel="Update"
                     baseClassName="ms-Button"
-                    disabled={false}
                     id="sidePanelOkButton"
                     onRenderDescription={[Function]}
                     primary={true}

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

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

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",
@@ -305,18 +307,10 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
         iconSrc: AddDatabaseIcon,
         title: "New " + getDatabaseName(),
         description: undefined,
-        onClick: async () => {
-          const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-          if (throughputCap && throughputCap !== -1) {
-            await useDatabases.getState().loadAllOffers();
-          }
+        onClick: () =>
           useSidePanel
             .getState()
-            .openSidePanel(
-              "New " + getDatabaseName(),
-              <AddDatabasePanel explorer={this.container} buttonElement={document.activeElement as HTMLElement} />
-            );
-        },
+            .openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={this.container} />),
       });
     }
 

src/Explorer/Tables/Constants.ts

@@ -14,13 +14,11 @@ export const CassandraType = {
   Bigint: "Bigint",
   Blob: "Blob",
   Boolean: "Boolean",
-  Date: "Date",
   Decimal: "Decimal",
   Double: "Double",
   Float: "Float",
   Int: "Int",
   Text: "Text",
-  Timestamp: "Timestamp",
   Uuid: "Uuid",
   Varchar: "Varchar",
   Varint: "Varint",

src/Explorer/Tables/DataTable/TableEntityListViewModel.ts

@@ -431,7 +431,7 @@ export default class TableEntityListViewModel extends DataTableViewModel {
           if (newHeaders.length > 0) {
             // Any new columns found will be added into headers array, which will trigger a re-render of the DataTable.
             // So there is no need to call it here.
-            this.updateHeaders(selectedHeadersUnion, /* notifyColumnChanges */ true);
+            this.updateHeaders(newHeaders, /* notifyColumnChanges */ true);
           } else {
             if (columnSortOrder) {
               this.sortColumns(columnSortOrder, oSettings);

src/Explorer/Tables/TableDataClient.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { FeedOptions } from "@azure/cosmos";
 import * as ko from "knockout";
 import Q from "q";
@@ -31,8 +32,6 @@ export interface CassandraTableKey {
 }
 
 export abstract class TableDataClient {
-  constructor() {}
-
   public abstract createDocument(
     collection: ViewModels.Collection,
     entity: Entities.ITableEntity
@@ -54,7 +53,7 @@ export abstract class TableDataClient {
   public abstract deleteDocuments(
     collection: ViewModels.Collection,
     entitiesToDelete: Entities.ITableEntity[]
-  ): Promise<any>;
+  ): Promise<unknown>;
 }
 
 export class TablesAPIDataClient extends TableDataClient {
@@ -67,7 +66,7 @@ export class TablesAPIDataClient extends TableDataClient {
       collection,
       TableEntityProcessor.convertEntityToNewDocument(<Entities.ITableEntityForTablesAPI>entity)
     ).then(
-      (newDocument: any) => {
+      (newDocument: unknown) => {
         const newEntity = TableEntityProcessor.convertDocumentsToEntities([newDocument])[0];
         deferred.resolve(newEntity);
       },
@@ -146,7 +145,7 @@ export class CassandraAPIDataClient extends TableDataClient {
     const clearInProgressMessage = logConsoleProgress(`Adding new row to table ${collection.id()}`);
     let properties = "(";
     let values = "(";
-    for (let property in entity) {
+    for (const property in entity) {
       if (entity[property]._ === null) {
         continue;
       }
@@ -164,7 +163,7 @@ export class CassandraAPIDataClient extends TableDataClient {
     const deferred = Q.defer<Entities.ITableEntity>();
     this.queryDocuments(collection, query)
       .then(
-        (data: any) => {
+        () => {
           entity[TableConstants.EntityKeyNames.RowKey] = entity[this.getCassandraPartitionKeyProperty(collection)];
           entity[TableConstants.EntityKeyNames.RowKey]._ = entity[TableConstants.EntityKeyNames.RowKey]._.toString();
           logConsoleInfo(`Successfully added new row to table ${collection.id()}`);
@@ -188,10 +187,10 @@ export class CassandraAPIDataClient extends TableDataClient {
 
     try {
       let whereSegment = " WHERE";
-      let keys: CassandraTableKey[] = collection.cassandraKeys.partitionKeys.concat(
+      const keys: CassandraTableKey[] = collection.cassandraKeys.partitionKeys.concat(
         collection.cassandraKeys.clusteringKeys
       );
-      for (let keyIndex in keys) {
+      for (const keyIndex in keys) {
         const key = keys[keyIndex].property;
         const keyType = keys[keyIndex].type;
         whereSegment += this.isStringType(keyType)
@@ -203,7 +202,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       let updateQuery = `UPDATE ${collection.databaseId}.${collection.id()}`;
       let isPropertyUpdated = false;
       let isFirstPropertyToUpdate = true;
-      for (let property in newEntity) {
+      for (const property in newEntity) {
         if (
           !originalDocument[property] ||
           newEntity[property]._.toString() !== originalDocument[property]._.toString()
@@ -229,7 +228,7 @@ export class CassandraAPIDataClient extends TableDataClient {
 
       let deleteQuery = `DELETE `;
       let isPropertyDeleted = false;
-      for (let property in originalDocument) {
+      for (const property in originalDocument) {
         if (property !== TableConstants.EntityKeyNames.RowKey && !newEntity[property] && !!originalDocument[property]) {
           deleteQuery += ` ${property},`;
           isPropertyDeleted = true;
@@ -333,16 +332,16 @@ export class CassandraAPIDataClient extends TableDataClient {
     resourceId: string,
     explorer: Explorer,
     createKeyspaceQuery: string
-  ): Q.Promise<any> {
+  ): Q.Promise<unknown> {
     if (!createKeyspaceQuery) {
       return Q.reject("No query specified");
     }
 
-    const deferred: Q.Deferred<any> = Q.defer();
+    const deferred: Q.Deferred<unknown> = Q.defer();
     const clearInProgressMessage = logConsoleProgress(`Creating a new keyspace with query ${createKeyspaceQuery}`);
     this.createOrDeleteQuery(cassandraEndpoint, resourceId, createKeyspaceQuery)
       .then(
-        (data: any) => {
+        () => {
           logConsoleInfo(`Successfully created a keyspace with query ${createKeyspaceQuery}`);
           deferred.resolve();
         },
@@ -366,8 +365,8 @@ export class CassandraAPIDataClient extends TableDataClient {
     explorer: Explorer,
     createTableQuery: string,
     createKeyspaceQuery?: string
-  ): Q.Promise<any> {
-    let createKeyspacePromise: Q.Promise<any>;
+  ): Q.Promise<unknown> {
+    let createKeyspacePromise: Q.Promise<unknown>;
     if (createKeyspaceQuery) {
       createKeyspacePromise = this.createKeyspace(cassandraEndpoint, resourceId, explorer, createKeyspaceQuery);
     } else {
@@ -380,7 +379,7 @@ export class CassandraAPIDataClient extends TableDataClient {
         const clearInProgressMessage = logConsoleProgress(`Creating a new table with query ${createTableQuery}`);
         this.createOrDeleteQuery(cassandraEndpoint, resourceId, createTableQuery)
           .then(
-            (data: any) => {
+            () => {
               logConsoleInfo(`Successfully created a table with query ${createTableQuery}`);
               deferred.resolve();
             },
@@ -399,7 +398,7 @@ export class CassandraAPIDataClient extends TableDataClient {
   }
 
   public getTableKeys(collection: ViewModels.Collection): Q.Promise<CassandraTableKeys> {
-    if (!!collection.cassandraKeys) {
+    if (collection.cassandraKeys) {
       return Q.resolve(collection.cassandraKeys);
     }
     const clearInProgressMessage = logConsoleProgress(`Fetching keys for table ${collection.id()}`);
@@ -408,7 +407,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       authType === AuthType.EncryptedToken
         ? Constants.CassandraBackend.guestKeysApi
         : Constants.CassandraBackend.keysApi;
-    let endpoint = `${configContext.BACKEND_ENDPOINT}/${apiEndpoint}`;
+    const endpoint = `${configContext.BACKEND_ENDPOINT}/${apiEndpoint}`;
     const deferred = Q.defer<CassandraTableKeys>();
 
     $.ajax(endpoint, {
@@ -429,7 +428,7 @@ export class CassandraAPIDataClient extends TableDataClient {
           logConsoleInfo(`Successfully fetched keys for table ${collection.id()}`);
           deferred.resolve(data);
         },
-        (error: any) => {
+        (error: Error) => {
           handleError(error, "FetchKeysCassandra", `Error fetching keys for table ${collection.id()}`);
           deferred.reject(error);
         }
@@ -439,7 +438,7 @@ export class CassandraAPIDataClient extends TableDataClient {
   }
 
   public getTableSchema(collection: ViewModels.Collection): Q.Promise<CassandraTableKey[]> {
-    if (!!collection.cassandraSchema) {
+    if (collection.cassandraSchema) {
       return Q.resolve(collection.cassandraSchema);
     }
     const clearInProgressMessage = logConsoleProgress(`Fetching schema for table ${collection.id()}`);
@@ -448,7 +447,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       authType === AuthType.EncryptedToken
         ? Constants.CassandraBackend.guestSchemaApi
         : Constants.CassandraBackend.schemaApi;
-    let endpoint = `${configContext.BACKEND_ENDPOINT}/${apiEndpoint}`;
+    const endpoint = `${configContext.BACKEND_ENDPOINT}/${apiEndpoint}`;
     const deferred = Q.defer<CassandraTableKey[]>();
 
     $.ajax(endpoint, {
@@ -469,7 +468,7 @@ export class CassandraAPIDataClient extends TableDataClient {
           logConsoleInfo(`Successfully fetched schema for table ${collection.id()}`);
           deferred.resolve(data.columns);
         },
-        (error: any) => {
+        (error: Error) => {
           handleError(error, "FetchSchemaCassandra", `Error fetching schema for table ${collection.id()}`);
           deferred.reject(error);
         }
@@ -496,7 +495,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       beforeSend: this.setAuthorizationHeader,
       cache: false,
     }).then(
-      (data: any) => {
+      () => {
         deferred.resolve();
       },
       (reason) => {
@@ -535,9 +534,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       dataType === TableConstants.CassandraType.Text ||
       dataType === TableConstants.CassandraType.Inet ||
       dataType === TableConstants.CassandraType.Ascii ||
-      dataType === TableConstants.CassandraType.Varchar ||
-      dataType === TableConstants.CassandraType.Timestamp ||
-      dataType === TableConstants.CassandraType.Date
+      dataType === TableConstants.CassandraType.Varchar
     );
   }
 

src/Explorer/Tabs/NotebookTabBase.ts

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

src/Explorer/Tabs/NotebookV2Tab.ts

@@ -53,16 +53,14 @@ export default class NotebookTabV2 extends NotebookTabBase {
       onUpdateKernelInfo: this.onKernelUpdate,
     });
   }
-  /*
-   * Hard cleaning the workspace(Closing tabs connected with old container connection) when new container got allocated.
-   */
-  public onCloseTabButtonClick(hardClose = false): Q.Promise<any> {
+
+  public onCloseTabButtonClick(): Q.Promise<any> {
     const cleanup = () => {
       this.notebookComponentAdapter.notebookShutdown();
       super.onCloseTabButtonClick();
     };
 
-    if (this.notebookComponentAdapter.isContentDirty() && hardClose === false) {
+    if (this.notebookComponentAdapter.isContentDirty()) {
       useDialog
         .getState()
         .showOkCancelModalDialog(

src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx

@@ -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">

src/Explorer/Tabs/TerminalTab.tsx

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

src/Explorer/Tree/Collection.ts

@@ -1,5 +1,4 @@
 import { Resource, StoredProcedureDefinition, TriggerDefinition, UserDefinedFunctionDefinition } from "@azure/cosmos";
-import { useNotebook } from "Explorer/Notebook/useNotebook";
 import * as ko from "knockout";
 import * as _ from "underscore";
 import * as Constants from "../../Common/Constants";
@@ -529,9 +528,6 @@ export default class Collection implements ViewModels.Collection {
   };
 
   public onSchemaAnalyzerClick = async () => {
-    if (useNotebook.getState().isPhoenixFeatures) {
-      await this.container.allocateContainer();
-    }
     useSelectedNode.getState().setSelectedNode(this);
     this.selectedSubnodeKind(ViewModels.CollectionTabKind.SchemaAnalyzer);
     const SchemaAnalyzerTab = await (await import("../Tabs/SchemaAnalyzerTab")).default;
@@ -576,8 +572,7 @@ export default class Collection implements ViewModels.Collection {
 
   public onSettingsClick = async (): Promise<void> => {
     useSelectedNode.getState().setSelectedNode(this);
-    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-    throughputCap && throughputCap !== -1 ? await useDatabases.getState().loadAllOffers() : await this.loadOffer();
+    await this.loadOffer();
     this.selectedSubnodeKind(ViewModels.CollectionTabKind.Settings);
     TelemetryProcessor.trace(Action.SelectItem, ActionModifiers.Mark, {
       description: "Settings node",

src/Explorer/Tree/Database.tsx

@@ -57,7 +57,7 @@ export default class Database implements ViewModels.Database {
     this.isOfferRead = false;
   }
 
-  public onSettingsClick = async (): Promise<void> => {
+  public onSettingsClick = (): void => {
     useSelectedNode.getState().setSelectedNode(this);
     this.selectedSubnodeKind(ViewModels.CollectionTabKind.DatabaseSettings);
     TelemetryProcessor.trace(Action.SelectItem, ActionModifiers.Mark, {
@@ -66,11 +66,6 @@ export default class Database implements ViewModels.Database {
       dataExplorerArea: Constants.Areas.ResourceTree,
     });
 
-    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-    if (throughputCap && throughputCap !== -1) {
-      await useDatabases.getState().loadAllOffers();
-    }
-
     const pendingNotificationsPromise: Promise<DataModels.Notification> = this.getPendingThroughputSplitNotification();
     const tabKind = ViewModels.CollectionTabKind.DatabaseSettingsV2;
     const matchingTabs = useTabs.getState().getTabs(tabKind, (tab) => tab.node?.id() === this.id());

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)",

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(

src/Explorer/useDatabases.ts

@@ -18,7 +18,6 @@ interface DatabasesState {
   findCollection: (databaseId: string, collectionId: string) => ViewModels.Collection;
   isLastCollection: () => boolean;
   loadDatabaseOffers: () => Promise<void>;
-  loadAllOffers: () => Promise<void>;
   isFirstResourceCreated: () => boolean;
   findSelectedDatabase: () => ViewModels.Database;
   validateDatabaseId: (id: string) => boolean;
@@ -98,19 +97,6 @@ export const useDatabases: UseStore<DatabasesState> = create((set, get) => ({
       })
     );
   },
-  loadAllOffers: async () => {
-    await Promise.all(
-      get().databases?.map(async (database: ViewModels.Database) => {
-        await database.loadOffer();
-        await database.loadCollections();
-        await Promise.all(
-          (database.collections() || []).map(async (collection: ViewModels.Collection) => {
-            await collection.loadOffer();
-          })
-        );
-      })
-    );
-  },
   isFirstResourceCreated: () => {
     const databases = get().databases;
 

src/Explorer/useSelectedNode.ts

@@ -1,5 +1,3 @@
-import { ConnectionStatusType } from "Common/Constants";
-import { useNotebook } from "Explorer/Notebook/useNotebook";
 import create, { UseStore } from "zustand";
 import * as ViewModels from "../Contracts/ViewModels";
 import { useTabs } from "../hooks/useTabs";
@@ -14,7 +12,6 @@ export interface SelectedNodeState {
     collectionId?: string,
     subnodeKinds?: ViewModels.CollectionTabKind[]
   ) => boolean;
-  isConnectedToContainer: () => boolean;
 }
 
 export const useSelectedNode: UseStore<SelectedNodeState> = create((set, get) => ({
@@ -62,7 +59,4 @@ export const useSelectedNode: UseStore<SelectedNodeState> = create((set, get) =>
       subnodeKinds.includes(selectedSubnodeKind)
     );
   },
-  isConnectedToContainer: (): boolean => {
-    return useNotebook.getState().connectionInfo?.status === ConnectionStatusType.Connected;
-  },
 }));

src/GitHub/GitHubOAuthService.ts

@@ -1,8 +1,8 @@
 import ko from "knockout";
 import postRobot from "post-robot";
-import { GetGithubClientId } from "Utils/GitHubUtils";
 import { HttpStatusCodes } from "../Common/Constants";
 import { handleError } from "../Common/ErrorHandlingUtils";
+import { configContext } from "../ConfigContext";
 import { AuthorizeAccessComponent } from "../Explorer/Controls/GitHub/AuthorizeAccessComponent";
 import { JunoClient } from "../Juno/JunoClient";
 import { logConsoleInfo } from "../Utils/NotificationConsoleUtils";
@@ -55,7 +55,7 @@ export class GitHubOAuthService {
 
     const params = {
       scope,
-      client_id: GetGithubClientId(),
+      client_id: configContext.GITHUB_CLIENT_ID,
       redirect_uri: new URL("./connectToGitHub.html", window.location.href).href,
       state: this.resetState(),
     };

src/Juno/JunoClient.ts

@@ -1,5 +1,4 @@
 import ko from "knockout";
-import { GetGithubClientId } from "Utils/GitHubUtils";
 import { HttpHeaders, HttpStatusCodes } from "../Common/Constants";
 import { configContext } from "../ConfigContext";
 import * as DataModels from "../Contracts/DataModels";
@@ -523,7 +522,7 @@ export class JunoClient {
 
   private static getGitHubClientParams(): URLSearchParams {
     const githubParams = new URLSearchParams({
-      client_id: GetGithubClientId(),
+      client_id: configContext.GITHUB_CLIENT_ID,
     });
 
     if (configContext.GITHUB_CLIENT_SECRET) {

src/Phoenix/PhoenixClient.ts

@@ -1,56 +1,33 @@
-import promiseRetry, { AbortError } from "p-retry";
-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 { HttpHeaders, HttpStatusCodes } from "../Common/Constants";
 import { configContext } from "../ConfigContext";
-import {
-  ContainerConnectionInfo,
-  ContainerInfo,
-  IContainerData,
-  IPhoenixConnectionInfoResult,
-  IProvisionData,
-  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";
 
+export interface IPhoenixResponse<T> {
+  status: number;
+  data: T;
+}
+export interface IPhoenixConnectionInfoResult {
+  readonly notebookAuthToken?: string;
+  readonly notebookServerUrl?: string;
+}
+export interface IProvosionData {
+  cosmosEndpoint: string;
+  dbAccountName: string;
+  aadToken: string;
+  resourceGroup: string;
+  subscriptionId: string;
+}
 export class PhoenixClient {
-  private containerHealthHandler: NodeJS.Timeout;
-  private retryOptions: promiseRetry.Options = {
-    retries: Notebook.retryAttempts,
-    maxTimeout: Notebook.retryAttemptDelayMs,
-    minTimeout: Notebook.retryAttemptDelayMs,
-  };
-
-  public async allocateContainer(provisionData: IProvisionData): Promise<IResponse<IPhoenixConnectionInfoResult>> {
-    return this.executeContainerAssignmentOperation(provisionData, "allocate");
-  }
-
-  public async resetContainer(provisionData: IProvisionData): Promise<IResponse<IPhoenixConnectionInfoResult>> {
-    return this.executeContainerAssignmentOperation(provisionData, "reset");
-  }
-
-  private async executeContainerAssignmentOperation(
-    provisionData: IProvisionData,
-    operation: string
-  ): Promise<IResponse<IPhoenixConnectionInfoResult>> {
+  public async containerConnectionInfo(
+    provisionData: IProvosionData
+  ): Promise<IPhoenixResponse<IPhoenixConnectionInfoResult>> {
     try {
-      const response = await fetch(`${this.getPhoenixControlPlanePathPrefix()}/containerconnections`, {
-        method: operation === "allocate" ? "POST" : "PATCH",
+      const response = await window.fetch(`${this.getPhoenixContainerPoolingEndPoint()}/allocate`, {
+        method: "POST",
         headers: PhoenixClient.getHeaders(),
         body: JSON.stringify(provisionData),
       });
-
       let data: IPhoenixConnectionInfoResult;
       if (response.status === HttpStatusCodes.OK) {
         data = await response.json();
@@ -65,92 +42,6 @@ export class PhoenixClient {
     }
   }
 
-  public async initiateContainerHeartBeat(containerData: IContainerData) {
-    if (this.containerHealthHandler) {
-      clearTimeout(this.containerHealthHandler);
-    }
-    await this.getContainerHealth(Notebook.containerStatusHeartbeatDelayMs, containerData);
-  }
-
-  private scheduleContainerHeartbeat(delayMs: number, containerData: IContainerData): void {
-    this.containerHealthHandler = setTimeout(async () => {
-      await this.getContainerHealth(delayMs, containerData);
-    }, delayMs);
-  }
-
-  private async getContainerStatusAsync(containerData: IContainerData): Promise<ContainerInfo> {
-    try {
-      const runContainerStatusAsync = async () => {
-        const response = await window.fetch(
-          `${this.getPhoenixControlPlanePathPrefix()}/${containerData.forwardingId}`,
-          {
-            method: "GET",
-            headers: PhoenixClient.getHeaders(),
-          }
-        );
-        if (response.status === HttpStatusCodes.OK) {
-          const containerStatus = await response.json();
-          return {
-            durationLeftInMinutes: containerStatus?.durationLeftInMinutes,
-            notebookServerInfo: containerStatus?.notebookServerInfo,
-            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);
-      return {
-        durationLeftInMinutes: undefined,
-        notebookServerInfo: undefined,
-        status: ContainerStatusType.Disconnected,
-      };
-    }
-  }
-
-  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 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;
-    }
-  }
-
   public static getPhoenixEndpoint(): string {
     const phoenixEndpoint =
       userContext.features.phoenixEndpoint ?? userContext.features.junoEndpoint ?? configContext.JUNO_ENDPOINT;
@@ -163,12 +54,9 @@ 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 {
     const authorizationHeader = getAuthorizationHeader();
     return {

src/Platform/Hosted/extractFeatures.ts

@@ -11,9 +11,7 @@ export type Features = {
   autoscaleDefault: boolean;
   partitionKeyDefault: boolean;
   partitionKeyDefault2: boolean;
-  phoenixNotebooks: boolean;
-  phoenixFeatures: boolean;
-  notebooksDownBanner: boolean;
+  phoenix: boolean;
   readonly enableSDKoperations: boolean;
   readonly enableSpark: boolean;
   readonly enableTtl: boolean;
@@ -34,7 +32,7 @@ export type Features = {
   readonly ttl90Days: boolean;
   readonly mongoProxyEndpoint?: string;
   readonly mongoProxyAPIs?: string;
-  readonly enableThroughputCap: boolean;
+  readonly notebooksTemporarilyDown: boolean;
 };
 
 export function extractFeatures(given = new URLSearchParams(window.location.search)): Features {
@@ -84,10 +82,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"),
-    notebooksDownBanner: "true" === get("notebooksDownBanner"),
-    enableThroughputCap: "true" === get("enablethroughputcap"),
+    notebooksTemporarilyDown: "true" === get("notebookstemporarilydown", "true"),
+    phoenix: "true" === get("phoenix"),
   };
 }
 

src/SelfServe/SqlX/SqlX.rp.ts

@@ -6,7 +6,6 @@ import { RefreshResult } from "../SelfServeTypes";
 import SqlX from "./SqlX";
 import {
   FetchPricesResponse,
-  PriceMapAndCurrencyCode,
   RegionsResponse,
   SqlxServiceResource,
   UpdateDedicatedGatewayRequestParameters,
@@ -179,18 +178,18 @@ const getFetchPricesPathForRegion = (subscriptionId: string): string => {
   return `/subscriptions/${subscriptionId}/providers/Microsoft.CostManagement/fetchPrices`;
 };
 
-export const getPriceMapAndCurrencyCode = async (regions: Array<string>): Promise<PriceMapAndCurrencyCode> => {
+export const getPriceMap = async (regions: Array<string>): Promise<Map<string, Map<string, number>>> => {
   const telemetryData = {
     feature: "Calculate approximate cost",
-    function: "getPriceMapAndCurrencyCode",
+    function: "getPriceMap",
     description: "fetch prices API call",
     selfServeClassName: SqlX.name,
   };
-  const getPriceMapAndCurrencyCodeTimestamp = selfServeTraceStart(telemetryData);
+  const getPriceMapTimestamp = selfServeTraceStart(telemetryData);
 
   try {
     const priceMap = new Map<string, Map<string, number>>();
-    let currencyCode;
+
     for (const region of regions) {
       const regionPriceMap = new Map<string, number>();
 
@@ -208,21 +207,17 @@ export const getPriceMapAndCurrencyCode = async (regions: Array<string>): Promis
       });
 
       for (const item of response.result.Items) {
-        if (currencyCode === undefined) {
-          currencyCode = item.currencyCode;
-        } else if (item.currencyCode !== currencyCode) {
-          throw Error("Currency Code Mismatch: Currency code not same for all regions / skus.");
-        }
         regionPriceMap.set(item.skuName, item.retailPrice);
       }
       priceMap.set(region, regionPriceMap);
     }
 
-    selfServeTraceSuccess(telemetryData, getPriceMapAndCurrencyCodeTimestamp);
-    return { priceMap: priceMap, currencyCode: currencyCode };
+    selfServeTraceSuccess(telemetryData, getPriceMapTimestamp);
+    return priceMap;
   } catch (err) {
     const failureTelemetry = { err, selfServeClassName: SqlX.name };
-    selfServeTraceFailure(failureTelemetry, getPriceMapAndCurrencyCodeTimestamp);
-    return { priceMap: undefined, currencyCode: undefined };
+    selfServeTraceFailure(failureTelemetry, getPriceMapTimestamp);
+
+    return undefined;
   }
 };

src/SelfServe/SqlX/SqlX.tsx

@@ -21,7 +21,7 @@ import { BladeType, generateBladeLink } from "../SelfServeUtils";
 import {
   deleteDedicatedGatewayResource,
   getCurrentProvisioningState,
-  getPriceMapAndCurrencyCode,
+  getPriceMap,
   getRegions,
   refreshDedicatedGatewayProvisioning,
   updateDedicatedGatewayResource,
@@ -207,7 +207,6 @@ const ApproximateCostDropDownInfo: Info = {
 };
 
 let priceMap: Map<string, Map<string, number>>;
-let currencyCode: string;
 let regions: Array<string>;
 
 const calculateCost = (skuName: string, instanceCount: number): Description => {
@@ -238,7 +237,7 @@ const calculateCost = (skuName: string, instanceCount: number): Description => {
 
     selfServeTraceSuccess(telemetryData, calculateCostTimestamp);
     return {
-      textTKey: `${costPerHour} ${currencyCode}`,
+      textTKey: `${costPerHour} USD`,
       type: DescriptionType.Text,
     };
   } catch (err) {
@@ -347,9 +346,7 @@ export default class SqlX extends SelfServeBaseClass {
     });
 
     regions = await getRegions();
-    const priceMapAndCurrencyCode = await getPriceMapAndCurrencyCode(regions);
-    priceMap = priceMapAndCurrencyCode.priceMap;
-    currencyCode = priceMapAndCurrencyCode.currencyCode;
+    priceMap = await getPriceMap(regions);
 
     const response = await getCurrentProvisioningState();
     if (response.status && response.status !== "Deleting") {

src/SelfServe/SqlX/SqlxTypes.ts

@@ -36,15 +36,9 @@ export type FetchPricesResponse = {
   Count: number;
 };
 
-export type PriceMapAndCurrencyCode = {
-  priceMap: Map<string, Map<string, number>>;
-  currencyCode: string;
-};
-
 export type PriceItem = {
   retailPrice: number;
   skuName: string;
-  currencyCode: string;
 };
 
 export type RegionsResponse = {

src/Shared/Telemetry/TelemetryConstants.ts

@@ -50,6 +50,7 @@ export enum Action {
   SubscriptionSwitch,
   TenantSwitch,
   DefaultTenantSwitch,
+  ResetNotebookWorkspace,
   CreateNotebookWorkspace,
   NotebookErrorNotification,
   CreateSparkCluster,
@@ -81,9 +82,6 @@ export enum Action {
   NotebooksInsertTextCellBelowFromMenu,
   NotebooksMoveCellUpFromMenu,
   NotebooksMoveCellDownFromMenu,
-  PhoenixConnection,
-  PhoenixHeartBeat,
-  PhoenixResetWorkspace,
   DeleteCellFromMenu,
   OpenTerminal,
   CreateMongoCollectionWithWildcardIndex,

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) {

src/Terminal/TerminalProps.ts

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

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",

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;
@@ -238,7 +239,7 @@ export function downloadItem(
         useDialog
           .getState()
           .showOkModalDialog(
-            "Failed to connect",
+            "Failed to Connect",
             "Failed to connect to temporary workspace. Please refresh the page and try again."
           );
       }

src/Utils/GitHubUtils.ts

@@ -1,9 +1,4 @@
 // https://github.com/<owner>/<repo>/tree/<branch>
-
-import { JunoEndpoints } from "Common/Constants";
-import { configContext } from "ConfigContext";
-import { userContext } from "UserContext";
-
 // The url when users visit a repo/branch on github.com
 export const RepoUriPattern = /https:\/\/github.com\/([^/]*)\/([^/]*)\/tree\/([^?]*)/;
 
@@ -65,15 +60,3 @@ export function toContentUri(owner: string, repo: string, branch: string, path:
 export function toRawContentUri(owner: string, repo: string, branch: string, path: string): string {
   return `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${path}`;
 }
-
-export function GetGithubClientId(): string {
-  const junoEndpoint = userContext.features.junoEndpoint ?? configContext.JUNO_ENDPOINT;
-  if (
-    junoEndpoint === JunoEndpoints.Test ||
-    junoEndpoint === JunoEndpoints.Test2 ||
-    junoEndpoint === JunoEndpoints.Test3
-  ) {
-    return configContext.GITHUB_TEST_ENV_CLIENT_ID;
-  }
-  return configContext.GITHUB_CLIENT_ID;
-}

src/hooks/useDatabaseAccounts.tsx

@@ -1,7 +1,6 @@
 import useSWR from "swr";
 import { configContext } from "../ConfigContext";
 import { DatabaseAccount } from "../Contracts/DataModels";
-import { userContext } from "../UserContext";
 
 interface AccountListResult {
   nextLink: string;
@@ -15,8 +14,8 @@ export async function fetchDatabaseAccounts(subscriptionId: string, accessToken:
   headers.append("Authorization", bearer);
 
   let accounts: Array<DatabaseAccount> = [];
-  const apiVersion = userContext.features.enableThroughputCap ? "2021-10-15-preview" : "2021-06-15";
-  let nextLink = `${configContext.ARM_ENDPOINT}/subscriptions/${subscriptionId}/providers/Microsoft.DocumentDB/databaseAccounts?api-version=${apiVersion}`;
+
+  let nextLink = `${configContext.ARM_ENDPOINT}/subscriptions/${subscriptionId}/providers/Microsoft.DocumentDB/databaseAccounts?api-version=2021-06-15`;
 
   while (nextLink) {
     const response: Response = await fetch(nextLink, { headers });

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,14 +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.NotebooksDownBanner) !== -1) {
-      userContext.features.notebooksDownBanner = true;
+    if (inputs.flights.indexOf(Flights.Phoenix) !== -1) {
+      userContext.features.phoenix = true;
     }
   }
 }

src/hooks/useTabs.ts

@@ -1,7 +1,5 @@
 import create, { UseStore } from "zustand";
 import * as ViewModels from "../Contracts/ViewModels";
-import { CollectionTabKind } from "../Contracts/ViewModels";
-import NotebookTabV2 from "../Explorer/Tabs/NotebookV2Tab";
 import TabsBase from "../Explorer/Tabs/TabsBase";
 
 interface TabsState {
@@ -14,7 +12,6 @@ interface TabsState {
   refreshActiveTab: (comparator: (tab: TabsBase) => boolean) => void;
   closeTabsByComparator: (comparator: (tab: TabsBase) => boolean) => void;
   closeTab: (tab: TabsBase) => void;
-  closeAllNotebookTabs: (hardClose: boolean) => void;
 }
 
 export const useTabs: UseStore<TabsState> = create((set, get) => ({
@@ -81,31 +78,4 @@ export const useTabs: UseStore<TabsState> = create((set, get) => ({
 
     set({ openedTabs: updatedTabs });
   },
-  closeAllNotebookTabs: (hardClose): void => {
-    const isNotebook = (tabKind: CollectionTabKind): boolean => {
-      if (
-        tabKind === CollectionTabKind.Notebook ||
-        tabKind === CollectionTabKind.NotebookV2 ||
-        tabKind === CollectionTabKind.SchemaAnalyzer ||
-        tabKind === CollectionTabKind.Terminal
-      ) {
-        return true;
-      }
-      return false;
-    };
-
-    const tabList = get().openedTabs;
-    if (tabList && tabList.length > 0) {
-      tabList.forEach((tab: NotebookTabV2) => {
-        const tabKind: CollectionTabKind = tab.tabKind;
-        if (tabKind && isNotebook(tabKind)) {
-          tab.onCloseTabButtonClick(hardClose);
-        }
-      });
-
-      if (get().openedTabs.length === 0) {
-        set({ activeTab: undefined });
-      }
-    }
-  },
 }));