From b17fcd30afcdec188224177fc2d83a5e5464f2dd Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:10:37 +0200 Subject: [PATCH] Replace deprecated gql sort inputs Was missed in e1e2cbc679fb338b02c6cc6309c505f11acb5780 and caused unexpected behaviour due to the response data being incorrectly sorted --- src/lib/graphql/queries/ChapterQuery.ts | 2 +- src/lib/requests/RequestManager.ts | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/lib/graphql/queries/ChapterQuery.ts b/src/lib/graphql/queries/ChapterQuery.ts index a25f0ce0..e04da0a4 100644 --- a/src/lib/graphql/queries/ChapterQuery.ts +++ b/src/lib/graphql/queries/ChapterQuery.ts @@ -135,7 +135,7 @@ export const GET_MANGAS_CHAPTER_IDS_WITH_STATE = gql` chapters( filter: { mangaId: { in: $mangaIds } } condition: { isDownloaded: $isDownloaded, isRead: $isRead, isBookmarked: $isBookmarked } - orderBy: SOURCE_ORDER + order: [{ by: SOURCE_ORDER }] ) { nodes { ...CHAPTER_STATE_FIELDS diff --git a/src/lib/requests/RequestManager.ts b/src/lib/requests/RequestManager.ts index 47a29253..9b3e3496 100644 --- a/src/lib/requests/RequestManager.ts +++ b/src/lib/requests/RequestManager.ts @@ -1864,9 +1864,8 @@ export class RequestManager { document, { condition: { mangaId: Number(mangaId) }, - orderBy: ChapterOrderBy.SourceOrder, - orderByType: SortOrder.Desc, - } as unknown as Variables, + order: [{ by: ChapterOrderBy.SourceOrder, byType: SortOrder.Desc }], + } satisfies GetChaptersMangaQueryVariables as unknown as Variables, options, ); } @@ -2048,8 +2047,8 @@ export class RequestManager { GQLMethod.USE_QUERY, document, { - orderBy: CategoryOrderBy.Order, - } as unknown as Variables, + order: [{ by: CategoryOrderBy.Order }], + } satisfies GetCategoriesSettingsQueryVariables as unknown as Variables, options, ); } @@ -2062,8 +2061,8 @@ export class RequestManager { GQLMethod.QUERY, document, { - orderBy: CategoryOrderBy.Order, - } as unknown as Variables, + order: [{ by: CategoryOrderBy.Order }], + } satisfies GetCategoriesSettingsQueryVariables as unknown as Variables, options, ); }