From e15573d4453f8432e2da1db86f2e9417666fb8b5 Mon Sep 17 00:00:00 2001 From: Yongjie Zhao Date: Fri, 25 Mar 2022 07:58:53 +0800 Subject: [PATCH] fix: number format should editable when AA in time comparison (#19351) --- .../src/shared-controls/index.tsx | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx index ff15a6f4a..edd6e30b0 100644 --- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx +++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx @@ -44,6 +44,7 @@ import { legacyValidateInteger, validateNonEmpty, JsonArray, + ComparisionType, } from '@superset-ui/core'; import { @@ -455,16 +456,12 @@ const y_axis_format: SharedControlConfig<'SelectControl', SelectDefaultOption> = filterOption: ({ data: option }, search) => option.label.includes(search) || option.value.includes(search), mapStateToProps: state => { - const showWarning = - state.controls?.comparison_type?.value === 'percentage'; + const isPercentage = + state.controls?.comparison_type?.value === ComparisionType.Percentage; return { - warning: showWarning - ? t( - 'When `Calculation type` is set to "Percentage change", the Y ' + - 'Axis Format is forced to `.1%`', - ) - : null, - disabled: showWarning, + choices: isPercentage + ? D3_FORMAT_OPTIONS.filter(option => option[0].includes('%')) + : D3_FORMAT_OPTIONS, }; }, };