Rename psql TerminalKind enum

configs/prod.json

@@ -1,5 +1,5 @@
 {
- "JUNO_ENDPOINT": "https://tools.cosmos.azure.com",
- "isTerminalEnabled" : false,
- "isPhoenixEnabled" : false
-}
+    "JUNO_ENDPOINT": "https://localhost",
+    "isTerminalEnabled": false,
+    "isPhoenixEnabled": false
+}

src/Common/Constants.ts

@@ -423,6 +423,6 @@ 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 Prod = "https://localhost";
   public static readonly Stage = "https://tools-staging.cosmos.azure.com";
 }

src/ConfigContext.ts

@@ -69,7 +69,7 @@ let configContext: Readonly<ConfigContext> = {
   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
-  JUNO_ENDPOINT: "https://tools.cosmos.azure.com",
+  JUNO_ENDPOINT: "https://localhost",
   BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
   isTerminalEnabled: false,
   isPhoenixEnabled: false,

src/Contracts/ViewModels.ts

@@ -372,6 +372,7 @@ export enum TerminalKind {
   Default = 0,
   Mongo = 1,
   Cassandra = 2,
+  Postgres = 3,
 }
 
 export interface DataExplorerInputsFrame {

src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx

@@ -74,6 +74,8 @@ export class NotebookTerminalComponent extends React.Component<NotebookTerminalC
         this.props.databaseAccount?.properties.mongoEndpoint || this.props.databaseAccount?.properties.documentEndpoint;
     } else if (StringUtils.endsWith(notebookServerEndpoint, "cassandra")) {
       terminalEndpoint = this.props.databaseAccount?.properties.cassandraEndpoint;
+    } else if (StringUtils.endsWith(notebookServerEndpoint, "postgresql")) {
+      return (this.props.databaseAccount?.properties as any).postgresqlEndpoint;
     }
 
     if (terminalEndpoint) {

src/Explorer/Explorer.tsx

@@ -93,7 +93,8 @@ export default class Explorer {
       dataExplorerArea: Constants.Areas.ResourceTree,
     });
     this._isInitializingNotebooks = false;
-    this.phoenixClient = new PhoenixClient();
+
+    this.phoenixClient = new PhoenixClient(userContext.databaseAccount.id);
     useNotebook.subscribe(
       () => this.refreshCommandBarButtons(),
       (state) => state.isNotebooksEnabledForAccount
@@ -185,7 +186,7 @@ export default class Explorer {
       useNotebook.getState().setNotebookBasePath(userContext.features.notebookBasePath);
     }
 
-    if (userContext.apiType !== "Postgres") {
+    if (!userContext.features.enablePGQuickstart || userContext.apiType !== "Postgres") {
       this.refreshExplorer();
     }
   }
@@ -353,7 +354,7 @@ export default class Explorer {
         (notebookServerInfo && notebookServerInfo.notebookServerEndpoint === undefined))
     ) {
       const provisionData: IProvisionData = {
-        cosmosEndpoint: userContext.databaseAccount.properties.documentEndpoint,
+        cosmosEndpoint: userContext?.databaseAccount?.properties?.documentEndpoint,
         poolId: PoolIdType.DefaultPoolId,
       };
       const connectionStatus: ContainerConnectionInfo = {
@@ -1058,6 +1059,10 @@ export default class Explorer {
         title = "Cassandra Shell";
         break;
 
+      case ViewModels.TerminalKind.Postgres:
+        title = "PSQL Shell";
+        break;
+
       default:
         throw new Error("Terminal kind: ${kind} not supported");
     }

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -34,7 +34,7 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
   const buttons = useCommandBar((state) => state.contextButtons);
   const backgroundColor = StyleConstants.BaseLight;
 
-  if (userContext.apiType === "Postgres") {
+  if (userContext.features.enablePGQuickstart && userContext.apiType === "Postgres") {
     const buttons = CommandBarComponentButtonFactory.createPostgreButtons(container);
     return (
       <div className="commandBarContainer">

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -95,6 +95,8 @@ export function createStaticCommandBarButtons(
       }
     }
 
+    notebookButtons.push(createOpenPsqlTerminalButton(container));
+
     notebookButtons.forEach((btn) => {
       if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
         if (!useNotebook.getState().isPhoenixFeatures) {
@@ -104,6 +106,10 @@ export function createStaticCommandBarButtons(
         if (!useNotebook.getState().isPhoenixFeatures) {
           applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
         }
+      } else if (btn.commandButtonLabel.indexOf("PSQL") !== -1) {
+        if (!useNotebook.getState().isPhoenixFeatures) {
+          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
+        }
       } else if (btn.commandButtonLabel.indexOf("Open Terminal") !== -1) {
         if (!useNotebook.getState().isPhoenixFeatures) {
           applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
@@ -523,6 +529,28 @@ function createOpenCassandraTerminalButton(container: Explorer): CommandButtonCo
   };
 }
 
+function createOpenPsqlTerminalButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open PSQL Shell";
+  const disableButton =
+    !useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled;
+  return {
+    iconSrc: HostedTerminalIcon,
+    iconAlt: label,
+    onCommandClick: () => {
+      if (useNotebook.getState().isNotebookEnabled) {
+        container.openNotebookTerminal(ViewModels.TerminalKind.Postgres);
+      }
+    },
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: disableButton,
+    ariaLabel: label,
+    tooltipText: !disableButton
+      ? ""
+      : "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.",
+  };
+}
+
 function createNotebookWorkspaceResetButton(container: Explorer): CommandButtonComponentProps {
   const label = "Reset Workspace";
   return {

src/Explorer/Notebook/NotebookContainerClient.ts

@@ -23,7 +23,7 @@ export class NotebookContainerClient {
   private scheduleTimerId: NodeJS.Timeout;
 
   constructor(private onConnectionLost: () => void) {
-    this.phoenixClient = new PhoenixClient();
+    this.phoenixClient = new PhoenixClient(userContext.databaseAccount.id);
     this.retryOptions = {
       retries: Notebook.retryAttempts,
       maxTimeout: Notebook.retryAttemptDelayMs,

src/Explorer/Notebook/useNotebook.ts

@@ -307,7 +307,7 @@ export const useNotebook: UseStore<NotebookState> = create((set, get) => ({
       let isPhoenixFeatures = false;
 
       const isPublicInternetAllowed = isPublicInternetAccessAllowed();
-      const phoenixClient = new PhoenixClient();
+      const phoenixClient = new PhoenixClient(userContext.databaseAccount.id);
       const dbAccountAllowedInfo = await phoenixClient.getDbAccountAllowedStatus();
 
       if (dbAccountAllowedInfo.status === HttpStatusCodes.OK) {

src/Explorer/Quickstart/QuickstartGuide.tsx

@@ -119,7 +119,7 @@ WHERE user_id = 3861633;`;
                   <br /> Before you can interact with your data using PGShell, you will need to login - please follow
                   instructions on the right to enter your password
                 </Text>
-                <Youtube videoId="Jvgh64rvdXU" style={{ margin: "20px 0" }} opts={{ width: "80%" }} />
+                <Youtube videoId="Jvgh64rvdXU" style={{ margin: "20px 0" }} opts={{ width: "60%" }} />
               </Stack>
             </PivotItem>
             <PivotItem

src/Explorer/Tabs/TerminalTab.tsx

@@ -95,6 +95,10 @@ export default class TerminalTab extends TabsBase {
         endpointSuffix = "cassandra";
         break;
 
+      case ViewModels.TerminalKind.Postgres:
+        endpointSuffix = "postgresql";
+        break;
+
       default:
         throw new Error(`Terminal kind: ${options.kind} not supported`);
     }

src/Main.tsx

@@ -7,7 +7,6 @@ import { SQLQuickstartTutorial } from "Explorer/Quickstart/Tutorials/SQLQuicksta
 import { useCarousel } from "hooks/useCarousel";
 import React, { useState } from "react";
 import ReactDOM from "react-dom";
-import { userContext } from "UserContext";
 import "../externals/jquery-ui.min.css";
 import "../externals/jquery-ui.min.js";
 import "../externals/jquery-ui.structure.min.css";
@@ -30,8 +29,6 @@ import "../less/TableStyles/EntityEditor.less";
 import "../less/TableStyles/fulldatatables.less";
 import "../less/TableStyles/queryBuilder.less";
 import "../less/tree.less";
-import { CollapsedResourceTree } from "./Common/CollapsedResourceTree";
-import { ResourceTreeContainer } from "./Common/ResourceTreeContainer";
 import "./Explorer/Controls/Accordion/AccordionComponent.less";
 import "./Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.less";
 import { Dialog } from "./Explorer/Controls/Dialog";
@@ -84,26 +81,6 @@ const App: React.FunctionComponent = () => {
         <CommandBar container={explorer} />
         {/* Collections Tree and Tabs - Begin */}
         <div className="resourceTreeAndTabs">
-          {/* Collections Tree - Start */}
-          {userContext.apiType !== "Postgres" && (
-            <div id="resourcetree" data-test="resourceTreeId" className="resourceTree">
-              <div className="collectionsTreeWithSplitter">
-                {/* Collections Tree Expanded - Start */}
-                <ResourceTreeContainer
-                  container={explorer}
-                  toggleLeftPaneExpanded={toggleLeftPaneExpanded}
-                  isLeftPaneExpanded={isLeftPaneExpanded}
-                />
-                {/* Collections Tree Expanded - End */}
-                {/* Collections Tree Collapsed - Start */}
-                <CollapsedResourceTree
-                  toggleLeftPaneExpanded={toggleLeftPaneExpanded}
-                  isLeftPaneExpanded={isLeftPaneExpanded}
-                />
-                {/* Collections Tree Collapsed - End */}
-              </div>
-            </div>
-          )}
           <Tabs explorer={explorer} />
         </div>
         {/* Collections Tree and Tabs - End */}

src/Phoenix/PhoenixClient.ts

@@ -32,6 +32,7 @@ import { userContext } from "../UserContext";
 import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
 
 export class PhoenixClient {
+  private armResourceId: string;
   private containerHealthHandler: NodeJS.Timeout;
   private retryOptions: promiseRetry.Options = {
     retries: Notebook.retryAttempts,
@@ -39,6 +40,10 @@ export class PhoenixClient {
     minTimeout: Notebook.retryAttemptDelayMs,
   };
 
+  constructor(armResourceId: string) {
+    this.armResourceId = armResourceId;
+  }
+
   public async allocateContainer(provisionData: IProvisionData): Promise<IResponse<IPhoenixServiceInfo>> {
     return this.executeContainerAssignmentOperation(provisionData, "allocate");
   }
@@ -214,22 +219,17 @@ export class PhoenixClient {
     }
   }
 
-  public static getPhoenixEndpoint(): string {
-    const phoenixEndpoint =
+  public getPhoenixControlPlanePathPrefix(): string {
+    const toolsEndpoint =
       userContext.features.phoenixEndpoint ?? userContext.features.junoEndpoint ?? configContext.JUNO_ENDPOINT;
-    if (!validateEndpoint(phoenixEndpoint, allowedJunoOrigins)) {
-      const error = `${phoenixEndpoint} not allowed as juno endpoint`;
+
+    if (!validateEndpoint(toolsEndpoint, allowedJunoOrigins)) {
+      const error = `${toolsEndpoint} not allowed as tools endpoint`;
       console.error(error);
       throw new Error(error);
     }
 
-    return phoenixEndpoint;
-  }
-
-  public getPhoenixControlPlanePathPrefix(): string {
-    return `${PhoenixClient.getPhoenixEndpoint()}/api/controlplane/toolscontainer/cosmosaccounts${
-      userContext.databaseAccount.id
-    }`;
+    return `${toolsEndpoint}/api/controlplane/toolscontainer/cosmosaccounts${this.armResourceId}`;
   }
 
   private static getHeaders(): HeadersInit {

src/Terminal/JupyterLabAppFactory.ts

@@ -24,6 +24,10 @@ export class JupyterLabAppFactory {
     this.isShellStarted = content?.includes("Connected to") && content?.includes("cqlsh");
   }
 
+  private isPostgresShellStarted(content: string | undefined) {
+    this.isShellStarted = content?.includes("cqlsh");
+  }
+
   constructor(closeTab: () => void) {
     this.onShellExited = closeTab;
     this.isShellStarted = false;
@@ -36,6 +40,9 @@ export class JupyterLabAppFactory {
       case "Cassandra":
         this.checkShellStarted = this.isCassandraShellStarted;
         break;
+      case "Postgres":
+        this.checkShellStarted = this.isPostgresShellStarted;
+        break;
     }
   }
 

src/UserContext.ts

@@ -86,7 +86,7 @@ function isAccountNewerThanThresholdInMs(createdAt: string, threshold: number) {
 
 function updateUserContext(newContext: Partial<UserContext>): void {
   if (newContext.databaseAccount) {
-    newContext.apiType = "Postgres";
+    newContext.apiType = apiType(newContext.databaseAccount);
 
     const isNewAccount = isAccountNewerThanThresholdInMs(
       newContext.databaseAccount?.systemData?.createdAt || "",
@@ -107,30 +107,34 @@ function updateUserContext(newContext: Partial<UserContext>): void {
   Object.assign(userContext, newContext);
 }
 
-// function apiType(account: DatabaseAccount | undefined): ApiType {
-//   if (!account) {
-//     return "SQL";
-//   }
+function apiType(account: DatabaseAccount | undefined): ApiType {
+  if (!account) {
+    return "SQL";
+  }
 
-//   const capabilities = account.properties?.capabilities;
-//   if (capabilities) {
-//     if (capabilities.find((c) => c.name === "EnableCassandra")) {
-//       return "Cassandra";
-//     }
-//     if (capabilities.find((c) => c.name === "EnableGremlin")) {
-//       return "Gremlin";
-//     }
-//     if (capabilities.find((c) => c.name === "EnableMongo")) {
-//       return "Mongo";
-//     }
-//     if (capabilities.find((c) => c.name === "EnableTable")) {
-//       return "Tables";
-//     }
-//   }
-//   if (account.kind === "MongoDB" || account.kind === "Parse") {
-//     return "Mongo";
-//   }
-//   return "SQL";
-// }
+  if (features.enablePGQuickstart) {
+    return "Postgres";
+  }
+
+  const capabilities = account.properties?.capabilities;
+  if (capabilities) {
+    if (capabilities.find((c) => c.name === "EnableCassandra")) {
+      return "Cassandra";
+    }
+    if (capabilities.find((c) => c.name === "EnableGremlin")) {
+      return "Gremlin";
+    }
+    if (capabilities.find((c) => c.name === "EnableMongo")) {
+      return "Mongo";
+    }
+    if (capabilities.find((c) => c.name === "EnableTable")) {
+      return "Tables";
+    }
+  }
+  if (account.kind === "MongoDB" || account.kind === "Parse") {
+    return "Mongo";
+  }
+  return "SQL";
+}
 
 export { userContext, updateUserContext };