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

Fix: React Graph & Show message on no data (#16278)

Browse Source
This commit is contained in:
Ryan McKinley 2019-03-28 10:15:20 -07:00 committed by Torkel Ödegaard
parent 9fd824960f
commit 236074ea47
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
public/app/plugins/panel/graph2/GraphPanel.tsx
View File

@ -14,36 +14,46 @@ export class GraphPanel extends PureComponent<Props> {
const { showLines, showBars, showPoints } = this.props.options; const { showLines, showBars, showPoints } = this.props.options;
const graphs: GraphSeriesXY[] = []; const graphs: GraphSeriesXY[] = [];
for (const series of data) { if (data) {
const timeColumn = getFirstTimeField(series); for (const series of data) {
if (timeColumn < 0) { const timeColumn = getFirstTimeField(series);
continue; if (timeColumn < 0) {
} continue;
}
for (let i = 0; i < series.fields.length; i++) { for (let i = 0; i < series.fields.length; i++) {
const field = series.fields[i]; const field = series.fields[i];
// Show all numeric columns // Show all numeric columns
if (field.type === FieldType.number) { if (field.type === FieldType.number) {
// Use external calculator just to make sure it works :) // Use external calculator just to make sure it works :)
const points = getFlotPairs({ const points = getFlotPairs({
series, series,
xIndex: timeColumn, xIndex: timeColumn,
yIndex: i, yIndex: i,
nullValueMode: NullValueMode.Null, nullValueMode: NullValueMode.Null,
});
if (points.length > 0) {
graphs.push({
label: field.name,
data: points,
color: colors[graphs.length % colors.length],
}); });
if (points.length > 0) {
graphs.push({
label: field.name,
data: points,
color: colors[graphs.length % colors.length],
});
}
} }
} }
} }
} }
if (graphs.length < 1) {
return (
<div className="panel-empty">
<p>No data found in response</p>
</div>
);
}
return ( return (
<Graph <Graph
series={graphs} series={graphs}