Reset current page upon search change

Kiro47 · May 3, 2020 · 8f4eb1a · 8f4eb1a
1 parent 0b22262
commit 8f4eb1a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/webapp/src/ui/components/courses-list.js b/webapp/src/ui/components/courses-list.js
@@ -24,6 +24,11 @@ const CoursesList = ({data}) => {
   const [page, setPage] = useState(0);
   const [rowsPerPage, setRowsPerPage] = useState(50);
 
+  // Reset current page upon data change
+  useEffect(() => {
+    setPage(0);
+  }, [data]);
+
   useEffect(() => {
     setDisplayedData(data.slice(rowsPerPage * page, rowsPerPage * (page + 1)));
   }, [rowsPerPage, page, data]);

diff --git a/webapp/src/ui/courses.js b/webapp/src/ui/courses.js
@@ -84,7 +84,7 @@ const Courses = () => {
 
       <CoursesList data={filteredCourses}/>
 
-      <Backdrop open={courses.loading || courses.error} className={classes.backdrop}>
+      <Backdrop open={courses.loading === true || courses.error !== undefined} className={classes.backdrop}>
         {courses.error ? (
           <Paper>
             <Box p={4} textAlign="center">