From bfbd2ec862da5fb99d3842244fddfba485eaeb83 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Wed, 24 Jan 2018 16:08:48 -0800
Subject: [PATCH] Fix SUPERSET_WEBSERVER_TIMEOUT in VisualizeModal (#4277)

* Fix SUPERSET_WEBSERVER_TIMEOUT in VisualizeModal

* Fix test

* lint
---
 .../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 7c8b66511d49..23692f9aa0c7 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 56af8de45e87..dffa8250ba03 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 = {