fix: discussions-url

.gitignore

@@ -78,3 +78,4 @@ temp/
 
 dist/
 build/
+.vscode/settings.json

package.json

@@ -124,7 +124,7 @@
     "react-transition-group": "^4.4.1",
     "tailwindcss": "^2.0.2",
     "ts-loader": "^8.0.12",
-    "typescript": "^4.1.3"
+    "typescript": "^4.6.2"
   },
   "devDependencies": {
     "@testing-library/react": "^11.2.2",

src/__mocks__/electron.js

@@ -27,18 +27,26 @@ window.localStorage = {
 
 window.alert = jest.fn();
 
-const browserWindow = {
-  loadURL: jest.fn(),
-  webContents: {
+let instance;
+
+class BrowserWindow {
+  constructor() {
+    if(!instance){
+      instance = this;
+    }
+    return instance;
+  }
+  loadURL = jest.fn();
+  webContents = {
     on: () => {},
     session: {
       clearStorageData: jest.fn(),
     },
-  },
-  on: () => {},
-  close: jest.fn(),
-  hide: jest.fn(),
-  destroy: jest.fn(),
+  };
+  on(){};
+  close = jest.fn();
+  hide = jest.fn();
+  destroy = jest.fn();
 };
 
 const dialog = {
@@ -47,7 +55,7 @@ const dialog = {
 
 module.exports = {
   remote: {
-    BrowserWindow: () => browserWindow,
+    BrowserWindow: BrowserWindow,
     dialog: dialog,
     process: {
       platform: 'darwin',
@@ -57,7 +65,7 @@ module.exports = {
       getLoginItemSettings: jest.fn(),
       setLoginItemSettings: () => {},
     },
-    getCurrentWindow: jest.fn(() => browserWindow),
+    getCurrentWindow: jest.fn(() => instance || new BrowserWindow),
   },
   ipcRenderer: {
     send: jest.fn(),

src/__mocks__/mockedData.ts

@@ -1,5 +1,5 @@
 import { AccountNotifications, EnterpriseAccount } from '../types';
-import { Notification, Repository, User } from '../typesGithub';
+import { Notification, Repository, User, GraphQLSearch } from '../typesGithub';
 
 export const mockedEnterpriseAccounts: EnterpriseAccount[] = [
   {
@@ -274,3 +274,116 @@ export const mockedSingleAccountNotifications: AccountNotifications[] = [
     notifications: [mockedSingleNotification],
   },
 ];
+
+export const mockedGraphQLResponse: GraphQLSearch = {
+  "data": {
+      "data": {
+          "search": {
+              "edges": [
+                  {
+                      "node": {
+                          "viewerSubscription": "SUBSCRIBED",
+                          "title": "1.16.0",
+                          "url": "https://github.com/manosim/notifications-test/discussions/612",
+                          "comments": {
+                              "edges": [
+                                  {
+                                      "node": {
+                                          "databaseId": 2215656,
+                                          "createdAt": "2022-02-20T18:33:39Z",
+                                          "replies": {
+                                              "edges": []
+                                          }
+                                      }
+                                  },
+                                  {
+                                      "node": {
+                                          "databaseId": 2217789,
+                                          "createdAt": "2022-02-21T03:30:42Z",
+                                          "replies": {
+                                              "edges": []
+                                          }
+                                      }
+                                  },
+                                  {
+                                      "node": {
+                                          "databaseId": 2223243,
+                                          "createdAt": "2022-02-21T18:26:27Z",
+                                          "replies": {
+                                              "edges": [
+                                                  {
+                                                      "node": {
+                                                          "databaseId": 2232922,
+                                                          "createdAt": "2022-02-23T00:57:58Z"
+                                                      }
+                                                  }
+                                              ]
+                                          }
+                                      }
+                                  },
+                                  {
+                                      "node": {
+                                          "databaseId": 2232921,
+                                          "createdAt": "2022-02-23T00:57:49Z",
+                                          "replies": {
+                                              "edges": []
+                                          }
+                                      }
+                                  },
+                                  {
+                                      "node": {
+                                          "databaseId": 2258799,
+                                          "createdAt": "2022-02-27T01:22:20Z",
+                                          "replies": {
+                                              "edges": [
+                                                  {
+                                                      "node": {
+                                                        "databaseId": 2300902,
+                                                        "createdAt": "2022-03-05T17:43:52Z"
+                                                      }
+                                                  }
+                                              ]
+                                          }
+                                      }
+                                  },
+                                  {
+                                      "node": {
+                                          "databaseId": 2297637,
+                                          "createdAt": "2022-03-04T20:39:44Z",
+                                          "replies": {
+                                              "edges": [
+                                                  {
+                                                      "node": {
+                                                          "databaseId": 2300893,
+                                                          "createdAt": "2022-03-05T17:41:04Z"
+                                                      }
+                                                  }
+                                              ]
+                                          }
+                                      }
+                                  },
+                                  {
+                                      "node": {
+                                          "databaseId": 2299763,
+                                          "createdAt": "2022-03-05T11:05:42Z",
+                                          "replies": {
+                                              "edges": [
+                                                  {
+                                                      "node": {
+                                                        "databaseId": 2300895,
+                                                        "createdAt": "2022-03-05T17:41:44Z"
+                                                      }
+                                                  }
+                                              ]
+                                          }
+                                      }
+                                  }
+                              ]
+                          }
+                      }
+                  }
+              ]
+          }
+      }
+  }
+}

src/components/NotificationRow.tsx

@@ -1,11 +1,9 @@
-const { shell } = require('electron');
-
 import React, { useCallback, useContext } from 'react';
 import { formatDistanceToNow, parseISO } from 'date-fns';
 import { CheckIcon, MuteIcon } from '@primer/octicons-react';
 
 import { formatReason, getNotificationTypeIcon } from '../utils/github-api';
-import { generateGitHubWebUrl } from '../utils/helpers';
+import { openInBrowser } from '../utils/helpers';
 import { Notification } from '../typesGithub';
 import { AppContext } from '../context/App';
 
@@ -18,8 +16,12 @@ export const NotificationRow: React.FC<IProps> = ({
   notification,
   hostname,
 }) => {
-  const { settings, accounts } = useContext(AppContext);
-  const { markNotification, unsubscribeNotification } = useContext(AppContext);
+  const {
+    settings,
+    accounts,
+    markNotification,
+    unsubscribeNotification,
+  } = useContext(AppContext);
 
   const pressTitle = useCallback(() => {
     openBrowser();
@@ -29,17 +31,7 @@ export const NotificationRow: React.FC<IProps> = ({
     }
   }, [settings]);
 
-  const openBrowser = useCallback(() => {
-    // Some Notification types from GitHub are missing urls in their subjects.
-    if (notification.subject.url) {
-      const url = generateGitHubWebUrl(
-        notification.subject.url,
-        notification.id,
-        accounts.user?.id
-      );
-      shell.openExternal(url);
-    }
-  }, [notification]);
+  const openBrowser = useCallback(() => openInBrowser(notification, accounts), [notification]);
 
   const unsubscribe = (event: React.MouseEvent<HTMLElement>) => {
     // Don't trigger onClick of parent element.

src/hooks/useNotifications.ts

@@ -100,7 +100,7 @@ export const useNotifications = (): NotificationsState => {
               notifications,
               data,
               settings,
-              accounts.user
+              accounts
             );
             setNotifications(data);
             setIsFetching(false);

src/routes/__snapshots__/LoginWithToken.test.tsx.snap

@@ -84,7 +84,7 @@ exports[`routes/LoginWithToken.js renders correctly 1`] = `
           <span
             className="underline font-extrabold text-yellow-500"
           >
-            read:user, notifications
+            read:user, notifications, repo
 
           </span>
           scopes.

src/typesGithub.ts

@@ -21,6 +21,11 @@ export type SubjectType =
   | 'Release'
   | 'RepositoryVulnerabilityAlert';
 
+export type ViewerSubscription =
+  | 'IGNORED'
+  | 'SUBSCRIBED'
+  | 'UNSUBSCRIBED'
+
 export interface Notification {
   id: string;
   unread: boolean;
@@ -115,3 +120,41 @@ export interface Subject {
   latest_comment_url?: string;
   type: SubjectType;
 }
+
+export interface GraphQLSearch {
+  data: {
+    data: {
+      search: {
+        edges: DiscussionEdge[]
+      }
+    }
+  }
+}
+
+export interface DiscussionEdge {
+  node: {
+    viewerSubscription: ViewerSubscription;
+    title: string;
+    url: string;
+    comments: {
+      edges: DiscussionCommentEdge[]
+    }
+  }
+}
+
+export interface DiscussionCommentEdge {
+  node: {
+    databaseId: string|number;
+    createdAt: string;
+    replies: {
+      edges: DiscussionSubcommentEdge[]
+    }
+  }
+}
+
+export interface DiscussionSubcommentEdge {
+  node: {
+    databaseId: string|number;
+    createdAt: string;
+  }
+}

src/utils/auth.test.ts

@@ -1,22 +1,22 @@
 import { AxiosPromise, AxiosResponse } from 'axios';
 
-const { remote } = require('electron');
-const BrowserWindow = remote.BrowserWindow;
+import { remote } from 'electron';
+const browserWindow = new remote.BrowserWindow
 
 import * as auth from './auth';
 import * as apiRequests from './api-requests';
 import { AuthState } from '../types';
 
 describe('utils/auth.tsx', () => {
   describe('authGitHub', () => {
-    const loadURLMock = jest.spyOn(new BrowserWindow(), 'loadURL');
+    const loadURLMock = jest.spyOn(browserWindow, 'loadURL');
 
     beforeEach(() => {
       loadURLMock.mockReset();
     });
 
     it('should call authGithub - success', async () => {
-      spyOn(new BrowserWindow().webContents, 'on').and.callFake(
+      spyOn(browserWindow.webContents, 'on').and.callFake(
         (event, callback) => {
           if (event === 'will-redirect') {
             const event = new Event('will-redirect');
@@ -30,19 +30,19 @@ describe('utils/auth.tsx', () => {
       expect(res.authCode).toBe('123-456');
 
       expect(
-        new BrowserWindow().webContents.session.clearStorageData
+        browserWindow.webContents.session.clearStorageData
       ).toHaveBeenCalledTimes(1);
 
       expect(loadURLMock).toHaveBeenCalledTimes(1);
       expect(loadURLMock).toHaveBeenCalledWith(
-        'https://github.com/login/oauth/authorize?client_id=FAKE_CLIENT_ID_123&scope=read:user,notifications'
+        'https://github.com/login/oauth/authorize?client_id=FAKE_CLIENT_ID_123&scope=read:user,notifications,repo'
       );
 
-      expect(new BrowserWindow().destroy).toHaveBeenCalledTimes(1);
+      expect(browserWindow.destroy).toHaveBeenCalledTimes(1);
     });
 
     it('should call authGithub - failure', async () => {
-      spyOn(new BrowserWindow().webContents, 'on').and.callFake(
+      spyOn(browserWindow.webContents, 'on').and.callFake(
         (event, callback) => {
           if (event === 'will-redirect') {
             const event = new Event('will-redirect');

src/utils/constants.ts

@@ -1,6 +1,6 @@
 export const Constants = {
   // GitHub OAuth
-  AUTH_SCOPE: ['read:user', 'notifications'],
+  AUTH_SCOPE: ['read:user', 'notifications', 'repo'],
 
   DEFAULT_AUTH_OPTIONS: {
     hostname: 'github.com',