fix(CodeTransform): pre-select Java version (#4401)

## Problem

UX request to change the way we validate input: rather than letting user
select a project, then run all validation checks, we want to run all
validation checks on all open projects to filter valid projects for the
user, plus pre-select the Java version for them if we were able to
detect it and it's a supported version (8 or 11).

## Solution

Implement what is described above.

<!---
    REMINDER:
    - Read CONTRIBUTING.md first.
    - Add test coverage for your changes.
    - Update the changelog using `npm run newChange`.
    - Link to related issues/commits.
    - Testing: how did you test your changes?
    - Screenshots
-->

## License

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

---------

Co-authored-by: David Hasani <[email protected]>

Author: dhasani23

packages/toolkit/src/codewhisperer/commands/startTransformByQ.ts

@@ -9,7 +9,7 @@ import * as fs from 'fs'
 import * as os from 'os'
 import { getLogger } from '../../shared/logger'
 import * as CodeWhispererConstants from '../models/constants'
-import { transformByQState, StepProgress, TransformByQReviewStatus } from '../models/model'
+import { transformByQState, StepProgress, TransformByQReviewStatus, JDKVersion, DropdownStep } from '../models/model'
 import {
     throwIfCancelled,
     startJob,
@@ -21,10 +21,11 @@ import {
     convertToTimeString,
     convertDateToTimestamp,
     getOpenProjects,
-    validateProjectSelection,
     getVersionData,
+    validateOpenProjects,
 } from '../service/transformByQHandler'
 import { QuickPickItem } from 'vscode'
+import { MultiStepInputFlowController } from '../../shared//multiStepInputFlowController'
 import path from 'path'
 import { sleep } from '../../shared/utilities/timeoutUtils'
 import { encodeHTML } from '../../shared/utilities/textUtilities'
@@ -65,26 +66,82 @@ export async function startTransformByQWithProgress() {
 }
 
 interface UserInputState {
-    title: string
-    step: number
-    totalSteps: number
-    targetLanguage: QuickPickItem
-    targetVersion: QuickPickItem
-    project: QuickPickItem
+    project: QuickPickItem | undefined
+    sourceJavaVersion: QuickPickItem | undefined
 }
 
-async function collectInput(validProjects: vscode.QuickPickItem[]) {
+async function collectInput(validProjects: Map<vscode.QuickPickItem, JDKVersion | undefined>) {
     const state = {} as Partial<UserInputState>
-    transformByQState.setTargetJDKVersionToJDK17()
-    const pick = await vscode.window.showQuickPick(validProjects, {
+    transformByQState.setTargetJDKVersion(JDKVersion.JDK17)
+    await MultiStepInputFlowController.run(input => pickProject(input, state, validProjects))
+    if (!state.project) {
+        throw new ToolkitError('No project selected', { code: 'NoProjectSelected' })
+    }
+    const versionsArray = [JDKVersion.JDK8, JDKVersion.JDK11]
+    const validSourceVersions: vscode.QuickPickItem[] = versionsArray.map(version => ({
+        label: version,
+    }))
+    await MultiStepInputFlowController.run(input => pickSourceVersion(input, state, validSourceVersions))
+    if (!state.sourceJavaVersion) {
+        throw new ToolkitError('No version selected', { code: 'NoVersionSelected' })
+    }
+    return state as UserInputState
+}
+
+async function pickProject(
+    input: MultiStepInputFlowController,
+    state: Partial<UserInputState>,
+    validProjects: Map<vscode.QuickPickItem, JDKVersion | undefined>
+) {
+    const pick = await input.showQuickPick({
+        title: CodeWhispererConstants.transformByQWindowTitle,
+        step: DropdownStep.STEP_1,
+        totalSteps: DropdownStep.STEP_2,
+        placeholder: CodeWhispererConstants.selectProjectPrompt,
+        items: Array.from(validProjects.keys()),
+        shouldResume: () => Promise.resolve(false),
+    })
+    state.project = pick
+    transformByQState.setProjectName(encodeHTML(state.project.label)) // encode to avoid HTML injection risk
+    const javaVersion = validProjects.get(pick)
+    transformByQState.setSourceJDKVersion(javaVersion)
+}
+
+async function pickSourceVersion(
+    input: MultiStepInputFlowController,
+    state: Partial<UserInputState>,
+    validSourceVersions: vscode.QuickPickItem[]
+) {
+    let detectedJavaVersion = undefined
+    const sourceJDKVersion = transformByQState.getSourceJDKVersion()
+    if (sourceJDKVersion === JDKVersion.JDK8) {
+        detectedJavaVersion = validSourceVersions[0]
+    } else if (sourceJDKVersion === JDKVersion.JDK11) {
+        detectedJavaVersion = validSourceVersions[1]
+    }
+    let placeholderText = ''
+    if (sourceJDKVersion === JDKVersion.JDK8 || sourceJDKVersion === JDKVersion.JDK11) {
+        placeholderText = `We found Java ${sourceJDKVersion}. Select a different version if incorrect.`
+    } else if (sourceJDKVersion === JDKVersion.UNSUPPORTED) {
+        placeholderText = 'We found an unsupported Java version. Select your version here if incorrect.'
+    } else {
+        placeholderText = "Choose your project's Java version here." // if no .class files found or if javap fails
+    }
+    const pick = await input.showQuickPick({
         title: CodeWhispererConstants.transformByQWindowTitle,
-        placeHolder: CodeWhispererConstants.selectModulePrompt,
+        step: DropdownStep.STEP_2,
+        totalSteps: DropdownStep.STEP_2,
+        placeholder: placeholderText,
+        items: validSourceVersions,
+        activeItem: detectedJavaVersion,
+        shouldResume: () => Promise.resolve(false),
     })
-    if (pick) {
-        state.project = pick
-        transformByQState.setProjectName(encodeHTML(state.project.label)) // encode to avoid HTML injection risk
+    state.sourceJavaVersion = pick
+    if (pick === validSourceVersions[0]) {
+        transformByQState.setSourceJDKVersion(JDKVersion.JDK8)
+    } else if (pick === validSourceVersions[1]) {
+        transformByQState.setSourceJDKVersion(JDKVersion.JDK11)
     }
-    return state as UserInputState
 }
 
 export async function startTransformByQ() {
@@ -135,7 +192,7 @@ export async function preTransformationUploadCode(userInputState: UserInputState
     let payloadFilePath = ''
     throwIfCancelled()
     try {
-        payloadFilePath = await zipCode(userInputState.project.description!)
+        payloadFilePath = await zipCode(userInputState.project!.description!)
         transformByQState.setPayloadFilePath(payloadFilePath)
         await vscode.commands.executeCommand('aws.amazonq.refresh') // so that button updates
         uploadId = await uploadPayload(payloadFilePath)
@@ -254,19 +311,17 @@ export async function validateTransformationJob() {
         getLogger().error('Failed to get open projects: ', err)
         throw err
     }
-    const userInputState = await collectInput(openProjects)
-
-    if (!userInputState.project) {
-        throw new ToolkitError('No project selected', { code: 'NoProjectSelected' })
-    }
 
+    let validProjects = undefined
     try {
-        await validateProjectSelection(userInputState.project)
+        validProjects = await validateOpenProjects(openProjects)
     } catch (err) {
         getLogger().error('Selected project is not Java 8, not Java 11, or does not use Maven', err)
         throw err
     }
 
+    const userInputState = await collectInput(validProjects)
+
     const selection = await vscode.window.showWarningMessage(
         CodeWhispererConstants.dependencyDisclaimer,
         { modal: true },
@@ -291,7 +346,7 @@ export async function validateTransformationJob() {
 
 export async function setTransformationToRunningState(userInputState: UserInputState) {
     transformByQState.setToRunning()
-    transformByQState.setProjectPath(userInputState.project.description!)
+    transformByQState.setProjectPath(userInputState.project!.description!)
     sessionPlanProgress['uploadCode'] = StepProgress.Pending
     sessionPlanProgress['buildCode'] = StepProgress.Pending
     sessionPlanProgress['transformCode'] = StepProgress.Pending
@@ -302,7 +357,7 @@ export async function setTransformationToRunningState(userInputState: UserInputS
     telemetry.codeTransform_jobStartedCompleteFromPopupDialog.emit({
         codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
         codeTransformJavaSourceVersionsAllowed: JDKToTelemetryValue(
-            transformByQState.getSourceJDKVersion()
+            transformByQState.getSourceJDKVersion()!
         ) as CodeTransformJavaSourceVersionsAllowed,
         codeTransformJavaTargetVersionsAllowed: JDKToTelemetryValue(
             transformByQState.getTargetJDKVersion()

packages/toolkit/src/codewhisperer/models/constants.ts

@@ -276,13 +276,9 @@ export const newCustomizationAvailableKey = 'CODEWHISPERER_NEW_CUSTOMIZATION_AVA
 
 // Transform by Q
 
-export const selectTargetLanguagePrompt = 'Select the target language'
+export const selectProjectPrompt = 'Select the project you want to transform'
 
-export const selectTargetVersionPrompt = 'Select the target version'
-
-export const selectModulePrompt = 'Select the module you want to transform'
-
-export const transformByQWindowTitle = 'Amazon Q CodeTransformation'
+export const transformByQWindowTitle = 'Amazon Q Code Transformation'
 
 export const stopTransformByQMessage = 'Stop Transformation?'
 
@@ -297,9 +293,9 @@ export const transformByQCompletedMessage = 'Transformation completed'
 export const transformByQPartiallyCompletedMessage = 'Transformation partially completed'
 
 export const noPomXmlFoundMessage =
-    'We could not find a valid configuration file. We currently support Maven build tool and require a POM.xml in the root directory to identify build configurations. Be sure to also build your project.'
+    'None of your open Java projects are supported by Amazon Q Code Transformation. We were unable to find a pom.xml in any of your Java projects. We only support Java projects built on Maven at the moment.'
 
-export const noActiveIdCMessage = 'Transform by Q requires an active IAM Identity Center connection'
+export const noActiveIdCMessage = 'Amazon Q Code Transformation requires an active IAM Identity Center connection'
 
 export const noOngoingJobMessage = 'No job is in-progress at the moment'
 
@@ -309,18 +305,18 @@ export const cancellationInProgressMessage = 'Cancellation is in-progress'
 
 export const errorStoppingJobMessage = 'Error stopping job'
 
-export const errorDownloadingDiffMessage = 'Transform by Q experienced an error when downloading the diff'
+export const errorDownloadingDiffMessage = 'Amazon Q Code Transformation experienced an error when downloading the diff'
 
 export const viewProposedChangesMessage =
     'Transformation job completed. You can view the transformation summary along with the proposed changes and accept or reject them in the Proposed Changes panel.'
 
 export const changesAppliedMessage = 'Changes applied'
 
 export const noSupportedJavaProjectsFoundMessage =
-    'We could not find an upgrade-eligible application. We currently support upgrade of Java applications of version 8 and 11. Be sure to also build your project.'
+    'None of your open projects are supported by Amazon Q Code Transformation. We were unable to find a Java project. We only support Java projects built on Maven at the moment.'
 
 export const dependencyDisclaimer =
-    'Please confirm you are ready to proceed with the transformation. Amazon Q will upload the application code and its dependency binaries from your machine to start the upgrade. If you have not yet compiled the application on your local machine, please do so once before starting the upgrade. Install Maven to ensure all module dependencies are picked for Transformation.'
+    'Please confirm you are ready to proceed with the transformation. Amazon Q Code Transformation will upload the application code and its dependency binaries from your machine to start the upgrade. If you have not yet compiled the application on your local machine, please do so once before starting the upgrade. Install Maven to ensure all module dependencies are picked for Transformation.'
 
 export const dependencyFolderName = 'transformation_dependencies_temp_'
 

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

@@ -240,6 +240,7 @@ export enum JDKVersion {
     JDK8 = '8',
     JDK11 = '11',
     JDK17 = '17',
+    UNSUPPORTED = 'UNSUPPORTED',
 }
 
 export enum BuildSystem {
@@ -254,6 +255,11 @@ export class ZipManifest {
     version: string = '1.0'
 }
 
+export enum DropdownStep {
+    STEP_1 = 1,
+    STEP_2 = 2,
+}
+
 export class TransformByQState {
     private transformByQState: TransformByQStatus = TransformByQStatus.NotStarted
 
@@ -262,7 +268,7 @@ export class TransformByQState {
 
     private jobId: string = ''
 
-    private sourceJDKVersion: JDKVersion = JDKVersion.JDK8
+    private sourceJDKVersion: JDKVersion | undefined = undefined
 
     private targetJDKVersion: JDKVersion = JDKVersion.JDK17
 
@@ -406,16 +412,12 @@ export class TransformByQState {
         this.jobId = id
     }
 
-    public setSourceJDKVersionToJDK8() {
-        this.sourceJDKVersion = JDKVersion.JDK8
-    }
-
-    public setSourceJDKVersionToJDK11() {
-        this.sourceJDKVersion = JDKVersion.JDK11
+    public setSourceJDKVersion(version: JDKVersion | undefined) {
+        this.sourceJDKVersion = version
     }
 
-    public setTargetJDKVersionToJDK17() {
-        this.targetJDKVersion = JDKVersion.JDK17
+    public setTargetJDKVersion(version: JDKVersion) {
+        this.targetJDKVersion = version
     }
 
     public setPlanFilePath(filePath: string) {