Call props.onChange only when closing filter (apache#4003)

michellethomas · May 23, 2018 · 72c05fa · 72c05fa
1 parent 4f166ca
commit 72c05fa
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/superset/assets/javascripts/explore/components/controls/DateFilterControl.jsx b/superset/assets/javascripts/explore/components/controls/DateFilterControl.jsx
@@ -63,17 +63,6 @@ export default class DateFilterControl extends React.Component {
   onNumberChange(event) {
     this.setState({ num: event.target.value }, this.onChange);
   }
-  onChange() {
-    let val;
-    if (this.state.type === 'rel') {
-      val = `${this.state.num} ${this.state.grain} ${this.state.rel}`;
-    } else if (this.state.type === 'fix') {
-      val = this.state.dttm;
-    } else if (this.state.type === 'free') {
-      val = this.state.free;
-    }
-    this.props.onChange(val);
-  }
   onFreeChange(event) {
     this.setState({ free: event.target.value }, this.onChange);
   }
@@ -88,6 +77,15 @@ export default class DateFilterControl extends React.Component {
     this.setState({ dttm: dttm.format().substring(0, 19) }, this.onChange);
   }
   close() {
+    let val;
+    if (this.state.type === 'rel') {
+      val = `${this.state.num} ${this.state.grain} ${this.state.rel}`;
+    } else if (this.state.type === 'fix') {
+      val = this.state.dttm;
+    } else if (this.state.type === 'free') {
+      val = this.state.free;
+    }
+    this.props.onChange(val);
     this.refs.trigger.hide();
   }
   renderPopover() {