QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-07 18:35:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] handle null value in date filter (#11655)

Browse Source
This commit is contained in:
Grace Guo
2020-11-11 09:32:26 -08:00
committed by GitHub
parent 77dff0e4e0
commit a9f9c4bbd5
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
superset-frontend/spec/javascripts/explore/components/DateFilterControl_spec.jsx
View File

@@ -81,6 +81,19 @@ describe('DateFilterControl', () => {
expect(close).toBeCalled();
});
it('should handle null value', () => {
const open = jest.fn();
const close = jest.fn();
const props = {
...defaultProps,
value: null,
onOpenDateFilterControl: open,
onCloseDateFilterControl: close,
};
expect(mount(<DateFilterControl {...props} />)).toExist();
});
it('renders two tabs in popover', () => {
const popoverContent = wrapper.find(Popover).first().props().content;
const popoverContentWrapper = mount(popoverContent);

4
superset-frontend/src/explore/components/controls/DateFilterControl.jsx
View File

@@ -236,11 +236,11 @@ class DateFilterControl extends React.Component {
};
const { value } = props;
if (value.indexOf(SEPARATOR) >= 0) {
if (value && value.indexOf(SEPARATOR) >= 0) {
this.state = { ...this.state, ...getStateFromSeparator(value) };
} else if (COMMON_TIME_FRAMES.indexOf(value) >= 0) {
this.state = { ...this.state, ...getStateFromCommonTimeFrame(value) };
} else {
} else if (value) {
this.state = { ...this.state, ...getStateFromCustomRange(value) };
}