Skip to content

Commit bebec9e

Browse files
committed
Fix RunList pagination is reset
1 parent 08b220a commit bebec9e

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/components/run/RunRaListFilters.tsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
import { required, minLength, DateTimeInput, useTranslate } from "react-admin";
1+
import {
2+
TextInput,
3+
required,
4+
minLength,
5+
DateTimeInput,
6+
useTranslate,
7+
useListContext,
8+
} from "react-admin";
29

310
import { useForm, FormProvider } from "react-hook-form";
411
import { Box, Button, InputAdornment } from "@mui/material";
512
import SearchIcon from "@mui/icons-material/Search";
6-
import { TextInput, useListContext } from "react-admin";
713
import { useCallback, useEffect } from "react";
814
import RunRaStatusFilter from "./RunRaStatusFilter";
915
import { JobTypeRaFilter } from "../job";
@@ -36,7 +42,7 @@ export const weekAgo = (): Date => {
3642
const RunRaListFilters = () => {
3743
const translate = useTranslate();
3844
const { filterValues, setFilters } = useListContext();
39-
const form = useForm();
45+
const form = useForm({ defaultValues: filterValues });
4046

4147
const onSubmit = useCallback(
4248
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -56,10 +62,9 @@ const RunRaListFilters = () => {
5662

5763
const submit = form.handleSubmit(onSubmit);
5864

59-
// fill up filters just after opening the page
6065
useEffect(() => {
61-
onSubmit({ defaultValues: filterValues });
62-
}, [submit]);
66+
submit();
67+
}, [form]);
6368

6469
return (
6570
<FormProvider {...form}>

0 commit comments

Comments
 (0)