From 947ec803b312d944eef8570a2affcfbc7d682ba4 Mon Sep 17 00:00:00 2001 From: MerlinScheurer Date: Sat, 29 Mar 2025 10:56:26 +0100 Subject: [PATCH] Fix Download page not refetching on page change --- frontend/src/pages/Base.tsx | 6 +++++- frontend/src/pages/Download.tsx | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/frontend/src/pages/Base.tsx b/frontend/src/pages/Base.tsx index 611f45cd..6a3d959b 100644 --- a/frontend/src/pages/Base.tsx +++ b/frontend/src/pages/Base.tsx @@ -80,7 +80,11 @@ const Base = () => { useEffect(() => { if (currentPageFromUrl !== currentPage) { setSearchParams(params => { - params.set('page', currentPage.toString()); + if (currentPage == 0) { + params.delete('page'); + } else { + params.set('page', currentPage.toString()); + } return params; }); diff --git a/frontend/src/pages/Download.tsx b/frontend/src/pages/Download.tsx index b4e1b688..4fc06d28 100644 --- a/frontend/src/pages/Download.tsx +++ b/frontend/src/pages/Download.tsx @@ -117,7 +117,11 @@ const Download = () => { })(); // eslint-disable-next-line react-hooks/exhaustive-deps - }, [refresh, showIgnored, currentPage]); + }, [refresh]); + + useEffect(() => { + setRefresh(true); + }, [channelFilterFromUrl, currentPage, showIgnored]); useEffect(() => { (async () => { @@ -127,10 +131,6 @@ const Download = () => { })(); }, [lastVideoCount, showIgnored]); - useEffect(() => { - setRefresh(true); - }, [channelFilterFromUrl]); - return ( <> TA | Downloads @@ -262,7 +262,7 @@ const Download = () => { const params = searchParams; if (value !== 'all') { - params.append('channel', value); + params.set('channel', value); } else { params.delete('channel'); }