From cdbdaf417903efb5432e44ca9028525fe8034a4d Mon Sep 17 00:00:00 2001 From: Beto Dealmeida Date: Thu, 12 Jun 2025 16:02:38 -0400 Subject: [PATCH] fix: apply d3 format to BigNumber(s) (#33759) (cherry picked from commit d7d7b7c0e67c136b7a78778fb6c61592a98f4a2f) --- .../BigNumberPeriodOverPeriod/transformProps.ts | 10 +++++++++- .../src/BigNumber/BigNumberTotal/transformProps.ts | 2 +- .../BigNumber/BigNumberWithTrendline/transformProps.ts | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts index b434fbbc58e..2dfa82aefa2 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts @@ -18,6 +18,7 @@ */ import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; +import { Metric } from '@superset-ui/chart-controls'; import { ChartProps, getMetricLabel, @@ -100,6 +101,13 @@ export default function transformProps(chartProps: ChartProps) { adhoc_filter.operator === 'TEMPORAL_RANGE', )?.[0]; + let metricEntry: Metric | undefined; + if (chartProps.datasource?.metrics) { + metricEntry = chartProps.datasource.metrics.find( + metricItem => metricItem.metric_name === metric, + ); + } + const isCustomOrInherit = timeComparison === 'custom' || timeComparison === 'inherit'; let dataOffset: string[] = []; @@ -140,7 +148,7 @@ export default function transformProps(chartProps: ChartProps) { metric, currencyFormats, columnFormats, - yAxisFormat, + metricEntry?.d3format || yAxisFormat, currencyFormat, ); diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts index 757ecd3e612..9275697f99c 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.ts @@ -80,7 +80,7 @@ export default function transformProps( metric, currencyFormats, columnFormats, - yAxisFormat, + metricEntry?.d3format || yAxisFormat, currencyFormat, ); diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts index d285a551b13..846930fe7a1 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.ts @@ -160,7 +160,7 @@ export default function transformProps( metric, currencyFormats, columnFormats, - yAxisFormat, + metricEntry?.d3format || yAxisFormat, currencyFormat, );