diff --git a/src/components/shared/tablefilters.js b/src/components/shared/tablefilters.js index 8df0bc9f..b60e0de5 100644 --- a/src/components/shared/tablefilters.js +++ b/src/components/shared/tablefilters.js @@ -20,7 +20,7 @@ export const runnerFilter = (row, columnId, value) => { export const donationRunnerFilter = (row, columnId, value) => { const runner = row.getValue(columnId); - if(!runner){return false;} + if (!runner) { return false; } return filterRunner(runner, value) }; @@ -43,6 +43,22 @@ function filterRunner(runner, value) { return `${runner.firstname} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase()) } +export const filterName = (row, columnId, value) => { + const obj = row.original; + if (obj.middlename) { + return `${obj.firstname} ${obj.middlename} ${obj.lastname}`.toLowerCase().includes(value.toLowerCase()) + } + return `${obj.firstname} ${obj.lastname}`.toLowerCase().includes(value.toLowerCase()) +}; + +export const filterAddress = (row, columnId, value) => { + const obj = row.original.address; + if (obj.address2) {s + return `${obj.address1} ${obj.address2} ${obj.postalcode} ${obj.city} ${obj.country}`.toLowerCase().includes(value.toLowerCase()) + } + return `${obj.address1} ${obj.postalcode} ${obj.city} ${obj.country}`.toLowerCase().includes(value.toLowerCase()) +}; + export const statusFilter = (row, columnId, value) => { const status = row.getValue(columnId); return status.toString().includes(value);