refactor: simplify useNotifications

src/__mocks__/mockedData.ts

@@ -70,7 +70,7 @@ export const mockedCommenterUser: User = {
 };
 
 export const mockedSingleNotification: Notification = {
-  hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
+  hostname: Constants.GITHUB_API_BASE_URL,
   id: '138661096',
   unread: true,
   reason: 'subscribed',
@@ -249,7 +249,7 @@ export const mockedGitHubNotifications = [
     url: 'https://api.github.com/notifications/threads/148827438',
     subscription_url:
       'https://api.github.com/notifications/threads/148827438/subscription',
-    hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
+    hostname: Constants.GITHUB_API_BASE_URL,
   } as Notification,
 ];
 
@@ -359,7 +359,7 @@ export const mockedEnterpriseNotifications = [
     url: 'https://github.gitify.io/api/v3/notifications/threads/3',
     subscription_url:
       'https://github.gitify.io/api/v3/notifications/threads/3/subscription',
-    hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
+    hostname: Constants.GITHUB_API_BASE_URL,
   } as Notification,
 ];
 

src/hooks/useNotifications.test.ts

@@ -43,10 +43,13 @@ describe('hooks/useNotifications.ts', () => {
           expect(result.current.status).toBe('success');
         });
 
-        expect(result.current.notifications[0].hostname).toBe(
+        expect(result.current.notifications[0].hostname).toBe('api.github.com');
+        expect(result.current.notifications[0].notifications.length).toBe(2);
+
+        expect(result.current.notifications[1].hostname).toBe(
           'github.gitify.io',
         );
-        expect(result.current.notifications[1].hostname).toBe('github.com');
+        expect(result.current.notifications[1].notifications.length).toBe(2);
       });
 
       it('should fetch notifications with failures - github.com & enterprise', async () => {
@@ -117,11 +120,12 @@ describe('hooks/useNotifications.ts', () => {
         });
 
         await waitFor(() => {
-          expect(result.current.notifications[0].hostname).toBe(
-            'github.gitify.io',
-          );
+          expect(result.current.status).toBe('success');
         });
 
+        expect(result.current.notifications[0].hostname).toBe(
+          'github.gitify.io',
+        );
         expect(result.current.notifications[0].notifications.length).toBe(2);
       });
 
@@ -179,9 +183,10 @@ describe('hooks/useNotifications.ts', () => {
         });
 
         await waitFor(() => {
-          expect(result.current.notifications[0].hostname).toBe('github.com');
+          expect(result.current.status).toBe('success');
         });
 
+        expect(result.current.notifications[0].hostname).toBe('api.github.com');
         expect(result.current.notifications[0].notifications.length).toBe(2);
       });
 
@@ -379,7 +384,7 @@ describe('hooks/useNotifications.ts', () => {
           expect(result.current.status).toBe('success');
         });
 
-        expect(result.current.notifications[0].hostname).toBe('github.com');
+        expect(result.current.notifications[0].hostname).toBe('api.github.com');
         expect(result.current.notifications[0].notifications.length).toBe(6);
       });
     });
@@ -459,7 +464,7 @@ describe('hooks/useNotifications.ts', () => {
           expect(result.current.status).toBe('success');
         });
 
-        expect(result.current.notifications[0].hostname).toBe('github.com');
+        expect(result.current.notifications[0].hostname).toBe('api.github.com');
         expect(result.current.notifications[0].notifications.length).toBe(1);
       });
     });

src/hooks/useNotifications.ts

@@ -106,43 +106,24 @@ export const useNotifications = (): NotificationsState => {
         getGitHubNotifications(),
         ...getEnterpriseNotifications(),
       ])
-        .then(([gitHubNotifications, ...entAccNotifications]) => {
-          const enterpriseNotifications = entAccNotifications.map(
-            (accountNotifications) => {
+        .then(([...responses]) => {
+          const accountsNotifications: AccountNotifications[] = responses
+            .filter((response) => !!response)
+            .map((accountNotifications) => {
               const { hostname } = new URL(accountNotifications.config.url);
               return {
                 hostname,
                 notifications: accountNotifications.data.map(
-                  (notification: Notification) => {
-                    return {
-                      ...notification,
-                      hostname: hostname,
-                    };
-                  },
+                  (notification: Notification) => ({
+                    ...notification,
+                    hostname,
+                  }),
                 ),
               };
-            },
-          );
-
-          const data = isGitHubLoggedIn(accounts)
-            ? [
-                ...enterpriseNotifications,
-                {
-                  hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
-                  notifications: gitHubNotifications.data.map(
-                    (notification: Notification) => {
-                      return {
-                        ...notification,
-                        hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
-                      };
-                    },
-                  ),
-                },
-              ]
-            : [...enterpriseNotifications];
+            });
 
           Promise.all(
-            data.map(async (accountNotifications) => {
+            accountsNotifications.map(async (accountNotifications) => {
               return {
                 hostname: accountNotifications.hostname,
                 notifications: await Promise.all<Notification>(

src/typesGitHub.ts

@@ -79,7 +79,8 @@ export interface Notification {
   repository: Repository;
   url: string;
   subscription_url: string;
-  hostname: string; // This is not in the GitHub API, but we add it to the type to make it easier to work with
+  // TODO - rename this to apiBaseUrl
+  hostname: string; // This is not in the official GitHub API. We add this to make notification interactions easier.
 }
 
 export type UserDetails = User & UserProfile;