Only send notification if action or card is not hidden

Author: almenscorner

SupportCompanion/Services/NotificationService.swift

@@ -158,9 +158,15 @@ class BadgeManager {
                 let prefs = AppStateManager.shared.preferences
                 let hasPendingUpdates = !prefs.hiddenCards.contains("PendingAppUpdates") && AppStateManager.shared.pendingUpdatesCount > 0
                 let hasSoftwareUpdates = !prefs.hiddenActions.contains("SoftwareUpdates") && AppStateManager.shared.systemUpdateCache.count > 0
-                NSApplication.shared.dockTile.showsApplicationBadge = hasPendingUpdates || hasSoftwareUpdates
-                NSApplication.shared.dockTile.badgeLabel = nil
-                NSApplication.shared.dockTile.badgeLabel = String(self.badgeCount)
+                if hasPendingUpdates || hasSoftwareUpdates {
+                    NSApplication.shared.dockTile.showsApplicationBadge = true
+                    NSApplication.shared.dockTile.badgeLabel = nil
+                    NSApplication.shared.dockTile.badgeLabel = String(self.badgeCount)
+                } else {
+                    NSApplication.shared.dockTile.showsApplicationBadge = false
+                    NSApplication.shared.dockTile.badgeLabel = nil
+                }
+
             } else {
                 NSApplication.shared.dockTile.badgeLabel = nil
                 NSApplication.shared.dockTile.showsApplicationBadge = false

SupportCompanion/ViewModels/PendingIntuneUpdatesManager.swift

@@ -90,7 +90,7 @@ class PendingIntuneUpdatesManager {
                     self.appState.pendingUpdatesCount = updates
                 }
             }
-            if updates > 0 {
+            if updates > 0 && !appState.preferences.hiddenCards.contains("PendingAppUpdates") {
                 NotificationService(appState: appState).sendNotification(
                     message: appState.preferences.appUpdateNotificationMessage,
                     buttonText: appState.preferences.appUpdateNotificationButtonText,

SupportCompanion/ViewModels/PendingMunkiUpdatesManager.swift

@@ -120,7 +120,7 @@ class PendingMunkiUpdatesManager {
                     self.appState.pendingUpdatesCount = updates
                 }
             }
-            if updates > 0 {
+            if updates > 0 && !appState.preferences.hiddenCards.contains("PendingAppUpdates") {
                 NotificationService(appState: appState).sendNotification(
                     message: appState.preferences.appUpdateNotificationMessage,
                     buttonText: appState.preferences.appUpdateNotificationButtonText,

SupportCompanion/ViewModels/SystemUpdatesManager.swift

@@ -38,7 +38,7 @@ class SystemUpdatesManager: ObservableObject {
         monitorTask = Task {
             while !Task.isCancelled {
                 do {
-                    let result = await ActionHelpers.getSystemUpdateStatus(sendNotification: true)
+                    let result = await ActionHelpers.getSystemUpdateStatus(sendNotification: !appState.preferences.hiddenActions.contains("SoftwareUpdates"))
                     switch result {
                     case .success(let (count, updates)):
                         if count != self.previousUpdateCount {