case insensitive orgs, moved filter code, removed detailed notif warning

Author: vallieres

src/renderer/components/filters/OrganizationFilter.tsx

@@ -15,7 +15,6 @@ import {
 } from '../../utils/notifications/filters/organizations';
 import { Tooltip } from '../fields/Tooltip';
 import { Title } from '../primitives/Title';
-import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
 
 type InputToken = {
   id: number;
@@ -143,7 +142,6 @@ export const OrganizationFilter: FC = () => {
           tooltip={
             <Stack direction="vertical" gap="condensed">
               <Text>Filter notifications by organization.</Text>
-              <RequiresDetailedNotificationWarning />
             </Stack>
           }
         />

src/renderer/utils/notifications/filters/filter.test.ts

@@ -140,7 +140,15 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
 
         mockNotifications[0].repository.owner.login = 'microsoft';
         mockNotifications[1].repository.owner.login = 'github';
-        const result = filterDetailedNotifications(mockNotifications, {
+
+        // Apply base filtering first (where organization filtering now happens)
+        let result = filterBaseNotifications(mockNotifications, {
+          ...mockSettings,
+          filterIncludeOrganizations: ['microsoft'],
+        });
+
+        // Then apply detailed filtering
+        result = filterDetailedNotifications(result, {
           ...mockSettings,
           detailedNotifications: true,
           filterIncludeOrganizations: ['microsoft'],
@@ -167,7 +175,15 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
 
         mockNotifications[0].repository.owner.login = 'microsoft';
         mockNotifications[1].repository.owner.login = 'github';
-        const result = filterDetailedNotifications(mockNotifications, {
+
+        // Apply base filtering first (where organization filtering now happens)
+        let result = filterBaseNotifications(mockNotifications, {
+          ...mockSettings,
+          filterExcludeOrganizations: ['github'],
+        });
+
+        // Then apply detailed filtering
+        result = filterDetailedNotifications(result, {
           ...mockSettings,
           detailedNotifications: true,
           filterExcludeOrganizations: ['github'],

src/renderer/utils/notifications/filters/filter.ts

@@ -24,6 +24,23 @@ export function filterBaseNotifications(
   return notifications.filter((notification) => {
     let passesFilters = true;
 
+    // Organization filters should always apply, regardless of detailed notifications setting
+    if (hasIncludeOrganizationFilters(settings)) {
+      passesFilters =
+        passesFilters &&
+        settings.filterIncludeOrganizations.some((organization) =>
+          filterNotificationByOrganization(notification, organization),
+        );
+    }
+
+    if (hasExcludeOrganizationFilters(settings)) {
+      passesFilters =
+        passesFilters &&
+        !settings.filterExcludeOrganizations.some((organization) =>
+          filterNotificationByOrganization(notification, organization),
+        );
+    }
+
     if (subjectTypeFilter.hasFilters(settings)) {
       passesFilters =
         passesFilters &&
@@ -51,23 +68,6 @@ export function filterDetailedNotifications(
   return notifications.filter((notification) => {
     let passesFilters = true;
 
-    // Organization filters should always apply, regardless of detailed notifications setting
-    if (hasIncludeOrganizationFilters(settings)) {
-      passesFilters =
-        passesFilters &&
-        settings.filterIncludeOrganizations.some((organization) =>
-          filterNotificationByOrganization(notification, organization),
-        );
-    }
-
-    if (hasExcludeOrganizationFilters(settings)) {
-      passesFilters =
-        passesFilters &&
-        !settings.filterExcludeOrganizations.some((organization) =>
-          filterNotificationByOrganization(notification, organization),
-        );
-    }
-
     if (settings.detailedNotifications) {
       passesFilters =
         passesFilters && passesUserFilters(notification, settings);

src/renderer/utils/notifications/filters/organizations.ts

@@ -13,5 +13,8 @@ export function filterNotificationByOrganization(
   notification: Notification,
   organizationName: string,
 ): boolean {
-  return notification.repository.owner.login === organizationName;
+  return (
+    notification.repository.owner.login.toLowerCase() ===
+    organizationName.toLowerCase()
+  );
 }