feat(url): improve fallback url handling

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

Author: setchy

src/renderer/utils/helpers.test.ts

@@ -16,6 +16,7 @@ import {
   generateGitHubWebUrl,
   generateNotificationReferrerId,
   getChevronDetails,
+  getDefaultURLForType,
   getPlatformFromHostname,
   isEnterpriseServerHost,
 } from './helpers';
@@ -416,7 +417,7 @@ describe('renderer/utils/helpers.ts', () => {
         );
       });
 
-      it('issues - defaults when no urls present in notification', async () => {
+      it('pull requests - defaults when no urls present in notification', async () => {
         const subject = {
           title: 'generate github web url unit tests',
           url: null,
@@ -482,6 +483,38 @@ describe('renderer/utils/helpers.ts', () => {
     });
   });
 
+  describe('getDefaultURLForType', () => {
+    let mockUrl: URL;
+
+    beforeEach(() => {
+      mockUrl = new URL('https://github.com/gitify-app/notifications-test');
+    });
+
+    it('discussions', () => {
+      expect(getDefaultURLForType(mockUrl, 'Discussion')).toEqual(
+        'https://github.com/gitify-app/notifications-test/discussions',
+      );
+    });
+
+    it('issues', () => {
+      expect(getDefaultURLForType(mockUrl, 'Issue')).toEqual(
+        'https://github.com/gitify-app/notifications-test/issues',
+      );
+    });
+
+    it('pull requests', () => {
+      expect(getDefaultURLForType(mockUrl, 'PullRequest')).toEqual(
+        'https://github.com/gitify-app/notifications-test/pulls',
+      );
+    });
+
+    it('default', () => {
+      expect(getDefaultURLForType(mockUrl, 'RepositoryInvitation')).toEqual(
+        'https://github.com/gitify-app/notifications-test',
+      );
+    });
+  });
+
   describe('getChevronDetails', () => {
     it('should return correct chevron details', () => {
       expect(getChevronDetails(true, true, 'account')).toEqual({

src/renderer/utils/helpers.ts

@@ -136,7 +136,7 @@ export async function generateGitHubWebUrl(
             notification.account.token,
           );
         } else {
-          url.href = defaultGitHubWebUrl(url, notification.subject.type);
+          url.href = getDefaultURLForType(url, notification.subject.type);
         }
     }
   } catch (err) {
@@ -147,7 +147,7 @@ export async function generateGitHubWebUrl(
       notification,
     );
 
-    url.href = defaultGitHubWebUrl(url, notification.subject.type);
+    url.href = getDefaultURLForType(url, notification.subject.type);
   }
 
   url.searchParams.set(
@@ -158,14 +158,14 @@ export async function generateGitHubWebUrl(
   return url.toString() as Link;
 }
 
-export function defaultGitHubWebUrl(url: URL, type: SubjectType) {
+export function getDefaultURLForType(url: URL, type: SubjectType) {
   switch (type) {
-    case 'Issue':
-      url.pathname += '/issues';
-      break;
     case 'Discussion':
       url.pathname += '/discussions';
       break;
+    case 'Issue':
+      url.pathname += '/issues';
+      break;
     case 'PullRequest':
       url.pathname += '/pulls';
       break;