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: Legend decimals now work as expected (#24931)

Browse Source 
* Graph: Legend decimals now work as expected

* removed new test that I could not get green
This commit is contained in:
Torkel Ödegaard 2020-05-20 17:28:41 +02:00 committed by GitHub
parent 6099398c37
commit 8aedf81133
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grafana-data/src/valueFormats/valueFormats.test.ts
View File

@ -25,6 +25,7 @@ const formatTests: ValueFormatTest[] = [
{ id: 'ms', decimals: 0, value: 1200, result: '1 s' }, { id: 'ms', decimals: 0, value: 1200, result: '1 s' },
{ id: 'short', decimals: 0, scaledDecimals: -1, value: 98765, result: '98.77 K' }, { id: 'short', decimals: 0, scaledDecimals: -1, value: 98765, result: '98.77 K' },
{ id: 'short', decimals: 0, scaledDecimals: 0, value: 9876543, result: '9.876543 Mil' }, { id: 'short', decimals: 0, scaledDecimals: 0, value: 9876543, result: '9.876543 Mil' },
{ id: 'short', decimals: 2, scaledDecimals: null, value: 9876543, result: '9.88 Mil' },
{ id: 'kbytes', decimals: 3, value: 10000000, result: '9.537 GiB' }, { id: 'kbytes', decimals: 3, value: 10000000, result: '9.537 GiB' },
{ id: 'deckbytes', decimals: 3, value: 10000000, result: '10.000 GB' }, { id: 'deckbytes', decimals: 3, value: 10000000, result: '10.000 GB' },
{ id: 'megwatt', decimals: 3, value: 1000, result: '1.000 GW' }, { id: 'megwatt', decimals: 3, value: 1000, result: '1.000 GW' },

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

@ -98,8 +98,8 @@ export default class TimeSeries {
hideTooltip: boolean; hideTooltip: boolean;
allIsNull: boolean; allIsNull: boolean;
allIsZero: boolean; allIsZero: boolean;
decimals: number; decimals: DecimalCount;
scaledDecimals: number; scaledDecimals: DecimalCount;
hasMsResolution: boolean; hasMsResolution: boolean;
isOutsideRange: boolean; isOutsideRange: boolean;
@ -344,8 +344,8 @@ export default class TimeSeries {
updateLegendValues(formater: ValueFormatter, decimals: DecimalCount, scaledDecimals: DecimalCount) { updateLegendValues(formater: ValueFormatter, decimals: DecimalCount, scaledDecimals: DecimalCount) {
this.valueFormater = formater; this.valueFormater = formater;
this.decimals = decimals ?? 0; this.decimals = decimals;
this.scaledDecimals = scaledDecimals ?? 0; this.scaledDecimals = scaledDecimals;
} }
formatValue(value: number) { formatValue(value: number) {