Skip to content

2018/04/01 release #306

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 13 commits into from
Apr 15, 2018
Merged

2018/04/01 release #306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f34cb4b
allow user to filter column without inputField
chunming-c Mar 26, 2018
a1477e2
filter column by new onFilter
chunming-c Mar 26, 2018
4dd39ae
export onFilter function to allow user to access
chunming-c Apr 1, 2018
0903234
[example] example for programmatically filter by text, number and select
chunming-c Apr 1, 2018
3775345
rename props and variable in samples for better readability
chunming-c Apr 1, 2018
f54c1f7
display filter condition correctly and make sure text filter to be St…
chunming-c Apr 4, 2018
a35701f
[test] correct test for filter wrapper
chunming-c Apr 4, 2018
c64951f
[test] correct tests for filter components
chunming-c Apr 4, 2018
a82e611
[test] add test for pogrammatically filter
chunming-c Apr 4, 2018
dc1f4dc
update travis.yml
chunming-c Apr 5, 2018
b172c68
fix #228
AllenFang Apr 8, 2018
b15d7a3
Merge pull request #287 from react-bootstrap-table/feature/pogrammati…
AllenFang Apr 15, 2018
e4b6993
fix #302 (#304)
AllenFang Apr 15, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[test] correct test for filter wrapper
  • Loading branch information
@chunming-c
chunming-c committed Apr 4, 2018
commit a35701fabfc84675656a1f81fed1ba7c1c59116d
13 changes: 13 additions & 0 deletions packages/react-bootstrap-table2-filter/test/filter.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,19 @@ describe('filter', () => {
filterFn = filters(store, columns, _);
});

describe('when filter value is not a String', () => {
it('should transform to string and do the filter', () => {
currFilters.name = {
filterVal: 3,
filterType: FILTER_TYPE.TEXT
};

const result = filterFn(currFilters);
expect(result).toBeDefined();
expect(result).toHaveLength(2);
});
});

describe(`when default comparator is ${LIKE}`, () => {
it('should returning correct result', () => {
currFilters.name = {
Expand Down
20 changes: 10 additions & 10 deletions packages/react-bootstrap-table2-filter/test/wrapper.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,14 @@ describe('Wrapper', () => {

it('should setting store object correctly', () => {
filterVals.forEach((filterVal) => {
instance.onFilter(props.columns[1], filterVal, FILTER_TYPE.TEXT);
instance.onFilter(props.columns[1], FILTER_TYPE.TEXT)(filterVal);
expect(props.store.filtering).toBeFalsy();
});
});

it('should setting state correctly', () => {
filterVals.forEach((filterVal) => {
instance.onFilter(props.columns[1], filterVal, FILTER_TYPE.TEXT);
instance.onFilter(props.columns[1], FILTER_TYPE.TEXT)(filterVal);
expect(instance.state.isDataChanged).toBeTruthy();
expect(Object.keys(instance.state.currFilters)).toHaveLength(0);
});
Expand All @@ -185,12 +185,12 @@ describe('Wrapper', () => {
const filterVal = '3';

it('should setting store object correctly', () => {
instance.onFilter(props.columns[1], filterVal, FILTER_TYPE.TEXT);
instance.onFilter(props.columns[1], FILTER_TYPE.TEXT)(filterVal);
expect(props.store.filters).toEqual(instance.state.currFilters);
});

it('should setting state correctly', () => {
instance.onFilter(props.columns[1], filterVal, FILTER_TYPE.TEXT);
instance.onFilter(props.columns[1], FILTER_TYPE.TEXT)(filterVal);
expect(instance.state.isDataChanged).toBeTruthy();
expect(Object.keys(instance.state.currFilters)).toHaveLength(1);
});
Expand All @@ -203,7 +203,7 @@ describe('Wrapper', () => {
props = createTableProps();
props.remote = { filter: true };
createFilterWrapper(props);
instance.onFilter(props.columns[1], filterVal, FILTER_TYPE.TEXT);
instance.onFilter(props.columns[1], FILTER_TYPE.TEXT)(filterVal);
});

it('should not setting store object correctly', () => {
Expand All @@ -222,27 +222,27 @@ describe('Wrapper', () => {

describe('combination', () => {
it('should setting store object correctly', () => {
instance.onFilter(props.columns[1], '3', FILTER_TYPE.TEXT);
instance.onFilter(props.columns[1], FILTER_TYPE.TEXT)('3');
expect(props.store.filters).toEqual(instance.state.currFilters);
expect(instance.state.isDataChanged).toBeTruthy();
expect(Object.keys(instance.state.currFilters)).toHaveLength(1);

instance.onFilter(props.columns[1], '2', FILTER_TYPE.TEXT);
instance.onFilter(props.columns[1], FILTER_TYPE.TEXT)('2');
expect(props.store.filters).toEqual(instance.state.currFilters);
expect(instance.state.isDataChanged).toBeTruthy();
expect(Object.keys(instance.state.currFilters)).toHaveLength(1);

instance.onFilter(props.columns[2], '2', FILTER_TYPE.TEXT);
instance.onFilter(props.columns[2], FILTER_TYPE.TEXT)('2');
expect(props.store.filters).toEqual(instance.state.currFilters);
expect(instance.state.isDataChanged).toBeTruthy();
expect(Object.keys(instance.state.currFilters)).toHaveLength(2);

instance.onFilter(props.columns[2], '', FILTER_TYPE.TEXT);
instance.onFilter(props.columns[2], FILTER_TYPE.TEXT)('');
expect(props.store.filters).toEqual(instance.state.currFilters);
expect(instance.state.isDataChanged).toBeTruthy();
expect(Object.keys(instance.state.currFilters)).toHaveLength(1);

instance.onFilter(props.columns[1], '', FILTER_TYPE.TEXT);
instance.onFilter(props.columns[1], FILTER_TYPE.TEXT)('');
expect(props.store.filters).toEqual(instance.state.currFilters);
expect(instance.state.isDataChanged).toBeTruthy();
expect(Object.keys(instance.state.currFilters)).toHaveLength(0);
Expand Down