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

Tooltip: Fix issue with tooltip throwing an error when retrieving values (#20565)

Browse Source
This commit is contained in:
Dominik Prokop 2019-11-21 17:07:11 +01:00 committed by GitHub
parent 83fa91b1f4
commit caff9146ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/grafana-ui/src/components/Graph/Graph.tsx
View File

@ -139,7 +139,6 @@ export class Graph extends PureComponent<GraphProps, GraphState> {
// Check if tooltip needs to be rendered with custom tooltip component, otherwise default to GraphTooltip // Check if tooltip needs to be rendered with custom tooltip component, otherwise default to GraphTooltip
const tooltipContentRenderer = tooltipElementProps.tooltipComponent || GraphTooltip; const tooltipContentRenderer = tooltipElementProps.tooltipComponent || GraphTooltip;
// Indicates column(field) index in y-axis dimension // Indicates column(field) index in y-axis dimension
const seriesIndex = activeItem ? activeItem.series.seriesIndex : 0; const seriesIndex = activeItem ? activeItem.series.seriesIndex : 0;
// Indicates row index in active field values // Indicates row index in active field values
@ -272,7 +271,11 @@ export class Graph extends PureComponent<GraphProps, GraphState> {
}; };
try { try {
$.plot(this.element, series, flotOptions); $.plot(
this.element,
series.filter(s => s.isVisible),
flotOptions
);
} catch (err) { } catch (err) {
console.log('Graph rendering error', err, flotOptions, series); console.log('Graph rendering error', err, flotOptions, series);
throw new Error('Error rendering panel'); throw new Error('Error rendering panel');

2
packages/grafana-ui/src/components/Graph/GraphWithLegend.tsx
View File

@ -94,7 +94,7 @@ export const GraphWithLegend: React.FunctionComponent<GraphWithLegendProps> = (p
<div className={wrapper}> <div className={wrapper}>
<div className={graphContainer}> <div className={graphContainer}>
<Graph <Graph
series={series.filter(s => !!s.isVisible)} series={series}
timeRange={timeRange} timeRange={timeRange}
timeZone={timeZone} timeZone={timeZone}
showLines={showLines} showLines={showLines}