diff --git a/configs/mpac.json b/configs/mpac.json index cd8b27e03..0a8e7eaba 100644 --- a/configs/mpac.json +++ b/configs/mpac.json @@ -1,5 +1,5 @@ { - "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com", - "isTerminalEnabled" : true, - "isPhoenixEnabled" : true -} \ No newline at end of file + "JUNO_ENDPOINT": "https://tools.cosmos.azure.com", + "isTerminalEnabled": true, + "isPhoenixEnabled": true +} diff --git a/src/Contracts/ViewModels.ts b/src/Contracts/ViewModels.ts index 3bfb62ae1..bbf5455bb 100644 --- a/src/Contracts/ViewModels.ts +++ b/src/Contracts/ViewModels.ts @@ -407,6 +407,7 @@ export interface DataExplorerInputsFrame { features?: { [key: string]: string; }; + feedbackPolicies?: any; } export interface SelfServeFrameInputs { diff --git a/src/Explorer/Panes/__snapshots__/AddCollectionPanel.test.tsx.snap b/src/Explorer/Panes/__snapshots__/AddCollectionPanel.test.tsx.snap index 0a19a654b..79485d550 100644 --- a/src/Explorer/Panes/__snapshots__/AddCollectionPanel.test.tsx.snap +++ b/src/Explorer/Panes/__snapshots__/AddCollectionPanel.test.tsx.snap @@ -486,4 +486,4 @@ exports[`AddCollectionPanel should render Default properly 1`] = ` isButtonDisabled={false} /> -`; +`; \ No newline at end of file diff --git a/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx b/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx index 58e5988b9..fb6b79dd6 100644 --- a/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx +++ b/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx @@ -21,7 +21,6 @@ import { import { HttpStatusCodes } from "Common/Constants"; import { handleError } from "Common/ErrorHandlingUtils"; import { createUri } from "Common/UrlUtility"; -import { WelcomeModal } from "Explorer/QueryCopilot/Modal/WelcomeModal"; import { CopyPopup } from "Explorer/QueryCopilot/Popup/CopyPopup"; import { DeletePopup } from "Explorer/QueryCopilot/Popup/DeletePopup"; import { @@ -272,28 +271,11 @@ export const QueryCopilotPromptbar: React.FC = ({ } }; - const showTeachingBubble = (): void => { - if (showPromptTeachingBubble && !inputEdited.current) { - setTimeout(() => { - if (!inputEdited.current && !isWelcomModalVisible()) { - setCopilotTeachingBubbleVisible(true); - inputEdited.current = true; - } - }, 30000); - } else { - toggleCopilotTeachingBubbleVisible(false); - } - }; - const toggleCopilotTeachingBubbleVisible = (visible: boolean): void => { setCopilotTeachingBubbleVisible(visible); setShowPromptTeachingBubble(visible); }; - const isWelcomModalVisible = (): boolean => { - return localStorage.getItem("hideWelcomeModal") !== "true"; - }; - const clearFeedback = () => { resetButtonState(); resetQueryResults(); @@ -322,7 +304,6 @@ export const QueryCopilotPromptbar: React.FC = ({ }; React.useEffect(() => { - showTeachingBubble(); useTabs.getState().setIsQueryErrorThrown(false); }, []); @@ -539,84 +520,90 @@ export const QueryCopilotPromptbar: React.FC = ({ {showFeedbackBar && ( - - Provide feedback on the query generated - {showCallout && !hideFeedbackModalForLikedQueries && ( - { - setShowCallout(false); - SubmitFeedback({ - params: { - generatedQuery: generatedQuery, - likeQuery: likeQuery, - description: "", - userPrompt: userPrompt, - }, - explorer, - databaseId, - containerId, - mode: isSampleCopilotActive ? "Sample" : "User", - }); - }} - directionalHint={DirectionalHint.topCenter} - > - - Thank you. Need to give{" "} - { + + {userContext.feedbackPolicies?.policyAllowFeedback && ( + + Provide feedback on the query generated + {showCallout && !hideFeedbackModalForLikedQueries && ( + { setShowCallout(false); - openFeedbackModal(generatedQuery, true, userPrompt); + SubmitFeedback({ + params: { + generatedQuery: generatedQuery, + likeQuery: likeQuery, + description: "", + userPrompt: userPrompt, + }, + explorer, + databaseId, + containerId, + mode: isSampleCopilotActive ? "Sample" : "User", + }); }} + directionalHint={DirectionalHint.topCenter} > - more feedback? - - - + + Thank you. Need to give{" "} + { + setShowCallout(false); + openFeedbackModal(generatedQuery, true, userPrompt); + }} + > + more feedback? + + + + )} + { + setShowCallout(!likeQuery); + setLikeQuery(!likeQuery); + if (likeQuery === true) { + document.getElementById("likeStatus").innerHTML = "Unpressed"; + } + if (likeQuery === false) { + document.getElementById("likeStatus").innerHTML = "Liked"; + } + if (dislikeQuery) { + setDislikeQuery(!dislikeQuery); + } + }} + /> + { + let toggleStatusValue = "Unpressed"; + if (!dislikeQuery) { + openFeedbackModal(generatedQuery, false, userPrompt); + setLikeQuery(false); + toggleStatusValue = "Disliked"; + } + setDislikeQuery(!dislikeQuery); + setShowCallout(false); + document.getElementById("likeStatus").innerHTML = toggleStatusValue; + }} + /> + + + )} - { - setShowCallout(!likeQuery); - setLikeQuery(!likeQuery); - if (likeQuery === true) { - document.getElementById("likeStatus").innerHTML = "Unpressed"; - } - if (likeQuery === false) { - document.getElementById("likeStatus").innerHTML = "Liked"; - } - if (dislikeQuery) { - setDislikeQuery(!dislikeQuery); - } - }} - /> - { - let toggleStatusValue = "Unpressed"; - if (!dislikeQuery) { - openFeedbackModal(generatedQuery, false, userPrompt); - setLikeQuery(false); - toggleStatusValue = "Disliked"; - } - setDislikeQuery(!dislikeQuery); - setShowCallout(false); - document.getElementById("likeStatus").innerHTML = toggleStatusValue; - }} - /> - - - - = ({ )} - {isSamplePromptsOpen && } {query !== "" && query.trim().length !== 0 && (