From ac3fbedccd91580035f120265c8d9adfe64ea38e Mon Sep 17 00:00:00 2001 From: rstubryan Date: Thu, 5 Feb 2026 10:46:37 +0700 Subject: [PATCH] refactor(FE): Rename filter keys to plural forms --- src/components/pages/finance/FinanceTable.tsx | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/components/pages/finance/FinanceTable.tsx b/src/components/pages/finance/FinanceTable.tsx index c1c7f079..ba2101b8 100644 --- a/src/components/pages/finance/FinanceTable.tsx +++ b/src/components/pages/finance/FinanceTable.tsx @@ -152,10 +152,10 @@ const FinanceTable = () => { } = useTableFilter({ initial: { search: searchValue, - transactionType: '', - bankId: '', - customerId: '', - supplierId: '', + transactionTypes: '', + bankIds: '', + customerIds: '', + supplierIds: '', sortBy: '', startDate: '', endDate: '', @@ -163,10 +163,10 @@ const FinanceTable = () => { paramMap: { page: 'page', pageSize: 'limit', - transactionType: 'transaction_type', - bankId: 'bank_id', - customerId: 'customer_id', - supplierId: 'supplier_id', + transactionTypes: 'transaction_types', + bankIds: 'bank_ids', + customerIds: 'customer_ids', + supplierIds: 'supplier_ids', sortBy: 'sort_date', startDate: 'start_date', endDate: 'end_date', @@ -178,10 +178,10 @@ const FinanceTable = () => { const deleteModal = useModal(); const [pendingFilters, setPendingFilters] = useState({ search: searchValue, - transactionType: '', - bankId: '', - customerId: '', - supplierId: '', + transactionTypes: '', + bankIds: '', + customerIds: '', + supplierIds: '', sortBy: '', startDate: '', endDate: '', @@ -247,7 +247,7 @@ const FinanceTable = () => { setSelectedTransactionType(val); setPendingFilters((prev) => ({ ...prev, - transactionType: val + transactionTypes: val ? Array.isArray(val) ? val.map((item) => item.value).join(',') : (val.value as string) @@ -258,7 +258,7 @@ const FinanceTable = () => { setSelectedBank(val); setPendingFilters((prev) => ({ ...prev, - bankId: val + bankIds: val ? Array.isArray(val) ? val.map((item) => item.value).join(',') : (val.value as string) @@ -269,7 +269,7 @@ const FinanceTable = () => { setSelectedCustomerId(val); setPendingFilters((prev) => ({ ...prev, - customerId: val + customerIds: val ? Array.isArray(val) ? val.map((item) => item.value).join(',') : (val.value as string) @@ -280,7 +280,7 @@ const FinanceTable = () => { setSelectedSupplierId(val); setPendingFilters((prev) => ({ ...prev, - supplierId: val + supplierIds: val ? Array.isArray(val) ? val.map((item) => item.value).join(',') : (val.value as string) @@ -307,10 +307,10 @@ const FinanceTable = () => { const submitFilterHandler = () => { updateFilter('search', pendingFilters.search); setSearchValue(pendingFilters.search); - updateFilter('transactionType', pendingFilters.transactionType); - updateFilter('bankId', pendingFilters.bankId); - updateFilter('customerId', pendingFilters.customerId); - updateFilter('supplierId', pendingFilters.supplierId); + updateFilter('transactionTypes', pendingFilters.transactionTypes); + updateFilter('bankIds', pendingFilters.bankIds); + updateFilter('customerIds', pendingFilters.customerIds); + updateFilter('supplierIds', pendingFilters.supplierIds); updateFilter('sortBy', pendingFilters.sortBy); updateFilter('startDate', pendingFilters.startDate); updateFilter('endDate', pendingFilters.endDate); @@ -324,10 +324,10 @@ const FinanceTable = () => { const emptyFilters = { search: '', - transactionType: '', - bankId: '', - customerId: '', - supplierId: '', + transactionTypes: '', + bankIds: '', + customerIds: '', + supplierIds: '', sortBy: '', startDate: '', endDate: '', @@ -336,10 +336,10 @@ const FinanceTable = () => { updateFilter('search', ''); resetSearchValue(); - updateFilter('transactionType', ''); - updateFilter('bankId', ''); - updateFilter('customerId', ''); - updateFilter('supplierId', ''); + updateFilter('transactionTypes', ''); + updateFilter('bankIds', ''); + updateFilter('customerIds', ''); + updateFilter('supplierIds', ''); updateFilter('sortBy', ''); updateFilter('startDate', ''); updateFilter('endDate', '');