Revert "Show toasts for notifications and notification banner on critical notifications(#5097)"

This reverts commit fc77aab.

Author: samgst-amazon

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

@@ -10,8 +10,8 @@ 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.components.panels.Wrapper
-import com.intellij.util.ui.components.BorderLayoutPanel
+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
@@ -22,8 +22,6 @@ import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.core.credentials.sono.Q_SCOPES
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenAuthState
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProviderListener
-import software.aws.toolkits.jetbrains.core.notifications.NotificationPanel
-import software.aws.toolkits.jetbrains.core.notifications.ProcessNotificationsBase
 import software.aws.toolkits.jetbrains.core.webview.BrowserState
 import software.aws.toolkits.jetbrains.services.amazonq.QWebviewPanel
 import software.aws.toolkits.jetbrains.services.amazonq.RefreshQChatPanelButtonPressedListener
@@ -37,21 +35,7 @@ import java.awt.event.ComponentAdapter
 import java.awt.event.ComponentEvent
 
 class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
-
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
-        val mainPanel = BorderLayoutPanel()
-        val qPanel = Wrapper()
-        val notificationPanel = NotificationPanel()
-
-        mainPanel.addToTop(notificationPanel)
-        mainPanel.add(qPanel)
-        val notifListener = ProcessNotificationsBase.getInstance(project)
-        notifListener.addListenerForNotification { bannerContent ->
-            runInEdt {
-                notificationPanel.updateNotificationPanel(bannerContent)
-            }
-        }
-
         if (toolWindow is ToolWindowEx) {
             val actionManager = ActionManager.getInstance()
             toolWindow.setTitleActions(listOf(actionManager.getAction("aws.q.toolwindow.titleBar")))
@@ -62,7 +46,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             ToolkitConnectionManagerListener.TOPIC,
             object : ToolkitConnectionManagerListener {
                 override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
-                    onConnectionChanged(project, newConnection, qPanel)
+                    onConnectionChanged(project, newConnection, toolWindow)
                 }
             }
         )
@@ -72,7 +56,8 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             object : RefreshQChatPanelButtonPressedListener {
                 override fun onRefresh() {
                     runInEdt {
-                        prepareChatContent(project, qPanel)
+                        contentManager.removeAllContents(true)
+                        prepareChatContent(project, contentManager)
                     }
                 }
             }
@@ -83,37 +68,43 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             object : BearerTokenProviderListener {
                 override fun onChange(providerId: String, newScopes: List<String>?) {
                     if (ToolkitConnectionManager.getInstance(project).connectionStateForFeature(QConnection.getInstance()) == BearerTokenAuthState.AUTHORIZED) {
-                        val qComponent = AmazonQToolWindow.getInstance(project).component
+                        val content = contentManager.factory.createContent(AmazonQToolWindow.getInstance(project).component, null, false).also {
+                            it.isCloseable = true
+                            it.isPinnable = true
+                        }
 
                         runInEdt {
-                            qPanel.setContent(qComponent)
+                            contentManager.removeAllContents(true)
+                            contentManager.addContent(content)
                         }
                     }
                 }
             }
         )
 
-        prepareChatContent(project, qPanel)
+        val content = prepareChatContent(project, contentManager)
 
-        val content = contentManager.factory.createContent(mainPanel, null, false).also {
-            it.isCloseable = true
-            it.isPinnable = true
-        }
         toolWindow.activate(null)
-        contentManager.addContent(content)
+        contentManager.setSelectedContent(content)
     }
 
     private fun prepareChatContent(
         project: Project,
-        qPanel: Wrapper,
-    ) {
+        contentManager: ContentManager,
+    ): Content {
         val component = if (isQConnected(project) && !isQExpired(project)) {
             AmazonQToolWindow.getInstance(project).component
         } else {
             QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.AmazonQ))
             QWebviewPanel.getInstance(project).component
         }
-        qPanel.setContent(component)
+
+        val content = contentManager.factory.createContent(component, null, false).also {
+            it.isCloseable = true
+            it.isPinnable = true
+        }
+        contentManager.addContent(content)
+        return content
     }
 
     override fun init(toolWindow: ToolWindow) {
@@ -134,7 +125,8 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
 
     override fun shouldBeAvailable(project: Project): Boolean = isQWebviewsAvailable()
 
-    private fun onConnectionChanged(project: Project, newConnection: ToolkitConnection?, qPanel: Wrapper) {
+    private fun onConnectionChanged(project: Project, newConnection: ToolkitConnection?, toolWindow: ToolWindow) {
+        val contentManager = toolWindow.contentManager
         val isNewConnectionForQ = newConnection?.let {
             (it as? AwsBearerTokenConnection)?.let { conn ->
                 val scopeShouldHave = Q_SCOPES
@@ -159,8 +151,15 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             LOG.debug { "returning login window; no Q connection found" }
             QWebviewPanel.getInstance(project).component
         }
+
+        val content = contentManager.factory.createContent(component, null, false).also {
+            it.isCloseable = true
+            it.isPinnable = true
+        }
+
         runInEdt {
-            qPanel.setContent(component)
+            contentManager.removeAllContents(true)
+            contentManager.addContent(content)
         }
     }
 

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

@@ -28,7 +28,6 @@ object AwsToolkit {
 
     const val GITHUB_URL = "https://github.com/aws/aws-toolkit-jetbrains"
     const val AWS_DOCS_URL = "https://docs.aws.amazon.com/console/toolkit-for-jetbrains"
-    const val GITHUB_CHANGELOG = "https://github.com/aws/aws-toolkit-jetbrains/blob/main/CHANGELOG.md"
 }
 
 data class PluginInfo(val id: String, val name: String) {

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

@@ -3,109 +3,11 @@
 
 package software.aws.toolkits.jetbrains.core.notifications
 
-import com.intellij.icons.AllIcons
-import com.intellij.ide.BrowserUtil
-import com.intellij.openapi.actionSystem.AnAction
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.ui.Messages
-import com.intellij.ui.EditorNotificationPanel
-import software.aws.toolkits.jetbrains.AwsToolkit
-import software.aws.toolkits.resources.AwsCoreBundle
-
 fun checkSeverity(notificationSeverity: String): NotificationSeverity = when (notificationSeverity) {
     "Critical" -> NotificationSeverity.CRITICAL
     "Warning" -> NotificationSeverity.WARNING
     "Info" -> NotificationSeverity.INFO
     else -> NotificationSeverity.INFO
 }
 
-object NotificationManager {
-    fun createActions(
-        project: Project,
-        followupActions: List<NotificationFollowupActions>?,
-        message: String,
-        title: String,
-
-    ): List<NotificationActionList> = buildList {
-        var url: String? = null
-        followupActions?.forEach { action ->
-            if (action.type == "ShowUrl") {
-                url = action.content.locale.url
-            }
-
-            if (action.type == "UpdateExtension") {
-                add(
-                    NotificationActionList(AwsCoreBundle.message("notification.update")) {
-                        // TODO: Add update logic
-                    }
-                )
-            }
-
-            if (action.type == "OpenChangelog") {
-                add(
-                    NotificationActionList(AwsCoreBundle.message("notification.changelog")) {
-                        BrowserUtil.browse(AwsToolkit.GITHUB_CHANGELOG)
-                    }
-                )
-            }
-        }
-        add(
-            NotificationActionList(AwsCoreBundle.message("general.more_dialog")) {
-                if (url == null) {
-                    Messages.showYesNoDialog(
-                        project,
-                        message,
-                        title,
-                        AwsCoreBundle.message("general.acknowledge"),
-                        AwsCoreBundle.message("general.cancel"),
-                        AllIcons.General.Error
-                    )
-                } else {
-                    val link = url ?: AwsToolkit.GITHUB_URL
-                    val openLink = Messages.showYesNoDialog(
-                        project,
-                        message,
-                        title,
-                        AwsCoreBundle.message(AwsCoreBundle.message("notification.learn_more")),
-                        AwsCoreBundle.message("general.cancel"),
-                        AllIcons.General.Error
-                    )
-                    if (openLink == 0) {
-                        BrowserUtil.browse(link)
-                    }
-                }
-            }
-        )
-    }
-
-    fun buildNotificationActions(actions: List<NotificationActionList>): List<AnAction> = actions.map { (title, block) ->
-        object : AnAction(title) {
-            override fun actionPerformed(e: AnActionEvent) {
-                block()
-            }
-        }
-    }
-
-    fun buildBannerPanel(panel: EditorNotificationPanel, actions: List<NotificationActionList>): EditorNotificationPanel {
-        actions.forEach { (actionTitle, block) ->
-            panel.createActionLabel(actionTitle) {
-                block()
-            }
-        }
-
-        return panel
-    }
-}
-
-data class NotificationActionList(
-    val title: String,
-    val blockToExecute: () -> Unit,
-)
-
-data class BannerContent(
-    val title: String,
-    val message: String,
-    val actions: List<NotificationActionList>,
-    val id: String,
-)
+// TODO: Add actions that can be performed from the notifications here