Bump shell-quote and react-dev-utils

Bumps [shell-quote](https://github.com/substack/node-shell-quote) to 1.7.3 and updates ancestor dependency [react-dev-utils](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-dev-utils). These dependencies need to be updated together.


Updates `shell-quote` from 1.7.2 to 1.7.3
- [Release notes](https://github.com/substack/node-shell-quote/releases)
- [Commits](https://github.com/substack/node-shell-quote/commits)

Updates `react-dev-utils` from 11.0.4 to 12.0.1
- [Release notes](https://github.com/facebook/create-react-app/releases)
- [Changelog](https://github.com/facebook/create-react-app/blob/main/CHANGELOG-1.x.md)
- [Commits](https://github.com/facebook/create-react-app/commits/react-dev-utils@12.0.1/packages/react-dev-utils)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-type: indirect
- dependency-name: react-dev-utils
  dependency-type: direct:development
...

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

.github/workflows/ci.yml

@@ -182,7 +182,7 @@ jobs:
         with:
           name: dist
       - run: cp ./configs/prod.json config.json
-      - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "GitHub" -Password "$AZURE_DEVOPS_PAT"
+      - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "vimeng@microsoft.com" -Password "$AZURE_DEVOPS_PAT"
       - run: nuget pack -Version "2.0.0-github-${GITHUB_SHA}"
       - run: nuget push -SkipDuplicate -Source "$NUGET_SOURCE" -ApiKey Az *.nupkg
       - uses: actions/upload-artifact@v2
@@ -207,7 +207,7 @@ jobs:
           name: dist
       - run: cp ./configs/mpac.json config.json
       - run: sed -i 's/Azure.Cosmos.DB.Data.Explorer/Azure.Cosmos.DB.Data.Explorer.MPAC/g' DataExplorer.nuspec
-      - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "GitHub" -Password "$AZURE_DEVOPS_PAT"
+      - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "vimeng@microsoft.com" -Password "$AZURE_DEVOPS_PAT"
       - run: nuget pack -Version "2.0.0-github-${GITHUB_SHA}"
       - run: nuget push -SkipDuplicate -Source "$NUGET_SOURCE" -ApiKey Az *.nupkg
       - uses: actions/upload-artifact@v2

configs/prod.json

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

package.json

@@ -171,7 +171,7 @@
     "prettier": "2.2.1",
     "process": "0.11.10",
     "raw-loader": "0.5.1",
-    "react-dev-utils": "11.0.4",
+    "react-dev-utils": "12.0.1",
     "rimraf": "3.0.0",
     "sinon": "3.2.1",
     "style-loader": "0.23.0",

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://localhost";
+  public static readonly Prod = "https://tools.cosmos.azure.com";
   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://localhost",
+  JUNO_ENDPOINT: "https://tools.cosmos.azure.com",
   BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
   isTerminalEnabled: false,
   isPhoenixEnabled: false,

src/Contracts/ViewModels.ts

@@ -372,7 +372,6 @@ export enum TerminalKind {
   Default = 0,
   Mongo = 1,
   Cassandra = 2,
-  Postgres = 3,
 }
 
 export interface DataExplorerInputsFrame {
@@ -396,6 +395,7 @@ export interface DataExplorerInputsFrame {
   sharedThroughputDefault?: number;
   dataExplorerVersion?: string;
   defaultCollectionThroughput?: CollectionCreationDefaults;
+  isPostgresAccount?: boolean;
   flights?: readonly string[];
   features?: {
     [key: string]: string;

src/Explorer/Controls/Notebook/NotebookTerminalComponent.tsx

@@ -74,8 +74,6 @@ 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,8 +93,7 @@ export default class Explorer {
       dataExplorerArea: Constants.Areas.ResourceTree,
     });
     this._isInitializingNotebooks = false;
-
-    this.phoenixClient = new PhoenixClient(userContext.databaseAccount.id);
+    this.phoenixClient = new PhoenixClient();
     useNotebook.subscribe(
       () => this.refreshCommandBarButtons(),
       (state) => state.isNotebooksEnabledForAccount
@@ -186,7 +185,7 @@ export default class Explorer {
       useNotebook.getState().setNotebookBasePath(userContext.features.notebookBasePath);
     }
 
-    if (!userContext.features.enablePGQuickstart || userContext.apiType !== "Postgres") {
+    if (userContext.apiType !== "Postgres") {
       this.refreshExplorer();
     }
   }
@@ -354,7 +353,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 = {
@@ -1059,10 +1058,6 @@ 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.features.enablePGQuickstart && userContext.apiType === "Postgres") {
+  if (userContext.apiType === "Postgres") {
     const buttons = CommandBarComponentButtonFactory.createPostgreButtons(container);
     return (
       <div className="commandBarContainer">

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -95,8 +95,6 @@ export function createStaticCommandBarButtons(
       }
     }
 
-    notebookButtons.push(createOpenPsqlTerminalButton(container));
-
     notebookButtons.forEach((btn) => {
       if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
         if (!useNotebook.getState().isPhoenixFeatures) {
@@ -106,10 +104,6 @@ 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);
@@ -529,28 +523,6 @@ 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(userContext.databaseAccount.id);
+    this.phoenixClient = new PhoenixClient();
     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(userContext.databaseAccount.id);
+      const phoenixClient = new PhoenixClient();
       const dbAccountAllowedInfo = await phoenixClient.getDbAccountAllowedStatus();
 
       if (dbAccountAllowedInfo.status === HttpStatusCodes.OK) {

src/Explorer/Tabs/TerminalTab.tsx

@@ -95,10 +95,6 @@ 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,6 +7,7 @@ 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";
@@ -29,6 +30,8 @@ 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";
@@ -81,6 +84,26 @@ 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,7 +32,6 @@ 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,
@@ -40,10 +39,6 @@ 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");
   }
@@ -219,17 +214,22 @@ export class PhoenixClient {
     }
   }
 
-  public getPhoenixControlPlanePathPrefix(): string {
-    const toolsEndpoint =
+  public static getPhoenixEndpoint(): string {
+    const phoenixEndpoint =
       userContext.features.phoenixEndpoint ?? userContext.features.junoEndpoint ?? configContext.JUNO_ENDPOINT;
-
-    if (!validateEndpoint(toolsEndpoint, allowedJunoOrigins)) {
-      const error = `${toolsEndpoint} not allowed as tools endpoint`;
+    if (!validateEndpoint(phoenixEndpoint, allowedJunoOrigins)) {
+      const error = `${phoenixEndpoint} not allowed as juno endpoint`;
       console.error(error);
       throw new Error(error);
     }
 
-    return `${toolsEndpoint}/api/controlplane/toolscontainer/cosmosaccounts${this.armResourceId}`;
+    return phoenixEndpoint;
+  }
+
+  public getPhoenixControlPlanePathPrefix(): string {
+    return `${PhoenixClient.getPhoenixEndpoint()}/api/controlplane/toolscontainer/cosmosaccounts${
+      userContext.databaseAccount.id
+    }`;
   }
 
   private static getHeaders(): HeadersInit {

src/Platform/Hosted/extractFeatures.ts

@@ -29,7 +29,6 @@ export type Features = {
   readonly mongoProxyEndpoint?: string;
   readonly mongoProxyAPIs?: string;
   readonly enableThroughputCap: boolean;
-  readonly enablePGQuickstart: 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"),
-    enablePGQuickstart: "true" === get("enablepgquickstart"),
   };
 }
 

src/Terminal/JupyterLabAppFactory.ts

@@ -24,10 +24,6 @@ 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;
@@ -40,9 +36,6 @@ export class JupyterLabAppFactory {
       case "Cassandra":
         this.checkShellStarted = this.isCassandraShellStarted;
         break;
-      case "Postgres":
-        this.checkShellStarted = this.isPostgresShellStarted;
-        break;
     }
   }
 

src/UserContext.ts

@@ -112,10 +112,6 @@ function apiType(account: DatabaseAccount | undefined): ApiType {
     return "SQL";
   }
 
-  if (features.enablePGQuickstart) {
-    return "Postgres";
-  }
-
   const capabilities = account.properties?.capabilities;
   if (capabilities) {
     if (capabilities.find((c) => c.name === "EnableCassandra")) {

src/hooks/useKnockoutExplorer.ts

@@ -354,9 +354,15 @@ function updateContextsFromPortalMessage(inputs: DataExplorerInputsFrame) {
     collectionCreationDefaults: inputs.defaultCollectionThroughput,
     isTryCosmosDBSubscription: inputs.isTryCosmosDBSubscription,
   });
+
+  if (inputs.isPostgresAccount) {
+    updateUserContext({ apiType: "Postgres" });
+  }
+
   if (inputs.features) {
     Object.assign(userContext.features, extractFeatures(new URLSearchParams(inputs.features)));
   }
+
   if (inputs.flights) {
     if (inputs.flights.indexOf(Flights.AutoscaleTest) !== -1) {
       userContext.features.autoscaleDefault;