SRV-920 feat - calculating correct date for 'X ... ago' tooltips

apache · Jan 6, 2025 · 75062f9 · 75062f9
1 parent 166aabb
commit 75062f9
Showing 1 changed file with 11 additions and 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
@@ -96,6 +96,7 @@ import {
   getXAxisFormatter,
   getYAxisFormatter,
 } from '../utils/formatters';
+import moment from 'moment';
 
 const getFormatter = (
   customFormatters: Record<string, ValueFormatter>,
@@ -580,7 +581,7 @@ export default function transformProps(
       show: !inContextMenu,
       trigger: richTooltip ? 'axis' : 'item',
       formatter: (params: any) => {
-        const xValue: number = richTooltip
+        let xValue: number = richTooltip
           ? params[0].value[0]
           : params.value[0];
         const forecastValue: any[] = richTooltip ? params : [params];
@@ -639,6 +640,15 @@ export default function transformProps(
               focusedRow = rows.length - 1;
             }
           });
+        const { seriesName } = params
+        if (seriesName) {
+          const regex = new RegExp(".*(\\d+) (\\w+) ago")
+          const result = seriesName.match(regex)
+          if (result && result.length == 3) {
+            const [_, diff, diffType] = result
+            xValue = moment.utc(xValue).subtract(Number(diff), diffType).valueOf()
+          }
+        }
         return tooltipHtml(rows, tooltipFormatter(xValue), focusedRow);
       },
     },