CodeWhisperer: Getting Started UX #3861

Problem
User can see Getting Started UX Even without Login

Solution
Fixed the problem and now user can see the Getting Started UX only if user is logged in.
Made Telemetry changes to capture user clicks in getting started UX.

Author: laileni-aws

src/codewhisperer/commands/gettingStartedPageCommands.ts

@@ -6,13 +6,18 @@ import * as vscode from 'vscode'
 import { CommandDeclarations, Commands } from '../../shared/vscode/commands2'
 import { showCodeWhispererWebview, CodeWhispererSource } from '../vue/backend'
 import { telemetry } from '../../shared/telemetry/telemetry'
+import { PromptSettings } from '../../shared/settings'
 /**
  * The methods with backend logic for the Codewhisperer Getting Started Page commands.
  */
 export class CodeWhispererCommandBackend {
     constructor(private readonly extContext: vscode.ExtensionContext) {}
-    public showGettingStartedPage(source: CodeWhispererSource) {
-        telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_ButtonClick', passive: true })
+    public async showGettingStartedPage(source: CodeWhispererSource) {
+        const prompts = PromptSettings.instance
+        //To check the condition If the user has already seen the welcome message
+        if (!(await prompts.isPromptEnabled('codeWhispererNewWelcomeMessage'))) {
+            telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_ButtonClick', passive: true })
+        }
         return showCodeWhispererWebview(this.extContext, source)
     }
 }

src/codewhisperer/service/recommendationHandler.ts

@@ -135,17 +135,19 @@ export class RecommendationHandler {
         }
     }
 
-    async getTaskTypeFromEditorFileName(fileName: string): Promise<CodewhispererGettingStartedTask> {
-        if (fileName.startsWith('CodeWhisperer_generate_suggestion')) {
+    async getTaskTypeFromEditorFileName(filePath: string): Promise<CodewhispererGettingStartedTask | undefined> {
+        if (filePath.includes('CodeWhisperer_generate_suggestion')) {
             return 'autoTrigger'
-        } else if (fileName.startsWith('CodeWhisperer_manual_invoke')) {
+        } else if (filePath.includes('CodeWhisperer_manual_invoke')) {
             return 'manualTrigger'
-        } else if (fileName.startsWith('CodeWhisperer_use_comments')) {
+        } else if (filePath.includes('CodeWhisperer_use_comments')) {
             return 'commentAsPrompt'
-        } else if (fileName.startsWith('CodeWhisperer_navigate_suggestions')) {
+        } else if (filePath.includes('CodeWhisperer_navigate_suggestions')) {
             return 'navigation'
-        } else {
+        } else if (filePath.includes('Generate_unit_tests')) {
             return 'unitTest'
+        } else {
+            return undefined
         }
     }
 

src/codewhisperer/util/authUtil.ts

@@ -72,7 +72,10 @@ export class AuthUtil {
                 vscode.commands.executeCommand('aws.codeWhisperer.refreshStatusBar'),
                 vscode.commands.executeCommand('aws.codeWhisperer.updateReferenceLog'),
             ])
-            await vscode.commands.executeCommand('aws.codeWhisperer.enableCodeSuggestions')
+            // To check valid connection
+            if (this.isValidEnterpriseSsoInUse() || (this.isBuilderIdInUse() && !this.isConnectionExpired())) {
+                await vscode.commands.executeCommand('aws.codeWhisperer.enableCodeSuggestions')
+            }
             await vscode.commands.executeCommand('setContext', 'CODEWHISPERER_ENABLED', this.isConnected())
         })
     }

src/codewhisperer/util/codeWhispererSession.ts

@@ -26,7 +26,7 @@ class CodeWhispererSession {
         supplementalMetadata: Omit<CodeWhispererSupplementalContext, 'supplementalContextItems'> | undefined
     } = { request: {} as any, supplementalMetadata: {} as any }
     language: CodewhispererLanguage = 'java'
-    taskType: CodewhispererGettingStartedTask = 'autoTrigger'
+    taskType: CodewhispererGettingStartedTask | undefined
     // Various states of recommendations
     recommendations: Recommendation[] = []
     suggestionStates = new Map<number, string>()

src/codewhisperer/vue/backend.ts

@@ -13,6 +13,7 @@ import globals from '../../shared/extensionGlobals'
 import { telemetry, CodewhispererLanguage, CodewhispererGettingStartedTask } from '../../shared/telemetry/telemetry'
 import { FileSystemCommon } from '../../srcShared/fs'
 import { getLogger } from '../../shared/logger'
+import { PromptSettings } from '../../shared/settings'
 export type OSType = 'Mac' | 'RestOfOS'
 export class CodeWhispererWebview extends VueWebview {
     public readonly id = 'CodeWhispererWebview'
@@ -156,5 +157,12 @@ export async function showCodeWhispererWebview(
                 subscriptions = undefined
             }),
         ]
+        const prompts = PromptSettings.instance
+        //To check the condition If the user has already seen the welcome message
+        if (await prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')) {
+            telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_PageOpen', passive: true })
+        } else {
+            telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_PageOpen', passive: false })
+        }
     }
 }

src/codewhisperer/vue/root.vue

@@ -81,10 +81,6 @@ import Shortcuts from './shortcuts.vue'
 import ScanCode from './scanCode.vue'
 import GenerateSuggestionTab from './genSuggestionTab.vue'
 import Workshop from './workshop.vue'
-import { CodeWhispererWebview } from './backend'
-import { WebviewClientFactory } from '../../webviews/client'
-
-const client = WebviewClientFactory.create<CodeWhispererWebview>()
 
 export default defineComponent({
     name: 'Getting_Started',
@@ -101,10 +97,6 @@ export default defineComponent({
             active: parseInt(sessionStorage.getItem('active') || '0'),
         }
     },
-    //The created hook runs before the templates and Virtual DOM have been mounted or rendered
-    created() {
-        client.emitUiClick('codewhisperer_Learn_PageOpen')
-    },
     mounted() {
         /* 
                 We use Session Storage here because we need to store the the first time signin user and Existing first time signin state globally. According to this we need to display the banner.