Bump node-fetch from 2.6.1 to 3.3.2

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

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

less/TableStyles/queryBuilder.less

@@ -230,7 +230,7 @@ input::-webkit-inner-spin-button {
 .advanced-options-panel .advanced-options .select .select-options-link {
   margin-left: 4px;
   cursor: pointer;
-  padding: 2px;
+  outline: none;
 }
 
 .query-panel .row .column-headers .Field {

package.json

@@ -167,7 +167,7 @@
     "less-vars-loader": "1.1.0",
     "mini-css-extract-plugin": "2.1.0",
     "monaco-editor-webpack-plugin": "1.7.0",
-    "node-fetch": "2.6.1",
+    "node-fetch": "3.3.2",
     "playwright": "1.13.0",
     "prettier": "2.2.1",
     "process": "0.11.10",

src/Common/TableEntity.tsx

@@ -137,7 +137,7 @@ export const TableEntity: FunctionComponent<TableEntityProps> = ({
         />
         {!isEntityValueDisable && (
           <TooltipHost content="Edit property" id="editTooltip">
-            <div>
+            <div tabIndex={0}>
               <Image
                 {...imageProps}
                 src={EditIcon}

src/ConfigContext.ts

@@ -1,14 +1,14 @@
 import {
   allowedAadEndpoints,
   allowedArcadiaEndpoints,
+  allowedArmEndpoints,
+  allowedBackendEndpoints,
   allowedEmulatorEndpoints,
   allowedGraphEndpoints,
   allowedHostedExplorerEndpoints,
   allowedJunoOrigins,
   allowedMongoBackendEndpoints,
   allowedMsalRedirectEndpoints,
-  defaultAllowedArmEndpoints,
-  defaultAllowedBackendEndpoints,
   validateEndpoint,
 } from "Utils/EndpointValidation";
 
@@ -20,8 +20,6 @@ export enum Platform {
 
 export interface ConfigContext {
   platform: Platform;
-  allowedArmEndpoints: ReadonlyArray<string>;
-  allowedBackendEndpoints: ReadonlyArray<string>;
   allowedParentFrameOrigins: ReadonlyArray<string>;
   gitSha?: string;
   proxyPath?: string;
@@ -51,8 +49,6 @@ export interface ConfigContext {
 // Default configuration
 let configContext: Readonly<ConfigContext> = {
   platform: Platform.Portal,
-  allowedArmEndpoints: defaultAllowedArmEndpoints,
-  allowedBackendEndpoints: defaultAllowedBackendEndpoints,
   allowedParentFrameOrigins: [
     `^https:\\/\\/cosmos\\.azure\\.(com|cn|us)$`,
     `^https:\\/\\/[\\.\\w]*portal\\.azure\\.(com|cn|us)$`,
@@ -81,7 +77,7 @@ let configContext: Readonly<ConfigContext> = {
 
 export function resetConfigContext(): void {
   if (process.env.NODE_ENV !== "test") {
-    throw new Error("resetConfigContext can only be called in a test environment");
+    throw new Error("resetConfigContext can only becalled in a test environment");
   }
   configContext = {} as ConfigContext;
 }
@@ -91,7 +87,7 @@ export function updateConfigContext(newContext: Partial<ConfigContext>): void {
     return;
   }
 
-  if (!validateEndpoint(newContext.ARM_ENDPOINT, configContext.allowedArmEndpoints || defaultAllowedArmEndpoints)) {
+  if (!validateEndpoint(newContext.ARM_ENDPOINT, allowedArmEndpoints)) {
     delete newContext.ARM_ENDPOINT;
   }
 
@@ -111,12 +107,7 @@ export function updateConfigContext(newContext: Partial<ConfigContext>): void {
     delete newContext.ARCADIA_ENDPOINT;
   }
 
-  if (
-    !validateEndpoint(
-      newContext.BACKEND_ENDPOINT,
-      configContext.allowedBackendEndpoints || defaultAllowedBackendEndpoints
-    )
-  ) {
+  if (!validateEndpoint(newContext.BACKEND_ENDPOINT, allowedBackendEndpoints)) {
     delete newContext.BACKEND_ENDPOINT;
   }
 
@@ -139,7 +130,7 @@ export function updateConfigContext(newContext: Partial<ConfigContext>): void {
   Object.assign(configContext, newContext);
 }
 
-// Injected for local development. These will be removed in the production bundle by webpack
+// Injected for local develpment. These will be removed in the production bundle by webpack
 if (process.env.NODE_ENV === "development") {
   const port: string = process.env.PORT || "1234";
   updateConfigContext({

src/Explorer/ContextMenuButtonFactory.tsx

@@ -1,5 +1,3 @@
-import { Action } from "Shared/Telemetry/TelemetryConstants";
-import { traceOpen } from "Shared/Telemetry/TelemetryProcessor";
 import { ReactTabKind, useTabs } from "hooks/useTabs";
 import React from "react";
 import AddCollectionIcon from "../../images/AddCollection.svg";
@@ -148,10 +146,7 @@ export const createSampleCollectionContextMenuButton = (): TreeNodeMenuItem[] =>
   if (userContext.apiType === "SQL") {
     items.push({
       iconSrc: AddSqlQueryIcon,
-      onClick: () => {
-        useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot);
-        traceOpen(Action.OpenQueryCopilotFromNewQuery, { apiType: userContext.apiType });
-      },
+      onClick: () => useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot),
       label: "New SQL Query",
     });
   }

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -5,18 +5,18 @@ import DiscardIcon from "../../../../images/discard.svg";
 import SaveIcon from "../../../../images/save-cosmos.svg";
 import { AuthType } from "../../../AuthType";
 import * as Constants from "../../../Common/Constants";
-import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
 import { getIndexTransformationProgress } from "../../../Common/dataAccess/getIndexTransformationProgress";
 import { readMongoDBCollectionThroughRP } from "../../../Common/dataAccess/readMongoDBCollection";
 import { updateCollection } from "../../../Common/dataAccess/updateCollection";
 import { updateOffer } from "../../../Common/dataAccess/updateOffer";
+import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as ViewModels from "../../../Contracts/ViewModels";
 import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
 import { trace, traceFailure, traceStart, traceSuccess } from "../../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../../UserContext";
-import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import { MongoDBCollectionResource, MongoIndex } from "../../../Utils/arm/generatedClients/cosmos/types";
+import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import { useCommandBar } from "../../Menus/CommandBar/CommandBarComponentAdapter";
 import { SettingsTabV2 } from "../../Tabs/SettingsTabV2";
@@ -37,15 +37,15 @@ import {
   AddMongoIndexProps,
   ChangeFeedPolicyState,
   GeospatialConfigType,
-  MongoIndexTypes,
-  SettingsV2TabTypes,
-  TtlType,
   getMongoNotification,
   getTabTitle,
   hasDatabaseSharedThroughput,
   isDirty,
+  MongoIndexTypes,
   parseConflictResolutionMode,
   parseConflictResolutionProcedure,
+  SettingsV2TabTypes,
+  TtlType,
 } from "./SettingsUtils";
 
 interface SettingsV2TabInfo {

src/Explorer/Explorer.tsx

@@ -1,8 +1,5 @@
 import { Link } from "@fluentui/react/lib/Link";
 import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility";
-import { sendMessage } from "Common/MessageHandler";
-import { Platform } from "ConfigContext";
-import { MessageTypes } from "Contracts/ExplorerContracts";
 import { IGalleryItem } from "Juno/JunoClient";
 import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointValidation";
 import * as ko from "knockout";
@@ -26,7 +23,7 @@ import { PhoenixClient } from "../Phoenix/PhoenixClient";
 import * as ExplorerSettings from "../Shared/ExplorerSettings";
 import { Action, ActionModifiers } from "../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
-import { isAccountNewerThanThresholdInMs, userContext } from "../UserContext";
+import { userContext } from "../UserContext";
 import { getCollectionName, getUploadName } from "../Utils/APITypeUtils";
 import { stringToBlob } from "../Utils/BlobUtils";
 import { isCapabilityEnabled } from "../Utils/CapabilityUtils";
@@ -261,45 +258,6 @@ export default class Explorer {
     // TODO: return result
   }
 
-  private getRandomInt(max: number) {
-    return Math.floor(Math.random() * max);
-  }
-
-  public openNPSSurveyDialog(): void {
-    if (!Platform.Portal) {
-      return;
-    }
-
-    const NINETY_DAYS_IN_MS = 7776000000;
-    const ONE_DAY_IN_MS = 86400000;
-    const isAccountNewerThanNinetyDays = isAccountNewerThanThresholdInMs(
-      userContext.databaseAccount?.systemData?.createdAt || "",
-      NINETY_DAYS_IN_MS
-    );
-
-    // Try Cosmos DB subscription - survey shown to random 25% of users at day 1 in Data Explorer.
-    if (userContext.isTryCosmosDBSubscription) {
-      if (
-        isAccountNewerThanThresholdInMs(userContext.databaseAccount?.systemData?.createdAt || "", ONE_DAY_IN_MS) &&
-        this.getRandomInt(100) < 25
-      ) {
-        sendMessage({ type: MessageTypes.DisplayNPSSurvey });
-      }
-    } else {
-      // An existing account is lesser than 90 days old. For existing account show to random 10 % of users in Data Explorer.
-      if (isAccountNewerThanNinetyDays) {
-        if (this.getRandomInt(100) < 10) {
-          sendMessage({ type: MessageTypes.DisplayNPSSurvey });
-        }
-      } else {
-        // An existing account is greater than 90 days. For existing account show to random 25 % of users in Data Explorer.
-        if (this.getRandomInt(100) < 25) {
-          sendMessage({ type: MessageTypes.DisplayNPSSurvey });
-        }
-      }
-    }
-  }
-
   public async refreshDatabaseForResourceToken(): Promise<void> {
     const databaseId = userContext.parsedResourceToken?.databaseId;
     const collectionId = userContext.parsedResourceToken?.collectionId;

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -4,21 +4,16 @@
  * and update any knockout observables passed from the parent.
  */
 import { CommandBar as FluentCommandBar, ICommandBarItemProps } from "@fluentui/react";
-import { AuthType } from "AuthType";
 import { useNotebook } from "Explorer/Notebook/useNotebook";
-import { userContext } from "UserContext";
 import * as React from "react";
+import { userContext } from "UserContext";
 import create, { UseStore } from "zustand";
 import { ConnectionStatusType, StyleConstants } from "../../../Common/Constants";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
 import { useSelectedNode } from "../../useSelectedNode";
+import * as CommandBarComponentButtonFactory from "./CommandBarComponentButtonFactory";
 import * as CommandBarUtil from "./CommandBarUtil";
-import * as createContextCommandBarButtons from "./CommandButtonsFactories/createContextCommandBarButtons";
-import * as createControlCommandBarButtons from "./CommandButtonsFactories/createControlCommandBarButtons";
-import * as createPostgreButtons from "./CommandButtonsFactories/createPostgreButtons";
-import * as createStaticCommandBarButtons from "./CommandButtonsFactories/createStaticCommandBarButtons";
-import * as createStaticCommandBarButtonsForResourceToken from "./CommandButtonsFactories/createStaticCommandBarButtonsForResourceToken";
 
 interface Props {
   container: Explorer;
@@ -40,7 +35,7 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
   const backgroundColor = StyleConstants.BaseLight;
 
   if (userContext.apiType === "Postgres") {
-    const buttons = createPostgreButtons.createPostgreButtons(container);
+    const buttons = CommandBarComponentButtonFactory.createPostgreButtons(container);
     return (
       <div className="commandBarContainer">
         <FluentCommandBar
@@ -55,18 +50,11 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
     );
   }
 
-  const staticButtons =
-    userContext.authType === AuthType.ResourceToken
-      ? createStaticCommandBarButtonsForResourceToken.createStaticCommandBarButtonsForResourceToken(
-          container,
-          selectedNodeState
-        )
-      : createStaticCommandBarButtons.createStaticCommandBarButtons(container, selectedNodeState);
-
+  const staticButtons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(container, selectedNodeState);
   const contextButtons = (buttons || []).concat(
-    createContextCommandBarButtons.createContextCommandBarButtons(container, selectedNodeState)
+    CommandBarComponentButtonFactory.createContextCommandBarButtons(container, selectedNodeState)
   );
-  const controlButtons = createControlCommandBarButtons.createControlCommandBarButtons(container);
+  const controlButtons = CommandBarComponentButtonFactory.createControlCommandBarButtons(container);
 
   const uiFabricStaticButtons = CommandBarUtil.convertButton(staticButtons, backgroundColor);
   if (buttons && buttons.length > 0) {

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts

@@ -9,7 +9,7 @@ import NotebookManager from "../../Notebook/NotebookManager";
 import { useNotebook } from "../../Notebook/useNotebook";
 import { useDatabases } from "../../useDatabases";
 import { useSelectedNode } from "../../useSelectedNode";
-import * as createStaticCommandBarButtons from "./CommandButtonsFactories/createStaticCommandBarButtons";
+import * as CommandBarComponentButtonFactory from "./CommandBarComponentButtonFactory";
 
 describe("CommandBarComponentButtonFactory tests", () => {
   let mockExplorer: Explorer;
@@ -32,7 +32,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Button should be visible", () => {
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const enableAzureSynapseLinkBtn = buttons.find(
         (button) => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel
       );
@@ -48,7 +48,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
         } as DatabaseAccount,
       });
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const enableAzureSynapseLinkBtn = buttons.find(
         (button) => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel
       );
@@ -64,7 +64,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
         } as DatabaseAccount,
       });
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const enableAzureSynapseLinkBtn = buttons.find(
         (button) => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel
       );
@@ -100,7 +100,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
       useNotebook.getState().setIsNotebookEnabled(true);
       useNotebook.getState().setIsNotebooksEnabledForAccount(true);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
       expect(enableNotebookBtn).toBeUndefined();
     });
@@ -110,7 +110,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
         portalEnv: "mooncake",
       });
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
       expect(enableNotebookBtn).toBeUndefined();
     });
@@ -118,7 +118,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     it("Notebooks is not enabled but is available - button should be shown and enabled", () => {
       useNotebook.getState().setIsNotebooksEnabledForAccount(true);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
 
       //TODO: modify once notebooks are available
@@ -129,7 +129,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is not enabled and is unavailable - button should be shown and disabled", () => {
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
 
       //TODO: modify once notebooks are available
@@ -180,7 +180,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
       updateUserContext({
         apiType: "SQL",
       });
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
       expect(openMongoShellBtn).toBeUndefined();
     });
@@ -190,13 +190,13 @@ describe("CommandBarComponentButtonFactory tests", () => {
         portalEnv: "mooncake",
       });
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
       expect(openMongoShellBtn).toBeUndefined();
     });
 
     it("Notebooks is not enabled and is unavailable - button should be hidden", () => {
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
       expect(openMongoShellBtn).toBeUndefined();
     });
@@ -204,7 +204,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     it("Notebooks is not enabled and is available - button should be hidden", () => {
       useNotebook.getState().setIsNotebooksEnabledForAccount(true);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
       expect(openMongoShellBtn).toBeUndefined();
     });
@@ -212,7 +212,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     it("Notebooks is enabled and is unavailable - button should be shown and enabled", () => {
       useNotebook.getState().setIsNotebookEnabled(true);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
       expect(openMongoShellBtn).toBeDefined();
 
@@ -226,7 +226,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
       useNotebook.getState().setIsNotebookEnabled(true);
       useNotebook.getState().setIsNotebooksEnabledForAccount(true);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
       expect(openMongoShellBtn).toBeDefined();
 
@@ -241,7 +241,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
       useNotebook.getState().setIsNotebooksEnabledForAccount(true);
       useNotebook.getState().setIsShellEnabled(false);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
       expect(openMongoShellBtn).toBeUndefined();
     });
@@ -285,7 +285,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
           },
         } as DatabaseAccount,
       });
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
       expect(openCassandraShellBtn).toBeUndefined();
     });
@@ -295,13 +295,13 @@ describe("CommandBarComponentButtonFactory tests", () => {
         portalEnv: "mooncake",
       });
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
       expect(openCassandraShellBtn).toBeUndefined();
     });
 
     it("Notebooks is not enabled and is unavailable - button should be shown and disabled", () => {
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
       expect(openCassandraShellBtn).toBeUndefined();
     });
@@ -309,7 +309,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     it("Notebooks is not enabled and is available - button should be shown and enabled", () => {
       useNotebook.getState().setIsNotebooksEnabledForAccount(true);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
       expect(openCassandraShellBtn).toBeUndefined();
     });
@@ -317,7 +317,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     it("Notebooks is enabled and is unavailable - button should be shown and enabled", () => {
       useNotebook.getState().setIsNotebookEnabled(true);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
 
       expect(openCassandraShellBtn).toBeDefined();
@@ -332,7 +332,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
       useNotebook.getState().setIsNotebookEnabled(true);
       useNotebook.getState().setIsNotebooksEnabledForAccount(true);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
       expect(openCassandraShellBtn).toBeDefined();
 
@@ -370,7 +370,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     it("Notebooks is enabled and GitHubOAuthService is not logged in - connect to github button should be visible", () => {
       useNotebook.getState().setIsNotebookEnabled(true);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const connectToGitHubBtn = buttons.find((button) => button.commandButtonLabel === connectToGitHubBtnLabel);
       expect(connectToGitHubBtn).toBeDefined();
     });
@@ -379,7 +379,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
       useNotebook.getState().setIsNotebookEnabled(true);
       mockExplorer.notebookManager.gitHubOAuthService.isLoggedIn = jest.fn().mockReturnValue(true);
 
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       const manageGitHubSettingsBtn = buttons.find(
         (button) => button.commandButtonLabel === manageGitHubSettingsBtnLabel
       );
@@ -387,7 +387,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
     });
 
     it("Notebooks is not enabled - connect to github and manage github settings buttons should be hidden", () => {
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
 
       const connectToGitHubBtn = buttons.find((button) => button.commandButtonLabel === connectToGitHubBtnLabel);
       expect(connectToGitHubBtn).toBeUndefined();
@@ -419,7 +419,7 @@ describe("CommandBarComponentButtonFactory tests", () => {
           kind: "DocumentDB",
         } as DatabaseAccount,
       });
-      const buttons = createStaticCommandBarButtons.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
       expect(buttons.length).toBe(2);
       expect(buttons[0].commandButtonLabel).toBe("New SQL Query");
       expect(buttons[0].disabled).toBe(false);

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -0,0 +1,633 @@
+import { ReactTabKind, useTabs } from "hooks/useTabs";
+import * as React from "react";
+import AddCollectionIcon from "../../../../images/AddCollection.svg";
+import AddDatabaseIcon from "../../../../images/AddDatabase.svg";
+import AddSqlQueryIcon from "../../../../images/AddSqlQuery_16x16.svg";
+import AddStoredProcedureIcon from "../../../../images/AddStoredProcedure.svg";
+import AddTriggerIcon from "../../../../images/AddTrigger.svg";
+import AddUdfIcon from "../../../../images/AddUdf.svg";
+import BrowseQueriesIcon from "../../../../images/BrowseQuery.svg";
+import CosmosTerminalIcon from "../../../../images/Cosmos-Terminal.svg";
+import FeedbackIcon from "../../../../images/Feedback-Command.svg";
+import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
+import OpenQueryFromDiskIcon from "../../../../images/OpenQueryFromDisk.svg";
+import GitHubIcon from "../../../../images/github.svg";
+import NewNotebookIcon from "../../../../images/notebook/Notebook-new.svg";
+import ResetWorkspaceIcon from "../../../../images/notebook/Notebook-reset-workspace.svg";
+import OpenInTabIcon from "../../../../images/open-in-tab.svg";
+import SettingsIcon from "../../../../images/settings_15x15.svg";
+import SynapseIcon from "../../../../images/synapse-link.svg";
+import { AuthType } from "../../../AuthType";
+import * as Constants from "../../../Common/Constants";
+import { Platform, configContext } from "../../../ConfigContext";
+import * as ViewModels from "../../../Contracts/ViewModels";
+import { JunoClient } from "../../../Juno/JunoClient";
+import { userContext } from "../../../UserContext";
+import { getCollectionName, getDatabaseName } from "../../../Utils/APITypeUtils";
+import { isRunningOnNationalCloud } from "../../../Utils/CloudUtils";
+import { useSidePanel } from "../../../hooks/useSidePanel";
+import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
+import Explorer from "../../Explorer";
+import { useNotebook } from "../../Notebook/useNotebook";
+import { OpenFullScreen } from "../../OpenFullScreen";
+import { AddDatabasePanel } from "../../Panes/AddDatabasePanel/AddDatabasePanel";
+import { BrowseQueriesPane } from "../../Panes/BrowseQueriesPane/BrowseQueriesPane";
+import { GitHubReposPanel } from "../../Panes/GitHubReposPanel/GitHubReposPanel";
+import { LoadQueryPane } from "../../Panes/LoadQueryPane/LoadQueryPane";
+import { SettingsPane } from "../../Panes/SettingsPane/SettingsPane";
+import { useDatabases } from "../../useDatabases";
+import { SelectedNodeState, useSelectedNode } from "../../useSelectedNode";
+
+let counter = 0;
+
+export function createStaticCommandBarButtons(
+  container: Explorer,
+  selectedNodeState: SelectedNodeState
+): CommandButtonComponentProps[] {
+  if (userContext.authType === AuthType.ResourceToken) {
+    return createStaticCommandBarButtonsForResourceToken(container, selectedNodeState);
+  }
+
+  const newCollectionBtn = createNewCollectionGroup(container);
+  const buttons: CommandButtonComponentProps[] = [];
+
+  buttons.push(newCollectionBtn);
+  if (userContext.apiType !== "Tables" && userContext.apiType !== "Cassandra") {
+    const addSynapseLink = createOpenSynapseLinkDialogButton(container);
+
+    if (addSynapseLink) {
+      buttons.push(createDivider());
+      buttons.push(addSynapseLink);
+    }
+  }
+
+  if (userContext.apiType !== "Tables") {
+    newCollectionBtn.children = [createNewCollectionGroup(container)];
+    const newDatabaseBtn = createNewDatabase(container);
+    newCollectionBtn.children.push(newDatabaseBtn);
+  }
+
+  if (useNotebook.getState().isNotebookEnabled) {
+    buttons.push(createDivider());
+    const notebookButtons: CommandButtonComponentProps[] = [];
+
+    const newNotebookButton = createNewNotebookButton(container);
+    newNotebookButton.children = [createNewNotebookButton(container), createuploadNotebookButton(container)];
+    notebookButtons.push(newNotebookButton);
+
+    if (container.notebookManager?.gitHubOAuthService) {
+      notebookButtons.push(createManageGitHubAccountButton(container));
+    }
+    if (useNotebook.getState().isPhoenixFeatures && configContext.isTerminalEnabled) {
+      notebookButtons.push(createOpenTerminalButton(container));
+    }
+    if (useNotebook.getState().isPhoenixNotebooks && selectedNodeState.isConnectedToContainer()) {
+      notebookButtons.push(createNotebookWorkspaceResetButton(container));
+    }
+    if (
+      (userContext.apiType === "Mongo" &&
+        useNotebook.getState().isShellEnabled &&
+        selectedNodeState.isDatabaseNodeOrNoneSelected()) ||
+      userContext.apiType === "Cassandra"
+    ) {
+      notebookButtons.push(createDivider());
+      if (userContext.apiType === "Cassandra") {
+        notebookButtons.push(createOpenCassandraTerminalButton(container));
+      } else {
+        notebookButtons.push(createOpenMongoTerminalButton(container));
+      }
+    }
+
+    notebookButtons.forEach((btn) => {
+      if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
+        if (!useNotebook.getState().isPhoenixFeatures) {
+          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
+        }
+      } else if (btn.commandButtonLabel.indexOf("Mongo") !== -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);
+        }
+      } else if (!useNotebook.getState().isPhoenixNotebooks) {
+        applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
+      }
+      buttons.push(btn);
+    });
+  }
+
+  if (!selectedNodeState.isDatabaseNodeOrNoneSelected()) {
+    const isQuerySupported = userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
+
+    if (isQuerySupported) {
+      buttons.push(createDivider());
+      const newSqlQueryBtn = createNewSQLQueryButton(selectedNodeState);
+      buttons.push(newSqlQueryBtn);
+    }
+
+    if (isQuerySupported && selectedNodeState.findSelectedCollection()) {
+      const openQueryBtn = createOpenQueryButton(container);
+      openQueryBtn.children = [createOpenQueryButton(container), createOpenQueryFromDiskButton()];
+      buttons.push(openQueryBtn);
+    }
+
+    if (areScriptsSupported()) {
+      const label = "New Stored Procedure";
+      const newStoredProcedureBtn: CommandButtonComponentProps = {
+        iconSrc: AddStoredProcedureIcon,
+        iconAlt: label,
+        onCommandClick: () => {
+          const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
+          selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection);
+        },
+        commandButtonLabel: label,
+        ariaLabel: label,
+        hasPopup: true,
+        disabled:
+          useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
+          selectedNodeState.isDatabaseNodeOrNoneSelected(),
+      };
+
+      newStoredProcedureBtn.children = createScriptCommandButtons(selectedNodeState);
+      buttons.push(newStoredProcedureBtn);
+    }
+  }
+
+  return buttons;
+}
+
+export function createContextCommandBarButtons(
+  container: Explorer,
+  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 = {
+      iconSrc: HostedTerminalIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        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,
+    };
+    buttons.push(newMongoShellBtn);
+  }
+
+  return buttons;
+}
+
+export function createControlCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
+  const buttons: CommandButtonComponentProps[] = [
+    {
+      iconSrc: SettingsIcon,
+      iconAlt: "Settings",
+      onCommandClick: () => useSidePanel.getState().openSidePanel("Settings", <SettingsPane />),
+      commandButtonLabel: undefined,
+      ariaLabel: "Settings",
+      tooltipText: "Settings",
+      hasPopup: true,
+      disabled: false,
+    },
+  ];
+
+  const showOpenFullScreen =
+    configContext.platform === Platform.Portal && !isRunningOnNationalCloud() && userContext.apiType !== "Gremlin";
+
+  if (showOpenFullScreen) {
+    const label = "Open Full Screen";
+    const fullScreenButton: CommandButtonComponentProps = {
+      id: "openFullScreenBtn",
+      iconSrc: OpenInTabIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        useSidePanel.getState().openSidePanel("Open Full Screen", <OpenFullScreen />);
+      },
+      commandButtonLabel: undefined,
+      ariaLabel: label,
+      tooltipText: label,
+      hasPopup: false,
+      disabled: !showOpenFullScreen,
+      className: "OpenFullScreen",
+    };
+    buttons.push(fullScreenButton);
+  }
+
+  if (configContext.platform !== Platform.Emulator) {
+    const label = "Feedback";
+    const feedbackButtonOptions: CommandButtonComponentProps = {
+      iconSrc: FeedbackIcon,
+      iconAlt: label,
+      onCommandClick: () => container.provideFeedbackEmail(),
+      commandButtonLabel: undefined,
+      ariaLabel: label,
+      tooltipText: label,
+      hasPopup: false,
+      disabled: false,
+    };
+    buttons.push(feedbackButtonOptions);
+  }
+
+  return buttons;
+}
+
+export function createDivider(): CommandButtonComponentProps {
+  const label = `divider${counter++}`;
+  return {
+    isDivider: true,
+    commandButtonLabel: label,
+    hasPopup: false,
+    iconSrc: undefined,
+    iconAlt: undefined,
+    onCommandClick: undefined,
+    ariaLabel: label,
+  };
+}
+
+function areScriptsSupported(): boolean {
+  return userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
+}
+
+function createNewCollectionGroup(container: Explorer): CommandButtonComponentProps {
+  const label = `New ${getCollectionName()}`;
+  return {
+    iconSrc: AddCollectionIcon,
+    iconAlt: label,
+    onCommandClick: () => container.onNewCollectionClicked(),
+    commandButtonLabel: label,
+    ariaLabel: label,
+    hasPopup: true,
+    id: "createNewContainerCommandButton",
+  };
+}
+
+function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonComponentProps {
+  if (configContext.platform === Platform.Emulator) {
+    return undefined;
+  }
+
+  if (userContext?.databaseAccount?.properties?.enableAnalyticalStorage) {
+    return undefined;
+  }
+
+  const capabilities = userContext?.databaseAccount?.properties?.capabilities || [];
+  if (capabilities.some((capability) => capability.name === Constants.CapabilityNames.EnableStorageAnalytics)) {
+    return undefined;
+  }
+
+  const label = "Enable Azure Synapse Link";
+  return {
+    iconSrc: SynapseIcon,
+    iconAlt: label,
+    onCommandClick: () => container.openEnableSynapseLinkDialog(),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled:
+      useSelectedNode.getState().isQueryCopilotCollectionSelected() || useNotebook.getState().isSynapseLinkUpdating,
+    ariaLabel: label,
+  };
+}
+
+function createNewDatabase(container: Explorer): CommandButtonComponentProps {
+  const label = "New " + getDatabaseName();
+  return {
+    iconSrc: AddDatabaseIcon,
+    iconAlt: label,
+    onCommandClick: async () => {
+      const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
+      if (throughputCap && throughputCap !== -1) {
+        await useDatabases.getState().loadAllOffers();
+      }
+      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />);
+    },
+    commandButtonLabel: label,
+    ariaLabel: label,
+    hasPopup: true,
+  };
+}
+
+function createNewSQLQueryButton(selectedNodeState: SelectedNodeState): CommandButtonComponentProps {
+  if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
+    const label = "New SQL Query";
+    return {
+      id: "newQueryBtn",
+      iconSrc: AddSqlQueryIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        if (useSelectedNode.getState().isQueryCopilotCollectionSelected()) {
+          useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot);
+        } else {
+          const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
+          selectedCollection && selectedCollection.onNewQueryClick(selectedCollection);
+        }
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled: selectedNodeState.isDatabaseNodeOrNoneSelected(),
+    };
+  } else if (userContext.apiType === "Mongo") {
+    const label = "New Query";
+    return {
+      id: "newQueryBtn",
+      iconSrc: AddSqlQueryIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewMongoQueryClick(selectedCollection);
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled: selectedNodeState.isDatabaseNodeOrNoneSelected(),
+    };
+  }
+
+  return undefined;
+}
+
+export function createScriptCommandButtons(selectedNodeState: SelectedNodeState): CommandButtonComponentProps[] {
+  const buttons: CommandButtonComponentProps[] = [];
+
+  const shouldEnableScriptsCommands: boolean =
+    !selectedNodeState.isDatabaseNodeOrNoneSelected() && areScriptsSupported();
+
+  if (shouldEnableScriptsCommands) {
+    const label = "New Stored Procedure";
+    const newStoredProcedureBtn: CommandButtonComponentProps = {
+      iconSrc: AddStoredProcedureIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection);
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled:
+        useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
+        selectedNodeState.isDatabaseNodeOrNoneSelected(),
+    };
+    buttons.push(newStoredProcedureBtn);
+  }
+
+  if (shouldEnableScriptsCommands) {
+    const label = "New UDF";
+    const newUserDefinedFunctionBtn: CommandButtonComponentProps = {
+      iconSrc: AddUdfIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection);
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled:
+        useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
+        selectedNodeState.isDatabaseNodeOrNoneSelected(),
+    };
+    buttons.push(newUserDefinedFunctionBtn);
+  }
+
+  if (shouldEnableScriptsCommands) {
+    const label = "New Trigger";
+    const newTriggerBtn: CommandButtonComponentProps = {
+      iconSrc: AddTriggerIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewTriggerClick(selectedCollection);
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled:
+        useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
+        selectedNodeState.isDatabaseNodeOrNoneSelected(),
+    };
+    buttons.push(newTriggerBtn);
+  }
+
+  return buttons;
+}
+
+function applyNotebooksTemporarilyDownStyle(buttonProps: CommandButtonComponentProps, tooltip: string): void {
+  if (!buttonProps.isDivider) {
+    buttonProps.disabled = true;
+    buttonProps.tooltipText = tooltip;
+  }
+}
+
+function createNewNotebookButton(container: Explorer): CommandButtonComponentProps {
+  const label = "New Notebook";
+  return {
+    id: "newNotebookBtn",
+    iconSrc: NewNotebookIcon,
+    iconAlt: label,
+    onCommandClick: () => container.onNewNotebookClicked(),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    ariaLabel: label,
+  };
+}
+
+function createuploadNotebookButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Upload to Notebook Server";
+  return {
+    iconSrc: NewNotebookIcon,
+    iconAlt: label,
+    onCommandClick: () => container.openUploadFilePanel(),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    ariaLabel: label,
+  };
+}
+
+function createOpenQueryButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open Query";
+  return {
+    iconSrc: BrowseQueriesIcon,
+    iconAlt: label,
+    onCommandClick: () =>
+      useSidePanel.getState().openSidePanel("Open Saved Queries", <BrowseQueriesPane explorer={container} />),
+    commandButtonLabel: label,
+    ariaLabel: label,
+    hasPopup: true,
+    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+  };
+}
+
+function createOpenQueryFromDiskButton(): CommandButtonComponentProps {
+  const label = "Open Query From Disk";
+  return {
+    iconSrc: OpenQueryFromDiskIcon,
+    iconAlt: label,
+    onCommandClick: () => useSidePanel.getState().openSidePanel("Load Query", <LoadQueryPane />),
+    commandButtonLabel: label,
+    ariaLabel: label,
+    hasPopup: true,
+    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+  };
+}
+
+function createOpenTerminalButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open Terminal";
+  return {
+    iconSrc: CosmosTerminalIcon,
+    iconAlt: label,
+    onCommandClick: () => container.openNotebookTerminal(ViewModels.TerminalKind.Default),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    ariaLabel: label,
+  };
+}
+
+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;
+  return {
+    iconSrc: HostedTerminalIcon,
+    iconAlt: label,
+    onCommandClick: () => {
+      if (useNotebook.getState().isNotebookEnabled) {
+        container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
+      }
+    },
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: disableButton,
+    ariaLabel: label,
+    tooltipText: !disableButton ? "" : tooltip,
+  };
+}
+
+function createOpenCassandraTerminalButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open Cassandra 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;
+  return {
+    iconSrc: HostedTerminalIcon,
+    iconAlt: label,
+    onCommandClick: () => {
+      if (useNotebook.getState().isNotebookEnabled) {
+        container.openNotebookTerminal(ViewModels.TerminalKind.Cassandra);
+      }
+    },
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: disableButton,
+    ariaLabel: label,
+    tooltipText: !disableButton ? "" : tooltip,
+  };
+}
+
+function createOpenPsqlTerminalButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open PSQL Shell";
+  const disableButton =
+    (!useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled) ||
+    useSelectedNode.getState().isQueryCopilotCollectionSelected();
+  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 {
+    iconSrc: ResetWorkspaceIcon,
+    iconAlt: label,
+    onCommandClick: () => container.resetNotebookWorkspace(),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    ariaLabel: label,
+  };
+}
+
+function createManageGitHubAccountButton(container: Explorer): CommandButtonComponentProps {
+  const connectedToGitHub: boolean = container.notebookManager?.gitHubOAuthService.isLoggedIn();
+  const label = connectedToGitHub ? "Manage GitHub settings" : "Connect to GitHub";
+  const junoClient = new JunoClient();
+  return {
+    iconSrc: GitHubIcon,
+    iconAlt: label,
+    onCommandClick: () => {
+      useSidePanel
+        .getState()
+        .openSidePanel(
+          label,
+          <GitHubReposPanel
+            explorer={container}
+            gitHubClientProp={container.notebookManager.gitHubClient}
+            junoClientProp={junoClient}
+          />
+        );
+    },
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
+    ariaLabel: label,
+  };
+}
+
+function createStaticCommandBarButtonsForResourceToken(
+  container: Explorer,
+  selectedNodeState: SelectedNodeState
+): CommandButtonComponentProps[] {
+  const newSqlQueryBtn = createNewSQLQueryButton(selectedNodeState);
+  const openQueryBtn = createOpenQueryButton(container);
+
+  const resourceTokenCollection: ViewModels.CollectionBase = useDatabases.getState().resourceTokenCollection;
+  const isResourceTokenCollectionNodeSelected: boolean =
+    resourceTokenCollection?.id() === selectedNodeState.selectedNode?.id();
+  newSqlQueryBtn.disabled = !isResourceTokenCollectionNodeSelected;
+  newSqlQueryBtn.onCommandClick = () => {
+    const resourceTokenCollection: ViewModels.CollectionBase = useDatabases.getState().resourceTokenCollection;
+    resourceTokenCollection && resourceTokenCollection.onNewQueryClick(resourceTokenCollection, undefined);
+  };
+
+  openQueryBtn.disabled = !isResourceTokenCollectionNodeSelected;
+  if (!openQueryBtn.disabled) {
+    openQueryBtn.children = [createOpenQueryButton(container), createOpenQueryFromDiskButton()];
+  }
+
+  return [newSqlQueryBtn, openQueryBtn];
+}
+
+export function createPostgreButtons(container: Explorer): CommandButtonComponentProps[] {
+  const openPostgreShellBtn = createOpenPsqlTerminalButton(container);
+
+  return [openPostgreShellBtn];
+}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/applyNotebooksTemporarilyDownStyle.tsx

@@ -1,8 +0,0 @@
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-
-export function applyNotebooksTemporarilyDownStyle(buttonProps: CommandButtonComponentProps, tooltip: string): void {
-  if (!buttonProps.isDivider) {
-    buttonProps.disabled = true;
-    buttonProps.tooltipText = tooltip;
-  }
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/areScriptsSupported.tsx

@@ -1,5 +0,0 @@
-import { userContext } from "../../../../UserContext";
-
-export function areScriptsSupported(): boolean {
-  return userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createContextCommandBarButtons.tsx

@@ -1,40 +0,0 @@
-import * as ViewModels from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useNotebook } from "../../../Notebook/useNotebook";
-import { SelectedNodeState } from "../../../useSelectedNode";
-
-export function createContextCommandBarButtons(
-  container: Explorer,
-  selectedNodeState: SelectedNodeState
-): CommandButtonComponentProps[] {
-  if (selectedNodeState.isDatabaseNodeOrNoneSelected()) {
-    return [];
-  }
-
-  if (userContext.apiType !== "Mongo") {
-    return [];
-  }
-
-  const label = useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell";
-
-  const newMongoShellBtn: CommandButtonComponentProps = {
-    iconSrc: HostedTerminalIcon,
-    iconAlt: label,
-    onCommandClick: () => {
-      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,
-  };
-
-  return [newMongoShellBtn];
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createControlCommandBarButtons.tsx

@@ -1,66 +0,0 @@
-import * as React from "react";
-import { Platform, configContext } from "../../../../ConfigContext";
-import { userContext } from "../../../../UserContext";
-import { isRunningOnNationalCloud } from "../../../../Utils/CloudUtils";
-import { useSidePanel } from "../../../../hooks/useSidePanel";
-import FeedbackIcon from "../../../../images/Feedback-Command.svg";
-import OpenInTabIcon from "../../../../images/open-in-tab.svg";
-import SettingsIcon from "../../../../images/settings_15x15.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { OpenFullScreen } from "../../../OpenFullScreen";
-import { SettingsPane } from "../../../Panes/SettingsPane/SettingsPane";
-
-export function createControlCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
-  const buttons: CommandButtonComponentProps[] = [
-    {
-      iconSrc: SettingsIcon,
-      iconAlt: "Settings",
-      onCommandClick: () => useSidePanel.getState().openSidePanel("Settings", <SettingsPane />),
-      commandButtonLabel: undefined,
-      ariaLabel: "Settings",
-      tooltipText: "Settings",
-      hasPopup: true,
-      disabled: false,
-    },
-  ];
-
-  const showOpenFullScreen =
-    configContext.platform === Platform.Portal && !isRunningOnNationalCloud() && userContext.apiType !== "Gremlin";
-
-  if (showOpenFullScreen) {
-    const label = "Open Full Screen";
-    const fullScreenButton: CommandButtonComponentProps = {
-      id: "openFullScreenBtn",
-      iconSrc: OpenInTabIcon,
-      iconAlt: label,
-      onCommandClick: () => {
-        useSidePanel.getState().openSidePanel("Open Full Screen", <OpenFullScreen />);
-      },
-      commandButtonLabel: undefined,
-      ariaLabel: label,
-      tooltipText: label,
-      hasPopup: false,
-      disabled: !showOpenFullScreen,
-      className: "OpenFullScreen",
-    };
-    buttons.push(fullScreenButton);
-  }
-
-  if (configContext.platform !== Platform.Emulator) {
-    const label = "Feedback";
-    const feedbackButtonOptions: CommandButtonComponentProps = {
-      iconSrc: FeedbackIcon,
-      iconAlt: label,
-      onCommandClick: () => container.provideFeedbackEmail(),
-      commandButtonLabel: undefined,
-      ariaLabel: label,
-      tooltipText: label,
-      hasPopup: false,
-      disabled: false,
-    };
-    buttons.push(feedbackButtonOptions);
-  }
-
-  return buttons;
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createDivider.tsx

@@ -1,15 +0,0 @@
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-
-let counter = 0;
-export function createDivider(): CommandButtonComponentProps {
-  const label = `divider${counter++}`;
-  return {
-    isDivider: true,
-    commandButtonLabel: label,
-    hasPopup: false,
-    iconSrc: undefined,
-    iconAlt: undefined,
-    onCommandClick: undefined,
-    ariaLabel: label,
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createManageGitHubAccountButton.tsx

@@ -1,34 +0,0 @@
-import * as React from "react";
-import { JunoClient } from "../../../../Juno/JunoClient";
-import { useSidePanel } from "../../../../hooks/useSidePanel";
-import GitHubIcon from "../../../../images/github.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { GitHubReposPanel } from "../../../Panes/GitHubReposPanel/GitHubReposPanel";
-import { useSelectedNode } from "../../../useSelectedNode";
-
-export function createManageGitHubAccountButton(container: Explorer): CommandButtonComponentProps {
-  const connectedToGitHub: boolean = container.notebookManager?.gitHubOAuthService.isLoggedIn();
-  const label = connectedToGitHub ? "Manage GitHub settings" : "Connect to GitHub";
-  const junoClient = new JunoClient();
-  return {
-    iconSrc: GitHubIcon,
-    iconAlt: label,
-    onCommandClick: () => {
-      useSidePanel
-        .getState()
-        .openSidePanel(
-          label,
-          <GitHubReposPanel
-            explorer={container}
-            gitHubClientProp={container.notebookManager.gitHubClient}
-            junoClientProp={junoClient}
-          />
-        );
-    },
-    commandButtonLabel: label,
-    hasPopup: false,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
-    ariaLabel: label,
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createNewCollectionGroup.tsx

@@ -1,17 +0,0 @@
-import { getCollectionName } from "../../../../Utils/APITypeUtils";
-import AddCollectionIcon from "../../../../images/AddCollection.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-
-export function createNewCollectionGroup(container: Explorer): CommandButtonComponentProps {
-  const label = `New ${getCollectionName()}`;
-  return {
-    iconSrc: AddCollectionIcon,
-    iconAlt: label,
-    onCommandClick: () => container.onNewCollectionClicked(),
-    commandButtonLabel: label,
-    ariaLabel: label,
-    hasPopup: true,
-    id: "createNewContainerCommandButton",
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createNewDatabase.tsx

@@ -1,27 +0,0 @@
-import * as React from "react";
-import { userContext } from "../../../../UserContext";
-import { getDatabaseName } from "../../../../Utils/APITypeUtils";
-import { useSidePanel } from "../../../../hooks/useSidePanel";
-import AddDatabaseIcon from "../../../../images/AddDatabase.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { AddDatabasePanel } from "../../../Panes/AddDatabasePanel/AddDatabasePanel";
-import { useDatabases } from "../../../useDatabases";
-
-export function createNewDatabase(container: Explorer): CommandButtonComponentProps {
-  const label = "New " + getDatabaseName();
-  return {
-    iconSrc: AddDatabaseIcon,
-    iconAlt: label,
-    onCommandClick: async () => {
-      const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
-      if (throughputCap && throughputCap !== -1) {
-        await useDatabases.getState().loadAllOffers();
-      }
-      useSidePanel.getState().openSidePanel("New " + getDatabaseName(), <AddDatabasePanel explorer={container} />);
-    },
-    commandButtonLabel: label,
-    ariaLabel: label,
-    hasPopup: true,
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createNewNotebookButton.tsx

@@ -1,18 +0,0 @@
-import NewNotebookIcon from "../../../../images/notebook/Notebook-new.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useSelectedNode } from "../../../useSelectedNode";
-
-export function createNewNotebookButton(container: Explorer): CommandButtonComponentProps {
-  const label = "New Notebook";
-  return {
-    id: "newNotebookBtn",
-    iconSrc: NewNotebookIcon,
-    iconAlt: label,
-    onCommandClick: () => container.onNewNotebookClicked(),
-    commandButtonLabel: label,
-    hasPopup: false,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
-    ariaLabel: label,
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createNewSQLQueryButton.tsx

@@ -1,49 +0,0 @@
-import { Action } from "Shared/Telemetry/TelemetryConstants";
-import { traceOpen } from "Shared/Telemetry/TelemetryProcessor";
-import { ReactTabKind, useTabs } from "hooks/useTabs";
-import * as ViewModels from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import AddSqlQueryIcon from "../../../../images/AddSqlQuery_16x16.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import { SelectedNodeState, useSelectedNode } from "../../../useSelectedNode";
-
-export function createNewSQLQueryButton(selectedNodeState: SelectedNodeState): CommandButtonComponentProps {
-  if (userContext.apiType === "SQL" || userContext.apiType === "Gremlin") {
-    const label = "New SQL Query";
-    return {
-      id: "newQueryBtn",
-      iconSrc: AddSqlQueryIcon,
-      iconAlt: label,
-      onCommandClick: () => {
-        if (useSelectedNode.getState().isQueryCopilotCollectionSelected()) {
-          useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot);
-          traceOpen(Action.OpenQueryCopilotFromNewQuery, { apiType: userContext.apiType });
-        } else {
-          const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-          selectedCollection && selectedCollection.onNewQueryClick(selectedCollection);
-        }
-      },
-      commandButtonLabel: label,
-      ariaLabel: label,
-      hasPopup: true,
-      disabled: selectedNodeState.isDatabaseNodeOrNoneSelected(),
-    };
-  } else if (userContext.apiType === "Mongo") {
-    const label = "New Query";
-    return {
-      id: "newQueryBtn",
-      iconSrc: AddSqlQueryIcon,
-      iconAlt: label,
-      onCommandClick: () => {
-        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        selectedCollection && selectedCollection.onNewMongoQueryClick(selectedCollection);
-      },
-      commandButtonLabel: label,
-      ariaLabel: label,
-      hasPopup: true,
-      disabled: selectedNodeState.isDatabaseNodeOrNoneSelected(),
-    };
-  }
-
-  return undefined;
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createNotebookWorkspaceResetButton.tsx

@@ -1,17 +0,0 @@
-import ResetWorkspaceIcon from "../../../../images/notebook/Notebook-reset-workspace.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useSelectedNode } from "../../../useSelectedNode";
-
-export function createNotebookWorkspaceResetButton(container: Explorer): CommandButtonComponentProps {
-  const label = "Reset Workspace";
-  return {
-    iconSrc: ResetWorkspaceIcon,
-    iconAlt: label,
-    onCommandClick: () => container.resetNotebookWorkspace(),
-    commandButtonLabel: label,
-    hasPopup: false,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
-    ariaLabel: label,
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createOpenCassandraTerminalButton.tsx

@@ -1,27 +0,0 @@
-import * as ViewModels from "../../../../Contracts/ViewModels";
-import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useNotebook } from "../../../Notebook/useNotebook";
-
-export function createOpenCassandraTerminalButton(container: Explorer): CommandButtonComponentProps {
-  const label = "Open Cassandra 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;
-  return {
-    iconSrc: HostedTerminalIcon,
-    iconAlt: label,
-    onCommandClick: () => {
-      if (useNotebook.getState().isNotebookEnabled) {
-        container.openNotebookTerminal(ViewModels.TerminalKind.Cassandra);
-      }
-    },
-    commandButtonLabel: label,
-    hasPopup: false,
-    disabled: disableButton,
-    ariaLabel: label,
-    tooltipText: !disableButton ? "" : tooltip,
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createOpenMongoTerminalButton.tsx

@@ -1,27 +0,0 @@
-import * as ViewModels from "../../../../Contracts/ViewModels";
-import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useNotebook } from "../../../Notebook/useNotebook";
-
-export 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;
-  return {
-    iconSrc: HostedTerminalIcon,
-    iconAlt: label,
-    onCommandClick: () => {
-      if (useNotebook.getState().isNotebookEnabled) {
-        container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
-      }
-    },
-    commandButtonLabel: label,
-    hasPopup: false,
-    disabled: disableButton,
-    ariaLabel: label,
-    tooltipText: !disableButton ? "" : tooltip,
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createOpenPsqlTerminalButton.tsx

@@ -1,29 +0,0 @@
-import * as ViewModels from "../../../../Contracts/ViewModels";
-import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useNotebook } from "../../../Notebook/useNotebook";
-import { useSelectedNode } from "../../../useSelectedNode";
-
-export function createOpenPsqlTerminalButton(container: Explorer): CommandButtonComponentProps {
-  const label = "Open PSQL Shell";
-  const disableButton =
-    (!useNotebook.getState().isNotebooksEnabledForAccount && !useNotebook.getState().isNotebookEnabled) ||
-    useSelectedNode.getState().isQueryCopilotCollectionSelected();
-  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.",
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createOpenQueryButton.tsx

@@ -1,21 +0,0 @@
-import * as React from "react";
-import { useSidePanel } from "../../../../hooks/useSidePanel";
-import BrowseQueriesIcon from "../../../../images/BrowseQuery.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { BrowseQueriesPane } from "../../../Panes/BrowseQueriesPane/BrowseQueriesPane";
-import { useSelectedNode } from "../../../useSelectedNode";
-
-export function createOpenQueryButton(container: Explorer): CommandButtonComponentProps {
-  const label = "Open Query";
-  return {
-    iconSrc: BrowseQueriesIcon,
-    iconAlt: label,
-    onCommandClick: () =>
-      useSidePanel.getState().openSidePanel("Open Saved Queries", <BrowseQueriesPane explorer={container} />),
-    commandButtonLabel: label,
-    ariaLabel: label,
-    hasPopup: true,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createOpenQueryFromDiskButton.tsx

@@ -1,19 +0,0 @@
-import * as React from "react";
-import { useSidePanel } from "../../../../hooks/useSidePanel";
-import OpenQueryFromDiskIcon from "../../../../images/OpenQueryFromDisk.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import { LoadQueryPane } from "../../../Panes/LoadQueryPane/LoadQueryPane";
-import { useSelectedNode } from "../../../useSelectedNode";
-
-export function createOpenQueryFromDiskButton(): CommandButtonComponentProps {
-  const label = "Open Query From Disk";
-  return {
-    iconSrc: OpenQueryFromDiskIcon,
-    iconAlt: label,
-    onCommandClick: () => useSidePanel.getState().openSidePanel("Load Query", <LoadQueryPane />),
-    commandButtonLabel: label,
-    ariaLabel: label,
-    hasPopup: true,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createOpenSynapseLinkDialogButton.tsx

@@ -1,35 +0,0 @@
-import * as Constants from "../../../../Common/Constants";
-import { Platform, configContext } from "../../../../ConfigContext";
-import { userContext } from "../../../../UserContext";
-import SynapseIcon from "../../../../images/synapse-link.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useNotebook } from "../../../Notebook/useNotebook";
-import { useSelectedNode } from "../../../useSelectedNode";
-
-export function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonComponentProps {
-  if (configContext.platform === Platform.Emulator) {
-    return undefined;
-  }
-
-  if (userContext?.databaseAccount?.properties?.enableAnalyticalStorage) {
-    return undefined;
-  }
-
-  const capabilities = userContext?.databaseAccount?.properties?.capabilities || [];
-  if (capabilities.some((capability) => capability.name === Constants.CapabilityNames.EnableStorageAnalytics)) {
-    return undefined;
-  }
-
-  const label = "Enable Azure Synapse Link";
-  return {
-    iconSrc: SynapseIcon,
-    iconAlt: label,
-    onCommandClick: () => container.openEnableSynapseLinkDialog(),
-    commandButtonLabel: label,
-    hasPopup: false,
-    disabled:
-      useSelectedNode.getState().isQueryCopilotCollectionSelected() || useNotebook.getState().isSynapseLinkUpdating,
-    ariaLabel: label,
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createOpenTerminalButton.tsx

@@ -1,18 +0,0 @@
-import * as ViewModels from "../../../../Contracts/ViewModels";
-import CosmosTerminalIcon from "../../../../images/Cosmos-Terminal.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useSelectedNode } from "../../../useSelectedNode";
-
-export function createOpenTerminalButton(container: Explorer): CommandButtonComponentProps {
-  const label = "Open Terminal";
-  return {
-    iconSrc: CosmosTerminalIcon,
-    iconAlt: label,
-    onCommandClick: () => container.openNotebookTerminal(ViewModels.TerminalKind.Default),
-    commandButtonLabel: label,
-    hasPopup: false,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
-    ariaLabel: label,
-  };
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createPostgreButtons.tsx

@@ -1,9 +0,0 @@
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { createOpenPsqlTerminalButton } from "./createOpenPsqlTerminalButton";
-
-export function createPostgreButtons(container: Explorer): CommandButtonComponentProps[] {
-  const openPostgreShellBtn = createOpenPsqlTerminalButton(container);
-
-  return [openPostgreShellBtn];
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createScriptCommandButtons.tsx

@@ -1,73 +0,0 @@
-import { CommandButtonComponentProps } from "Explorer/Controls/CommandButton/CommandButtonComponent";
-import { SelectedNodeState, useSelectedNode } from "Explorer/useSelectedNode";
-import * as ViewModels from "../../../../Contracts/ViewModels";
-import AddStoredProcedureIcon from "../../../../images/AddStoredProcedure.svg";
-import AddTriggerIcon from "../../../../images/AddTrigger.svg";
-import AddUdfIcon from "../../../../images/AddUdf.svg";
-import { areScriptsSupported } from "./areScriptsSupported";
-
-export function createScriptCommandButtons(selectedNodeState: SelectedNodeState): CommandButtonComponentProps[] {
-  const buttons: CommandButtonComponentProps[] = [];
-
-  const shouldEnableScriptsCommands: boolean =
-    !selectedNodeState.isDatabaseNodeOrNoneSelected() && areScriptsSupported();
-
-  if (shouldEnableScriptsCommands) {
-    const label = "New Stored Procedure";
-    const newStoredProcedureBtn: CommandButtonComponentProps = {
-      iconSrc: AddStoredProcedureIcon,
-      iconAlt: label,
-      onCommandClick: () => {
-        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection);
-      },
-      commandButtonLabel: label,
-      ariaLabel: label,
-      hasPopup: true,
-      disabled:
-        useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
-        selectedNodeState.isDatabaseNodeOrNoneSelected(),
-    };
-    buttons.push(newStoredProcedureBtn);
-  }
-
-  if (shouldEnableScriptsCommands) {
-    const label = "New UDF";
-    const newUserDefinedFunctionBtn: CommandButtonComponentProps = {
-      iconSrc: AddUdfIcon,
-      iconAlt: label,
-      onCommandClick: () => {
-        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection);
-      },
-      commandButtonLabel: label,
-      ariaLabel: label,
-      hasPopup: true,
-      disabled:
-        useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
-        selectedNodeState.isDatabaseNodeOrNoneSelected(),
-    };
-    buttons.push(newUserDefinedFunctionBtn);
-  }
-
-  if (shouldEnableScriptsCommands) {
-    const label = "New Trigger";
-    const newTriggerBtn: CommandButtonComponentProps = {
-      iconSrc: AddTriggerIcon,
-      iconAlt: label,
-      onCommandClick: () => {
-        const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        selectedCollection && selectedCollection.onNewTriggerClick(selectedCollection);
-      },
-      commandButtonLabel: label,
-      ariaLabel: label,
-      hasPopup: true,
-      disabled:
-        useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
-        selectedNodeState.isDatabaseNodeOrNoneSelected(),
-    };
-    buttons.push(newTriggerBtn);
-  }
-
-  return buttons;
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createStaticCommandBarButtons.tsx

@@ -1,140 +0,0 @@
-import { createScriptCommandButtons } from "Explorer/Menus/CommandBar/CommandButtonsFactories/createScriptCommandButtons";
-import * as Constants from "../../../../Common/Constants";
-import { configContext } from "../../../../ConfigContext";
-import * as ViewModels from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import AddStoredProcedureIcon from "../../../../images/AddStoredProcedure.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useNotebook } from "../../../Notebook/useNotebook";
-import { SelectedNodeState, useSelectedNode } from "../../../useSelectedNode";
-import { applyNotebooksTemporarilyDownStyle } from "./applyNotebooksTemporarilyDownStyle";
-import { areScriptsSupported } from "./areScriptsSupported";
-import { createDivider } from "./createDivider";
-import { createManageGitHubAccountButton } from "./createManageGitHubAccountButton";
-import { createNewCollectionGroup } from "./createNewCollectionGroup";
-import { createNewDatabase } from "./createNewDatabase";
-import { createNewNotebookButton } from "./createNewNotebookButton";
-import { createNewSQLQueryButton } from "./createNewSQLQueryButton";
-import { createNotebookWorkspaceResetButton } from "./createNotebookWorkspaceResetButton";
-import { createOpenCassandraTerminalButton } from "./createOpenCassandraTerminalButton";
-import { createOpenMongoTerminalButton } from "./createOpenMongoTerminalButton";
-import { createOpenQueryButton } from "./createOpenQueryButton";
-import { createOpenQueryFromDiskButton } from "./createOpenQueryFromDiskButton";
-import { createOpenSynapseLinkDialogButton } from "./createOpenSynapseLinkDialogButton";
-import { createOpenTerminalButton } from "./createOpenTerminalButton";
-import { createuploadNotebookButton } from "./createuploadNotebookButton";
-
-export function createStaticCommandBarButtons(
-  container: Explorer,
-  selectedNodeState: SelectedNodeState
-): CommandButtonComponentProps[] {
-  const newCollectionBtn = createNewCollectionGroup(container);
-  const buttons: CommandButtonComponentProps[] = [];
-
-  buttons.push(newCollectionBtn);
-  if (userContext.apiType !== "Tables" && userContext.apiType !== "Cassandra") {
-    const addSynapseLink = createOpenSynapseLinkDialogButton(container);
-
-    if (addSynapseLink) {
-      buttons.push(createDivider());
-      buttons.push(addSynapseLink);
-    }
-  }
-
-  if (userContext.apiType !== "Tables") {
-    newCollectionBtn.children = [createNewCollectionGroup(container)];
-    const newDatabaseBtn = createNewDatabase(container);
-    newCollectionBtn.children.push(newDatabaseBtn);
-  }
-
-  if (useNotebook.getState().isNotebookEnabled) {
-    buttons.push(createDivider());
-    const notebookButtons: CommandButtonComponentProps[] = [];
-
-    const newNotebookButton = createNewNotebookButton(container);
-    newNotebookButton.children = [createNewNotebookButton(container), createuploadNotebookButton(container)];
-    notebookButtons.push(newNotebookButton);
-
-    if (container.notebookManager?.gitHubOAuthService) {
-      notebookButtons.push(createManageGitHubAccountButton(container));
-    }
-    if (useNotebook.getState().isPhoenixFeatures && configContext.isTerminalEnabled) {
-      notebookButtons.push(createOpenTerminalButton(container));
-    }
-    if (useNotebook.getState().isPhoenixNotebooks && selectedNodeState.isConnectedToContainer()) {
-      notebookButtons.push(createNotebookWorkspaceResetButton(container));
-    }
-    if (
-      (userContext.apiType === "Mongo" &&
-        useNotebook.getState().isShellEnabled &&
-        selectedNodeState.isDatabaseNodeOrNoneSelected()) ||
-      userContext.apiType === "Cassandra"
-    ) {
-      notebookButtons.push(createDivider());
-      if (userContext.apiType === "Cassandra") {
-        notebookButtons.push(createOpenCassandraTerminalButton(container));
-      } else {
-        notebookButtons.push(createOpenMongoTerminalButton(container));
-      }
-    }
-
-    notebookButtons.forEach((btn) => {
-      if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
-        if (!useNotebook.getState().isPhoenixFeatures) {
-          applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
-        }
-      } else if (btn.commandButtonLabel.indexOf("Mongo") !== -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);
-        }
-      } else if (!useNotebook.getState().isPhoenixNotebooks) {
-        applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
-      }
-      buttons.push(btn);
-    });
-  }
-
-  if (!selectedNodeState.isDatabaseNodeOrNoneSelected()) {
-    const isQuerySupported = userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
-
-    if (isQuerySupported) {
-      buttons.push(createDivider());
-      const newSqlQueryBtn = createNewSQLQueryButton(selectedNodeState);
-      buttons.push(newSqlQueryBtn);
-    }
-
-    if (isQuerySupported && selectedNodeState.findSelectedCollection()) {
-      const openQueryBtn = createOpenQueryButton(container);
-      openQueryBtn.children = [createOpenQueryButton(container), createOpenQueryFromDiskButton()];
-      buttons.push(openQueryBtn);
-    }
-
-    if (areScriptsSupported()) {
-      const label = "New Stored Procedure";
-      const newStoredProcedureBtn: CommandButtonComponentProps = {
-        iconSrc: AddStoredProcedureIcon,
-        iconAlt: label,
-        onCommandClick: () => {
-          const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-          selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection);
-        },
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: true,
-        disabled:
-          useSelectedNode.getState().isQueryCopilotCollectionSelected() ||
-          selectedNodeState.isDatabaseNodeOrNoneSelected(),
-      };
-
-      newStoredProcedureBtn.children = createScriptCommandButtons(selectedNodeState);
-      buttons.push(newStoredProcedureBtn);
-    }
-  }
-
-  return buttons;
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createStaticCommandBarButtonsForResourceToken.tsx

@@ -1,32 +0,0 @@
-import * as ViewModels from "../../../../Contracts/ViewModels";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useDatabases } from "../../../useDatabases";
-import { SelectedNodeState } from "../../../useSelectedNode";
-import { createNewSQLQueryButton } from "./createNewSQLQueryButton";
-import { createOpenQueryButton } from "./createOpenQueryButton";
-import { createOpenQueryFromDiskButton } from "./createOpenQueryFromDiskButton";
-
-export function createStaticCommandBarButtonsForResourceToken(
-  container: Explorer,
-  selectedNodeState: SelectedNodeState
-): CommandButtonComponentProps[] {
-  const newSqlQueryBtn = createNewSQLQueryButton(selectedNodeState);
-  const openQueryBtn = createOpenQueryButton(container);
-
-  const resourceTokenCollection: ViewModels.CollectionBase = useDatabases.getState().resourceTokenCollection;
-  const isResourceTokenCollectionNodeSelected: boolean =
-    resourceTokenCollection?.id() === selectedNodeState.selectedNode?.id();
-  newSqlQueryBtn.disabled = !isResourceTokenCollectionNodeSelected;
-  newSqlQueryBtn.onCommandClick = () => {
-    const resourceTokenCollection: ViewModels.CollectionBase = useDatabases.getState().resourceTokenCollection;
-    resourceTokenCollection && resourceTokenCollection.onNewQueryClick(resourceTokenCollection, undefined);
-  };
-
-  openQueryBtn.disabled = !isResourceTokenCollectionNodeSelected;
-  if (!openQueryBtn.disabled) {
-    openQueryBtn.children = [createOpenQueryButton(container), createOpenQueryFromDiskButton()];
-  }
-
-  return [newSqlQueryBtn, openQueryBtn];
-}

src/Explorer/Menus/CommandBar/CommandButtonsFactories/createuploadNotebookButton.tsx

@@ -1,17 +0,0 @@
-import NewNotebookIcon from "../../../../images/notebook/Notebook-new.svg";
-import { CommandButtonComponentProps } from "../../../Controls/CommandButton/CommandButtonComponent";
-import Explorer from "../../../Explorer";
-import { useSelectedNode } from "../../../useSelectedNode";
-
-export function createuploadNotebookButton(container: Explorer): CommandButtonComponentProps {
-  const label = "Upload to Notebook Server";
-  return {
-    iconSrc: NewNotebookIcon,
-    iconAlt: label,
-    onCommandClick: () => container.openUploadFilePanel(),
-    commandButtonLabel: label,
-    hasPopup: false,
-    disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
-    ariaLabel: label,
-  };
-}

src/Explorer/Panes/AddCollectionPanel.tsx

@@ -1425,10 +1425,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       this.setState({ isExecuting: false });
       TelemetryProcessor.traceSuccess(Action.CreateCollection, telemetryData, startKey);
       useSidePanel.getState().closeSidePanel();
-      // open NPS Survey Dialog once the collection is created
-      if (userContext.features.enableNPSSurvey) {
-        this.props.explorer.openNPSSurveyDialog();
-      }
     } catch (error) {
       const errorMessage: string = getErrorMessage(error);
       this.setState({ isExecuting: false, errorMessage, showErrorDetails: true });

src/Explorer/Panes/PanelComponent.less

@@ -112,9 +112,6 @@
   margin-top: 28px;
   margin-left: 4px !important;
 }
-.addRemoveIcon [alt="editEntity"]:focus,.addRemoveIconLabel [alt="editEntity"]:focus{
-  border:1px dashed #605E5C
-}
 .addNewParamStyle {
   margin-top: 5px;
   margin-left: 5px !important;

src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx

@@ -78,13 +78,11 @@ export const QueryCopilotFeedbackModal: React.FC = (): JSX.Element => {
           }}
         ></ChoiceGroup>
         <Text style={{ fontSize: 12, marginBottom: 14 }}>
-          By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the{" "}
-          {
-            <Link href="https://privacy.microsoft.com/privacystatement" target="_blank">
-              Privacy statement
-            </Link>
-          }{" "}
-          for more information.
+          By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your
+          organization will be able to view and manage your feedback data.{" "}
+          <Link href="" target="_blank">
+            Privacy statement
+          </Link>
         </Text>
         {likeQuery && (
           <Checkbox

src/Explorer/QueryCopilot/Modal/WelcomeModal.tsx

@@ -42,8 +42,8 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
             </Stack>
           </Stack>
           <Stack horizontalAlign="center">
-            <Stack.Item align="center" style={{ textAlign: "center" }}>
-              <Text className="title bold">Welcome to Query Copilot for Azure Cosmos DB (Private Preview)</Text>
+            <Stack.Item align="center">
+              <Text className="title bold">Welcome to Copilot in CosmosDB</Text>
             </Stack.Item>
             <Stack.Item align="center" className="text">
               <Stack horizontal>
@@ -52,7 +52,7 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
                 </StackItem>
                 <StackItem align="start">
                   <Text className="bold">
-                    Let Query Copilot do the work for you
+                    Let copilot do the work for you
                     <br />
                   </Text>
                 </StackItem>
@@ -60,7 +60,7 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
               <Text>
                 Ask Copilot to generate a query by describing the query in your words.
                 <br />
-                <Link href="http://aka.ms/cdb-copilot-learn-more">Learn more</Link>
+                <Link href="">Learn more</Link>
               </Text>
             </Stack.Item>
             <Stack.Item align="center" className="text">
@@ -78,7 +78,7 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
               <Text>
                 AI-generated content can have mistakes. Make sure it’s accurate and appropriate before using it.
                 <br />
-                <Link href="http://aka.ms/cdb-copilot-preview-terms">Read preview terms</Link>
+                <Link href="">Read preview terms</Link>
               </Text>
             </Stack.Item>
             <Stack.Item align="center" className="text">
@@ -88,16 +88,15 @@ export const WelcomeModal = ({ visible }: { visible: boolean }): JSX.Element =>
                 </StackItem>
                 <StackItem align="start">
                   <Text className="bold">
-                    Query Copilot works on a sample database.
+                    Copilot currently works only a sample database
                     <br />
                   </Text>
                 </StackItem>
               </Stack>
               <Text>
-                While in Private Preview, Query Copilot is setup to work on sample database we have configured for you
-                at no cost.
+                Copilot is setup on a sample database we have configured for you at no cost
                 <br />
-                <Link href="http://aka.ms/cdb-copilot-learn-more">Learn more</Link>
+                <Link href="">Learn more</Link>
               </Text>
             </Stack.Item>
           </Stack>

src/Explorer/QueryCopilot/Modal/__snapshots__/QueryCopilotFeedbackModal.test.tsx.snap

@@ -118,16 +118,14 @@ exports[`Query Copilot Feedback Modal snapshot test shoud render and match snaps
         }
       }
     >
-      By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
        
       <StyledLinkBase
-        href="https://privacy.microsoft.com/privacystatement"
+        href=""
         target="_blank"
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -273,16 +271,14 @@ exports[`Query Copilot Feedback Modal snapshot test should cancel submission 1`]
         }
       }
     >
-      By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
        
       <StyledLinkBase
-        href="https://privacy.microsoft.com/privacystatement"
+        href=""
         target="_blank"
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -428,16 +424,14 @@ exports[`Query Copilot Feedback Modal snapshot test should close on cancel click
         }
       }
     >
-      By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
        
       <StyledLinkBase
-        href="https://privacy.microsoft.com/privacystatement"
+        href=""
         target="_blank"
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -583,16 +577,14 @@ exports[`Query Copilot Feedback Modal snapshot test should get user unput 1`] =
         }
       }
     >
-      By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
        
       <StyledLinkBase
-        href="https://privacy.microsoft.com/privacystatement"
+        href=""
         target="_blank"
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -738,16 +730,14 @@ exports[`Query Copilot Feedback Modal snapshot test should not render dont show
         }
       }
     >
-      By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
        
       <StyledLinkBase
-        href="https://privacy.microsoft.com/privacystatement"
+        href=""
         target="_blank"
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -893,16 +883,14 @@ exports[`Query Copilot Feedback Modal snapshot test should record user contact c
         }
       }
     >
-      By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
        
       <StyledLinkBase
-        href="https://privacy.microsoft.com/privacystatement"
+        href=""
         target="_blank"
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -1048,16 +1036,14 @@ exports[`Query Copilot Feedback Modal snapshot test should record user contact c
         }
       }
     >
-      By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
        
       <StyledLinkBase
-        href="https://privacy.microsoft.com/privacystatement"
+        href=""
         target="_blank"
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -1203,16 +1189,14 @@ exports[`Query Copilot Feedback Modal snapshot test should render dont show agai
         }
       }
     >
-      By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
        
       <StyledLinkBase
-        href="https://privacy.microsoft.com/privacystatement"
+        href=""
         target="_blank"
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <StyledCheckboxBase
       checked={true}
@@ -1373,16 +1357,14 @@ exports[`Query Copilot Feedback Modal snapshot test should submit submission 1`]
         }
       }
     >
-      By pressing submit, your feedback will be used to improve Microsoft products and services. Please see the
+      By pressing submit, your feedback will be used to improve Microsoft products and services. IT admins for your organization will be able to view and manage your feedback data.
        
       <StyledLinkBase
-        href="https://privacy.microsoft.com/privacystatement"
+        href=""
         target="_blank"
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}

src/Explorer/QueryCopilot/Modal/__snapshots__/WelcomeModal.test.tsx.snap

@@ -60,16 +60,11 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
       >
         <StackItem
           align="center"
-          style={
-            Object {
-              "textAlign": "center",
-            }
-          }
         >
           <Text
             className="title bold"
           >
-            Welcome to Query Copilot for Azure Cosmos DB (Private Preview)
+            Welcome to Copilot in CosmosDB
           </Text>
         </StackItem>
         <StackItem
@@ -93,7 +88,7 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
               <Text
                 className="bold"
               >
-                Let Query Copilot do the work for you
+                Let copilot do the work for you
                 <br />
               </Text>
             </StackItem>
@@ -102,7 +97,7 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
             Ask Copilot to generate a query by describing the query in your words.
             <br />
             <StyledLinkBase
-              href="http://aka.ms/cdb-copilot-learn-more"
+              href=""
             >
               Learn more
             </StyledLinkBase>
@@ -138,7 +133,7 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
             AI-generated content can have mistakes. Make sure it’s accurate and appropriate before using it.
             <br />
             <StyledLinkBase
-              href="http://aka.ms/cdb-copilot-preview-terms"
+              href=""
             >
               Read preview terms
             </StyledLinkBase>
@@ -165,16 +160,16 @@ exports[`Query Copilot Welcome Modal snapshot test should render when isOpen is
               <Text
                 className="bold"
               >
-                Query Copilot works on a sample database.
+                Copilot currently works only a sample database
                 <br />
               </Text>
             </StackItem>
           </Stack>
           <Text>
-            While in Private Preview, Query Copilot is setup to work on sample database we have configured for you at no cost.
+            Copilot is setup on a sample database we have configured for you at no cost
             <br />
             <StyledLinkBase
-              href="http://aka.ms/cdb-copilot-learn-more"
+              href=""
             >
               Learn more
             </StyledLinkBase>

src/Explorer/QueryCopilot/QueryCopilotTab.test.tsx

@@ -5,7 +5,9 @@ import { QueryCopilotTab } from "./QueryCopilotTab";
 
 describe("Query copilot tab snapshot test", () => {
   it("should render with initial input", () => {
-    const wrapper = shallow(<QueryCopilotTab explorer={new Explorer()} />);
+    const wrapper = shallow(
+      <QueryCopilotTab initialInput="Write a query to return all records in this table" explorer={new Explorer()} />
+    );
     expect(wrapper).toMatchSnapshot();
   });
 });

src/Explorer/QueryCopilot/QueryCopilotTab.tsx

@@ -34,8 +34,6 @@ import { DeletePopup } from "Explorer/QueryCopilot/Popup/DeletePopup";
 import { querySampleDocuments, submitFeedback } from "Explorer/QueryCopilot/QueryCopilotUtilities";
 import { SamplePrompts, SamplePromptsProps } from "Explorer/QueryCopilot/SamplePrompts/SamplePrompts";
 import { QueryResultSection } from "Explorer/Tabs/QueryTab/QueryResultSection";
-import { Action } from "Shared/Telemetry/TelemetryConstants";
-import { traceFailure, traceStart, traceSuccess } from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";
 import { queryPagesUntilContentPresent } from "Utils/QueryUtils";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
@@ -56,6 +54,7 @@ interface SuggestedPrompt {
 }
 
 interface QueryCopilotTabProps {
+  initialInput: string;
   explorer: Explorer;
 }
 
@@ -72,50 +71,31 @@ const promptStyles: IButtonStyles = {
   label: { fontWeight: 400, textAlign: "left", paddingLeft: 8 },
 };
 
-export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: QueryCopilotTabProps): JSX.Element => {
+export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({
+  initialInput,
+  explorer,
+}: QueryCopilotTabProps): JSX.Element => {
+  const hideFeedbackModalForLikedQueries = useQueryCopilot((state) => state.hideFeedbackModalForLikedQueries);
+  const [userPrompt, setUserPrompt] = useState<string>(initialInput || "");
+  const [generatedQuery, setGeneratedQuery] = useState<string>("");
+  const [query, setQuery] = useState<string>("");
+  const [selectedQuery, setSelectedQuery] = useState<string>("");
+  const [isGeneratingQuery, setIsGeneratingQuery] = useState<boolean>(false);
+  const [isExecuting, setIsExecuting] = useState<boolean>(false);
+  const [likeQuery, setLikeQuery] = useState<boolean>();
+  const [dislikeQuery, setDislikeQuery] = useState<boolean>();
+  const [showCallout, setShowCallout] = useState<boolean>(false);
+  const [showSamplePrompts, setShowSamplePrompts] = useState<boolean>(false);
+  const [queryIterator, setQueryIterator] = useState<MinimalQueryIterator>();
+  const [queryResults, setQueryResults] = useState<QueryResults>();
+  const [errorMessage, setErrorMessage] = useState<string>("");
   const [copilotTeachingBubbleVisible, { toggle: toggleCopilotTeachingBubbleVisible }] = useBoolean(false);
   const inputEdited = useRef(false);
-  const {
-    hideFeedbackModalForLikedQueries,
-    userPrompt,
-    setUserPrompt,
-    generatedQuery,
-    setGeneratedQuery,
-    query,
-    setQuery,
-    selectedQuery,
-    setSelectedQuery,
-    isGeneratingQuery,
-    setIsGeneratingQuery,
-    isExecuting,
-    setIsExecuting,
-    likeQuery,
-    setLikeQuery,
-    dislikeQuery,
-    setDislikeQuery,
-    showCallout,
-    setShowCallout,
-    showSamplePrompts,
-    setShowSamplePrompts,
-    queryIterator,
-    setQueryIterator,
-    queryResults,
-    setQueryResults,
-    errorMessage,
-    setErrorMessage,
-    isSamplePromptsOpen,
-    setIsSamplePromptsOpen,
-    showDeletePopup,
-    setShowDeletePopup,
-    showFeedbackBar,
-    setShowFeedbackBar,
-    showCopyPopup,
-    setshowCopyPopup,
-    showErrorMessageBar,
-    setShowErrorMessageBar,
-    generatedQueryComments,
-    setGeneratedQueryComments,
-  } = useQueryCopilot();
+  const [isSamplePromptsOpen, setIsSamplePromptsOpen] = useState<boolean>(false);
+  const [showDeletePopup, setShowDeletePopup] = useState<boolean>(false);
+  const [showFeedbackBar, setShowFeedbackBar] = useState<boolean>(false);
+  const [showCopyPopup, setshowCopyPopup] = useState<boolean>(false);
+  const [showErrorMessageBar, setShowErrorMessageBar] = useState<boolean>(false);
 
   const sampleProps: SamplePromptsProps = {
     isSamplePromptsOpen: isSamplePromptsOpen,
@@ -190,12 +170,10 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
         userPrompt: userPrompt,
       };
       setShowDeletePopup(false);
-      useQueryCopilot.getState().refreshCorrelationId();
       const response = await fetch("https://copilotorchestrater.azurewebsites.net/generateSQLQuery", {
         method: "POST",
         headers: {
           "content-type": "application/json",
-          "x-ms-correlationid": useQueryCopilot.getState().correlationId,
         },
         body: JSON.stringify(payload),
       });
@@ -210,7 +188,6 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
           query += generateSQLQueryResponse.sql;
           setQuery(query);
           setGeneratedQuery(generateSQLQueryResponse.sql);
-          setGeneratedQueryComments(generateSQLQueryResponse.explanation);
           setShowErrorMessageBar(false);
         }
       } else {
@@ -231,13 +208,6 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
   };
 
   const onExecuteQueryClick = async (): Promise<void> => {
-    traceStart(Action.ExecuteQueryGeneratedFromQueryCopilot, {
-      correlationId: useQueryCopilot.getState().correlationId,
-      userPrompt: userPrompt,
-      generatedQuery: generatedQuery,
-      generatedQueryComments: generatedQueryComments,
-      executedQuery: selectedQuery || query,
-    });
     const queryToExecute = selectedQuery || query;
     const queryIterator = querySampleDocuments(queryToExecute, {
       enableCrossPartitionQuery: shouldEnableCrossPartitionKey(),
@@ -263,15 +233,8 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
       setQueryResults(queryResults);
       setErrorMessage("");
       setShowErrorMessageBar(false);
-      traceSuccess(Action.ExecuteQueryGeneratedFromQueryCopilot, {
-        correlationId: useQueryCopilot.getState().correlationId,
-      });
     } catch (error) {
       const errorMessage = getErrorMessage(error);
-      traceFailure(Action.ExecuteQueryGeneratedFromQueryCopilot, {
-        correlationId: useQueryCopilot.getState().correlationId,
-        errorMessage: errorMessage,
-      });
       setErrorMessage(errorMessage);
       handleError(errorMessage, "executeQueryCopilotTab");
       useTabs.getState().setIsQueryErrorThrown(true);
@@ -284,7 +247,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
 
   const getCommandbarButtons = (): CommandButtonComponentProps[] => {
     const executeQueryBtnLabel = selectedQuery ? "Execute Selection" : "Execute Query";
-    const executeQueryBtn: CommandButtonComponentProps = {
+    const executeQueryBtn = {
       iconSrc: ExecuteQueryIcon,
       iconAlt: executeQueryBtnLabel,
       onCommandClick: () => onExecuteQueryClick(),
@@ -294,7 +257,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
       disabled: query?.trim() === "",
     };
 
-    const saveQueryBtn: CommandButtonComponentProps = {
+    const saveQueryBtn = {
       iconSrc: SaveQueryIcon,
       iconAlt: "Save Query",
       onCommandClick: () =>
@@ -306,7 +269,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
     };
 
     // Sample Prompts temporary disabled due current design
-    // const samplePromptsBtn: CommandButtonComponentProps = {
+    // const samplePromptsBtn = {
     //   iconSrc: SamplePromptsIcon,
     //   iconAlt: "Sample Prompts",
     //   onCommandClick: () => setIsSamplePromptsOpen(true),
@@ -318,10 +281,9 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
     return [executeQueryBtn, saveQueryBtn];
   };
   const showTeachingBubble = (): void => {
-    const shouldShowTeachingBubble = !inputEdited.current && userPrompt.trim() === "";
-    if (shouldShowTeachingBubble) {
+    if (!inputEdited.current) {
       setTimeout(() => {
-        if (shouldShowTeachingBubble) {
+        if (!inputEdited.current) {
           toggleCopilotTeachingBubbleVisible();
           inputEdited.current = true;
         }
@@ -335,24 +297,21 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
     setShowCallout(false);
   };
 
-  const startGenerateQueryProcess = () => {
-    updateHistories();
-    generateSQLQuery();
-    resetButtonState();
-  };
-
   React.useEffect(() => {
     useCommandBar.getState().setContextButtons(getCommandbarButtons());
   }, [query, selectedQuery]);
 
   React.useEffect(() => {
+    if (initialInput) {
+      generateSQLQuery();
+    }
     showTeachingBubble();
     useTabs.getState().setIsQueryErrorThrown(false);
   }, []);
 
   return (
     <Stack className="tab-pane" style={{ padding: 24, width: "100%" }}>
-      <div style={isGeneratingQuery ? { height: "100%" } : { overflowY: "auto", height: "100%" }}>
+      <div style={{ overflowY: "auto", height: "100%" }}>
         <Stack horizontal verticalAlign="center">
           <Image src={CopilotIcon} />
           <Text style={{ marginLeft: 8, fontWeight: 600, fontSize: 16 }}>Copilot</Text>
@@ -366,11 +325,6 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
               inputEdited.current = true;
               setShowSamplePrompts(true);
             }}
-            onKeyDown={(e) => {
-              if (e.key === "Enter") {
-                startGenerateQueryProcess();
-              }
-            }}
             style={{ lineHeight: 30 }}
             styles={{ root: { width: "95%" } }}
             disabled={isGeneratingQuery}
@@ -403,7 +357,11 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
             iconProps={{ iconName: "Send" }}
             disabled={isGeneratingQuery || !userPrompt.trim()}
             style={{ marginLeft: 8 }}
-            onClick={() => startGenerateQueryProcess()}
+            onClick={() => {
+              updateHistories();
+              generateSQLQuery();
+              resetButtonState();
+            }}
           />
           {isGeneratingQuery && <Spinner style={{ marginLeft: 8 }} />}
           {showSamplePrompts && (
@@ -495,7 +453,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
                       }}
                     >
                       Learn about{" "}
-                      <Link target="_blank" href="http://aka.ms/cdb-copilot-writing">
+                      <Link target="_blank" href="">
                         writing effective prompts
                       </Link>
                     </Text>
@@ -509,7 +467,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
         <Stack style={{ marginTop: 8, marginBottom: 24 }}>
           <Text style={{ fontSize: 12 }}>
             AI-generated content can have mistakes. Make sure it&apos;s accurate and appropriate before using it.{" "}
-            <Link href="http://aka.ms/cdb-copilot-preview-terms" target="_blank">
+            <Link href="" target="_blank">
               Read preview terms
             </Link>
             {showErrorMessageBar && (
@@ -532,12 +490,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
                 target="#likeBtn"
                 onDismiss={() => {
                   setShowCallout(false);
-                  submitFeedback({
-                    generatedQuery: generatedQuery,
-                    likeQuery: likeQuery,
-                    description: "",
-                    userPrompt: userPrompt,
-                  });
+                  submitFeedback({ generatedQuery, likeQuery, description: "", userPrompt: userPrompt });
                 }}
                 directionalHint={DirectionalHint.topCenter}
               >

src/Explorer/QueryCopilot/QueryCopilotUtilities.test.tsx

@@ -4,7 +4,6 @@ import { handleError } from "Common/ErrorHandlingUtils";
 import { sampleDataClient } from "Common/SampleDataClient";
 import * as commonUtils from "Common/dataAccess/queryDocuments";
 import DocumentId from "Explorer/Tree/DocumentId";
-import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { querySampleDocuments, readSampleDocument, submitFeedback } from "./QueryCopilotUtilities";
 jest.mock("Explorer/Tree/DocumentId", () => {
   return jest.fn().mockImplementation(() => {
@@ -57,7 +56,6 @@ describe("QueryCopilotUtilities", () => {
       const mockFetch = jest.fn().mockResolvedValueOnce({});
 
       globalThis.fetch = mockFetch;
-      useQueryCopilot.getState().refreshCorrelationId();
 
       await submitFeedback({
         likeQuery: true,
@@ -73,7 +71,6 @@ describe("QueryCopilotUtilities", () => {
           method: "POST",
           headers: {
             "content-type": "application/json",
-            "x-ms-correlationid": useQueryCopilot.getState().correlationId,
           },
         })
       );
@@ -89,7 +86,6 @@ describe("QueryCopilotUtilities", () => {
       const mockFetch = jest.fn().mockResolvedValueOnce({});
 
       globalThis.fetch = mockFetch;
-      useQueryCopilot.getState().refreshCorrelationId();
 
       await submitFeedback({
         likeQuery: false,
@@ -105,7 +101,6 @@ describe("QueryCopilotUtilities", () => {
           method: "POST",
           headers: {
             "content-type": "application/json",
-            "x-ms-correlationid": useQueryCopilot.getState().correlationId,
           },
         })
       );

src/Explorer/QueryCopilot/QueryCopilotUtilities.ts

@@ -10,7 +10,6 @@ import { getPartitionKeyValue } from "Common/dataAccess/getPartitionKeyValue";
 import { getCommonQueryOptions } from "Common/dataAccess/queryDocuments";
 import DocumentId from "Explorer/Tree/DocumentId";
 import { logConsoleProgress } from "Utils/NotificationConsoleUtils";
-import { useQueryCopilot } from "hooks/useQueryCopilot";
 
 interface FeedbackParams {
   likeQuery: boolean;
@@ -36,7 +35,6 @@ export const submitFeedback = async (params: FeedbackParams): Promise<void> => {
       method: "POST",
       headers: {
         "content-type": "application/json",
-        "x-ms-correlationid": useQueryCopilot.getState().correlationId,
       },
       body: JSON.stringify(payload),
     });

src/Explorer/QueryCopilot/__snapshots__/QueryCopilotTab.test.tsx.snap

@@ -54,7 +54,6 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
         id="naturalLanguageInput"
         onChange={[Function]}
         onClick={[Function]}
-        onKeyDown={[Function]}
         style={
           Object {
             "lineHeight": 30,
@@ -67,10 +66,10 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
             },
           }
         }
-        value=""
+        value="Write a query to return all records in this table"
       />
       <CustomizedIconButton
-        disabled={true}
+        disabled={false}
         iconProps={
           Object {
             "iconName": "Send",
@@ -102,7 +101,7 @@ exports[`Query copilot tab snapshot test should render with initial input 1`] =
         AI-generated content can have mistakes. Make sure it's accurate and appropriate before using it.
          
         <StyledLinkBase
-          href="http://aka.ms/cdb-copilot-preview-terms"
+          href=""
           target="_blank"
         >
           Read preview terms

src/Explorer/SplashScreen/SplashScreen.tsx

@@ -97,12 +97,6 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
           () => this.setState({}),
           (state) => state.showResetPasswordBubble
         ),
-      },
-      {
-        dispose: useDatabases.subscribe(
-          () => this.setState({}),
-          (state) => state.sampleDataResourceTokenCollection
-        ),
       }
     );
   }
@@ -113,11 +107,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
   };
 
   private getSplashScreenButtons = (): JSX.Element => {
-    if (
-      useDatabases.getState().sampleDataResourceTokenCollection &&
-      userContext.features.enableCopilot &&
-      userContext.apiType === "SQL"
-    ) {
+    if (userContext.features.enableCopilot && userContext.apiType === "SQL") {
       return (
         <Stack style={{ width: "66%", cursor: "pointer", margin: "40px auto" }} tokens={{ childrenGap: 16 }}>
           <Stack horizontal tokens={{ childrenGap: 16 }}>
@@ -147,10 +137,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
               description={
                 "Copilot is your AI buddy that helps you write Azure Cosmos DB queries like a pro. Try it using our sample data set now!"
               }
-              onClick={() => {
-                useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot);
-                traceOpen(Action.OpenQueryCopilotFromSplashScreen, { apiType: userContext.apiType });
-              }}
+              onClick={() => useTabs.getState().openAndActivateReactTab(ReactTabKind.QueryCopilot)}
             />
             <SplashScreenButton
               imgSrc={ConnectIcon}
@@ -259,9 +246,8 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
         <form className="connectExplorerFormContainer">
           <div className="splashScreenContainer">
             <div className="splashScreen">
-              <h1
+              <div
                 className="title"
-                role="heading"
                 aria-label={
                   userContext.apiType === "Postgres"
                     ? "Welcome to Azure Cosmos DB for PostgreSQL"
@@ -272,7 +258,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {
                   ? "Welcome to Azure Cosmos DB for PostgreSQL"
                   : "Welcome to Azure Cosmos DB"}
                 <FeaturePanelLauncher />
-              </h1>
+              </div>
               <div className="subtitle">
                 {userContext.apiType === "Postgres"
                   ? "Get started with our sample datasets, documentation, and additional tools."

src/Explorer/Tabs/ConflictsTab.ts

@@ -6,16 +6,16 @@ import DiscardIcon from "../../../images/discard.svg";
 import SaveIcon from "../../../images/save-cosmos.svg";
 import * as Constants from "../../Common/Constants";
 import { DocumentsGridMetrics, KeyCodes } from "../../Common/Constants";
-import editable from "../../Common/EditableUtility";
-import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
-import * as HeadersUtility from "../../Common/HeadersUtility";
-import { MinimalQueryIterator } from "../../Common/IteratorUtilities";
-import { Splitter, SplitterBounds, SplitterDirection } from "../../Common/Splitter";
 import { createDocument } from "../../Common/dataAccess/createDocument";
 import { deleteConflict } from "../../Common/dataAccess/deleteConflict";
 import { deleteDocument } from "../../Common/dataAccess/deleteDocument";
 import { queryConflicts } from "../../Common/dataAccess/queryConflicts";
 import { updateDocument } from "../../Common/dataAccess/updateDocument";
+import editable from "../../Common/EditableUtility";
+import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
+import * as HeadersUtility from "../../Common/HeadersUtility";
+import { MinimalQueryIterator } from "../../Common/IteratorUtilities";
+import { Splitter, SplitterBounds, SplitterDirection } from "../../Common/Splitter";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { Action } from "../../Shared/Telemetry/TelemetryConstants";

src/Explorer/Tabs/NotebookV2Tab.ts

@@ -1,8 +1,7 @@
 import { stringifyNotebook, toJS } from "@nteract/commutable";
-import * as createDivider from "Explorer/Menus/CommandBar/CommandButtonsFactories/createDivider";
-import { userContext } from "UserContext";
 import * as ko from "knockout";
 import * as Q from "q";
+import { userContext } from "UserContext";
 import ClearAllOutputsIcon from "../../../images/notebook/Notebook-clear-all-outputs.svg";
 import CopyIcon from "../../../images/notebook/Notebook-copy.svg";
 import CutIcon from "../../../images/notebook/Notebook-cut.svg";
@@ -13,16 +12,17 @@ import RunAllIcon from "../../../images/notebook/Notebook-run-all.svg";
 import RunIcon from "../../../images/notebook/Notebook-run.svg";
 import { default as InterruptKernelIcon, default as KillKernelIcon } from "../../../images/notebook/Notebook-stop.svg";
 import SaveIcon from "../../../images/save-cosmos.svg";
+import { useNotebookSnapshotStore } from "../../hooks/useNotebookSnapshotStore";
 import { Action, ActionModifiers, Source } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import * as NotebookConfigurationUtils from "../../Utils/NotebookConfigurationUtils";
 import { logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
-import { useNotebookSnapshotStore } from "../../hooks/useNotebookSnapshotStore";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
 import { useDialog } from "../Controls/Dialog";
+import * as CommandBarComponentButtonFactory from "../Menus/CommandBar/CommandBarComponentButtonFactory";
 import { KernelSpecsDisplay } from "../Notebook/NotebookClientV2";
-import { NotebookComponentAdapter } from "../Notebook/NotebookComponent/NotebookComponentAdapter";
 import * as CdbActions from "../Notebook/NotebookComponent/actions";
+import { NotebookComponentAdapter } from "../Notebook/NotebookComponent/NotebookComponentAdapter";
 import { CdbAppState, SnapshotRequest } from "../Notebook/NotebookComponent/types";
 import { NotebookContentItem } from "../Notebook/NotebookContentItem";
 import { NotebookUtil } from "../Notebook/NotebookUtil";
@@ -118,7 +118,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
     const cellMarkdownType = "markdown";
     const cellRawType = "raw";
 
-    const saveButtonChildren: CommandButtonComponentProps[] = [];
+    const saveButtonChildren = [];
     if (this.container.notebookManager?.gitHubOAuthService.isLoggedIn()) {
       saveButtonChildren.push({
         iconName: copyToLabel,
@@ -272,7 +272,7 @@ export default class NotebookTabV2 extends NotebookTabBase {
         hasPopup: false,
         disabled: false,
       },
-      createDivider.createDivider(),
+      CommandBarComponentButtonFactory.createDivider(),
       {
         iconSrc: null,
         iconAlt: null,

src/Explorer/Tabs/QueryTablesTab.tsx

@@ -7,8 +7,8 @@ import ExecuteQueryIcon from "../../../images/ExecuteQuery.svg";
 import QueryBuilderIcon from "../../../images/Query-Builder.svg";
 import QueryTextIcon from "../../../images/Query-Text.svg";
 import * as ViewModels from "../../Contracts/ViewModels";
-import { userContext } from "../../UserContext";
 import { useSidePanel } from "../../hooks/useSidePanel";
+import { userContext } from "../../UserContext";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../Explorer";
 import { AddTableEntityPanel } from "../Panes/Tables/AddTableEntityPanel";

src/Explorer/Tabs/StoredProcedureTab/StoredProcedureTabComponent.tsx

@@ -1,8 +1,8 @@
 import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
 import { Pivot, PivotItem } from "@fluentui/react";
 import React from "react";
-import ExecuteQueryIcon from "../../../../images/ExecuteQuery.svg";
 import DiscardIcon from "../../../../images/discard.svg";
+import ExecuteQueryIcon from "../../../../images/ExecuteQuery.svg";
 import SaveIcon from "../../../../images/save-cosmos.svg";
 import { NormalizedEventKey } from "../../../Common/Constants";
 import { createStoredProcedure } from "../../../Common/dataAccess/createStoredProcedure";

src/Explorer/Tabs/Tabs.tsx

@@ -9,7 +9,6 @@ import { ConnectTab } from "Explorer/Tabs/ConnectTab";
 import { PostgresConnectTab } from "Explorer/Tabs/PostgresConnectTab";
 import { QuickstartTab } from "Explorer/Tabs/QuickstartTab";
 import { userContext } from "UserContext";
-import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { useTeachingBubble } from "hooks/useTeachingBubble";
 import ko from "knockout";
 import React, { MutableRefObject, useEffect, useRef, useState } from "react";
@@ -159,7 +158,6 @@ const CloseButton = ({
     onClick={(event: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
       event.stopPropagation();
       tab ? tab.onCloseTabButtonClick() : useTabs.getState().closeReactTab(tabKind);
-      tabKind === ReactTabKind.QueryCopilot && useQueryCopilot.getState().resetQueryCopilotStates();
     }}
     tabIndex={active ? 0 : undefined}
     onKeyPress={({ nativeEvent: e }) => tab.onKeyPressClose(undefined, e)}
@@ -253,7 +251,7 @@ const getReactTabContent = (activeReactTab: ReactTabKind, explorer: Explorer): J
     case ReactTabKind.Quickstart:
       return <QuickstartTab explorer={explorer} />;
     case ReactTabKind.QueryCopilot:
-      return <QueryCopilotTab explorer={explorer} />;
+      return <QueryCopilotTab initialInput={useTabs.getState().queryCopilotTabInitialInput} explorer={explorer} />;
     default:
       throw Error(`Unsupported tab kind ${ReactTabKind[activeReactTab]}`);
   }

src/Explorer/Tabs/TriggerTabContent.tsx

@@ -4,9 +4,9 @@ import React, { Component } from "react";
 import DiscardIcon from "../../../images/discard.svg";
 import SaveIcon from "../../../images/save-cosmos.svg";
 import * as Constants from "../../Common/Constants";
-import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
 import { createTrigger } from "../../Common/dataAccess/createTrigger";
 import { updateTrigger } from "../../Common/dataAccess/updateTrigger";
+import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { Action } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";

src/Explorer/Tabs/UserDefinedFunctionTabContent.tsx

@@ -4,9 +4,9 @@ import React, { Component } from "react";
 import DiscardIcon from "../../../images/discard.svg";
 import SaveIcon from "../../../images/save-cosmos.svg";
 import * as Constants from "../../Common/Constants";
-import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
 import { createUserDefinedFunction } from "../../Common/dataAccess/createUserDefinedFunction";
 import { updateUserDefinedFunction } from "../../Common/dataAccess/updateUserDefinedFunction";
+import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { Action } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";

src/Explorer/Tree/SampleDataTree.tsx

@@ -17,7 +17,7 @@ export const SampleDataTree = ({
   const buildSampleDataTree = (): TreeNode => {
     const updatedSampleTree: TreeNode = {
       label: sampleDataResourceTokenCollection.databaseId,
-      isExpanded: false,
+      isExpanded: true,
       iconSrc: CosmosDBIcon,
       className: "databaseHeader",
       children: [
@@ -47,7 +47,6 @@ export const SampleDataTree = ({
             {
               label: "Items",
               onClick: () => sampleDataResourceTokenCollection.onDocumentDBDocumentsClick(),
-              contextMenu: ResourceTreeContextMenuButtonFactory.createSampleCollectionContextMenuButton(),
               isSelected: () =>
                 useSelectedNode
                   .getState()

src/Platform/Hosted/Components/FeedbackCommandButton.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
-import FeedbackIcon from "../../../../images/Feedback.svg";
 import { CommandButtonComponent } from "../../../Explorer/Controls/CommandButton/CommandButtonComponent";
+import FeedbackIcon from "../../../../images/Feedback.svg";
 
 export const FeedbackCommandButton: React.FunctionComponent = () => {
   return (

src/Platform/Hosted/extractFeatures.ts

@@ -36,7 +36,6 @@ export type Features = {
   readonly enableLegacyMongoShellV2Debug: boolean;
   readonly loadLegacyMongoShellFromBE: boolean;
   readonly enableCopilot: boolean;
-  readonly enableNPSSurvey: boolean;
 
   // can be set via both flight and feature flag
   autoscaleDefault: boolean;
@@ -105,7 +104,6 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     enableLegacyMongoShellV2Debug: "true" === get("enablelegacymongoshellv2debug"),
     loadLegacyMongoShellFromBE: "true" === get("loadlegacymongoshellfrombe"),
     enableCopilot: "true" === get("enablecopilot"),
-    enableNPSSurvey: "true" === get("enablenpssurvey"),
   };
 }
 

src/Shared/Telemetry/TelemetryConstants.ts

@@ -131,9 +131,6 @@ export enum Action {
   LaunchUITour,
   CancelUITour,
   CompleteUITour,
-  OpenQueryCopilotFromSplashScreen,
-  OpenQueryCopilotFromNewQuery,
-  ExecuteQueryGeneratedFromQueryCopilot,
 }
 
 export const ActionModifiers = {

src/UserContext.ts

@@ -91,7 +91,7 @@ const userContext: UserContext = {
   collectionCreationDefaults: CollectionCreationDefaults,
 };
 
-export function isAccountNewerThanThresholdInMs(createdAt: string, threshold: number) {
+function isAccountNewerThanThresholdInMs(createdAt: string, threshold: number) {
   let createdAtMs: number = Date.parse(createdAt);
   if (isNaN(createdAtMs)) {
     createdAtMs = 0;

src/Utils/EndpointValidation.ts

@@ -38,7 +38,7 @@ function validateEndpointInternal(
   return valid;
 }
 
-export const defaultAllowedArmEndpoints: ReadonlyArray<string> = [
+export const allowedArmEndpoints: ReadonlyArray<string> = [
   "https://​management.azure.com",
   "https://​management.usgovcloudapi.net",
   "https://management.chinacloudapi.cn",
@@ -46,7 +46,7 @@ export const defaultAllowedArmEndpoints: ReadonlyArray<string> = [
 
 export const allowedAadEndpoints: ReadonlyArray<string> = ["https://login.microsoftonline.com/"];
 
-export const defaultAllowedBackendEndpoints: ReadonlyArray<string> = [
+export const allowedBackendEndpoints: ReadonlyArray<string> = [
   "https://main.documentdb.ext.azure.com",
   "https://main.documentdb.ext.azure.cn",
   "https://main.documentdb.ext.azure.us",

src/hooks/useQueryCopilot.ts

@@ -1,6 +1,3 @@
-import { MinimalQueryIterator } from "Common/IteratorUtilities";
-import { QueryResults } from "Contracts/ViewModels";
-import { guid } from "Explorer/Tables/Utilities";
 import create, { UseStore } from "zustand";
 
 interface QueryCopilotState {
@@ -9,127 +6,20 @@ interface QueryCopilotState {
   userPrompt: string;
   showFeedbackModal: boolean;
   hideFeedbackModalForLikedQueries: boolean;
-  correlationId: string;
-  query: string;
-  selectedQuery: string;
-  isGeneratingQuery: boolean;
-  isExecuting: boolean;
-  dislikeQuery: boolean | undefined;
-  showCallout: boolean;
-  showSamplePrompts: boolean;
-  queryIterator: MinimalQueryIterator | undefined;
-  queryResults: QueryResults | undefined;
-  errorMessage: string;
-  isSamplePromptsOpen: boolean;
-  showDeletePopup: boolean;
-  showFeedbackBar: boolean;
-  showCopyPopup: boolean;
-  showErrorMessageBar: boolean;
-  generatedQueryComments: string;
-
   openFeedbackModal: (generatedQuery: string, likeQuery: boolean, userPrompt: string) => void;
   closeFeedbackModal: () => void;
   setHideFeedbackModalForLikedQueries: (hideFeedbackModalForLikedQueries: boolean) => void;
-  refreshCorrelationId: () => void;
-  setUserPrompt: (userPrompt: string) => void;
-  setQuery: (query: string) => void;
-  setGeneratedQuery: (generatedQuery: string) => void;
-  setSelectedQuery: (selectedQuery: string) => void;
-  setIsGeneratingQuery: (isGeneratingQuery: boolean) => void;
-  setIsExecuting: (isExecuting: boolean) => void;
-  setLikeQuery: (likeQuery: boolean) => void;
-  setDislikeQuery: (dislikeQuery: boolean | undefined) => void;
-  setShowCallout: (showCallout: boolean) => void;
-  setShowSamplePrompts: (showSamplePrompts: boolean) => void;
-  setQueryIterator: (queryIterator: MinimalQueryIterator | undefined) => void;
-  setQueryResults: (queryResults: QueryResults | undefined) => void;
-  setErrorMessage: (errorMessage: string) => void;
-  setIsSamplePromptsOpen: (isSamplePromptsOpen: boolean) => void;
-  setShowDeletePopup: (showDeletePopup: boolean) => void;
-  setShowFeedbackBar: (showFeedbackBar: boolean) => void;
-  setshowCopyPopup: (showCopyPopup: boolean) => void;
-  setShowErrorMessageBar: (showErrorMessageBar: boolean) => void;
-  setGeneratedQueryComments: (generatedQueryComments: string) => void;
-  resetQueryCopilotStates: () => void;
 }
 
-type QueryCopilotStore = UseStore<QueryCopilotState>;
-
-export const useQueryCopilot: QueryCopilotStore = create((set) => ({
+export const useQueryCopilot: UseStore<QueryCopilotState> = create((set) => ({
   generatedQuery: "",
   likeQuery: false,
   userPrompt: "",
   showFeedbackModal: false,
   hideFeedbackModalForLikedQueries: false,
-  correlationId: "",
-  query: "",
-  selectedQuery: "",
-  isGeneratingQuery: false,
-  isExecuting: false,
-  dislikeQuery: undefined,
-  showCallout: false,
-  showSamplePrompts: false,
-  queryIterator: undefined,
-  queryResults: undefined,
-  errorMessage: "",
-  isSamplePromptsOpen: false,
-  showDeletePopup: false,
-  showFeedbackBar: false,
-  showCopyPopup: false,
-  showErrorMessageBar: false,
-  generatedQueryComments: "",
-
   openFeedbackModal: (generatedQuery: string, likeQuery: boolean, userPrompt: string) =>
     set({ generatedQuery, likeQuery, userPrompt, showFeedbackModal: true }),
   closeFeedbackModal: () => set({ generatedQuery: "", likeQuery: false, userPrompt: "", showFeedbackModal: false }),
   setHideFeedbackModalForLikedQueries: (hideFeedbackModalForLikedQueries: boolean) =>
     set({ hideFeedbackModalForLikedQueries }),
-  refreshCorrelationId: () => set({ correlationId: guid() }),
-  setUserPrompt: (userPrompt: string) => set({ userPrompt }),
-  setQuery: (query: string) => set({ query }),
-  setGeneratedQuery: (generatedQuery: string) => set({ generatedQuery }),
-  setSelectedQuery: (selectedQuery: string) => set({ selectedQuery }),
-  setIsGeneratingQuery: (isGeneratingQuery: boolean) => set({ isGeneratingQuery }),
-  setIsExecuting: (isExecuting: boolean) => set({ isExecuting }),
-  setLikeQuery: (likeQuery: boolean) => set({ likeQuery }),
-  setDislikeQuery: (dislikeQuery: boolean | undefined) => set({ dislikeQuery }),
-  setShowCallout: (showCallout: boolean) => set({ showCallout }),
-  setShowSamplePrompts: (showSamplePrompts: boolean) => set({ showSamplePrompts }),
-  setQueryIterator: (queryIterator: MinimalQueryIterator | undefined) => set({ queryIterator }),
-  setQueryResults: (queryResults: QueryResults | undefined) => set({ queryResults }),
-  setErrorMessage: (errorMessage: string) => set({ errorMessage }),
-  setIsSamplePromptsOpen: (isSamplePromptsOpen: boolean) => set({ isSamplePromptsOpen }),
-  setShowDeletePopup: (showDeletePopup: boolean) => set({ showDeletePopup }),
-  setShowFeedbackBar: (showFeedbackBar: boolean) => set({ showFeedbackBar }),
-  setshowCopyPopup: (showCopyPopup: boolean) => set({ showCopyPopup }),
-  setShowErrorMessageBar: (showErrorMessageBar: boolean) => set({ showErrorMessageBar }),
-  setGeneratedQueryComments: (generatedQueryComments: string) => set({ generatedQueryComments }),
-
-  resetQueryCopilotStates: () => {
-    set((state) => ({
-      ...state,
-      generatedQuery: "",
-      likeQuery: false,
-      userPrompt: "",
-      showFeedbackModal: false,
-      hideFeedbackModalForLikedQueries: false,
-      correlationId: "",
-      query: "",
-      selectedQuery: "",
-      isGeneratingQuery: false,
-      isExecuting: false,
-      dislikeQuery: undefined,
-      showCallout: false,
-      showSamplePrompts: false,
-      queryIterator: undefined,
-      queryResults: undefined,
-      errorMessage: "",
-      isSamplePromptsOpen: false,
-      showDeletePopup: false,
-      showFeedbackBar: false,
-      showCopyPopup: false,
-      showErrorMessageBar: false,
-      generatedQueryComments: "",
-    }));
-  },
 }));