Merge master into feature/serverlessland

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Bug Fix-da5a775a-766c-4862-8cab-2bb0259acb2f.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/transform: replace icons in Transformation Hub with text"
+}

packages/amazonq/package.json

@@ -314,16 +314,14 @@
                     "group": "navigation@3"
                 },
                 {
-                    "command": "aws.amazonq.transformationHub.summary.reveal",
-                    "when": "view == aws.amazonq.transformationHub"
-                },
-                {
-                    "command": "aws.amazonq.transformationHub.reviewChanges.reveal",
-                    "when": "view == aws.amazonq.transformationHub"
+                    "command": "aws.amazonq.showTransformationPlanInHub",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@4"
                 },
                 {
-                    "command": "aws.amazonq.showTransformationPlanInHub",
-                    "when": "view == aws.amazonq.transformationHub"
+                    "command": "aws.amazonq.transformationHub.summary.reveal",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@5"
                 },
                 {
                     "command": "aws.amazonq.transformationHub.reviewChanges.acceptChanges",
@@ -568,11 +566,6 @@
                 "title": "%AWS.command.q.transform.showChangeSummary%",
                 "enablement": "gumby.isSummaryAvailable"
             },
-            {
-                "command": "aws.amazonq.transformationHub.reviewChanges.reveal",
-                "title": "%AWS.command.q.transform.showChanges%",
-                "enablement": "gumby.reviewState == InReview"
-            },
             {
                 "command": "aws.amazonq.showTransformationPlanInHub",
                 "title": "%AWS.command.q.transform.showTransformationPlan%",
@@ -643,19 +636,16 @@
             },
             {
                 "command": "aws.amazonq.stopTransformationInHub",
-                "title": "Stop Transformation",
-                "icon": "$(stop)",
+                "title": "%AWS.command.q.transform.stopJobInHub%",
                 "enablement": "gumby.isStopButtonAvailable"
             },
             {
                 "command": "aws.amazonq.showPlanProgressInHub",
-                "title": "Show Transformation Status",
-                "icon": "$(checklist)"
+                "title": "%AWS.command.q.transform.viewJobProgress%"
             },
             {
                 "command": "aws.amazonq.showHistoryInHub",
-                "title": "Show Job Status",
-                "icon": "$(history)"
+                "title": "%AWS.command.q.transform.viewJobStatus%"
             },
             {
                 "command": "aws.amazonq.selectCustomization",

packages/core/package.nls.json

@@ -240,9 +240,11 @@
     "AWS.command.codewhisperer.openReferencePanel": "Open Code Reference Log",
     "AWS.command.q.transform.acceptChanges": "Accept",
     "AWS.command.q.transform.rejectChanges": "Reject",
-    "AWS.command.q.transform.showChanges": "Show Proposed Changes",
-    "AWS.command.q.transform.showChangeSummary": "Show Transformation Summary",
-    "AWS.command.q.transform.showTransformationPlan": "Show Transformation Plan",
+    "AWS.command.q.transform.stopJobInHub": "Stop job",
+    "AWS.command.q.transform.viewJobProgress": "View job progress",
+    "AWS.command.q.transform.viewJobStatus": "View job status",
+    "AWS.command.q.transform.showTransformationPlan": "View plan",
+    "AWS.command.q.transform.showChangeSummary": "View summary",
     "AWS.command.threatComposer.createNew": "Create New Threat Composer File",
     "AWS.command.threatComposer.newFile": "Threat Composer File",
     "AWS.threatComposer.page.title": "{0} (Threat Composer)",

packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts

@@ -98,7 +98,7 @@ export class TransformationHubViewProvider implements vscode.WebviewViewProvider
             </style>
             </head>
             <body>
-            <p><b>Job Status</b></p>
+            <p><b>Transformation Status</b></p>
             ${
                 Object.keys(sessionJobHistory).length === 0
                     ? `<p>${CodeWhispererConstants.nothingToShowMessage}</p>`