Skip to content

Commit e9e2d8b

Browse files
dhasani23David Hasani
and
David Hasani
authored
fix(amazonq): check job status directly before completing (#5281)
* fix(amazonq): check job status directly before completing * address comment --------- Co-authored-by: David Hasani <davhasan@amazon.com>
1 parent 561a183 commit e9e2d8b

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,9 @@ class CodeModernizerSession(
533533
}
534534
}
535535

536-
result.succeeded -> CodeModernizerJobCompletedResult.JobCompletedSuccessfully(jobId)
536+
result.state == TransformationStatus.COMPLETED -> {
537+
CodeModernizerJobCompletedResult.JobCompletedSuccessfully(jobId)
538+
}
537539

538540
// Should not happen
539541
else -> CodeModernizerJobCompletedResult.JobFailed(jobId, result.jobDetails?.reason().orEmpty())

plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/CodeModernizerJobHistoryPanelTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.mockito.kotlin.spy
99
import org.mockito.kotlin.times
1010
import org.mockito.kotlin.verify
1111
import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobHistoryItem
12+
import software.aws.toolkits.resources.message
1213
import java.time.Duration
1314
import java.time.Instant
1415

@@ -23,7 +24,7 @@ class CodeModernizerJobHistoryPanelTest {
2324
tablePanelMock.updateTableData(testData)
2425
verify(tablePanelMock, times(1)).setDefaultUI()
2526
verify(tablePanelMock, times(1)).updateTableData(testData)
26-
assertThat(tablePanelMock.headerLabel.text).isEqualTo("Job status")
27+
assertThat(tablePanelMock.headerLabel.text).isEqualTo(message("codemodernizer.toolwindow.job_status.header"))
2728
assertThat(tablePanelMock.jbTable.columnCount).isEqualTo(5)
2829
assertThat(tablePanelMock.jbTable.isEmpty).isFalse()
2930
assertThat(tablePanelMock.tableData).isEqualTo(testData)

plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ codemodernizer.toolwindow.banner.job_starting=Job is starting.
803803
codemodernizer.toolwindow.banner.no_ongoing_job=No job ongoing.
804804
codemodernizer.toolwindow.banner.run_scan_complete=All steps of transformation successful
805805
codemodernizer.toolwindow.banner.run_scan_info=Select 'Transform' in toolbar to upgrade this package.
806-
codemodernizer.toolwindow.job_status.header=Job status
806+
codemodernizer.toolwindow.job_status.header=Transformation status
807807
codemodernizer.toolwindow.label=Transformation Hub - {0}
808808
codemodernizer.toolwindow.label_no_job=Transformation Hub
809809
codemodernizer.toolwindow.problems_mvn_window_not_found=Unable to display Code Transform results as the Maven window cannot be fetched.

0 commit comments

Comments
 (0)