Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
caff9146
Unverified
Commit
caff9146
authored
Nov 21, 2019
by
Dominik Prokop
Committed by
GitHub
Nov 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tooltip: Fix issue with tooltip throwing an error when retrieving values (#20565)
parent
83fa91b1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
packages/grafana-ui/src/components/Graph/Graph.tsx
+5
-2
packages/grafana-ui/src/components/Graph/GraphWithLegend.tsx
+1
-1
No files found.
packages/grafana-ui/src/components/Graph/Graph.tsx
View file @
caff9146
...
...
@@ -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
const
tooltipContentRenderer
=
tooltipElementProps
.
tooltipComponent
||
GraphTooltip
;
// Indicates column(field) index in y-axis dimension
const
seriesIndex
=
activeItem
?
activeItem
.
series
.
seriesIndex
:
0
;
// Indicates row index in active field values
...
...
@@ -272,7 +271,11 @@ export class Graph extends PureComponent<GraphProps, GraphState> {
};
try
{
$
.
plot
(
this
.
element
,
series
,
flotOptions
);
$
.
plot
(
this
.
element
,
series
.
filter
(
s
=>
s
.
isVisible
),
flotOptions
);
}
catch
(
err
)
{
console
.
log
(
'Graph rendering error'
,
err
,
flotOptions
,
series
);
throw
new
Error
(
'Error rendering panel'
);
...
...
packages/grafana-ui/src/components/Graph/GraphWithLegend.tsx
View file @
caff9146
...
...
@@ -94,7 +94,7 @@ export const GraphWithLegend: React.FunctionComponent<GraphWithLegendProps> = (p
<
div
className=
{
wrapper
}
>
<
div
className=
{
graphContainer
}
>
<
Graph
series=
{
series
.
filter
(
s
=>
!!
s
.
isVisible
)
}
series=
{
series
}
timeRange=
{
timeRange
}
timeZone=
{
timeZone
}
showLines=
{
showLines
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment