From 7abe2d5eee177b854342c68cd218f37543ea4026 Mon Sep 17 00:00:00 2001 From: "Shao-Yen \"Fred\" Cheng" Date: Sun, 16 Jul 2017 21:04:34 -0700 Subject: [PATCH] [#3137] Use state.datasource.type instead of state.datasource_type when rendering ControlPanelsContainer (#3138) --- .../assets/javascripts/explore/components/ChartContainer.jsx | 2 +- .../javascripts/explore/components/ExploreViewContainer.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/superset/assets/javascripts/explore/components/ChartContainer.jsx b/superset/assets/javascripts/explore/components/ChartContainer.jsx index f6da538843ee..fca1afd33925 100644 --- a/superset/assets/javascripts/explore/components/ChartContainer.jsx +++ b/superset/assets/javascripts/explore/components/ChartContainer.jsx @@ -341,7 +341,7 @@ function mapStateToProps(state) { table_name: formData.datasource_name, viz_type: formData.viz_type, triggerRender: state.triggerRender, - datasourceType: state.datasource_type, + datasourceType: state.datasource.type, datasourceId: state.datasource_id, }; } diff --git a/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx b/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx index 67141241a362..f015aa99b6a0 100644 --- a/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx +++ b/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx @@ -187,7 +187,7 @@ function mapStateToProps(state) { const form_data = getFormDataFromControls(state.controls); return { chartStatus: state.chartStatus, - datasource_type: state.datasource_type, + datasource_type: state.datasource.type, controls: state.controls, form_data, standalone: state.standalone,