mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Fixed gauge issue that will require migration later and also value options editor did not handle null decimals or 0 decimals
This commit is contained in:
parent
c0b204f93b
commit
d33d08fa15
@ -9,7 +9,7 @@ import { Themeable } from '../../index';
|
|||||||
type TimeSeriesValue = string | number | null;
|
type TimeSeriesValue = string | number | null;
|
||||||
|
|
||||||
export interface Props extends Themeable {
|
export interface Props extends Themeable {
|
||||||
decimals: number;
|
decimals?: number | null;
|
||||||
height: number;
|
height: number;
|
||||||
valueMappings: ValueMapping[];
|
valueMappings: ValueMapping[];
|
||||||
maxValue: number;
|
maxValue: number;
|
||||||
|
@ -35,7 +35,15 @@ export class SingleStatValueEditor extends PureComponent<Props> {
|
|||||||
|
|
||||||
onDecimalChange = event => {
|
onDecimalChange = event => {
|
||||||
if (!isNaN(event.target.value)) {
|
if (!isNaN(event.target.value)) {
|
||||||
this.props.onChange({ ...this.props.options, decimals: event.target.value });
|
this.props.onChange({
|
||||||
|
...this.props.options,
|
||||||
|
decimals: parseInt(event.target.value, 10),
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.props.onChange({
|
||||||
|
...this.props.options,
|
||||||
|
decimals: null,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -45,6 +53,11 @@ export class SingleStatValueEditor extends PureComponent<Props> {
|
|||||||
render() {
|
render() {
|
||||||
const { stat, unit, decimals, prefix, suffix } = this.props.options;
|
const { stat, unit, decimals, prefix, suffix } = this.props.options;
|
||||||
|
|
||||||
|
let decimalsString = '';
|
||||||
|
if (Number.isFinite(decimals)) {
|
||||||
|
decimalsString = decimals.toString();
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PanelOptionsGroup title="Value">
|
<PanelOptionsGroup title="Value">
|
||||||
<div className="gf-form">
|
<div className="gf-form">
|
||||||
@ -65,7 +78,7 @@ export class SingleStatValueEditor extends PureComponent<Props> {
|
|||||||
labelWidth={labelWidth}
|
labelWidth={labelWidth}
|
||||||
placeholder="auto"
|
placeholder="auto"
|
||||||
onChange={this.onDecimalChange}
|
onChange={this.onDecimalChange}
|
||||||
value={decimals || ''}
|
value={decimalsString}
|
||||||
type="number"
|
type="number"
|
||||||
/>
|
/>
|
||||||
<FormField label="Prefix" labelWidth={labelWidth} onChange={this.onPrefixChange} value={prefix || ''} />
|
<FormField label="Prefix" labelWidth={labelWidth} onChange={this.onPrefixChange} value={prefix || ''} />
|
||||||
|
@ -15,7 +15,7 @@ export interface SingleStatValueOptions {
|
|||||||
suffix: string;
|
suffix: string;
|
||||||
stat: string;
|
stat: string;
|
||||||
prefix: string;
|
prefix: string;
|
||||||
decimals: number;
|
decimals?: number | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const defaults: GaugeOptions = {
|
export const defaults: GaugeOptions = {
|
||||||
@ -26,7 +26,7 @@ export const defaults: GaugeOptions = {
|
|||||||
valueOptions: {
|
valueOptions: {
|
||||||
prefix: '',
|
prefix: '',
|
||||||
suffix: '',
|
suffix: '',
|
||||||
decimals: 0,
|
decimals: null,
|
||||||
stat: 'avg',
|
stat: 'avg',
|
||||||
unit: 'none',
|
unit: 'none',
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user