Merge branch 'main' into bugfix/amazon-q-doc-cancel-or-wrong-folder-sel

Author: vikshe

.changes/next-release/bugfix-abe84b95-c057-478d-a0df-4e2c13c2db4f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Improve text description of workspace index settings"
+}

.changes/next-release/bugfix-da16ce4d-acd5-41d1-8c2a-3ac1e5252642.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Doc README diff will re-open when the README file is clicked after it has been closed"
+}s

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

@@ -533,7 +533,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())

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("Job 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)

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

@@ -519,6 +519,9 @@ export class Connector {
             case 'codetest':
                 this.codeTestChatConnector.onFormButtonClick(tabID, messageId ?? '', {id: "utg_view_diff"})
                 break
+            case 'doc':
+                this.docChatConnector.onOpenDiff(tabID, filePath, deleted)
+                break
         }
     }
 

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

@@ -276,7 +276,7 @@ aws.settings.codewhisperer.group.q_chat=Chat
 aws.settings.codewhisperer.include_code_with_reference=Include suggestions with code references
 aws.settings.codewhisperer.include_code_with_reference.tooltip=When checked, Amazon Q will include suggestions with code references. If you authenticate through IAM Identity Center, this setting is controlled by your Amazon Q Developer Pro administrator. <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-reference.html">Learn more<a/>
 aws.settings.codewhisperer.project_context=Workspace index
-aws.settings.codewhisperer.project_context.tooltip=When you add @workspace to your questions in Amazon Q chat, Amazon Q will index your open workspace files locally to use as context for its response. Extra CPU usage is expected while indexing a workspace. This will not impact Amazon Q features or your IDE, but you may manage CPU usage by setting the number of local threads below.
+aws.settings.codewhisperer.project_context.tooltip=When you add @workspace to your questions in Amazon Q chat, Amazon Q will index your workspace files locally to use as context for its response. Extra CPU usage is expected while indexing a workspace. This will not impact Amazon Q features or your IDE, but you may manage CPU usage by setting the number of local threads below.
 aws.settings.codewhisperer.project_context_gpu=Workspace index uses GPU
 aws.settings.codewhisperer.project_context_gpu.tooltip=Enable GPU to help index your local workspace files. This setting only applies to Linux and Windows.
 aws.settings.codewhisperer.project_context_index_max_size=Workspace index max size
@@ -805,7 +805,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.