update i18n and minor fixes

Author: kelvin-klchu

packages/core/package.nls.json

@@ -312,6 +312,8 @@
     "AWS.amazonq.featureDev.pillText.generatingCode": "Generating code...",
     "AWS.amazonq.featureDev.pillText.requestingChanges": "Requesting changes ...",
     "AWS.amazonq.featureDev.pillText.insertCode": "Accept code",
+    "AWS.amazonq.featureDev.pillText.acceptAllChanges": "Accept all changes",
+    "AWS.amazonq.featureDev.pillText.acceptRemainingChanges": "Accept remaining changes",
     "AWS.amazonq.featureDev.pillText.stoppingCodeGeneration": "Stopping code generation...",
     "AWS.amazonq.featureDev.pillText.sendFeedback": "Send feedback",
     "AWS.amazonq.featureDev.pillText.selectFiles": "Select files for context",

packages/core/src/amazonq/webview/ui/diffTree/actions.ts

@@ -6,20 +6,21 @@
 import { MynahIcons } from '@aws/mynah-ui'
 import { FileNodeAction, TreeNodeDetails } from '@aws/mynah-ui/dist/static'
 import { DiffTreeFileInfo } from './types'
+import { uiComponentsTexts } from '../texts/constants'
 
 export function getDetails(filePaths: DiffTreeFileInfo[]): Record<string, TreeNodeDetails> {
     const details: Record<string, TreeNodeDetails> = {}
     for (const filePath of filePaths) {
         if (filePath.changeApplied) {
             details[filePath.relativePath] = {
                 status: 'success',
-                label: 'Change accepted',
+                label: uiComponentsTexts.changeAccepted,
                 icon: MynahIcons.OK,
             }
         } else if (filePath.rejected) {
             details[filePath.relativePath] = {
                 status: 'error',
-                label: 'Change rejected',
+                label: uiComponentsTexts.changeRejected,
                 icon: MynahIcons.CANCEL_CIRCLE,
             }
         }
@@ -39,7 +40,7 @@ export function getActions(filePaths: DiffTreeFileInfo[]): Record<string, FileNo
                     {
                         icon: MynahIcons.REVERT,
                         name: 'revert-rejection',
-                        description: 'Revert rejection',
+                        description: uiComponentsTexts.revertRejection,
                     },
                 ]
                 break
@@ -49,13 +50,13 @@ export function getActions(filePaths: DiffTreeFileInfo[]): Record<string, FileNo
                         icon: MynahIcons.OK,
                         status: 'success',
                         name: 'accept-change',
-                        description: 'Accept change',
+                        description: uiComponentsTexts.acceptChange,
                     },
                     {
                         icon: MynahIcons.CANCEL_CIRCLE,
                         status: 'error',
                         name: 'reject-change',
-                        description: 'Reject change',
+                        description: uiComponentsTexts.rejectChange,
                     },
                 ]
                 break

packages/core/src/amazonq/webview/ui/texts/constants.ts

@@ -24,6 +24,11 @@ export const uiComponentsTexts = {
     noMoreTabsTooltip: 'You can only open ten conversation tabs at a time.',
     codeSuggestionWithReferenceTitle: 'Some suggestions contain code with references.',
     spinnerText: 'Generating your answer...',
+    changeAccepted: 'Change accepted',
+    changeRejected: 'Change rejected',
+    acceptChange: 'Accept change',
+    rejectChange: 'Reject change',
+    revertRejection: 'Revert rejection',
 }
 
 export const userGuideURL = 'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/software-dev.html'

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -476,7 +476,7 @@ export class FeatureDevController {
                     tabID: tabID,
                     messageId,
                 })
-                await session.updateChatAnswer(tabID, 'Accept all changes')
+                await session.updateChatAnswer(tabID, i18n('AWS.amazonq.featureDev.pillText.acceptAllChanges'))
             }
             this.messenger.sendUpdatePlaceholder(tabID, i18n('AWS.amazonq.featureDev.pillText.selectOption'))
         } finally {
@@ -762,12 +762,12 @@ export class FeatureDevController {
             }
         }
 
-        await session.updateFilesPaths(
-            tabId,
-            session.state.filePaths ?? [],
-            session.state.deletedFiles ?? [],
-            messageId
-        )
+        await session.updateFilesPaths({
+            tabID: tabId,
+            filePaths: session.state.filePaths ?? [],
+            deletedFiles: session.state.deletedFiles ?? [],
+            messageId,
+        })
 
         if (session.acceptCodeMessageId) {
             const allFilePathsAccepted = session.state.filePaths?.every(

packages/core/src/amazonqFeatureDev/session/session.ts

@@ -13,6 +13,7 @@ import {
     type NewFileInfo,
     type SessionState,
     type SessionStateConfig,
+    UpdateFilesPathsParams,
 } from '../types'
 import { ConversationIdNotFoundError } from '../errors'
 import { referenceLogText } from '../constants'
@@ -153,18 +154,13 @@ export class Session {
         return resp.interaction
     }
 
-    public async updateFilesPaths(
-        tabID: string,
-        filePaths: NewFileInfo[],
-        deletedFiles: DeletedFileInfo[],
-        messageId: string,
-        disableFileActions: boolean = false
-    ) {
+    public async updateFilesPaths(params: UpdateFilesPathsParams) {
+        const { tabID, filePaths, deletedFiles, messageId, disableFileActions = false } = params
         this.messenger.updateFileComponent(tabID, filePaths, deletedFiles, messageId, disableFileActions)
         if ([...filePaths, ...deletedFiles].some((file) => file.rejected || file.changeApplied)) {
-            await this.updateChatAnswer(tabID, 'Accept remaining changes')
+            await this.updateChatAnswer(tabID, i18n('AWS.amazonq.featureDev.pillText.acceptRemainingChanges'))
         } else {
-            await this.updateChatAnswer(tabID, 'Accept all changes')
+            await this.updateChatAnswer(tabID, i18n('AWS.amazonq.featureDev.pillText.acceptAllChanges'))
         }
     }
 
@@ -196,21 +192,23 @@ export class Session {
     }
 
     public async insertChanges() {
-        const newFilePaths = this.state.filePaths?.filter((i) => !i.rejected && !i.changeApplied) ?? []
+        const newFilePaths =
+            this.state.filePaths?.filter((filePath) => !filePath.rejected && !filePath.changeApplied) ?? []
         await this.insertNewFiles(newFilePaths)
 
-        const deletedFiles = this.state.deletedFiles?.filter((i) => !i.rejected && !i.changeApplied) ?? []
+        const deletedFiles =
+            this.state.deletedFiles?.filter((deletedFile) => !deletedFile.rejected && !deletedFile.changeApplied) ?? []
         await this.applyDeleteFiles(deletedFiles)
 
         await this.insertCodeReferenceLogs(this.state.references ?? [])
 
         if (this._codeResultMessageId) {
-            await this.updateFilesPaths(
-                this.state.tabID,
-                this.state.filePaths ?? [],
-                this.state.deletedFiles ?? [],
-                this._codeResultMessageId
-            )
+            await this.updateFilesPaths({
+                tabID: this.state.tabID,
+                filePaths: this.state.filePaths ?? [],
+                deletedFiles: this.state.deletedFiles ?? [],
+                messageId: this._codeResultMessageId,
+            })
         }
     }
 
@@ -247,13 +245,13 @@ export class Session {
             return
         }
 
-        await this.updateFilesPaths(
-            this.state.tabID,
-            this.state.filePaths ?? [],
-            this.state.deletedFiles ?? [],
-            this._codeResultMessageId,
-            true
-        )
+        await this.updateFilesPaths({
+            tabID: this.state.tabID,
+            filePaths: this.state.filePaths ?? [],
+            deletedFiles: this.state.deletedFiles ?? [],
+            messageId: this._codeResultMessageId,
+            disableFileActions: true,
+        })
         this._codeResultMessageId = undefined
     }
 

packages/core/src/amazonqFeatureDev/types.ts

@@ -114,3 +114,11 @@ export interface SessionStorage {
 }
 
 export type LLMResponseType = 'EMPTY' | 'INVALID_STATE' | 'VALID'
+
+export interface UpdateFilesPathsParams {
+    tabID: string
+    filePaths: NewFileInfo[]
+    deletedFiles: DeletedFileInfo[]
+    messageId: string
+    disableFileActions?: boolean
+}