You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ma...@apache.org on 2018/07/17 20:38:36 UTC
[incubator-superset] branch master updated: Fix time filter in
dashboard v2 (#5412)
This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 75cf5e1 Fix time filter in dashboard v2 (#5412)
75cf5e1 is described below
commit 75cf5e198fa5f5a5843588912edc69909245893c
Author: Beto Dealmeida <ro...@dealmeida.net>
AuthorDate: Tue Jul 17 13:38:33 2018 -0700
Fix time filter in dashboard v2 (#5412)
---
superset/assets/src/dashboard/reducers/dashboardState.js | 3 +--
superset/assets/src/explore/components/controls/DateFilterControl.jsx | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/superset/assets/src/dashboard/reducers/dashboardState.js b/superset/assets/src/dashboard/reducers/dashboardState.js
index 5312de2..69d4e69 100644
--- a/superset/assets/src/dashboard/reducers/dashboardState.js
+++ b/superset/assets/src/dashboard/reducers/dashboardState.js
@@ -97,8 +97,7 @@ export default function dashboardStateReducer(state = {}, action) {
const { chart, col, vals: nextVals, merge, refresh } = action;
const sliceId = chart.id;
const filterKeys = [
- '__from',
- '__to',
+ '__time_range',
'__time_col',
'__time_grain',
'__time_origin',
diff --git a/superset/assets/src/explore/components/controls/DateFilterControl.jsx b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
index 40f249e..f15e6f4 100644
--- a/superset/assets/src/explore/components/controls/DateFilterControl.jsx
+++ b/superset/assets/src/explore/components/controls/DateFilterControl.jsx
@@ -176,7 +176,7 @@ export default class DateFilterControl extends React.Component {
}
handleClick(e) {
// switch to `TYPES.CUSTOM_START_END` when the calendar is clicked
- if (this.startEndSectionRef.contains(e.target)) {
+ if (this.startEndSectionRef && this.startEndSectionRef.contains(e.target)) {
this.setState({ type: TYPES.CUSTOM_START_END });
}
}