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

Heatmap: fix formatting (#21433)

Browse Source 
* add formatting

* remove logging
This commit is contained in:
Ryan McKinley 2020-01-10 03:50:30 -08:00 committed by Torkel Ödegaard
parent 15fe58f193
commit 7521d2bba0
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/panel/heatmap/heatmap_tooltip.ts
View File

@ -2,7 +2,7 @@ import * as d3 from 'd3';
import $ from 'jquery'; import $ from 'jquery';
import _ from 'lodash'; import _ from 'lodash';
import { getValueBucketBound } from './heatmap_data_converter'; import { getValueBucketBound } from './heatmap_data_converter';
import { getValueFormat } from '@grafana/data'; import { getValueFormat, formattedValueToString } from '@grafana/data';
const TOOLTIP_PADDING_X = 30; const TOOLTIP_PADDING_X = 30;
const TOOLTIP_PADDING_Y = 5; const TOOLTIP_PADDING_Y = 5;
@ -273,9 +273,9 @@ export class HeatmapTooltip {
} }
countValueFormatter(decimals: number, scaledDecimals: any = null) { countValueFormatter(decimals: number, scaledDecimals: any = null) {
const format = 'short'; const fmt = getValueFormat('short');
return (value: number) => { return (value: number) => {
return getValueFormat(format)(value, decimals, scaledDecimals); return formattedValueToString(fmt(value, decimals, scaledDecimals));
}; };
} }
} }

16
public/app/plugins/panel/heatmap/rendering.ts
View File

@ -6,7 +6,14 @@ import * as ticksUtils from 'app/core/utils/ticks';
import { HeatmapTooltip } from './heatmap_tooltip'; import { HeatmapTooltip } from './heatmap_tooltip';
import { mergeZeroBuckets } from './heatmap_data_converter'; import { mergeZeroBuckets } from './heatmap_data_converter';
import { getColorScale, getOpacityScale } from './color_scale'; import { getColorScale, getOpacityScale } from './color_scale';
import { toUtc, PanelEvents, GrafanaThemeType, getColorFromHexRgbOrName, getValueFormat } from '@grafana/data'; import {
toUtc,
PanelEvents,
GrafanaThemeType,
getColorFromHexRgbOrName,
getValueFormat,
formattedValueToString,
} from '@grafana/data';
import { CoreEvents } from 'app/types'; import { CoreEvents } from 'app/types';
const MIN_CARD_SIZE = 1, const MIN_CARD_SIZE = 1,
@ -441,11 +448,14 @@ export class HeatmapRenderer {
const format = this.panel.yAxis.format; const format = this.panel.yAxis.format;
return (value: any) => { return (value: any) => {
try { try {
return format !== 'none' ? getValueFormat(format)(value, decimals, scaledDecimals) : value; if (format !== 'none') {
const v = getValueFormat(format)(value, decimals, scaledDecimals);
return formattedValueToString(v);
}
} catch (err) { } catch (err) {
console.error(err.message || err); console.error(err.message || err);
return value;
} }
return value;
}; };
} }