refactor(api): use graphql api for issue and pull request enrichment

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

Author: setchy

src/renderer/utils/notifications/handlers/issue.ts

@@ -3,7 +3,6 @@ import type { FC } from 'react';
 import type { OcticonProps } from '@primer/octicons-react';
 import {
   IssueClosedIcon,
-  IssueDraftIcon,
   IssueOpenedIcon,
   IssueReopenedIcon,
   SkipIcon,
@@ -16,6 +15,10 @@ import type {
   Subject,
 } from '../../../typesGitHub';
 import { fetchIssueByNumber } from '../../api/client';
+import {
+  IssueState,
+  IssueStateReason,
+} from '../../api/graphql/generated/graphql';
 import { isStateFilteredOut, isUserFilteredOut } from '../filters/filter';
 import { DefaultHandler } from './default';
 import { getSubjectAuthor } from './utils';
@@ -58,15 +61,16 @@ class IssueHandler extends DefaultHandler {
   }
 
   iconType(subject: Subject): FC<OcticonProps> | null {
-    switch (subject.state) {
-      case 'draft':
-        return IssueDraftIcon;
-      case 'closed':
-      case 'completed':
+    const state = subject.state as IssueState | IssueStateReason;
+
+    switch (state) {
+      case IssueState.Closed:
+      case IssueStateReason.Completed:
         return IssueClosedIcon;
-      case 'not_planned':
+      case IssueStateReason.Duplicate:
+      case IssueStateReason.NotPlanned:
         return SkipIcon;
-      case 'reopened':
+      case IssueStateReason.Reopened:
         return IssueReopenedIcon;
       default:
         return IssueOpenedIcon;

src/renderer/utils/notifications/handlers/pullRequest.ts

@@ -17,8 +17,8 @@ import type {
   Subject,
 } from '../../../typesGitHub';
 import { fetchPullByNumber } from '../../api/client';
-import type {
-  FetchPullByNumberQuery,
+import {
+  type FetchPullByNumberQuery,
   PullRequestState,
 } from '../../api/graphql/generated/graphql';
 import { isStateFilteredOut, isUserFilteredOut } from '../filters/filter';
@@ -72,11 +72,15 @@ class PullRequestHandler extends DefaultHandler {
   }
 
   iconType(subject: Subject): FC<OcticonProps> | null {
-    switch (subject.state) {
+    const state = subject.state as PullRequestStateType | PullRequestState;
+
+    switch (state) {
       case 'draft':
         return GitPullRequestDraftIcon;
+      case PullRequestState.Closed:
       case 'closed':
         return GitPullRequestClosedIcon;
+      case PullRequestState.Merged:
       case 'merged':
         return GitMergeIcon;
       default: