Modified impl of progress bar cancel functionality and some UX changes for V1 version of build and execute

Author: laileni-aws

gradle/libs.versions.toml

@@ -27,7 +27,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.10"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.301"
+telemetryGenerator = "1.0.307"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

@@ -67,7 +67,7 @@ class BrowserConnector(
                                 it.elementId(source.asText())
                             }
                         } else if (module != null && trigger != null) {
-                            Telemetry.toolkit.openModule.use {
+                            Telemetry.toolkit.willOpenModule.use {
                                 it.module(module.asText())
                                 it.source(trigger.asText())
                             }

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

@@ -60,5 +60,5 @@ fun createProgressField(messageKey: String): ProgressField = ProgressField(
     status = "default",
     value = -1,
     text = message(messageKey),
-    actions = listOf(if (messageKey == "testgen.progressbar.build_and_execute") cancelFixingTestCasesButton else cancelTestGenBuildAndExecuteButton)
+    actions = listOf(if (messageKey == "testgen.progressbar.build_and_execute") cancelTestGenBuildAndExecuteButton else cancelFixingTestCasesButton)
 )

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

@@ -36,6 +36,7 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.CodeTes
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.model.PreviousUTGIterationContext
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.model.ShortAnswer
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildAndExecuteProgressStatus
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildStatus
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.Session
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.utils.constructBuildAndExecutionSummaryText
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTotalLatency
@@ -55,6 +56,7 @@ import software.aws.toolkits.jetbrains.utils.isQConnected
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Status
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -270,7 +272,6 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     promptInputProgress = if (session.listOfTestGenerationJobId.size == 1) {
                         testGenProgressField(progressRate)
                     } else {
-//                        fixingTestCasesProgressField
                         createProgressField("testgen.progressbar.fixing_test_cases")
                     }
 
@@ -355,7 +356,6 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 session.viewDiffMessageId = viewDiffMessageId
                 codeTestChatHelper.updateUI(
                     promptInputDisabledState = false,
-//                    promptInputPlaceholder = "Specify a function(s) in the current file(optional)",
                     promptInputProgress = testGenCompletedField,
                 )
             } else {
@@ -555,7 +555,10 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             session.conversationState = ConversationState.IDLE
             return null
         }
-
+        if (session.buildStatus === BuildStatus.CANCELLED) {
+            session.conversationState = ConversationState.IDLE
+            return null
+        }
         beforeTestGenFlow(session)
 
         return cs.launch {
@@ -617,7 +620,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                         artifactsUploadDuration = session.artifactUploadDuration,
                         buildZipFileBytes = session.srcZipFileSize,
                         requestId = session.startTestGenerationRequestId,
-//                        status = if (e.message == message("testgen.message.cancelled")) Status.CANCELLED else Status.FAILED,
+                        status = if (e.message == message("testgen.message.cancelled")) Status.CANCELLED else Status.FAILED,
                     )
                 }
                 session.isGeneratingTests = false

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

@@ -61,6 +61,7 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.CodeWhispererUTG
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.ConversationState
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.FEATURE_NAME
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.InboundAppMessagesHandler
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.cancellingProgressField
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.createProgressField
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.Button
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.CodeTestChatMessage
@@ -103,6 +104,7 @@ import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.FeatureId
 import software.aws.toolkits.telemetry.InteractionType
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Status
 import software.aws.toolkits.telemetry.UiTelemetry
 import java.io.File
 import java.nio.file.Files
@@ -172,6 +174,7 @@ class CodeTestChatController(
     override suspend fun processStartTestGen(message: IncomingCodeTestMessage.StartTestGen) {
         codeTestChatHelper.setActiveCodeTestTabId(message.tabId)
         val session = codeTestChatHelper.getActiveSession()
+        sessionCleanUp(message.tabId)
         // check if IDE has active file open, yes return (fileName and filePath) else return null
         val project = context.project
         val fileInfo = checkActiveFileInIDE(project, message) ?: return
@@ -314,7 +317,7 @@ class CodeTestChatController(
                     result = MetricResult.Succeeded,
                     perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
                     requestId = id,
-//                    status = Status.ACCEPTED
+                    status = Status.ACCEPTED
                 )
             }
             session.isGeneratingTests = false
@@ -689,7 +692,7 @@ class CodeTestChatController(
                         buildPayloadBytes = session.srcPayloadSize,
                         buildZipFileBytes = session.srcZipFileSize,
                         requestId = session.startTestGenerationRequestId,
-//                        status = Status.ACCEPTED
+                        status = Status.ACCEPTED
                     )
                 }
 
@@ -818,7 +821,7 @@ class CodeTestChatController(
                         buildZipFileBytes = session.srcZipFileSize,
                         requestId = session.startTestGenerationRequestId,
                         update = session.updateBuildCommands,
-//                        status = Status.ACCEPTED
+                        status = Status.ACCEPTED
                     )
                 }
             }
@@ -915,7 +918,7 @@ class CodeTestChatController(
                         buildPayloadBytes = session.srcPayloadSize,
                         buildZipFileBytes = session.srcZipFileSize,
                         requestId = session.startTestGenerationRequestId,
-//                        status = Status.REJECTED
+                        status = Status.REJECTED
                     )
                 } else {
                     AmazonqTelemetry.unitTestGeneration(
@@ -1064,7 +1067,7 @@ class CodeTestChatController(
                         buildZipFileBytes = session.srcZipFileSize,
                         requestId = session.startTestGenerationRequestId,
                         update = session.updateBuildCommands,
-//                        status = Status.ACCEPTED
+                        status = Status.ACCEPTED
                     )
                     sessionCleanUp(message.tabId)
                     return
@@ -1119,20 +1122,50 @@ class CodeTestChatController(
                 // TODO: install dependencies and build
             }
             "stop_test_generation" -> {
-                UiTelemetry.click(null as Project?, "unitTestGeneration_cancelTestGenerationProgress")
+                UiTelemetry.click(context.project, "unitTestGeneration_cancelTestGenerationProgress")
                 session.isGeneratingTests = false
                 return
             }
             "stop_test_gen_build_and_execution" -> {
-                UiTelemetry.click(null as Project?, "unitTestGeneration_cancelBuildProgress")
-                // TODO: Cancel Build and execute
+                UiTelemetry.click(context.project, "unitTestGeneration_cancelBuildProgress")
+                session.buildStatus = BuildStatus.CANCELLED
                 session.isGeneratingTests = false
+                AmazonqTelemetry.unitTestGeneration(
+                    cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                    hasUserPromptSupplied = session.hasUserPromptSupplied,
+                    isSupportedLanguage = true,
+                    credentialStartUrl = getStartUrl(project = context.project),
+                    jobGroup = session.testGenerationJobGroupName,
+                    jobId = session.testGenerationJob,
+                    result = MetricResult.Cancelled,
+                    reason = null,
+                    reasonDesc = null,
+                    perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
+                    isCodeBlockSelected = session.isCodeBlockSelected,
+                    artifactsUploadDuration = session.artifactUploadDuration,
+                    buildZipFileBytes = session.srcZipFileSize,
+                    requestId = session.startTestGenerationRequestId,
+                    status = Status.CANCELLED,
+                )
+                codeTestChatHelper.updateUI(
+                    promptInputDisabledState = false,
+                    promptInputProgress = cancellingProgressField,
+                    promptInputPlaceholder = message("testgen.placeholder.enter_slash_quick_actions"),
+                )
+                delay(1000)
+                codeTestChatHelper.addAnswer(
+                    CodeTestChatMessageContent(
+                        message = message("testgen.message.cancelled"),
+                        type = ChatMessageType.Answer,
+                        canBeVoted = false
+                    )
+                )
+                codeTestChatHelper.sendUpdatePromptProgress(session.tabId, null)
                 return
             }
             "stop_fixing_test_cases" -> {
                 UiTelemetry.click(null as Project?, "unitTestGeneration_cancelFixingTest")
                 session.isGeneratingTests = false
-                session.buildStatus = BuildStatus.CANCELLED
                 return
             }
             else -> {
@@ -1149,7 +1182,7 @@ class CodeTestChatController(
         sessionCleanUp(codeTestChatHelper.getActiveSession().tabId)
     }
 
-    suspend fun updateBuildAndExecuteProgressCard(
+    private suspend fun updateBuildAndExecuteProgressCard(
         currentStatus: BuildAndExecuteProgressStatus,
         messageId: String?,
     ): String? {

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

@@ -5,7 +5,6 @@ package software.aws.toolkits.jetbrains.services.amazonqCodeTest.model
 
 enum class BuildAndExecuteStatusIcon(val icon: String) {
     WAIT("<span>&#9203;</span>"),
-    CURRENT("<span>&#9203;</span>"),
     DONE("<span style=\"color: green;\">&#10004;</span>"),
     FAILED("<span style=\"color: red;\">&#10060;</span>"),
 }

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

@@ -40,7 +40,8 @@ fun constructBuildAndExecutionSummaryText(currentStatus: BuildAndExecuteProgress
     }
 
     if (currentStatus >= BuildAndExecuteProgressStatus.RUN_EXECUTION_TESTS && codeTestChatHelper.getActiveSession().buildStatus == BuildStatus.SUCCESS) {
-        progressMessages.add("${BuildAndExecuteStatusIcon.DONE.icon} ${"Project compiled\n"}\${BuildAndExecuteStatusIcon.DONE.icon} ${"All tests passed\n"}")
+        progressMessages.add("${BuildAndExecuteStatusIcon.DONE.icon} ${"Project compiled"}")
+        progressMessages.add("${BuildAndExecuteStatusIcon.DONE.icon} ${"All tests passed\n"}")
     }
 // TODO: Commenting out this code to do a better UX in the V2 version after science support
 /*
@@ -110,7 +111,7 @@ fun constructBuildAndExecutionSummaryText(currentStatus: BuildAndExecuteProgress
     return """
             Sure, This may take a few minutes and I'll update the progress here.
         
-            **Progress summary**\n
+            **Progress summary**
             
     """.trimIndent() + progressMessages.joinToString("\n")
 }
@@ -145,13 +146,12 @@ fun runBuildOrTestCommand(
         }
         packageRoot = packageRoot.parentFile
     }
-    var workingDir = if (foundGradleRoot) {
+    val workingDir = if (foundGradleRoot) {
         packageRoot ?: testFileAbsolutePath.parentFile
     } else {
         testFileAbsolutePath.parentFile
     }
-    // If no valid Gradle directory is found, fallback to the project root
-//    val gradleWrapper = File(packageRoot ?: projectRoot, "gradlew")
+
     val console: ConsoleView = ConsoleViewImpl(project, true)
 
     // Attach Console View to Build Tool Window
@@ -187,7 +187,6 @@ fun runBuildOrTestCommand(
     }.withWorkDirectory(workingDir)
 
     try {
-        // val process = processBuilder.start()
         val processHandler = OSProcessHandler(commandLine)
 
         // Attach Process Listener for Output Handling