Move chapter types and constants to corresponding files

src/modules/chapter/Chapter.constants.ts

@@ -7,7 +7,7 @@
  */
 
 import { TranslationKey } from '@/Base.types.ts';
-import { ChapterListOptions, ChapterSortMode } from '@/modules/chapter/Chapter.types.ts';
+import { ChapterAction, ChapterListOptions, ChapterSortMode } from '@/modules/chapter/Chapter.types.ts';
 
 export const FALLBACK_CHAPTER = { id: -1, name: '', realUrl: '', isBookmarked: false };
 
@@ -26,3 +26,63 @@ export const CHAPTER_SORT_OPTIONS_TO_TRANSLATION_KEY: Record<ChapterSortMode, Tr
     uploadedAt: 'global.sort.label.by_upload_date',
     fetchedAt: 'global.sort.label.by_fetch_date',
 };
+
+export const CHAPTER_ACTION_TO_TRANSLATION: {
+    [key in ChapterAction]: {
+        action: {
+            single: TranslationKey;
+            selected: TranslationKey;
+        };
+        success: TranslationKey;
+        error: TranslationKey;
+    };
+} = {
+    download: {
+        action: {
+            single: 'chapter.action.download.add.label.action',
+            selected: 'chapter.action.download.add.button.selected',
+        },
+        success: 'chapter.action.download.add.label.success',
+        error: 'chapter.action.download.add.label.error',
+    },
+    delete: {
+        action: {
+            single: 'chapter.action.download.delete.label.action',
+            selected: 'chapter.action.download.delete.button.selected',
+        },
+        success: 'chapter.action.download.delete.label.success',
+        error: 'chapter.action.download.delete.label.error',
+    },
+    bookmark: {
+        action: {
+            single: 'chapter.action.bookmark.add.label.action',
+            selected: 'chapter.action.bookmark.add.button.selected',
+        },
+        success: 'chapter.action.bookmark.add.label.success',
+        error: 'chapter.action.bookmark.add.label.error',
+    },
+    unbookmark: {
+        action: {
+            single: 'chapter.action.bookmark.remove.label.action',
+            selected: 'chapter.action.bookmark.remove.button.selected',
+        },
+        success: 'chapter.action.bookmark.remove.label.success',
+        error: 'chapter.action.bookmark.remove.label.error',
+    },
+    mark_as_read: {
+        action: {
+            single: 'chapter.action.mark_as_read.add.label.action.current',
+            selected: 'chapter.action.mark_as_read.add.button.selected',
+        },
+        success: 'chapter.action.mark_as_read.add.label.success',
+        error: 'chapter.action.mark_as_read.add.label.error',
+    },
+    mark_as_unread: {
+        action: {
+            single: 'chapter.action.mark_as_read.remove.label.action',
+            selected: 'chapter.action.mark_as_read.remove.button.selected',
+        },
+        success: 'chapter.action.mark_as_read.remove.label.success',
+        error: 'chapter.action.mark_as_read.remove.label.error',
+    },
+};

src/modules/chapter/Chapter.types.ts

@@ -7,7 +7,11 @@
  */
 
 import { NullAndUndefined } from '@/Base.types.ts';
-import { ChapterReaderFieldsFragment } from '@/lib/graphql/generated/graphql.ts';
+import {
+    ChapterReaderFieldsFragment,
+    ChapterType,
+    DownloadStatusFieldsFragment,
+} from '@/lib/graphql/generated/graphql.ts';
 
 export type ChapterSortMode = 'fetchedAt' | 'source' | 'chapterNumber' | 'uploadedAt';
 
@@ -21,3 +25,25 @@ export interface ChapterListOptions {
 }
 
 export type TChapterReader = ChapterReaderFieldsFragment;
+
+export type ChapterAction = 'download' | 'delete' | 'bookmark' | 'unbookmark' | 'mark_as_read' | 'mark_as_unread';
+
+export type ChapterDownloadStatus = DownloadStatusFieldsFragment['queue'][number];
+
+export type ChapterIdInfo = Pick<ChapterType, 'id'>;
+
+export type ChapterMangaInfo = Pick<ChapterType, 'mangaId'>;
+
+export type ChapterDownloadInfo = ChapterIdInfo & Pick<ChapterType, 'isDownloaded'>;
+
+export type ChapterBookmarkInfo = ChapterIdInfo & Pick<ChapterType, 'isBookmarked'>;
+
+export type ChapterReadInfo = ChapterIdInfo & Pick<ChapterType, 'isRead'>;
+
+export type ChapterNumberInfo = ChapterIdInfo & Pick<ChapterType, 'chapterNumber'>;
+
+export type ChapterSourceOrderInfo = ChapterIdInfo & Pick<ChapterType, 'sourceOrder'>;
+
+export type ChapterScanlatorInfo = ChapterIdInfo & Pick<ChapterType, 'scanlator'>;
+
+export type ChapterRealUrlInfo = Pick<ChapterType, 'realUrl'>;

src/modules/chapter/components/actions/ChapterActionMenuItems.tsx

@@ -18,17 +18,7 @@ import DoneAll from '@mui/icons-material/DoneAll';
 import { ComponentProps, useMemo } from 'react';
 import LaunchIcon from '@mui/icons-material/Launch';
 import { SelectableCollectionReturnType } from '@/modules/collection/hooks/useSelectableCollection.ts';
-import {
-    CHAPTER_ACTION_TO_TRANSLATION,
-    ChapterAction,
-    ChapterBookmarkInfo,
-    ChapterDownloadInfo,
-    ChapterIdInfo,
-    ChapterMangaInfo,
-    ChapterReadInfo,
-    ChapterRealUrlInfo,
-    Chapters,
-} from '@/modules/chapter/services/Chapters.ts';
+import { Chapters } from '@/modules/chapter/services/Chapters.ts';
 import { MenuItem } from '@/modules/core/components/menu/MenuItem.tsx';
 import {
     createGetMenuItemTitle,
@@ -41,6 +31,16 @@ import { ChapterCard } from '@/modules/chapter/components/cards/ChapterCard.tsx'
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { GetChaptersMangaQuery } from '@/lib/graphql/generated/graphql.ts';
 import { GET_CHAPTERS_MANGA } from '@/lib/graphql/queries/ChapterQuery.ts';
+import { CHAPTER_ACTION_TO_TRANSLATION } from '@/modules/chapter/Chapter.constants.ts';
+import {
+    ChapterAction,
+    ChapterBookmarkInfo,
+    ChapterDownloadInfo,
+    ChapterIdInfo,
+    ChapterMangaInfo,
+    ChapterReadInfo,
+    ChapterRealUrlInfo,
+} from '@/modules/chapter/Chapter.types.ts';
 
 type BaseProps = { onClose: () => void; selectable?: boolean };
 

src/modules/chapter/components/buttons/ChapterDownloadButton.tsx

@@ -10,11 +10,12 @@ import IconButton from '@mui/material/IconButton';
 import { useTranslation } from 'react-i18next';
 import DownloadIcon from '@mui/icons-material/Download';
 import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { ChapterIdInfo, Chapters } from '@/modules/chapter/services/Chapters.ts';
+import { Chapters } from '@/modules/chapter/services/Chapters.ts';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 import { MUIUtil } from '@/lib/mui/MUI.util.ts';
+import { ChapterIdInfo } from '@/modules/chapter/Chapter.types.ts';
 
 export const ChapterDownloadButton = ({
     chapterId,

src/modules/chapter/components/buttons/ChapterDownloadRetryButton.tsx

@@ -11,11 +11,12 @@ import IconButton from '@mui/material/IconButton';
 import { useTranslation } from 'react-i18next';
 import { DownloadState } from '@/lib/graphql/generated/graphql.ts';
 import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
-import { ChapterIdInfo, Chapters } from '@/modules/chapter/services/Chapters.ts';
+import { Chapters } from '@/modules/chapter/services/Chapters.ts';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { makeToast } from '@/modules/core/utils/Toast.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 import { MUIUtil } from '@/lib/mui/MUI.util.ts';
+import { ChapterIdInfo } from '@/modules/chapter/Chapter.types.ts';
 
 export const ChapterDownloadRetryButton = ({ chapterId }: { chapterId: ChapterIdInfo['id'] }) => {
     const { t } = useTranslation();

src/modules/chapter/components/cards/ChapterCard.tsx

@@ -25,6 +25,11 @@ import { DownloadStateIndicator } from '@/modules/core/components/downloads/Down
 import { ChapterType } from '@/lib/graphql/generated/graphql.ts';
 import { ChapterActionMenuItems } from '@/modules/chapter/components/actions/ChapterActionMenuItems.tsx';
 import { Menu } from '@/modules/core/components/menu/Menu.tsx';
+import { Chapters } from '@/modules/chapter/services/Chapters.ts';
+import { applyStyles } from '@/modules/core/utils/ApplyStyles.ts';
+import { ChapterCardMetadata } from '@/modules/chapter/components/cards/ChapterCardMetadata.tsx';
+import { MUIUtil } from '@/lib/mui/MUI.util.ts';
+import { ListCardContent } from '@/modules/core/components/lists/cards/ListCardContent.tsx';
 import {
     ChapterBookmarkInfo,
     ChapterDownloadInfo,
@@ -32,13 +37,8 @@ import {
     ChapterMangaInfo,
     ChapterNumberInfo,
     ChapterReadInfo,
-    Chapters,
     ChapterScanlatorInfo,
-} from '@/modules/chapter/services/Chapters.ts';
-import { applyStyles } from '@/modules/core/utils/ApplyStyles.ts';
-import { ChapterCardMetadata } from '@/modules/chapter/components/cards/ChapterCardMetadata.tsx';
-import { MUIUtil } from '@/lib/mui/MUI.util.ts';
-import { ListCardContent } from '@/modules/core/components/lists/cards/ListCardContent.tsx';
+} from '@/modules/chapter/Chapter.types.ts';
 
 type TChapter = ChapterIdInfo &
     ChapterMangaInfo &

src/modules/chapter/services/Chapters.ts

@@ -15,92 +15,28 @@ import {
     ChapterListFieldsFragment,
     ChapterType,
     DownloadState,
-    DownloadStatusFieldsFragment,
     DownloadTypeFieldsFragment,
 } from '@/lib/graphql/generated/graphql.ts';
 import { CHAPTER_LIST_FIELDS } from '@/lib/graphql/fragments/ChapterFragments.ts';
 
-import { DirectionOffset, TranslationKey } from '@/Base.types.ts';
+import { DirectionOffset } from '@/Base.types.ts';
 import { MangaIdInfo } from '@/modules/manga/Manga.types.ts';
 import { ReaderOpenChapterLocationState, ReaderResumeMode } from '@/modules/reader/types/Reader.types.ts';
 import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 import { DOWNLOAD_TYPE_FIELDS } from '@/lib/graphql/fragments/DownloadFragments.ts';
 import { epochToDate, getDateString } from '@/util/DateHelper.ts';
-
-export type ChapterAction = 'download' | 'delete' | 'bookmark' | 'unbookmark' | 'mark_as_read' | 'mark_as_unread';
-
-export const CHAPTER_ACTION_TO_TRANSLATION: {
-    [key in ChapterAction]: {
-        action: {
-            single: TranslationKey;
-            selected: TranslationKey;
-        };
-        success: TranslationKey;
-        error: TranslationKey;
-    };
-} = {
-    download: {
-        action: {
-            single: 'chapter.action.download.add.label.action',
-            selected: 'chapter.action.download.add.button.selected',
-        },
-        success: 'chapter.action.download.add.label.success',
-        error: 'chapter.action.download.add.label.error',
-    },
-    delete: {
-        action: {
-            single: 'chapter.action.download.delete.label.action',
-            selected: 'chapter.action.download.delete.button.selected',
-        },
-        success: 'chapter.action.download.delete.label.success',
-        error: 'chapter.action.download.delete.label.error',
-    },
-    bookmark: {
-        action: {
-            single: 'chapter.action.bookmark.add.label.action',
-            selected: 'chapter.action.bookmark.add.button.selected',
-        },
-        success: 'chapter.action.bookmark.add.label.success',
-        error: 'chapter.action.bookmark.add.label.error',
-    },
-    unbookmark: {
-        action: {
-            single: 'chapter.action.bookmark.remove.label.action',
-            selected: 'chapter.action.bookmark.remove.button.selected',
-        },
-        success: 'chapter.action.bookmark.remove.label.success',
-        error: 'chapter.action.bookmark.remove.label.error',
-    },
-    mark_as_read: {
-        action: {
-            single: 'chapter.action.mark_as_read.add.label.action.current',
-            selected: 'chapter.action.mark_as_read.add.button.selected',
-        },
-        success: 'chapter.action.mark_as_read.add.label.success',
-        error: 'chapter.action.mark_as_read.add.label.error',
-    },
-    mark_as_unread: {
-        action: {
-            single: 'chapter.action.mark_as_read.remove.label.action',
-            selected: 'chapter.action.mark_as_read.remove.button.selected',
-        },
-        success: 'chapter.action.mark_as_read.remove.label.success',
-        error: 'chapter.action.mark_as_read.remove.label.error',
-    },
-};
-
-export type ChapterDownloadStatus = DownloadStatusFieldsFragment['queue'][number];
-
-export type ChapterIdInfo = Pick<ChapterType, 'id'>;
-export type ChapterMangaInfo = Pick<ChapterType, 'mangaId'>;
-export type ChapterDownloadInfo = ChapterIdInfo & Pick<ChapterType, 'isDownloaded'>;
-export type ChapterBookmarkInfo = ChapterIdInfo & Pick<ChapterType, 'isBookmarked'>;
-export type ChapterReadInfo = ChapterIdInfo & Pick<ChapterType, 'isRead'>;
-export type ChapterNumberInfo = ChapterIdInfo & Pick<ChapterType, 'chapterNumber'>;
-export type ChapterSourceOrderInfo = ChapterIdInfo & Pick<ChapterType, 'sourceOrder'>;
-export type ChapterScanlatorInfo = ChapterIdInfo & Pick<ChapterType, 'scanlator'>;
-export type ChapterRealUrlInfo = Pick<ChapterType, 'realUrl'>;
+import { CHAPTER_ACTION_TO_TRANSLATION } from '@/modules/chapter/Chapter.constants.ts';
+import {
+    ChapterAction,
+    ChapterBookmarkInfo,
+    ChapterDownloadInfo,
+    ChapterMangaInfo,
+    ChapterNumberInfo,
+    ChapterReadInfo,
+    ChapterScanlatorInfo,
+    ChapterSourceOrderInfo,
+} from '@/modules/chapter/Chapter.types.ts';
 
 export class Chapters {
     static getIds(chapters: { id: number }[]): number[] {

src/modules/chapter/utils/ChapterList.util.tsx

@@ -7,10 +7,14 @@
  */
 
 import { useMemo } from 'react';
-import { ChapterBookmarkInfo, ChapterDownloadInfo, ChapterReadInfo } from '@/modules/chapter/services/Chapters.ts';
 import { ChapterType } from '@/lib/graphql/generated/graphql.ts';
 import { NullAndUndefined } from '@/Base.types.ts';
-import { ChapterListOptions } from '@/modules/chapter/Chapter.types.ts';
+import {
+    ChapterBookmarkInfo,
+    ChapterDownloadInfo,
+    ChapterListOptions,
+    ChapterReadInfo,
+} from '@/modules/chapter/Chapter.types.ts';
 import { MangaIdInfo } from '@/modules/manga/Manga.types.ts';
 import { GqlMetaHolder } from '@/modules/metadata/Metadata.types.ts';
 import { createUpdateMangaMetadata, useGetMangaMetadata } from '@/modules/manga/services/MangaMetadata.ts';