[superset] branch master updated: fix(chart): Time Series set showMaxLabel as null for time xAxis (#20627)

[ru...@apache.org]

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

rusackas 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 9362e27ce2 fix(chart): Time Series set showMaxLabel as null for time xAxis (#20627)
9362e27ce2 is described below

commit 9362e27ce2ace1803a975ab289fe2024fd195367
Author: Antonio Rivero Martinez <38...@users.noreply.github.com>
AuthorDate: Tue Aug 2 17:35:41 2022 -0300

    fix(chart): Time Series set showMaxLabel as null for time xAxis (#20627)
    
    * Time Series Chart:
    
    -Apache echarts has this option as false by default for time axis, so we need to override it for our charts so it's uto determined and not fixed to hidden.
    - Add AxisType enum so we stop comparing agains raw strings when checking xAxis type
    
    * Time Series Chart:
    
    - set the showMaxLabel option directly without using merge
    
    * Time Series Chart:
    
     - Rename the property to showMaxLabel as it was originally
---
 .../plugin-chart-echarts/src/Timeseries/transformProps.ts | 15 +++++++++++++--
 .../plugins/plugin-chart-echarts/src/Timeseries/types.ts  |  7 +++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
index b6b23fc701..07f18c3d5e 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
@@ -41,6 +41,7 @@ import {
   EchartsTimeseriesSeriesType,
   TimeseriesChartTransformedProps,
   OrientationType,
+  AxisType,
 } from './types';
 import { DEFAULT_FORM_DATA } from './constants';
 import { ForecastSeriesEnum, ForecastValue } from '../types';
@@ -337,13 +338,23 @@ export default function transformProps(
       rotate: xAxisLabelRotation,
     },
     minInterval:
-      xAxisType === 'time' && timeGrainSqla
+      xAxisType === AxisType.time && timeGrainSqla
         ? TIMEGRAIN_TO_TIMESTAMP[timeGrainSqla]
         : 0,
   };
+
+  if (xAxisType === AxisType.time) {
+    /**
+     * Overriding default behavior (false) for time axis regardless of the granilarity.
+     * Not including this in the initial declaration above so if echarts changes the default
+     * behavior for other axist types we won't unintentionally override it
+     */
+    xAxis.axisLabel.showMaxLabel = null;
+  }
+
   let yAxis: any = {
     ...defaultYAxis,
-    type: logAxis ? 'log' : 'value',
+    type: logAxis ? AxisType.log : AxisType.value,
     min,
     max,
     minorTick: { show: true },
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts
index 946d41ec16..71729bd0f1 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/types.ts
@@ -94,3 +94,10 @@ export interface EchartsTimeseriesChartProps
 
 export type TimeseriesChartTransformedProps =
   EChartTransformedProps<EchartsTimeseriesFormData>;
+
+export enum AxisType {
+  category = 'category',
+  value = 'value',
+  time = 'time',
+  log = 'log',
+}