Fixes default hanlding in Altered slice tag (apache#3903)

wenchma · Nov 20, 2017 · b327ee9 · b327ee9
1 parent f7cbf97
commit b327ee9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/superset/assets/javascripts/explore/components/ExploreChartHeader.jsx b/superset/assets/javascripts/explore/components/ExploreChartHeader.jsx
@@ -55,13 +55,6 @@ class ExploreChartHeader extends React.PureComponent {
       });
   }
 
-  renderAlteredTag() {
-    const origFormData = (this.props.slice && this.props.slice.form_data) || {};
-    const currentFormData = this.props.form_data;
-    const tagProps = { origFormData, currentFormData };
-    return (<AlteredSliceTag {...tagProps} />);
-  }
-
   renderChartTitle() {
     let title;
     if (this.props.slice) {
@@ -113,9 +106,12 @@ class ExploreChartHeader extends React.PureComponent {
           </TooltipWrapper>
         </span>
         }
-
-        {this.renderAlteredTag()}
-
+        {this.props.chart.sliceFormData &&
+          <AlteredSliceTag
+            origFormData={this.props.chart.sliceFormData}
+            currentFormData={this.props.form_data}
+          />
+        }
         <div className="pull-right">
           {this.props.chart.chartStatus === 'success' &&
           queryResponse &&

diff --git a/superset/assets/javascripts/explore/index.jsx b/superset/assets/javascripts/explore/index.jsx
@@ -36,8 +36,12 @@ const bootstrappedState = Object.assign(
     isStarred: false,
   },
 );
-
-const chartKey = bootstrappedState.slice ? ('slice_' + bootstrappedState.slice.slice_id) : 'slice';
+const slice = bootstrappedState.slice;
+const sliceFormData = slice ?
+  getFormDataFromControls(getControlsState(bootstrapData, slice.form_data))
+  :
+  null;
+const chartKey = slice ? ('slice_' + slice.slice_id) : 'slice';
 const initState = {
   charts: {
     [chartKey]: {
@@ -47,6 +51,7 @@ const initState = {
       chartUpdateEndTime: null,
       chartUpdateStartTime: now(),
       latestQueryFormData: getFormDataFromControls(controls),
+      sliceFormData,
       queryRequest: null,
       queryResponse: null,
       triggerQuery: true,