From 6b43a846ae7db0d37583e33eb782fcf76a436611 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Thu, 6 Mar 2025 12:35:59 -0800 Subject: [PATCH] fix: follow up comments on #4825 --- .../feature-1afd4cfd-991f-47a7-904d-7311402305bb.json | 4 ++++ .../aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt | 5 +++-- .../jetbrains/core/explorer/webview/ToolkitLoginWebview.kt | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 .changes/next-release/feature-1afd4cfd-991f-47a7-904d-7311402305bb.json diff --git a/.changes/next-release/feature-1afd4cfd-991f-47a7-904d-7311402305bb.json b/.changes/next-release/feature-1afd4cfd-991f-47a7-904d-7311402305bb.json new file mode 100644 index 00000000000..a1ae79074f6 --- /dev/null +++ b/.changes/next-release/feature-1afd4cfd-991f-47a7-904d-7311402305bb.json @@ -0,0 +1,4 @@ +{ + "type" : "feature", + "description" : "Add support for using Amazon Q chat through a remote IDE instance on 2024.2+" +} \ No newline at end of file diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt index a314ea8d49c..67ceff60677 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt @@ -262,8 +262,8 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos override fun loadWebView(query: JBCefJSQuery) { val webScriptUri = assetHandler.createResource( - "js/getStart.js", - QWebviewBrowser::class.java.getResourceAsStream("/webview/assets/js/getStart.js") + WEB_SCRIPT, + QWebviewBrowser::class.java.getResourceAsStream("/webview/assets/$WEB_SCRIPT") ) jcefBrowser.loadURL(assetHandler.createResource("content.html", getWebviewHTML(webScriptUri, query))) @@ -271,5 +271,6 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos companion object { private val LOG = getLogger() + private const val WEB_SCRIPT = "js/getStart.js" } } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt index 9376f506010..8c14c3b9eea 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt @@ -323,8 +323,8 @@ class ToolkitWebviewBrowser(val project: Project, private val parentDisposable: override fun loadWebView(query: JBCefJSQuery) { val webScriptUri = assetHandler.createResource( - "js/toolkitGetStart.js", - ToolkitWebviewBrowser::class.java.getResourceAsStream("/webview/assets/js/toolkitGetStart.js") + WEB_SCRIPT, + ToolkitWebviewBrowser::class.java.getResourceAsStream("/webview/assets/$WEB_SCRIPT") ) jcefBrowser.loadURL(assetHandler.createResource("content.html", getWebviewHTML(webScriptUri, query))) @@ -334,6 +334,7 @@ class ToolkitWebviewBrowser(val project: Project, private val parentDisposable: companion object { private val LOG = getLogger() + private const val WEB_SCRIPT = "js/toolkitGetStart.js" } }