CEC-2378 Add fix for fleet vehicles' search

This commit is contained in:
arpanetus
2022-09-10 05:25:03 +06:00
committed by GitHub
parent aa5a1e20e0
commit 969b921aa1

View File

@@ -42,11 +42,16 @@ const MainForm = ({ name }) => {
const [pageIndex, setPageIndex] = useState(0); const [pageIndex, setPageIndex] = useState(0);
const [orderBy, setOrderBy] = useState("id"); const [orderBy, setOrderBy] = useState("id");
const [order, setOrder] = useState("desc"); const [order, setOrder] = useState("desc");
const [search, setSearch] = useState("");
const classes = useStyles(); const classes = useStyles();
const { setMessage } = useStatusContext(); const { setMessage } = useStatusContext();
const { fleetVehicles, totalFleetVehicles, getFleetVehicles, deleteFleetVehicle } = useFleetContext(); const { fleetVehicles, totalFleetVehicles, getFleetVehicles, deleteFleetVehicle } = useFleetContext();
const { token: { idToken: { jwtToken: token } }, groups } = useUserContext(); const { token: { idToken: { jwtToken: token } }, groups } = useUserContext();
const handleSearch = (query) => {
setSearch(query);
};
useEffect(() => { useEffect(() => {
(async () => { (async () => {
try { try {
@@ -54,6 +59,7 @@ const MainForm = ({ name }) => {
await getFleetVehicles( await getFleetVehicles(
name, name,
{ {
search,
limit: pageSize, limit: pageSize,
offset: pageSize * pageIndex, offset: pageSize * pageIndex,
order: `${orderBy} ${order}`, order: `${orderBy} ${order}`,
@@ -66,7 +72,7 @@ const MainForm = ({ name }) => {
} }
})(); })();
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [token, pageIndex, pageSize, orderBy, order]); }, [token, pageIndex, pageSize, orderBy, order, search]);
const handleChangePageIndex = (event, newIndex) => { const handleChangePageIndex = (event, newIndex) => {
setPageIndex(newIndex); setPageIndex(newIndex);
@@ -145,7 +151,7 @@ const MainForm = ({ name }) => {
</Link> </Link>
</Grid> </Grid>
<Grid item md={8} align="right" className={classes.textCenterAlign}> <Grid item md={8} align="right" className={classes.textCenterAlign}>
<SearchField classes={classes} /> <SearchField classes={classes} onSearch={handleSearch}/>
</Grid> </Grid>
</Grid> </Grid>
<Table> <Table>