diff --git a/src/components/pages/expense/ExpensesTable.tsx b/src/components/pages/expense/ExpensesTable.tsx index 75c25da6..9a133447 100644 --- a/src/components/pages/expense/ExpensesTable.tsx +++ b/src/components/pages/expense/ExpensesTable.tsx @@ -1,6 +1,5 @@ 'use client'; -import axios from 'axios'; import { ChangeEventHandler, useCallback, @@ -722,7 +721,7 @@ const ExpensesTable = () => { }; const searchChangeHandler: ChangeEventHandler = (e) => { - updateFilter('search', e.target.value); + updateFilter('search', e.target.value, true); }; // ===== FILTER MODAL HANDLERS ===== @@ -741,41 +740,52 @@ const ExpensesTable = () => { project_flock?: OptionType | null; project_flock_kandang?: OptionType | null; }) => { - updateFilter('transactionDate', values.transaction_date || ''); - updateFilter('realizationDate', values.realization_date || ''); + updateFilter('transactionDate', values.transaction_date || '', true); + updateFilter('realizationDate', values.realization_date || '', true); updateFilter( 'locationId', - values.location?.value ? String(values.location?.value) : '' + values.location?.value ? String(values.location?.value) : '', + true ); updateFilter( 'locationName', - values.location?.label ? String(values.location?.label) : '' + values.location?.label ? String(values.location?.label) : '', + true ); updateFilter( 'vendorId', - values.vendor?.value ? String(values.vendor?.value) : '' + values.vendor?.value ? String(values.vendor?.value) : '', + true ); updateFilter( 'vendorName', - values.vendor?.label ? String(values.vendor?.label) : '' + values.vendor?.label ? String(values.vendor?.label) : '', + true + ); + updateFilter('category', values.category?.value || '', true); + updateFilter('approvalStatus', values.approval_status?.value || '', true); + updateFilter( + 'realizationStatus', + values.realization_status?.value || '', + true ); - updateFilter('category', values.category?.value || ''); - updateFilter('approvalStatus', values.approval_status?.value || ''); - updateFilter('realizationStatus', values.realization_status?.value || ''); updateFilter( 'projectFlockId', - values.project_flock?.value ? String(values.project_flock.value) : '' + values.project_flock?.value ? String(values.project_flock.value) : '', + true ); - updateFilter('projectFlockName', values.project_flock?.label || ''); + updateFilter('projectFlockName', values.project_flock?.label || '', true); updateFilter( 'projectFlockKandangId', values.project_flock_kandang?.value ? String(values.project_flock_kandang.value) - : '' + : '', + true ); updateFilter( 'projectFlockKandangName', - values.project_flock_kandang?.label || '' + values.project_flock_kandang?.label || '', + true ); };