From 606ee9de2d8b99e86264cf95d549ec2244908ebf Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Tue, 23 May 2023 13:54:14 +0200 Subject: [PATCH] RequestManager make requests abortable - Fix missed usages (#318) --- src/components/ExtensionCard.tsx | 6 +++--- src/components/library/UpdateChecker.tsx | 2 +- src/screens/DownloadQueue.tsx | 6 +++--- src/screens/settings/LibrarySettings.tsx | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/ExtensionCard.tsx b/src/components/ExtensionCard.tsx index 7229fe09..f9a2b009 100644 --- a/src/components/ExtensionCard.tsx +++ b/src/components/ExtensionCard.tsx @@ -87,13 +87,13 @@ export default function ExtensionCard(props: IProps) { setInstalledState(state); switch (action) { case ExtensionAction.INSTALL: - await requestManager.installExtension(pkgName); + await requestManager.installExtension(pkgName).response; break; case ExtensionAction.UNINSTALL: - await requestManager.uninstallExtension(pkgName); + await requestManager.uninstallExtension(pkgName).response; break; case ExtensionAction.UPDATE: - await requestManager.updateExtension(pkgName); + await requestManager.updateExtension(pkgName).response; break; default: throw new Error(`Unexpected ExtensionAction "${action}"`); diff --git a/src/components/library/UpdateChecker.tsx b/src/components/library/UpdateChecker.tsx index fbddc0f1..243f8719 100644 --- a/src/components/library/UpdateChecker.tsx +++ b/src/components/library/UpdateChecker.tsx @@ -46,7 +46,7 @@ function UpdateChecker({ handleFinishedUpdate }: IUpdateCheckerProps) { try { setLoading(true); setProgress(0); - await requestManager.startGlobalUpdate(); + await requestManager.startGlobalUpdate().response; } catch (e) { makeToast(t('global.error.label.update_failed'), 'error'); setLoading(false); diff --git a/src/screens/DownloadQueue.tsx b/src/screens/DownloadQueue.tsx index 211f41b9..54ecbc2b 100644 --- a/src/screens/DownloadQueue.tsx +++ b/src/screens/DownloadQueue.tsx @@ -67,15 +67,15 @@ const DownloadQueue: React.FC = () => { try { if (isRunning) { // required to stop before deleting otherwise the download kept going. Server issue? - await requestManager.stopDownloads(); + await requestManager.stopDownloads().response; } await Promise.all([ // remove from download queue - requestManager.removeChapterFromDownloadQueue(chapter.mangaId, chapter.index), + requestManager.removeChapterFromDownloadQueue(chapter.mangaId, chapter.index).response, // delete partial download, should be handle server side? // bug: The folder and the last image downloaded are not deleted - requestManager.deleteDownloadedChapter(chapter.mangaId, chapter.index), + requestManager.deleteDownloadedChapter(chapter.mangaId, chapter.index).response, ]); } catch (error) { makeToast(t('download.queue.error.label.failed_to_remove'), 'error'); diff --git a/src/screens/settings/LibrarySettings.tsx b/src/screens/settings/LibrarySettings.tsx index fdacf582..8f853092 100644 --- a/src/screens/settings/LibrarySettings.tsx +++ b/src/screens/settings/LibrarySettings.tsx @@ -111,7 +111,7 @@ export default function LibrarySettings() { ); const updateCategory = (category: ICategory) => - requestManager.updateCategory(category.id, { includeInUpdate: category.includeInUpdate }); + requestManager.updateCategory(category.id, { includeInUpdate: category.includeInUpdate }).response; const updateCategories = async () => { const categoriesToUpdate = dialogCategories.filter((category) => {