rearranged call site

Author: manodnyab

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

@@ -21,8 +21,7 @@ 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.NotificationActionList
-import software.aws.toolkits.jetbrains.core.notifications.ShowCriticalNotificationBannerListener
+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
@@ -41,8 +40,15 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         val mainPanel = BorderLayoutPanel()
         val qPanel = OuterAmazonQPanel.getInstance(project)
         val notificationPanel = NotificationPanel.getInstance(project)
+
         mainPanel.addToTop(notificationPanel)
         mainPanel.add(qPanel)
+        val notifListener = ProcessNotificationsBase.getInstance(project)
+        notifListener.addListenerForNotification { title, message, followupActions ->
+            runInEdt {
+                notificationPanel.updateNotificationPanel(title, message, followupActions)
+            }
+        }
 
         if (toolWindow is ToolWindowEx) {
             val actionManager = ActionManager.getInstance()
@@ -70,17 +76,6 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             }
         )
 
-        project.messageBus.connect().subscribe(
-            ShowCriticalNotificationBannerListener.TOPIC,
-            object : ShowCriticalNotificationBannerListener {
-                override fun onReceiveEmergencyNotification(title: String, message: String, notificationActionList: List<NotificationActionList>) {
-                    runInEdt {
-                        notificationPanel.updateNotificationPanel(title, message, notificationActionList)
-                    }
-                }
-            }
-        )
-
         project.messageBus.connect().subscribe(
             BearerTokenProviderListener.TOPIC,
             object : BearerTokenProviderListener {

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

@@ -10,10 +10,21 @@ import com.intellij.openapi.util.registry.Registry
 class DummyNotificationAction : AnAction("Show notif") {
     override fun actionPerformed(e: AnActionEvent) {
         if (!Registry.`is`("aws.toolkit.developerMode")) return
-        ShowCriticalNotificationBannerListener.showBanner(
+//        ShowCriticalNotificationBannerListener.showBanner(
+//            "hello hello",
+//            "This is a bug",
+//            NotificationManager.createActions(emptyList(), "This is a bug", "hello hello")
+//        )
+        val a = e.project?.let { ProcessNotificationsBase.getInstance(it) } ?: return
+        a.notifyListenerForNotification(
             "hello hello",
             "This is a bug",
             NotificationManager.createActions(emptyList(), "This is a bug", "hello hello")
+
         )
     }
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabledAndVisible = Registry.`is`("aws.toolkit.developerMode")
+    }
 }

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

@@ -3,9 +3,16 @@
 
 package software.aws.toolkits.jetbrains.core.notifications
 
+import com.intellij.notification.NotificationType
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
+import software.aws.toolkits.jetbrains.utils.notifyStickyWithData
 
+@Service(Service.Level.PROJECT)
 class ProcessNotificationsBase {
+    private val notifListener = mutableListOf<NotifListener>()
     init {
         // TODO: install a listener for the polling class
     }
@@ -21,14 +28,41 @@ class ProcessNotificationsBase {
 
     fun processNotification(project: Project, notificationData: NotificationData) {
         val shouldShow = RulesEngine.displayNotification(project, notificationData)
-        if(shouldShow) {
-            // TODO: notifies listeners
+        if (shouldShow) {
+            val notificationContent = notificationData.content.locale
+            val severity = notificationData.severity
+            val followupActions = NotificationManager.createActions(notificationData.actions, notificationContent.description, notificationContent.title)
+            showToast(
+                notificationContent.title,
+                notificationContent.description,
+                NotificationManager.buildNotificationActions(followupActions),
+                checkSeverity(severity),
+                notificationData.id
+            )
+            if (severity == "Critical") {
+                notifyListenerForNotification(notificationContent.title, notificationContent.description, followupActions)
+            }
         }
     }
 
-    fun notifyListenerForNotification() {
+    private 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 addListenerForNotification() {
+    fun notifyListenerForNotification(title: String, description: String, followUpActions: List<NotificationActionList>) =
+        notifListener.forEach { it(title, description, followUpActions) }
+
+    fun addListenerForNotification(newNotifListener: NotifListener) =
+        notifListener.add(newNotifListener)
+
+    companion object {
+        fun getInstance(project: Project): ProcessNotificationsBase = project.service()
     }
 }
+
+typealias NotifListener = (title: String, message: String, followupActions: List<NotificationActionList>) -> Unit

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

@@ -37,8 +37,7 @@ import software.aws.toolkits.jetbrains.core.explorer.webview.OuterToolkitPanel
 import software.aws.toolkits.jetbrains.core.explorer.webview.ToolkitWebviewPanel
 import software.aws.toolkits.jetbrains.core.explorer.webview.shouldPromptToolkitReauth
 import software.aws.toolkits.jetbrains.core.help.HelpIds
-import software.aws.toolkits.jetbrains.core.notifications.NotificationActionList
-import software.aws.toolkits.jetbrains.core.notifications.ShowCriticalNotificationBannerListener
+import software.aws.toolkits.jetbrains.core.notifications.ProcessNotificationsBase
 import software.aws.toolkits.jetbrains.core.webview.BrowserState
 import software.aws.toolkits.jetbrains.utils.actions.OpenBrowserAction
 import software.aws.toolkits.jetbrains.utils.isTookitConnected
@@ -55,6 +54,12 @@ class AwsToolkitExplorerFactory : ToolWindowFactory, DumbAware {
         val mainPanel = BorderLayoutPanel()
         mainPanel.addToTop(notificationPanel)
         mainPanel.add(toolkitPanel)
+        val notifListener = ProcessNotificationsBase.getInstance(project)
+        notifListener.addListenerForNotification { title, message, followupActions ->
+            runInEdt {
+                notificationPanel.updateNotificationPanel(title, message, followupActions)
+            }
+        }
         toolWindow.helpId = HelpIds.EXPLORER_WINDOW.id
 
         if (toolWindow is ToolWindowEx) {
@@ -150,15 +155,6 @@ class AwsToolkitExplorerFactory : ToolWindowFactory, DumbAware {
                 }
             }
         )
-
-        project.messageBus.connect().subscribe(
-            ShowCriticalNotificationBannerListener.TOPIC,
-            object : ShowCriticalNotificationBannerListener {
-                override fun onReceiveEmergencyNotification(title: String, message: String, notificationActionList: List<NotificationActionList>) {
-                    notificationPanel.updateNotificationPanel(title, message, notificationActionList)
-                }
-            }
-        )
     }
 
     override fun init(toolWindow: ToolWindow) {