Merge master into feature/emr

aws-toolkit-automation · web-flow · commit ec2166abb9eb · 2025-02-04T18:57:26.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/next-release/Feature-d4b1f56f-fbfd-43e9-b4e1-e2c972dcf197.json b/packages/amazonq/.changes/next-release/Feature-d4b1f56f-fbfd-43e9-b4e1-e2c972dcf197.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Added github issue link and description to the chat answer feedback form"
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -519,7 +519,7 @@
         "@vscode/debugprotocol": "^1.57.0",
         "@zip.js/zip.js": "^2.7.41",
         "adm-zip": "^0.5.10",
-        "amazon-states-language-service": "^1.13.0",
+        "amazon-states-language-service": "^1.15.0",
         "async-lock": "^1.4.0",
         "aws-sdk": "^2.1692.0",
         "aws-ssm-document-language-service": "^1.0.0",
diff --git a/packages/core/src/amazonq/webview/messages/messageDispatcher.ts b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts
@@ -48,9 +48,9 @@ export function dispatchWebViewMessagesToApps(
                 AmazonQChatMessageDuration.stopChatMessageTelemetry(msg)
                 return
             }
-            case 'open-user-guide': {
-                const { userGuideLink } = msg
-                void openUrl(Uri.parse(userGuideLink))
+            case 'open-link': {
+                const { link } = msg
+                void openUrl(Uri.parse(link))
                 return
             }
             case 'send-telemetry': {
diff --git a/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts b/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts
@@ -130,8 +130,8 @@ export class Connector {
         this.sendMessageToExtension(createClickTelemetry(`amazonq-explore-${actionId}`))
 
         this.sendMessageToExtension({
-            command: 'open-user-guide',
-            userGuideLink,
+            command: 'open-link',
+            link: userGuideLink,
         })
     }
 
diff --git a/packages/core/src/amazonq/webview/ui/commands.ts b/packages/core/src/amazonq/webview/ui/commands.ts
@@ -39,7 +39,7 @@ type MessageCommand =
     | 'store-code-result-message-id'
     | 'start-test-gen'
     | 'review'
-    | 'open-user-guide'
+    | 'open-link'
     | 'send-telemetry'
     | 'update-welcome-count'
 
diff --git a/packages/core/src/amazonq/webview/ui/connector.ts b/packages/core/src/amazonq/webview/ui/connector.ts
@@ -131,6 +131,13 @@ export class Connector {
         }
     }
 
+    onLinkClick = (link: string): void => {
+        this.sendMessageToExtension({
+            command: 'open-link',
+            link,
+        })
+    }
+
     onResponseBodyLinkClick = (tabID: string, messageId: string, link: string): void => {
         switch (this.tabsStorage.getTab(tabID)?.type) {
             case 'cwc':
diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
@@ -834,6 +834,12 @@ export const createMynahUI = (
             mouseEvent?.stopImmediatePropagation()
             connector.onResponseBodyLinkClick(tabId, messageId, link)
         },
+        onFormLinkClick: (link, mouseEvent) => {
+            mouseEvent?.preventDefault()
+            mouseEvent?.stopPropagation()
+            mouseEvent?.stopImmediatePropagation()
+            connector.onLinkClick(link)
+        },
         onInfoLinkClick: (tabId: string, link: string, mouseEvent?: MouseEvent) => {
             mouseEvent?.preventDefault()
             mouseEvent?.stopPropagation()
diff --git a/packages/core/src/amazonq/webview/ui/texts/constants.ts b/packages/core/src/amazonq/webview/ui/texts/constants.ts
@@ -8,6 +8,8 @@ export const uiComponentsTexts = {
     copy: 'Copy',
     insertAtCursorLabel: 'Insert at cursor',
     feedbackFormTitle: 'Report an issue',
+    feedbackFormDescription:
+        '_Feedback is anonymous. For issue updates, please contact us on [GitHub](https://github.com/aws/aws-toolkit-vscode/issues/new/choose)._',
     feedbackFormOptionsLabel: 'What type of issue would you like to report?',
     feedbackFormCommentLabel: 'Description of issue (optional):',
     feedbackThanks: 'Thanks for your feedback!',
diff --git a/packages/toolkit/.changes/next-release/Feature-f899524a-1862-4e6f-a10a-bda639f1e792.json b/packages/toolkit/.changes/next-release/Feature-f899524a-1862-4e6f-a10a-bda639f1e792.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Step Functions: Upgrade amazon-states-language-service to 1.15. This new version enhance autocomplete for variable and JSONata expression in JSON ASL files."
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Feature",
 +	"description": "Added github issue link and description to the chat answer feedback form"
 +}
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ export function dispatchWebViewMessagesToApps(`
`48`	`48`	`AmazonQChatMessageDuration.stopChatMessageTelemetry(msg)`
`49`	`49`	`return`
`50`	`50`	`}`
`51`		`- case 'open-user-guide': {`
`52`		`- const { userGuideLink } = msg`
`53`		`- void openUrl(Uri.parse(userGuideLink))`
	`51`	`+ case 'open-link': {`
	`52`	`+ const { link } = msg`
	`53`	`+ void openUrl(Uri.parse(link))`
`54`	`54`	`return`
`55`	`55`	`}`
`56`	`56`	`case 'send-telemetry': {`
Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,8 @@ export class Connector {`
`130`	`130`	this.sendMessageToExtension(createClickTelemetry(`amazonq-explore-${actionId}`))
`131`	`131`
`132`	`132`	`this.sendMessageToExtension({`
`133`		`- command: 'open-user-guide',`
`134`		`- userGuideLink,`
	`133`	`+ command: 'open-link',`
	`134`	`+ link: userGuideLink,`
`135`	`135`	`})`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,13 @@ export class Connector {`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
	`134`	`+ onLinkClick = (link: string): void => {`
	`135`	`+ this.sendMessageToExtension({`
	`136`	`+ command: 'open-link',`
	`137`	`+ link,`
	`138`	`+ })`
	`139`	`+ }`
	`140`	`+`
`134`	`141`	`onResponseBodyLinkClick = (tabID: string, messageId: string, link: string): void => {`
`135`	`142`	`switch (this.tabsStorage.getTab(tabID)?.type) {`
`136`	`143`	`case 'cwc':`