update webviewContent

Author: Randall-Jiang

packages/core/src/amazonq/webview/generators/webViewContent.ts

@@ -87,6 +87,9 @@ export class WebViewContentGenerator {
         const disclaimerAcknowledged = !AmazonQPromptSettings.instance.isPromptEnabled('amazonQChatDisclaimer')
         const welcomeLoadCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0)
 
+        const dismissedCards = globals.globalState.tryGet('aws.amazonq.dismissedCards', Array, [])
+        const dismissedCardsString = JSON.stringify(dismissedCards)
+
         // only show profile card when the two conditions
         //  1. profile count >= 2
         //  2. not default (fallback) which has empty arn
@@ -113,6 +116,7 @@ export class WebViewContentGenerator {
                     ${disabledCommandsString},
                     ${isSMUS},
                     ${isSM}
+                    ${dismissedCardsString}
                 );
             }
         </script>

packages/core/src/amazonq/webview/messages/messageDispatcher.ts

@@ -87,13 +87,15 @@ export function dispatchWebViewMessagesToApps(
                 return
             }
             case 'message-dismissed': {
-                if (msg.messageId) {
-                    const dismissedCards = globals.globalState.tryGet('aws.amazonq.dismissedCards', Array, [])
-                    if (!dismissedCards.includes(msg.messageId)) {
-                        dismissedCards.push(msg.messageId)
-                        void globals.globalState.tryUpdate('aws.amazonq.dismissedCards', dismissedCards)
-                    }
-                }
+                // eslint-disable-next-line aws-toolkits/no-console-log
+                console.log('message-dismissed', msg)
+                const dismissedCards = globals.globalState.tryGet('aws.amazonq.dismissedCards', Array, [])
+                dismissedCards.push(msg.messageId)
+                void globals.globalState.tryUpdate('aws.amazonq.dismissedCards', [...dismissedCards, msg.messageId])
+                // eslint-disable-next-line aws-toolkits/no-console-log
+                console.log('dismissedCards', dismissedCards)
+                const a = 1 + 1
+                return
             }
         }
 

packages/core/src/amazonq/webview/ui/connector.ts

@@ -711,7 +711,7 @@ export class Connector {
     onMessageDismiss = (tabId: string, messageId: string): void => {
         this.sendMessageToExtension({
             command: 'message-dismissed',
-            tabID: tabId,
+            tabId: tabId,
             messageId,
             tabType: this.tabsStorage.getTab(tabId)?.type,
         })

packages/core/src/amazonq/webview/ui/main.ts

@@ -52,7 +52,8 @@ export const createMynahUI = (
     regionProfile: RegionProfile | undefined,
     disabledCommands?: string[],
     isSMUS?: boolean,
-    isSM?: boolean
+    isSM?: boolean,
+    dismissedCards?: string[]
 ) => {
     let disclaimerCardActive = !disclaimerAcknowledged
     // eslint-disable-next-line prefer-const
@@ -166,6 +167,7 @@ export const createMynahUI = (
         disabledCommands,
         commandHighlight: highlightCommand,
         regionProfile,
+        dismissedCards: dismissedCards || [],
     })
 
     // eslint-disable-next-line prefer-const
@@ -251,6 +253,7 @@ export const createMynahUI = (
                 disabledCommands,
                 commandHighlight: highlightCommand,
                 regionProfile,
+                dismissedCards: dismissedCards || [],
             })
 
             featureConfigs = tryNewMap(featureConfigsSerialized)

packages/core/src/amazonq/webview/ui/tabs/generator.ts

@@ -11,7 +11,6 @@ import { qChatIntroMessageForSMUS, TabTypeDataMap } from './constants'
 import { agentWalkthroughDataModel } from '../walkthrough/agent'
 import { FeatureContext } from '../../../../shared/featureConfig'
 import { RegionProfile } from '../../../../codewhisperer/models/model'
-import globals from '../../../../shared/extensionGlobals'
 export interface TabDataGeneratorProps {
     isFeatureDevEnabled: boolean
     isGumbyEnabled: boolean
@@ -21,13 +20,15 @@ export interface TabDataGeneratorProps {
     disabledCommands?: string[]
     commandHighlight?: FeatureContext
     regionProfile?: RegionProfile
+    dismissedCards?: string[]
 }
 
 export class TabDataGenerator {
     private followUpsGenerator: FollowUpGenerator
     public quickActionsGenerator: QuickActionGenerator
     private highlightCommand?: FeatureContext
     private regionProfile?: RegionProfile
+    private dismissedCards?: string[]
 
     constructor(props: TabDataGeneratorProps) {
         this.followUpsGenerator = new FollowUpGenerator()
@@ -41,6 +42,7 @@ export class TabDataGenerator {
         })
         this.highlightCommand = props.commandHighlight
         this.regionProfile = props.regionProfile
+        this.dismissedCards = props.dismissedCards
     }
 
     public getTabData(
@@ -57,10 +59,9 @@ export class TabDataGenerator {
             return {}
         }
 
-        const programmerModeCardId = 'programmerModeCard'
+        const programmerModeCardId = 'programmerModeCardId'
 
-        const dismissedCards = globals.globalState.tryGet('aws.amazonq.dismissedCards', Array, [])
-        const isProgrammerModeCardDismissed = dismissedCards.includes(programmerModeCardId)
+        const isProgrammerModeCardDismissed = this.dismissedCards?.includes(programmerModeCardId)
         const programmerModeCard: ChatItem | undefined = !isProgrammerModeCardDismissed
             ? ({
                   type: ChatItemType.ANSWER,