From e4e553b5a2713d2451c5edf6fa333dde0548a09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 20 Mar 2019 19:14:10 +0100 Subject: [PATCH] Merge with master, and updated logo and name --- .../src/components/PieChart/PieChart.tsx | 2 -- .../plugins/panel/piechart/PieChartPanel.tsx | 6 ++-- .../panel/piechart/img/icon_piechart.svg | 29 ++++++++++++++++++ .../piechart/img/piechart_logo_large.png | Bin 3723 -> 0 bytes .../piechart/img/piechart_logo_small.png | Bin 2629 -> 0 bytes public/app/plugins/panel/piechart/plugin.json | 6 ++-- public/app/plugins/panel/piechart/types.ts | 2 -- 7 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 public/app/plugins/panel/piechart/img/icon_piechart.svg delete mode 100644 public/app/plugins/panel/piechart/img/piechart_logo_large.png delete mode 100644 public/app/plugins/panel/piechart/img/piechart_logo_small.png diff --git a/packages/grafana-ui/src/components/PieChart/PieChart.tsx b/packages/grafana-ui/src/components/PieChart/PieChart.tsx index 68b6ed11c72..3310a967264 100644 --- a/packages/grafana-ui/src/components/PieChart/PieChart.tsx +++ b/packages/grafana-ui/src/components/PieChart/PieChart.tsx @@ -145,5 +145,3 @@ export class PieChart extends PureComponent { } } } - -export default PieChart; diff --git a/public/app/plugins/panel/piechart/PieChartPanel.tsx b/public/app/plugins/panel/piechart/PieChartPanel.tsx index 14e251ddffe..5082b162f96 100644 --- a/public/app/plugins/panel/piechart/PieChartPanel.tsx +++ b/public/app/plugins/panel/piechart/PieChartPanel.tsx @@ -15,13 +15,13 @@ interface Props extends PanelProps {} export class PieChartPanel extends PureComponent { render() { - const { panelData, width, height, options } = this.props; + const { data, width, height, options } = this.props; const { valueOptions } = options; const datapoints: PieChartDataPoint[] = []; - if (panelData.timeSeries) { + if (data) { const vmSeries = processTimeSeries({ - timeSeries: panelData.timeSeries, + data, nullValueMode: NullValueMode.Null, }); diff --git a/public/app/plugins/panel/piechart/img/icon_piechart.svg b/public/app/plugins/panel/piechart/img/icon_piechart.svg new file mode 100644 index 00000000000..49da58abec6 --- /dev/null +++ b/public/app/plugins/panel/piechart/img/icon_piechart.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/app/plugins/panel/piechart/img/piechart_logo_large.png b/public/app/plugins/panel/piechart/img/piechart_logo_large.png deleted file mode 100644 index 21b7ab40145bdd8dd7fc08bfb4612a1c37d8bf5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3723 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 diff --git a/public/app/plugins/panel/piechart/plugin.json b/public/app/plugins/panel/piechart/plugin.json index 56299e4aa52..cf9ac759653 100644 --- a/public/app/plugins/panel/piechart/plugin.json +++ b/public/app/plugins/panel/piechart/plugin.json @@ -1,6 +1,6 @@ { "type": "panel", - "name": "PieChart", + "name": "PieChart v2", "id": "piechart", "state": "alpha", @@ -12,8 +12,8 @@ "url": "https://grafana.com" }, "logos": { - "small": "img/piechart_logo_small.png", - "large": "img/piechart_logo_large.png" + "small": "img/icon_piechart.svg", + "large": "img/icon_piechart.svg" } } } diff --git a/public/app/plugins/panel/piechart/types.ts b/public/app/plugins/panel/piechart/types.ts index 5ec9bae516b..45682f31d5e 100644 --- a/public/app/plugins/panel/piechart/types.ts +++ b/public/app/plugins/panel/piechart/types.ts @@ -3,9 +3,7 @@ import { PieChartType } from '@grafana/ui'; export interface PieChartOptions { pieType: PieChartType; strokeWidth: number; - valueOptions: PieChartValueOptions; - // TODO: Options for Legend / Combine components } export interface PieChartValueOptions {