diff --git a/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx index fd4ec89..2bf79e0 100644 --- a/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx +++ b/src/pages/transaction/approval-transaction/blocks/ListToolbar.tsx @@ -16,18 +16,17 @@ const ListToolbar = () => { // Set the initial state for trxDate const [trxDate, settrxDate] = useState({ from: '', to: '' }); - const [statusApproval, setStatusApproval] = useState( (table.getColumn('status_approve')?.getFilterValue() as string) ?? '' ); useEffect(() => { - const timer = setTimeout(() => { - table.getColumn('status_approve')?.setFilterValue(statusApproval); - table.setPageIndex(0); - }, 200); - return () => clearTimeout(timer); - }, [statusApproval, table]); + const timer = setTimeout(() => { + table.getColumn('status_approve')?.setFilterValue(statusApproval); + table.setPageIndex(0); + }, 200); + return () => clearTimeout(timer); + }, [statusApproval, table]); // Function to format date to YYYY-MM-DD const formatDate = (date: Date): string => { @@ -139,7 +138,9 @@ const ListToolbar = () => { const today = new Date(); const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1); + // Resetting all filters setSearchValue(''); + setStatusApproval(''); settrxDate({ from: formatDate(firstDayOfMonth), to: formatDate(today), @@ -149,7 +150,7 @@ const ListToolbar = () => { table.getColumn('status_approve')?.setFilterValue(''); table.setPageIndex(0); - reload(); + reload(); // Reload table data }} > @@ -159,7 +160,6 @@ const ListToolbar = () => { ); - }; export default ListToolbar; diff --git a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx index 1050d07..1ca2b79 100644 --- a/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx +++ b/src/pages/transaction/history-transaction/blocks/ListToolbar.tsx @@ -164,9 +164,11 @@ const ListToolbar = () => { variant="outline" className="h-7.5" onClick={() => { + // Preserve trxDate values (from, to) and reset others const today = new Date(); const firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1); + // Only reset filters excluding from and to setSearchValue(''); setStatusValue(''); setTypeValue(''); @@ -175,6 +177,7 @@ const ListToolbar = () => { to: formatDate(today), }); + // Reset other filters except for date range table.setColumnFilters([ { id: 'code', value: '' }, { id: 'status', value: '' },