refactor: handler enhancements

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

Author: setchy

src/renderer/components/notifications/NotificationRow.tsx

@@ -70,7 +70,6 @@ export const NotificationRow: FC<INotificationRow> = ({
   };
 
   const handler = createNotificationHandler(notification);
-
   const NotificationIcon = handler.iconType(notification.subject);
   const iconColor = handler.iconColor(notification.subject);
   const notificationType = handler.formattedNotificationType(notification);

src/renderer/utils/helpers.test.ts

@@ -16,7 +16,6 @@ import {
 } from './api/__mocks__/response-mocks';
 import * as apiRequests from './api/request';
 import {
-  formatForDisplay,
   generateGitHubWebUrl,
   generateNotificationReferrerId,
   getChevronDetails,
@@ -517,22 +516,6 @@ describe('renderer/utils/helpers.ts', () => {
     });
   });
 
-  describe('formatting', () => {
-    it('formatForDisplay', () => {
-      expect(formatForDisplay(null)).toBe('');
-      expect(formatForDisplay([])).toBe('');
-      expect(formatForDisplay(['open', 'PullRequest'])).toBe(
-        'Open Pull Request',
-      );
-      expect(formatForDisplay(['OUTDATED', 'Discussion'])).toBe(
-        'Outdated Discussion',
-      );
-      expect(formatForDisplay(['not_planned', 'Issue'])).toBe(
-        'Not Planned Issue',
-      );
-    });
-  });
-
   describe('getChevronDetails', () => {
     it('should return correct chevron details', () => {
       expect(getChevronDetails(true, true, 'account')).toEqual({

src/renderer/utils/helpers.ts

@@ -171,21 +171,6 @@ export async function generateGitHubWebUrl(
   return url.toString() as Link;
 }
 
-export function formatForDisplay(text: string[]): string {
-  if (!text) {
-    return '';
-  }
-
-  return text
-    .join(' ')
-    .replace(/([a-z])([A-Z])/g, '$1 $2') // Add space between lowercase character followed by an uppercase character
-    .replace(/_/g, ' ') // Replace underscores with spaces
-    .replace(/\w+/g, (word) => {
-      // Convert to proper case (capitalize first letter of each word)
-      return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
-    });
-}
-
 export function getChevronDetails(
   hasNotifications: boolean,
   isVisible: boolean,

src/renderer/utils/notifications/handlers/default.ts

@@ -11,8 +11,8 @@ import type {
   Subject,
   SubjectType,
 } from '../../../typesGitHub';
-import { formatForDisplay } from '../../helpers';
 import type { NotificationTypeHandler } from './types';
+import { formatForDisplay } from './utils';
 
 export class DefaultHandler implements NotificationTypeHandler {
   type?: SubjectType;

src/renderer/utils/notifications/handlers/utils.test.ts

@@ -1,5 +1,5 @@
 import { partialMockUser } from '../../../__mocks__/partial-mocks';
-import { getSubjectUser } from './utils';
+import { formatForDisplay, getSubjectUser } from './utils';
 
 describe('renderer/utils/notifications/handlers/utils.ts', () => {
   describe('getSubjectUser', () => {
@@ -33,4 +33,16 @@ describe('renderer/utils/notifications/handlers/utils.ts', () => {
       });
     });
   });
+
+  it('formatForDisplay', () => {
+    expect(formatForDisplay(null)).toBe('');
+    expect(formatForDisplay([])).toBe('');
+    expect(formatForDisplay(['open', 'PullRequest'])).toBe('Open Pull Request');
+    expect(formatForDisplay(['OUTDATED', 'Discussion'])).toBe(
+      'Outdated Discussion',
+    );
+    expect(formatForDisplay(['not_planned', 'Issue'])).toBe(
+      'Not Planned Issue',
+    );
+  });
 });

src/renderer/utils/notifications/handlers/utils.ts

@@ -23,3 +23,18 @@ export function getSubjectUser(users: User[]): SubjectUser {
 
   return subjectUser;
 }
+
+export function formatForDisplay(text: string[]): string {
+  if (!text) {
+    return '';
+  }
+
+  return text
+    .join(' ')
+    .replace(/([a-z])([A-Z])/g, '$1 $2') // Add space between lowercase character followed by an uppercase character
+    .replace(/_/g, ' ') // Replace underscores with spaces
+    .replace(/\w+/g, (word) => {
+      // Convert to proper case (capitalize first letter of each word)
+      return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
+    });
+}