IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 10:03:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

panel-header: Avoid undefined classNames and use the real panel description

Browse Source
This commit is contained in:
Johannes Schill 2018-11-14 22:02:50 +01:00
parent 7d74ca4a8d
commit 48d1a574b9
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/core/components/Tooltip/withPopper.tsx
View File

@ -68,6 +68,8 @@ export default function withPopper(WrappedComponent) {
render() {
const { show, placement } = this.state;
const className = this.props.className || '';
return (
<WrappedComponent
{...this.props}
@ -76,6 +78,7 @@ export default function withPopper(WrappedComponent) {
renderContent={this.renderContent}
show={show}
placement={placement}
className={className}
/>
);
}

15
public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
View File

@ -42,15 +42,16 @@ export class PanelHeader extends PureComponent<Props, State> {
const isLoading = false;
const panelHeaderClass = classNames({ 'panel-header': true, 'grid-drag-handle': !isFullscreen });
const { panel, dashboard, timeInfo } = this.props;
const cornerCssClass = panel.description ? 'panel-info-corner--info' : '';
return (
<div className={panelHeaderClass}>
<Tooltip content="hello world">
<span className={`panel-info-corner ${cornerCssClass}`}>
<i className="fa" />
<span className="panel-info-corner-inner" />
</span>
</Tooltip>
{panel.description && (
<Tooltip content={panel.description}>
<span className="panel-info-corner panel-info-corner--info">
<i className="fa" />
<span className="panel-info-corner-inner" />
</span>
</Tooltip>
)}
{isLoading && (
<span className="panel-loading">
<i className="fa fa-spinner fa-spin" />