From 0633dba30211c6f2d6b8da759ab647325616d08a Mon Sep 17 00:00:00 2001 From: corpglory-dev Date: Tue, 19 Feb 2019 21:14:05 +0300 Subject: [PATCH] Fixes after merging #15468 --- ...hartPanelOptions.tsx => PieChartPanelEditor.tsx} | 13 ++----------- public/app/plugins/panel/piechart/module.tsx | 12 +++++++++--- public/app/plugins/panel/piechart/types.ts | 7 +++++++ 3 files changed, 18 insertions(+), 14 deletions(-) rename public/app/plugins/panel/piechart/{PiechartPanelOptions.tsx => PieChartPanelEditor.tsx} (66%) diff --git a/public/app/plugins/panel/piechart/PiechartPanelOptions.tsx b/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx similarity index 66% rename from public/app/plugins/panel/piechart/PiechartPanelOptions.tsx rename to public/app/plugins/panel/piechart/PieChartPanelEditor.tsx index 43d7c2ab23d..8743dc0f539 100644 --- a/public/app/plugins/panel/piechart/PiechartPanelOptions.tsx +++ b/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx @@ -1,19 +1,10 @@ import React, { PureComponent } from 'react'; -import { PanelOptionsProps, PanelOptionsGrid } from '@grafana/ui'; +import { PanelEditorProps, PanelOptionsGrid } from '@grafana/ui'; import ValueOptions from './ValueOptions'; import { PiechartOptions } from './types'; -export const defaultProps = { - options: { - pieType: 'pie', - unit: 'short', - stat: 'current', - strokeWidth: 1, - }, -}; - -export default class PiechartPanelOptions extends PureComponent> { +export default class PiechartPanelOptions extends PureComponent> { static defaultProps = defaultProps; render() { diff --git a/public/app/plugins/panel/piechart/module.tsx b/public/app/plugins/panel/piechart/module.tsx index 13789376c8e..11737de9a08 100644 --- a/public/app/plugins/panel/piechart/module.tsx +++ b/public/app/plugins/panel/piechart/module.tsx @@ -1,4 +1,10 @@ -import PiechartPanelOptions, { defaultProps } from './PiechartPanelOptions'; -import { PiechartPanel } from './PiechartPanel'; +import { ReactPanelPlugin } from '@grafana/ui'; -export { PiechartPanel as Panel, PiechartPanelOptions as PanelOptions, defaultProps as PanelDefaults }; +import PiechartPanelEditor from './PiechartPanelEditor'; +import { PiechartPanel } from './PiechartPanel'; +import { PiechartOptions, defaults } from './types'; + +export const reactPanel = new ReactPanelPlugin(PiechartPanel); + +reactPanel.setEditor(PiechartPanelEditor); +reactPanel.setDefaults(defaults); diff --git a/public/app/plugins/panel/piechart/types.ts b/public/app/plugins/panel/piechart/types.ts index 8357c75dc28..9bd6120ab1a 100644 --- a/public/app/plugins/panel/piechart/types.ts +++ b/public/app/plugins/panel/piechart/types.ts @@ -5,3 +5,10 @@ export interface PiechartOptions { strokeWidth: number; // TODO: Options for Legend / Combine components } + +export const defaults: PiechartOptions = { + pieType: 'pie', + unit: 'short', + stat: 'current', + strokeWidth: 1, +};