Hidding container connection status behind the feature flag and initi… (#1019)

* Hidding container connection status behind the feature flag and initializing scratch issue

* maintaining connecting status UX part at notebooks context

* Changing scratch name to temporary and showing only after connected

src/Common/Constants.ts

@@ -340,7 +340,6 @@ export enum ConflictOperationType {
 
 export enum ConnectionStatusType {
   Connecting = "Connecting",
-  Allocating = "Allocating",
   Connected = "Connected",
   Failed = "Connection Failed",
 }

src/Explorer/Explorer.tsx

@@ -4,7 +4,6 @@ import _ from "underscore";
 import { AuthType } from "../AuthType";
 import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer";
 import * as Constants from "../Common/Constants";
-import { ConnectionStatusType } from "../Common/Constants";
 import { readCollection } from "../Common/dataAccess/readCollection";
 import { readDatabases } from "../Common/dataAccess/readDatabases";
 import { isPublicInternetAccessAllowed } from "../Common/DatabaseAccountUtility";
@@ -347,10 +346,6 @@ export default class Explorer {
     }
     this._isInitializingNotebooks = true;
     if (userContext.features.phoenix) {
-      const connectionStatus: DataModels.ContainerConnectionInfo = {
-        status: ConnectionStatusType.Allocating,
-      };
-      useNotebook.getState().setConnectionInfo(connectionStatus);
       const provisionData = {
         cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
         resourceId: userContext.databaseAccount.id,
@@ -361,9 +356,6 @@ export default class Explorer {
       };
       const connectionInfo = await this.phoenixClient.containerConnectionInfo(provisionData);
       if (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,

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -9,6 +9,7 @@ import create, { UseStore } from "zustand";
 import { StyleConstants } from "../../../Common/Constants";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { useTabs } from "../../../hooks/useTabs";
+import { userContext } from "../../../UserContext";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
 import { useSelectedNode } from "../../useSelectedNode";
@@ -54,7 +55,13 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
   const uiFabricControlButtons = CommandBarUtil.convertButton(controlButtons, backgroundColor);
   uiFabricControlButtons.forEach((btn: ICommandBarItemProps) => (btn.iconOnly = true));
 
-  uiFabricControlButtons.unshift(CommandBarUtil.createConnectionStatus("connectionStatus"));
+  if (
+    userContext.features.notebooksTemporarilyDown === false &&
+    userContext.features.phoenix === true &&
+    useTabs.getState().activeTab?.tabKind === ViewModels.CollectionTabKind.NotebookV2
+  ) {
+    uiFabricControlButtons.unshift(CommandBarUtil.createConnectionStatus("connectionStatus"));
+  }
 
   if (useTabs.getState().activeTab?.tabKind === ViewModels.CollectionTabKind.NotebookV2) {
     uiFabricControlButtons.unshift(CommandBarUtil.createMemoryTracker("memoryTracker"));

src/Explorer/Menus/CommandBar/ConnectionStatusComponent.tsx

@@ -1,4 +1,4 @@
-import { Icon, ProgressIndicator, Spinner, SpinnerSize, Stack, TooltipHost } from "@fluentui/react";
+import { Icon, ProgressIndicator, Stack, TooltipHost } from "@fluentui/react";
 import * as React from "react";
 import { ConnectionStatusType } from "../../../Common/Constants";
 import { useNotebook } from "../../Notebook/useNotebook";
@@ -40,14 +40,9 @@ export const ConnectionStatus: React.FC = (): JSX.Element => {
 
   const connectionInfo = useNotebook((state) => state.connectionInfo);
   if (!connectionInfo) {
-    return (
-      <Stack className="connectionStatusContainer" horizontal>
-        <span>Connecting</span>
-        <Spinner size={SpinnerSize.medium} />
-      </Stack>
-    );
+    return <></>;
   }
-  if (connectionInfo && connectionInfo.status === ConnectionStatusType.Allocating && isActive === false) {
+  if (connectionInfo && connectionInfo.status === ConnectionStatusType.Connecting && isActive === false) {
     setIsActive(true);
   } else if (connectionInfo && connectionInfo.status === ConnectionStatusType.Connected && isActive === true) {
     stopTimer();
@@ -68,7 +63,7 @@ export const ConnectionStatus: React.FC = (): JSX.Element => {
         <span className={connectionInfo.status === ConnectionStatusType.Failed ? "connectionStatusFailed" : ""}>
           {connectionInfo.status}
         </span>
-        {connectionInfo.status === ConnectionStatusType.Allocating && isActive && (
+        {connectionInfo.status === ConnectionStatusType.Connecting && isActive && (
           <ProgressIndicator description={minute + ":" + second} />
         )}
       </Stack>

src/Explorer/Notebook/useNotebook.ts

@@ -29,7 +29,7 @@ interface NotebookState {
   gitHubNotebooksContentRoot: NotebookContentItem;
   galleryContentRoot: NotebookContentItem;
   connectionInfo: DataModels.ContainerConnectionInfo;
-  NotebookFolderName: string;
+  notebookFolderName: string;
   setIsNotebookEnabled: (isNotebookEnabled: boolean) => void;
   setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => void;
   setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => void;
@@ -38,6 +38,7 @@ interface NotebookState {
   setMemoryUsageInfo: (memoryUsageInfo: DataModels.MemoryUsageInfo) => void;
   setIsShellEnabled: (isShellEnabled: boolean) => void;
   setNotebookBasePath: (notebookBasePath: string) => void;
+  setNotebookFolderName: (notebookFolderName: string) => void;
   refreshNotebooksEnabledStateForAccount: () => Promise<void>;
   findItem: (root: NotebookContentItem, item: NotebookContentItem) => NotebookContentItem;
   insertNotebookItem: (parent: NotebookContentItem, item: NotebookContentItem, isGithubTree?: boolean) => void;
@@ -69,7 +70,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   gitHubNotebooksContentRoot: undefined,
   galleryContentRoot: undefined,
   connectionInfo: undefined,
-  NotebookFolderName: userContext.features.phoenix ? "My Notebooks Scratch" : "My Notebooks",
+  notebookFolderName: undefined,
   setIsNotebookEnabled: (isNotebookEnabled: boolean) => set({ isNotebookEnabled }),
   setIsNotebooksEnabledForAccount: (isNotebooksEnabledForAccount: boolean) => set({ isNotebooksEnabledForAccount }),
   setNotebookServerInfo: (notebookServerInfo: DataModels.NotebookWorkspaceConnectionInfo) =>
@@ -80,6 +81,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
   setMemoryUsageInfo: (memoryUsageInfo: DataModels.MemoryUsageInfo) => set({ memoryUsageInfo }),
   setIsShellEnabled: (isShellEnabled: boolean) => set({ isShellEnabled }),
   setNotebookBasePath: (notebookBasePath: string) => set({ notebookBasePath }),
+  setNotebookFolderName: (notebookFolderName: string) => set({ notebookFolderName }),
   refreshNotebooksEnabledStateForAccount: async (): Promise<void> => {
     const { databaseAccount, authType } = userContext;
     if (
@@ -173,8 +175,10 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
     isGithubTree ? set({ gitHubNotebooksContentRoot: root }) : set({ myNotebooksContentRoot: root });
   },
   initializeNotebooksTree: async (notebookManager: NotebookManager): Promise<void> => {
+    const notebookFolderName = userContext.features.phoenix === true ? "Temporary Notebooks" : "My Notebooks";
+    set({ notebookFolderName });
     const myNotebooksContentRoot = {
-      name: get().NotebookFolderName,
+      name: get().notebookFolderName,
       path: get().notebookBasePath,
       type: NotebookContentItemType.Directory,
     };

src/Explorer/Panes/CopyNotebookPane/CopyNotebookPaneComponent.tsx

@@ -49,8 +49,8 @@ export const CopyNotebookPaneComponent: FunctionComponent<CopyNotebookPaneProps>
     const options: IDropdownOption[] = [];
     options.push({
       key: "MyNotebooks-Item",
-      text: useNotebook.getState().NotebookFolderName,
-      title: useNotebook.getState().NotebookFolderName,
+      text: useNotebook.getState().notebookFolderName,
+      title: useNotebook.getState().notebookFolderName,
       data: {
         type: "MyNotebooks",
       } as Location,

src/Explorer/Tree/ResourceTree.tsx

@@ -11,7 +11,7 @@ import NotebookIcon from "../../../images/notebook/Notebook-resource.svg";
 import PublishIcon from "../../../images/notebook/publish_content.svg";
 import RefreshIcon from "../../../images/refresh-cosmos.svg";
 import CollectionIcon from "../../../images/tree-collection.svg";
-import { Areas, Notebook } from "../../Common/Constants";
+import { Areas, ConnectionStatusType, Notebook } from "../../Common/Constants";
 import { isPublicInternetAccessAllowed } from "../../Common/DatabaseAccountUtility";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
@@ -128,15 +128,13 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ container }: Resourc
         notebooksTree.children.push(buildGalleryNotebooksTree());
       }
 
-      if (myNotebooksContentRoot) {
+      if (myNotebooksContentRoot && useNotebook.getState().connectionInfo.status == ConnectionStatusType.Connected) {
         notebooksTree.children.push(buildMyNotebooksTree());
       }
       if (container.notebookManager?.gitHubOAuthService.isLoggedIn()) {
         // collapse all other notebook nodes
         notebooksTree.children.forEach((node) => (node.isExpanded = false));
         notebooksTree.children.push(buildGitHubNotebooksTree(true));
-      } else if (container.notebookManager && !container.notebookManager.gitHubOAuthService.isLoggedIn()) {
-        notebooksTree.children.push(buildGitHubNotebooksTree(false));
       }
     }
     return notebooksTree;

src/Explorer/Tree/ResourceTreeAdapter.tsx

@@ -132,7 +132,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
       type: NotebookContentItemType.File,
     };
     this.myNotebooksContentRoot = {
-      name: useNotebook.getState().NotebookFolderName,
+      name: useNotebook.getState().notebookFolderName,
       path: useNotebook.getState().notebookBasePath,
       type: NotebookContentItemType.Directory,
     };

src/Phoenix/PhoenixClient.ts

@@ -1,6 +1,6 @@
 import { ConnectionStatusType, HttpHeaders, HttpStatusCodes } from "../Common/Constants";
 import { configContext } from "../ConfigContext";
-import * as DataModels from "../Contracts/DataModels";
+import { ContainerConnectionInfo } from "../Contracts/DataModels";
 import { useNotebook } from "../Explorer/Notebook/useNotebook";
 import { userContext } from "../UserContext";
 import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
@@ -25,25 +25,40 @@ export class PhoenixClient {
   public async containerConnectionInfo(
     provisionData: IProvosionData
   ): Promise<IPhoenixResponse<IPhoenixConnectionInfoResult>> {
-    const response = await window.fetch(`${this.getPhoenixContainerPoolingEndPoint()}/provision`, {
-      method: "POST",
-      headers: PhoenixClient.getHeaders(),
-      body: JSON.stringify(provisionData),
-    });
-    let data: IPhoenixConnectionInfoResult;
-    if (response.status === HttpStatusCodes.OK) {
-      data = await response.json();
-    } else {
-      const connectionStatus: DataModels.ContainerConnectionInfo = {
+    try {
+      const connectionStatus: ContainerConnectionInfo = {
+        status: ConnectionStatusType.Connecting,
+      };
+      useNotebook.getState().setConnectionInfo(connectionStatus);
+      const response = await window.fetch(`${this.getPhoenixContainerPoolingEndPoint()}/provision`, {
+        method: "POST",
+        headers: PhoenixClient.getHeaders(),
+        body: JSON.stringify(provisionData),
+      });
+      let data: IPhoenixConnectionInfoResult;
+      if (response.status === HttpStatusCodes.OK) {
+        data = await response.json();
+        if (data && data.notebookServerUrl) {
+          connectionStatus.status = ConnectionStatusType.Connected;
+          useNotebook.getState().setConnectionInfo(connectionStatus);
+        }
+      } else {
+        connectionStatus.status = ConnectionStatusType.Failed;
+        useNotebook.getState().setConnectionInfo(connectionStatus);
+      }
+
+      return {
+        status: response.status,
+        data,
+      };
+    } catch (error) {
+      const connectionStatus: ContainerConnectionInfo = {
         status: ConnectionStatusType.Failed,
       };
       useNotebook.getState().setConnectionInfo(connectionStatus);
+      console.error(error);
+      throw error;
     }
-
-    return {
-      status: response.status,
-      data,
-    };
   }
 
   public static getPhoenixEndpoint(): string {

src/Utils/GalleryUtils.test.ts

@@ -2,6 +2,7 @@ import { HttpStatusCodes } from "../Common/Constants";
 import { useDialog } from "../Explorer/Controls/Dialog";
 import { GalleryTab, SortBy } from "../Explorer/Controls/NotebookGallery/GalleryViewerComponent";
 import Explorer from "../Explorer/Explorer";
+import { useNotebook } from "../Explorer/Notebook/useNotebook";
 import { IGalleryItem, JunoClient } from "../Juno/JunoClient";
 import * as GalleryUtils from "./GalleryUtils";
 
@@ -34,7 +35,7 @@ describe("GalleryUtils", () => {
 
     expect(useDialog.getState().visible).toBe(true);
     expect(useDialog.getState().dialogProps).toBeDefined();
-    expect(useDialog.getState().dialogProps.title).toBe("Download to My Notebooks");
+    expect(useDialog.getState().dialogProps.title).toBe(`Download to ${useNotebook.getState().notebookFolderName}`);
   });
 
   it("favoriteItem favorites item", async () => {

src/Utils/GalleryUtils.ts

@@ -224,12 +224,12 @@ export function downloadItem(
 
   const name = data.name;
   useDialog.getState().showOkCancelModalDialog(
-    `Download to ${useNotebook.getState().NotebookFolderName}`,
+    `Download to ${useNotebook.getState().notebookFolderName}`,
     `Download ${name} from gallery as a copy to your notebooks to run and/or edit the notebook.`,
     "Download",
     async () => {
       const clearInProgressMessage = logConsoleProgress(
-        `Downloading ${name} to ${useNotebook.getState().NotebookFolderName}`
+        `Downloading ${name} to ${useNotebook.getState().notebookFolderName}`
       );
       const startKey = traceStart(Action.NotebooksGalleryDownload, {
         notebookId: data.id,