[incubator-superset] branch master updated: [Bugfix]: Explore view does not respect custom timeout. (#3582)

[ma...@apache.org]

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 a85968e  [Bugfix]: Explore view does not respect custom timeout. (#3582)
a85968e is described below

commit a85968eadb2079b08b1382ff70ec6195de429c51
Author: fabianmenges <fa...@users.noreply.github.com>
AuthorDate: Wed Oct 4 01:20:32 2017 -0400

    [Bugfix]: Explore view does not respect custom timeout. (#3582)
---
 .../assets/javascripts/explore/components/ExploreViewContainer.jsx    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx b/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx
index bb96dbc..f696ed6 100644
--- a/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx
+++ b/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx
@@ -24,6 +24,7 @@ const propTypes = {
   standalone: PropTypes.bool.isRequired,
   triggerQuery: PropTypes.bool.isRequired,
   queryRequest: PropTypes.object,
+  timeout: PropTypes.number,
 };
 
 class ExploreViewContainer extends React.Component {
@@ -90,7 +91,7 @@ class ExploreViewContainer extends React.Component {
 
   triggerQueryIfNeeded() {
     if (this.props.triggerQuery && !this.hasErrors()) {
-      this.props.actions.runQuery(this.props.form_data);
+      this.props.actions.runQuery(this.props.form_data, false, this.props.timeout);
     }
   }
 
@@ -202,6 +203,7 @@ function mapStateToProps({ explore, chart }) {
     forcedHeight: explore.forced_height,
     queryRequest: chart.queryRequest,
     chartStatus: chart.chartStatus,
+    timeout: explore.common.conf.SUPERSET_WEBSERVER_TIMEOUT,
   };
 }
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@superset.apache.org" <co...@superset.apache.org>'].