From 5e3bda96a2dab4e29c71e308613706e5cae883e2 Mon Sep 17 00:00:00 2001 From: Dogus Atasoy Date: Fri, 31 Jan 2025 15:56:15 +0100 Subject: [PATCH 1/4] feat(amazonq): Add description and github issue link to feedback form --- package-lock.json | 8 ++++---- packages/core/package.json | 2 +- .../src/amazonq/webview/messages/messageDispatcher.ts | 5 +++++ packages/core/src/amazonq/webview/ui/commands.ts | 1 + packages/core/src/amazonq/webview/ui/connector.ts | 7 +++++++ packages/core/src/amazonq/webview/ui/main.ts | 6 ++++++ packages/core/src/amazonq/webview/ui/texts/constants.ts | 2 ++ 7 files changed, 26 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index d501d9b7cf5..c639652c9ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6071,9 +6071,9 @@ } }, "node_modules/@aws/mynah-ui": { - "version": "4.21.6", - "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.21.6.tgz", - "integrity": "sha512-SpWY997696aMDPwbiBqwkBXUCrguDQsJ3RukmgafjAlQuBJAQTIaVAj4GfsEwuTLOsBNR7CJIj9XxhtDo7PvJQ==", + "version": "4.22.0", + "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.22.0.tgz", + "integrity": "sha512-uZ7ULKyt5z5NEyI96XpAIPnp5XHPcXVAsZOZ3gICb/KEsHkU/L3ZgNsi7V98Svcqn8WTquRiVoFyJ6FAznvvMQ==", "hasInstallScript": true, "license": "Apache License 2.0", "dependencies": { @@ -21270,7 +21270,7 @@ "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/smithy-client": "^3.46.0", "@aws-sdk/util-arn-parser": "^3.46.0", - "@aws/mynah-ui": "^4.21.6", + "@aws/mynah-ui": "^4.22.0", "@gerhobbelt/gitignore-parser": "^0.2.0-9", "@iarna/toml": "^2.2.5", "@smithy/middleware-retry": "^2.3.1", diff --git a/packages/core/package.json b/packages/core/package.json index a15a1fc8893..3fad9f94e4b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -508,7 +508,7 @@ "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/smithy-client": "^3.46.0", "@aws-sdk/util-arn-parser": "^3.46.0", - "@aws/mynah-ui": "^4.21.6", + "@aws/mynah-ui": "^4.22.0", "@gerhobbelt/gitignore-parser": "^0.2.0-9", "@iarna/toml": "^2.2.5", "@smithy/middleware-retry": "^2.3.1", diff --git a/packages/core/src/amazonq/webview/messages/messageDispatcher.ts b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts index 6acc250a25f..ba08dcf6af4 100644 --- a/packages/core/src/amazonq/webview/messages/messageDispatcher.ts +++ b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts @@ -53,6 +53,11 @@ export function dispatchWebViewMessagesToApps( void openUrl(Uri.parse(userGuideLink)) return } + case 'open-form-link': { + const { link } = msg + void openUrl(Uri.parse(link)) + return + } case 'send-telemetry': { if (isOpenAgentTelemetry(msg)) { telemetry.toolkit_openModule.emit({ diff --git a/packages/core/src/amazonq/webview/ui/commands.ts b/packages/core/src/amazonq/webview/ui/commands.ts index d668cb5d3b7..215783bcef4 100644 --- a/packages/core/src/amazonq/webview/ui/commands.ts +++ b/packages/core/src/amazonq/webview/ui/commands.ts @@ -40,6 +40,7 @@ type MessageCommand = | 'start-test-gen' | 'review' | 'open-user-guide' + | 'open-form-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 index a0ddb355d87..bee002e062b 100644 --- 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 { } } + onFormLinkClick = (link: string): void => { + this.sendMessageToExtension({ + command: 'open-form-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 index c535409ca78..8fd237ea206 100644 --- 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.onFormLinkClick(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 index d907308b8c3..23d733bfd4f 100644 --- 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!', From 83aedec9c466e881ce0d62fd677ea2a34e2b91a8 Mon Sep 17 00:00:00 2001 From: Dogus Atasoy Date: Fri, 31 Jan 2025 15:58:24 +0100 Subject: [PATCH 2/4] add: changelog --- .../Feature-d4b1f56f-fbfd-43e9-b4e1-e2c972dcf197.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 packages/amazonq/.changes/next-release/Feature-d4b1f56f-fbfd-43e9-b4e1-e2c972dcf197.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 new file mode 100644 index 00000000000..065aad75325 --- /dev/null +++ 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" +} From 4ffea91041468f9773d78c40c15e72c82209041a Mon Sep 17 00:00:00 2001 From: Dogus Atasoy Date: Mon, 3 Feb 2025 20:02:00 +0100 Subject: [PATCH 3/4] updated open-user-guide and open-form-link combined to open-link --- .../core/src/amazonq/webview/messages/messageDispatcher.ts | 7 +------ .../src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts | 4 ++-- packages/core/src/amazonq/webview/ui/commands.ts | 3 +-- packages/core/src/amazonq/webview/ui/connector.ts | 4 ++-- packages/core/src/amazonq/webview/ui/main.ts | 2 +- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/packages/core/src/amazonq/webview/messages/messageDispatcher.ts b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts index ba08dcf6af4..8acd04e8953 100644 --- a/packages/core/src/amazonq/webview/messages/messageDispatcher.ts +++ b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts @@ -48,12 +48,7 @@ export function dispatchWebViewMessagesToApps( AmazonQChatMessageDuration.stopChatMessageTelemetry(msg) return } - case 'open-user-guide': { - const { userGuideLink } = msg - void openUrl(Uri.parse(userGuideLink)) - return - } - case 'open-form-link': { + case 'open-link': { const { link } = msg void openUrl(Uri.parse(link)) return diff --git a/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts b/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts index c0f031509d3..e9378512995 100644 --- 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 index 215783bcef4..bdf2490b3a1 100644 --- a/packages/core/src/amazonq/webview/ui/commands.ts +++ b/packages/core/src/amazonq/webview/ui/commands.ts @@ -39,8 +39,7 @@ type MessageCommand = | 'store-code-result-message-id' | 'start-test-gen' | 'review' - | 'open-user-guide' - | 'open-form-link' + | '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 index bee002e062b..e7d2d47bf24 100644 --- a/packages/core/src/amazonq/webview/ui/connector.ts +++ b/packages/core/src/amazonq/webview/ui/connector.ts @@ -131,9 +131,9 @@ export class Connector { } } - onFormLinkClick = (link: string): void => { + onLinkClick = (link: string): void => { this.sendMessageToExtension({ - command: 'open-form-link', + command: 'open-link', link, }) } diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts index 8fd237ea206..74ada92cc67 100644 --- a/packages/core/src/amazonq/webview/ui/main.ts +++ b/packages/core/src/amazonq/webview/ui/main.ts @@ -838,7 +838,7 @@ export const createMynahUI = ( mouseEvent?.preventDefault() mouseEvent?.stopPropagation() mouseEvent?.stopImmediatePropagation() - connector.onFormLinkClick(link) + connector.onLinkClick(link) }, onInfoLinkClick: (tabId: string, link: string, mouseEvent?: MouseEvent) => { mouseEvent?.preventDefault() From 465f8b507528f1e9377de9bacdd75c47065fa27a Mon Sep 17 00:00:00 2001 From: Dogus Atasoy Date: Mon, 3 Feb 2025 20:19:38 +0100 Subject: [PATCH 4/4] updated mynah-ui version --- package-lock.json | 8 ++++---- packages/core/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c639652c9ab..dae40a590e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6071,9 +6071,9 @@ } }, "node_modules/@aws/mynah-ui": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.22.0.tgz", - "integrity": "sha512-uZ7ULKyt5z5NEyI96XpAIPnp5XHPcXVAsZOZ3gICb/KEsHkU/L3ZgNsi7V98Svcqn8WTquRiVoFyJ6FAznvvMQ==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.22.1.tgz", + "integrity": "sha512-6mWD5Fp4VDVSKIv3sRKopoeh3GeiXEp2gWXmUWSVE9ccnnnavPyKSebV6vJiHJHtuS1da7i6ZLVednpsV9I49Q==", "hasInstallScript": true, "license": "Apache License 2.0", "dependencies": { @@ -21270,7 +21270,7 @@ "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/smithy-client": "^3.46.0", "@aws-sdk/util-arn-parser": "^3.46.0", - "@aws/mynah-ui": "^4.22.0", + "@aws/mynah-ui": "^4.22.1", "@gerhobbelt/gitignore-parser": "^0.2.0-9", "@iarna/toml": "^2.2.5", "@smithy/middleware-retry": "^2.3.1", diff --git a/packages/core/package.json b/packages/core/package.json index 3fad9f94e4b..e8158d302ed 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -508,7 +508,7 @@ "@aws-sdk/property-provider": "3.46.0", "@aws-sdk/smithy-client": "^3.46.0", "@aws-sdk/util-arn-parser": "^3.46.0", - "@aws/mynah-ui": "^4.22.0", + "@aws/mynah-ui": "^4.22.1", "@gerhobbelt/gitignore-parser": "^0.2.0-9", "@iarna/toml": "^2.2.5", "@smithy/middleware-retry": "^2.3.1",