diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx index 01402741137..df201008b1f 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberViz.tsx @@ -25,6 +25,7 @@ import { computeMaxFontSize, BRAND_COLOR, BinaryQueryObjectFilterClause, + DTTM_ALIAS, } from '@superset-ui/core'; import { styled, useTheme } from '@apache-superset/core/ui'; import Echart from '../components/Echart'; @@ -357,7 +358,10 @@ function BigNumberVis({ const pointerEvent = eventParams.event.event; const drillToDetailFilters: BinaryQueryObjectFilterClause[] = []; drillToDetailFilters.push({ - col: formData?.granularitySqla, + col: + formData?.xAxis === DTTM_ALIAS + ? formData?.granularitySqla + : formData?.xAxis, grain: formData?.timeGrainSqla, op: '==', val: data[0], diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts index f6f6b4cca11..b4be8637bd6 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberWithTrendline/transformProps.test.ts @@ -106,6 +106,7 @@ describe('BigNumberWithTrendline transformProps', () => { subtitleFontSize: 14, forceTimestampFormatting: false, timeFormat: 'YYYY-MM-DD', + xAxis: '__timestamp', yAxisFormat: 'SMART_NUMBER', compareLag: 1, compareSuffix: 'WoW', diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/types.ts index e1f115c28b8..8f6bde4d2b8 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/types.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/types.ts @@ -47,6 +47,7 @@ export type BigNumberWithTrendlineFormData = BigNumberTotalFormData & { b: number; }; compareLag?: string | number; + xAxis: string; showXAxis?: boolean; showXAxisMinMaxLabels?: boolean; showYAxis?: boolean; diff --git a/superset-frontend/plugins/plugin-chart-echarts/test/BigNumber/transformProps.test.ts b/superset-frontend/plugins/plugin-chart-echarts/test/BigNumber/transformProps.test.ts index cd1b00100eb..0c0d5c3b87f 100644 --- a/superset-frontend/plugins/plugin-chart-echarts/test/BigNumber/transformProps.test.ts +++ b/superset-frontend/plugins/plugin-chart-echarts/test/BigNumber/transformProps.test.ts @@ -35,6 +35,7 @@ const formData = { a: 1, }, compareLag: 1, + xAxis: '__timestamp', timeGrainSqla: TimeGranularity.QUARTER, granularitySqla: 'ds', compareSuffix: 'over last quarter', @@ -54,11 +55,13 @@ const rawFormData: BigNumberWithTrendlineFormData = { a: 1, }, compare_lag: 1, + x_axis: '__timestamp', time_grain_sqla: TimeGranularity.QUARTER, granularity_sqla: 'ds', compare_suffix: 'over last quarter', viz_type: VizType.BigNumber, y_axis_format: '.3s', + xAxis: '__timestamp', }; function generateProps(