fix: change filter logic to avoid early returning (#653)

Signed-off-by: Adam Setch <[email protected]>
setchy · Feb 20, 2025 · 91fe1c3 · 91fe1c3
1 parent 50302db
commit 91fe1c3
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/src/renderer/utils/notifications/filters/filter.ts b/src/renderer/utils/notifications/filters/filter.ts
@@ -15,31 +15,41 @@ export function filterNotifications(
   settings: SettingsState,
 ): AtlassifyNotification[] {
   return notifications.filter((notification) => {
+    let passesFilters = true;
+
     if (hasTimeSensitiveFilters(settings)) {
-      return settings.filterTimeSensitive.some((ts) =>
-        filterNotificationByTimeSensitive(notification, ts),
-      );
+      passesFilters =
+        passesFilters &&
+        settings.filterTimeSensitive.some((ts) =>
+          filterNotificationByTimeSensitive(notification, ts),
+        );
     }
 
     if (hasCategoryFilters(settings)) {
-      return settings.filterCategories.some((c) =>
-        filterNotificationByCategory(notification, c),
-      );
+      passesFilters =
+        passesFilters &&
+        settings.filterCategories.some((c) =>
+          filterNotificationByCategory(notification, c),
+        );
     }
 
     if (hasReadStateFilters(settings)) {
-      return settings.filterReadStates.some((rs) =>
-        filterNotificationByReadState(notification, rs),
-      );
+      passesFilters =
+        passesFilters &&
+        settings.filterReadStates.some((rs) =>
+          filterNotificationByReadState(notification, rs),
+        );
     }
 
     if (hasProductFilters(settings)) {
-      return settings.filterProducts.some((p) =>
-        filterNotificationByProduct(notification, p),
-      );
+      passesFilters =
+        passesFilters &&
+        settings.filterProducts.some((p) =>
+          filterNotificationByProduct(notification, p),
+        );
     }
 
-    return true;
+    return passesFilters;
   });
 }