Progress bar cancel UX changes

Author: laileni-aws

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatItems.kt

@@ -35,6 +35,12 @@ val cancelTestGenBuildAndExecuteButton = Button(
     icon = "cancel"
 )
 
+val cancelFixingTestCasesButton = Button(
+    id = CodeTestButtonId.StopFixingTestCases.id,
+    text = message("general.cancel"),
+    icon = "cancel"
+)
+
 fun testGenProgressField(value: Int) = ProgressField(
     status = "default",
     text = message("testgen.progressbar.generate_unit_tests"),
@@ -43,14 +49,6 @@ fun testGenProgressField(value: Int) = ProgressField(
     actions = listOf(cancelTestGenButton)
 )
 
-//val buildAndExecuteProgrogressField = ProgressField(
-//    status = "default",
-//    value= -1,
-//    text = message("testgen.progressbar.build_and_execute"),
-//    actions = listOf(cancelTestGenBuildAndExecuteButton)
-//)
-
-
 val fixingTestCasesProgressField = ProgressField(
     status = "default",
     value= -1,
@@ -63,6 +61,6 @@ fun createProgressField(messageKey: String): ProgressField {
         status = "default",
         value = -1,
         text = message(messageKey),
-        actions = listOf(cancelTestGenBuildAndExecuteButton)
+        actions = listOf(if (messageKey == "testgen.progressbar.build_and_execute") cancelFixingTestCasesButton else cancelTestGenBuildAndExecuteButton)
     )
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -1019,6 +1019,9 @@ class CodeTestChatController(
                     session.testFileRelativePathToProjectRoot,
                     codeTestChatHelper
                 )
+                if(session.buildStatus === BuildStatus.CANCELLED) {
+                    return
+                }
                 while (taskContext.buildExitCode < 0) {
                     // wait until build command finished
                     delay(1000)
@@ -1104,7 +1107,7 @@ class CodeTestChatController(
                     )
                 )
                 codeTestChatHelper.updateUI(
-                    promptInputDisabledState = true,
+                    promptInputDisabledState = false,
                     promptInputPlaceholder = message("testgen.placeholder.modifyCommand"),
                 )
 
@@ -1116,14 +1119,18 @@ class CodeTestChatController(
             "stop_test_generation" -> {
                 UiTelemetry.click(null as Project?, "unitTestGeneration_cancelTestGenerationProgress")
                 session.isGeneratingTests = false
-//                sessionCleanUp(message.tabId)
                 return
             }
             "stop_test_gen_build_and_execution" -> {
                 UiTelemetry.click(null as Project?, "unitTestGeneration_cancelBuildProgress")
                 // TODO: Cancel Build and execute
                 session.isGeneratingTests = false
-//                sessionCleanUp(message.tabId)
+                return
+            }
+            "stop_fixing_test_cases" -> {
+                UiTelemetry.click(null as Project?, "unitTestGeneration_cancelFixingTest")
+                session.isGeneratingTests = false
+                session.buildStatus=BuildStatus.CANCELLED
                 return
             }
             else -> {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/messages/CodeTestMessage.kt

@@ -17,6 +17,7 @@ const val CODE_TEST_TAB_NAME = "codetest"
 enum class CodeTestButtonId(val id: String) {
     StopTestGeneration("stop_test_generation"),
     StopTestGenBuildAndExecution("stop_test_gen_build_and_execution"),
+    StopFixingTestCases("stop_fixing_test_cases")
 }
 
 data class Button(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/utils/UTGChatUtil.kt

@@ -158,17 +158,24 @@ fun runBuildOrTestCommand(
                 ApplicationManager.getApplication().invokeLater {
                     VirtualFileManager.getInstance().refreshAndFindFileByNioPath(file.toPath())?.refresh(false, false)
                 }
+                // Check if the build has been cancelled
+                if (codeTestChatHelper.getActiveSession().buildStatus == BuildStatus.CANCELLED) {
+                    processHandler.destroyProcess()
+                    console.print("\nBuild cancelled by user\n", ConsoleViewContentType.SYSTEM_OUTPUT)
+                    if (isBuildCommand) {
+                        buildAndExecuteTaskContext.buildExitCode = 1
+                    } else {
+                        buildAndExecuteTaskContext.testExitCode = 1
+                    }
+                }
             }
-
             override fun processTerminated(event: ProcessEvent) {
                 val exitCode = event.exitCode
                 if (exitCode == 0) {
                     codeTestChatHelper.getActiveSession().buildStatus = BuildStatus.SUCCESS
-                    // green color
                     console.print("\nBUILD SUCCESSFUL\n", ConsoleViewContentType.USER_INPUT)
-                } else {
+                } else if (codeTestChatHelper.getActiveSession().buildStatus != BuildStatus.CANCELLED) {
                     codeTestChatHelper.getActiveSession().buildStatus = BuildStatus.FAILURE
-                    // red color
                     console.print("\nBUILD FAILED with exit code $exitCode\n", ConsoleViewContentType.ERROR_OUTPUT)
                 }
                 if (isBuildCommand) {