Show notification banner

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

@@ -10,8 +10,8 @@
 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 com.intellij.ui.components.panels.Wrapper
+import com.intellij.util.ui.components.BorderLayoutPanel
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
@@ -22,20 +22,31 @@
 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.NotificationFollowupActions
+import software.aws.toolkits.jetbrains.core.notifications.ShowCriticalNotificationBannerListener
+import software.aws.toolkits.jetbrains.core.notifications.getBannerActionList
 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.utils.isQConnected
 import software.aws.toolkits.jetbrains.utils.isQExpired
 import software.aws.toolkits.jetbrains.utils.isQWebviewsAvailable
+import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.FeatureId
 import java.awt.event.ComponentAdapter
 import java.awt.event.ComponentEvent
+import javax.swing.JComponent
 
 class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
+    private val notificationPanel = NotificationPanel()
+    private val qPanel = QPanel()
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
+        val mainPanel = BorderLayoutPanel()
+        mainPanel.addToTop(notificationPanel)
+        mainPanel.add(qPanel)
+
         if (toolWindow is ToolWindowEx) {
             val actionManager = ActionManager.getInstance()
             toolWindow.setTitleActions(listOf(actionManager.getAction("aws.q.toolwindow.titleBar")))
@@ -46,7 +57,7 @@
             ToolkitConnectionManagerListener.TOPIC,
             object : ToolkitConnectionManagerListener {
                 override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
-                    onConnectionChanged(project, newConnection, toolWindow)
+                    onConnectionChanged(project, newConnection)
                 }
             }
         )
@@ -56,55 +67,62 @@
             object : RefreshQChatPanelButtonPressedListener {
                 override fun onRefresh() {
                     runInEdt {
-                        contentManager.removeAllContents(true)
-                        prepareChatContent(project, contentManager)
+                        prepareChatContent(project)
                     }
                 }
             }
         )
 
+        project.messageBus.connect().subscribe(
+            ShowCriticalNotificationBannerListener.TOPIC,
+            object : ShowCriticalNotificationBannerListener {
+                override fun onReceiveEmergencyNotification(title: String, message: String, actions: List<NotificationFollowupActions>?) {
+                    notificationPanel.updateNotificationPanel(title, message, actions)
+                }
+            }
+        )
+
         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) {
-                        val content = contentManager.factory.createContent(AmazonQToolWindow.getInstance(project).component, null, false).also {
+                        // change this
+                        val qComponent = AmazonQToolWindow.getInstance(project).component
+
+                        val content = contentManager.factory.createContent(qComponent, null, false).also {
                             it.isCloseable = true
                             it.isPinnable = true
                         }
 
                         runInEdt {
-                            contentManager.removeAllContents(true)
-                            contentManager.addContent(content)
+                            qPanel.updateQPanel(qComponent)
                         }
                     }
                 }
             }
         )
 
-        val content = prepareChatContent(project, contentManager)
+        prepareChatContent(project)
 
+        val content = contentManager.factory.createContent(mainPanel, null, false).also {
+            it.isCloseable = true
+            it.isPinnable = true
+        }
         toolWindow.activate(null)
-        contentManager.setSelectedContent(content)
+        contentManager.addContent(content)
     }
 
     private fun prepareChatContent(
         project: Project,
-        contentManager: ContentManager,
-    ): Content {
+    ) {
         val component = if (isQConnected(project) && !isQExpired(project)) {
             AmazonQToolWindow.getInstance(project).component
         } else {
             QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.Q))
             QWebviewPanel.getInstance(project).component
         }
-
-        val content = contentManager.factory.createContent(component, null, false).also {
-            it.isCloseable = true
-            it.isPinnable = true
-        }
-        contentManager.addContent(content)
-        return content
+        qPanel.updateQPanel(component)
     }
 
     override fun init(toolWindow: ToolWindow) {
@@ -125,8 +143,7 @@
 
     override fun shouldBeAvailable(project: Project): Boolean = isQWebviewsAvailable()
 
-    private fun onConnectionChanged(project: Project, newConnection: ToolkitConnection?, toolWindow: ToolWindow) {
-        val contentManager = toolWindow.contentManager
+    private fun onConnectionChanged(project: Project, newConnection: ToolkitConnection?) {
         val isNewConnectionForQ = newConnection?.let {
             (it as? AwsBearerTokenConnection)?.let { conn ->
                 val scopeShouldHave = Q_SCOPES
@@ -151,15 +168,8 @@
             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 {
-            contentManager.removeAllContents(true)
-            contentManager.addContent(content)
+            qPanel.updateQPanel(component)
         }
     }
 
@@ -169,3 +179,41 @@
         private const val MINIMUM_TOOLWINDOW_WIDTH = 325
     }
 }
+
+class NotificationPanel : BorderLayoutPanel() {
+    private val wrapper = Wrapper()
+    init {
+        isOpaque = false
+        addToCenter(wrapper)
+    }
+
+    private fun removeNotificationPanel() = runInEdt {
+        wrapper.removeAll()
+    }
+
+    fun updateNotificationPanel(title: String, message: String, actions: List<NotificationFollowupActions>?) {
+        val editorNotificationPanel = getBannerActionList(actions, title, message)
+
+        editorNotificationPanel.createActionLabel("Dismiss") {
+            removeNotificationPanel()
+        }
+
+        wrapper.setContent(editorNotificationPanel)
+    }
+}
+
+class QPanel : BorderLayoutPanel() {
+    private val wrapper = Wrapper()
+    init {
+        isOpaque = false
+        addToCenter(wrapper)
+    }
+
+    fun updateQPanel(content: JComponent) {
+        try {
+            wrapper.setContent(content)
+        } catch (e: Exception) {
+            notifyInfo("Error while creating window")
+        }
+    }
+}

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

@@ -0,0 +1,99 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+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.ui.Messages
+import com.intellij.ui.EditorNotificationPanel
+
+fun checkSeverity(notificationSeverity: String): NotificationSeverity = when (notificationSeverity) {
+    "Critical" -> NotificationSeverity.CRITICAL
+    "Warning" -> NotificationSeverity.WARNING
+    "Info" -> NotificationSeverity.INFO
+    else -> NotificationSeverity.INFO
+}
+
+fun getNotificationActionList(
+    notificationFollowupActions: List<NotificationFollowupActions>?,
+    notificationTitle: String,
+    notificationMessage: String,
+): List<AnAction> {
+    val actionList = mutableListOf<AnAction>()
+    actionList.add(
+        getNotifAction("Expand") {
+            Messages.showYesNoDialog(null, notificationMessage, notificationTitle, "OK", "Cancel", AllIcons.General.Error)
+        }
+    )
+    if (notificationFollowupActions.isNullOrEmpty()) return actionList
+    notificationFollowupActions.forEach { notificationAction ->
+        if (notificationAction.type == "ShowUrl") {
+            actionList.add(
+                getNotifAction("Learn more") {
+                    notificationAction.content.locale.url?.let { url -> BrowserUtil.browse(url) }
+                }
+            )
+        }
+
+        if (notificationAction.type == "UpdateExtension") {
+            actionList.add(
+                getNotifAction("Update") {
+                    // add update logic
+                }
+            )
+        }
+
+        if (notificationAction.type == "openChangelog") {
+            actionList.add(
+                getNotifAction("Changelog") {
+                    BrowserUtil.browse("https://github.com/aws/aws-toolkit-jetbrains/blob/main/CHANGELOG.md")
+                }
+            )
+        }
+    }
+    return actionList
+}
+
+fun getNotifAction(title: String, block: () -> Unit): AnAction = object : AnAction(title) {
+    override fun actionPerformed(e: AnActionEvent) {
+        block()
+    }
+}
+
+fun getBannerActionList(
+    notificationFollowupActions: List<NotificationFollowupActions>?,
+    notificationTitle: String,
+    notificationMessage: String,
+): EditorNotificationPanel {
+    val panel = EditorNotificationPanel()
+
+    panel.text = notificationTitle
+    panel.icon(AllIcons.General.Error)
+    panel.createActionLabel("Expand") {
+        Messages.showYesNoDialog(null, notificationMessage, notificationTitle, "OK", "Cancel", AllIcons.General.Error)
+    }
+    if (notificationFollowupActions.isNullOrEmpty()) return panel
+    notificationFollowupActions.forEach { notificationAction ->
+        if (notificationAction.type == "ShowUrl") {
+            panel.createActionLabel("Learn more") {
+                notificationAction.content.locale.url?.let { url -> BrowserUtil.browse(url) }
+            }
+        }
+
+        if (notificationAction.type == "UpdateExtension") {
+            panel.createActionLabel("Update") {
+                // add update logic
+            }
+        }
+
+        if (notificationAction.type == "openChangelog") {
+            panel.createActionLabel("Changelog") {
+                BrowserUtil.browse("https://github.com/aws/aws-toolkit-jetbrains/blob/main/CHANGELOG.md")
+            }
+        }
+    }
+    return panel
+}

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

@@ -0,0 +1,38 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.core.notifications
+
+import com.intellij.notification.NotificationType
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.project.Project
+import software.aws.toolkits.jetbrains.utils.notifyStickyWithData
+
+object DisplayToastNotifications {
+    fun showToast(title: String, message: String, action: List<AnAction>, notificationType: NotificationSeverity, notificationId: String) {
+        val notifyType = when (notificationType) {
+            NotificationSeverity.CRITICAL -> NotificationType.ERROR
+            NotificationSeverity.WARNING -> NotificationType.WARNING
+            NotificationSeverity.INFO -> NotificationType.INFORMATION
+        }
+        notifyStickyWithData(notifyType, title, message, null, action, notificationId)
+    }
+
+    fun shouldShowNotification(project: Project, notificationData: NotificationData) {
+        if (RulesEngine.displayNotification(notificationData, project)) {
+            val notificationContent = notificationData.content.locale
+            val severity = notificationData.severity
+            showToast(
+                notificationContent.title,
+                notificationContent.description,
+                getNotificationActionList(notificationData.actions, notificationContent.title, notificationContent.description),
+                checkSeverity(severity),
+                notificationData.id
+            )
+
+            if (severity == "Critical") {
+                ShowCriticalNotificationBannerListener.showBanner(notificationContent.title, notificationContent.description, notificationData.actions)
+            }
+        }
+    }
+}