[superset] branch master updated: fix(explore): Time column label not formatted when GENERIC_X_AXES enabled (#21294)

[kg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kgabryje pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new c3a00d43d0 fix(explore): Time column label not formatted when GENERIC_X_AXES enabled (#21294)
c3a00d43d0 is described below

commit c3a00d43d055224d4a31ea9315934a59b556eea7
Author: Kamil Gabryjelski <ka...@gmail.com>
AuthorDate: Thu Sep 1 18:07:49 2022 +0200

    fix(explore): Time column label not formatted when GENERIC_X_AXES enabled (#21294)
---
 .../plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
index fc4f1f82df..1300f66201 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -167,7 +167,7 @@ export default function transformProps(
   });
 
   const dataTypes = getColtypesMapping(queriesData[0]);
-  const xAxisDataType = dataTypes?.[xAxisCol];
+  const xAxisDataType = dataTypes?.[xAxisCol] ?? dataTypes?.[xAxisOrig];
   const xAxisType = getAxisType(xAxisDataType);
   const series: SeriesOption[] = [];
   const formatter = getNumberFormatter(contributionMode ? ',.0%' : yAxisFormat);