IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Graph: Fixes auto decimals issue in legend and tooltip (#30628)

Browse Source 
* Graph: Fixes auto decimals issue in legend and tooltip

* Updated decimals
This commit is contained in:
Torkel Ödegaard 2021-01-26 12:37:48 +01:00 committed by GitHub
parent 2c2869a0ae
commit f109f06485
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/app/core/specs/time_series.test.ts
View File

@ -430,25 +430,11 @@ describe('TimeSeries', () => {
};
});
it('should set decimals based on Y axis (expect calculated decimals = 1)', () => {
it('should set decimals to null if no decimals set', () => {
const data = [series];
// Expect ticks with this data will have decimals = 1
updateLegendValues(data, panel, height);
expect(data[0].decimals).toBe(2);
});
it('should set decimals based on Y axis to 0 if calculated decimals = 0)', () => {
testData.datapoints = [
[10, 2],
[0, 3],
[100, 4],
[80, 5],
];
series = new TimeSeries(testData);
series.getFlotPairs();
const data = [series];
updateLegendValues(data, panel, height);
expect(data[0].decimals).toBe(0);
expect(data[0].decimals).toBe(null);
});
it('should set decimals to Y axis decimals + 1', () => {

35
public/app/core/time_series2.ts
View File

@ -1,4 +1,3 @@
import { getFlotTickDecimals } from 'app/core/utils/ticks';
import _ from 'lodash';
import { getValueFormat, ValueFormatter, stringToJsRegex, DecimalCount, formattedValueToString } from '@grafana/data';
@ -45,37 +44,15 @@ export function updateLegendValues(data: TimeSeries[], panel: any, height: numbe
// decimal override
if (_.isNumber(panel.decimals)) {
series.updateLegendValues(formatter, panel.decimals, null);
series.updateLegendValues(formatter, panel.decimals);
} else if (_.isNumber(axis.decimals)) {
series.updateLegendValues(formatter, axis.decimals + 1, null);
series.updateLegendValues(formatter, axis.decimals + 1);
} else {
// auto decimals
// legend and tooltip gets one more decimal precision
// than graph legend ticks
const { datamin, datamax } = getDataMinMax(data);
const { tickDecimals, scaledDecimals } = getFlotTickDecimals(datamin, datamax, axis, height);
const tickDecimalsPlusOne = (tickDecimals || -1) + 1;
series.updateLegendValues(formatter, tickDecimalsPlusOne, scaledDecimals + 2);
series.updateLegendValues(formatter, null);
}
}
}
export function getDataMinMax(data: TimeSeries[]) {
let datamin = null;
let datamax = null;
for (const series of data) {
if (datamax === null || datamax < series.stats.max) {
datamax = series.stats.max;
}
if (datamin === null || datamin > series.stats.min) {
datamin = series.stats.min;
}
}
return { datamin, datamax };
}
/**
* @deprecated: This class should not be used in new panels
*
@ -99,7 +76,6 @@ export default class TimeSeries {
allIsNull: boolean;
allIsZero: boolean;
decimals: DecimalCount;
scaledDecimals: DecimalCount;
hasMsResolution: boolean;
isOutsideRange: boolean;
@ -344,17 +320,16 @@ export default class TimeSeries {
return result;
}
updateLegendValues(formater: ValueFormatter, decimals: DecimalCount, scaledDecimals: DecimalCount) {
updateLegendValues(formater: ValueFormatter, decimals: DecimalCount) {
this.valueFormater = formater;
this.decimals = decimals;
this.scaledDecimals = scaledDecimals;
}
formatValue(value: number | null) {
if (!_.isFinite(value)) {
value = null; // Prevent NaN formatting
}
return formattedValueToString(this.valueFormater(value, this.decimals, this.scaledDecimals));
return formattedValueToString(this.valueFormater(value, this.decimals));
}
isMsResolutionNeeded() {