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
0a5f920b
Commit
0a5f920b
authored
Nov 14, 2018
by
Johannes Schill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
panel-header: Avoid undefined classNames and use the real panel description
parent
af859b2f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
public/app/core/components/Tooltip/withPopper.tsx
+3
-0
public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
+4
-3
No files found.
public/app/core/components/Tooltip/withPopper.tsx
View file @
0a5f920b
...
@@ -68,6 +68,8 @@ export default function withPopper(WrappedComponent) {
...
@@ -68,6 +68,8 @@ export default function withPopper(WrappedComponent) {
render
()
{
render
()
{
const
{
show
,
placement
}
=
this
.
state
;
const
{
show
,
placement
}
=
this
.
state
;
const
className
=
this
.
props
.
className
||
''
;
return
(
return
(
<
WrappedComponent
<
WrappedComponent
{
...
this
.
props
}
{
...
this
.
props
}
...
@@ -76,6 +78,7 @@ export default function withPopper(WrappedComponent) {
...
@@ -76,6 +78,7 @@ export default function withPopper(WrappedComponent) {
renderContent=
{
this
.
renderContent
}
renderContent=
{
this
.
renderContent
}
show=
{
show
}
show=
{
show
}
placement=
{
placement
}
placement=
{
placement
}
className=
{
className
}
/>
/>
);
);
}
}
...
...
public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
View file @
0a5f920b
...
@@ -42,15 +42,16 @@ export class PanelHeader extends PureComponent<Props, State> {
...
@@ -42,15 +42,16 @@ export class PanelHeader extends PureComponent<Props, State> {
const
isLoading
=
false
;
const
isLoading
=
false
;
const
panelHeaderClass
=
classNames
({
'panel-header'
:
true
,
'grid-drag-handle'
:
!
isFullscreen
});
const
panelHeaderClass
=
classNames
({
'panel-header'
:
true
,
'grid-drag-handle'
:
!
isFullscreen
});
const
{
panel
,
dashboard
,
timeInfo
}
=
this
.
props
;
const
{
panel
,
dashboard
,
timeInfo
}
=
this
.
props
;
const
cornerCssClass
=
panel
.
description
?
'panel-info-corner--info'
:
''
;
return
(
return
(
<
div
className=
{
panelHeaderClass
}
>
<
div
className=
{
panelHeaderClass
}
>
<
Tooltip
content=
"hello world"
>
{
panel
.
description
&&
(
<
span
className=
{
`panel-info-corner ${cornerCssClass}`
}
>
<
Tooltip
content=
{
panel
.
description
}
>
<
span
className=
"panel-info-corner panel-info-corner--info"
>
<
i
className=
"fa"
/>
<
i
className=
"fa"
/>
<
span
className=
"panel-info-corner-inner"
/>
<
span
className=
"panel-info-corner-inner"
/>
</
span
>
</
span
>
</
Tooltip
>
</
Tooltip
>
)
}
{
isLoading
&&
(
{
isLoading
&&
(
<
span
className=
"panel-loading"
>
<
span
className=
"panel-loading"
>
<
i
className=
"fa fa-spinner fa-spin"
/>
<
i
className=
"fa fa-spinner fa-spin"
/>
...
...
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