Skip to content

Refactor a little for filter.js in react-bootstrap-table2-filter #1368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 17, 2020
Merged

Refactor a little for filter.js in react-bootstrap-table2-filter #1368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42a972b
Refactor `filterByNumber` to return the result of comparator directly
CYBAI May 6, 2020
b8ac424
Return the filter function directly in filterFactory
CYBAI May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 15 additions & 40 deletions packages/react-bootstrap-table2-filter/src/filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,55 +39,36 @@ export const filterByNumber = _ => (
) => (
data.filter((row) => {
if (number === '' || !comparator) return true;
let valid = true;
let cell = _.get(row, dataField);

if (customFilterValue) {
cell = customFilterValue(cell, row);
}

switch (comparator) {
case EQ: {
if (cell != number) {
valid = false;
}
break;
return cell == number;
}
case GT: {
if (cell <= number) {
valid = false;
}
break;
return cell > number;
}
case GE: {
if (cell < number) {
valid = false;
}
break;
return cell >= number;
}
case LT: {
if (cell >= number) {
valid = false;
}
break;
return cell < number;
}
case LE: {
if (cell > number) {
valid = false;
}
break;
return cell <= number;
}
case NE: {
if (cell == number) {
valid = false;
}
break;
return cell != number;
}
default: {
console.error('Number comparator provided is not supported');
break;
return true;
}
}
return valid;
})
);

Expand Down Expand Up @@ -208,25 +189,19 @@ export const filterByArray = _ => (
};

export const filterFactory = _ => (filterType) => {
let filterFn;
switch (filterType) {
case FILTER_TYPE.TEXT:
case FILTER_TYPE.SELECT:
filterFn = filterByText(_);
break;
case FILTER_TYPE.MULTISELECT:
filterFn = filterByArray(_);
break;
return filterByArray(_);
case FILTER_TYPE.NUMBER:
filterFn = filterByNumber(_);
break;
return filterByNumber(_);
case FILTER_TYPE.DATE:
filterFn = filterByDate(_);
break;
return filterByDate(_);
case FILTER_TYPE.TEXT:
case FILTER_TYPE.SELECT:
default:
filterFn = filterByText(_);
// Use `text` filter as default filter
return filterByText(_);
}
return filterFn;
};

export const filters = (data, columns, _) => (currFilters, clearFilters = {}) => {
Expand Down