refactor(renderer): organize utils

Signed-off-by: Adam Setch <adam.setch@outlook.com>

Author: setchy

src/renderer/components/notifications/AccountNotifications.tsx

@@ -16,7 +16,6 @@ import {
 } from '../../types';
 
 import { hasMultipleAccounts } from '../../utils/auth/utils';
-import { getChevronDetails } from '../../utils/helpers';
 import {
   groupNotificationsByRepository,
   isGroupByRepository,
@@ -27,6 +26,7 @@ import {
   openGitHubPulls,
 } from '../../utils/system/links';
 import { cn } from '../../utils/ui/cn';
+import { getChevronDetails } from '../../utils/ui/display';
 import { AllRead } from '../AllRead';
 import { AvatarWithFallback } from '../avatars/AvatarWithFallback';
 import { Oops } from '../Oops';

src/renderer/components/notifications/NotificationRow.tsx

@@ -10,7 +10,7 @@ import { HoverGroup } from '../primitives/HoverGroup';
 
 import { type GitifyNotification, Opacity, Size } from '../../types';
 
-import { isMarkAsDoneFeatureSupported } from '../../utils/features';
+import { isMarkAsDoneFeatureSupported } from '../../utils/api/features';
 import { isGroupByDate } from '../../utils/notifications/group';
 import { shouldRemoveNotificationsFromState } from '../../utils/notifications/remove';
 import { openNotification } from '../../utils/system/links';

src/renderer/components/notifications/NotificationTitle.tsx

@@ -4,8 +4,8 @@ import { Text } from '@primer/react';
 
 import { useAppContext } from '../../hooks/useAppContext';
 
-import { parseInlineCode } from '../../utils/helpers';
 import { cn } from '../../utils/ui/cn';
+import { parseInlineCode } from '../../utils/ui/display';
 
 interface NotificationTitleProps {
   title: string;

src/renderer/components/notifications/RepositoryNotifications.tsx

@@ -10,11 +10,11 @@ import { HoverGroup } from '../primitives/HoverGroup';
 
 import { type GitifyNotification, Opacity, Size } from '../../types';
 
-import { isMarkAsDoneFeatureSupported } from '../../utils/features';
-import { getChevronDetails } from '../../utils/helpers';
+import { isMarkAsDoneFeatureSupported } from '../../utils/api/features';
 import { shouldRemoveNotificationsFromState } from '../../utils/notifications/remove';
 import { openRepository } from '../../utils/system/links';
 import { cn } from '../../utils/ui/cn';
+import { getChevronDetails } from '../../utils/ui/display';
 import { AvatarWithFallback } from '../avatars/AvatarWithFallback';
 import { NotificationRow } from './NotificationRow';
 

src/renderer/hooks/useNotifications.ts

@@ -14,13 +14,13 @@ import {
   markNotificationThreadAsDone,
   markNotificationThreadAsRead,
 } from '../utils/api/client';
+import { isMarkAsDoneFeatureSupported } from '../utils/api/features';
 import { getAccountUUID } from '../utils/auth/utils';
 import {
   areAllAccountErrorsSame,
   doesAllAccountsHaveErrors,
 } from '../utils/core/errors';
 import { rendererLogError } from '../utils/core/logger';
-import { isMarkAsDoneFeatureSupported } from '../utils/features';
 import {
   getAllNotifications,
   getNotificationCount,

src/renderer/utils/__snapshots__/reason.test.ts.snap

@@ -17,8 +17,8 @@ import type {
   MarkNotificationThreadAsReadResponse,
 } from './types';
 
-import { isAnsweredDiscussionFeatureSupported } from '../features';
 import { createNotificationHandler } from '../notifications/handlers';
+import { isAnsweredDiscussionFeatureSupported } from './features';
 import {
   FetchDiscussionByNumberDocument,
   type FetchDiscussionByNumberQuery,

src/renderer/utils/api/client.ts

@@ -1,14 +1,14 @@
 import {
   mockGitHubCloudAccount,
   mockGitHubEnterpriseServerAccount,
-} from '../__mocks__/account-mocks';
+} from '../../__mocks__/account-mocks';
 
 import {
   isAnsweredDiscussionFeatureSupported,
   isMarkAsDoneFeatureSupported,
 } from './features';
 
-describe('renderer/utils/features.ts', () => {
+describe('renderer/utils/api/features.ts', () => {
   describe('isMarkAsDoneFeatureSupported', () => {
     it('should return true for GitHub Cloud', () => {
       expect(isMarkAsDoneFeatureSupported(mockGitHubCloudAccount)).toBe(true);

src/renderer/utils/features.test.ts src/renderer/utils/api/features.test.tssrc/renderer/utils/features.test.ts renamed to src/renderer/utils/api/features.test.ts

@@ -1,15 +1,14 @@
 import semver from 'semver';
 
-import type { Account } from '../types';
+import type { Account } from '../../types';
 
-import { isEnterpriseServerHost } from './helpers';
+import { isEnterpriseServerHost } from '../auth/platform';
 
 /**
  * Check if the "Mark as done" feature is supported for the given account.
  *
  * GitHub Cloud or GitHub Enterprise Server 3.13 or newer is required to support this feature.
  */
-
 export function isMarkAsDoneFeatureSupported(account: Account): boolean {
   if (isEnterpriseServerHost(account.hostname)) {
     if (account.version) {
@@ -21,12 +20,12 @@ export function isMarkAsDoneFeatureSupported(account: Account): boolean {
 
   return true;
 }
+
 /**
  * Check if the "answered" discussions are supported for the given account.
  *
  * GitHub Cloud or GitHub Enterprise Server 3.12 or newer is required to support this feature.
  */
-
 export function isAnsweredDiscussionFeatureSupported(
   account: Account,
 ): boolean {

src/renderer/utils/features.ts src/renderer/utils/api/features.tssrc/renderer/utils/features.ts renamed to src/renderer/utils/api/features.ts

@@ -12,7 +12,7 @@ import type {
 } from '../../types';
 import type { RawGitHubNotification } from './types';
 
-import { getReasonDetails } from '../reason';
+import { getReasonDetails } from '../notifications/reason';
 
 /**
  * Transform all raw notifications from Atlassian types to Atlassify types.