chore: small fixes after merge

Author: viktorsaws

chat-client/src/client/chat.test.ts

@@ -2,9 +2,10 @@ import { injectJSDOM } from '../test/jsDomInjector'
 // This needs to be run before all other imports so that mynah ui gets loaded inside of jsdom
 injectJSDOM()
 
-import { ERROR_MESSAGE, GENERIC_COMMAND, SEND_TO_PROMPT } from '@aws/chat-client-ui-types'
+import { CHAT_OPTIONS, ERROR_MESSAGE, GENERIC_COMMAND, SEND_TO_PROMPT } from '@aws/chat-client-ui-types'
 import {
     CHAT_REQUEST_METHOD,
+    GET_SERIALIZED_CHAT_REQUEST_METHOD,
     OPEN_TAB_REQUEST_METHOD,
     READY_NOTIFICATION_METHOD,
     TAB_ADD_NOTIFICATION_METHOD,
@@ -41,6 +42,8 @@ describe('Chat', () => {
 
     beforeEach(() => {
         sandbox.stub(TabFactory, 'generateUniqueId').returns(initialTabId)
+        sandbox.stub(TabFactory.prototype, 'enableHistory')
+        sandbox.stub(TabFactory.prototype, 'enableExport')
 
         clientApi = {
             postMessage: sandbox.stub(),
@@ -296,6 +299,52 @@ describe('Chat', () => {
         assert.notCalled(updateStoreStub)
     })
 
+    describe('chatOptions', () => {
+        it('enables history feature support', () => {
+            const chatOptionsRequest = createInboundEvent({
+                command: CHAT_OPTIONS,
+                params: {
+                    history: true,
+                    export: true,
+                },
+            })
+            window.dispatchEvent(chatOptionsRequest)
+
+            // @ts-ignore
+            assert.called(TabFactory.prototype.enableHistory)
+            // @ts-ignore
+            assert.called(TabFactory.prototype.enableExport)
+        })
+    })
+
+    describe('onGetSerializedChat', () => {
+        it('getSerializedChat requestId was propagated from inbound to outbound message', () => {
+            const requestId = 'request-1234'
+
+            const setSerializedChatEvent = createInboundEvent({
+                command: GET_SERIALIZED_CHAT_REQUEST_METHOD,
+                params: {
+                    tabId: 'tab-1',
+                    format: 'markdown',
+                },
+                requestId: requestId,
+            })
+            window.dispatchEvent(setSerializedChatEvent)
+
+            // Verify that postMessage was called with the correct requestId
+            assert.calledWithExactly(clientApi.postMessage, {
+                requestId,
+                command: GET_SERIALIZED_CHAT_REQUEST_METHOD,
+                params: {
+                    success: true,
+                    result: sinon.match({
+                        content: sinon.match.string,
+                    }),
+                },
+            })
+        })
+    })
+
     function createInboundEvent(params: any) {
         const event = new CustomEvent('message') as any
         event.data = params

chat-client/src/client/chat.ts

@@ -165,9 +165,6 @@ export const createChat = (
                     }))
                     tabFactory.updateQuickActionCommands(quickActionCommandGroups)
                 }
-                if (params?.history) {
-                    tabFactory.enableHistory()
-                }
 
                 if (params?.history) {
                     tabFactory.enableHistory()

chat-client/src/client/tabs/tabFactory.test.ts

@@ -59,5 +59,26 @@ describe('tabFactory', () => {
             }
             assert.deepEqual(result, expected)
         })
+
+        it('enabling export sets export tab bar button', () => {
+            const data = {
+                tabTitle: 'Chat',
+            }
+            const tabFactory = new TabFactory(data)
+            tabFactory.enableExport()
+            const result = tabFactory.getDefaultTabData()
+
+            const expected = {
+                ...data,
+                tabBarButtons: [
+                    {
+                        description: 'Export chat',
+                        icon: 'external',
+                        id: 'export',
+                    },
+                ],
+            }
+            assert.deepEqual(result, expected)
+        })
     })
 })

chat-client/src/client/tabs/tabFactory.ts

@@ -95,27 +95,6 @@ export class TabFactory {
         }
     }
 
-    private getTabBarActions(): TabBarMainAction[] {
-        const tabBarActions = []
-
-        if (this.history) {
-            tabBarActions.push({
-                id: ChatHistory.TabBarButtonId,
-                icon: MynahIcons.HISTORY,
-                description: 'View chat history',
-            })
-        }
-
-        if (this.export) {
-            tabBarActions.push({
-                id: 'export',
-                icon: MynahIcons.EXTERNAL,
-                description: 'Export chat',
-            })
-        }
-
-        return tabBarActions
-    }
     private getTabBarButtons(): TabBarMainAction[] | undefined {
         const tabBarButtons = [...(this.defaultTabData.tabBarButtons ?? [])]
 

client/vscode/package.json

@@ -345,6 +345,7 @@
     "devDependencies": {
         "@aws-sdk/credential-providers": "^3.731.1",
         "@aws-sdk/types": "^3.734.0",
+        "@aws/chat-client-ui-types": "^0.1.13",
         "@aws/language-server-runtimes": "^0.2.56",
         "@types/uuid": "^9.0.8",
         "@types/vscode": "^1.98.0",

client/vscode/src/chatActivation.ts

@@ -404,7 +404,7 @@ function generateJS(webView: Webview, extensionUri: Uri): string {
     <script type="text/javascript" src="${entrypoint.toString()}" defer onload="init()"></script>
     <script type="text/javascript">
         const init = () => {
-            amazonQChat.createChat(acquireVsCodeApi(), {disclaimerAcknowledged: false, enableConversationExport: true});
+            amazonQChat.createChat(acquireVsCodeApi(), {disclaimerAcknowledged: false});
         }
     </script>
     `

server/aws-lsp-codewhisperer/src/language-server/agenticChat/tabBarController.ts

@@ -134,8 +134,6 @@ export class TabBarController {
         } else if (params.action === 'delete') {
             this.#chatHistoryDb.deleteHistory(historyID)
         } else if (params.action === 'export') {
-            // 1. Get or restore Chat Client tab, if not opened
-
             let openTabID = this.#chatHistoryDb.getOpenTabId(historyID)
 
             // Restore tab if it is not open in Chat Client, this is needed to request serialized content from Chat Client later on.
@@ -184,7 +182,6 @@ export class TabBarController {
             defaultUri = URI.file(defaultFileName)
         }
 
-        // TODO: make it URI instead of filepath?
         const { targetUri } = await this.#features.lsp.window.showSaveFileDialog({
             supportedFormats: ['markdown', 'html'],
             defaultUri: defaultUri.toString(),