refactor simplify

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/renderer/__mocks__/notifications-mocks.ts

@@ -1,4 +1,4 @@
-import type { AccountNotifications } from '../types';
+import type { AccountNotifications, GitifyError } from '../types';
 import type { StateType, Subject, SubjectType } from '../typesGitHub';
 import {
   mockEnterpriseNotifications,
@@ -44,3 +44,11 @@ export function createSubjectMock(mocks: {
     latest_comment_url: null,
   };
 }
+
+export function mockAccountWithError(error: GitifyError): AccountNotifications {
+  return {
+    account: mockGitHubCloudAccount,
+    notifications: [],
+    error,
+  };
+}

src/renderer/context/App.test.tsx

@@ -9,8 +9,8 @@ import { mockSingleNotification } from '../utils/api/__mocks__/response-mocks';
 import * as apiRequests from '../utils/api/request';
 import * as comms from '../utils/comms';
 import * as notifications from '../utils/notifications/notifications';
-import * as tray from '../utils/notifications/tray';
 import * as storage from '../utils/storage';
+import * as tray from '../utils/tray';
 import { AppContext, AppProvider } from './App';
 import { defaultSettings } from './defaults';
 

src/renderer/context/App.tsx

@@ -49,14 +49,14 @@ import {
   setUseUnreadActiveIcon,
 } from '../utils/comms';
 import { getUnreadNotificationCount } from '../utils/notifications/notifications';
-import { setTrayIconColorAndTitle } from '../utils/notifications/tray';
 import { clearState, loadState, saveState } from '../utils/storage';
 import {
   DEFAULT_DAY_COLOR_SCHEME,
   DEFAULT_NIGHT_COLOR_SCHEME,
   mapThemeModeToColorMode,
   mapThemeModeToColorScheme,
 } from '../utils/theme';
+import { setTrayIconColorAndTitle } from '../utils/tray';
 import { zoomPercentageToLevel } from '../utils/zoom';
 import { defaultAuth, defaultFilters, defaultSettings } from './defaults';
 

src/renderer/hooks/useNotifications.ts

@@ -14,6 +14,10 @@ import {
   markNotificationThreadAsRead,
 } from '../utils/api/client';
 import { updateTrayColor } from '../utils/comms';
+import {
+  areAllAccountErrorsSame,
+  doesAllAccountsHaveErrors,
+} from '../utils/errors';
 import { isMarkAsDoneFeatureSupported } from '../utils/features';
 import { rendererLogError } from '../utils/logger';
 import { raiseNativeNotification } from '../utils/notifications/native';
@@ -78,24 +82,14 @@ export const useNotifications = (): NotificationsState => {
 
       // Set Global Error if all accounts have the same error
       const allAccountsHaveErrors =
-        fetchedNotifications.length > 0 &&
-        fetchedNotifications.every((account) => {
-          return account.error !== null;
-        });
-
-      let accountErrorsAreAllSame = true;
-      const accountError = fetchedNotifications[0]?.error;
-
-      for (const fetchedNotification of fetchedNotifications) {
-        if (accountError !== fetchedNotification.error) {
-          accountErrorsAreAllSame = false;
-          break;
-        }
-      }
+        doesAllAccountsHaveErrors(fetchedNotifications);
+      const allAccountErrorsAreSame =
+        areAllAccountErrorsSame(fetchedNotifications);
 
       if (allAccountsHaveErrors) {
+        const accountError = fetchedNotifications[0].error;
         setStatus('error');
-        setGlobalError(accountErrorsAreAllSame ? accountError : null);
+        setGlobalError(allAccountErrorsAreSame ? accountError : null);
         updateTrayColor(-1);
         return;
       }

src/renderer/utils/errors.test.ts

@@ -0,0 +1,67 @@
+import { mockAccountWithError } from '../__mocks__/notifications-mocks';
+import type { AccountNotifications } from '../types';
+import {
+  areAllAccountErrorsSame,
+  doesAllAccountsHaveErrors,
+  Errors,
+} from './errors';
+
+describe('renderer/utils/errors.ts', () => {
+  describe('doesAllAccountsHaveErrors', () => {
+    it('returns false for empty list', () => {
+      expect(doesAllAccountsHaveErrors([])).toBe(false);
+    });
+
+    it('returns false when some accounts have no error', () => {
+      const items: AccountNotifications[] = [
+        mockAccountWithError(Errors.NETWORK),
+        mockAccountWithError(null),
+      ];
+
+      expect(doesAllAccountsHaveErrors(items)).toBe(false);
+    });
+
+    it('returns true when every account has an error', () => {
+      const items: AccountNotifications[] = [
+        mockAccountWithError(Errors.NETWORK),
+        mockAccountWithError(Errors.RATE_LIMITED),
+      ];
+
+      expect(doesAllAccountsHaveErrors(items)).toBe(true);
+    });
+  });
+
+  describe('areAllAccountErrorsSame', () => {
+    it('returns true for empty list', () => {
+      expect(areAllAccountErrorsSame([])).toBe(true);
+    });
+
+    it('returns true when all errors are identical object reference', () => {
+      const err = Errors.NETWORK;
+      const items: AccountNotifications[] = [
+        mockAccountWithError(err),
+        mockAccountWithError(err),
+      ];
+
+      expect(areAllAccountErrorsSame(items)).toBe(true);
+    });
+
+    it('returns false when errors differ', () => {
+      const items: AccountNotifications[] = [
+        mockAccountWithError(Errors.NETWORK),
+        mockAccountWithError(Errors.RATE_LIMITED),
+      ];
+
+      expect(areAllAccountErrorsSame(items)).toBe(false);
+    });
+
+    it('returns false when one account has null error', () => {
+      const items: AccountNotifications[] = [
+        mockAccountWithError(Errors.NETWORK),
+        mockAccountWithError(null),
+      ];
+
+      expect(areAllAccountErrorsSame(items)).toBe(false);
+    });
+  });
+});

src/renderer/utils/errors.ts

@@ -1,4 +1,4 @@
-import type { ErrorType, GitifyError } from '../types';
+import type { AccountNotifications, ErrorType, GitifyError } from '../types';
 
 export const Errors: Record<ErrorType, GitifyError> = {
   BAD_CREDENTIALS: {
@@ -30,3 +30,27 @@ export const Errors: Record<ErrorType, GitifyError> = {
     emojis: ['🤔', '🥲', '😳', '🫠', '🙃', '🙈'],
   },
 };
+
+/**
+ * Check if all accounts have errors
+ */
+export function doesAllAccountsHaveErrors(
+  notifications: AccountNotifications[],
+) {
+  return (
+    notifications.length > 0 &&
+    notifications.every((account) => account.error !== null)
+  );
+}
+
+/**
+ * Check if all account errors are the same
+ */
+export function areAllAccountErrorsSame(notifications: AccountNotifications[]) {
+  if (notifications.length === 0) {
+    return true;
+  }
+
+  const firstError = notifications[0].error;
+  return notifications.every((account) => account.error === firstError);
+}

…enderer/utils/notifications/tray.test.ts src/renderer/utils/tray.test.tssrc/renderer/utils/notifications/tray.test.ts renamed to src/renderer/utils/tray.test.ts src/renderer/utils/notifications/tray.test.ts renamed to src/renderer/utils/tray.test.ts

@@ -1,8 +1,8 @@
-import { mockSettings } from '../../__mocks__/state-mocks';
-import * as comms from '../comms';
+import { mockSettings } from '../__mocks__/state-mocks';
+import * as comms from './comms';
 import { setTrayIconColorAndTitle } from './tray';
 
-describe('renderer/utils/notifications/tray.ts', () => {
+describe('renderer/utils/tray.ts', () => {
   const updateTrayColorSpy = jest.spyOn(comms, 'updateTrayColor');
   const updateTrayTitleSpy = jest.spyOn(comms, 'updateTrayTitle');
 

src/renderer/utils/notifications/tray.ts src/renderer/utils/tray.tssrc/renderer/utils/notifications/tray.ts renamed to src/renderer/utils/tray.ts

@@ -1,5 +1,5 @@
-import type { SettingsState } from '../../types';
-import { updateTrayColor, updateTrayTitle } from '../comms';
+import type { SettingsState } from '../types';
+import { updateTrayColor, updateTrayTitle } from './comms';
 
 /**
  * Sets the tray icon color and title based on the number of unread notifications.