fixed eslint of TableDataClient file

2025-12-23 02:41:39 +00:00 · 2021-10-20 16:31:47 +05:30
67 changed files with 287 additions and 1080 deletions
--- a/.eslintignore
+++ b/.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
--- a/less/documentDB.less
+++ b/less/documentDB.less
@@ -2077,7 +2077,7 @@ a:link {
 .resourceTreeAndTabs {
  display: flex;
  flex: 1 1 auto;
-  overflow-x: clip;
+  overflow-x: auto;
  overflow-y: auto;
  height: 100%;
 }
@@ -2245,7 +2245,7 @@ a:link {
 }

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

 .refreshColHeader:hover {
@@ -2869,31 +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;
+    .pageOptionsPart {
+      padding-bottom: @MediumSpace;
+    }
  }
 }

--- a/package-lock.json
+++ b/package-lock.json
@@ -6326,8 +6326,8 @@
    },
    "@webpack-cli/serve": {
      "version": "1.5.2",
-      "resolved": "https://msazure.pkgs.visualstudio.com/_packaging/AzurePortal/npm/registry/@webpack-cli/serve/-/serve-1.5.2.tgz",
-      "integrity": "sha1-6lhLY3/2PFpHf28hYEtaIFtyyew=",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz",
+      "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==",
      "dev": true
    },
    "@xtuc/ieee754": {
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -97,7 +97,6 @@ export class Flights {
  public static readonly PartitionKeyTest = "partitionkeytest";
  public static readonly PKPartitionKeyTest = "pkpartitionkeytest";
  public static readonly Phoenix = "phoenix";
-  public static readonly NotebooksDownBanner = "notebooksdownbanner";
 }

 export class AfecFeatures {
@@ -344,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 =
@@ -362,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 = 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. To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends.";
-  public static newNotebookModalTitle = "Create notebook in temporary workspace";
-  public static newNotebookUploadModalTitle = "Upload notebook to temporary workspace";
+  public static 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 =
@@ -412,11 +401,3 @@ export class TerminalQueryParams {
  public static readonly SubscriptionId = "subscriptionId";
  public static readonly TerminalEndpoint = "terminalEndpoint";
 }
-
-export class JunoEndpoints {
-  public static readonly Test = "https://juno-test.documents-dev.windows-int.net";
-  public static readonly Test2 = "https://juno-test2.documents-dev.windows-int.net";
-  public static readonly Test3 = "https://juno-test3.documents-dev.windows-int.net";
-  public static readonly Prod = "https://tools.cosmos.azure.com";
-  public static readonly Stage = "https://tools-staging.cosmos.azure.com";
-}
--- a/src/ConfigContext.ts
+++ b/src/ConfigContext.ts
@@ -1,5 +1,3 @@
-import { JunoEndpoints } from "Common/Constants";
-
 export enum Platform {
  Portal = "Portal",
  Hosted = "Hosted",
@@ -25,7 +23,6 @@ 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.
  hostedExplorerURL: string;
  armAPIVersion?: string;
@@ -55,16 +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",
  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",
  ],
 };
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -1,4 +1,4 @@
-import { ConnectionStatusType, ContainerStatusType } from "../Common/Constants";
+import { ConnectionStatusType } from "../Common/Constants";

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

 export interface DatabaseAccountResponseLocation {
@@ -428,36 +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 {
-  subscriptionId: string;
-  resourceGroup: string;
-  dbAccountName: string;
-  cosmosEndpoint: string;
-}
-
-export interface IContainerData {
-  dbAccountName: string;
-  forwardingId: string;
-}
-
-export interface IResponse<T> {
-  status: number;
-  data: T;
-}
-
-export interface IPhoenixConnectionInfoResult {
-  readonly notebookAuthToken?: string;
-  readonly notebookServerUrl?: string;
-  readonly forwardingId?: string;
 }

 export interface NotebookWorkspaceFeedResponse {
--- a/src/Explorer/Controls/Dialog.tsx
+++ b/src/Explorer/Controls/Dialog.tsx
@@ -13,6 +13,7 @@ import {
  Link,
  PrimaryButton,
  ProgressIndicator,
+  Text,
  TextField,
 } from "@fluentui/react";
 import React, { FC } from "react";
@@ -196,7 +197,7 @@ export const Dialog: FC = () => {
          {linkProps.linkText} <FontIcon iconName="NavigateExternalInline" />
        </Link>
      )}
-      {contentHtml}
+      {contentHtml && <Text>{contentHtml}</Text>}
      {progressIndicatorProps && <ProgressIndicator {...progressIndicatorProps} />}
      <DialogFooter>
        <PrimaryButton {...primaryButtonProps} />
--- a/src/Explorer/Controls/GitHub/AddRepoComponent.tsx
+++ b/src/Explorer/Controls/GitHub/AddRepoComponent.tsx
@@ -1,14 +1,14 @@
 import { DefaultButton, IButtonProps, ITextFieldProps, TextField } from "@fluentui/react";
 import * as React from "react";
 import * as Constants from "../../../Common/Constants";
-import * as UrlUtility from "../../../Common/UrlUtility";
-import { IGitHubRepo } from "../../../GitHub/GitHubClient";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
-import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
-import * as GitHubUtils from "../../../Utils/GitHubUtils";
-import Explorer from "../../Explorer";
 import { RepoListItem } from "./GitHubReposComponent";
 import { ChildrenMargin } from "./GitHubStyleConstants";
+import * as GitHubUtils from "../../../Utils/GitHubUtils";
+import { IGitHubRepo } from "../../../GitHub/GitHubClient";
+import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
+import * as UrlUtility from "../../../Common/UrlUtility";
+import Explorer from "../../Explorer";

 export interface AddRepoComponentProps {
  container: Explorer;
@@ -27,6 +27,7 @@ export class AddRepoComponent extends React.Component<AddRepoComponentProps, Add
  private static readonly ButtonText = "Add";
  private static readonly TextFieldPlaceholder = "https://github.com/owner/repo/tree/branch";
  private static readonly TextFieldErrorMessage = "Invalid url";
+  private static readonly DefaultBranchName = "master";

  constructor(props: AddRepoComponentProps) {
    super(props);
@@ -77,7 +78,7 @@ export class AddRepoComponent extends React.Component<AddRepoComponentProps, Add
    });
    let enteredUrl = this.state.textFieldValue;
    if (enteredUrl.indexOf("/tree/") === -1) {
-      enteredUrl = UrlUtility.createUri(enteredUrl, `tree/`);
+      enteredUrl = UrlUtility.createUri(enteredUrl, `tree/${AddRepoComponent.DefaultBranchName}`);
    }

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

        TelemetryProcessor.traceSuccess(
--- a/src/Explorer/Controls/GitHub/ReposListComponent.tsx
+++ b/src/Explorer/Controls/GitHub/ReposListComponent.tsx
@@ -24,11 +24,11 @@ import { RepoListItem } from "./GitHubReposComponent";
 import {
  BranchesDropdownCheckboxStyles,
  BranchesDropdownOptionContainerStyle,
-  BranchesDropdownStyles,
-  BranchesDropdownWidth,
-  ReposListBranchesColumnWidth,
  ReposListCheckboxStyles,
  ReposListRepoColumnMinWidth,
+  ReposListBranchesColumnWidth,
+  BranchesDropdownWidth,
+  BranchesDropdownStyles,
 } from "./GitHubStyleConstants";

 export interface ReposListComponentProps {
@@ -44,7 +44,6 @@ export interface BranchesProps {
  lastPageInfo?: IGitHubPageInfo;
  hasMore: boolean;
  isLoading: boolean;
-  defaultBranchName: string;
  loadMore: () => void;
 }

@@ -65,7 +64,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
  private static readonly BranchesColumnName = "Branches";
  private static readonly LoadingText = "Loading...";
  private static readonly LoadMoreText = "Load more";
-  private static readonly DefaultBranchNames = "master/main";
+  private static readonly DefaultBranchName = "master";
  private static readonly FooterIndex = -1;

  public render(): JSX.Element {
@@ -156,10 +155,6 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
    }

    const branchesProps = this.props.branchesProps[GitHubUtils.toRepoFullName(item.repo.owner, item.repo.name)];
-    if (item.branches.length === 0 && branchesProps.defaultBranchName) {
-      item.branches = [{ name: branchesProps.defaultBranchName }];
-    }
-
    const options: IDropdownOption[] = branchesProps.branches.map((branch) => ({
      key: branch.name,
      text: branch.name,
@@ -203,7 +198,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
    const dropdownProps: IDropdownProps = {
      styles: BranchesDropdownStyles,
      options: [],
-      placeholder: ReposListComponent.DefaultBranchNames,
+      placeholder: ReposListComponent.DefaultBranchName,
      disabled: true,
    };

@@ -277,7 +272,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
      styles: ReposListCheckboxStyles,
      onChange: () => {
        const repoListItem = { ...item };
-        repoListItem.branches = [];
+        repoListItem.branches = [{ name: ReposListComponent.DefaultBranchName }];
        this.props.pinRepo(repoListItem);
      },
    };
--- a/src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx
+++ b/src/Explorer/Controls/Notebook/NotebookTerminalComponent.test.tsx
@@ -35,19 +35,16 @@ const testCassandraAccount: DataModels.DatabaseAccount = {
 const testNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
  authToken: "authToken",
  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com",
-  forwardingId: "Id",
 };

 const testMongoNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
  authToken: "authToken",
  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/mongo",
-  forwardingId: "Id",
 };

 const testCassandraNotebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo = {
  authToken: "authToken",
  notebookServerEndpoint: "https://testNotebookServerEndpoint.azure.com/cassandra",
-  forwardingId: "Id",
 };

 describe("NotebookTerminalComponent", () => {
--- a/src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
+++ b/src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx
@@ -53,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,
--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -1,5 +1,4 @@
 import { IPivotItemProps, IPivotProps, Pivot, PivotItem } from "@fluentui/react";
-import { useDatabases } from "Explorer/useDatabases";
 import * as React from "react";
 import DiscardIcon from "../../../../images/discard.svg";
 import SaveIcon from "../../../../images/save-cosmos.svg";
@@ -72,7 +71,6 @@ export interface SettingsComponentState {
  wasAutopilotOriginallySet: boolean;
  isScaleSaveable: boolean;
  isScaleDiscardable: boolean;
-  throughputError: string;

  timeToLive: TtlType;
  timeToLiveBaseline: TtlType;
@@ -126,7 +124,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
  private changeFeedPolicyVisible: boolean;
  private isFixedContainer: boolean;
  private shouldShowIndexingPolicyEditor: boolean;
-  private totalThroughputUsed: number;
  public mongoDBCollectionResource: MongoDBCollectionResource;

  constructor(props: SettingsComponentProps) {
@@ -158,7 +155,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      wasAutopilotOriginallySet: false,
      isScaleSaveable: false,
      isScaleDiscardable: false,
-      throughputError: undefined,

      timeToLive: undefined,
      timeToLiveBaseline: undefined,
@@ -212,11 +208,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
        return true;
      },
    };
-
-    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-    if (throughputCap && throughputCap !== -1) {
-      this.calculateTotalThroughputUsed();
-    }
  }

  componentDidMount(): void {
@@ -263,10 +254,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      return false;
    }

-    if (this.state.throughputError) {
-      return false;
-    }
-
    return (
      this.state.isScaleSaveable ||
      this.state.isSubSettingsSaveable ||
@@ -494,26 +481,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
  private onMongoIndexingPolicyDiscardableChange = (isMongoIndexingPolicyDiscardable: boolean): void =>
    this.setState({ isMongoIndexingPolicyDiscardable });

-  private calculateTotalThroughputUsed = (): void => {
-    this.totalThroughputUsed = 0;
-    (useDatabases.getState().databases || []).forEach(async (database) => {
-      if (database.offer()) {
-        const dbThroughput = database.offer().autoscaleMaxThroughput || database.offer().manualThroughput;
-        this.totalThroughputUsed += dbThroughput;
-      }
-
-      (database.collections() || []).forEach(async (collection) => {
-        if (collection.offer()) {
-          const colThroughput = collection.offer().autoscaleMaxThroughput || collection.offer().manualThroughput;
-          this.totalThroughputUsed += colThroughput;
-        }
-      });
-    });
-
-    const numberOfRegions = userContext.databaseAccount?.properties.locations?.length || 1;
-    this.totalThroughputUsed *= numberOfRegions;
-  };
-
  public getAnalyticalStorageTtl = (): number => {
    if (this.isAnalyticalStorageEnabled) {
      if (this.state.analyticalStorageTtlSelection === TtlType.On) {
@@ -676,31 +643,10 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
    return buttons;
  };

-  private onMaxAutoPilotThroughputChange = (newThroughput: number): void => {
-    let throughputError = "";
-    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-    const numberOfRegions = userContext.databaseAccount?.properties.locations?.length || 1;
-    const throughputDelta = (newThroughput - this.offer.autoscaleMaxThroughput) * numberOfRegions;
-    if (throughputCap && throughputCap !== -1 && throughputCap - this.totalThroughputUsed < throughputDelta) {
-      throughputError = `Your account is currently configured with a total throughput limit of ${throughputCap} RU/s. This update isn't possible because it would increase the total throughput to ${
-        this.totalThroughputUsed + throughputDelta
-      } RU/s. Change total throughput limit in cost management.`;
-    }
-    this.setState({ autoPilotThroughput: newThroughput, throughputError });
-  };
+  private onMaxAutoPilotThroughputChange = (newThroughput: number): void =>
+    this.setState({ autoPilotThroughput: newThroughput });

-  private onThroughputChange = (newThroughput: number): void => {
-    let throughputError = "";
-    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-    const numberOfRegions = userContext.databaseAccount?.properties.locations?.length || 1;
-    const throughputDelta = (newThroughput - this.offer.manualThroughput) * numberOfRegions;
-    if (throughputCap && throughputCap !== -1 && throughputCap - this.totalThroughputUsed < throughputDelta) {
-      throughputError = `Your account is currently configured with a total throughput limit of ${throughputCap} RU/s. This update isn't possible because it would increase the total throughput to ${
-        this.totalThroughputUsed + throughputDelta
-      } RU/s. Change total throughput limit in cost management.`;
-    }
-    this.setState({ throughput: newThroughput, throughputError });
-  };
+  private onThroughputChange = (newThroughput: number): void => this.setState({ throughput: newThroughput });

  private onAutoPilotSelected = (isAutoPilotSelected: boolean): void =>
    this.setState({ isAutoPilotSelected: isAutoPilotSelected });
@@ -947,7 +893,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      onScaleSaveableChange: this.onScaleSaveableChange,
      onScaleDiscardableChange: this.onScaleDiscardableChange,
      initialNotification: this.props.settingsTab.pendingNotification(),
-      throughputError: this.state.throughputError,
    };

    if (!this.isCollectionSettingsTab) {
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx
@@ -36,7 +36,6 @@ export interface ScaleComponentProps {
  onScaleSaveableChange: (isScaleSaveable: boolean) => void;
  onScaleDiscardableChange: (isScaleDiscardable: boolean) => void;
  initialNotification: DataModels.Notification;
-  throughputError?: string;
 }

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

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

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

@@ -26,7 +24,6 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
  showFreeTierExceedThroughputTooltip,
  setThroughputValue,
  setIsAutoscale,
-  setIsThroughputCapExceeded,
  isSharded,
  onCostAcknowledgeChange,
 }: ThroughputInputProps) => {
@@ -34,60 +31,10 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
  const [throughput, setThroughput] = useState<number>(AutoPilotUtils.minAutoPilotThroughput);
  const [isCostAcknowledged, setIsCostAcknowledged] = useState<boolean>(false);
  const [throughputError, setThroughputError] = useState<string>("");
-  const [totalThroughputUsed, setTotalThroughputUsed] = useState<number>(0);

  setIsAutoscale(isAutoscaleSelected);
  setThroughputValue(throughput);

-  const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-  const numberOfRegions = userContext.databaseAccount?.properties.locations?.length || 1;
-
-  useEffect(() => {
-    // throughput cap check for the initial state
-    let totalThroughput = 0;
-    (useDatabases.getState().databases || []).forEach((database) => {
-      if (database.offer()) {
-        const dbThroughput = database.offer().autoscaleMaxThroughput || database.offer().manualThroughput;
-        totalThroughput += dbThroughput;
-      }
-
-      (database.collections() || []).forEach((collection) => {
-        if (collection.offer()) {
-          const colThroughput = collection.offer().autoscaleMaxThroughput || collection.offer().manualThroughput;
-          totalThroughput += colThroughput;
-        }
-      });
-    });
-    totalThroughput *= numberOfRegions;
-    setTotalThroughputUsed(totalThroughput);
-
-    if (throughputCap && throughputCap !== -1 && throughputCap - totalThroughput < throughput) {
-      setThroughputError(
-        `Your account is currently configured with a total throughput limit of ${throughputCap} RU/s. This update isn't possible because it would increase the total throughput to ${
-          totalThroughput + throughput * numberOfRegions
-        } RU/s. Change total throughput limit in cost management.`
-      );
-
-      setIsThroughputCapExceeded(true);
-    }
-  }, []);
-
-  const checkThroughputCap = (newThroughput: number): boolean => {
-    if (throughputCap && throughputCap !== -1 && throughputCap - totalThroughputUsed < newThroughput) {
-      setThroughputError(
-        `Your account is currently configured with a total throughput limit of ${throughputCap} RU/s. This update isn't possible because it would increase the total throughput to ${
-          totalThroughputUsed + newThroughput * numberOfRegions
-        } RU/s. Change total throughput limit in cost management.`
-      );
-      setIsThroughputCapExceeded(true);
-      return false;
-    }
-
-    setThroughputError("");
-    setIsThroughputCapExceeded(false);
-    return true;
-  };
-
  const getThroughputLabelText = (): string => {
    let throughputHeaderText: string;
    if (isAutoscaleSelected) {
@@ -113,17 +60,11 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
    const newThroughput = parseInt(newInput);
    setThroughput(newThroughput);
    setThroughputValue(newThroughput);
-
    if (!isSharded && newThroughput > 10000) {
      setThroughputError("Unsharded collections support up to 10,000 RUs");
-      return;
+    } 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);
    }
  };

--- a/src/Explorer/Controls/ThroughputInput/snapshots/ThroughputInput.test.tsx.snap
+++ b/src/Explorer/Controls/ThroughputInput/snapshots/ThroughputInput.test.tsx.snap
@@ -6,7 +6,6 @@ exports[`ThroughputInput Pane should render Default properly 1`] = `
  isSharded={true}
  onCostAcknowledgeChange={[Function]}
  setIsAutoscale={[Function]}
-  setIsThroughputCapExceeded={[Function]}
  setThroughputValue={[Function]}
  showFreeTierExceedThroughputTooltip={true}
 >
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -1,20 +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, 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";
@@ -166,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);
@@ -178,7 +179,6 @@ export default class Explorer {
      useNotebook.getState().setNotebookServerInfo({
        notebookServerEndpoint: userContext.features.notebookServerUrl,
        authToken: userContext.features.notebookServerToken,
-        forwardingId: undefined,
      });
    }

@@ -364,7 +364,6 @@ export default class Explorer {
      useNotebook.getState().setNotebookServerInfo({
        notebookServerEndpoint: userContext.features.notebookServerUrl || connectionInfo.notebookServerEndpoint,
        authToken: userContext.features.notebookServerToken || connectionInfo.authToken,
-        forwardingId: undefined,
      });
    }

@@ -376,12 +375,9 @@ export default class Explorer {
  public async allocateContainer(): Promise<void> {
    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
    const isAllocating = useNotebook.getState().isAllocating;
-    if (
-      isAllocating === false &&
-      (notebookServerInfo === undefined ||
-        (notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined))
-    ) {
+    if (isAllocating === false && notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined) {
      const provisionData = {
+        aadToken: userContext.authorizationToken,
        subscriptionId: userContext.subscriptionId,
        resourceGroup: userContext.resourceGroup,
        dbAccountName: userContext.databaseAccount.name,
@@ -392,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(
@@ -455,14 +428,11 @@ export default class Explorer {
      );
      return;
    }
-    const dialogContent = NotebookUtil.isPhoenixEnabled()
-      ? "Notebooks saved in the temporary workspace will be deleted. Do you want to proceed?"
-      : "This lets you keep your notebook files and the workspace will be restored to default. Proceed anyway?";

    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,
@@ -520,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 (NotebookUtil.isPhoenixEnabled()) {
-        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 (NotebookUtil.isPhoenixEnabled()) {
-        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 (NotebookUtil.isPhoenixEnabled()) {
-        connectionStatus = {
-          status: ConnectionStatusType.Failed,
-        };
-        useNotebook.getState().resetContainerConnection(connectionStatus);
-        useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
-      }
      throw error;
    } finally {
      clearInProgressMessage();
@@ -760,7 +692,7 @@ export default class Explorer {
      throw new Error(`Invalid notebookContentItem: ${notebookContentItem}`);
    }
    if (notebookContentItem.type === NotebookContentItemType.Notebook && NotebookUtil.isPhoenixEnabled()) {
-      await this.allocateContainer();
+      this.allocateContainer();
    }

    const notebookTabs = useTabs
@@ -1084,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 {
@@ -1187,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} />);
@@ -1216,9 +1145,10 @@ export default class Explorer {
  }

  public async handleOpenFileAction(path: string): Promise<void> {
-    if (userContext.features.phoenix) {
-      await this.allocateContainer();
-    } else if (!(await this._containsDefaultNotebookWorkspace(userContext.databaseAccount))) {
+    if (
+      userContext.features.phoenix === false &&
+      !(await this._containsDefaultNotebookWorkspace(userContext.databaseAccount))
+    ) {
      this._openSetupNotebooksPaneForQuickstart();
    }

@@ -1302,11 +1232,15 @@ export default class Explorer {
      ? this.refreshDatabaseForResourceToken()
      : this.refreshAllDatabases();
    await useNotebook.getState().refreshNotebooksEnabledStateForAccount();
-
-    // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
-    const isNotebookEnabled = userContext.features.notebooksDownBanner || userContext.features.phoenix;
+    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(userContext.features.phoenix && isPublicInternetAccessAllowed());
+    useNotebook.getState().setIsShellEnabled(isNotebookEnabled && isPublicInternetAccessAllowed());

    TelemetryProcessor.trace(Action.NotebookEnabled, ActionModifiers.Mark, {
      isNotebookEnabled,
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
@@ -80,7 +80,7 @@ export function createStaticCommandBarButtons(
    }

    notebookButtons.push(createOpenTerminalButton(container));
-    if (selectedNodeState.isConnectedToContainer()) {
+    if (userContext.features.phoenix === false) {
      notebookButtons.push(createNotebookWorkspaceResetButton(container));
    }
    if (
@@ -310,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,
--- a/src/Explorer/Menus/CommandBar/ConnectionStatusComponent.tsx
+++ b/src/Explorer/Menus/CommandBar/ConnectionStatusComponent.tsx
@@ -1,20 +1,8 @@
-import {
-  FocusTrapCallout,
-  FocusZone,
-  FocusZoneTabbableElements,
-  FontWeights,
-  Icon,
-  mergeStyleSets,
-  ProgressIndicator,
-  Stack,
-  Text,
-  TooltipHost,
-} from "@fluentui/react";
-import { useId } from "@fluentui/react-hooks";
-import { ActionButton, DefaultButton } from "@fluentui/react/lib/Button";
+import { Icon, ProgressIndicator, Stack, TooltipHost } from "@fluentui/react";
+import { ActionButton } from "@fluentui/react/lib/Button";
 import * as React from "react";
 import "../../../../less/hostedexplorer.less";
-import { ConnectionStatusType, ContainerStatusType, Notebook } from "../../../Common/Constants";
+import { ConnectionStatusType, Notebook } from "../../../Common/Constants";
 import Explorer from "../../Explorer";
 import { useNotebook } from "../../Notebook/useNotebook";
 import "../CommandBar/ConnectionStatusComponent.less";
@@ -22,33 +10,12 @@ interface Props {
  container: Explorer;
 }
 export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Element => {
-  const connectionInfo = useNotebook((state) => state.connectionInfo);
  const [second, setSecond] = React.useState("00");
  const [minute, setMinute] = React.useState("00");
  const [isActive, setIsActive] = React.useState(false);
  const [counter, setCounter] = React.useState(0);
  const [statusColor, setStatusColor] = React.useState("");
  const [toolTipContent, setToolTipContent] = React.useState("Connect to temporary workspace.");
-  const [isBarDismissed, setIsBarDismissed] = React.useState<boolean>(false);
-  const buttonId = useId("callout-button");
-  const containerInfo = useNotebook((state) => state.containerStatus);
-
-  const styles = mergeStyleSets({
-    callout: {
-      width: 320,
-      padding: "20px 24px",
-    },
-    title: {
-      marginBottom: 12,
-      fontWeight: FontWeights.semilight,
-    },
-    buttons: {
-      display: "flex",
-      justifyContent: "flex-end",
-      marginTop: 20,
-    },
-  });
-
  React.useEffect(() => {
    let intervalId: NodeJS.Timeout;

@@ -68,15 +35,6 @@ export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Ele
    return () => clearInterval(intervalId);
  }, [isActive, counter]);

-  React.useEffect(() => {
-    if (connectionInfo?.status === ConnectionStatusType.Reconnect) {
-      setToolTipContent("Click here to Reconnect to temporary workspace.");
-    } else if (connectionInfo?.status === ConnectionStatusType.Failed) {
-      setStatusColor("status failed is-animating");
-      setToolTipContent("Click here to Reconnect to temporary workspace.");
-    }
-  }, [connectionInfo.status]);
-
  const stopTimer = () => {
    setIsActive(false);
    setCounter(0);
@@ -84,13 +42,15 @@ export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Ele
    setMinute("00");
  };

+  const connectionInfo = useNotebook((state) => state.connectionInfo);
  const memoryUsageInfo = useNotebook((state) => state.memoryUsageInfo);
+
  const totalGB = memoryUsageInfo ? memoryUsageInfo.totalKB / Notebook.memoryGuageToGB : 0;
  const usedGB = totalGB > 0 ? totalGB - memoryUsageInfo.freeKB / Notebook.memoryGuageToGB : 0;

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

  if (connectionInfo && connectionInfo.status === ConnectionStatusType.Connecting && isActive === false) {
-    stopTimer();
    setIsActive(true);
    setStatusColor("status connecting is-animating");
    setToolTipContent("Connecting to temporary workspace.");
@@ -119,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>
  );
 };
--- a/src/Explorer/Notebook/NotebookContainerClient.ts
+++ b/src/Explorer/Notebook/NotebookContainerClient.ts
@@ -1,22 +1,14 @@
 /**
 * 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 {
-  ContainerConnectionInfo,
-  IPhoenixConnectionInfoResult,
-  IProvisionData,
-  IResponse,
-} from "../../Contracts/DataModels";
+import { ContainerConnectionInfo } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
 import { createOrUpdate, destroy } from "../../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
-import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { NotebookUtil } from "./NotebookUtil";
 import { useNotebook } from "./useNotebook";
@@ -24,16 +16,8 @@ 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);
@@ -54,23 +38,10 @@ export class NotebookContainerClient {
   * Heartbeat: each ping schedules another ping
   */
  private scheduleHeartbeat(delayMs: number): void {
-    setTimeout(async () => {
-      try {
-        const memoryUsageInfo = await this.getMemoryUsage();
-        useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo);
-        const notebookServerInfo = useNotebook.getState().notebookServerInfo;
-        if (notebookServerInfo?.notebookServerEndpoint) {
-          this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
-        }
-      } catch (exception) {
-        if (NotebookUtil.isPhoenixEnabled()) {
-          const connectionStatus: ContainerConnectionInfo = {
-            status: ConnectionStatusType.Failed,
-          };
-          useNotebook.getState().resetContainerConnection(connectionStatus);
-          useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
-        }
-      }
+    setTimeout(() => {
+      this.getMemoryUsage()
+        .then((memoryUsageInfo) => useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo))
+        .finally(() => this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs));
    }, delayMs);
  }

@@ -88,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.checkStatus()) {
      const response = await fetch(`${notebookServerEndpoint}api/metrics/memory`, {
        method: "GET",
        headers: {
@@ -128,43 +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();
-    } 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 checkStatus(): boolean {
-    if (NotebookUtil.isPhoenixEnabled()) {
-      if (useNotebook.getState().containerStatus?.status === Constants.ContainerStatusType.Disconnected) {
-        const connectionStatus: ContainerConnectionInfo = {
-          status: ConnectionStatusType.Reconnect,
-        };
-        useNotebook.getState().resetContainerConnection(connectionStatus);
-        useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
-        return false;
-      }
-    }
-    return true;
-  }
-
-  public async resetWorkspace(): Promise<IResponse<IPhoenixConnectionInfoResult>> {
+  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";
@@ -172,23 +123,15 @@ export class NotebookContainerClient {
      return Promise.reject(error);
    }

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

@@ -220,12 +163,4 @@ export class NotebookContainerClient {
      return Promise.reject(error);
    }
  }
-
-  private getHeaders(): HeadersInit {
-    const authorizationHeader = getAuthorizationHeader();
-    return {
-      [authorizationHeader.header]: authorizationHeader.token,
-      [HttpHeaders.contentType]: "application/json",
-    };
-  }
 }
--- a/src/Explorer/Notebook/notebookClientV2.test.ts
+++ b/src/Explorer/Notebook/notebookClientV2.test.ts
@@ -35,7 +35,6 @@ describe("auto start kernel", () => {
        connectionInfo: {
          authToken: "autToken",
          notebookServerEndpoint: "notebookServerEndpoint",
-          forwardingId: "Id",
        },
        databaseAccountName: undefined,
        defaultExperience: undefined,
--- a/src/Explorer/Notebook/useNotebook.ts
+++ b/src/Explorer/Notebook/useNotebook.ts
@@ -7,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";
@@ -36,7 +35,6 @@ interface NotebookState {
  notebookFolderName: string;
  isAllocating: boolean;
  isRefreshed: boolean;
-  containerStatus: ContainerInfo;
  setIsNotebookEnabled: (isNotebookEnabled: boolean) => void;
  setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => void;
  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
@@ -55,9 +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;
 }

 export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
@@ -66,7 +63,6 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
  notebookServerInfo: {
    notebookServerEndpoint: undefined,
    authToken: undefined,
-    forwardingId: undefined,
  },
  sparkClusterConnectionInfo: {
    userName: undefined,
@@ -87,11 +83,6 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
  notebookFolderName: undefined,
  isAllocating: false,
  isRefreshed: false,
-  containerStatus: {
-    status: undefined,
-    durationLeftInMinutes: undefined,
-    notebookServerInfo: undefined,
-  },
  setIsNotebookEnabled: (isNotebookEnabled: boolean) => set({ isNotebookEnabled }),
  setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => set({ isNotebooksEnabledForAccount }),
  setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) =>
@@ -279,17 +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 }),
 }));
--- a/src/Explorer/Panes/AddCollectionPanel.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel.tsx
@@ -11,7 +11,7 @@ import {
  Separator,
  Stack,
  Text,
-  TooltipHost
+  TooltipHost,
 } from "@fluentui/react";
 import * as Constants from "Common/Constants";
 import { createCollection } from "Common/dataAccess/createCollection";
@@ -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)}
                  />
                )}
@@ -468,8 +463,8 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                directionalHint={DirectionalHint.bottomLeftEdge}
                content={`You can optionally provision dedicated throughput for a ${getCollectionName().toLocaleLowerCase()} within a database that has throughput
                  provisioned. This dedicated throughput amount will not be shared with other ${getCollectionName(
-                  true
-                ).toLocaleLowerCase()} in the database and
+                    true
+                  ).toLocaleLowerCase()} in the database and
                  does not count towards the throughput you provisioned for the database. This throughput amount will be
                  billed in addition to the throughput amount you provisioned at the database level.`}
              >
@@ -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>
@@ -1019,10 +1011,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
    const partitionKeyVersion = this.state.useHashV2 ? 2 : undefined;
    const partitionKey: DataModels.PartitionKey = partitionKeyString
      ? {
-        paths: [partitionKeyString],
-        kind: "Hash",
-        version: partitionKeyVersion,
-      }
+          paths: [partitionKeyString],
+          kind: "Hash",
+          version: partitionKeyVersion,
+        }
      : undefined;

    const indexingPolicy: DataModels.IndexingPolicy = this.state.enableIndexing
--- a/src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx
+++ b/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)}
          />
        )}
--- a/src/Explorer/Panes/AddDatabasePanel/snapshots/AddDatabasePanel.test.tsx.snap
+++ b/src/Explorer/Panes/AddDatabasePanel/snapshots/AddDatabasePanel.test.tsx.snap
@@ -4,7 +4,6 @@ exports[`AddDatabasePane Pane should render Default properly 1`] = `
 <RightPaneForm
  formError=""
  isExecuting={false}
-  isSubmitButtonDisabled={false}
  onSubmit={[Function]}
  submitButtonText="OK"
 >
@@ -93,7 +92,6 @@ exports[`AddDatabasePane Pane should render Default properly 1`] = `
      isSharded={true}
      onCostAcknowledgeChange={[Function]}
      setIsAutoscale={[Function]}
-      setIsThroughputCapExceeded={[Function]}
      setThroughputValue={[Function]}
    />
  </div>
--- a/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
+++ b/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
@@ -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)}
            />
          )}
@@ -337,7 +334,6 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
            isSharded={false}
            setThroughputValue={(throughput: number) => (tableThroughput = throughput)}
            setIsAutoscale={(isAutoscale: boolean) => (isTableAutoscale = isAutoscale)}
-            setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}
            onCostAcknowledgeChange={(isAcknowledged: boolean) => (isCostAcknowledged = isAcknowledged)}
          />
        )}
--- a/src/Explorer/Panes/DeleteCollectionConfirmationPane/snapshots/DeleteCollectionConfirmationPane.test.tsx.snap
+++ b/src/Explorer/Panes/DeleteCollectionConfirmationPane/snapshots/DeleteCollectionConfirmationPane.test.tsx.snap
@@ -369,21 +369,18 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
      </div>
      <PanelFooterComponent
        buttonLabel="OK"
-        isButtonDisabled={false}
      >
        <div
          className="panelFooter"
        >
          <CustomizedPrimaryButton
            ariaLabel="OK"
-            disabled={false}
            id="sidePanelOkButton"
            text="OK"
            type="submit"
          >
            <PrimaryButton
              ariaLabel="OK"
-              disabled={false}
              id="sidePanelOkButton"
              text="OK"
              theme={
@@ -663,7 +660,6 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
            >
              <CustomizedDefaultButton
                ariaLabel="OK"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -945,7 +941,6 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
              >
                <DefaultButton
                  ariaLabel="OK"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -1228,7 +1223,6 @@ exports[`Delete Collection Confirmation Pane submit() should call delete collect
                  <BaseButton
                    ariaLabel="OK"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/ExecuteSprocParamsPane/snapshots/ExecuteSprocParamsPane.test.tsx.snap
+++ b/src/Explorer/Panes/ExecuteSprocParamsPane/snapshots/ExecuteSprocParamsPane.test.tsx.snap
@@ -5305,21 +5305,18 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
      </div>
      <PanelFooterComponent
        buttonLabel="Execute"
-        isButtonDisabled={false}
      >
        <div
          className="panelFooter"
        >
          <CustomizedPrimaryButton
            ariaLabel="Execute"
-            disabled={false}
            id="sidePanelOkButton"
            text="Execute"
            type="submit"
          >
            <PrimaryButton
              ariaLabel="Execute"
-              disabled={false}
              id="sidePanelOkButton"
              text="Execute"
              theme={
@@ -5599,7 +5596,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="Execute"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -5881,7 +5877,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
              >
                <DefaultButton
                  ariaLabel="Execute"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -6164,7 +6159,6 @@ exports[`Excute Sproc Param Pane should render Default properly 1`] = `
                  <BaseButton
                    ariaLabel="Execute"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/GitHubReposPanel/GitHubReposPanel.tsx
+++ b/src/Explorer/Panes/GitHubReposPanel/GitHubReposPanel.tsx
@@ -35,9 +35,6 @@ interface IGitHubReposPanelState {
 }
 export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IGitHubReposPanelState> {
  private static readonly PageSize = 30;
-  private static readonly MasterBranchName = "master";
-  private static readonly MainBranchName = "main";
-
  private isAddedRepo = false;
  private gitHubClient: GitHubClient;
  private junoClient: JunoClient;
@@ -119,8 +116,6 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
        if (response.status !== HttpStatusCodes.OK) {
          throw new Error(`Received HTTP ${response.status} when saving pinned repos`);
        }
-
-        this.props.explorer.notebookManager?.refreshPinnedRepos();
      } catch (error) {
        handleError(error, "GitHubReposPane/submit", "Failed to save pinned repos");
      }
@@ -212,14 +207,6 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
      if (response.data) {
        branchesProps.branches = branchesProps.branches.concat(response.data);
        branchesProps.lastPageInfo = response.pageInfo;
-        branchesProps.defaultBranchName = branchesProps.branches[0].name;
-        const defaultbranchName = branchesProps.branches.find(
-          (branch) =>
-            branch.name === GitHubReposPanel.MasterBranchName || branch.name === GitHubReposPanel.MainBranchName
-        )?.name;
-        if (defaultbranchName) {
-          branchesProps.defaultBranchName = defaultbranchName;
-        }
      }
    } catch (error) {
      handleError(error, "GitHubReposPane/loadMoreBranches", "Failed to fetch branches");
@@ -311,17 +298,6 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
    const existingRepo = this.pinnedReposProps.repos.find((repo) => repo.key === item.key);
    if (existingRepo) {
      existingRepo.branches = item.branches;
-      this.setState({
-        gitHubReposState: {
-          ...this.state.gitHubReposState,
-          reposListProps: {
-            ...this.state.gitHubReposState.reposListProps,
-            pinnedReposProps: {
-              repos: this.pinnedReposProps.repos,
-            },
-          },
-        },
-      });
    } else {
      this.pinnedReposProps.repos = [...this.pinnedReposProps.repos, item];
    }
@@ -398,7 +374,6 @@ export class GitHubReposPanel extends React.Component<IGitHubReposPanelProps, IG
          lastPageInfo: undefined,
          hasMore: true,
          isLoading: true,
-          defaultBranchName: undefined,
          loadMore: (): Promise<void> => this.loadMoreBranches(item.repo),
        };
        this.loadMoreBranches(item.repo);
--- a/src/Explorer/Panes/GitHubReposPanel/snapshots/GitHubReposPanel.test.tsx.snap
+++ b/src/Explorer/Panes/GitHubReposPanel/snapshots/GitHubReposPanel.test.tsx.snap
@@ -23,13 +23,7 @@ exports[`GitHub Repos Panel should render Default properly 1`] = `
            "isTabsContentExpanded": [Function],
            "onRefreshDatabasesKeyPress": [Function],
            "onRefreshResourcesClick": [Function],
-            "phoenixClient": PhoenixClient {
-              "retryOptions": Object {
-                "maxTimeout": 5000,
-                "minTimeout": 5000,
-                "retries": 3,
-              },
-            },
+            "phoenixClient": PhoenixClient {},
            "provideFeedbackEmail": [Function],
            "queriesClient": QueriesClient {
              "container": [Circular],
--- a/src/Explorer/Panes/PanelFooterComponent.tsx
+++ b/src/Explorer/Panes/PanelFooterComponent.tsx
@@ -3,20 +3,12 @@ import React from "react";

 export interface PanelFooterProps {
  buttonLabel: string;
-  isButtonDisabled?: boolean;
 }

 export const PanelFooterComponent: React.FunctionComponent<PanelFooterProps> = ({
  buttonLabel,
-  isButtonDisabled,
 }: PanelFooterProps): JSX.Element => (
  <div className="panelFooter">
-    <PrimaryButton
-      type="submit"
-      id="sidePanelOkButton"
-      text={buttonLabel}
-      ariaLabel={buttonLabel}
-      disabled={!!isButtonDisabled}
-    />
+    <PrimaryButton type="submit" id="sidePanelOkButton" text={buttonLabel} ariaLabel={buttonLabel} />
  </div>
 );
--- a/src/Explorer/Panes/RightPaneForm/RightPaneForm.tsx
+++ b/src/Explorer/Panes/RightPaneForm/RightPaneForm.tsx
@@ -9,7 +9,6 @@ export interface RightPaneFormProps {
  onSubmit: () => void;
  submitButtonText: string;
  isSubmitButtonHidden?: boolean;
-  isSubmitButtonDisabled?: boolean;
  children?: ReactNode;
 }

@@ -19,7 +18,6 @@ export const RightPaneForm: FunctionComponent<RightPaneFormProps> = ({
  onSubmit,
  submitButtonText,
  isSubmitButtonHidden = false,
-  isSubmitButtonDisabled = false,
  children,
 }: RightPaneFormProps) => {
  const handleOnSubmit = (event: React.FormEvent<HTMLFormElement>) => {
@@ -32,9 +30,7 @@ export const RightPaneForm: FunctionComponent<RightPaneFormProps> = ({
      <form className="panelFormWrapper" onSubmit={handleOnSubmit}>
        {formError && <PanelInfoErrorComponent messageType="error" message={formError} showErrorDetails={true} />}
        {children}
-        {!isSubmitButtonHidden && (
-          <PanelFooterComponent buttonLabel={submitButtonText} isButtonDisabled={isSubmitButtonDisabled} />
-        )}
+        {!isSubmitButtonHidden && <PanelFooterComponent buttonLabel={submitButtonText} />}
      </form>
      {isExecuting && <PanelLoadingScreen />}
    </>
--- a/src/Explorer/Panes/RightPaneForm/snapshots/RightPaneForm.test.tsx.snap
+++ b/src/Explorer/Panes/RightPaneForm/snapshots/RightPaneForm.test.tsx.snap
@@ -14,21 +14,18 @@ exports[`Right Pane Form should render Default properly 1`] = `
  >
    <PanelFooterComponent
      buttonLabel="Load"
-      isButtonDisabled={false}
    >
      <div
        className="panelFooter"
      >
        <CustomizedPrimaryButton
          ariaLabel="Load"
-          disabled={false}
          id="sidePanelOkButton"
          text="Load"
          type="submit"
        >
          <PrimaryButton
            ariaLabel="Load"
-            disabled={false}
            id="sidePanelOkButton"
            text="Load"
            theme={
@@ -308,7 +305,6 @@ exports[`Right Pane Form should render Default properly 1`] = `
          >
            <CustomizedDefaultButton
              ariaLabel="Load"
-              disabled={false}
              id="sidePanelOkButton"
              onRenderDescription={[Function]}
              primary={true}
@@ -590,7 +586,6 @@ exports[`Right Pane Form should render Default properly 1`] = `
            >
              <DefaultButton
                ariaLabel="Load"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -873,7 +868,6 @@ exports[`Right Pane Form should render Default properly 1`] = `
                <BaseButton
                  ariaLabel="Load"
                  baseClassName="ms-Button"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -1,4 +1,4 @@
-import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton, Stack, Text } from "@fluentui/react";
+import { Checkbox, ChoiceGroup, IChoiceGroupOption, SpinButton } from "@fluentui/react";
 import * as Constants from "Common/Constants";
 import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { configContext } from "ConfigContext";
@@ -113,44 +113,20 @@ export const SettingsPane: FunctionComponent = () => {
  const handleOnPageOptionChange = (ev: React.FormEvent<HTMLInputElement>, option: IChoiceGroupOption): void => {
    setPageOption(option.key);
  };
-
-  const choiceButtonStyles = {
-    flexContainer: [
-      {
-        selectors: {
-          ".ms-ChoiceField-wrapper label": {
-            fontSize: 12,
-            paddingTop: 0,
-          },
-          ".ms-ChoiceField": {
-            marginTop: 0,
-          },
-        },
-      },
-    ],
-  };
  return (
    <RightPaneForm {...genericPaneProps}>
      <div className="paneMainContent">
        {shouldShowQueryPageOptions && (
          <div className="settingsSection">
-            <div className="settingsSectionPart">
-              <Stack horizontal>
-                <Text id="pageOptions" className="settingsSectionLabel" variant="small">
-                  Page options
-                </Text>
+            <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>
-              </Stack>
-              <ChoiceGroup
-                ariaLabelledBy="pageOptions"
-                selectedKey={pageOption}
-                options={pageOptionList}
-                styles={choiceButtonStyles}
-                onChange={handleOnPageOptionChange}
-              />
+              </div>
+              <ChoiceGroup selectedKey={pageOption} options={pageOptionList} onChange={handleOnPageOptionChange} />
            </div>
            <div className="tabs settingsSectionPart">
              {isCustomPageOptionSelected() && (
--- a/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
+++ b/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
@@ -14,24 +14,17 @@ exports[`Settings Pane should render Default properly 1`] = `
      className="settingsSection"
    >
      <div
-        className="settingsSectionPart"
+        className="settingsSectionPart pageOptionsPart"
      >
-        <Stack
-          horizontal={true}
+        <div
+          className="settingsSectionLabel"
        >
-          <Text
-            className="settingsSectionLabel"
-            id="pageOptions"
-            variant="small"
-          >
-            Page options
-          </Text>
+          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>
-        </Stack>
+        </div>
        <StyledChoiceGroup
-          ariaLabelledBy="pageOptions"
          onChange={[Function]}
          options={
            Array [
@@ -46,23 +39,6 @@ exports[`Settings Pane should render Default properly 1`] = `
            ]
          }
          selectedKey="custom"
-          styles={
-            Object {
-              "flexContainer": Array [
-                Object {
-                  "selectors": Object {
-                    ".ms-ChoiceField": Object {
-                      "marginTop": 0,
-                    },
-                    ".ms-ChoiceField-wrapper label": Object {
-                      "fontSize": 12,
-                      "paddingTop": 0,
-                    },
-                  },
-                },
-              ],
-            }
-          }
        />
      </div>
      <div
--- a/src/Explorer/Panes/StringInputPane/snapshots/StringInputPane.test.tsx.snap
+++ b/src/Explorer/Panes/StringInputPane/snapshots/StringInputPane.test.tsx.snap
@@ -13,13 +13,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
      "isTabsContentExpanded": [Function],
      "onRefreshDatabasesKeyPress": [Function],
      "onRefreshResourcesClick": [Function],
-      "phoenixClient": PhoenixClient {
-        "retryOptions": Object {
-          "maxTimeout": 5000,
-          "minTimeout": 5000,
-          "retries": 3,
-        },
-      },
+      "phoenixClient": PhoenixClient {},
      "provideFeedbackEmail": [Function],
      "queriesClient": QueriesClient {
        "container": [Circular],
@@ -681,21 +675,18 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
      </div>
      <PanelFooterComponent
        buttonLabel="Create"
-        isButtonDisabled={false}
      >
        <div
          className="panelFooter"
        >
          <CustomizedPrimaryButton
            ariaLabel="Create"
-            disabled={false}
            id="sidePanelOkButton"
            text="Create"
            type="submit"
          >
            <PrimaryButton
              ariaLabel="Create"
-              disabled={false}
              id="sidePanelOkButton"
              text="Create"
              theme={
@@ -975,7 +966,6 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="Create"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -1257,7 +1247,6 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
              >
                <DefaultButton
                  ariaLabel="Create"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -1540,7 +1529,6 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                  <BaseButton
                    ariaLabel="Create"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/Tables/TableQuerySelectPanel/snapshots/TableQuerySelectPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/TableQuerySelectPanel/snapshots/TableQuerySelectPanel.test.tsx.snap
@@ -1262,21 +1262,18 @@ exports[`Table query select Panel should render Default properly 1`] = `
      </div>
      <PanelFooterComponent
        buttonLabel="OK"
-        isButtonDisabled={false}
      >
        <div
          className="panelFooter"
        >
          <CustomizedPrimaryButton
            ariaLabel="OK"
-            disabled={false}
            id="sidePanelOkButton"
            text="OK"
            type="submit"
          >
            <PrimaryButton
              ariaLabel="OK"
-              disabled={false}
              id="sidePanelOkButton"
              text="OK"
              theme={
@@ -1556,7 +1553,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="OK"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -1838,7 +1834,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
              >
                <DefaultButton
                  ariaLabel="OK"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -2121,7 +2116,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
                  <BaseButton
                    ariaLabel="OK"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx
+++ b/src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx
@@ -33,7 +33,6 @@ const {
  Inet,
  Smallint,
  Tinyint,
-  Timestamp,
 } = TableConstants.CassandraType;
 export const cassandraOptions = [
  { key: Text, text: Text },
@@ -51,7 +50,6 @@ export const cassandraOptions = [
  { key: Inet, text: Inet },
  { key: Smallint, text: Smallint },
  { key: Tinyint, text: Tinyint },
-  { key: Timestamp, text: Timestamp },
 ];

 export const imageProps: IImageProps = {
--- a/src/Explorer/Panes/Tables/snapshots/AddTableEntityPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/snapshots/AddTableEntityPanel.test.tsx.snap
@@ -356,21 +356,18 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
      </div>
      <PanelFooterComponent
        buttonLabel="Add Entity"
-        isButtonDisabled={false}
      >
        <div
          className="panelFooter"
        >
          <CustomizedPrimaryButton
            ariaLabel="Add Entity"
-            disabled={false}
            id="sidePanelOkButton"
            text="Add Entity"
            type="submit"
          >
            <PrimaryButton
              ariaLabel="Add Entity"
-              disabled={false}
              id="sidePanelOkButton"
              text="Add Entity"
              theme={
@@ -650,7 +647,6 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="Add Entity"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -932,7 +928,6 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
              >
                <DefaultButton
                  ariaLabel="Add Entity"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -1215,7 +1210,6 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
                  <BaseButton
                    ariaLabel="Add Entity"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/Tables/snapshots/EditTableEntityPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/snapshots/EditTableEntityPanel.test.tsx.snap
@@ -357,21 +357,18 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
      </div>
      <PanelFooterComponent
        buttonLabel="Update"
-        isButtonDisabled={false}
      >
        <div
          className="panelFooter"
        >
          <CustomizedPrimaryButton
            ariaLabel="Update"
-            disabled={false}
            id="sidePanelOkButton"
            text="Update"
            type="submit"
          >
            <PrimaryButton
              ariaLabel="Update"
-              disabled={false}
              id="sidePanelOkButton"
              text="Update"
              theme={
@@ -651,7 +648,6 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="Update"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -933,7 +929,6 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
              >
                <DefaultButton
                  ariaLabel="Update"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -1216,7 +1211,6 @@ exports[`Excute Edit Table Entity Pane should render Default properly 1`] = `
                  <BaseButton
                    ariaLabel="Update"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/Panes/snapshots/DeleteDatabaseConfirmationPanel.test.tsx.snap
+++ b/src/Explorer/Panes/snapshots/DeleteDatabaseConfirmationPanel.test.tsx.snap
@@ -1041,21 +1041,18 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
      </div>
      <PanelFooterComponent
        buttonLabel="OK"
-        isButtonDisabled={false}
      >
        <div
          className="panelFooter"
        >
          <CustomizedPrimaryButton
            ariaLabel="OK"
-            disabled={false}
            id="sidePanelOkButton"
            text="OK"
            type="submit"
          >
            <PrimaryButton
              ariaLabel="OK"
-              disabled={false}
              id="sidePanelOkButton"
              text="OK"
              theme={
@@ -1335,7 +1332,6 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
            >
              <CustomizedDefaultButton
                ariaLabel="OK"
-                disabled={false}
                id="sidePanelOkButton"
                onRenderDescription={[Function]}
                primary={true}
@@ -1617,7 +1613,6 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
              >
                <DefaultButton
                  ariaLabel="OK"
-                  disabled={false}
                  id="sidePanelOkButton"
                  onRenderDescription={[Function]}
                  primary={true}
@@ -1900,7 +1895,6 @@ exports[`Delete Database Confirmation Pane Should call delete database 1`] = `
                  <BaseButton
                    ariaLabel="OK"
                    baseClassName="ms-Button"
-                    disabled={false}
                    id="sidePanelOkButton"
                    onRenderDescription={[Function]}
                    primary={true}
--- a/src/Explorer/SplashScreen/SplashScreen.tsx
+++ b/src/Explorer/SplashScreen/SplashScreen.tsx
@@ -307,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} />),
      });
    }

--- a/src/Explorer/Tables/Constants.ts
+++ b/src/Explorer/Tables/Constants.ts
@@ -19,7 +19,6 @@ export const CassandraType = {
  Float: "Float",
  Int: "Int",
  Text: "Text",
-  Timestamp: "Timestamp",
  Uuid: "Uuid",
  Varchar: "Varchar",
  Varint: "Varint",
--- a/src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
+++ b/src/Explorer/Tables/DataTable/TableEntityListViewModel.ts
@@ -431,7 +431,7 @@ export default class TableEntityListViewModel extends DataTableViewModel {
          if (newHeaders.length > 0) {
            // Any new columns found will be added into headers array, which will trigger a re-render of the DataTable.
            // So there is no need to call it here.
-            this.updateHeaders(selectedHeadersUnion, /* notifyColumnChanges */ true);
+            this.updateHeaders(newHeaders, /* notifyColumnChanges */ true);
          } else {
            if (columnSortOrder) {
              this.sortColumns(columnSortOrder, oSettings);
--- a/src/Explorer/Tables/TableDataClient.ts
+++ b/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,8 +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.Varchar
    );
  }

--- a/src/Explorer/Tabs/NotebookTabBase.ts
+++ b/src/Explorer/Tabs/NotebookTabBase.ts
@@ -17,7 +17,6 @@ export interface NotebookTabBaseOptions extends ViewModels.TabOptions {

 /**
 * Every notebook-based tab inherits from this class. It holds the static reference to a notebook client (singleton)
- * Re-initiating the constructor when ever a new container got allocated.
 */
 export default class NotebookTabBase extends TabsBase {
  protected static clientManager: NotebookClientV2;
@@ -28,15 +27,6 @@ export default class NotebookTabBase extends TabsBase {

    this.container = options.container;

-    useNotebook.subscribe(
-      () => {
-        const notebookServerInfo = useNotebook.getState().notebookServerInfo;
-        if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint) {
-          NotebookTabBase.clientManager = undefined;
-        }
-      },
-      (state) => state.notebookServerInfo
-    );
    if (!NotebookTabBase.clientManager) {
      NotebookTabBase.clientManager = new NotebookClientV2({
        connectionInfo: useNotebook.getState().notebookServerInfo,
--- a/src/Explorer/Tabs/NotebookV2Tab.ts
+++ b/src/Explorer/Tabs/NotebookV2Tab.ts
@@ -53,16 +53,14 @@ export default class NotebookTabV2 extends NotebookTabBase {
      onUpdateKernelInfo: this.onKernelUpdate,
    });
  }
-  /*
-   * Hard cleaning the workspace(Closing tabs connected with old container connection) when new container got allocated.
-   */
-  public onCloseTabButtonClick(hardClose = false): Q.Promise<any> {
+
+  public onCloseTabButtonClick(): Q.Promise<any> {
    const cleanup = () => {
      this.notebookComponentAdapter.notebookShutdown();
      super.onCloseTabButtonClick();
    };

-    if (this.notebookComponentAdapter.isContentDirty() && hardClose === false) {
+    if (this.notebookComponentAdapter.isContentDirty()) {
      useDialog
        .getState()
        .showOkCancelModalDialog(
--- a/src/Explorer/Tabs/TerminalTab.tsx
+++ b/src/Explorer/Tabs/TerminalTab.tsx
@@ -100,7 +100,6 @@ export default class TerminalTab extends TabsBase {
    return {
      authToken: info.authToken,
      notebookServerEndpoint: `${info.notebookServerEndpoint.replace(/\/+$/, "")}/${endpointSuffix}`,
-      forwardingId: info.forwardingId,
    };
  }
 }
--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -1,5 +1,4 @@
 import { Resource, StoredProcedureDefinition, TriggerDefinition, UserDefinedFunctionDefinition } from "@azure/cosmos";
-import { NotebookUtil } from "Explorer/Notebook/NotebookUtil";
 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 (NotebookUtil.isPhoenixEnabled()) {
-      await this.container.allocateContainer();
-    }
    useSelectedNode.getState().setSelectedNode(this);
    this.selectedSubnodeKind(ViewModels.CollectionTabKind.SchemaAnalyzer);
    const SchemaAnalyzerTab = await (await import("../Tabs/SchemaAnalyzerTab")).default;
@@ -576,8 +572,7 @@ export default class Collection implements ViewModels.Collection {

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

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

-    const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-    if (throughputCap && throughputCap !== -1) {
-      await useDatabases.getState().loadAllOffers();
-    }
-
    const pendingNotificationsPromise: Promise<DataModels.Notification> = this.getPendingThroughputSplitNotification();
    const tabKind = ViewModels.CollectionTabKind.DatabaseSettingsV2;
    const matchingTabs = useTabs.getState().getTabs(tabKind, (tab) => tab.node?.id() === this.id());
--- a/src/Explorer/useDatabases.ts
+++ b/src/Explorer/useDatabases.ts
@@ -18,7 +18,6 @@ interface DatabasesState {
  findCollection: (databaseId: string, collectionId: string) => ViewModels.Collection;
  isLastCollection: () => boolean;
  loadDatabaseOffers: () => Promise<void>;
-  loadAllOffers: () => Promise<void>;
  isFirstResourceCreated: () => boolean;
  findSelectedDatabase: () => ViewModels.Database;
  validateDatabaseId: (id: string) => boolean;
@@ -98,19 +97,6 @@ export const useDatabases: UseStore<DatabasesState> = create((set, get) => ({
      })
    );
  },
-  loadAllOffers: async () => {
-    await Promise.all(
-      get().databases?.map(async (database: ViewModels.Database) => {
-        await database.loadOffer();
-        await database.loadCollections();
-        await Promise.all(
-          (database.collections() || []).map(async (collection: ViewModels.Collection) => {
-            await collection.loadOffer();
-          })
-        );
-      })
-    );
-  },
  isFirstResourceCreated: () => {
    const databases = get().databases;

--- a/src/Explorer/useSelectedNode.ts
+++ b/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;
-  },
 }));
--- a/src/GitHub/GitHubOAuthService.ts
+++ b/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(),
    };
--- a/src/Juno/JunoClient.ts
+++ b/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) {
--- a/src/Phoenix/PhoenixClient.ts
+++ b/src/Phoenix/PhoenixClient.ts
@@ -1,46 +1,33 @@
-import promiseRetry, { AbortError } from "p-retry";
-import { 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 {
-  ContainerInfo,
-  IContainerData,
-  IPhoenixConnectionInfoResult,
-  IProvisionData,
-  IResponse,
-} from "../Contracts/DataModels";
-import { useNotebook } from "../Explorer/Notebook/useNotebook";
 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.getPhoenixContainerPoolingEndPoint()}/${operation}`, {
+      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();
@@ -55,68 +42,6 @@ export class PhoenixClient {
    }
  }

-  public async initiateContainerHeartBeat(containerData: { forwardingId: string; dbAccountName: string }) {
-    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.getPhoenixContainerPoolingEndPoint()}/${containerData.dbAccountName}/${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) {
-          throw new AbortError(response.statusText);
-        }
-        throw new Error(response.statusText);
-      };
-      return await promiseRetry(runContainerStatusAsync, this.retryOptions);
-    } catch (error) {
-      Logger.logError(getErrorMessage(error), "PhoenixClient/getContainerStatus");
-      return {
-        durationLeftInMinutes: undefined,
-        notebookServerInfo: undefined,
-        status: ContainerStatusType.Disconnected,
-      };
-    }
-  }
-
-  private async getContainerHealth(delayMs: number, containerData: { forwardingId: string; dbAccountName: string }) {
-    try {
-      const containerInfo = await this.getContainerStatusAsync(containerData);
-      useNotebook.getState().setContainerStatus(containerInfo);
-      if (useNotebook.getState().containerStatus?.status === ContainerStatusType.Active) {
-        this.scheduleContainerHeartbeat(delayMs, containerData);
-      }
-    } catch (exception) {
-      useNotebook.getState().setContainerStatus({
-        durationLeftInMinutes: undefined,
-        notebookServerInfo: undefined,
-        status: ContainerStatusType.Disconnected,
-      });
-    }
-  }
-
  public static getPhoenixEndpoint(): string {
    const phoenixEndpoint =
      userContext.features.phoenixEndpoint ?? userContext.features.junoEndpoint ?? configContext.JUNO_ENDPOINT;
@@ -132,7 +57,6 @@ export class PhoenixClient {
  public getPhoenixContainerPoolingEndPoint(): string {
    return `${PhoenixClient.getPhoenixEndpoint()}/api/controlplane/toolscontainer`;
  }
-
  private static getHeaders(): HeadersInit {
    const authorizationHeader = getAuthorizationHeader();
    return {
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -12,7 +12,6 @@ export type Features = {
  partitionKeyDefault: boolean;
  partitionKeyDefault2: boolean;
  phoenix: boolean;
-  notebooksDownBanner: boolean;
  readonly enableSDKoperations: boolean;
  readonly enableSpark: boolean;
  readonly enableTtl: boolean;
@@ -34,7 +33,6 @@ export type Features = {
  readonly mongoProxyEndpoint?: string;
  readonly mongoProxyAPIs?: string;
  readonly notebooksTemporarilyDown: boolean;
-  readonly enableThroughputCap: boolean;
 };

 export function extractFeatures(given = new URLSearchParams(window.location.search)): Features {
@@ -86,8 +84,6 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
    partitionKeyDefault2: "true" === get("pkpartitionkeytest"),
    notebooksTemporarilyDown: "true" === get("notebookstemporarilydown", "true"),
    phoenix: "true" === get("phoenix"),
-    notebooksDownBanner: "true" === get("notebooksDownBanner"),
-    enableThroughputCap: "true" === get("enablethroughputcap"),
  };
 }

--- a/src/SelfServe/SqlX/SqlX.rp.ts
+++ b/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;
  }
 };
--- a/src/SelfServe/SqlX/SqlX.tsx
+++ b/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") {
--- a/src/SelfServe/SqlX/SqlxTypes.ts
+++ b/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 = {
--- a/src/Shared/Telemetry/TelemetryConstants.ts
+++ b/src/Shared/Telemetry/TelemetryConstants.ts
@@ -50,6 +50,7 @@ export enum Action {
  SubscriptionSwitch,
  TenantSwitch,
  DefaultTenantSwitch,
+  ResetNotebookWorkspace,
  CreateNotebookWorkspace,
  NotebookErrorNotification,
  CreateSparkCluster,
@@ -81,8 +82,6 @@ export enum Action {
  NotebooksInsertTextCellBelowFromMenu,
  NotebooksMoveCellUpFromMenu,
  NotebooksMoveCellDownFromMenu,
-  PhoenixConnection,
-  PhoenixResetWorkspace,
  DeleteCellFromMenu,
  OpenTerminal,
  CreateMongoCollectionWithWildcardIndex,
--- a/src/Utils/GalleryUtils.ts
+++ b/src/Utils/GalleryUtils.ts
@@ -239,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."
          );
      }
--- a/src/Utils/GitHubUtils.ts
+++ b/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;
-}
--- a/src/hooks/useDatabaseAccounts.tsx
+++ b/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 });
--- a/src/hooks/useKnockoutExplorer.ts
+++ b/src/hooks/useKnockoutExplorer.ts
@@ -342,9 +342,6 @@ function updateContextsFromPortalMessage(inputs: DataExplorerInputsFrame) {
    if (inputs.flights.indexOf(Flights.Phoenix) !== -1) {
      userContext.features.phoenix = true;
    }
-    if (inputs.flights.indexOf(Flights.NotebooksDownBanner) !== -1) {
-      userContext.features.notebooksDownBanner = true;
-    }
  }
 }

--- a/src/hooks/useTabs.ts
+++ b/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 });
-      }
-    }
-  },
 }));