Merge branch 'master' into hkobew/ec2/remoteConnect/telemetry

Author: Hweinstock

package-lock.json

@@ -69,7 +69,7 @@
         "webpack-merge": "^5.10.0"
     },
     "dependencies": {
-        "@types/node": "^22.7.5",
+        "@types/node": "^18.19.55",
         "vscode-nls": "^5.2.0",
         "vscode-nls-dev": "^4.0.4"
     }

package.json

@@ -0,0 +1,10 @@
+{
+	"date": "2024-10-17",
+	"version": "1.30.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Various fixes and changes"
+		}
+	]
+}

packages/amazonq/.changes/1.30.0.json

@@ -1,3 +1,7 @@
+## 1.30.0 2024-10-17
+
+- **Bug Fix** Various fixes and changes
+
 ## 1.29.0 2024-10-10
 
 - **Bug Fix** Amazon Q /dev: include telemetry for workspace usage when generating new files

packages/amazonq/CHANGELOG.md

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "Amazon Q is your generative AI-powered assistant across the software development lifecycle.",
-    "version": "1.30.0-SNAPSHOT",
+    "version": "1.31.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

packages/amazonq/package.json

@@ -411,7 +411,6 @@
         "@types/circular-dependency-plugin": "^5.0.8",
         "@types/cross-spawn": "^6.0.6",
         "@types/diff": "^5.0.7",
-        "@types/fs-extra": "^9.0.11",
         "@types/glob": "^8.1.0",
         "@types/js-yaml": "^4.0.5",
         "@types/jsdom": "^21.1.6",
@@ -488,7 +487,6 @@
         "cross-fetch": "^4.0.0",
         "cross-spawn": "^7.0.3",
         "fast-json-patch": "^3.1.1",
-        "fs-extra": "^10.0.1",
         "glob": "^10.3.10",
         "got": "^11.8.5",
         "highlight.js": "^11.9.0",

packages/core/package.json

@@ -129,6 +129,7 @@
     "AWS.command.ec2.stopInstance": "Stop EC2 Instance",
     "AWS.command.ec2.rebootInstance": "Reboot EC2 Instance",
     "AWS.command.ec2.copyInstanceId": "Copy Instance Id",
+    "AWS.command.ec2.viewLogs": "View EC2 Logs",
     "AWS.command.ecr.copyTagUri": "Copy Tag URI",
     "AWS.command.ecr.copyRepositoryUri": "Copy Repository URI",
     "AWS.command.ecr.createRepository": "Create Repository...",

packages/core/package.nls.json

@@ -0,0 +1,25 @@
+/* Pulsating effect */
+@keyframes pulsate {
+    0% {
+        opacity: 0;
+    }
+    50% {
+        opacity: 0.15;
+    }
+    100% {
+        opacity: 0;
+    }
+}
+
+body[data-feature-viewdiffinchat='TREATMENT'] {
+    .mynah-syntax-highlighter-copy-buttons button:nth-of-type(2)::after, /* Accept Diff and Insert At Cursor */
+    .mynah-syntax-highlighter-copy-buttons button:nth-of-type(3)::after {
+        /* View Diff */
+        content: '';
+        animation-name: pulsate;
+        animation-duration: 1.5s;
+        animation-timing-function: ease-in-out;
+        animation-iteration-count: 2;
+        transform: translate3d(0%, 0, 0);
+    }
+}

packages/core/resources/css/amazonq-chat.css

@@ -9,6 +9,20 @@ import { AuthUtil } from '../../../codewhisperer/util/authUtil'
 import { FeatureConfigProvider, FeatureContext, globals } from '../../../shared'
 
 export class WebViewContentGenerator {
+    private async generateFeatureConfigsData(): Promise<string> {
+        let featureConfigs = new Map<string, FeatureContext>()
+        try {
+            await FeatureConfigProvider.instance.fetchFeatureConfigs()
+            featureConfigs = FeatureConfigProvider.getFeatureConfigs()
+        } catch (error) {
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console.error('Error fetching feature configs:', error)
+        }
+
+        // Convert featureConfigs to a string suitable for data-features
+        return JSON.stringify(Array.from(featureConfigs.entries()))
+    }
+
     public async generate(extensionURI: Uri, webView: Webview): Promise<string> {
         const entrypoint = process.env.WEBPACK_DEVELOPER_SERVER
             ? 'http: localhost'
@@ -17,14 +31,25 @@ export class WebViewContentGenerator {
         const contentPolicy = `default-src ${entrypoint} data: blob: 'unsafe-inline';
         script-src ${entrypoint} filesystem: ws: wss: 'unsafe-inline';`
 
+        let featureDataAttributes = ''
+        try {
+            // Fetch and parse featureConfigs
+            const featureConfigs = JSON.parse(await this.generateFeatureConfigsData())
+            featureDataAttributes = featureConfigs
+                .map((config: FeatureContext[]) => `data-feature-${config[1].name}="${config[1].variation}"`)
+                .join(' ')
+        } catch (error) {
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console.error('Error setting data-feature attribute for featureConfigs:', error)
+        }
         return `<!DOCTYPE html>
         <html>
             <head>
                 <meta http-equiv="Content-Security-Policy" content="${contentPolicy}">
-                <title>Amazon Q (Preview)</title>                
-                ${await this.generateJS(extensionURI, webView)}                
+                <title>Amazon Q (Preview)</title>
+                ${await this.generateJS(extensionURI, webView)}
             </head>
-            <body>
+            <body ${featureDataAttributes}>
             </body>
         </html>`
     }
@@ -41,29 +66,27 @@ export class WebViewContentGenerator {
                 ? Uri.parse(serverHostname).with({ path: `/${source}` })
                 : webView.asWebviewUri(javascriptUri)
 
-        const cssEntrypoint = webView.asWebviewUri(
-            Uri.joinPath(globals.context.extensionUri, 'resources', 'css', 'amazonq-webview.css')
-        )
+        const cssEntrypoints = [
+            Uri.joinPath(globals.context.extensionUri, 'resources', 'css', 'amazonq-webview.css'),
+            Uri.joinPath(globals.context.extensionUri, 'resources', 'css', 'amazonq-chat.css'),
+        ]
 
-        let featureConfigs = new Map<string, FeatureContext>()
-        try {
-            await FeatureConfigProvider.instance.fetchFeatureConfigs()
-            featureConfigs = FeatureConfigProvider.getFeatureConfigs()
-        } catch (error) {
-            // eslint-disable-next-line aws-toolkits/no-console-log
-            console.error('Error fetching feature configs:', error)
-        }
+        const cssEntrypointsMap = cssEntrypoints.map((item) => webView.asWebviewUri(item))
+        const cssLinks = cssEntrypointsMap.map((uri) => `<link rel="stylesheet" href="${uri.toString()}">`).join('\n')
+
+        // Fetch featureConfigs and use it within the script
+        const featureConfigsString = await this.generateFeatureConfigsData()
 
         return `
         <script type="text/javascript" src="${javascriptEntrypoint.toString()}" defer onload="init()"></script>
-        <link rel="stylesheet" href="${cssEntrypoint.toString()}">
+        ${cssLinks}
         <script type="text/javascript">
             const init = () => {
                 createMynahUI(acquireVsCodeApi(), ${
                     (await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected'
-                },${JSON.stringify(Array.from(featureConfigs.entries()))});
+                },${featureConfigsString});
             }
-    </script>
+        </script>
         `
     }
 }

packages/core/src/amazonq/webview/generators/webViewContent.ts

@@ -5,7 +5,7 @@
 import { CancellationError } from '../../shared/utilities/timeoutUtils'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { showInputBox } from '../../shared/ui/inputPrompter'
-import { createURIFromArgs, isLogStreamUri, recordTelemetryFilter } from './cloudWatchLogsUtils'
+import { cwlUriSchema, isLogStreamUri, recordTelemetryFilter } from './cloudWatchLogsUtils'
 import { prepareDocument } from './commands/searchLogGroup'
 import { getActiveDocumentUri } from './document/logDataDocumentProvider'
 import { CloudWatchLogsData, filterLogEventsFromUri, LogDataRegistry } from './registry/logDataRegistry'
@@ -98,7 +98,7 @@ export async function changeLogSearchParams(
             throw new CancellationError('user')
         }
 
-        const newUri = createURIFromArgs(newData.logGroupInfo, newData.parameters)
+        const newUri = cwlUriSchema.form({ logGroupInfo: newData.logGroupInfo, parameters: newData.parameters })
         await prepareDocument(newUri, newData, registry)
     })
 }