Skip to content
This repository has been archived by the owner on Dec 10, 2021. It is now read-only.

fix(plugin-chart-echarts): fix tooltip format in mixed ts chart #1143

Merged
merged 1 commit into from
Jun 2, 2021
Merged

fix(plugin-chart-echarts): fix tooltip format in mixed ts chart #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import {
import { defaultGrid, defaultTooltip, defaultYAxis } from '../defaults';
import {
getPadding,
getTooltipFormatter,
getTooltipTimeFormatter,
getXAxisFormatter,
transformEventAnnotation,
transformFormulaAnnotation,
Expand Down Expand Up @@ -109,6 +109,18 @@ export default function transformProps(chartProps: ChartProps): EchartsProps {
const formatter = getNumberFormatter(contributionMode ? ',.0%' : yAxisFormat);
const formatterSecondary = getNumberFormatter(contributionMode ? ',.0%' : yAxisFormatSecondary);

const primarySeries = new Set<string>();
const secondarySeries = new Set<string>();
const mapSeriesIdToAxis = (seriesOption: SeriesOption, index?: number): void => {
if (index === 1) {
secondarySeries.add(seriesOption.id as string);
} else {
primarySeries.add(seriesOption.id as string);
}
};
rawSeriesA.forEach(seriesOption => mapSeriesIdToAxis(seriesOption, yAxisIndex));
rawSeriesB.forEach(seriesOption => mapSeriesIdToAxis(seriesOption, yAxisIndexB));

rawSeriesA.forEach(entry => {
const transformedSeries = transformSeries(entry, colorScale, {
area,
Expand Down Expand Up @@ -159,7 +171,7 @@ export default function transformProps(chartProps: ChartProps): EchartsProps {
if (max === undefined) max = 1;
}

const tooltipFormatter = getTooltipFormatter(tooltipTimeFormat);
const tooltipTimeFormatter = getTooltipTimeFormatter(tooltipTimeFormat);
const xAxisFormatter = getXAxisFormatter(xAxisTimeFormat);

const addYAxisLabelOffset = !!(yAxisTitle || yAxisTitleSecondary);
Expand Down Expand Up @@ -211,7 +223,7 @@ export default function transformProps(chartProps: ChartProps): EchartsProps {
const value: number = !richTooltip ? params.value : params[0].value[0];
const prophetValue = !richTooltip ? [params] : params;

const rows: Array<string> = [`${tooltipFormatter(value)}`];
const rows: Array<string> = [`${tooltipTimeFormatter(value)}`];
const prophetValues: Record<string, ProphetValue> = extractProphetValuesFromTooltipParams(
prophetValue,
);
Expand All @@ -222,7 +234,7 @@ export default function transformProps(chartProps: ChartProps): EchartsProps {
formatProphetTooltipSeries({
...value,
seriesName: key,
formatter,
formatter: primarySeries.has(key) ? formatter : formatterSecondary,
}),
);
});
Expand Down
4 changes: 2 additions & 2 deletions plugins/plugin-chart-echarts/src/Timeseries/transformProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import {
import { defaultGrid, defaultTooltip, defaultYAxis } from '../defaults';
import {
getPadding,
getTooltipFormatter,
getTooltipTimeFormatter,
getXAxisFormatter,
transformEventAnnotation,
transformFormulaAnnotation,
Expand Down Expand Up @@ -135,7 +135,7 @@ export default function transformProps(chartProps: ChartProps): EchartsProps {
if (max === undefined) max = 1;
}

const tooltipFormatter = getTooltipFormatter(tooltipTimeFormat);
const tooltipFormatter = getTooltipTimeFormatter(tooltipTimeFormat);
const xAxisFormatter = getXAxisFormatter(xAxisTimeFormat);

const addYAxisLabelOffset = !!yAxisTitle;
Expand Down
2 changes: 1 addition & 1 deletion plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ export function getPadding(
});
}

export function getTooltipFormatter(format?: string): TimeFormatter | StringConstructor {
export function getTooltipTimeFormatter(format?: string): TimeFormatter | StringConstructor {
if (format === smartDateFormatter.id) {
return smartDateDetailedFormatter;
}
Expand Down