Improve logic of reset pagination in the TaskList component

hotosm · May 11, 2021 · 0595f22 · 0595f22
1 parent 0084afa
commit 0595f22
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/frontend/src/components/taskSelection/taskList.js b/frontend/src/components/taskSelection/taskList.js
@@ -394,10 +394,12 @@ function PaginatedList({
 }: Object) {
   const [page, setPage] = useQueryParam('page', NumberParam);
   const lastPage = howManyPages(items.length, pageSize);
-  // change page to 1 if the page number is not valid
-  if (items && page && page > lastPage) {
-    setPage(1);
-  }
+  // reset page number to 1 if it is not valid any more
+  useEffect(() => {
+    if (items && page > 1 && page > lastPage) {
+      setPage(1);
+    }
+  }, [items, page, lastPage, setPage]);
 
   const latestItems = useRef(items);
   useEffect(() => {