remove agree to local build form

Author: David Hasani

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt

@@ -46,7 +46,6 @@ private enum class CodeTransformMessageTypes(val type: String) {
     CodeTransformStop("codetransform-stop"),
     CodeTransformCancel("codetransform-cancel"),
     CodeTransformContinue("codetransform-continue"),
-    CodeTransformAgree("codetransform-agree"),
     CodeTransformConfirmSkipTests("codetransform-confirm-skip-tests"),
     CodeTransformConfirmOneOrMultipleDiffs("codetransform-confirm-one-or-multiple-diffs"),
     CodeTransformNew("codetransform-new"),
@@ -82,7 +81,6 @@ class CodeTransformChatApp : AmazonQApp {
             CodeTransformMessageTypes.CodeTransformStop.type to IncomingCodeTransformMessage.CodeTransformStop::class,
             CodeTransformMessageTypes.CodeTransformCancel.type to IncomingCodeTransformMessage.CodeTransformCancel::class,
             CodeTransformMessageTypes.CodeTransformContinue.type to IncomingCodeTransformMessage.CodeTransformContinue::class,
-            CodeTransformMessageTypes.CodeTransformAgree.type to IncomingCodeTransformMessage.CodeTransformAgreeToLocalBuild::class,
             CodeTransformMessageTypes.ChatPrompt.type to IncomingCodeTransformMessage.ChatPrompt::class,
             CodeTransformMessageTypes.CodeTransformConfirmSkipTests.type to IncomingCodeTransformMessage.CodeTransformConfirmSkipTests::class,
             CodeTransformMessageTypes.CodeTransformConfirmOneOrMultipleDiffs.type to IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs::class,
@@ -196,7 +194,6 @@ class CodeTransformChatApp : AmazonQApp {
             is IncomingCodeTransformMessage.CodeTransformConfirmSkipTests -> inboundAppMessagesHandler.processCodeTransformConfirmSkipTests(message)
             is IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs -> inboundAppMessagesHandler.processCodeTransformOneOrMultipleDiffs(message)
             is IncomingCodeTransformMessage.CodeTransformContinue -> inboundAppMessagesHandler.processCodeTransformContinueAction(message)
-            is IncomingCodeTransformMessage.CodeTransformAgreeToLocalBuild -> inboundAppMessagesHandler.processCodeTransformAgreeToLocalBuild(message)
             is IncomingCodeTransformMessage.CodeTransformNew -> inboundAppMessagesHandler.processCodeTransformNewAction(message)
             is IncomingCodeTransformMessage.CodeTransformOpenTransformHub -> inboundAppMessagesHandler.processCodeTransformOpenTransformHub(message)
             is IncomingCodeTransformMessage.CodeTransformOpenMvnBuild -> inboundAppMessagesHandler.processCodeTransformOpenMvnBuild(message)

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/InboundAppMessagesHandler.kt

@@ -13,8 +13,6 @@ interface InboundAppMessagesHandler {
 
     suspend fun processCodeTransformContinueAction(message: IncomingCodeTransformMessage.CodeTransformContinue)
 
-    suspend fun processCodeTransformAgreeToLocalBuild(message: IncomingCodeTransformMessage.CodeTransformAgreeToLocalBuild)
-
     suspend fun processCodeTransformStartAction(message: IncomingCodeTransformMessage.CodeTransformStart)
 
     suspend fun processCodeTransformSelectSQLMetadataAction(message: IncomingCodeTransformMessage.CodeTransformSelectSQLMetadata)

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

@@ -52,14 +52,6 @@ private val continueTransformationButton = Button(
     id = CodeTransformButtonId.ContinueTransformation.id,
 )
 
-// used to agree to local build
-private val agreeToLocalBuildButton = Button(
-    keepCardAfterClick = false,
-    waitMandatoryFormItems = false,
-    text = "Agree",
-    id = CodeTransformButtonId.AgreeToLocalBuild.id,
-)
-
 private val confirmUserSelectionLanguageUpgradeButton = Button(
     keepCardAfterClick = false,
     waitMandatoryFormItems = true,
@@ -295,15 +287,6 @@ fun buildUserReplyChatContent(reply: String) = CodeTransformChatMessageContent(
     type = CodeTransformChatMessageType.Prompt,
 )
 
-fun buildPermissionToBuildChatContent() = CodeTransformChatMessageContent(
-    message = message("codemodernizer.chat.message.permission_to_build"),
-    type = CodeTransformChatMessageType.FinalizedAnswer,
-    buttons = listOf(
-        cancelUserSelectionButton,
-        agreeToLocalBuildButton
-    )
-)
-
 fun buildCheckingValidProjectChatContent() = CodeTransformChatMessageContent(
     message = message("codemodernizer.chat.message.validation.check_eligible_modules"),
     type = CodeTransformChatMessageType.PendingAnswer,

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

@@ -121,17 +121,10 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.validateYam
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
 import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.fileEditor.FileEditorManager
-import com.intellij.testFramework.LightVirtualFile
-import org.jetbrains.yaml.YAMLFileType
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildPermissionToBuildChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildPromptTargetJDKPathChatContent
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserReplyChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CLIENT_SIDE_BUILD
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformConversationState
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.createJavaHomePrompt
-import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodeTransformPreValidationError
 
@@ -480,7 +473,11 @@ class CodeTransformChatController(
     private suspend fun processJDKPathChatPromptMessage(message: IncomingCodeTransformMessage.ChatPrompt) {
         codeModernizerManager.codeTransformationSession?.sessionContext?.targetJdkPath = message.message.trim()
         codeTransformChatHelper.addNewMessage(buildUserReplyChatContent(message.message.trim()))
-        codeTransformChatHelper.addNewMessage(buildPermissionToBuildChatContent())
+        // start local build once we get target JDK path
+        codeTransformChatHelper.addNewMessage(buildCompileLocalInProgressChatContent())
+        codeModernizerManager.codeTransformationSession?.let {
+            codeModernizerManager.runLocalMavenBuild(context.project, it)
+        }
     }
 
     /*
@@ -518,13 +515,6 @@ dependencyManagement:
         promptForTargetJdkPath(message.tabId)
     }
 
-    override suspend fun processCodeTransformAgreeToLocalBuild(message: IncomingCodeTransformMessage.CodeTransformAgreeToLocalBuild) {
-        codeTransformChatHelper.addNewMessage(buildCompileLocalInProgressChatContent())
-        codeModernizerManager.codeTransformationSession?.let {
-            codeModernizerManager.runLocalMavenBuild(context.project, it)
-        }
-    }
-
     private suspend fun promptForTargetJdkPath(tabId: String) {
         chatSessionStorage.getSession(tabId).conversationState = CodeTransformConversationState.PROMPT_TARGET_JDK_PATH
         val targetJdk = codeModernizerManager.codeTransformationSession?.sessionContext?.targetJavaVersion?.name.orEmpty()

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt

@@ -21,7 +21,6 @@ enum class CodeTransformButtonId(val id: String) {
     SelectSQLModuleSchema("codetransform-input-select-sql-module-schema"),
     CancelTransformation("codetransform-input-cancel"),
     ContinueTransformation("codetransform-input-continue"),
-    AgreeToLocalBuild("codetransform-input-agree"),
     ConfirmSkipTests("codetransform-input-confirm-skip-tests"),
     ConfirmOneOrMultipleDiffs("codetransform-input-confirm-one-or-multiple-diffs"),
     ConfirmCustomDependencyVersions("codetransform-input-confirm-custom-dependency-versions"),
@@ -110,10 +109,6 @@ sealed interface IncomingCodeTransformMessage : CodeTransformBaseMessage {
         @JsonProperty("tabID") val tabId: String,
     ) : IncomingCodeTransformMessage
 
-    data class CodeTransformAgreeToLocalBuild(
-        @JsonProperty("tabID") val tabId: String,
-    ) : IncomingCodeTransformMessage
-
     data class CodeTransformConfirmSkipTests(
         @JsonProperty("tabID") val tabId: String,
         val skipTestsSelection: String,

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTransformChatConnector.ts

@@ -284,12 +284,6 @@ export class CodeTransformChatConnector {
                 tabID,
                 tabType: 'codetransform',
             })
-        } else if (action.id === FormButtonIds.CodeTransformInputAgree) {
-            this.sendMessageToExtension({
-                command: 'codetransform-agree',
-                tabID,
-                tabType: 'codetransform',
-            })
         } else if (action.id === FormButtonIds.CodeTransformInputSkipTests) {
             this.sendMessageToExtension({
                 command: 'codetransform-confirm-skip-tests',

plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts

@@ -37,7 +37,6 @@ type MessageCommand =
     | 'codetransform-cancel'
     | 'codetransform-stop'
     | 'codetransform-continue'
-    | 'codetransform-agree'
     | 'codetransform-confirm-skip-tests'
     | 'codetransform-confirm-one-or-multiple-diffs'
     | 'codetransform-input-confirm-custom-dependency-versions'

plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts

@@ -9,7 +9,6 @@ export const enum FormButtonIds {
   CodeTransformInputSQLModuleSchema = 'codetransform-input-select-sql-module-schema',
   CodeTransformInputCancel = 'codetransform-input-cancel',
   CodeTransformInputContinue = 'codetransform-input-continue',
-  CodeTransformInputAgree = 'codetransform-input-agree',
   CodeTransformInputSkipTests = 'codetransform-input-confirm-skip-tests',
   CodeTransformInputOneOrMultipleDiffs = 'codetransform-input-confirm-one-or-multiple-diffs',
   CodeTransformInputCustomDependencyVersions = 'codetransform-input-confirm-custom-dependency-versions',
@@ -50,7 +49,6 @@ export const isFormButtonCodeTransform = (id: string): boolean => {
     id === FormButtonIds.CodeTransformInputSQLModuleSchema ||
     id === FormButtonIds.CodeTransformInputSkipTests ||
     id === FormButtonIds.CodeTransformInputContinue ||
-    id === FormButtonIds.CodeTransformInputAgree ||
     id === FormButtonIds.CodeTransformInputOneOrMultipleDiffs ||
     id === FormButtonIds.CodeTransformInputCustomDependencyVersions ||
     id === FormButtonIds.CodeTransformViewDiff ||