superset-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maximebeauche...@apache.org
Subject [incubator-superset] branch master updated: Fix SUPERSET_WEBSERVER_TIMEOUT in VisualizeModal (#4277)
Date Thu, 25 Jan 2018 00:08:51 GMT
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 914480a  Fix SUPERSET_WEBSERVER_TIMEOUT in VisualizeModal (#4277)
914480a is described below

commit 914480ad3c53b4df07d60f9342c4fc28331d135f
Author: Maxime Beauchemin <maximebeauchemin@gmail.com>
AuthorDate: Wed Jan 24 16:08:48 2018 -0800

    Fix SUPERSET_WEBSERVER_TIMEOUT in VisualizeModal (#4277)
    
    * Fix SUPERSET_WEBSERVER_TIMEOUT in VisualizeModal
    
    * Fix test
    
    * lint
---
 superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx | 2 +-
 superset/assets/spec/javascripts/sqllab/VisualizeModal_spec.jsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx b/superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx
index 7c8b665..23692f9 100644
--- a/superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx
+++ b/superset/assets/javascripts/SqlLab/components/VisualizeModal.jsx
@@ -294,7 +294,7 @@ function mapStateToProps(state) {
   return {
     datasource: state.datasource,
     errorMessage: state.errorMessage,
-    timeout: state.common ? state.common.SUPERSET_WEBSERVER_TIMEOUT : null,
+    timeout: state.common ? state.common.conf.SUPERSET_WEBSERVER_TIMEOUT : null,
   };
 }
 
diff --git a/superset/assets/spec/javascripts/sqllab/VisualizeModal_spec.jsx b/superset/assets/spec/javascripts/sqllab/VisualizeModal_spec.jsx
index 56af8de..dffa825 100644
--- a/superset/assets/spec/javascripts/sqllab/VisualizeModal_spec.jsx
+++ b/superset/assets/spec/javascripts/sqllab/VisualizeModal_spec.jsx
@@ -27,7 +27,7 @@ describe('VisualizeModal', () => {
   const mockStore = configureStore(middlewares);
   const initialState = sqlLabReducer({}, {});
   initialState.common = {
-    SUPERSET_WEBSERVER_TIMEOUT: 45,
+    conf: { SUPERSET_WEBSERVER_TIMEOUT: 45 },
   };
   const store = mockStore(initialState);
   const mockedProps = {

-- 
To stop receiving notification emails like this one, please contact
maximebeauchemin@apache.org.

Mime
View raw message