Merge branch 'feature/q-lsp-chat' into manodnyb/setupChatComponentsWithFlare

Author: manodnyab

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

@@ -227,7 +227,7 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
             }
 
             is BrowserMessage.PublishWebviewTelemetry -> {
-                publishTelemetry(message)
+//                publishTelemetry(message)
             }
 
             is BrowserMessage.OpenUrl -> {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt

@@ -86,7 +86,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
                 override fun onChange(providerId: String, newScopes: List<String>?) {
                     if (ToolkitConnectionManager.getInstance(project).connectionStateForFeature(QConnection.getInstance()) == BearerTokenAuthState.AUTHORIZED) {
                         AmazonQToolWindow.getInstance(project).disposeAndRecreate()
-                        qPanel.setContent(AmazonQToolWindow.getInstance(project).component)
+                        prepareChatContent(project, qPanel)
                     }
                 }
             }

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/help/HelpIds.kt

@@ -126,10 +126,9 @@ enum class HelpIds(shortId: String, val url: String) {
         "https://docs.aws.amazon.com/toolkit-for-jetbrains/latest/userguide/setup-credentials.html"
     ),
 
-    // TODO: update this
     Q_SWITCH_PROFILES_DIALOG(
         "QSwitchProfilesDialog",
-        "https://aws.amazon.com/q/developer/"
+        "https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/subscribe-understanding-profile.html"
     ),
     ;
 

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/LoginBrowserTest.kt

@@ -9,6 +9,7 @@ import com.intellij.ui.jcef.JBCefBrowserBase
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension
 import org.mockito.kotlin.argumentCaptor
@@ -34,6 +35,7 @@ class TestLoginBrowser(project: Project) : LoginBrowser(project, "", "") {
     override fun loadWebView(query: JBCefJSQuery) {}
 }
 
+@Disabled
 class LoginBrowserTest {
     private lateinit var sut: TestLoginBrowser
     private val project: Project