Update copilot endpoints

package.json

@@ -148,7 +148,7 @@
     "eslint-cli": "1.1.1",
     "eslint-plugin-no-null": "1.0.2",
     "eslint-plugin-prefer-arrow": "1.2.2",
-    "eslint-plugin-react-hooks": "4.6.0",
+    "eslint-plugin-react-hooks": "4.2.0",
     "expect-playwright": "0.3.3",
     "fast-glob": "3.2.5",
     "file-loader": "2.0.0",

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/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/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/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="https://privacy.microsoft.com/privacystatement" 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>
@@ -88,14 +88,13 @@ 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>
               </Text>

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

@@ -118,7 +118,7 @@ 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"
@@ -126,8 +126,6 @@ exports[`Query Copilot Feedback Modal snapshot test shoud render and match snaps
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -273,7 +271,7 @@ 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"
@@ -281,8 +279,6 @@ exports[`Query Copilot Feedback Modal snapshot test should cancel submission 1`]
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -428,7 +424,7 @@ 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"
@@ -436,8 +432,6 @@ exports[`Query Copilot Feedback Modal snapshot test should close on cancel click
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -583,7 +577,7 @@ 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"
@@ -591,8 +585,6 @@ exports[`Query Copilot Feedback Modal snapshot test should get user unput 1`] =
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -738,7 +730,7 @@ 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"
@@ -746,8 +738,6 @@ exports[`Query Copilot Feedback Modal snapshot test should not render dont show
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -893,7 +883,7 @@ 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"
@@ -901,8 +891,6 @@ exports[`Query Copilot Feedback Modal snapshot test should record user contact c
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -1048,7 +1036,7 @@ 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"
@@ -1056,8 +1044,6 @@ exports[`Query Copilot Feedback Modal snapshot test should record user contact c
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <Stack
       horizontal={true}
@@ -1203,7 +1189,7 @@ 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"
@@ -1211,8 +1197,6 @@ exports[`Query Copilot Feedback Modal snapshot test should render dont show agai
       >
         Privacy statement
       </StyledLinkBase>
-       
-      for more information.
     </Text>
     <StyledCheckboxBase
       checked={true}
@@ -1373,7 +1357,7 @@ 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"
@@ -1381,8 +1365,6 @@ exports[`Query Copilot Feedback Modal snapshot test should submit submission 1`]
       >
         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>
@@ -165,13 +160,13 @@ 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"

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

@@ -17,7 +17,7 @@ import {
   TextField,
 } from "@fluentui/react";
 import { useBoolean } from "@fluentui/react-hooks";
-import { QueryCopilotSampleContainerId, QueryCopilotSampleContainerSchema } from "Common/Constants";
+import { JunoEndpoints, QueryCopilotSampleContainerId, QueryCopilotSampleContainerSchema } from "Common/Constants";
 import { getErrorMessage, handleError } from "Common/ErrorHandlingUtils";
 import { shouldEnableCrossPartitionKey } from "Common/HeadersUtility";
 import { MinimalQueryIterator } from "Common/IteratorUtilities";
@@ -56,6 +56,7 @@ interface SuggestedPrompt {
 }
 
 interface QueryCopilotTabProps {
+  initialInput: string;
   explorer: Explorer;
 }
 
@@ -72,50 +73,32 @@ 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 [generatedQueryComments, setGeneratedQueryComments] = 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,
@@ -191,7 +174,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
       };
       setShowDeletePopup(false);
       useQueryCopilot.getState().refreshCorrelationId();
-      const response = await fetch("https://copilotorchestrater.azurewebsites.net/generateSQLQuery", {
+      const response = await fetch(`${JunoEndpoints.Prod}/generateSQLQuery`, {
         method: "POST",
         headers: {
           "content-type": "application/json",
@@ -318,10 +301,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;
         }
@@ -346,13 +328,16 @@ export const QueryCopilotTab: React.FC<QueryCopilotTabProps> = ({ explorer }: Qu
   }, [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>
@@ -532,12 +517,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.ts

@@ -1,5 +1,6 @@
 import { FeedOptions, Item, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
 import {
+  JunoEndpoints,
   QueryCopilotSampleContainerId,
   QueryCopilotSampleContainerSchema,
   QueryCopilotSampleDatabaseId,
@@ -32,7 +33,7 @@ export const submitFeedback = async (params: FeedbackParams): Promise<void> => {
       contact: contact || "",
     };
 
-    await fetch("https://copilotorchestrater.azurewebsites.net/feedback", {
+    await fetch(`${JunoEndpoints.Prod}/feedback`, {
       method: "POST",
       headers: {
         "content-type": "application/json",

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

@@ -67,10 +67,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",

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/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/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,5 +1,3 @@
-import { MinimalQueryIterator } from "Common/IteratorUtilities";
-import { QueryResults } from "Contracts/ViewModels";
 import { guid } from "Explorer/Tables/Utilities";
 import create, { UseStore } from "zustand";
 
@@ -10,126 +8,23 @@ interface QueryCopilotState {
   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: "",
-    }));
-  },
 }));