Merge branch 'main' into feat/query-merging

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

Author: setchy

.gitattributes

@@ -1,4 +1,8 @@
-# Snapshots are taken by our test suite and used to determine regressions.
-# We don't need to review their code in PRs, so treat them as auto-generated.
+# Define auto-generated file patterns to hide within GitHub's PR diff/file preview.
 # https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github
+
+# Snapshots are taken by our test suite and used to determine regressions.
 *.snap linguist-generated=true
+
+# GraphQL Codegen outputs
++ src/renderer/utils/api/graphql/generated/**/*.ts linguist-generated=true

biome.json

@@ -55,7 +55,7 @@
             ]
           }
         },
-        "useUniqueElementIds": "warn"
+        "useUniqueElementIds": "off"
       },
       "style": {
         "useDefaultSwitchClause": "error",

renovate.json

@@ -2,11 +2,13 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:best-practices",
+    ":dependencyDashboardApproval",
     ":enableVulnerabilityAlerts",
     ":separateMultipleMajorReleases",
     "customManagers:biomeVersions",
     "schedule:weekly"
   ],
+  "assignees": ["setchy"],
   "labels": ["dependency"],
   "rangeStrategy": "pin",
   "packageRules": [
@@ -22,7 +24,7 @@
     {
       "description": "Fetch changelog details for twemoji packages",
       "matchPackageNames": ["@discordapp/twemoji"],
-      "sourceUrl": "https://github.com/jdjdecked/twemoji"
+      "changelogUrl": "https://github.com/jdjdecked/twemoji"
     }
   ],
   "customManagers": [

src/renderer/App.tsx

@@ -1,4 +1,3 @@
-import { useContext } from 'react';
 import {
   Navigate,
   Route,
@@ -10,7 +9,7 @@ import {
 import { BaseStyles, ThemeProvider } from '@primer/react';
 
 import { AppLayout } from './components/layout/AppLayout';
-import { AppContext, AppProvider } from './context/App';
+import { AppProvider, useAppContext } from './context/App';
 import { AccountsRoute } from './routes/Accounts';
 import { FiltersRoute } from './routes/Filters';
 import { LoginRoute } from './routes/Login';
@@ -22,7 +21,7 @@ import { SettingsRoute } from './routes/Settings';
 import './App.css';
 
 function RequireAuth({ children }) {
-  const { isLoggedIn } = useContext(AppContext);
+  const { isLoggedIn } = useAppContext();
   const location = useLocation();
 
   return isLoggedIn ? (

src/renderer/__mocks__/notifications-mocks.ts

@@ -1,15 +1,14 @@
 import { Constants } from '../constants';
 import type {
   AccountNotifications,
+  GitifyNotification,
   GitifyNotificationState,
+  GitifyRepository,
+  GitifySubject,
   Hostname,
-} from '../types';
-import type {
-  Notification,
-  Repository,
-  Subject,
+  Link,
   SubjectType,
-} from '../typesGitHub';
+} from '../types';
 import {
   mockEnterpriseNotifications,
   mockGitHubNotifications,
@@ -47,21 +46,21 @@ export function createMockSubject(mocks: {
   title?: string;
   type?: SubjectType;
   state?: GitifyNotificationState;
-}): Subject {
+}): GitifySubject {
   return {
     title: mocks.title ?? 'Mock Subject',
     type: mocks.type ?? ('Unknown' as SubjectType),
     state: mocks.state ?? ('Unknown' as GitifyNotificationState),
     url: null,
-    latest_comment_url: null,
+    latestCommentUrl: null,
   };
 }
 
 export function createPartialMockNotification(
-  subject: Partial<Subject>,
-  repository?: Partial<Repository>,
-): Notification {
-  const mockNotification: Partial<Notification> = {
+  subject: Partial<GitifySubject>,
+  repository?: Partial<GitifyRepository>,
+): GitifyNotification {
+  const mockNotification: Partial<GitifyNotification> = {
     account: {
       method: 'Personal Access Token',
       platform: 'GitHub Cloud',
@@ -70,28 +69,30 @@ export function createPartialMockNotification(
       user: mockGitifyUser,
       hasRequiredScopes: true,
     },
-    subject: subject as Subject,
+    subject: subject as GitifySubject,
     repository: {
       name: 'notifications-test',
-      full_name: 'gitify-app/notifications-test',
-      html_url: 'https://github.com/gitify-app/notifications-test',
+      fullName: 'gitify-app/notifications-test',
+      htmlUrl: 'https://github.com/gitify-app/notifications-test' as Link,
       owner: {
         login: 'gitify-app',
+        avatarUrl: 'https://avatars.githubusercontent.com/u/1' as Link,
+        type: 'Organization',
       },
       ...repository,
-    } as Repository,
+    } as GitifyRepository,
   };
 
-  return mockNotification as Notification;
+  return mockNotification as GitifyNotification;
 }
 
 export function createMockNotificationForRepoName(
   id: string,
   repoFullName: string | null,
-): Notification {
+): GitifyNotification {
   return {
     id,
-    repository: repoFullName ? { full_name: repoFullName } : null,
+    repository: repoFullName ? { fullName: repoFullName } : null,
     account: mockGitHubCloudAccount,
-  } as Notification;
+  } as GitifyNotification;
 }

src/renderer/__mocks__/user-mocks.ts

@@ -1,5 +1,5 @@
-import type { GitifyUser, Link } from '../types';
-import type { User } from '../typesGitHub';
+import type { GitifyNotificationUser, GitifyUser, Link } from '../types';
+import type { RawUser } from '../utils/api/types';
 
 export const mockGitifyUser: GitifyUser = {
   login: 'octocat',
@@ -8,13 +8,24 @@ export const mockGitifyUser: GitifyUser = {
   avatar: 'https://avatars.githubusercontent.com/u/583231?v=4' as Link,
 };
 
-export function createPartialMockUser(login: string): User {
-  const mockUser: Partial<User> = {
+export function createPartialMockUser(login: string): RawUser {
+  const mockUser: Partial<RawUser> = {
     login: login,
     html_url: `https://github.com/${login}` as Link,
     avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4' as Link,
     type: 'User',
   };
 
-  return mockUser as User;
+  return mockUser as RawUser;
+}
+
+export function createMockNotificationUser(
+  login: string,
+): GitifyNotificationUser {
+  return {
+    login: login,
+    htmlUrl: `https://github.com/${login}` as Link,
+    avatarUrl: 'https://avatars.githubusercontent.com/u/583231?v=4' as Link,
+    type: 'User',
+  };
 }

src/renderer/components/AllRead.tsx

@@ -1,7 +1,7 @@
-import { type FC, useContext, useMemo } from 'react';
+import { type FC, useMemo } from 'react';
 
 import { Constants } from '../constants';
-import { AppContext } from '../context/App';
+import { useAppContext } from '../context/App';
 import { hasActiveFilters } from '../utils/notifications/filters/filter';
 import { EmojiSplash } from './layout/EmojiSplash';
 
@@ -12,7 +12,7 @@ interface AllReadProps {
 export const AllRead: FC<AllReadProps> = ({
   fullHeight = true,
 }: AllReadProps) => {
-  const { settings } = useContext(AppContext);
+  const { settings } = useAppContext();
 
   const hasFilters = hasActiveFilters(settings);
 

src/renderer/components/Sidebar.tsx

@@ -1,4 +1,4 @@
-import { type FC, useContext } from 'react';
+import type { FC } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
 import {
@@ -15,7 +15,7 @@ import { IconButton, Stack } from '@primer/react';
 import { APPLICATION } from '../../shared/constants';
 
 import { Constants } from '../constants';
-import { AppContext } from '../context/App';
+import { useAppContext } from '../context/App';
 import { quitApp } from '../utils/comms';
 import {
   openGitHubIssues,
@@ -37,7 +37,7 @@ export const Sidebar: FC = () => {
     auth,
     unreadNotificationCount,
     hasUnreadNotifications,
-  } = useContext(AppContext);
+  } = useAppContext();
 
   // We naively assume that the first account is the primary account for the purposes of our sidebar quick links
   const primaryAccountHostname =

src/renderer/components/avatars/AvatarWithFallback.tsx

@@ -3,8 +3,7 @@ import { useState } from 'react';
 
 import { Avatar, Stack, Truncate } from '@primer/react';
 
-import { type Link, Size } from '../../types';
-import type { UserType } from '../../typesGitHub';
+import { type Link, Size, type UserType } from '../../types';
 import { getDefaultUserIcon } from '../../utils/icons';
 import { isNonHumanUser } from '../../utils/notifications/filters/userType';
 

src/renderer/components/filters/FilterSection.tsx

@@ -1,9 +1,9 @@
-import { type ReactNode, useContext } from 'react';
+import type { ReactNode } from 'react';
 
 import type { Icon } from '@primer/octicons-react';
 import { Stack, Text } from '@primer/react';
 
-import { AppContext } from '../../context/App';
+import { useAppContext } from '../../context/App';
 import type { FilterSettingsState, FilterSettingsValue } from '../../types';
 import type { Filter } from '../../utils/notifications/filters';
 import { Checkbox } from '../fields/Checkbox';
@@ -29,7 +29,7 @@ export const FilterSection = <T extends FilterSettingsValue>({
   tooltip,
   layout = 'vertical',
 }: FilterSectionProps<T>) => {
-  const { updateFilter, settings, notifications } = useContext(AppContext);
+  const { updateFilter, settings, notifications } = useAppContext();
 
   return (
     <fieldset id={id}>