Update use cases

package.json

@@ -47,7 +47,6 @@
     "@types/node-fetch": "2.5.7",
     "applicationinsights": "1.8.0",
     "bootstrap": "3.4.1",
-    "botframework-webchat": "4.14.1",
     "canvas": "file:./canvas",
     "clean-webpack-plugin": "3.0.0",
     "clipboard-copy": "4.0.1",

src/Common/Constants.ts

@@ -398,6 +398,10 @@ 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/Explorer/Controls/CommandButton/CommandButtonComponent.tsx

@@ -1,13 +1,13 @@
 /**
  * React component for Command button component.
  */
-import { Icon, IIconStyles } from "@fluentui/react";
 import * as React from "react";
 import CollapseChevronDownIcon from "../../../../images/QueryBuilder/CollapseChevronDown_16x.png";
 import { KeyCodes } from "../../../Common/Constants";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
 import * as StringUtils from "../../../Utils/StringUtils";
+
 /**
  * Options for this component
  */
@@ -243,7 +243,6 @@ export class CommandButtonComponent extends React.Component<CommandButtonCompone
     if (this.props.children && this.props.children.length > 0) {
       contentClassName += " hasHiddenItems";
     }
-    const iconButtonStyles: Partial<IIconStyles> = { root: { marginBottom: -3 } };
 
     return (
       <div className="commandButtonReact">
@@ -260,18 +259,7 @@ export class CommandButtonComponent extends React.Component<CommandButtonCompone
           onClick={(e: React.MouseEvent<HTMLSpanElement>) => this.commandClickCallback(e)}
         >
           <div className={contentClassName}>
-            if (this.props.iconName){" "}
-            {
-              <div>
-                <Icon
-                  styles={iconButtonStyles}
-                  className="panelInfoIcon"
-                  iconName={this.props.iconName}
-                  ariaLabel="ChatBot"
-                />
-              </div>
-            }{" "}
-            else {<img className="commandIcon" src={this.props.iconSrc} alt={this.props.iconAlt} />}
+            <img className="commandIcon" src={this.props.iconSrc} alt={this.props.iconAlt} />
             {CommandButtonComponent.renderLabel(this.props)}
           </div>
         </span>

src/Explorer/Controls/SupportPaneComponent/SupportPaneComponent.tsx

@@ -1,41 +0,0 @@
-import { Activity } from "botframework-directlinejs";
-import ReactWebChat, { createDirectLine } from "botframework-webchat";
-import React from "react";
-import * as _ from "underscore";
-export interface SupportPaneComponentProps {
-  directLineToken: string;
-  userToken: string;
-  subId: string;
-  rg: string;
-  accName: string;
-}
-
-export class SupportPaneComponent extends React.Component<SupportPaneComponentProps> {
-  private readonly userId: string = _.uniqueId();
-
-  constructor(props: SupportPaneComponentProps) {
-    super(props);
-  }
-
-  public render(): JSX.Element {
-    const styleOptions = {
-      bubbleBackground: "rgba(0, 0, 255, .1)",
-      bubbleFromUserBackground: "rgba(0, 255, 0, .1)",
-    };
-
-    const directLine = createDirectLine({ token: this.props.directLineToken });
-    const dl = {
-      ...directLine,
-      postActivity: (activity: Activity) => {
-        activity.channelData.token = this.props.userToken;
-        activity.channelData.subId = this.props.subId;
-        activity.channelData.rg = this.props.rg;
-        activity.channelData.accName = this.props.accName;
-
-        return directLine.postActivity(activity);
-      },
-    };
-
-    return <ReactWebChat directLine={dl} userID={this.userId} styleOptions={styleOptions} />;
-  }
-}

src/Explorer/Controls/TreeComponent/TreeComponent.tsx

@@ -42,6 +42,8 @@ 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;
@@ -169,9 +171,15 @@ export class TreeNodeComponent extends React.Component<TreeNodeComponentProps, T
 
     return (
       <div
-        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)}
+        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)
+        }
         role="treeitem"
         id={node.id}
       >
@@ -184,7 +192,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.label}>
+            <span className="nodeLabel" title={`${node.toolTip ? node.toolTip : node.label}`}>
               {node.label}
             </span>
           )}
@@ -195,7 +203,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}>
+            <div className="nodeChildren" data-test={node.label} aria-disabled={node.isDisabled}>
               {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,7 +66,11 @@
     }
   }
 }
-
+.disable{
+  background-color: rgb(255, 255, 255);
+  filter: grayscale();
+  color: rgb(161, 159, 157);
+}
 .treeComponentMenuItemContainer {
   font-size: @mediumFontSize;
 

src/Explorer/Explorer.tsx

@@ -1,6 +1,5 @@
 import { Link } from "@fluentui/react/lib/Link";
 import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
-import { configContext } from "ConfigContext";
 import { IGalleryItem } from "Juno/JunoClient";
 import * as ko from "knockout";
 import React from "react";
@@ -35,7 +34,6 @@ import { userContext } from "../UserContext";
 import { getCollectionName, getUploadName } from "../Utils/APITypeUtils";
 import { update } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
 import { listByDatabaseAccount } from "../Utils/arm/generatedClients/cosmosNotebooks/notebookWorkspaces";
-import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
 import { stringToBlob } from "../Utils/BlobUtils";
 import { isCapabilityEnabled } from "../Utils/CapabilityUtils";
 import { fromContentUri, toRawContentUri } from "../Utils/GitHubUtils";
@@ -87,12 +85,6 @@ export default class Explorer {
   // Notebooks
   public notebookManager?: NotebookManager;
 
-  public conversationToken: ko.Observable<string>;
-  public userToken: ko.Observable<string>;
-  public subId: ko.Observable<string>;
-  public rg: ko.Observable<string>;
-  public accName: ko.Observable<string>;
-
   private _isInitializingNotebooks: boolean;
   private notebookToImport: {
     name: string;
@@ -114,10 +106,6 @@ export default class Explorer {
 
     this.queriesClient = new QueriesClient(this);
 
-    this.conversationToken = ko.observable<string>();
-
-    this.generateConversationToken();
-
     useSelectedNode.subscribe(() => {
       // Make sure switching tabs restores tabs display
       this.isTabsContentExpanded(false);
@@ -467,30 +455,6 @@ export default class Explorer {
     useDialog.getState().openDialog(resetConfirmationDialogProps);
   }
 
-  private async generateConversationToken() {
-    const url = `${configContext.JUNO_ENDPOINT}/api/chatbot/bot${userContext.databaseAccount.id}/conversationToken`;
-    const authorizationHeader = getAuthorizationHeader();
-
-    const response = await fetch(url, {
-      method: "GET",
-      headers: {
-        [Constants.HttpHeaders.authorization]: authorizationHeader.token,
-        Accept: "application/json",
-        [Constants.HttpHeaders.contentType]: "application/json",
-      },
-    });
-
-    if (!response.ok) {
-      throw new Error(await response.json());
-    }
-
-    const tokenResponse: { conversationId: string; token: string; expires_in: number } = await response.json();
-    this.conversationToken(tokenResponse?.token);
-    if (tokenResponse?.expires_in) {
-      setTimeout(() => this.generateConversationToken(), (tokenResponse?.expires_in - 1000) * 1000);
-    }
-  }
-
   private async _containsDefaultNotebookWorkspace(databaseAccount: DataModels.DatabaseAccount): Promise<boolean> {
     if (!databaseAccount) {
       return false;
@@ -1063,7 +1027,7 @@ export default class Explorer {
   }
 
   public async openNotebookTerminal(kind: ViewModels.TerminalKind): Promise<void> {
-    if (useNotebook.getState().isPhoenixFeatures) {
+    if (useNotebook.getState().isPhoenixFeatures && !useNotebook.getState().isPhoenixDisabled) {
       await this.allocateContainer();
       const notebookServerInfo = useNotebook.getState().notebookServerInfo;
       if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint !== undefined) {

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -26,7 +26,6 @@ import { userContext } from "../../../UserContext";
 import { getCollectionName, getDatabaseName } from "../../../Utils/APITypeUtils";
 import { isRunningOnNationalCloud } from "../../../Utils/CloudUtils";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
-import { SupportPaneComponent } from "../../Controls/SupportPaneComponent/SupportPaneComponent";
 import Explorer from "../../Explorer";
 import { useNotebook } from "../../Notebook/useNotebook";
 import { OpenFullScreen } from "../../OpenFullScreen";
@@ -76,7 +75,11 @@ export function createStaticCommandBarButtons(
     if (container.notebookManager?.gitHubOAuthService) {
       notebookButtons.push(createManageGitHubAccountButton(container));
     }
-    if (useNotebook.getState().isPhoenixFeatures && configContext.isTerminalEnabled) {
+    if (
+      useNotebook.getState().isPhoenixFeatures &&
+      !useNotebook.getState().isPhoenixDisabled &&
+      configContext.isTerminalEnabled
+    ) {
       notebookButtons.push(createOpenTerminalButton(container));
     }
     if (useNotebook.getState().isPhoenixNotebooks && selectedNodeState.isConnectedToContainer()) {
@@ -84,8 +87,8 @@ export function createStaticCommandBarButtons(
     }
     if (
       (userContext.apiType === "Mongo" &&
-        useNotebook.getState().isShellEnabled &&
-        selectedNodeState.isDatabaseNodeOrNoneSelected()) ||
+        selectedNodeState.isDatabaseNodeOrNoneSelected() &&
+        useNotebook.getState().isShellEnabled) ||
       userContext.apiType === "Cassandra"
     ) {
       notebookButtons.push(createDivider());
@@ -97,16 +100,26 @@ 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 (!useNotebook.getState().isPhoenixFeatures) {
-          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
+        if (isPhoenixFeaturesDownMsg) {
+          applyNotebooksStyleProps(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
+        } else if (useNotebook.getState().isPhoenixDisabled) {
+          applyNotebooksStyleProps(btn, Constants.Notebook.notebookDisabledText);
         }
       } else if (btn.commandButtonLabel.indexOf("Mongo") !== -1) {
-        if (!useNotebook.getState().isPhoenixFeatures) {
-          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
+        if (isPhoenixFeaturesDownMsg) {
+          applyNotebooksStyleProps(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
+        } else if (useNotebook.getState().isPhoenixDisabled) {
+          applyNotebooksStyleProps(btn, Constants.Notebook.notebookDisabledText);
         }
-      } else if (!useNotebook.getState().isPhoenixNotebooks) {
-        applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
+      } else if (isPhoenixFeaturesDownMsg) {
+        applyNotebooksStyleProps(btn, Constants.Notebook.temporarilyDownMsg);
+      } else if (useNotebook.getState().isPhoenixDisabled) {
+        applyNotebooksStyleProps(btn, Constants.Notebook.notebookDisabledText);
       }
       buttons.push(btn);
     });
@@ -155,25 +168,38 @@ export function createContextCommandBarButtons(
   selectedNodeState: SelectedNodeState
 ): CommandButtonComponentProps[] {
   const buttons: CommandButtonComponentProps[] = [];
-
   if (!selectedNodeState.isDatabaseNodeOrNoneSelected() && userContext.apiType === "Mongo") {
-    const label = useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell";
-    const newMongoShellBtn: CommandButtonComponentProps = {
+    const isPhoenixShellDisabled = !useNotebook.getState().isShellEnabled || useNotebook.getState().isPhoenixDisabled;
+    const phoenixMongoShellBtn: CommandButtonComponentProps = {
       iconSrc: HostedTerminalIcon,
-      iconAlt: label,
+      iconAlt: "Open Mongo Shell",
       onCommandClick: () => {
-        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled) {
-          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
-        } else {
-          selectedCollection && selectedCollection.onNewMongoShellClick();
-        }
+        container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
       },
-      commandButtonLabel: label,
-      ariaLabel: label,
+      commandButtonLabel: "Open Mongo Shell",
+      ariaLabel: "Open Mongo Shell",
       hasPopup: true,
+      disabled: isPhoenixShellDisabled,
+      tooltipText: isPhoenixShellDisabled ? Constants.Notebook.notebookDisabledText : undefined,
     };
-    buttons.push(newMongoShellBtn);
+    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();
+          selectedCollection && selectedCollection.onNewMongoShellClick();
+        },
+        commandButtonLabel: label,
+        ariaLabel: label,
+        hasPopup: true,
+        disabled: false,
+        tooltipText: label,
+      };
+      buttons.push(newMongoShellBtn);
+    }
   }
 
   return buttons;
@@ -196,35 +222,6 @@ export function createControlCommandBarButtons(container: Explorer): CommandButt
   const showOpenFullScreen =
     configContext.platform === Platform.Portal && !isRunningOnNationalCloud() && userContext.apiType !== "Gremlin";
 
-  if (userContext.authType === AuthType.AAD && userContext.features.enableChatbot) {
-    const label = "Chat Assistant";
-    const supportPaneButton: CommandButtonComponentProps = {
-      iconName: "ChatBot",
-      iconAlt: label,
-      onCommandClick: () => {
-        useSidePanel
-          .getState()
-          .openSidePanel(
-            "Chat Assistant (Beta)",
-            <SupportPaneComponent
-              directLineToken={container.conversationToken()}
-              userToken={userContext.authorizationToken}
-              subId={userContext.subscriptionId}
-              rg={userContext.resourceGroup}
-              accName={userContext.databaseAccount.name}
-            />
-          );
-      },
-      commandButtonLabel: null,
-      ariaLabel: label,
-      tooltipText: label,
-      hasPopup: true,
-      disabled: false,
-      className: "fonticoncustom",
-    };
-    buttons.push(supportPaneButton);
-  }
-
   if (showOpenFullScreen) {
     const label = "Open Full Screen";
     const fullScreenButton: CommandButtonComponentProps = {
@@ -431,7 +428,7 @@ export function createScriptCommandButtons(selectedNodeState: SelectedNodeState)
   return buttons;
 }
 
-function applyNotebooksTemporarilyDownStyle(buttonProps: CommandButtonComponentProps, tooltip: string): void {
+function applyNotebooksStyleProps(buttonProps: CommandButtonComponentProps, tooltip: string): void {
   if (!buttonProps.isDivider) {
     buttonProps.disabled = true;
     buttonProps.tooltipText = tooltip;
@@ -507,10 +504,11 @@ 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().isNotebooksEnabledForAccount &&
+    (!useNotebook.getState().isNotebookEnabled ||
+      !useNotebook.getState().isShellEnabled ||
+      useNotebook.getState().isPhoenixDisabled);
   return {
     iconSrc: HostedTerminalIcon,
     iconAlt: label,
@@ -523,7 +521,7 @@ function createOpenMongoTerminalButton(container: Explorer): CommandButtonCompon
     hasPopup: false,
     disabled: disableButton,
     ariaLabel: label,
-    tooltipText: !disableButton ? "" : tooltip,
+    tooltipText: !disableButton ? undefined : Constants.Notebook.notebookDisabledText,
   };
 }
 

src/Explorer/Menus/CommandBar/ConnectionStatusComponent.less

@@ -36,16 +36,17 @@
         outline: 0px;
     }
 }
+.disableText{
+  background-color: rgb(255, 255, 255)!important;
+  filter: grayscale();
+  color: rgb(161, 159, 157)!important;
+}
 .connectIcon{
         margin: 0px 4px;
         height: 18px;
         width: 18px;
         color: rgb(0, 120, 212);
 } 
-.fonticoncustom {
-  padding-top: 12px;
-} 
-
   .status {
     position: relative;
     display: block;

src/Explorer/Menus/CommandBar/ConnectionStatusComponent.tsx

@@ -23,6 +23,8 @@ 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);
@@ -77,6 +79,12 @@ 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);
@@ -93,11 +101,18 @@ export const ConnectionStatus: React.FC<Props> = ({ container }: Props): JSX.Ele
     (connectionInfo.status === ConnectionStatusType.Connect || connectionInfo.status === ConnectionStatusType.Reconnect)
   ) {
     return (
-      <ActionButton className="commandReactBtn" onClick={() => container.allocateContainer()}>
+      <ActionButton
+        className={isPhoenixDisabled ? "disableText commandReactBtn" : "commandReactBtn"}
+        disabled={isPhoenixDisabled}
+        onClick={() => !isPhoenixDisabled && container.allocateContainer()}
+      >
         <TooltipHost content={toolTipContent}>
           <Stack className="connectionStatusContainer" horizontal>
-            <Icon iconName="ConnectVirtualMachine" className="connectIcon" />
-            <span>{connectionInfo.status}</span>
+            <Icon
+              iconName="ConnectVirtualMachine"
+              className={isPhoenixDisabled ? "connectIcon disableText" : "connectIcon"}
+            />
+            <span className={isPhoenixDisabled ? "disableText" : ""}>{connectionInfo.status}</span>
           </Stack>
         </TooltipHost>
       </ActionButton>

src/Explorer/Notebook/useNotebook.ts

@@ -40,6 +40,7 @@ interface NotebookState {
   containerStatus: ContainerInfo;
   isPhoenixNotebooks: boolean;
   isPhoenixFeatures: boolean;
+  isPhoenixDisabled: boolean;
   setIsNotebookEnabled: (isNotebookEnabled: boolean) => void;
   setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => void;
   setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
@@ -64,6 +65,7 @@ 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) => ({
@@ -100,6 +102,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   },
   isPhoenixNotebooks: undefined,
   isPhoenixFeatures: undefined,
+  isPhoenixDisabled: undefined,
   setIsNotebookEnabled: (isNotebookEnabled: boolean) => set({ isNotebookEnabled }),
   setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => set({ isNotebooksEnabledForAccount }),
   setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) =>
@@ -305,6 +308,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
     if (get().isPhoenixNotebooks === undefined || get().isPhoenixFeatures === undefined) {
       let isPhoenixNotebooks = false;
       let isPhoenixFeatures = false;
+      let isPhoenixDisabled = false;
 
       const isPublicInternetAllowed = isPublicInternetAccessAllowed();
       const phoenixClient = new PhoenixClient();
@@ -312,18 +316,30 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
 
       if (dbAccountAllowedInfo.status === HttpStatusCodes.OK) {
         if (dbAccountAllowedInfo?.type === PhoenixErrorType.PhoenixFlightFallback) {
-          isPhoenixNotebooks = isPublicInternetAllowed && userContext.features.phoenixNotebooks;
-          isPhoenixFeatures = isPublicInternetAllowed && userContext.features.phoenixFeatures;
+          isPhoenixNotebooks = userContext.features.phoenixNotebooks;
+          isPhoenixFeatures = userContext.features.phoenixFeatures;
+          isPhoenixDisabled = !isPublicInternetAllowed && (isPhoenixNotebooks || isPhoenixFeatures);
         } else {
-          isPhoenixNotebooks = isPhoenixFeatures = isPublicInternetAllowed;
+          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;
       }
+
       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,8 +156,10 @@ 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,
     };
   };
 
@@ -523,6 +525,8 @@ 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/Platform/Hosted/extractFeatures.ts

@@ -29,7 +29,6 @@ export type Features = {
   readonly mongoProxyEndpoint?: string;
   readonly mongoProxyAPIs?: string;
   readonly enableThroughputCap: boolean;
-  readonly enableChatbot?: boolean;
 
   // can be set via both flight and feature flag
   autoscaleDefault: boolean;
@@ -91,7 +90,6 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     partitionKeyDefault2: "true" === get("pkpartitionkeytest"),
     notebooksDownBanner: "true" === get("notebooksDownBanner"),
     enableThroughputCap: "true" === get("enablethroughputcap"),
-    enableChatbot: "true" === get("enablechatbot"),
   };
 }
 

tsconfig.json

@@ -21,8 +21,7 @@
     "resolveJsonModule": true,
     "noEmit": true,
     "types": ["jest"],
-    "baseUrl": "src",
-    "skipLibCheck": true
+    "baseUrl": "src"
   },
   "typedocOptions": {
     "entryPoints": [