Fixing conflicts

Author: laileni-aws

packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts

@@ -303,7 +303,7 @@ export class Connector extends BaseConnector {
             type: ChatItemType.ANSWER,
             messageId: messageId,
             buttons: [],
-            body: ' ',
+            body: undefined,
             header: currentChatItem?.header ? { ...currentChatItem.header } : {},
         }
         switch (action.id) {
@@ -315,6 +315,7 @@ export class Connector extends BaseConnector {
                         status: 'success',
                     }
                     answer.header.buttons = []
+                    answer.body = ' '
                 }
                 break
             case 'reject-code-diff':
@@ -325,6 +326,7 @@ export class Connector extends BaseConnector {
                         status: 'error',
                     }
                     answer.header.buttons = []
+                    answer.body = ' '
                 }
                 break
             case 'confirm-tool-use':
@@ -342,8 +344,6 @@ export class Connector extends BaseConnector {
             default:
                 break
         }
-        // eslint-disable-next-line aws-toolkits/no-console-log
-        console.log(`[onCustomFormAction]: ${answer.body}`)
 
         if (currentChatItem && answer.messageId) {
             const updatedItem = { ...currentChatItem, ...answer }

packages/core/src/codewhispererChat/tools/fsWrite.ts

@@ -69,6 +69,7 @@ export class FsWrite {
         }
     }
 
+    // TODO:  Refactor the fsWrite.ts file "queueDescription" method to use existing diffLines and diff library to get the diff preview. or reuse existing diff view logic in cwchat. This will be part of next PR.
     private showStrReplacePreview(oldStr: string, newStr: string): string {
         // Split both strings into arrays of lines
         const oldStrLines = oldStr.split('\n')

packages/core/src/codewhispererChat/view/connector/connector.ts

@@ -206,6 +206,17 @@ export class ContextSelectedMessage extends UiMessage {
     }
 }
 
+export type ChatItemHeader =
+    | (ChatItemContent & {
+          icon?: MynahIcons | MynahIconsType
+          status?: {
+              status?: Status
+              icon?: MynahIcons | MynahIconsType
+              text?: string
+          }
+      })
+    | null
+
 export interface ChatMessageProps {
     readonly message: string | undefined
     readonly messageType: ChatMessageType
@@ -222,16 +233,7 @@ export interface ChatMessageProps {
     readonly buttons?: ChatItemButton[]
     readonly fileList?: ChatItemContent['fileList']
     readonly canBeVoted?: boolean
-    readonly header?:
-        | (ChatItemContent & {
-              icon?: MynahIcons | MynahIconsType
-              status?: {
-                  status?: Status
-                  icon?: MynahIcons | MynahIconsType
-                  text?: string
-              }
-          })
-        | null
+    readonly header?: ChatItemHeader
     readonly fullWidth?: boolean
     readonly padding?: boolean
     readonly codeBlockActions?: CodeBlockActions | null
@@ -253,16 +255,7 @@ export class ChatMessage extends UiMessage {
     readonly title?: string
     readonly buttons?: ChatItemButton[]
     readonly fileList?: ChatItemContent['fileList']
-    readonly header?:
-        | (ChatItemContent & {
-              icon?: MynahIcons | MynahIconsType
-              status?: {
-                  status?: Status
-                  icon?: MynahIcons | MynahIconsType
-                  text?: string
-              }
-          })
-        | null
+    readonly header?: ChatItemHeader
     readonly fullWidth?: boolean
     readonly padding?: boolean
     readonly codeBlockActions?: CodeBlockActions | null

packages/core/src/test/codewhispererChat/tools/toolShared.test.ts

@@ -156,30 +156,31 @@ describe('ToolUtils', function () {
     })
 
     describe('queueDescription', function () {
+        // TODO: Adding "void" to the following tests for the current implementation but in the next followup PR I will fix this issue.
         it('delegates to FsRead tool queueDescription method', function () {
             const tool: Tool = { type: ToolType.FsRead, tool: mockFsRead as unknown as FsRead }
-            ToolUtils.queueDescription(tool, mockWritable as unknown as Writable)
+            void ToolUtils.queueDescription(tool, mockWritable as unknown as Writable)
 
             assert(mockFsRead.queueDescription.calledOnceWith(mockWritable))
         })
 
         it('delegates to FsWrite tool queueDescription method', function () {
             const tool: Tool = { type: ToolType.FsWrite, tool: mockFsWrite as unknown as FsWrite }
-            ToolUtils.queueDescription(tool, mockWritable as unknown as Writable)
+            void ToolUtils.queueDescription(tool, mockWritable as unknown as Writable)
 
             assert(mockFsWrite.queueDescription.calledOnceWith(mockWritable))
         })
 
         it('delegates to ExecuteBash tool queueDescription method', function () {
             const tool: Tool = { type: ToolType.ExecuteBash, tool: mockExecuteBash as unknown as ExecuteBash }
-            ToolUtils.queueDescription(tool, mockWritable as unknown as Writable)
+            void ToolUtils.queueDescription(tool, mockWritable as unknown as Writable)
 
             assert(mockExecuteBash.queueDescription.calledOnceWith(mockWritable))
         })
 
         it('delegates to ListDirectory tool queueDescription method', function () {
             const tool: Tool = { type: ToolType.ListDirectory, tool: mockListDirectory as unknown as ListDirectory }
-            ToolUtils.queueDescription(tool, mockWritable as unknown as Writable)
+            void ToolUtils.queueDescription(tool, mockWritable as unknown as Writable)
 
             assert(mockListDirectory.queueDescription.calledOnceWith(mockWritable))
         })