fix(dev): conditional for stop code gen on async event aws#5896

## Problem The function onAsyncEventProgress its reused for both Gumby and Dev feature, which enabled for both (not the expected scenario). ## Solution Added a condition to prevent and only enable for Dev.
seshubaws · Oct 30, 2024 · 9c89c53 · 9c89c53
1 parent f806ae0
commit 9c89c53
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-9cebf072-0ebd-476d-a1bf-babd27ef9cc5.json b/packages/amazonq/.changes/next-release/Bug Fix-9cebf072-0ebd-476d-a1bf-babd27ef9cc5.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /dev: fix for stop button showing for Code Transformation"
+}
diff --git a/packages/core/src/amazonq/webview/ui/apps/featureDevChatConnector.ts b/packages/core/src/amazonq/webview/ui/apps/featureDevChatConnector.ts
@@ -18,7 +18,13 @@ interface ChatPayload {
 export interface ConnectorProps {
     sendMessageToExtension: (message: ExtensionMessage) => void
     onMessageReceived?: (tabID: string, messageData: any, needToShowAPIDocsTab: boolean) => void
-    onAsyncEventProgress: (tabID: string, inProgress: boolean, message: string) => void
+    onAsyncEventProgress: (
+        tabID: string,
+        inProgress: boolean,
+        message: string,
+        messageId: string | undefined,
+        enableStopAction: boolean
+    ) => void
     onChatAnswerReceived?: (tabID: string, message: ChatItem, messageData: any) => void
     sendFeedback?: (tabId: string, feedbackPayload: FeedbackPayload) => void | undefined
     onError: (tabID: string, message: string, title: string) => void
@@ -246,7 +252,14 @@ export class Connector {
         }
 
         if (messageData.type === 'asyncEventProgressMessage') {
-            this.onAsyncEventProgress(messageData.tabID, messageData.inProgress, messageData.message ?? undefined)
+            const enableStopAction = true
+            this.onAsyncEventProgress(
+                messageData.tabID,
+                messageData.inProgress,
+                messageData.message ?? undefined,
+                messageData.messageId ?? undefined,
+                enableStopAction
+            )
             return
         }
 

diff --git a/packages/core/src/amazonq/webview/ui/apps/gumbyChatConnector.ts b/packages/core/src/amazonq/webview/ui/apps/gumbyChatConnector.ts
@@ -16,7 +16,13 @@ import { ChatPayload } from '../connector'
 export interface ConnectorProps {
     sendMessageToExtension: (message: ExtensionMessage) => void
     onMessageReceived?: (tabID: string, messageData: any, needToShowAPIDocsTab: boolean) => void
-    onAsyncEventProgress: (tabID: string, inProgress: boolean, message: string, messageId: string) => void
+    onAsyncEventProgress: (
+        tabID: string,
+        inProgress: boolean,
+        message: string,
+        messageId: string,
+        enableStopAction: boolean
+    ) => void
     onChatAnswerReceived?: (tabID: string, message: ChatItem, messageData: any) => void
     onChatAnswerUpdated?: (tabID: string, message: ChatItem) => void
     onQuickHandlerCommand: (tabID: string, command: string, eventId?: string) => void
@@ -196,7 +202,8 @@ export class Connector {
                     messageData.tabID,
                     messageData.inProgress,
                     messageData.message,
-                    messageData.messageId
+                    messageData.messageId,
+                    false
                 )
                 break
             case 'authNeededException':

diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
@@ -195,13 +195,14 @@ export const createMynahUI = (
             tabID: string,
             inProgress: boolean,
             message: string | undefined,
-            messageId: string | undefined = undefined
+            messageId: string | undefined = undefined,
+            enableStopAction: boolean = false
         ) => {
             if (inProgress) {
                 mynahUI.updateStore(tabID, {
                     loadingChat: true,
                     promptInputDisabledState: true,
-                    cancelButtonWhenLoading: true,
+                    cancelButtonWhenLoading: enableStopAction,
                 })
 
                 if (message && messageId) {