Notification dismissal state tracking

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

@@ -21,7 +21,8 @@ class NotificationPanel : BorderLayoutPanel() {
     }
 
     private fun removeNotificationPanel(notificationId: String) = runInEdt {
-        ProcessNotificationsBase.showBannerNotification.remove(notificationId) // TODO: add id to dismissed notification list
+        ProcessNotificationsBase.showBannerNotification.remove(notificationId)
+        NotificationDismissalState.getInstance().dismissNotification(notificationId)
         wrapper.removeAll()
     }
 

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

@@ -0,0 +1,62 @@
+// 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.openapi.application.ApplicationManager
+import com.intellij.openapi.components.PersistentStateComponent
+import com.intellij.openapi.components.State
+import com.intellij.openapi.components.Storage
+
+@State(name = "notificationDismissals", storages = [Storage("aws.xml")])
+class NotificationDismissalState : PersistentStateComponent<NotificationDismissalConfiguration> {
+    private var state = NotificationDismissalConfiguration()
+
+    override fun getState(): NotificationDismissalConfiguration = state
+
+    override fun loadState(state: NotificationDismissalConfiguration) {
+        this.state = state
+    }
+
+    fun isDismissed(notificationId: String): Boolean =
+        state.dismissedNotificationIds.contains(notificationId)
+
+    fun dismissNotification(notificationId: String) {
+        state.dismissedNotificationIds.add(notificationId)
+    }
+
+    companion object {
+        fun getInstance(): NotificationDismissalState =
+            ApplicationManager.getApplication().getService(NotificationDismissalState::class.java)
+    }
+}
+
+data class NotificationDismissalConfiguration(
+    var dismissedNotificationIds: MutableSet<String> = mutableSetOf(),
+)
+
+@State(name = "notificationEtag", storages = [Storage("aws.xml")])
+class NotificationEtagState : PersistentStateComponent<NotificationEtagConfiguration> {
+    private var state = NotificationEtagConfiguration()
+
+    override fun getState(): NotificationEtagConfiguration = state
+
+    override fun loadState(state: NotificationEtagConfiguration) {
+        this.state = state
+    }
+
+    var etag: String?
+        get() = state.etag
+        set(value) {
+            state.etag = value
+        }
+
+    companion object {
+        fun getInstance(): NotificationEtagState =
+            ApplicationManager.getApplication().getService(NotificationEtagState::class.java)
+    }
+}
+
+data class NotificationEtagConfiguration(
+    var etag: String? = null,
+)

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

@@ -6,10 +6,7 @@ package software.aws.toolkits.jetbrains.core.notifications
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.Service
-import com.intellij.openapi.components.State
-import com.intellij.openapi.components.Storage
 import com.intellij.util.Alarm
 import com.intellij.util.AlarmFactory
 import com.intellij.util.io.HttpRequests
@@ -63,32 +60,6 @@ object NotificationEndpoint {
     private const val DEFAULT_ENDPOINT = "" // TODO: Replace with actual endpoint
 }
 
-@State(name = "notificationEtag", storages = [Storage("aws.xml")])
-class NotificationEtagState : PersistentStateComponent<NotificationEtagConfiguration> {
-    private var state = NotificationEtagConfiguration()
-
-    override fun getState(): NotificationEtagConfiguration = state
-
-    override fun loadState(state: NotificationEtagConfiguration) {
-        this.state = state
-    }
-
-    var etag: String?
-        get() = state.etag
-        set(value) {
-            state.etag = value
-        }
-
-    companion object {
-        fun getInstance(): NotificationEtagState =
-            ApplicationManager.getApplication().getService(NotificationEtagState::class.java)
-    }
-}
-
-data class NotificationEtagConfiguration(
-    var etag: String? = null,
-)
-
 @Service(Service.Level.APP)
 internal final class NotificationPollingService : Disposable {
     private val isFirstPoll = AtomicBoolean(true)

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

@@ -14,7 +14,7 @@ internal class NotificationServiceInitializer : ProjectActivity {
     override suspend fun execute(project: Project) {
         if (initialized.compareAndSet(false, true)) {
             val service = NotificationPollingService.getInstance()
-            ProcessNotificationsBase()
+            ProcessNotificationsBase(project)
             service.startPolling()
         }
     }

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

@@ -15,16 +15,20 @@
 import software.aws.toolkits.core.utils.inputStream
 import software.aws.toolkits.jetbrains.utils.notifyStickyWithData
 import java.nio.file.Paths
+import java.util.concurrent.atomic.AtomicBoolean
 
 object NotificationMapperUtil {
     val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
 }
 
 @Service(Service.Level.PROJECT)
-class ProcessNotificationsBase {
+class ProcessNotificationsBase(
+    private val project: Project,
+) {
     private val notifListener = mutableListOf<NotifListener>()
+    private var isStartup: AtomicBoolean = AtomicBoolean(true)
     init {
-        NotificationPollingService.getInstance().addObserver {  ->
+        NotificationPollingService.getInstance().addObserver {
             retrieveStartupAndEmergencyNotifications()
         }
     }
@@ -39,11 +43,30 @@
     }
 
     fun retrieveStartupAndEmergencyNotifications() {
-        // TODO: separates notifications into startup and emergency
-        // iterates through the 2 lists and processes each notification(if it isn't dismissed)
+        val notifications = getNotificationsFromFile()
+
+        notifications?.let { notificationsList ->
+            val (startupNotifications, emergencyNotifications) = notificationsList.notifications
+                ?.partition { notification ->
+                    notification.schedule.type.equals("StartUp", ignoreCase = true)
+                }
+                ?: Pair(emptyList(), emptyList())
+
+            val dismissalState = NotificationDismissalState.getInstance()
+            val startupList = if (isStartup.compareAndSet(true, false)) {
+                startupNotifications
+            } else {
+                emptyList()
+            }
+
+            val combinedNotifications = startupList.plus(emergencyNotifications)
+            val activeNotifications = combinedNotifications.filter { !dismissalState.isDismissed(it.id) }
+
+            activeNotifications.forEach { processNotification(project, it) }
+        }
     }
 
     fun processNotification(project: Project, notificationData: NotificationData) {
         val shouldShow = RulesEngine.displayNotification(project, notificationData)
         if (shouldShow) {
             val notificationContent = notificationData.content.locale

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

@@ -17,6 +17,7 @@ import com.intellij.ui.ScrollPaneFactory
 import org.slf4j.LoggerFactory
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.help.HelpIds
+import software.aws.toolkits.jetbrains.core.notifications.NotificationDismissalState
 import software.aws.toolkits.jetbrains.core.notifications.ProcessNotificationsBase
 import software.aws.toolkits.resources.AwsCoreBundle
 import javax.swing.JLabel
@@ -67,7 +68,7 @@ fun notifyStickyWithData(
             object : AnAction("Dismiss") {
                 override fun actionPerformed(e: AnActionEvent) {
                     ProcessNotificationsBase.showBannerNotification.remove(id)
-                    // TODO: add id to dismissed notification list
+                    NotificationDismissalState.getInstance().dismissNotification(id)
                 }
             }
         )

plugins/core/src/main/resources/META-INF/plugin.xml

@@ -21,6 +21,7 @@
     <extensions defaultExtensionNs="com.intellij">
         <!-- each plugin needs its own instance of these -->
         <applicationService serviceImplementation="software.aws.toolkits.jetbrains.core.notifications.NotificationEtagState"/>
+        <applicationService serviceImplementation="software.aws.toolkits.jetbrains.core.notifications.NotificationDismissalState"/>
         <applicationService serviceImplementation="migration.software.aws.toolkits.jetbrains.core.coroutines.PluginCoroutineScopeTracker"/>
         <projectService serviceImplementation="migration.software.aws.toolkits.jetbrains.core.coroutines.PluginCoroutineScopeTracker"/>
         <postStartupActivity implementation = "software.aws.toolkits.jetbrains.core.notifications.NotificationServiceInitializer"/>