Add refresh button to the chat panel (aws#4687)

Author: manodnyab

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -28,6 +28,10 @@
     </extensions>
 
     <actions>
+        <action id="aws.toolkit.open.q.window" class="software.aws.toolkits.jetbrains.services.amazonq.QRefreshPanelAction"/>
+        <group id="aws.q.toolwindow.titleBar" popup="false" compact="true">
+            <reference id="aws.toolkit.open.q.window"/>
+        </group>
         <!-- TODO: q.openchat will eventually be in amazonq, aws.toolkit.q.sign.in will eventually be in core. -->
         <action id="q.openchat" class="software.aws.toolkits.jetbrains.services.amazonq.QOpenPanelAction"/>
 

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

@@ -9,6 +9,7 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Disposer
 import com.intellij.ui.components.JBTextArea
 import com.intellij.ui.components.panels.Wrapper
 import com.intellij.ui.dsl.builder.panel
@@ -73,6 +74,19 @@ class QWebviewPanel private constructor(val project: Project) : Disposable {
     }
 
     init {
+        init()
+    }
+
+    fun disposeAndRecreate() {
+        webviewContainer.removeAll()
+        val toDispose = browser
+        init()
+        if (toDispose != null) {
+            Disposer.dispose(toDispose)
+        }
+    }
+
+    private fun init() {
         if (!JBCefApp.isSupported()) {
             // Fallback to an alternative browser-less solution
             webviewContainer.add(JBTextArea("JCEF not supported"))
@@ -92,11 +106,13 @@ class QWebviewPanel private constructor(val project: Project) : Disposable {
     }
 }
 
-class QWebviewBrowser(val project: Project, private val parentDisposable: Disposable) : LoginBrowser(
-    project,
-    QWebviewBrowser.DOMAIN,
-    QWebviewBrowser.WEB_SCRIPT_URI
-) {
+class QWebviewBrowser(val project: Project, private val parentDisposable: Disposable) :
+    LoginBrowser(
+        project,
+        QWebviewBrowser.DOMAIN,
+        QWebviewBrowser.WEB_SCRIPT_URI
+    ),
+    Disposable {
     // TODO: confirm if we need such configuration or the default is fine
     override val jcefBrowser = createBrowser(parentDisposable)
     private val query = JBCefJSQuery.create(jcefBrowser)
@@ -117,6 +133,10 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
         query.addHandler(jcefHandler)
     }
 
+    override fun dispose() {
+        Disposer.dispose(jcefBrowser)
+    }
+
     fun component(): JComponent? = jcefBrowser.component
 
     override fun handleBrowserMessage(message: BrowserMessage?) {

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

@@ -0,0 +1,41 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq
+
+import com.intellij.icons.AllIcons
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.DumbAwareAction
+import com.intellij.util.messages.Topic
+import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
+import software.aws.toolkits.resources.AmazonQBundle
+import software.aws.toolkits.resources.message
+import java.util.EventListener
+
+class QRefreshPanelAction : DumbAwareAction(AmazonQBundle.message("amazonq.refresh.panel"), null, AllIcons.Actions.Refresh) {
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project ?: return
+        // recreate chat browser
+        AmazonQToolWindow.getInstance(project).disposeAndRecreate()
+        // recreate signin browser
+        QWebviewPanel.getInstance(project).disposeAndRecreate()
+        RefreshQChatPanelButtonPressedListener.notifyRefresh()
+    }
+
+    override fun getActionUpdateThread() = ActionUpdateThread.BGT
+}
+
+interface RefreshQChatPanelButtonPressedListener : EventListener {
+    fun onRefresh() {}
+
+    companion object {
+        @Topic.AppLevel
+        val TOPIC = Topic.create("Q Chat refreshed", RefreshQChatPanelButtonPressedListener::class.java)
+
+        fun notifyRefresh() {
+            ApplicationManager.getApplication().messageBus.syncPublisher(TOPIC).onRefresh()
+        }
+    }
+}

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

@@ -4,7 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonq.toolwindow
 
 import com.intellij.idea.AppMode
-import com.intellij.openapi.Disposable
+import com.intellij.openapi.util.Disposer
 import com.intellij.ui.components.JBTextArea
 import com.intellij.ui.components.panels.Wrapper
 import com.intellij.ui.dsl.builder.panel
@@ -16,9 +16,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.webview.Browser
 import java.awt.event.ActionListener
 import javax.swing.JButton
 
-class AmazonQPanel(
-    parent: Disposable,
-) {
+class AmazonQPanel {
     private val webviewContainer = Wrapper()
     var browser: Browser? = null
         private set
@@ -52,6 +50,19 @@ class AmazonQPanel(
     }
 
     init {
+        init()
+    }
+
+    fun disposeAndRecreate() {
+        webviewContainer.removeAll()
+        val toDispose = browser
+        init()
+        if (toDispose != null) {
+            Disposer.dispose(toDispose)
+        }
+    }
+
+    private fun init() {
         if (!JBCefApp.isSupported()) {
             // Fallback to an alternative browser-less solution
             if (AppMode.isRemoteDevHost()) {
@@ -61,7 +72,7 @@ class AmazonQPanel(
             }
             browser = null
         } else {
-            browser = Browser(parent).also {
+            browser = Browser().also {
                 webviewContainer.add(it.component())
             }
         }

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

@@ -3,13 +3,17 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.toolwindow
 
+import com.intellij.ide.ui.LafManager
+import com.intellij.ide.ui.LafManagerListener
 import com.intellij.openapi.Disposable
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.wm.ToolWindowManager
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import software.aws.toolkits.jetbrains.services.amazonq.QWebviewPanel
@@ -36,7 +40,7 @@ class AmazonQToolWindow private constructor(
     private val browserConnector = BrowserConnector()
     private val editorThemeAdapter = EditorThemeAdapter()
 
-    private val chatPanel = AmazonQPanel(parent = this)
+    private val chatPanel = AmazonQPanel()
 
     val component: JComponent = chatPanel.component
 
@@ -48,6 +52,18 @@ class AmazonQToolWindow private constructor(
         connectApps()
     }
 
+    fun disposeAndRecreate() {
+        browserConnector.uiReady = CompletableDeferred()
+        chatPanel.disposeAndRecreate()
+
+        appConnections.clear()
+        initConnections()
+        connectUi()
+        connectApps()
+
+        ApplicationManager.getApplication().messageBus.syncPublisher(LafManagerListener.TOPIC).lookAndFeelChanged(LafManager.getInstance())
+    }
+
     private fun sendMessage(message: AmazonQMessage, tabType: String) {
         appConnections.filter { it.app.tabTypes.contains(tabType) }.forEach {
             scope.launch {

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

@@ -3,12 +3,15 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.toolwindow
 
+import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.openapi.wm.ex.ToolWindowEx
+import com.intellij.ui.content.Content
+import com.intellij.ui.content.ContentManager
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
@@ -21,6 +24,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenAu
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProviderListener
 import software.aws.toolkits.jetbrains.core.webview.BrowserState
 import software.aws.toolkits.jetbrains.services.amazonq.QWebviewPanel
+import software.aws.toolkits.jetbrains.services.amazonq.RefreshQChatPanelButtonPressedListener
 import software.aws.toolkits.jetbrains.services.amazonq.gettingstarted.openMeetQPage
 import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion
 import software.aws.toolkits.jetbrains.utils.isQConnected
@@ -33,6 +37,10 @@ import java.awt.event.ComponentEvent
 
 class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
+        if (toolWindow is ToolWindowEx) {
+            val actionManager = ActionManager.getInstance()
+            toolWindow.setTitleActions(listOf(actionManager.getAction("aws.q.toolwindow.titleBar")))
+        }
         val contentManager = toolWindow.contentManager
 
         project.messageBus.connect().subscribe(
@@ -44,11 +52,24 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             }
         )
 
+        project.messageBus.connect().subscribe(
+            RefreshQChatPanelButtonPressedListener.TOPIC,
+            object : RefreshQChatPanelButtonPressedListener {
+                override fun onRefresh() {
+                    runInEdt {
+                        contentManager.removeAllContents(true)
+                        prepareChatContent(project, contentManager)
+                    }
+                }
+            }
+        )
+
         project.messageBus.connect().subscribe(
             BearerTokenProviderListener.TOPIC,
             object : BearerTokenProviderListener {
                 override fun onChange(providerId: String, newScopes: List<String>?) {
                     if (ToolkitConnectionManager.getInstance(project).connectionStateForFeature(QConnection.getInstance()) == BearerTokenAuthState.AUTHORIZED) {
+                        contentManager.removeAllContents(true)
                         val content = contentManager.factory.createContent(AmazonQToolWindow.getInstance(project).component, null, false).also {
                             it.isCloseable = true
                             it.isPinnable = true
@@ -63,6 +84,16 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             }
         )
 
+        val content = prepareChatContent(project, contentManager)
+
+        toolWindow.activate(null)
+        contentManager.setSelectedContent(content)
+    }
+
+    private fun prepareChatContent(
+        project: Project,
+        contentManager: ContentManager
+    ): Content {
         val component = if (isQConnected(project) && !isQExpired(project)) {
             AmazonQToolWindow.getInstance(project).component
         } else {
@@ -75,8 +106,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             it.isPinnable = true
         }
         contentManager.addContent(content)
-        toolWindow.activate(null)
-        contentManager.setSelectedContent(content)
+        return content
     }
 
     override fun init(toolWindow: ToolWindow) {

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

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonq.webview
 
 import com.intellij.openapi.Disposable
+import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.cef.CefApp
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
@@ -14,9 +15,9 @@ typealias MessageReceiver = Function<String, JBCefJSQuery.Response>
 /*
 Displays the web view for the Amazon Q tool window
  */
-class Browser(parent: Disposable) {
+class Browser : Disposable {
 
-    val jcefBrowser = createBrowser(parent)
+    val jcefBrowser = createBrowser(this)
 
     val receiveMessageQuery = JBCefJSQuery.create(jcefBrowser)
 
@@ -32,6 +33,10 @@ class Browser(parent: Disposable) {
         loadWebView(isCodeTransformAvailable, isFeatureDevAvailable)
     }
 
+    override fun dispose() {
+        Disposer.dispose(jcefBrowser)
+    }
+
     fun component() = jcefBrowser.component
 
     fun post(message: String) =

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

@@ -27,7 +27,7 @@ class BrowserConnector(
     private val serializer: MessageSerializer = MessageSerializer.getInstance(),
     private val themeBrowserAdapter: ThemeBrowserAdapter = ThemeBrowserAdapter(),
 ) {
-    val uiReady = CompletableDeferred<Boolean>()
+    var uiReady = CompletableDeferred<Boolean>()
 
     suspend fun connect(
         browser: Browser,

plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties

@@ -1,2 +1,3 @@
 action.q.hello.description=Hello description
+amazonq.refresh.panel=Refresh Chat Session
 q.hello=Hello