fix(amazonq): check if tab is already open before exporting from history

Author: avi-alpert

packages/core/src/codewhispererChat/controllers/chat/tabBarController.ts

@@ -26,14 +26,21 @@ export class TabBarController {
     constructor(messenger: Messenger) {
         this.messenger = messenger
     }
-    processActionClickMessage(msg: DetailedListActionClickMessage) {
+    async processActionClickMessage(msg: DetailedListActionClickMessage) {
         if (msg.listType === 'history') {
             if (msg.action.text === 'Delete') {
                 this.chatHistoryDb.deleteHistory(msg.action.id)
                 this.messenger.sendUpdateDetailedListMessage('history', { list: this.generateHistoryList() })
             } else if (msg.action.text === 'Export') {
-                const selectedTab = this.chatHistoryDb.getTab(msg.action.id)
-                this.restoreTab(selectedTab, true)
+                // If conversation is already open, export it
+                const openTabId = this.chatHistoryDb.getOpenTabId(msg.action.id)
+                if (openTabId) {
+                    await this.exportChatButtonClicked({ tabID: openTabId, buttonId: 'export_chat' })
+                } // If conversation is not open, restore it before exporting
+                else {
+                    const selectedTab = this.chatHistoryDb.getTab(msg.action.id)
+                    this.restoreTab(selectedTab, true)
+                }
             }
         }
     }
@@ -58,13 +65,14 @@ export class TabBarController {
         }
     }
 
+    // If selected is conversation is already open, select that tab. Else, open new tab with conversation.
     processItemSelectMessage(msg: DetailedListItemSelectMessage) {
         if (msg.listType === 'history') {
             const historyID = msg.item.id
             if (historyID) {
-                const selectedTab = this.chatHistoryDb.getTab(historyID)
-                const openTabID = this.chatHistoryDb.getTabId(historyID)
-                if (!selectedTab?.isOpen || !openTabID) {
+                const openTabID = this.chatHistoryDb.getOpenTabId(historyID)
+                if (!openTabID) {
+                    const selectedTab = this.chatHistoryDb.getTab(historyID)
                     this.restoreTab(selectedTab)
                 } else {
                     this.messenger.sendSelectTabMessage(openTabID, historyID)

packages/core/src/shared/db/chatDb/chatDb.ts

@@ -119,10 +119,14 @@ export class Database {
         }
     }
 
-    getTabId(historyId: string) {
-        for (const [tabId, id] of this.historyIdMapping) {
-            if (id === historyId) {
-                return tabId
+    // If conversation is open, return its tabId, else return undefined
+    getOpenTabId(historyId: string) {
+        const selectedTab = this.getTab(historyId)
+        if (selectedTab?.isOpen) {
+            for (const [tabId, id] of this.historyIdMapping) {
+                if (id === historyId) {
+                    return tabId
+                }
             }
         }
         return undefined
@@ -214,7 +218,7 @@ export class Database {
         if (this.initialized) {
             const tabCollection = this.db.getCollection<Tab>(TabCollection)
             tabCollection.findAndRemove({ historyId })
-            const tabId = this.getTabId(historyId)
+            const tabId = this.getOpenTabId(historyId)
             if (tabId) {
                 this.historyIdMapping.delete(tabId)
             }