feat(api): codegen for discussions

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

Author: setchy

src/renderer/utils/helpers.test.ts

@@ -488,8 +488,8 @@ describe('renderer/utils/helpers.ts', () => {
       });
     });
 
-    describe('defaults to repository url', () => {
-      it('defaults when no urls present in notification', async () => {
+    describe('defaults web urls', () => {
+      it('issues - defaults when no urls present in notification', async () => {
         const subject = {
           title: 'generate github web url unit tests',
           url: null,
@@ -504,7 +504,64 @@ describe('renderer/utils/helpers.ts', () => {
 
         expect(apiRequestAuthSpy).toHaveBeenCalledTimes(0);
         expect(result).toBe(
-          `${mockSingleNotification.repository.html_url}?${mockNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/issues?${mockNotificationReferrer}`,
+        );
+      });
+
+      it('discussion - defaults when no urls present in notification', async () => {
+        const subject = {
+          title: 'generate github web url unit tests',
+          url: null,
+          latest_comment_url: null,
+          type: 'Discussion' as SubjectType,
+        };
+
+        const result = await generateGitHubWebUrl({
+          ...mockSingleNotification,
+          subject: subject,
+        });
+
+        expect(apiRequestAuthSpy).toHaveBeenCalledTimes(0);
+        expect(result).toBe(
+          `https://github.com/gitify-app/notifications-test/discussions?${mockNotificationReferrer}`,
+        );
+      });
+
+      it('issues - defaults when no urls present in notification', async () => {
+        const subject = {
+          title: 'generate github web url unit tests',
+          url: null,
+          latest_comment_url: null,
+          type: 'PullRequest' as SubjectType,
+        };
+
+        const result = await generateGitHubWebUrl({
+          ...mockSingleNotification,
+          subject: subject,
+        });
+
+        expect(apiRequestAuthSpy).toHaveBeenCalledTimes(0);
+        expect(result).toBe(
+          `https://github.com/gitify-app/notifications-test/pulls?${mockNotificationReferrer}`,
+        );
+      });
+
+      it('other - defaults when no urls present in notification', async () => {
+        const subject = {
+          title: 'generate github web url unit tests',
+          url: null,
+          latest_comment_url: null,
+          type: 'Commit' as SubjectType,
+        };
+
+        const result = await generateGitHubWebUrl({
+          ...mockSingleNotification,
+          subject: subject,
+        });
+
+        expect(apiRequestAuthSpy).toHaveBeenCalledTimes(0);
+        expect(result).toBe(
+          `https://github.com/gitify-app/notifications-test?${mockNotificationReferrer}`,
         );
       });
 
@@ -521,9 +578,7 @@ describe('renderer/utils/helpers.ts', () => {
           type: 'Issue' as SubjectType,
         };
 
-        const mockError = new Error('Test error');
-
-        apiRequestAuthSpy.mockRejectedValue(mockError);
+        apiRequestAuthSpy.mockRejectedValue(new Error('Test error'));
 
         const result = await generateGitHubWebUrl({
           ...mockSingleNotification,
@@ -537,7 +592,7 @@ describe('renderer/utils/helpers.ts', () => {
           mockPersonalAccessTokenAccount.token,
         );
         expect(result).toBe(
-          `https://github.com/gitify-app/notifications-test?${mockNotificationReferrer}`,
+          `https://github.com/gitify-app/notifications-test/issues?${mockNotificationReferrer}`,
         );
         expect(rendererLogErrorSpy).toHaveBeenCalledTimes(2);
       });

src/renderer/utils/helpers.ts

@@ -6,7 +6,7 @@ import {
 
 import { Constants } from '../constants';
 import type { Chevron, Hostname, Link } from '../types';
-import type { Notification } from '../typesGitHub';
+import type { Notification, SubjectType } from '../typesGitHub';
 import { fetchDiscussionByNumber, getHtmlUrl } from './api/client';
 import type { PlatformType } from './auth/types';
 import { rendererLogError } from './logger';
@@ -138,8 +138,9 @@ export async function generateGitHubWebUrl(
             notification.subject.url,
             notification.account.token,
           );
+        } else {
+          url.href = defaultGitHubWebUrl(url, notification.subject.type);
         }
-        break;
     }
   } catch (err) {
     rendererLogError(
@@ -149,20 +150,7 @@ export async function generateGitHubWebUrl(
       notification,
     );
 
-    // Error state fallback urls
-    switch (notification.subject.type) {
-      case 'Issue':
-        url.pathname += '/issues';
-        break;
-      case 'Discussion':
-        url.pathname += '/discussions';
-        break;
-      case 'PullRequest':
-        url.pathname += '/pulls';
-        break;
-      default:
-        break;
-    }
+    url.href = defaultGitHubWebUrl(url, notification.subject.type);
   }
 
   url.searchParams.set(
@@ -173,6 +161,25 @@ export async function generateGitHubWebUrl(
   return url.toString() as Link;
 }
 
+export function defaultGitHubWebUrl(url: URL, type: SubjectType) {
+  // Error state fallback urls
+  switch (type) {
+    case 'Issue':
+      url.pathname += '/issues';
+      break;
+    case 'Discussion':
+      url.pathname += '/discussions';
+      break;
+    case 'PullRequest':
+      url.pathname += '/pulls';
+      break;
+    default:
+      break;
+  }
+
+  return url.href;
+}
+
 export function getChevronDetails(
   hasNotifications: boolean,
   isVisible: boolean,