Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TSVB] Different field format on different series is ignored #78138

Merged
merged 7 commits into from
Sep 29, 2020
Merged

[TSVB] Different field format on different series is ignored #78138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e19399a
[TSVB] Different field format on different series is ignored
DianaDerevyankina Sep 22, 2020
24b77ef
Merge branch 'master' into Diana/74951
elasticmachine Sep 24, 2020
35743c4
Merge branch 'DianaDerevyankina' into Diana/74951
DianaDerevyankina Sep 24, 2020
33c32e9
Replace formatter of Y axis with simple value instead of formatter of…
DianaDerevyankina Sep 24, 2020
68b06b9
Merge branch 'DianaDerevyankina' into Diana/74951
DianaDerevyankina Sep 25, 2020
101050e
Add a condition to Y-axis tickFormatter to display formatted value if…
DianaDerevyankina Sep 25, 2020
1df5b2f
Merge branch 'master' into Diana/74951
elasticmachine Sep 28, 2020
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
9 changes: 2 additions & 7 deletions src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,9 @@ export class TimeseriesVisualization extends Component {
const mainAxisGroupId = yAxisIdGenerator('main_group');

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

const mainAxisScaleType = TimeseriesVisualization.getAxisScaleType(model);
const mainAxisDomain = TimeseriesVisualization.getYAxisDomain(model);
const tickFormatter = TimeseriesVisualization.getTickFormatter(
firstSeries,
this.props.getConfig
);
const yAxis = [];
let mainDomainAdded = false;

Expand Down Expand Up @@ -203,7 +198,7 @@ export class TimeseriesVisualization extends Component {
series
.filter((r) => startsWith(r.id, seriesGroup.id))
.forEach((seriesDataRow) => {
seriesDataRow.tickFormatter = seriesGroupTickFormatter;
seriesDataRow.tickFormat = seriesGroupTickFormatter;
seriesDataRow.groupId = groupId;
seriesDataRow.yScaleType = yScaleType;
seriesDataRow.hideInLegend = Boolean(seriesGroup.hide_in_legend);
Expand All @@ -224,7 +219,7 @@ export class TimeseriesVisualization extends Component {
});
} else if (!mainDomainAdded) {
TimeseriesVisualization.addYAxis(yAxis, {
tickFormatter,
tickFormatter: series.length === 1 ? undefined : (val) => val,
id: yAxisIdGenerator('main'),
groupId: mainAxisGroupId,
position: model.axis_position,
Expand Down
2 changes: 2 additions & 0 deletions ...imeseries/public/application/visualizations/views/timeseries/decorators/area_decorator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export function AreaSeriesDecorator({
sortIndex,
y1AccessorFormat,
y0AccessorFormat,
tickFormat,
}) {
const id = seriesId;
const groupId = seriesGroupId;
Expand All @@ -67,6 +68,7 @@ export function AreaSeriesDecorator({
enableHistogramMode,
useDefaultGroupDomain,
sortIndex,
tickFormat,
...areaSeriesStyle,
};

Expand Down
2 changes: 2 additions & 0 deletions ...timeseries/public/application/visualizations/views/timeseries/decorators/bar_decorator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export function BarSeriesDecorator({
sortIndex,
y1AccessorFormat,
y0AccessorFormat,
tickFormat,
}) {
const id = seriesId;
const groupId = seriesGroupId;
Expand All @@ -66,6 +67,7 @@ export function BarSeriesDecorator({
enableHistogramMode,
useDefaultGroupDomain,
sortIndex,
tickFormat,
...barSeriesStyle,
};

Expand Down
3 changes: 3 additions & 0 deletions src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ export const TimeSeries = ({
useDefaultGroupDomain,
y1AccessorFormat,
y0AccessorFormat,
tickFormat,
},
sortIndex
) => {
Expand Down Expand Up @@ -207,6 +208,7 @@ export const TimeSeries = ({
sortIndex={sortIndex}
y1AccessorFormat={y1AccessorFormat}
y0AccessorFormat={y0AccessorFormat}
tickFormat={tickFormat}
/>
);
}
Expand All @@ -233,6 +235,7 @@ export const TimeSeries = ({
sortIndex={sortIndex}
y1AccessorFormat={y1AccessorFormat}
y0AccessorFormat={y0AccessorFormat}
tickFormat={tickFormat}
/>
);
}
Expand Down