refactor simplify

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

Author: setchy

src/renderer/context/App.test.tsx

@@ -9,6 +9,7 @@ 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 { AppContext, AppProvider } from './App';
 import { defaultSettings } from './defaults';
@@ -39,7 +40,7 @@ describe('renderer/context/App.tsx', () => {
 
   describe('notification methods', () => {
     const setTrayIconColorAndTitleMock = jest
-      .spyOn(notifications, 'setTrayIconColorAndTitle')
+      .spyOn(tray, 'setTrayIconColorAndTitle')
       .mockImplementation(jest.fn());
 
     jest

src/renderer/context/App.tsx

@@ -48,10 +48,8 @@ import {
   setUseAlternateIdleIcon,
   setUseUnreadActiveIcon,
 } from '../utils/comms';
-import {
-  getUnreadNotificationCount,
-  setTrayIconColorAndTitle,
-} from '../utils/notifications/notifications';
+import { getUnreadNotificationCount } from '../utils/notifications/notifications';
+import { setTrayIconColorAndTitle } from '../utils/notifications/tray';
 import { clearState, loadState, saveState } from '../utils/storage';
 import {
   DEFAULT_DAY_COLOR_SCHEME,

src/renderer/hooks/useNotifications.test.ts

@@ -370,7 +370,6 @@ describe('renderer/hooks/useNotifications.ts', () => {
       });
 
       expect(result.current.notifications.length).toBe(0);
-      expect(mockSingleNotification.unread).toBeFalsy();
     });
 
     it('should mark notifications as read with failure', async () => {
@@ -414,7 +413,6 @@ describe('renderer/hooks/useNotifications.ts', () => {
       });
 
       expect(result.current.notifications.length).toBe(0);
-      expect(mockSingleNotification.unread).toBeFalsy();
     });
 
     it('should mark notifications as done with failure', async () => {

src/renderer/hooks/useNotifications.ts

@@ -16,15 +16,11 @@ import {
 import { updateTrayColor } from '../utils/comms';
 import { isMarkAsDoneFeatureSupported } from '../utils/features';
 import { rendererLogError } from '../utils/logger';
-import {
-  raiseNativeNotification,
-  raiseSoundNotification,
-} from '../utils/notifications/native';
-import {
-  getAllNotifications,
-  getNewNotifications,
-} from '../utils/notifications/notifications';
+import { raiseNativeNotification } from '../utils/notifications/native';
+import { getAllNotifications } from '../utils/notifications/notifications';
 import { removeNotifications } from '../utils/notifications/remove';
+import { raiseSoundNotification } from '../utils/notifications/sound';
+import { getNewNotifications } from '../utils/notifications/utils';
 
 interface NotificationsState {
   status: Status;

src/renderer/utils/notifications/native.ts

@@ -24,11 +24,3 @@ export const raiseNativeNotification = async (
 
   return window.gitify.raiseNativeNotification(title, body, url);
 };
-
-export const raiseSoundNotification = async (volume: number) => {
-  const path = await window.gitify.notificationSoundPath();
-
-  const audio = new Audio(path);
-  audio.volume = volume;
-  audio.play();
-};

src/renderer/utils/notifications/notifications.ts

@@ -6,8 +6,6 @@ import type {
 import type { GitifySubject, Notification } from '../../typesGitHub';
 import { listNotificationsForAuthenticatedUser } from '../api/client';
 import { determineFailureType } from '../api/errors';
-import { getAccountUUID } from '../auth/utils';
-import { updateTrayColor, updateTrayTitle } from '../comms';
 import { rendererLogError, rendererLogWarn } from '../logger';
 import {
   filterBaseNotifications,
@@ -16,27 +14,6 @@ import {
 import { getFlattenedNotificationsByRepo } from './group';
 import { createNotificationHandler } from './handlers';
 
-/**
- * Sets the tray icon color and title based on the number of unread notifications.
- *
- * @param notifications
- * @param settings
- */
-export function setTrayIconColorAndTitle(
-  notifications: AccountNotifications[],
-  settings: SettingsState,
-) {
-  const totalUnreadNotifications = getUnreadNotificationCount(notifications);
-
-  let title = '';
-  if (settings.showNotificationsCountInTray && totalUnreadNotifications > 0) {
-    title = totalUnreadNotifications.toString();
-  }
-
-  updateTrayColor(totalUnreadNotifications);
-  updateTrayTitle(title);
-}
-
 /**
  * Get the count of unread notifications.
  *
@@ -206,49 +183,3 @@ export function stabilizeNotificationsOrder(
     n.order = orderIndex++;
   }
 }
-
-/**
- * Find the account index for a given notification
- *
- * @param allNotifications - The list of all account notifications
- * @param notification - The notification to find the account index for
- * @returns The index of the account in the allNotifications array
- */
-export const findAccountIndex = (
-  allNotifications: AccountNotifications[],
-  notification: Notification,
-): number => {
-  return allNotifications.findIndex(
-    (accountNotifications) =>
-      getAccountUUID(accountNotifications.account) ===
-      getAccountUUID(notification.account),
-  );
-};
-
-/**
- * Find notifications that exist in newNotifications but not in previousNotifications
- */
-export const getNewNotifications = (
-  previousNotifications: AccountNotifications[],
-  newNotifications: AccountNotifications[],
-): Notification[] => {
-  return newNotifications.flatMap((accountNotifications) => {
-    const accountPreviousNotifications = previousNotifications.find(
-      (item) =>
-        getAccountUUID(item.account) ===
-        getAccountUUID(accountNotifications.account),
-    );
-
-    if (!accountPreviousNotifications) {
-      return accountNotifications.notifications;
-    }
-
-    const previousIds = new Set(
-      accountPreviousNotifications.notifications.map((item) => item.id),
-    );
-
-    return accountNotifications.notifications.filter(
-      (notification) => !previousIds.has(notification.id),
-    );
-  });
-};

src/renderer/utils/notifications/remove.ts

@@ -1,6 +1,6 @@
 import type { AccountNotifications, SettingsState } from '../../types';
 import type { Notification } from '../../typesGitHub';
-import { findAccountIndex } from './notifications';
+import { findAccountIndex } from './utils';
 
 export function removeNotifications(
   settings: SettingsState,
@@ -34,12 +34,14 @@ export function removeNotifications(
     return allNotifications;
   }
 
-  const updatedNotifications = [...allNotifications];
-  updatedNotifications[accountIndex] = {
-    ...updatedNotifications[accountIndex],
-    notifications: updatedNotifications[accountIndex].notifications.filter(
-      (notification) => !removeIds.has(notification.id),
-    ),
-  };
-  return updatedNotifications;
+  return allNotifications.map((account, index) =>
+    index === accountIndex
+      ? {
+          ...account,
+          notifications: account.notifications.filter(
+            (notification) => !removeIds.has(notification.id),
+          ),
+        }
+      : account,
+  );
 }

src/renderer/utils/notifications/sound.ts

@@ -0,0 +1,7 @@
+export const raiseSoundNotification = async (volume: number) => {
+  const path = await window.gitify.notificationSoundPath();
+
+  const audio = new Audio(path);
+  audio.volume = volume;
+  audio.play();
+};

src/renderer/utils/notifications/tray.ts

@@ -0,0 +1,24 @@
+import type { AccountNotifications, SettingsState } from '../../types';
+import { updateTrayColor, updateTrayTitle } from '../comms';
+import { getUnreadNotificationCount } from './notifications';
+
+/**
+ * Sets the tray icon color and title based on the number of unread notifications.
+ *
+ * @param notifications
+ * @param settings
+ */
+export function setTrayIconColorAndTitle(
+  notifications: AccountNotifications[],
+  settings: SettingsState,
+) {
+  const totalUnreadNotifications = getUnreadNotificationCount(notifications);
+
+  let title = '';
+  if (settings.showNotificationsCountInTray && totalUnreadNotifications > 0) {
+    title = totalUnreadNotifications.toString();
+  }
+
+  updateTrayColor(totalUnreadNotifications);
+  updateTrayTitle(title);
+}

src/renderer/utils/notifications/utils.ts

@@ -0,0 +1,49 @@
+import type { AccountNotifications } from '../../types';
+import type { Notification } from '../../typesGitHub';
+import { getAccountUUID } from '../auth/utils';
+
+/**
+ * Find the account index for a given notification
+ *
+ * @param allNotifications - The list of all account notifications
+ * @param notification - The notification to find the account index for
+ * @returns The index of the account in the allNotifications array
+ */
+export const findAccountIndex = (
+  allNotifications: AccountNotifications[],
+  notification: Notification,
+): number => {
+  return allNotifications.findIndex(
+    (accountNotifications) =>
+      getAccountUUID(accountNotifications.account) ===
+      getAccountUUID(notification.account),
+  );
+};
+
+/**
+ * Find notifications that exist in newNotifications but not in previousNotifications
+ */
+export const getNewNotifications = (
+  previousNotifications: AccountNotifications[],
+  newNotifications: AccountNotifications[],
+): Notification[] => {
+  return newNotifications.flatMap((accountNotifications) => {
+    const accountPreviousNotifications = previousNotifications.find(
+      (item) =>
+        getAccountUUID(item.account) ===
+        getAccountUUID(accountNotifications.account),
+    );
+
+    if (!accountPreviousNotifications) {
+      return accountNotifications.notifications;
+    }
+
+    const previousIds = new Set(
+      accountPreviousNotifications.notifications.map((item) => item.id),
+    );
+
+    return accountNotifications.notifications.filter(
+      (notification) => !previousIds.has(notification.id),
+    );
+  });
+};