|
|
|
@@ -124,12 +124,13 @@ const ItemsSearch: React.FC<Props> = ({ items }) => { |
|
|
|
); |
|
|
|
|
|
|
|
useEffect(() => { |
|
|
|
refetchData(filterObj); |
|
|
|
// Only refetch when paging changes AND we have already searched (filterObj has been set by search) |
|
|
|
if (Object.keys(filterObj).length > 0 || filteredItems.length > 0) { |
|
|
|
refetchData(filterObj); |
|
|
|
} |
|
|
|
}, [ |
|
|
|
filterObj, |
|
|
|
pagingController.pageNum, |
|
|
|
pagingController.pageSize, |
|
|
|
refetchData, |
|
|
|
]); |
|
|
|
|
|
|
|
const columns = useMemo<Column<ItemsResultWithStatus>[]>( |
|
|
|
@@ -181,25 +182,20 @@ const ItemsSearch: React.FC<Props> = ({ items }) => { |
|
|
|
); |
|
|
|
|
|
|
|
const onReset = useCallback(() => { |
|
|
|
setFilteredItems(items); |
|
|
|
}, [items]); |
|
|
|
setFilteredItems([]); |
|
|
|
setFilterObj({}); |
|
|
|
setTotalCount(0); |
|
|
|
}, []); |
|
|
|
|
|
|
|
return ( |
|
|
|
<> |
|
|
|
<SearchBox |
|
|
|
criteria={searchCriteria} |
|
|
|
onSearch={(query) => { |
|
|
|
// setFilteredItems( |
|
|
|
// items.filter((pm) => { |
|
|
|
// return ( |
|
|
|
// pm.code.toLowerCase().includes(query.code.toLowerCase()) && |
|
|
|
// pm.name.toLowerCase().includes(query.name.toLowerCase()) |
|
|
|
// ); |
|
|
|
// }) |
|
|
|
// ); |
|
|
|
setFilterObj({ |
|
|
|
...query, |
|
|
|
}); |
|
|
|
refetchData(query); |
|
|
|
}} |
|
|
|
onReset={onReset} |
|
|
|
/> |
|
|
|
|