Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: follow up comments on #4825 #5450

Merged
merged 1 commit into from
Mar 10, 2025
Merged

fix: follow up comments on #4825 #5450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/feature-1afd4cfd-991f-47a7-904d-7311402305bb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "Add support for using Amazon Q chat through a remote IDE instance on 2024.2+"
}
5 changes: 3 additions & 2 deletions ...jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,14 +262,15 @@

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")

Check warning on line 266 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt#L265-L266 

Added lines #L265 - L266 were not covered by tests
)

jcefBrowser.loadURL(assetHandler.createResource("content.html", getWebviewHTML(webScriptUri, query)))
}

companion object {
private val LOG = getLogger<QWebviewBrowser>()
private const val WEB_SCRIPT = "js/getStart.js"
}
}
5 changes: 3 additions & 2 deletions ...ins-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@

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")

Check warning on line 327 in plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt

View check run for this annotation

Codecov / codecov/patch

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt#L326-L327 

Added lines #L326 - L327 were not covered by tests
)

jcefBrowser.loadURL(assetHandler.createResource("content.html", getWebviewHTML(webScriptUri, query)))
Expand All @@ -334,6 +334,7 @@

companion object {
private val LOG = getLogger<ToolkitWebviewBrowser>()
private const val WEB_SCRIPT = "js/toolkitGetStart.js"
}
}

Expand Down
Loading