include build system in message

Author: David Hasani

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

@@ -325,9 +325,7 @@ export class GumbyController {
         const pathToProject: string = message.formSelectedValues['GumbyTransformProjectForm']
         const toJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkToForm']
         const fromJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkFromForm']
-
         const projectName = path.basename(pathToProject)
-        this.messenger.sendProjectSelectionMessage(projectName, fromJDKVersion, toJDKVersion, message.tabID)
 
         if (fromJDKVersion === JDKVersion.UNSUPPORTED) {
             this.messenger.sendUnrecoverableErrorResponse('unsupported-source-jdk-version', message.tabID)
@@ -338,24 +336,37 @@ export class GumbyController {
 
         // at this point, buildSystems is either [Maven], [Gradle], or [Maven, Gradle]
         const buildSystems = await checkBuildSystem(pathToProject)
-        let selectedProjectBuildSystem = undefined
-        if (buildSystems.length === 2) {
-            // TO-DO: revert to 1
-            selectedProjectBuildSystem = buildSystems[0]
+        let selectedBuildSystem = undefined
+        if (buildSystems.length === 1) {
+            selectedBuildSystem = buildSystems[0]
         } else {
             // multiple build systems present, so ask user to pick one
             await this.messenger.sendBuildSystemPrompt(message.tabID)
             return
         }
-        getLogger().info(`Selected project uses build system: ${selectedProjectBuildSystem}`)
-        transformByQState.setBuildSystem(selectedProjectBuildSystem)
+        getLogger().info(`Selected project uses build system: ${selectedBuildSystem}`)
+        transformByQState.setBuildSystem(selectedBuildSystem)
+        this.messenger.sendProjectSelectionMessage(
+            projectName,
+            fromJDKVersion,
+            toJDKVersion,
+            selectedBuildSystem,
+            message.tabID
+        )
         await this.validateBuildWithPromptOnError(message)
     }
 
     private async handleBuildSystemForm(message: any) {
-        const buildSystem: BuildSystem = message.formSelectedValues['GumbyTransformBuildSystemForm']
-        getLogger().info(`Selected project uses Maven and Gradle; user selected build system: ${buildSystem}`)
-        transformByQState.setBuildSystem(buildSystem)
+        const selectedBuildSystem: BuildSystem = message.formSelectedValues['GumbyTransformBuildSystemForm']
+        getLogger().info(`Selected project uses Maven and Gradle; user selected build system: ${selectedBuildSystem}`)
+        transformByQState.setBuildSystem(selectedBuildSystem)
+        this.messenger.sendProjectSelectionMessage(
+            transformByQState.getProjectName(),
+            transformByQState.getSourceJDKVersion()!,
+            transformByQState.getTargetJDKVersion(),
+            selectedBuildSystem,
+            message.tabID
+        )
         // this message obj is from the build system form, not the project selection form,
         // which is fine since validateBuildWithPromptOnError just needs the tab ID here
         await this.validateBuildWithPromptOnError(message)

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

@@ -152,7 +152,7 @@ export class Messenger {
                 },
                 'TransformBuildSystemForm',
                 tabID,
-                false
+                true
             )
         )
     }
@@ -466,6 +466,7 @@ export class Messenger {
         projectName: string,
         fromJDKVersion: JDKVersion,
         toJDKVersion: JDKVersion,
+        buildSystem: BuildSystem,
         tabID: any
     ) {
         const message = `### Transformation details
@@ -475,6 +476,7 @@ export class Messenger {
 | **Project**             |   ${projectName}   |
 | **Source JDK version** |  ${fromJDKVersion}   |
 | **Target JDK version** |  ${toJDKVersion}   |
+| **Build system** |  ${buildSystem}   |
     `
 
         this.dispatcher.sendChatMessage(new ChatMessage({ message, messageType: 'prompt' }, tabID))