vhad/react-bootstrap-table2
1
0
Fork 0
mirror of https://github.com/gosticks/react-bootstrap-table2.git synced 2026-08-12 04:00:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug for default sort and filter have potential issue when remote is enable

Browse Source
This commit is contained in:
AllenFang
2018-08-01 20:26:00 +08:00
parent 9c677fe174
commit 78ea63074e
11 changed files with 85 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-bootstrap-table2-filter/src/components/date.js
Vendored
+2 -2
View File
@@ -36,7 +36,7 @@ class DateFilter extends Component {
const comparator = this.dateFilterComparator.value;
const date = this.inputDate.value;
if (comparator && date) {
this.applyFilter(date, comparator);
this.applyFilter(date, comparator, true);
}
// export onFilter function to allow users to access
@@ -103,7 +103,7 @@ class DateFilter extends Component {
// instead of parsing an invalid Date. The filter function will interpret
// null as an empty date field
const date = value === '' ? null : new Date(value);
onFilter(column, FILTER_TYPE.DATE)({ date, comparator });
onFilter(column, FILTER_TYPE.DATE, )({ date, comparator });
};
if (delay) {
this.timeout = setTimeout(() => { execute(); }, delay);
packages/react-bootstrap-table2-filter/src/components/number.js
Vendored
+1 -1
View File
@@ -36,7 +36,7 @@ class NumberFilter extends Component {
const comparator = this.numberFilterComparator.value;
const number = this.numberFilter.value;
if (comparator && number) {
onFilter(column, FILTER_TYPE.NUMBER)({ number, comparator });
onFilter(column, FILTER_TYPE.NUMBER, true)({ number, comparator });
}
// export onFilter function to allow users to access
packages/react-bootstrap-table2-filter/src/components/select.js
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ class SelectFilter extends Component {
const value = this.selectInput.value;
if (value && value !== '') {
onFilter(column, FILTER_TYPE.SELECT)(value);
onFilter(column, FILTER_TYPE.SELECT, true)(value);
}
// export onFilter function to allow users to access
packages/react-bootstrap-table2-filter/src/components/text.js
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ class TextFilter extends Component {
const defaultValue = this.input.value;
if (defaultValue) {
onFilter(this.props.column, FILTER_TYPE.TEXT)(defaultValue);
onFilter(this.props.column, FILTER_TYPE.TEXT, true)(defaultValue);
}
// export onFilter function to allow users to access
packages/react-bootstrap-table2-filter/src/context.js
Vendored
+10 -5
View File
@@ -27,7 +27,13 @@ export default (
this.onExternalFilter = this.onExternalFilter.bind(this);
}
onFilter(column, filterType) {
componentDidMount() {
if (isRemoteFiltering() && Object.keys(this.currFilters).length > 0) {
handleFilterChange(this.currFilters);
}
}
onFilter(column, filterType, initialize = false) {
return (filterVal) => {
// watch out here if migration to context API, #334
const currFilters = Object.assign({}, this.currFilters);
@@ -52,10 +58,9 @@ export default (
this.currFilters = currFilters;
if (isRemoteFiltering()) {
handleFilterChange(currFilters);
// when remote filtering is enable, dont set currFilters state
// in the componentWillReceiveProps,
// it's the key point that we can know the filter is changed
if (!initialize) {
handleFilterChange(this.currFilters);
}
return;
}
packages/react-bootstrap-table2-filter/test/components/date.test.js
+2 -2
View File
@@ -124,7 +124,7 @@ describe('Date Filter', () => {
it('should do onFilter correctly when exported function was executed', () => {
expect(onFilter).toHaveBeenCalledTimes(1);
expect(onFilter).toHaveBeenCalledWith(column, FILTER_TYPE.DATE);
expect(onFilter).toHaveBeenCalledWith(column, FILTER_TYPE.DATE, false);
expect(onFilterFirstReturn).toHaveBeenCalledTimes(1);
expect(onFilterFirstReturn).toHaveBeenCalledWith({ comparator, date });
});
@@ -148,7 +148,7 @@ describe('Date Filter', () => {
it('should calling onFilter on componentDidMount', () => {
expect(onFilter).toHaveBeenCalledTimes(1);
expect(onFilter).toHaveBeenCalledWith(column, FILTER_TYPE.DATE);
expect(onFilter).toHaveBeenCalledWith(column, FILTER_TYPE.DATE, true);
expect(onFilterFirstReturn).toHaveBeenCalledTimes(1);
// expect(onFilterFirstReturn).toHaveBeenCalledWith({ comparator, date });
});
packages/react-bootstrap-table2-filter/test/components/number.test.js
+1 -1
View File
@@ -147,7 +147,7 @@ describe('Number Filter', () => {
it('should calling onFilter on componentDidMount', () => {
expect(onFilter.calledOnce).toBeTruthy();
expect(onFilter.calledWith(column, FILTER_TYPE.NUMBER)).toBeTruthy();
expect(onFilter.calledWith(column, FILTER_TYPE.NUMBER, true)).toBeTruthy();
expect(onFilterFirstReturn.calledOnce).toBeTruthy();
expect(onFilterFirstReturn.calledWith({ number: `${number}`, comparator })).toBeTruthy();
});
packages/react-bootstrap-table2-filter/test/components/select.test.js
+1 -1
View File
@@ -91,7 +91,7 @@ describe('Select Filter', () => {
it('should calling onFilter on componentDidMount', () => {
expect(onFilter.calledOnce).toBeTruthy();
expect(onFilter.calledWith(column, FILTER_TYPE.SELECT)).toBeTruthy();
expect(onFilter.calledWith(column, FILTER_TYPE.SELECT, true)).toBeTruthy();
expect(onFilterFirstReturn.calledOnce).toBeTruthy();
expect(onFilterFirstReturn.calledWith(defaultValue)).toBeTruthy();
});
packages/react-bootstrap-table2-filter/test/components/text.test.js
+1 -1
View File
@@ -65,7 +65,7 @@ describe('Text Filter', () => {
it('should calling onFilter on componentDidMount', () => {
expect(onFilter.calledOnce).toBeTruthy();
expect(onFilter.calledWith(column, FILTER_TYPE.TEXT)).toBeTruthy();
expect(onFilter.calledWith(column, FILTER_TYPE.TEXT, true)).toBeTruthy();
expect(onFilterFirstReturn.calledOnce).toBeTruthy();
expect(onFilterFirstReturn.calledWith(defaultValue)).toBeTruthy();
});
packages/react-bootstrap-table2-filter/test/context.test.js
+58 -4
View File
@@ -12,7 +12,6 @@ import { textFilter } from '../index';
describe('FilterContext', () => {
let wrapper;
// let filter;
let FilterContext;
const data = [{
@@ -33,8 +32,6 @@ describe('FilterContext', () => {
filter: textFilter()
}];
// const defaultFilter = {};
const mockBase = jest.fn((props => (
<BootstrapTable
keyField="id"
@@ -47,7 +44,6 @@ describe('FilterContext', () => {
const handleFilterChange = jest.fn();
function shallowContext(
// customFilter = defaultFilter,
enableRemote = false
) {
mockBase.mockReset();
@@ -115,6 +111,45 @@ describe('FilterContext', () => {
});
});
describe('componentDidMount', () => {
describe('when remote filter is disabled', () => {
beforeEach(() => {
wrapper = shallow(shallowContext());
wrapper.render();
wrapper.instance().componentDidMount();
});
it('should not call handleFilterChange', () => {
expect(handleFilterChange).toHaveBeenCalledTimes(0);
});
});
describe('when remote filter is enable but currFilters is empty', () => {
beforeEach(() => {
wrapper = shallow(shallowContext(true));
wrapper.render();
wrapper.instance().componentDidMount();
});
it('should not call handleFilterChange', () => {
expect(handleFilterChange).toHaveBeenCalledTimes(0);
});
});
describe('when remote filter is enable and currFilters is not empty', () => {
beforeEach(() => {
wrapper = shallow(shallowContext(true));
wrapper.instance().currFilters.price = { filterVal: 40, filterType: FILTER_TYPE.TEXT };
});
it('should not call handleFilterChange', () => {
wrapper.instance().componentDidMount();
expect(handleFilterChange).toHaveBeenCalledTimes(1);
expect(handleFilterChange).toHaveBeenCalledWith(wrapper.instance().currFilters);
});
});
});
describe('onFilter', () => {
let instance;
describe('when filterVal is empty or undefined', () => {
@@ -169,6 +204,25 @@ describe('FilterContext', () => {
});
});
describe('when remote filter is enabled but initialize argument is true', () => {
const filterVal = '3';
beforeEach(() => {
wrapper = shallow(shallowContext(true));
wrapper.render();
instance = wrapper.instance();
instance.onFilter(columns[1], FILTER_TYPE.TEXT, true)(filterVal);
});
it('should correct currFilters', () => {
expect(Object.keys(instance.currFilters)).toHaveLength(1);
});
it('should not call handleFilterChange correctly', () => {
expect(handleFilterChange).toHaveBeenCalledTimes(0);
});
});
describe('combination', () => {
beforeEach(() => {
wrapper = shallow(shallowContext());
packages/react-bootstrap-table2/src/contexts/sort-context.js
Vendored
+7 -4
View File
@@ -38,15 +38,18 @@ export default (
if (sortColumn.onSort) {
sortColumn.onSort(sortField, sortOrder);
}
if (isRemoteSort()) {
handleSortChange(sortField, sortOrder);
}
}
}
this.state = { sortOrder, sortColumn };
}
componentDidMount() {
const { sortOrder, sortColumn } = this.state;
if (isRemoteSort() && sortOrder && sortColumn) {
handleSortChange(sortColumn.dataField, sortOrder);
}
}
handleSort = (column) => {
const sortOrder = dataOperator.nextOrder(column, this.state, this.props.defaultSortDirection);