Merge pull request #4781 from metabase/issue-4751

Fix timeseries widgets wonkiness

frontend/src/metabase/qb/components/TimeseriesFilterWidget.jsx

@@ -33,8 +33,10 @@ type Props = {
     className: string,
     card: CardObject,
     tableMetadata: TableMetadata,
-    setDatasetQuery: (datasetQuery: DatasetQuery) => void,
-    runQuery: () => void
+    setDatasetQuery: (
+        datasetQuery: DatasetQuery,
+        options: { run: boolean }
+    ) => void
 };
 
 type State = {
@@ -89,8 +91,7 @@ export default class TimeseriesFilterWidget extends Component<*, Props, State> {
             className,
             card,
             tableMetadata,
-            setDatasetQuery,
-            runQuery
+            setDatasetQuery
         } = this.props;
         const { filter, filterIndex, currentFilter } = this.state;
         let currentDescription;
@@ -144,11 +145,11 @@ export default class TimeseriesFilterWidget extends Component<*, Props, State> {
                                     query = Query.addFilter(query, filter);
                                 }
                                 // $FlowFixMe
-                                setDatasetQuery({
+                                const datasetQuery: DatasetQuery = {
                                     ...card.dataset_query,
                                     query
-                                });
-                                runQuery();
+                                };
+                                setDatasetQuery(datasetQuery, { run: true });
                             }
                             if (this._popover) {
                                 this._popover.close();

frontend/src/metabase/qb/components/TimeseriesGroupingWidget.jsx

@@ -19,15 +19,18 @@ import type {
 
 type Props = {
     card: CardObject,
-    setDatasetQuery: (datasetQuery: DatasetQuery) => void,
-    runQuery: () => void
+    setDatasetQuery: (
+        datasetQuery: DatasetQuery,
+        options: { run: boolean }
+    ) => void
 };
 
 export default class TimeseriesGroupingWidget extends Component<*, Props, *> {
     _popover: ?any;
 
     render() {
-        const { card, setDatasetQuery, runQuery } = this.props;
+        const { card, setDatasetQuery } = this.props;
+
         if (Card.isStructured(card)) {
             const query = Card.getQuery(card);
             const breakouts = query && Query.getBreakouts(query);
@@ -58,11 +61,11 @@ export default class TimeseriesGroupingWidget extends Component<*, Props, *> {
                                     breakout
                                 );
                                 // $FlowFixMe
-                                setDatasetQuery({
+                                const datasetQuery: DatasetQuery = {
                                     ...card.dataset_query,
                                     query
-                                });
-                                runQuery();
+                                };
+                                setDatasetQuery(datasetQuery, { run: true });
                                 if (this._popover) {
                                     this._popover.close();
                                 }