[Power pages Copilo] Updated user prompt telemetry event to include f… (

#748) * [Power pages Copilo] Updated user prompt telemetry event to include flag for suggested prompt (#744) * getting info about selected code * showing label for selected lines of code * add flag to disable feature * updated responsiveness * code formatting fix * removed log statement * handles empty selections * passing and showing user selected code to copilot * setting fixed vertical height for user code * removed redundant code * added comment * added const for explainCode msg * sending localized string to copilot webview * gpt-tokenizer integration * user prompt with selected code and 'explain' check * showing context cmd only when copilot registered * update handling of empty snippet * updated when clause * moved code to skip in a const * Added telemetry * flag for suggested prompt and user icon update * suggested telemetry * removed comment --------- Co-authored-by: amitjoshi <[email protected]> Co-authored-by: tyaginidhi <[email protected]> * Action icon buttons code path correction (#747) --------- Co-authored-by: amitjoshi438 <[email protected]> Co-authored-by: amitjoshi <[email protected]>
microsoft · Oct 19, 2023 · 2ca8722 · 2ca8722
1 parent ad8f0be
commit 2ca8722
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/common/copilot/PowerPagesCopilot.ts b/src/common/copilot/PowerPagesCopilot.ts
@@ -216,11 +216,11 @@ export class PowerPagesCopilot implements vscode.WebviewViewProvider {
           break;
         }
         case "newUserPrompt": {
-          sendTelemetryEvent(this.telemetry, { eventName: CopilotUserPromptedEvent, copilotSessionId: sessionID, aibEndpoint: this.aibEndpoint ?? '', orgId: orgID }); //TODO: Add active Editor info
+          sendTelemetryEvent(this.telemetry, { eventName: CopilotUserPromptedEvent, copilotSessionId: sessionID, aibEndpoint: this.aibEndpoint ?? '', orgId: orgID, isSuggestedPrompt: String(data.value.isSuggestedPrompt) }); //TODO: Add active Editor info
           orgID
             ? (async () => {
               const { activeFileParams } = this.getActiveEditorContent();
-              await this.authenticateAndSendAPIRequest(data.value, activeFileParams, orgID, this.telemetry);
+              await this.authenticateAndSendAPIRequest(data.value.userPrompt, activeFileParams, orgID, this.telemetry);
             })()
             : (() => {
               this.sendMessageToWebview({ type: 'apiResponse', value: AuthProfileNotFound });

diff --git a/src/common/copilot/assets/scripts/copilot.js b/src/common/copilot/assets/scripts/copilot.js
@@ -495,10 +495,10 @@
     vscode.postMessage({ type: "login" });
   }
 
-  function getApiResponse(userPrompt) {
+  function getApiResponse(userPrompt, isSuggestedPrompt) {
     apiResponseHandler = handleAPIResponse();
     apiResponseHandler.updateThinking("Working on it...");
-    vscode.postMessage({ type: "newUserPrompt", value: userPrompt });
+    vscode.postMessage({ type: "newUserPrompt", value: {userPrompt: userPrompt, isSuggestedPrompt: isSuggestedPrompt}  });
   }
 
   function insertCode(code) {
@@ -517,7 +517,7 @@
     vscode.postMessage({ type: "walkthrough" });
   }
 
-  function processUserInput(input) {
+  function processUserInput(input, isSuggestedPrompt = false) {
     if (apiResponseInProgress) {
       return;
     }
@@ -527,7 +527,7 @@
       chatInput.disabled = true;
       saveInputToHistory(input);
       apiResponseInProgress = true;
-      getApiResponse(userPrompt); //TODO: userPrompt object should be passed
+      getApiResponse(userPrompt, isSuggestedPrompt);
       chatInput.value = "";
       chatInput.focus();
     }
@@ -592,7 +592,7 @@
 
   function handleSuggestionsClick() {
     const suggestedPrompt = this.innerText.trim();
-    processUserInput(suggestedPrompt);
+    processUserInput(suggestedPrompt, true);
   }
 
   chatInput.addEventListener('keydown', handleArrowKeys);

diff --git a/src/common/copilot/telemetry/ITelemetry.ts b/src/common/copilot/telemetry/ITelemetry.ts
@@ -19,4 +19,5 @@ export interface IProDevCopilotTelemetryData {
     aibEndpoint?: string,
     orgUrl?: string,
     tokenSize?: string
+    isSuggestedPrompt?: string;
 }
diff --git a/src/common/copilot/telemetry/copilotTelemetry.ts b/src/common/copilot/telemetry/copilotTelemetry.ts
@@ -26,6 +26,7 @@ export function sendTelemetryEvent(telemetry: ITelemetry, telemetryData: IProDev
     telemetryDataProperties.dataverseEntity = telemetryData.dataverseEntity ? telemetryData.dataverseEntity : '';
     telemetryDataProperties.responseStatus = telemetryData.responseStatus ? telemetryData.responseStatus : '';
     telemetryDataProperties.tokenSize = telemetryData.tokenSize ? telemetryData.tokenSize : '';
+    telemetryDataProperties.isSuggestedPrompt = telemetryData.isSuggestedPrompt ? telemetryData.isSuggestedPrompt : '';
 
     if (telemetryData.error) {
         telemetryDataProperties.eventName = telemetryData.eventName;

diff --git a/src/web/client/webViews/powerPagesNavigationProvider.ts b/src/web/client/webViews/powerPagesNavigationProvider.ts
@@ -145,8 +145,8 @@ export class PowerPagesNode extends vscode.TreeItem {
 
     getIconPath(svgFileName: string) {
         return {
-            light: vscode.Uri.joinPath(WebExtensionContext.extensionUri, '..', '..', 'src', 'web', 'client', 'assets', svgFileName),
-            dark: vscode.Uri.joinPath(WebExtensionContext.extensionUri, '..', '..', 'src', 'web', 'client', 'assets', svgFileName)
+            light: vscode.Uri.joinPath(WebExtensionContext.extensionUri, 'src', 'web', 'client', 'assets', svgFileName),
+            dark: vscode.Uri.joinPath(WebExtensionContext.extensionUri, 'src', 'web', 'client', 'assets', svgFileName)
         };
     }
-}
+}