pass account instead of hostname

gitify-app · Jun 8, 2024 · 7c9c84e · 7c9c84e
1 parent ba81d6d
commit 7c9c84e
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 30 deletions.
diff --git a/src/components/AccountNotifications.tsx b/src/components/AccountNotifications.tsx
@@ -54,7 +54,7 @@ export const AccountNotifications = (props: IProps) => {
         return (
           <RepositoryNotifications
             key={repoSlug}
-            hostname={account.hostname}
+            account={account}
             repoName={repoSlug}
             repoNotifications={repoNotifications}
           />

diff --git a/src/components/NotificationRow.test.tsx b/src/components/NotificationRow.test.tsx
@@ -1,6 +1,10 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import { shell } from 'electron';
-import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
+import {
+  mockAuth,
+  mockGitHubCloudAccount,
+  mockSettings,
+} from '../__mocks__/state-mocks';
 import { AppContext } from '../context/App';
 import type { Milestone, UserType } from '../typesGitHub';
 import { mockSingleNotification } from '../utils/api/__mocks__/response-mocks';
@@ -23,7 +27,7 @@ describe('components/NotificationRow.tsx', () => {
 
     const props = {
       notification: mockSingleNotification,
-      hostname: 'github.com',
+      account: mockGitHubCloudAccount,
     };
 
     const tree = render(
@@ -44,7 +48,7 @@ describe('components/NotificationRow.tsx', () => {
 
     const props = {
       notification: mockNotification,
-      hostname: 'github.com',
+      account: mockGitHubCloudAccount,
     };
 
     const tree = render(
@@ -65,7 +69,7 @@ describe('components/NotificationRow.tsx', () => {
 
     const props = {
       notification: mockNotification,
-      hostname: 'github.com',
+      account: mockGitHubCloudAccount,
     };
 
     const tree = render(
@@ -88,7 +92,7 @@ describe('components/NotificationRow.tsx', () => {
 
         const props = {
           notification: mockNotification,
-          hostname: 'github.com',
+          account: mockGitHubCloudAccount,
         };
 
         const tree = render(
@@ -115,7 +119,7 @@ describe('components/NotificationRow.tsx', () => {
 
         const props = {
           notification: mockNotification,
-          hostname: 'github.com',
+          account: mockGitHubCloudAccount,
         };
 
         const tree = render(
@@ -140,7 +144,7 @@ describe('components/NotificationRow.tsx', () => {
 
         const props = {
           notification: mockNotification,
-          hostname: 'github.com',
+          account: mockGitHubCloudAccount,
         };
 
         const tree = render(
@@ -167,7 +171,7 @@ describe('components/NotificationRow.tsx', () => {
 
         const props = {
           notification: mockNotification,
-          hostname: 'github.com',
+          account: mockGitHubCloudAccount,
         };
 
         const tree = render(
@@ -192,7 +196,7 @@ describe('components/NotificationRow.tsx', () => {
 
         const props = {
           notification: mockNotification,
-          hostname: 'github.com',
+          account: mockGitHubCloudAccount,
         };
 
         const tree = render(
@@ -217,7 +221,7 @@ describe('components/NotificationRow.tsx', () => {
 
         const props = {
           notification: mockNotification,
-          hostname: 'github.com',
+          account: mockGitHubCloudAccount,
         };
 
         const tree = render(
@@ -244,7 +248,7 @@ describe('components/NotificationRow.tsx', () => {
 
         const props = {
           notification: mockNotification,
-          hostname: 'github.com',
+          account: mockGitHubCloudAccount,
         };
 
         const tree = render(
@@ -274,7 +278,7 @@ describe('components/NotificationRow.tsx', () => {
 
         const props = {
           notification: mockNotification,
-          hostname: 'github.com',
+          account: mockGitHubCloudAccount,
         };
 
         const tree = render(
@@ -302,7 +306,7 @@ describe('components/NotificationRow.tsx', () => {
 
         const props = {
           notification: mockNotification,
-          hostname: 'github.com',
+          account: mockGitHubCloudAccount,
         };
 
         const tree = render(
@@ -325,7 +329,7 @@ describe('components/NotificationRow.tsx', () => {
 
       const props = {
         notification: mockSingleNotification,
-        hostname: 'github.com',
+        account: mockGitHubCloudAccount,
       };
 
       render(
@@ -350,7 +354,7 @@ describe('components/NotificationRow.tsx', () => {
 
       const props = {
         notification: mockSingleNotification,
-        hostname: 'github.com',
+        account: mockGitHubCloudAccount,
       };
 
       render(
@@ -375,7 +379,7 @@ describe('components/NotificationRow.tsx', () => {
 
       const props = {
         notification: mockSingleNotification,
-        hostname: 'github.com',
+        account: mockGitHubCloudAccount,
       };
 
       render(
@@ -400,7 +404,7 @@ describe('components/NotificationRow.tsx', () => {
 
       const props = {
         notification: mockSingleNotification,
-        hostname: 'github.com',
+        account: mockGitHubCloudAccount,
       };
 
       render(
@@ -423,7 +427,7 @@ describe('components/NotificationRow.tsx', () => {
 
       const props = {
         notification: mockSingleNotification,
-        hostname: 'github.com',
+        account: mockGitHubCloudAccount,
       };
 
       render(
@@ -443,7 +447,7 @@ describe('components/NotificationRow.tsx', () => {
 
       const props = {
         notification: mockSingleNotification,
-        hostname: 'github.com',
+        account: mockGitHubCloudAccount,
       };
 
       render(
@@ -475,7 +479,7 @@ describe('components/NotificationRow.tsx', () => {
             reviews: null,
           },
         },
-        hostname: 'github.com',
+        account: mockGitHubCloudAccount,
       };
 
       render(

diff --git a/src/components/NotificationRow.tsx b/src/components/NotificationRow.tsx
@@ -17,7 +17,7 @@ import {
 } from 'react';
 
 import { AppContext } from '../context/App';
-import { IconColor } from '../types';
+import { type Account, IconColor } from '../types';
 import type { Notification } from '../typesGitHub';
 import { openExternalLink } from '../utils/comms';
 import Constants from '../utils/constants';
@@ -34,11 +34,11 @@ import {
 import { formatReason } from '../utils/reason';
 
 interface IProps {
-  hostname: string;
+  account: Account;
   notification: Notification;
 }
 
-export const NotificationRow: FC<IProps> = ({ notification, hostname }) => {
+export const NotificationRow: FC<IProps> = ({ notification, account }) => {
   const {
     auth,
     settings,

diff --git a/src/components/Repository.test.tsx b/src/components/Repository.test.tsx
@@ -1,5 +1,6 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import { shell } from 'electron';
+import { mockGitHubCloudAccount } from '../__mocks__/state-mocks';
 import { AppContext } from '../context/App';
 import {
   mockGitHubNotifications,
@@ -16,7 +17,7 @@ describe('components/Repository.tsx', () => {
   const markRepoNotificationsDone = jest.fn();
 
   const props = {
-    hostname: 'github.com',
+    account: mockGitHubCloudAccount,
     repoName: 'gitify-app/notifications-test',
     repoNotifications: mockGitHubNotifications,
   };

diff --git a/src/components/Repository.tsx b/src/components/Repository.tsx
@@ -2,20 +2,21 @@ import { CheckIcon, MarkGithubIcon, ReadIcon } from '@primer/octicons-react';
 import { type FC, useCallback, useContext } from 'react';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
 import { AppContext } from '../context/App';
+import type { Account } from '../types';
 import type { Notification } from '../typesGitHub';
 import { openExternalLink } from '../utils/comms';
 import { NotificationRow } from './NotificationRow';
 
 interface IProps {
-  hostname: string;
+  account: Account;
   repoNotifications: Notification[];
   repoName: string;
 }
 
 export const RepositoryNotifications: FC<IProps> = ({
   repoName,
   repoNotifications,
-  hostname,
+  account,
 }) => {
   const { markRepoNotifications, markRepoNotificationsDone } =
     useContext(AppContext);
@@ -27,11 +28,11 @@ export const RepositoryNotifications: FC<IProps> = ({
 
   const markRepoAsRead = useCallback(() => {
     markRepoNotifications(repoNotifications[0]);
-  }, [repoNotifications, hostname]);
+  }, [repoNotifications, account]);
 
   const markRepoAsDone = useCallback(() => {
     markRepoNotificationsDone(repoNotifications[0]);
-  }, [repoNotifications, hostname]);
+  }, [repoNotifications, account]);
 
   const avatarUrl = repoNotifications[0].repository.owner.avatar_url;
   const repoSlug = repoNotifications[0].repository.full_name;
@@ -86,7 +87,7 @@ export const RepositoryNotifications: FC<IProps> = ({
           <CSSTransition key={obj.id} timeout={250} classNames="notification">
             <NotificationRow
               key={obj.id}
-              hostname={hostname}
+              account={account}
               notification={obj}
             />
           </CSSTransition>