You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by el...@apache.org on 2022/09/20 20:50:29 UTC

[superset] 19/29: fix(explore): Time column label not formatted when GENERIC_X_AXES enabled (#21294)

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

elizabeth pushed a commit to branch 2.0-test
in repository https://gitbox.apache.org/repos/asf/superset.git

commit 551f3064795b9635dbeaed9c12b018350817d737
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)
    
    (cherry picked from commit c3a00d43d055224d4a31ea9315934a59b556eea7)
---
 .../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 62ed57268f..663131dd97 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
@@ -155,7 +155,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);