fix after merge

Author: jpinkney-aws

packages/amazonq/src/lsp/chat/webviewProvider.ts

@@ -15,7 +15,7 @@ import {
 import { QuickActionCommandGroup } from '@aws/mynah-ui'
 import * as path from 'path'
 import { globals, isSageMaker, AmazonQPromptSettings, LanguageServerResolver } from 'aws-core-vscode/shared'
-import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { AuthUtil, RegionProfile } from 'aws-core-vscode/codewhisperer'
 import { featureConfig } from 'aws-core-vscode/amazonq'
 
 export class AmazonQChatViewProvider implements WebviewViewProvider {
@@ -76,9 +76,23 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
 
     private async getWebviewContent(mynahUIPath: string, hybridChatConnector: string) {
         const featureConfigData = await featureConfig.getFeatureConfigs()
-        const disabledCommands = isSageMaker() ? `['/dev', '/transform']` : '[]'
+
+        const isSM = isSageMaker('SMAI')
+        const isSMUS = isSageMaker('SMUS')
+        const disabledCommands = isSM ? `['/dev', '/transform', '/test', '/review', '/doc']` : '[]'
         const disclaimerAcknowledged = AmazonQPromptSettings.instance.isPromptEnabled('amazonQChatDisclaimer')
         const welcomeCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0)
+
+        // only show profile card when the two conditions
+        //  1. profile count >= 2
+        //  2. not default (fallback) which has empty arn
+        let regionProfile: RegionProfile | undefined = AuthUtil.instance.regionProfileManager.activeRegionProfile
+        if (AuthUtil.instance.regionProfileManager.profiles.length === 1) {
+            regionProfile = undefined
+        }
+
+        const regionProfileString: string = JSON.stringify(regionProfile)
+
         const entrypoint = process.env.WEBPACK_DEVELOPER_SERVER
             ? 'http: localhost'
             : 'https: file+.vscode-resources.vscode-cdn.net'
@@ -112,7 +126,7 @@ export class AmazonQChatViewProvider implements WebviewViewProvider {
             <script type="text/javascript" src="${hybridChatConnector.toString()}"></script>
             <script type="text/javascript">
                 const init = () => {
-                    const hybridChatConnector = new HybridChatAdapter(${(await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected'},${featureConfigData},${welcomeCount},${disclaimerAcknowledged},${disabledCommands})
+                    const hybridChatConnector = new HybridChatAdapter(${(await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected'},${featureConfigData},${welcomeCount},${disclaimerAcknowledged},${regionProfileString},${disabledCommands},${isSMUS},${isSM})
                     const connectorsConfig = {
                         quickActionCommands: [hybridChatConnector.initialQuickActions[0]]
                     }

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

@@ -9,6 +9,7 @@ import { isTabType } from './storages/tabsStorage'
 import { WebviewUIHandler } from './main'
 import { FeatureContext } from '../../../shared/featureConfig'
 import { TabDataGenerator } from './tabs/generator'
+import { RegionProfile } from '../../../codewhisperer/models/model'
 
 export interface ConnectorAdapter {
     mynahUI?: MynahUI
@@ -24,8 +25,10 @@ export class HybridChatAdapter implements ConnectorAdapter {
     private welcomeCount: number
     private disclaimerAcknowledged: boolean
     private disabledCommands: string[]
+    private regionProfile: RegionProfile | undefined
+    private isSMUS: boolean
+    private isSM: boolean
 
-    // private connector?: Connector
     private uiHandler?: WebviewUIHandler
 
     private _mynahUI?: MynahUI
@@ -35,27 +38,36 @@ export class HybridChatAdapter implements ConnectorAdapter {
         featureConfigsSerialized: [string, FeatureContext][],
         welcomeCount: number,
         disclaimerAcknowledged: boolean,
-        disabledCommands: string[]
+        regionProfile: RegionProfile | undefined,
+        disabledCommands: string[],
+        isSMUS: boolean,
+        isSM: boolean
     ) {
         this.enableAgents = enableAgents
         this.featureConfigsSerialized = featureConfigsSerialized
         this.welcomeCount = welcomeCount
         this.disclaimerAcknowledged = disclaimerAcknowledged
+        this.regionProfile = regionProfile
         this.disabledCommands = disabledCommands
+        this.isSMUS = isSMUS
+        this.isSM = isSM
     }
 
     createIdeConnector(mynahUIRef: { mynahUI: MynahUI }, ideApiPostMessage: (msg: any) => void): any {
         this.mynahUI = mynahUIRef.mynahUI
 
-        this.uiHandler = new WebviewUIHandler(
-            ideApiPostMessage,
-            this.mynahUI,
-            this.enableAgents,
-            this.featureConfigsSerialized,
-            this.welcomeCount,
-            this.disclaimerAcknowledged,
-            this.disabledCommands
-        )
+        this.uiHandler = new WebviewUIHandler({
+            postMessage: ideApiPostMessage,
+            mynahUI: this.mynahUI,
+            enableAgents: this.enableAgents,
+            featureConfigsSerialized: this.featureConfigsSerialized,
+            welcomeCount: this.welcomeCount,
+            disclaimerAcknowledged: this.disclaimerAcknowledged,
+            regionProfile: this.regionProfile,
+            disabledCommands: this.disabledCommands,
+            isSMUS: this.isSMUS,
+            isSM: this.isSM,
+        })
 
         /**
          * By default its spawed by the same handler that was created in the old mynah ui; we need to swap it with the new one that routes messages