ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new gql sort options

Browse Source
This commit is contained in:
schroda
2024-07-28 22:21:11 +02:00
parent cdcf69a3a2
commit e1e2cbc679
7 changed files with 89 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib/graphql/generated/graphql.ts
View File

@@ -3218,8 +3218,7 @@ export type GetCategoriesBaseQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<CategoryOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<CategoryOrderInput> | CategoryOrderInput>;
}>;
@@ -3233,8 +3232,7 @@ export type GetCategoriesLibraryQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<CategoryOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<CategoryOrderInput> | CategoryOrderInput>;
}>;
@@ -3248,8 +3246,7 @@ export type GetCategoriesSettingsQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<CategoryOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<CategoryOrderInput> | CategoryOrderInput>;
}>;
@@ -3270,8 +3267,7 @@ export type GetChaptersReaderQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<ChapterOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<ChapterOrderInput> | ChapterOrderInput>;
}>;
@@ -3285,8 +3281,7 @@ export type GetChaptersMangaQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<ChapterOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<ChapterOrderInput> | ChapterOrderInput>;
}>;
@@ -3300,8 +3295,7 @@ export type GetChaptersUpdatesQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<ChapterOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<ChapterOrderInput> | ChapterOrderInput>;
}>;
@@ -3330,8 +3324,7 @@ export type GetExtensionsQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<ExtensionOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<ExtensionOrderInput> | ExtensionOrderInput>;
}>;
@@ -3352,8 +3345,7 @@ export type GetGlobalMetadatasQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<MetaOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<MetaOrderInput> | MetaOrderInput>;
}>;
@@ -3405,8 +3397,7 @@ export type GetMangasBaseQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<MangaOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<MangaOrderInput> | MangaOrderInput>;
}>;
@@ -3420,8 +3411,7 @@ export type GetMangasLibraryQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<MangaOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<MangaOrderInput> | MangaOrderInput>;
}>;
@@ -3435,8 +3425,7 @@ export type GetMangasDuplicatesQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
last?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
orderBy?: InputMaybe<MangaOrderBy>;
orderByType?: InputMaybe<SortOrder>;
order?: InputMaybe<Array<MangaOrderInput> | MangaOrderInput>;
}>;

18
src/lib/graphql/queries/CategoryQuery.ts
View File

@@ -27,8 +27,7 @@ export const GET_CATEGORIES_BASE = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: CategoryOrderBy
$orderByType: SortOrder
$order: [CategoryOrderInput!]
) {
categories(
after: $after
@@ -38,8 +37,7 @@ export const GET_CATEGORIES_BASE = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...CATEGORY_BASE_FIELDS
@@ -64,8 +62,7 @@ export const GET_CATEGORIES_LIBRARY = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: CategoryOrderBy
$orderByType: SortOrder
$order: [CategoryOrderInput!]
) {
categories(
after: $after
@@ -75,8 +72,7 @@ export const GET_CATEGORIES_LIBRARY = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...CATEGORY_LIBRARY_FIELDS
@@ -101,8 +97,7 @@ export const GET_CATEGORIES_SETTINGS = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: CategoryOrderBy
$orderByType: SortOrder
$order: [CategoryOrderInput!]
) {
categories(
after: $after
@@ -112,8 +107,7 @@ export const GET_CATEGORIES_SETTINGS = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...CATEGORY_SETTING_FIELDS

18
src/lib/graphql/queries/ChapterQuery.ts
View File

@@ -28,8 +28,7 @@ export const GET_CHAPTERS_READER = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: ChapterOrderBy
$orderByType: SortOrder
$order: [ChapterOrderInput!]
) {
chapters(
after: $after
@@ -39,8 +38,7 @@ export const GET_CHAPTERS_READER = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...CHAPTER_READER_FIELDS
@@ -66,8 +64,7 @@ export const GET_CHAPTERS_MANGA = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: ChapterOrderBy
$orderByType: SortOrder
$order: [ChapterOrderInput!]
) {
chapters(
after: $after
@@ -77,8 +74,7 @@ export const GET_CHAPTERS_MANGA = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...CHAPTER_LIST_FIELDS
@@ -104,8 +100,7 @@ export const GET_CHAPTERS_UPDATES = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: ChapterOrderBy
$orderByType: SortOrder
$order: [ChapterOrderInput!]
) {
chapters(
after: $after
@@ -115,8 +110,7 @@ export const GET_CHAPTERS_UPDATES = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...CHAPTER_UPDATE_LIST_FIELDS

6
src/lib/graphql/queries/ExtensionQuery.ts
View File

@@ -23,8 +23,7 @@ export const GET_EXTENSIONS = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: ExtensionOrderBy
$orderByType: SortOrder
$order: [ExtensionOrderInput!]
) {
extensions(
after: $after
@@ -34,8 +33,7 @@ export const GET_EXTENSIONS = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...EXTENSION_LIST_FIELDS

6
src/lib/graphql/queries/GlobalMetadataQuery.ts
View File

@@ -29,8 +29,7 @@ export const GET_GLOBAL_METADATAS = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: MetaOrderBy
$orderByType: SortOrder
$order: [MetaOrderInput!]
) {
metas(
after: $after
@@ -40,8 +39,7 @@ export const GET_GLOBAL_METADATAS = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...GLOBAL_METADATA

18
src/lib/graphql/queries/MangaQuery.ts
View File

@@ -127,8 +127,7 @@ export const GET_MANGAS_BASE = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: MangaOrderBy
$orderByType: SortOrder
$order: [MangaOrderInput!]
) {
mangas(
after: $after
@@ -138,8 +137,7 @@ export const GET_MANGAS_BASE = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...MANGA_BASE_FIELDS
@@ -165,8 +163,7 @@ export const GET_MANGAS_LIBRARY = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: MangaOrderBy
$orderByType: SortOrder
$order: [MangaOrderInput!]
) {
mangas(
after: $after
@@ -176,8 +173,7 @@ export const GET_MANGAS_LIBRARY = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...MANGA_LIBRARY_FIELDS
@@ -203,8 +199,7 @@ export const GET_MANGAS_DUPLICATES = gql`
$first: Int
$last: Int
$offset: Int
$orderBy: MangaOrderBy
$orderByType: SortOrder
$order: [MangaOrderInput!]
) {
mangas(
after: $after
@@ -214,8 +209,7 @@ export const GET_MANGAS_DUPLICATES = gql`
first: $first
last: $last
offset: $offset
orderBy: $orderBy
orderByType: $orderByType
order: $order
) {
nodes {
...MANGA_LIBRARY_DUPLICATE_SCREEN_FIELDS

113
src/lib/requests/RequestManager.ts
View File

@@ -31,12 +31,13 @@ import { IRestClient, RestClient } from '@/lib/requests/client/RestClient.ts';
import { GraphQLClient } from '@/lib/requests/client/GraphQLClient.ts';
import {
CategoryOrderBy,
ChapterConditionInput,
ChapterOrderBy,
CheckForServerUpdatesQuery,
CheckForServerUpdatesQueryVariables,
ClearCachedImagesInput,
CheckForWebuiUpdateQuery,
CheckForWebuiUpdateQueryVariables,
ClearCachedImagesInput,
ClearDownloaderMutation,
ClearDownloaderMutationVariables,
ClearServerCacheMutation,
@@ -65,10 +66,18 @@ import {
FilterChangeInput,
GetAboutQuery,
GetAboutQueryVariables,
GetCategoriesSettingsQuery,
GetCategoriesSettingsQueryVariables,
GetCategoryMangasQuery,
GetCategoryMangasQueryVariables,
GetChapterPagesFetchMutation,
GetChapterPagesFetchMutationVariables,
GetChaptersMangaQuery,
GetChaptersMangaQueryVariables,
GetChaptersUpdatesQuery,
GetChaptersUpdatesQueryVariables,
GetDownloadStatusQuery,
GetDownloadStatusQueryVariables,
GetExtensionsFetchMutation,
GetExtensionsFetchMutationVariables,
GetExtensionsQuery,
@@ -81,17 +90,36 @@ import {
GetMangaChaptersFetchMutationVariables,
GetMangaFetchMutation,
GetMangaFetchMutationVariables,
GetMangasChapterIdsWithStateQuery,
GetMangasChapterIdsWithStateQueryVariables,
GetMangasLibraryQuery,
GetMangasLibraryQueryVariables,
GetMangaToMigrateQuery,
GetMangaToMigrateQueryVariables,
GetMangaToMigrateToFetchMutation,
GetMangaToMigrateToFetchMutationVariables,
GetMigratableSourceMangasQuery,
GetMigratableSourceMangasQueryVariables,
GetMigratableSourcesQuery,
GetMigratableSourcesQueryVariables,
GetRestoreStatusQuery,
GetRestoreStatusQueryVariables,
GetServerSettingsQuery,
GetServerSettingsQueryVariables,
GetSourceMangasFetchMutation,
GetSourceMangasFetchMutationVariables,
GetSourcesListQuery,
GetSourcesListQueryVariables,
GetUpdateStatusQuery,
GetUpdateStatusQueryVariables,
GetWebuiUpdateStatusQuery,
GetWebuiUpdateStatusQueryVariables,
InstallExternalExtensionMutation,
InstallExternalExtensionMutationVariables,
ReorderChapterDownloadMutation,
ReorderChapterDownloadMutationVariables,
ResetWebuiUpdateStatusMutation,
ResetWebuiUpdateStatusMutationVariables,
RestoreBackupMutation,
RestoreBackupMutationVariables,
SetCategoryMetadataMutation,
@@ -102,6 +130,8 @@ import {
SetGlobalMetadataMutationVariables,
SetMangaMetadataMutation,
SetMangaMetadataMutationVariables,
SetSourceMetadataMutation,
SetSourceMetadataMutationVariables,
SortOrder,
SourcePreferenceChangeInput,
StartDownloaderMutation,
@@ -110,6 +140,22 @@ import {
StopDownloaderMutationVariables,
StopUpdaterMutation,
StopUpdaterMutationVariables,
TrackerBindMutation,
TrackerBindMutationVariables,
TrackerFetchBindMutation,
TrackerFetchBindMutationVariables,
TrackerLoginCredentialsMutation,
TrackerLoginCredentialsMutationVariables,
TrackerLoginOauthMutation,
TrackerLoginOauthMutationVariables,
TrackerLogoutMutation,
TrackerLogoutMutationVariables,
TrackerSearchQuery,
TrackerSearchQueryVariables,
TrackerUnbindMutation,
TrackerUnbindMutationVariables,
TrackerUpdateBindMutation,
TrackerUpdateBindMutationVariables,
UpdateCategoryMangasMutation,
UpdateCategoryMangasMutationVariables,
UpdateCategoryMutation,
@@ -129,72 +175,26 @@ import {
UpdateLibraryMangasMutationVariables,
UpdateMangaCategoriesMutation,
UpdateMangaCategoriesMutationVariables,
UpdateMangaCategoriesPatchInput,
UpdateMangaMutation,
UpdateMangaMutationVariables,
UpdateMangaPatchInput,
UpdateMangasCategoriesMutation,
UpdateMangasCategoriesMutationVariables,
UpdateMangasMutation,
UpdateMangasMutationVariables,
UpdaterSubscription,
UpdaterSubscriptionVariables,
UpdateServerSettingsMutation,
UpdateServerSettingsMutationVariables,
UpdateSourcePreferencesMutation,
UpdateSourcePreferencesMutationVariables,
UpdateTrackInput,
UpdateWebuiMutation,
UpdateWebuiMutationVariables,
ValidateBackupQuery,
ValidateBackupQueryVariables,
WebuiUpdateSubscription,
ResetWebuiUpdateStatusMutation,
ResetWebuiUpdateStatusMutationVariables,
GetDownloadStatusQuery,
GetDownloadStatusQueryVariables,
GetMangasChapterIdsWithStateQuery,
GetMangasChapterIdsWithStateQueryVariables,
ChapterConditionInput,
UpdateMangasMutation,
UpdateMangasMutationVariables,
UpdateMangasCategoriesMutation,
UpdateMangasCategoriesMutationVariables,
UpdateMangaCategoriesPatchInput,
GetWebuiUpdateStatusQuery,
GetWebuiUpdateStatusQueryVariables,
GetMigratableSourcesQuery,
GetMigratableSourcesQueryVariables,
GetMigratableSourceMangasQuery,
GetMigratableSourceMangasQueryVariables,
GetMangaToMigrateQuery,
GetMangaToMigrateQueryVariables,
GetMangaToMigrateToFetchMutation,
GetMangaToMigrateToFetchMutationVariables,
TrackerLogoutMutation,
TrackerLogoutMutationVariables,
TrackerLoginOauthMutation,
TrackerLoginOauthMutationVariables,
TrackerLoginCredentialsMutation,
TrackerLoginCredentialsMutationVariables,
TrackerSearchQuery,
TrackerSearchQueryVariables,
TrackerBindMutation,
TrackerBindMutationVariables,
TrackerUpdateBindMutation,
TrackerUpdateBindMutationVariables,
UpdateTrackInput,
TrackerUnbindMutation,
TrackerUnbindMutationVariables,
TrackerFetchBindMutation,
TrackerFetchBindMutationVariables,
GetServerSettingsQueryVariables,
SetSourceMetadataMutation,
SetSourceMetadataMutationVariables,
GetCategoriesSettingsQuery,
GetCategoriesSettingsQueryVariables,
GetChaptersMangaQuery,
GetChaptersMangaQueryVariables,
GetChaptersUpdatesQuery,
GetChaptersUpdatesQueryVariables,
GetSourcesListQuery,
GetSourcesListQueryVariables,
GetMangasLibraryQuery,
GetMangasLibraryQueryVariables,
} from '@/lib/graphql/generated/graphql.ts';
import { GET_GLOBAL_METADATAS } from '@/lib/graphql/queries/GlobalMetadataQuery.ts';
import { SET_GLOBAL_METADATA } from '@/lib/graphql/mutations/GlobalMetadataMutation.ts';
@@ -2097,7 +2097,7 @@ export class RequestManager {
GetCategoriesSettingsQueryVariables
>({
query: GET_CATEGORIES_SETTINGS,
variables: { orderBy: CategoryOrderBy.Order },
variables: { order: [{ by: CategoryOrderBy.Order }] },
})?.categories.nodes;
if (!variables) {
@@ -2121,7 +2121,7 @@ export class RequestManager {
{
id: cache.identify({ __typename: 'CategoryNodeList' }),
query: GET_CATEGORIES_SETTINGS,
variables: { orderBy: CategoryOrderBy.Order },
variables: { order: [{ by: CategoryOrderBy.Order }] },
},
(data) => ({
...data!,
@@ -2409,8 +2409,7 @@ export class RequestManager {
GET_CHAPTERS_UPDATES,
{
filter: { inLibrary: { equalTo: true } },
orderBy: ChapterOrderBy.FetchedAt,
orderByType: SortOrder.Desc,
order: [{ by: ChapterOrderBy.FetchedAt, byType: SortOrder.Desc }],
first: initialPages * PAGE_SIZE + lastOffset,
},
options,