addressing comments to add to models and minor edits

Author: ntarakad-aws

packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts

@@ -178,15 +178,15 @@ export class Messenger {
             options: [
                 {
                     value: JDKVersion.JDK8,
-                    label: JDKVersion.JDK8.toString(),
+                    label: JDKVersion.JDK8,
                 },
                 {
                     value: JDKVersion.JDK11,
-                    label: JDKVersion.JDK11.toString(),
+                    label: JDKVersion.JDK11,
                 },
                 {
                     value: JDKVersion.JDK17,
-                    label: JDKVersion.JDK17.toString(),
+                    label: JDKVersion.JDK17,
                 },
                 {
                     value: JDKVersion.UNSUPPORTED,

packages/core/src/codewhisperer/models/model.ts

@@ -50,6 +50,12 @@ export type CrossFileStrategy = 'OpenTabs_BM25'
 
 export type SupplementalContextStrategy = CrossFileStrategy | UtgStrategy | 'Empty'
 
+export type PatchInfo = {
+    name: string
+    fileName: string
+    isSuccessful: boolean
+}
+
 export interface CodeWhispererSupplementalContext {
     isUtg: boolean
     isProcessTimeout: boolean

packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts

@@ -10,7 +10,7 @@ import { parsePatch, applyPatches, ParsedDiff } from 'diff'
 import path from 'path'
 import vscode from 'vscode'
 // import { ExportIntent } from '@amzn/codewhisperer-streaming'
-import { TransformByQReviewStatus, transformByQState } from '../../models/model'
+import { TransformByQReviewStatus, transformByQState, PatchInfo } from '../../models/model'
 import { ExportResultArchiveStructure } from '../../../shared/utilities/download'
 import { getLogger } from '../../../shared/logger'
 import { telemetry } from '../../../shared/telemetry/telemetry'
@@ -21,12 +21,6 @@ import * as CodeWhispererConstants from '../../models/constants'
 import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
 import { setContext } from '../../../shared/vscode/setContext'
 
-type PatchDescription = {
-    name: string
-    fileName: string
-    isSuccessful: boolean
-}
-
 export abstract class ProposedChangeNode {
     abstract readonly resourcePath: string
 
@@ -160,7 +154,7 @@ export class DiffModel {
      * @param pathToWorkspace Path to the project that was transformed
      * @returns List of nodes containing the paths of files that were modified, added, or removed
      */
-    public parseDiff(pathToDiff: string, pathToWorkspace: string, diffDescription: PatchDescription): PatchFileNode {
+    public parseDiff(pathToDiff: string, pathToWorkspace: string, diffDescription: PatchInfo): PatchFileNode {
         this.patchFileNodes = []
         const diffContents = fs.readFileSync(pathToDiff, 'utf8')
         const changedFiles = parsePatch(diffContents)
@@ -241,9 +235,6 @@ export class DiffModel {
 
     public clearChanges() {
         this.patchFileNodes = []
-        // transformByQState.setSummaryFilePath('')
-        // transformByQState.setProjectCopyFilePath('')
-        // transformByQState.setResultArchiveFilePath('')
     }
 }
 
@@ -320,7 +311,7 @@ export class ProposedTransformationExplorer {
                 getLogger().error(err)
             } else {
                 files.forEach((file) => {
-                    const filePath = path.join(path.join(pathContainingArchive, 'patch'), file)
+                    const filePath = path.join(pathContainingArchive, 'patch', file)
                     if (file.endsWith('.patch')) {
                         patchFiles.push(filePath)
                     }
@@ -331,7 +322,7 @@ export class ProposedTransformationExplorer {
         const pathContainingPatchFileDescriptions = path.join(pathContainingArchive, 'patch', 'diff.json')
 
         const jsonData = fs.readFileSync(pathContainingPatchFileDescriptions, 'utf-8')
-        const patchFilesDescriptions: PatchDescription[] = JSON.parse(jsonData)
+        const patchFilesDescriptions: PatchInfo[] = JSON.parse(jsonData)
 
         const reset = async () => {
             await setContext('gumby.transformationProposalReviewInProgress', false)
@@ -346,6 +337,7 @@ export class ProposedTransformationExplorer {
             }
 
             diffModel.clearChanges()
+            diffModel.currentPatchIndex = 0
             transformByQState.setSummaryFilePath('')
             transformByQState.setProjectCopyFilePath('')
             transformByQState.setResultArchiveFilePath('')
@@ -439,7 +431,7 @@ export class ProposedTransformationExplorer {
                 // const zip = new AdmZip(pathToArchive)
                 // zip.extractAllTo(pathContainingArchive)
 
-                getLogger().info('descriptions', patchFilesDescriptions.toString())
+                //Because multiple patches are returned once the ZIP is downloaded, we want to show the first one to start
                 diffModel.parseDiff(patchFiles[0], transformByQState.getProjectPath(), patchFilesDescriptions[0])
 
                 await setContext('gumby.reviewState', TransformByQReviewStatus.InReview)
@@ -474,7 +466,8 @@ export class ProposedTransformationExplorer {
             diffModel.saveChanges()
             telemetry.ui_click.emit({ elementId: 'transformationHub_acceptChanges' })
             void vscode.window.showInformationMessage(CodeWhispererConstants.changesAppliedNotification)
-            if (!diffModel.currentPatchIndex) {
+            //We do this to ensure that the changesAppliedChatMessage is only sent to user when they accept the first diff.patch
+            if (diffModel.currentPatchIndex === 0) {
                 transformByQState.getChatControllers()?.transformationFinished.fire({
                     message: CodeWhispererConstants.changesAppliedChatMessage,
                     tabID: ChatSessionManager.Instance.getSession().tabID,
@@ -506,7 +499,6 @@ export class ProposedTransformationExplorer {
 
         vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.rejectChanges', async () => {
             diffModel.rejectChanges()
-            diffModel.currentPatchIndex = 0
             await reset()
             telemetry.ui_click.emit({ elementId: 'transformationHub_rejectChanges' })