From b263b3edd64a1e7e1eac8df23dd082c582461097 Mon Sep 17 00:00:00 2001 From: corpglory-dev Date: Wed, 20 Feb 2019 16:32:35 +0300 Subject: [PATCH] change valueOptions --- .../plugins/panel/piechart/ValueOptions.tsx | 23 +++++++++++++++---- public/app/plugins/panel/piechart/types.ts | 15 ++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/public/app/plugins/panel/piechart/ValueOptions.tsx b/public/app/plugins/panel/piechart/ValueOptions.tsx index e83e4686d13..ad88151068e 100644 --- a/public/app/plugins/panel/piechart/ValueOptions.tsx +++ b/public/app/plugins/panel/piechart/ValueOptions.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; -import { FormLabel, PanelOptionsProps, PanelOptionsGroup, Select } from '@grafana/ui'; +import { FormLabel, PanelOptionsGroup, Select } from '@grafana/ui'; import UnitPicker from 'app/core/components/Select/UnitPicker'; -import { PiechartOptions } from './types'; +import { PiechartValueOptions } from './types'; const statOptions = [ { value: 'min', label: 'Min' }, @@ -13,10 +13,23 @@ const statOptions = [ const labelWidth = 6; -export default class ValueOptions extends PureComponent> { - onUnitChange = unit => this.props.onChange({ ...this.props.options, unit: unit.value }); +export interface Props { + options: PiechartValueOptions; + onChange: (valueOptions: PiechartValueOptions) => void; +} - onStatChange = stat => this.props.onChange({ ...this.props.options, stat: stat.value }); +export default class ValueOptions extends PureComponent { + onUnitChange = unit => + this.props.onChange({ + ...this.props.options, + unit: unit.value, + }); + + onStatChange = stat => + this.props.onChange({ + ...this.props.options, + stat: stat.value, + }); render() { const { stat, unit } = this.props.options; diff --git a/public/app/plugins/panel/piechart/types.ts b/public/app/plugins/panel/piechart/types.ts index 9bd6120ab1a..bf576991307 100644 --- a/public/app/plugins/panel/piechart/types.ts +++ b/public/app/plugins/panel/piechart/types.ts @@ -1,14 +1,21 @@ export interface PiechartOptions { pieType: string; + strokeWidth: number; + + valueOptions: PiechartValueOptions; + // TODO: Options for Legend / Combine components +} + +export interface PiechartValueOptions { unit: string; stat: string; - strokeWidth: number; - // TODO: Options for Legend / Combine components } export const defaults: PiechartOptions = { pieType: 'pie', - unit: 'short', - stat: 'current', strokeWidth: 1, + valueOptions: { + unit: 'short', + stat: 'current', + }, };