Skip to content

Commit 6f2fd54

Browse files
[TSVB] Different field format on different series is ignored (#78138)
* [TSVB] Different field format on different series is ignored Closes #74951 * Replace formatter of Y axis with simple value instead of formatter of the first series * Add a condition to Y-axis tickFormatter to display formatted value if there's only one series Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
1 parent d7d96d9 commit 6f2fd54

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,9 @@ export class TimeseriesVisualization extends Component {
163163
const mainAxisGroupId = yAxisIdGenerator('main_group');
164164

165165
const seriesModel = model.series.filter((s) => !s.hidden).map((s) => cloneDeep(s));
166-
const firstSeries = seriesModel.find((s) => s.formatter && !s.separate_axis);
167166

168167
const mainAxisScaleType = TimeseriesVisualization.getAxisScaleType(model);
169168
const mainAxisDomain = TimeseriesVisualization.getYAxisDomain(model);
170-
const tickFormatter = TimeseriesVisualization.getTickFormatter(
171-
firstSeries,
172-
this.props.getConfig
173-
);
174169
const yAxis = [];
175170
let mainDomainAdded = false;
176171

@@ -203,7 +198,7 @@ export class TimeseriesVisualization extends Component {
203198
series
204199
.filter((r) => startsWith(r.id, seriesGroup.id))
205200
.forEach((seriesDataRow) => {
206-
seriesDataRow.tickFormatter = seriesGroupTickFormatter;
201+
seriesDataRow.tickFormat = seriesGroupTickFormatter;
207202
seriesDataRow.groupId = groupId;
208203
seriesDataRow.yScaleType = yScaleType;
209204
seriesDataRow.hideInLegend = Boolean(seriesGroup.hide_in_legend);
@@ -224,7 +219,7 @@ export class TimeseriesVisualization extends Component {
224219
});
225220
} else if (!mainDomainAdded) {
226221
TimeseriesVisualization.addYAxis(yAxis, {
227-
tickFormatter,
222+
tickFormatter: series.length === 1 ? undefined : (val) => val,
228223
id: yAxisIdGenerator('main'),
229224
groupId: mainAxisGroupId,
230225
position: model.axis_position,

src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/area_decorator.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export function AreaSeriesDecorator({
4242
sortIndex,
4343
y1AccessorFormat,
4444
y0AccessorFormat,
45+
tickFormat,
4546
}) {
4647
const id = seriesId;
4748
const groupId = seriesGroupId;
@@ -67,6 +68,7 @@ export function AreaSeriesDecorator({
6768
enableHistogramMode,
6869
useDefaultGroupDomain,
6970
sortIndex,
71+
tickFormat,
7072
...areaSeriesStyle,
7173
};
7274

src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/bar_decorator.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export function BarSeriesDecorator({
4141
sortIndex,
4242
y1AccessorFormat,
4343
y0AccessorFormat,
44+
tickFormat,
4445
}) {
4546
const id = seriesId;
4647
const groupId = seriesGroupId;
@@ -66,6 +67,7 @@ export function BarSeriesDecorator({
6667
enableHistogramMode,
6768
useDefaultGroupDomain,
6869
sortIndex,
70+
tickFormat,
6971
...barSeriesStyle,
7072
};
7173

src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ export const TimeSeries = ({
176176
useDefaultGroupDomain,
177177
y1AccessorFormat,
178178
y0AccessorFormat,
179+
tickFormat,
179180
},
180181
sortIndex
181182
) => {
@@ -207,6 +208,7 @@ export const TimeSeries = ({
207208
sortIndex={sortIndex}
208209
y1AccessorFormat={y1AccessorFormat}
209210
y0AccessorFormat={y0AccessorFormat}
211+
tickFormat={tickFormat}
210212
/>
211213
);
212214
}
@@ -233,6 +235,7 @@ export const TimeSeries = ({
233235
sortIndex={sortIndex}
234236
y1AccessorFormat={y1AccessorFormat}
235237
y0AccessorFormat={y0AccessorFormat}
238+
tickFormat={tickFormat}
236239
/>
237240
);
238241
}

0 commit comments

Comments
 (0)