github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[TSVB] Hides ticks on the y axis for layers with the same format and different template (#123598) (#125515)

Browse source 
* [TSVB] Hides ticks on the y axis for layers with the same format and different template

* fix PR comment

* fix JEST

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 61ef26d511)

Co-authored-by: Alexey Antonov <alexwizp@gmail.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Stratoula Kalafateli 2022-02-16 15:02:47 +02:00 • committed by GitHub
parent 226be06574
commit f1a4f218fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/plugins/vis_types/timeseries/public/application/components/lib/check_if_series_have_same_formatters.test.ts
View file

@ -26,7 +26,7 @@ describe('checkIfSeriesHaveSameFormatters(seriesModel, fieldFormatMap)', () => {
expect(result).toBe(true);
});
it('should return false for the different value_template series formatters', () => {
it('should return true for the different value_template series formatters', () => {
const seriesModel = [
{
formatter: DATA_FORMATTERS.PERCENT,
@ -39,13 +39,13 @@ describe('checkIfSeriesHaveSameFormatters(seriesModel, fieldFormatMap)', () => {
] as Series[];
const result = checkIfSeriesHaveSameFormatters(seriesModel, fieldFormatMap);
expect(result).toBe(false);
expect(result).toBe(true);
});
it('should return true for the same field formatters', () => {
const seriesModel = [
{ formatter: DATA_FORMATTERS.DEFAULT, metrics: [{ field: 'someField' }] },
{ formatter: DATA_FORMATTERS.DEFAULT, metrics: [{ field: 'someField' }] },
{ formatter: DATA_FORMATTERS.DEFAULT, metrics: [{ type: 'avg', field: 'someField' }] },
{ formatter: DATA_FORMATTERS.DEFAULT, metrics: [{ type: 'avg', field: 'someField' }] },
] as Series[];
const result = checkIfSeriesHaveSameFormatters(seriesModel, fieldFormatMap);
@ -54,11 +54,11 @@ describe('checkIfSeriesHaveSameFormatters(seriesModel, fieldFormatMap)', () => {
it('should return false for the different field formatters', () => {
const seriesModel = [
{ formatter: DATA_FORMATTERS.DEFAULT, metrics: [{ field: 'someField' }] },
{ formatter: DATA_FORMATTERS.DEFAULT, metrics: [{ type: 'avg', field: 'someField' }] },
{
formatter: DATA_FORMATTERS.DEFAULT,
metrics: [{ field: 'anotherField' }],
metrics: [{ id: 'avg', field: 'anotherField' }],
},
] as Series[];
const result = checkIfSeriesHaveSameFormatters(seriesModel, fieldFormatMap);
@ -71,9 +71,12 @@ describe('checkIfSeriesHaveSameFormatters(seriesModel, fieldFormatMap)', () => {
{
formatter: DATA_FORMATTERS.DEFAULT,
metrics: [{ field: 'someField' }, { field: 'field' }],
metrics: [
{ type: 'avg', field: 'someField' },
{ type: 'avg', field: 'field' },
],
},
{ formatter: DATA_FORMATTERS.DEFAULT, metrics: [{ field: 'someField' }] },
{ formatter: DATA_FORMATTERS.DEFAULT, metrics: [{ type: 'avg', field: 'someField' }] },
] as Series[];
const result = checkIfSeriesHaveSameFormatters(seriesModel, fieldFormatMap);

39
src/plugins/vis_types/timeseries/public/application/components/lib/check_if_series_have_same_formatters.ts
View file

@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
import { last, isEqual } from 'lodash';
import { DATA_FORMATTERS } from '../../../../common/enums';
import { aggs } from '../../../../common/agg_utils';
import type { Series } from '../../../../common/types';
import type { FieldFormatMap } from '../../../../../../data/common';
@ -15,19 +15,28 @@ export const checkIfSeriesHaveSameFormatters = (
seriesModel: Series[],
fieldFormatMap?: FieldFormatMap
) => {
const allSeriesHaveDefaultFormatting = seriesModel.every(
(seriesGroup) => seriesGroup.formatter === DATA_FORMATTERS.DEFAULT
);
const uniqFormatters = new Set();
return allSeriesHaveDefaultFormatting && fieldFormatMap
? seriesModel
.map(({ metrics }) => fieldFormatMap[last(metrics)?.field ?? ''])
.every((fieldFormat, index, [firstSeriesFieldFormat]) =>
isEqual(fieldFormat, firstSeriesFieldFormat)
)
: seriesModel.every(
(series) =>
series.formatter === seriesModel[0].formatter &&
series.value_template === seriesModel[0].value_template
);
seriesModel.forEach((seriesGroup) => {
if (seriesGroup.formatter === DATA_FORMATTERS.DEFAULT) {
const activeMetric = seriesGroup.metrics[seriesGroup.metrics.length - 1];
const aggMeta = aggs.find((agg) => agg.id === activeMetric.type);
if (
activeMetric.field &&
aggMeta?.meta.isFieldRequired &&
fieldFormatMap?.[activeMetric.field]
) {
return uniqFormatters.add(JSON.stringify(fieldFormatMap[activeMetric.field]));
}
}
uniqFormatters.add(
JSON.stringify({
// requirement: in the case of using TSVB formatters, we do not need to check the value_template, just formatter!
formatter: seriesGroup.formatter,
})
);
});
return uniqFormatters.size === 1;
};

2
src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js
View file

@ -239,7 +239,7 @@ class TimeseriesVisualization extends Component {
} else if (!mainDomainAdded) {
const tickFormatter = checkIfSeriesHaveSameFormatters(seriesModel, fieldFormatMap)
? seriesGroupTickFormatter
: (val) => val;
: createTickFormatter(undefined, undefined, getConfig);
TimeseriesVisualization.addYAxis(yAxis, {
tickFormatter,

20
src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.test.js
View file

@ -99,7 +99,7 @@ describe('TimeseriesVisualization', () => {
const yAxisFormattedValue = timeSeriesProps.yAxis[0].tickFormatter(value);
expect(yAxisFormattedValue).toBe(value);
expect(yAxisFormattedValue).toBe(`${value}`);
});
test('should return the same stringified number from yAxis formatter for byte and percent series', () => {
@ -119,18 +119,6 @@ describe('TimeseriesVisualization', () => {
expect(yAxis[0].tickFormatter(value)).toBe('500B');
});
test('should return simple number from yAxis formatter and different values from the same byte formatters, but with different value templates', () => {
const timeSeriesProps = setupTimeSeriesProps(
['byte', 'byte'],
['{{value}}', '{{value}} value']
);
const { series, yAxis } = timeSeriesProps;
expect(series[0].tickFormat(value)).toBe('500B');
expect(series[1].tickFormat(value)).toBe('500B value');
expect(yAxis[0].tickFormatter(value)).toBe(value);
});
test('should return percent formatted value from yAxis formatter and three percent formatted series with the same value templates', () => {
const timeSeriesProps = setupTimeSeriesProps(['percent', 'percent', 'percent']);
@ -150,7 +138,7 @@ describe('TimeseriesVisualization', () => {
expect(series[0].tickFormat(value)).toBe('500 template');
expect(series[1].tickFormat(value)).toBe('500B template');
expect(yAxis[0].tickFormatter(value)).toBe(value);
expect(yAxis[0].tickFormatter(value)).toBe(`${value}`);
});
test('should return field formatted value for yAxis and single series with default formatter', () => {
@ -178,7 +166,7 @@ describe('TimeseriesVisualization', () => {
expect(series[1].tickFormat(value)).toBe('500 years');
expect(series[2].tickFormat(value)).toBe('42 years');
expect(series[3].tickFormat(value)).toBe('$500');
expect(yAxis[0].tickFormatter(value)).toBe(value);
expect(yAxis[0].tickFormatter(value)).toBe(`${value}`);
});
test('should return simple number from yAxis formatter and correctly formatted series values', () => {
@ -189,7 +177,7 @@ describe('TimeseriesVisualization', () => {
expect(series[1].tickFormat(value)).toBe('500B');
expect(series[2].tickFormat(value)).toBe('50000%');
expect(series[3].tickFormat(value)).toBe('$500');
expect(yAxis[0].tickFormatter(value)).toBe(value);
expect(yAxis[0].tickFormatter(value)).toBe(`${value}`);
});
});
});