From 14bf45da7cdb9dae6757fbea8c45cd3cc3149da7 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 10 Apr 2018 14:49:22 -0700 Subject: [PATCH] [bugfix] when num_period_compare is not set (#4799) Fixing issues where y_axis_format is set and not num_period_compare --- .../javascripts/explore/stores/controls.jsx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/superset/assets/javascripts/explore/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx index d2efd53fe9..a075a1adf1 100644 --- a/superset/assets/javascripts/explore/stores/controls.jsx +++ b/superset/assets/javascripts/explore/stores/controls.jsx @@ -1209,11 +1209,17 @@ export const controls = { default: '.3s', choices: D3_FORMAT_OPTIONS, description: D3_FORMAT_DOCS, - mapStateToProps: state => ({ - warning: state.controls && state.controls.num_period_compare.value !== '' ? - t('When `Period Ratio` is set, the Y Axis Format is forced to `.1%`') : null, - disabled: state.controls && state.controls.num_period_compare.value !== '', - }), + mapStateToProps: (state) => { + const showWarning = ( + state.controls && + state.controls.num_period_compare && + state.controls.num_period_compare.value !== ''); + return { + warning: showWarning ? + t('When `Period Ratio` is set, the Y Axis Format is forced to `.1%`') : null, + disabled: showWarning, + }; + }, }, y_axis_2_format: {