From 58c27f5899aa2f7773d13b97de7fc816d37e6fed Mon Sep 17 00:00:00 2001 From: David Hasani Date: Fri, 17 Jan 2025 23:25:35 -0800 Subject: [PATCH 1/2] fix(amazonq): check job status directly before completing --- .../services/codemodernizer/CodeModernizerSession.kt | 4 +++- .../panels/CodeModernizerJobHistoryPanelTest.kt | 2 +- .../software/aws/toolkits/resources/MessagesBundle.properties | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt index 973ac136ed5..1477575ad79 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt @@ -530,7 +530,9 @@ class CodeModernizerSession( } } - result.succeeded -> CodeModernizerJobCompletedResult.JobCompletedSuccessfully(jobId) + result.state == TransformationStatus.COMPLETED -> { + CodeModernizerJobCompletedResult.JobCompletedSuccessfully(jobId) + } // Should not happen else -> CodeModernizerJobCompletedResult.JobFailed(jobId, result.jobDetails?.reason().orEmpty()) diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt index bba969f91e6..656a39bb642 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt @@ -23,7 +23,7 @@ class CodeModernizerJobHistoryPanelTest { tablePanelMock.updateTableData(testData) verify(tablePanelMock, times(1)).setDefaultUI() verify(tablePanelMock, times(1)).updateTableData(testData) - assertThat(tablePanelMock.headerLabel.text).isEqualTo("Job status") + assertThat(tablePanelMock.headerLabel.text).isEqualTo("Transformation status") assertThat(tablePanelMock.jbTable.columnCount).isEqualTo(5) assertThat(tablePanelMock.jbTable.isEmpty).isFalse() assertThat(tablePanelMock.tableData).isEqualTo(testData) diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties index 045953b58cb..ef140b253a2 100644 --- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties +++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties @@ -800,7 +800,7 @@ codemodernizer.toolwindow.banner.job_starting=Job is starting. codemodernizer.toolwindow.banner.no_ongoing_job=No job ongoing. codemodernizer.toolwindow.banner.run_scan_complete=All steps of transformation successful codemodernizer.toolwindow.banner.run_scan_info=Select 'Transform' in toolbar to upgrade this package. -codemodernizer.toolwindow.job_status.header=Job status +codemodernizer.toolwindow.job_status.header=Transformation status codemodernizer.toolwindow.label=Transformation Hub - {0} codemodernizer.toolwindow.label_no_job=Transformation Hub codemodernizer.toolwindow.problems_mvn_window_not_found=Unable to display Code Transform results as the Maven window cannot be fetched. From 0d4c8cb75ac2186e84dc84d07516acbc48666d2b Mon Sep 17 00:00:00 2001 From: David Hasani Date: Tue, 21 Jan 2025 10:22:25 -0800 Subject: [PATCH 2/2] address comment --- .../codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt index 656a39bb642..d736204350f 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt @@ -9,6 +9,7 @@ import org.mockito.kotlin.spy import org.mockito.kotlin.times import org.mockito.kotlin.verify import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobHistoryItem +import software.aws.toolkits.resources.message import java.time.Duration import java.time.Instant @@ -23,7 +24,7 @@ class CodeModernizerJobHistoryPanelTest { tablePanelMock.updateTableData(testData) verify(tablePanelMock, times(1)).setDefaultUI() verify(tablePanelMock, times(1)).updateTableData(testData) - assertThat(tablePanelMock.headerLabel.text).isEqualTo("Transformation status") + assertThat(tablePanelMock.headerLabel.text).isEqualTo(message("codemodernizer.toolwindow.job_status.header")) assertThat(tablePanelMock.jbTable.columnCount).isEqualTo(5) assertThat(tablePanelMock.jbTable.isEmpty).isFalse() assertThat(tablePanelMock.tableData).isEqualTo(testData)