Bump node-fetch from 2.6.1 to 2.6.7 in /utils/deployment-status

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

src/Common/Constants.ts

@@ -354,10 +354,6 @@ export enum ContainerStatusType {
   Disconnected = "Disconnected",
 }
 
-export enum PoolIdType {
-  DefaultPoolId = "default",
-}
-
 export const EmulatorMasterKey =
   //[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")]
   "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
@@ -398,10 +394,6 @@ export class Notebook {
   public static cosmosNotebookHomePageUrl = "https://aka.ms/cosmos-notebooks-limits";
   public static cosmosNotebookGitDocumentationUrl = "https://aka.ms/cosmos-notebooks-github";
   public static learnMore = "Learn more.";
-  public static notebookDisabledText =
-    "This feature is disabled for this user, this can happen because of region restriction, key permissions etc..";
-  public static newShellDisabledText =
-    "This feature is disabled for this user, this is for users with region restriction, key permissions etc..";
 }
 
 export class SparkLibrary {

src/Contracts/DataModels.ts

@@ -438,25 +438,18 @@ export interface NotebookWorkspaceConnectionInfo {
 
 export interface ContainerInfo {
   durationLeftInMinutes: number;
-  phoenixServerInfo: NotebookWorkspaceConnectionInfo;
+  notebookServerInfo: NotebookWorkspaceConnectionInfo;
   status: ContainerStatusType;
 }
 
 export interface IProvisionData {
   cosmosEndpoint: string;
-  poolId: string;
 }
 
 export interface IContainerData {
   forwardingId: string;
 }
 
-export interface IDbAccountAllow {
-  status: number;
-  message?: string;
-  type?: string;
-}
-
 export interface IResponse<T> {
   status: number;
   data: T;
@@ -481,8 +474,8 @@ export interface IMaxUsersPerDbAccountExceeded extends IPhoenixError {
 }
 
 export interface IPhoenixConnectionInfoResult {
-  readonly authToken?: string;
-  readonly phoenixServiceUrl?: string;
+  readonly notebookAuthToken?: string;
+  readonly notebookServerUrl?: string;
   readonly forwardingId?: string;
 }
 
@@ -570,5 +563,4 @@ export enum PhoenixErrorType {
   RegionNotServicable = "RegionNotServicable",
   SubscriptionNotAllowed = "SubscriptionNotAllowed",
   UnknownError = "UnknownError",
-  PhoenixFlightFallback = "PhoenixFlightFallback",
 }

src/Explorer/Controls/TreeComponent/TreeComponent.tsx

@@ -42,8 +42,6 @@ export interface TreeNode {
   timestamp?: number;
   isLeavesParentsSeparate?: boolean; // Display parents together first, then leaves
   isLoading?: boolean;
-  isDisabled?: boolean;
-  toolTip?: string;
   isSelected?: () => boolean;
   onClick?: (isExpanded: boolean) => void; // Only if a leaf, other click will expand/collapse
   onExpanded?: () => void;
@@ -171,15 +169,9 @@ export class TreeNodeComponent extends React.Component<TreeNodeComponentProps, T
 
     return (
       <div
-        className={`${this.props.node.className || ""} main${generation} nodeItem ${showSelected ? "selected" : ""} ${
-          this.props.node.isDisabled ? "disable" : ""
-        }`}
-        onClick={(event: React.MouseEvent<HTMLDivElement>) =>
-          !this.props.node.isDisabled && this.onNodeClick(event, node)
-        }
-        onKeyPress={(event: React.KeyboardEvent<HTMLDivElement>) =>
-          !this.props.node.isDisabled && this.onNodeKeyPress(event, node)
-        }
+        className={`${this.props.node.className || ""} main${generation} nodeItem ${showSelected ? "selected" : ""}`}
+        onClick={(event: React.MouseEvent<HTMLDivElement>) => this.onNodeClick(event, node)}
+        onKeyPress={(event: React.KeyboardEvent<HTMLDivElement>) => this.onNodeKeyPress(event, node)}
         role="treeitem"
         id={node.id}
       >
@@ -192,7 +184,7 @@ export class TreeNodeComponent extends React.Component<TreeNodeComponentProps, T
           {this.renderCollapseExpandIcon(node)}
           {node.iconSrc && <img className="nodeIcon" src={node.iconSrc} alt="" />}
           {node.label && (
-            <span className="nodeLabel" title={`${node.toolTip ? node.toolTip : node.label}`}>
+            <span className="nodeLabel" title={node.label}>
               {node.label}
             </span>
           )}
@@ -203,7 +195,7 @@ export class TreeNodeComponent extends React.Component<TreeNodeComponentProps, T
         </div>
         {node.children && (
           <AnimateHeight duration={TreeNodeComponent.transitionDurationMS} height={this.state.isExpanded ? "auto" : 0}>
-            <div className="nodeChildren" data-test={node.label} aria-disabled={node.isDisabled}>
+            <div className="nodeChildren" data-test={node.label}>
               {TreeNodeComponent.getSortedChildren(node).map((childNode: TreeNode) => (
                 <TreeNodeComponent
                   key={`${childNode.label}-${generation + 1}-${childNode.timestamp}`}

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

@@ -35,7 +35,7 @@ exports[`TreeComponent renders a simple tree 1`] = `
 
 exports[`TreeNodeComponent does not render children by default 1`] = `
 <div
-  className=" main2 nodeItem  "
+  className=" main2 nodeItem "
   onClick={[Function]}
   onKeyPress={[Function]}
   role="treeitem"
@@ -136,7 +136,7 @@ exports[`TreeNodeComponent does not render children by default 1`] = `
 
 exports[`TreeNodeComponent renders a simple node (sorted children, expanded) 1`] = `
 <div
-  className="nodeClassname main12 nodeItem  "
+  className="nodeClassname main12 nodeItem "
   id="id"
   onClick={[Function]}
   onKeyPress={[Function]}
@@ -287,7 +287,7 @@ exports[`TreeNodeComponent renders a simple node (sorted children, expanded) 1`]
 
 exports[`TreeNodeComponent renders loading icon 1`] = `
 <div
-  className=" main2 nodeItem  "
+  className=" main2 nodeItem "
   onClick={[Function]}
   onKeyPress={[Function]}
   role="treeitem"
@@ -359,7 +359,7 @@ exports[`TreeNodeComponent renders loading icon 1`] = `
 
 exports[`TreeNodeComponent renders sorted children, expanded, leaves and parents separated 1`] = `
 <div
-  className="nodeClassname main12 nodeItem  "
+  className="nodeClassname main12 nodeItem "
   id="id"
   onClick={[Function]}
   onKeyPress={[Function]}
@@ -529,7 +529,7 @@ exports[`TreeNodeComponent renders sorted children, expanded, leaves and parents
 
 exports[`TreeNodeComponent renders unsorted children by default 1`] = `
 <div
-  className=" main2 nodeItem  "
+  className=" main2 nodeItem "
   onClick={[Function]}
   onKeyPress={[Function]}
   role="treeitem"

src/Explorer/Controls/TreeComponent/treeComponent.less

@@ -66,11 +66,7 @@
     }
   }
 }
-.disable{
-  background-color: rgb(255, 255, 255);
-  filter: grayscale();
-  color: rgb(161, 159, 157);
-}
+
 .treeComponentMenuItemContainer {
   font-size: @mediumFontSize;
 

src/Explorer/Explorer.tsx

@@ -9,7 +9,7 @@ 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, PoolIdType } from "../Common/Constants";
+import { Areas, ConnectionStatusType, HttpStatusCodes, Notebook } from "../Common/Constants";
 import { readCollection } from "../Common/dataAccess/readCollection";
 import { readDatabases } from "../Common/dataAccess/readDatabases";
 import { getErrorMessage, getErrorStack, handleError } from "../Common/ErrorHandlingUtils";
@@ -357,7 +357,6 @@ export default class Explorer {
     ) {
       const provisionData: IProvisionData = {
         cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
-        poolId: PoolIdType.DefaultPoolId,
       };
       const connectionStatus: ContainerConnectionInfo = {
         status: ConnectionStatusType.Connecting,
@@ -370,8 +369,8 @@ export default class Explorer {
         });
         useNotebook.getState().setIsAllocating(true);
         connectionInfo = await this.phoenixClient.allocateContainer(provisionData);
-        if (!connectionInfo?.data?.phoenixServiceUrl) {
-          throw new Error(`PhoenixServiceUrl is invalid!`);
+        if (!connectionInfo?.data?.notebookServerUrl) {
+          throw new Error(`NotebookServerUrl is invalid!`);
         }
         await this.setNotebookInfo(connectionInfo, connectionStatus);
         TelemetryProcessor.traceSuccess(Action.PhoenixConnection, {
@@ -422,8 +421,8 @@ export default class Explorer {
       notebookServerEndpoint:
         (validateEndpoint(userContext.features.notebookServerUrl, allowedNotebookServerUrls) &&
           userContext.features.notebookServerUrl) ||
-        connectionInfo.data.phoenixServiceUrl,
-      authToken: userContext.features.notebookServerToken || connectionInfo.data.authToken,
+        connectionInfo.data.notebookServerUrl,
+      authToken: userContext.features.notebookServerToken || connectionInfo.data.notebookAuthToken,
       forwardingId: connectionInfo.data.forwardingId,
     });
     this.notebookManager?.notebookClient
@@ -498,8 +497,8 @@ export default class Explorer {
       if (connectionInfo?.status !== HttpStatusCodes.OK) {
         throw new Error(`Reset Workspace: Received status code- ${connectionInfo?.status}`);
       }
-      if (!connectionInfo?.data?.phoenixServiceUrl) {
-        throw new Error(`Reset Workspace: PhoenixServiceUrl is invalid!`);
+      if (!connectionInfo?.data?.notebookServerUrl) {
+        throw new Error(`Reset Workspace: NotebookServerUrl is invalid!`);
       }
       if (useNotebook.getState().isPhoenixNotebooks) {
         await this.setNotebookInfo(connectionInfo, connectionStatus);
@@ -1027,7 +1026,7 @@ export default class Explorer {
   }
 
   public async openNotebookTerminal(kind: ViewModels.TerminalKind): Promise<void> {
-    if (useNotebook.getState().isPhoenixFeatures && !useNotebook.getState().isPhoenixDisabled) {
+    if (useNotebook.getState().isPhoenixFeatures) {
       await this.allocateContainer();
       const notebookServerInfo = useNotebook.getState().notebookServerInfo;
       if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint !== undefined) {

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -75,11 +75,7 @@ export function createStaticCommandBarButtons(
     if (container.notebookManager?.gitHubOAuthService) {
       notebookButtons.push(createManageGitHubAccountButton(container));
     }
-    if (
-      useNotebook.getState().isPhoenixFeatures &&
-      !useNotebook.getState().isPhoenixDisabled &&
-      configContext.isTerminalEnabled
-    ) {
+    if (useNotebook.getState().isPhoenixFeatures && configContext.isTerminalEnabled) {
       notebookButtons.push(createOpenTerminalButton(container));
     }
     if (useNotebook.getState().isPhoenixNotebooks && selectedNodeState.isConnectedToContainer()) {
@@ -87,8 +83,8 @@ export function createStaticCommandBarButtons(
     }
     if (
       (userContext.apiType === "Mongo" &&
-        selectedNodeState.isDatabaseNodeOrNoneSelected() &&
-        useNotebook.getState().isShellEnabled) ||
+        useNotebook.getState().isShellEnabled &&
+        selectedNodeState.isDatabaseNodeOrNoneSelected()) ||
       userContext.apiType === "Cassandra"
     ) {
       notebookButtons.push(createDivider());
@@ -100,26 +96,16 @@ export function createStaticCommandBarButtons(
     }
 
     notebookButtons.forEach((btn) => {
-      const isPhoenixFeaturesDownMsg =
-        (!useNotebook.getState().isPhoenixFeatures && !useNotebook.getState().isPhoenixDisabled) ||
-        (!useNotebook.getState().isPhoenixFeatures && useNotebook.getState().isPhoenixDisabled);
-
       if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
-        if (isPhoenixFeaturesDownMsg) {
-          applyNotebooksStyleProps(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
-        } else if (useNotebook.getState().isPhoenixDisabled) {
-          applyNotebooksStyleProps(btn, Constants.Notebook.notebookDisabledText);
+        if (!useNotebook.getState().isPhoenixFeatures) {
+          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
         }
       } else if (btn.commandButtonLabel.indexOf("Mongo") !== -1) {
-        if (isPhoenixFeaturesDownMsg) {
-          applyNotebooksStyleProps(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
-        } else if (useNotebook.getState().isPhoenixDisabled) {
-          applyNotebooksStyleProps(btn, Constants.Notebook.notebookDisabledText);
+        if (!useNotebook.getState().isPhoenixFeatures) {
+          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
         }
-      } else if (isPhoenixFeaturesDownMsg) {
-        applyNotebooksStyleProps(btn, Constants.Notebook.temporarilyDownMsg);
-      } else if (useNotebook.getState().isPhoenixDisabled) {
-        applyNotebooksStyleProps(btn, Constants.Notebook.notebookDisabledText);
+      } else if (!useNotebook.getState().isPhoenixNotebooks) {
+        applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
       }
       buttons.push(btn);
     });
@@ -168,38 +154,25 @@ export function createContextCommandBarButtons(
   selectedNodeState: SelectedNodeState
 ): CommandButtonComponentProps[] {
   const buttons: CommandButtonComponentProps[] = [];
+
   if (!selectedNodeState.isDatabaseNodeOrNoneSelected() && userContext.apiType === "Mongo") {
-    const isPhoenixShellDisabled = !useNotebook.getState().isShellEnabled || useNotebook.getState().isPhoenixDisabled;
-    const phoenixMongoShellBtn: CommandButtonComponentProps = {
+    const label = useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell";
+    const newMongoShellBtn: CommandButtonComponentProps = {
       iconSrc: HostedTerminalIcon,
-      iconAlt: "Open Mongo Shell",
+      iconAlt: label,
       onCommandClick: () => {
-        container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
-      },
-      commandButtonLabel: "Open Mongo Shell",
-      ariaLabel: "Open Mongo Shell",
-      hasPopup: true,
-      disabled: isPhoenixShellDisabled,
-      tooltipText: isPhoenixShellDisabled ? Constants.Notebook.notebookDisabledText : undefined,
-    };
-    buttons.push(phoenixMongoShellBtn);
-    if (!useNotebook.getState().isShellEnabled) {
-      const label = "New Shell";
-      const newMongoShellBtn: CommandButtonComponentProps = {
-        iconSrc: HostedTerminalIcon,
-        iconAlt: label,
-        onCommandClick: () => {
-          const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
+        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
+        if (useNotebook.getState().isShellEnabled) {
+          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
+        } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
-        },
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: true,
-        disabled: false,
-        tooltipText: label,
-      };
-      buttons.push(newMongoShellBtn);
-    }
+        }
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+    };
+    buttons.push(newMongoShellBtn);
   }
 
   return buttons;
@@ -428,7 +401,7 @@ export function createScriptCommandButtons(selectedNodeState: SelectedNodeState)
   return buttons;
 }
 
-function applyNotebooksStyleProps(buttonProps: CommandButtonComponentProps, tooltip: string): void {
+function applyNotebooksTemporarilyDownStyle(buttonProps: CommandButtonComponentProps, tooltip: string): void {
   if (!buttonProps.isDivider) {
     buttonProps.disabled = true;
     buttonProps.tooltipText = tooltip;
@@ -504,11 +477,10 @@ function createOpenTerminalButton(container: Explorer): CommandButtonComponentPr
 
 function createOpenMongoTerminalButton(container: Explorer): CommandButtonComponentProps {
   const label = "Open Mongo Shell";
+  const tooltip =
+    "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
   const disableButton =
-    !useNotebook.getState().isNotebooksEnabledForAccount &&
-    (!useNotebook.getState().isNotebookEnabled ||
-      !useNotebook.getState().isShellEnabled ||
-      useNotebook.getState().isPhoenixDisabled);
+    !useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled;
   return {
     iconSrc: HostedTerminalIcon,
     iconAlt: label,
@@ -521,7 +493,7 @@ function createOpenMongoTerminalButton(container: Explorer): CommandButtonCompon
     hasPopup: false,
     disabled: disableButton,
     ariaLabel: label,
-    tooltipText: !disableButton ? undefined : Constants.Notebook.notebookDisabledText,
+    tooltipText: !disableButton ? "" : tooltip,
   };
 }
 

src/Explorer/Menus/CommandBar/ConnectionStatusComponent.less

@@ -36,11 +36,6 @@
         outline: 0px;
     }
 }
-.disableText{
-  background-color: rgb(255, 255, 255)!important;
-  filter: grayscale();
-  color: rgb(161, 159, 157)!important;
-}
 .connectIcon{
         margin: 0px 4px;
         height: 18px;

src/Explorer/Menus/CommandBar/ConnectionStatusComponent.tsx

@@ -23,8 +23,6 @@ interface Props {
 }
 export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Element => {
   const connectionInfo = useNotebook((state) => state.connectionInfo);
-  const isPhoenixDisabled = useNotebook((state) => state.isPhoenixDisabled);
-
   const [second, setSecond] = React.useState("00");
   const [minute, setMinute] = React.useState("00");
   const [isActive, setIsActive] = React.useState(false);
@@ -79,12 +77,6 @@ export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Ele
     }
   }, [connectionInfo.status]);
 
-  React.useEffect(() => {
-    if (isPhoenixDisabled) {
-      setToolTipContent(Notebook.notebookDisabledText);
-    }
-  }, [isPhoenixDisabled]);
-
   const stopTimer = () => {
     setIsActive(false);
     setCounter(0);
@@ -101,18 +93,11 @@ export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Ele
     (connectionInfo.status === ConnectionStatusType.Connect || connectionInfo.status === ConnectionStatusType.Reconnect)
   ) {
     return (
-      <ActionButton
-        className={isPhoenixDisabled ? "disableText commandReactBtn" : "commandReactBtn"}
-        disabled={isPhoenixDisabled}
-        onClick={() => !isPhoenixDisabled && container.allocateContainer()}
-      >
+      <ActionButton className="commandReactBtn" onClick={() => container.allocateContainer()}>
         <TooltipHost content={toolTipContent}>
           <Stack className="connectionStatusContainer" horizontal>
-            <Icon
-              iconName="ConnectVirtualMachine"
-              className={isPhoenixDisabled ? "connectIcon disableText" : "connectIcon"}
-            />
-            <span className={isPhoenixDisabled ? "disableText" : ""}>{connectionInfo.status}</span>
+            <Icon iconName="ConnectVirtualMachine" className="connectIcon" />
+            <span>{connectionInfo.status}</span>
           </Stack>
         </TooltipHost>
       </ActionButton>

src/Explorer/Notebook/NotebookContainerClient.ts

@@ -5,7 +5,7 @@ import { useDialog } from "Explorer/Controls/Dialog";
 import promiseRetry, { AbortError } from "p-retry";
 import { PhoenixClient } from "Phoenix/PhoenixClient";
 import * as Constants from "../../Common/Constants";
-import { ConnectionStatusType, HttpHeaders, HttpStatusCodes, Notebook, PoolIdType } from "../../Common/Constants";
+import { ConnectionStatusType, HttpHeaders, HttpStatusCodes, Notebook } from "../../Common/Constants";
 import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 import * as Logger from "../../Common/Logger";
 import * as DataModels from "../../Contracts/DataModels";
@@ -154,7 +154,6 @@ export class NotebookContainerClient {
       if (useNotebook.getState().isPhoenixNotebooks) {
         const provisionData: IProvisionData = {
           cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
-          poolId: PoolIdType.DefaultPoolId,
         };
         return await this.phoenixClient.resetContainer(provisionData);
       }

src/Explorer/Notebook/SchemaAnalyzer/SchemaAnalyzer.tsx

@@ -5,7 +5,6 @@ import Immutable from "immutable";
 import * as React from "react";
 import { connect } from "react-redux";
 import { Dispatch } from "redux";
-import * as Logger from "../../../Common/Logger";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
 import { traceFailure, traceStart, traceSuccess } from "../../../Shared/Telemetry/TelemetryProcessor";
 import loadTransform from "../NotebookComponent/loadTransform";
@@ -101,7 +100,6 @@ export class SchemaAnalyzer extends React.Component<SchemaAnalyzerProps, SchemaA
     // Only in cases where CosmosMongoKernel runs into an error we get a single output
     if (outputs.size === 1) {
       traceFailure(Action.SchemaAnalyzerClickAnalyze, data, this.clickAnalyzeTelemetryStartKey);
-      Logger.logError(`Failed to analyze schema: ${JSON.stringify(data)}`, "SchemaAnalyzer/traceClickAnalyzeComplete");
     } else {
       traceSuccess(Action.SchemaAnalyzerClickAnalyze, data, this.clickAnalyzeTelemetryStartKey);
     }

src/Explorer/Notebook/useNotebook.ts

@@ -4,12 +4,12 @@ import { PhoenixClient } from "Phoenix/PhoenixClient";
 import create, { UseStore } from "zustand";
 import { AuthType } from "../../AuthType";
 import * as Constants from "../../Common/Constants";
-import { ConnectionStatusType, HttpStatusCodes } from "../../Common/Constants";
+import { ConnectionStatusType } from "../../Common/Constants";
 import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 import * as Logger from "../../Common/Logger";
 import { configContext } from "../../ConfigContext";
 import * as DataModels from "../../Contracts/DataModels";
-import { ContainerConnectionInfo, ContainerInfo, PhoenixErrorType } from "../../Contracts/DataModels";
+import { ContainerConnectionInfo, ContainerInfo } from "../../Contracts/DataModels";
 import { useTabs } from "../../hooks/useTabs";
 import { IPinnedRepo } from "../../Juno/JunoClient";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
@@ -40,7 +40,6 @@ interface NotebookState {
   containerStatus: ContainerInfo;
   isPhoenixNotebooks: boolean;
   isPhoenixFeatures: boolean;
-  isPhoenixDisabled: boolean;
   setIsNotebookEnabled: (isNotebookEnabled: boolean) => void;
   setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => void;
   setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
@@ -65,7 +64,6 @@ interface NotebookState {
   getPhoenixStatus: () => Promise<void>;
   setIsPhoenixNotebooks: (isPhoenixNotebooks: boolean) => void;
   setIsPhoenixFeatures: (isPhoenixFeatures: boolean) => void;
-  setIsPhoenixDisabled: (isPhoenixDisabled: boolean) => void;
 }
 
 export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
@@ -98,11 +96,10 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   containerStatus: {
     status: undefined,
     durationLeftInMinutes: undefined,
-    phoenixServerInfo: undefined,
+    notebookServerInfo: undefined,
   },
   isPhoenixNotebooks: undefined,
   isPhoenixFeatures: undefined,
-  isPhoenixDisabled: undefined,
   setIsNotebookEnabled: (isNotebookEnabled: boolean) => set({ isNotebookEnabled }),
   setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => set({ isNotebooksEnabledForAccount }),
   setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) =>
@@ -299,47 +296,26 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
     useNotebook.getState().setContainerStatus({
       status: undefined,
       durationLeftInMinutes: undefined,
-      phoenixServerInfo: undefined,
+      notebookServerInfo: undefined,
     });
   },
   setIsRefreshed: (isRefreshed: boolean) => set({ isRefreshed }),
   setContainerStatus: (containerStatus: ContainerInfo) => set({ containerStatus }),
   getPhoenixStatus: async () => {
     if (get().isPhoenixNotebooks === undefined || get().isPhoenixFeatures === undefined) {
-      let isPhoenixNotebooks = false;
-      let isPhoenixFeatures = false;
-      let isPhoenixDisabled = false;
-
-      const isPublicInternetAllowed = isPublicInternetAccessAllowed();
-      const phoenixClient = new PhoenixClient();
-      const dbAccountAllowedInfo = await phoenixClient.getDbAccountAllowedStatus();
-
-      if (dbAccountAllowedInfo.status === HttpStatusCodes.OK) {
-        if (dbAccountAllowedInfo?.type === PhoenixErrorType.PhoenixFlightFallback) {
-          isPhoenixNotebooks = userContext.features.phoenixNotebooks;
-          isPhoenixFeatures = userContext.features.phoenixFeatures;
-          isPhoenixDisabled = !isPublicInternetAllowed && (isPhoenixNotebooks || isPhoenixFeatures);
-        } else {
-          isPhoenixNotebooks = isPhoenixFeatures = true;
-          isPhoenixDisabled = !isPublicInternetAllowed;
-        }
-      } else if (
-        dbAccountAllowedInfo.status === HttpStatusCodes.Forbidden &&
-        (userContext.features.phoenixNotebooks || userContext.features.phoenixFeatures)
-      ) {
-        isPhoenixNotebooks = userContext.features.phoenixNotebooks;
-        isPhoenixFeatures = userContext.features.phoenixFeatures;
-        isPhoenixDisabled = true;
-      } else {
-        isPhoenixNotebooks = isPhoenixFeatures = false;
+      let isPhoenix = false;
+      if (userContext.features.phoenixNotebooks || userContext.features.phoenixFeatures) {
+        const phoenixClient = new PhoenixClient();
+        isPhoenix = isPublicInternetAccessAllowed() && (await phoenixClient.isDbAcountWhitelisted());
       }
 
+      const isPhoenixNotebooks = userContext.features.phoenixNotebooks && isPhoenix;
+      const isPhoenixFeatures = userContext.features.phoenixFeatures && isPhoenix;
+
       set({ isPhoenixNotebooks: isPhoenixNotebooks });
       set({ isPhoenixFeatures: isPhoenixFeatures });
-      set({ isPhoenixDisabled: isPhoenixDisabled });
     }
   },
   setIsPhoenixNotebooks: (isPhoenixNotebooks: boolean) => set({ isPhoenixNotebooks: isPhoenixNotebooks }),
   setIsPhoenixFeatures: (isPhoenixFeatures: boolean) => set({ isPhoenixFeatures: isPhoenixFeatures }),
-  setIsPhoenixDisabled: (isPhoenixDisabled: boolean) => set({ isPhoenixDisabled: isPhoenixDisabled }),
 }));

src/Explorer/Tree/ResourceTree.tsx

@@ -156,10 +156,8 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
       label: "Gallery",
       iconSrc: GalleryIcon,
       className: "notebookHeader galleryHeader",
-      toolTip: useNotebook.getState().isPhoenixDisabled ? Notebook.notebookDisabledText : undefined,
       onClick: () => container.openGallery(),
       isSelected: () => activeTab?.tabKind === ViewModels.CollectionTabKind.Gallery,
-      isDisabled: useNotebook.getState().isPhoenixDisabled,
     };
   };
 
@@ -525,8 +523,6 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
       children.push({
         label: "Schema (Preview)",
         onClick: collection.onSchemaAnalyzerClick.bind(collection),
-        toolTip: useNotebook.getState().isPhoenixDisabled ? Notebook.notebookDisabledText : undefined,
-        isDisabled: useNotebook.getState().isPhoenixDisabled,
         isSelected: () =>
           useSelectedNode
             .getState()

src/GalleryViewer/GalleryViewer.tsx

@@ -2,7 +2,6 @@ import { initializeIcons, Link, Text } from "@fluentui/react";
 import "bootstrap/dist/css/bootstrap.css";
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import { userContext } from "UserContext";
 import { initializeConfiguration } from "../ConfigContext";
 import { GalleryHeaderComponent } from "../Explorer/Controls/Header/GalleryHeaderComponent";
 import {
@@ -26,9 +25,7 @@ const onInit = async () => {
 
   const props: GalleryAndNotebookViewerComponentProps = {
     junoClient: new JunoClient(),
-    selectedTab:
-      galleryViewerProps.selectedTab ||
-      (userContext.features.publicGallery ? GalleryTab.PublicGallery : GalleryTab.OfficialSamples),
+    selectedTab: galleryViewerProps.selectedTab || GalleryTab.PublicGallery,
     sortBy: galleryViewerProps.sortBy || SortBy.MostRecent,
     searchText: galleryViewerProps.searchText,
   };

src/Phoenix/PhoenixClient.ts

@@ -17,7 +17,6 @@ import {
   ContainerConnectionInfo,
   ContainerInfo,
   IContainerData,
-  IDbAccountAllow,
   IMaxAllocationTimeExceeded,
   IMaxDbAccountsPerUserExceeded,
   IMaxUsersPerDbAccountExceeded,
@@ -104,7 +103,7 @@ export class PhoenixClient {
           const containerStatus = await response.json();
           return {
             durationLeftInMinutes: containerStatus?.durationLeftInMinutes,
-            phoenixServerInfo: containerStatus?.phoenixServerInfo,
+            notebookServerInfo: containerStatus?.notebookServerInfo,
             status: ContainerStatusType.Active,
           };
         } else if (response.status === HttpStatusCodes.NotFound) {
@@ -148,7 +147,7 @@ export class PhoenixClient {
       useNotebook.getState().setIsRefreshed(!useNotebook.getState().isRefreshed);
       return {
         durationLeftInMinutes: undefined,
-        phoenixServerInfo: undefined,
+        notebookServerInfo: undefined,
         status: ContainerStatusType.Disconnected,
       };
     }
@@ -162,17 +161,15 @@ export class PhoenixClient {
     }
   }
 
-  public async getDbAccountAllowedStatus(): Promise<IDbAccountAllow> {
+  public async isDbAcountWhitelisted(): Promise<boolean> {
     const startKey = TelemetryProcessor.traceStart(Action.PhoenixDBAccountAllowed, {
       dataExplorerArea: Areas.Notebook,
     });
-    let responseJson;
     try {
       const response = await window.fetch(`${this.getPhoenixControlPlanePathPrefix()}`, {
         method: "GET",
         headers: PhoenixClient.getHeaders(),
       });
-      responseJson = await response?.json();
       if (response.status !== HttpStatusCodes.OK) {
         throw new Error(`Received status code: ${response?.status}`);
       }
@@ -183,11 +180,7 @@ export class PhoenixClient {
         },
         startKey
       );
-      return {
-        status: response.status,
-        message: responseJson?.message,
-        type: responseJson?.type,
-      };
+      return response.status === HttpStatusCodes.OK;
     } catch (error) {
       TelemetryProcessor.traceFailure(
         Action.PhoenixDBAccountAllowed,
@@ -199,11 +192,7 @@ export class PhoenixClient {
         startKey
       );
       Logger.logError(getErrorMessage(error), "PhoenixClient/IsDbAcountWhitelisted");
-      return {
-        status: HttpStatusCodes.Forbidden,
-        message: responseJson?.message,
-        type: responseJson?.type,
-      };
+      return false;
     }
   }
 

src/SelfServe/SqlX/SqlX.rp.ts

@@ -7,7 +7,6 @@ import SqlX from "./SqlX";
 import {
   FetchPricesResponse,
   PriceMapAndCurrencyCode,
-  RegionItem,
   RegionsResponse,
   SqlxServiceResource,
   UpdateDedicatedGatewayRequestParameters,
@@ -140,7 +139,7 @@ const getGeneralPath = (subscriptionId: string, resourceGroup: string, name: str
   return `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.DocumentDB/databaseAccounts/${name}`;
 };
 
-export const getRegions = async (): Promise<Array<RegionItem>> => {
+export const getRegions = async (): Promise<Array<string>> => {
   const telemetryData = {
     feature: "Calculate approximate cost",
     function: "getRegions",
@@ -150,6 +149,8 @@ export const getRegions = async (): Promise<Array<RegionItem>> => {
   const getRegionsTimestamp = selfServeTraceStart(telemetryData);
 
   try {
+    const regions = new Array<string>();
+
     const response = await armRequestWithoutPolling<RegionsResponse>({
       host: configContext.ARM_ENDPOINT,
       path: getGeneralPath(userContext.subscriptionId, userContext.resourceGroup, userContext.databaseAccount.name),
@@ -157,12 +158,20 @@ export const getRegions = async (): Promise<Array<RegionItem>> => {
       apiVersion: "2021-04-01-preview",
     });
 
+    if (response.result.location !== undefined) {
+      regions.push(response.result.location.split(" ").join("").toLowerCase());
+    } else {
+      for (const location of response.result.locations) {
+        regions.push(location.locationName.split(" ").join("").toLowerCase());
+      }
+    }
+
     selfServeTraceSuccess(telemetryData, getRegionsTimestamp);
-    return response.result.properties.locations;
+    return regions;
   } catch (err) {
     const failureTelemetry = { err, selfServeClassName: SqlX.name };
     selfServeTraceFailure(failureTelemetry, getRegionsTimestamp);
-    return new Array<RegionItem>();
+    return new Array<string>();
   }
 };
 
@@ -170,7 +179,7 @@ const getFetchPricesPathForRegion = (subscriptionId: string): string => {
   return `/subscriptions/${subscriptionId}/providers/Microsoft.CostManagement/fetchPrices`;
 };
 
-export const getPriceMapAndCurrencyCode = async (regions: Array<RegionItem>): Promise<PriceMapAndCurrencyCode> => {
+export const getPriceMapAndCurrencyCode = async (regions: Array<string>): Promise<PriceMapAndCurrencyCode> => {
   const telemetryData = {
     feature: "Calculate approximate cost",
     function: "getPriceMapAndCurrencyCode",
@@ -182,7 +191,7 @@ export const getPriceMapAndCurrencyCode = async (regions: Array<RegionItem>): Pr
   try {
     const priceMap = new Map<string, Map<string, number>>();
     let currencyCode;
-    for (const regionItem of regions) {
+    for (const region of regions) {
       const regionPriceMap = new Map<string, number>();
 
       const response = await armRequestWithoutPolling<FetchPricesResponse>({
@@ -193,7 +202,7 @@ export const getPriceMapAndCurrencyCode = async (regions: Array<RegionItem>): Pr
         queryParams: {
           filter:
             "armRegionName eq '" +
-            regionItem.locationName.split(" ").join("").toLowerCase() +
+            region +
             "' and serviceFamily eq 'Databases' and productName eq 'Azure Cosmos DB Dedicated Gateway - General Purpose'",
         },
       });
@@ -206,7 +215,7 @@ export const getPriceMapAndCurrencyCode = async (regions: Array<RegionItem>): Pr
         }
         regionPriceMap.set(item.skuName, item.retailPrice);
       }
-      priceMap.set(regionItem.locationName, regionPriceMap);
+      priceMap.set(region, regionPriceMap);
     }
 
     selfServeTraceSuccess(telemetryData, getPriceMapAndCurrencyCodeTimestamp);

src/SelfServe/SqlX/SqlX.tsx

@@ -1,4 +1,3 @@
-import { RegionItem } from "SelfServe/SqlX/SqlxTypes";
 import { IsDisplayable, OnChange, PropertyInfo, RefreshOptions, Values } from "../Decorators";
 import {
   selfServeTrace,
@@ -209,7 +208,7 @@ const ApproximateCostDropDownInfo: Info = {
 
 let priceMap: Map<string, Map<string, number>>;
 let currencyCode: string;
-let regions: Array<RegionItem>;
+let regions: Array<string>;
 
 const calculateCost = (skuName: string, instanceCount: number): Description => {
   const telemetryData = {
@@ -222,47 +221,27 @@ const calculateCost = (skuName: string, instanceCount: number): Description => {
 
   try {
     let costPerHour = 0;
-    let costBreakdown = "";
-    for (const regionItem of regions) {
-      const incrementalCost = priceMap.get(regionItem.locationName).get(skuName.replace("Cosmos.", ""));
+    for (const region of regions) {
+      const incrementalCost = priceMap.get(region).get(skuName.replace("Cosmos.", ""));
       if (incrementalCost === undefined) {
-        throw new Error(`${regionItem.locationName} not found in price map.`);
-      } else if (incrementalCost === 0) {
-        throw new Error(`${regionItem.locationName} cost per hour = 0`);
+        throw new Error("Value not found in map.");
       }
-
-      let regionalInstanceCount = instanceCount;
-      if (regionItem.isZoneRedundant) {
-        regionalInstanceCount = Math.ceil(instanceCount * 1.5);
-      }
-
-      const regionalCostPerHour = incrementalCost * regionalInstanceCount;
-      costBreakdown += `
-      ${regionItem.locationName} ${regionItem.isZoneRedundant ? "(AZ)" : ""}
-      ${regionalCostPerHour} ${currencyCode} (${regionalInstanceCount} instances * ${incrementalCost} ${currencyCode})\
-      `;
-
-      if (regionalCostPerHour === 0) {
-        throw new Error(`${regionItem.locationName} Cost per hour = 0`);
-      }
-
-      costPerHour += regionalCostPerHour;
+      costPerHour += incrementalCost;
     }
 
     if (costPerHour === 0) {
       throw new Error("Cost per hour = 0");
     }
 
+    costPerHour *= instanceCount;
     costPerHour = Math.round(costPerHour * 100) / 100;
 
     selfServeTraceSuccess(telemetryData, calculateCostTimestamp);
     return {
-      textTKey: `${costPerHour} ${currencyCode}
-      ${costBreakdown}`,
+      textTKey: `${costPerHour} ${currencyCode}`,
       type: DescriptionType.Text,
     };
   } catch (err) {
-    alert(err);
     const failureTelemetry = { err, regions, priceMap, selfServeClassName: SqlX.name };
     selfServeTraceFailure(failureTelemetry, calculateCostTimestamp);
 

src/SelfServe/SqlX/SqlxTypes.ts

@@ -48,14 +48,10 @@ export type PriceItem = {
 };
 
 export type RegionsResponse = {
-  properties: RegionsProperties;
-};
-
-export type RegionsProperties = {
   locations: Array<RegionItem>;
+  location: string;
 };
 
 export type RegionItem = {
   locationName: string;
-  isZoneRedundant: boolean;
 };

utils/deployment-status/package-lock.json

@@ -51,9 +51,12 @@
       "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
     },
     "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
     },
     "supports-color": {
       "version": "7.1.0",
@@ -62,6 +65,25 @@
       "requires": {
         "has-flag": "^4.0.0"
       }
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
     }
   }
 }

utils/deployment-status/package.json

@@ -12,6 +12,6 @@
   "dependencies": {
     "chalk": "^4.1.0",
     "moment": "^2.27.0",
-    "node-fetch": "^2.6.1"
+    "node-fetch": "^2.6.7"
   }
 }