Commit 5d1c5502 by Torkel Ödegaard Committed by Johannes Schill

minor fixes

parent 5069c7f6
import React from 'react'; import React from 'react';
export interface UsingPopperProps { export interface UsingPopperProps {
showPopper: (prevState: object) => void; showPopper: (prevState: object) => void;
...@@ -60,6 +60,7 @@ export default function withPopper(WrappedComponent) { ...@@ -60,6 +60,7 @@ export default function withPopper(WrappedComponent) {
}; };
renderContent(content) { renderContent(content) {
console.log('render content');
if (typeof content === 'function') { if (typeof content === 'function') {
// If it's a function we assume it's a React component // If it's a function we assume it's a React component
const ReactComponent = content; const ReactComponent = content;
......
import React, { PureComponent } from 'react'; import React, { PureComponent } from 'react';
import { PanelModel } from 'app/features/dashboard/panel_model'; import { PanelModel } from 'app/features/dashboard/panel_model';
import Tooltip from 'app/core/components/Tooltip/Tooltip'; import Tooltip from 'app/core/components/Tooltip/Tooltip';
import templateSrv from 'app/features/templating/template_srv'; import templateSrv from 'app/features/templating/template_srv';
...@@ -21,10 +21,6 @@ export class PanelHeaderCorner extends PureComponent<Props> { ...@@ -21,10 +21,6 @@ export class PanelHeaderCorner extends PureComponent<Props> {
getInfoMode = () => { getInfoMode = () => {
const { panel } = this.props; const { panel } = this.props;
// TODO
// if (error) {
// return InfoModes.Error;
// }
if (!!panel.description) { if (!!panel.description) {
return InfoModes.Info; return InfoModes.Info;
} }
...@@ -35,11 +31,10 @@ export class PanelHeaderCorner extends PureComponent<Props> { ...@@ -35,11 +31,10 @@ export class PanelHeaderCorner extends PureComponent<Props> {
return undefined; return undefined;
}; };
getInfoContent = () => { getInfoContent = (): JSX.Element => {
const { panel } = this.props; const { panel } = this.props;
const markdown = panel.description; const markdown = panel.description;
const linkSrv = new LinkSrv(templateSrv, this.timeSrv); const linkSrv = new LinkSrv(templateSrv, this.timeSrv);
const sanitize = str => str; // TODO
const interpolatedMarkdown = templateSrv.replace(markdown, panel.scopedVars); const interpolatedMarkdown = templateSrv.replace(markdown, panel.scopedVars);
const remarkableInterpolatedMarkdown = new Remarkable().render(interpolatedMarkdown); const remarkableInterpolatedMarkdown = new Remarkable().render(interpolatedMarkdown);
...@@ -63,7 +58,8 @@ export class PanelHeaderCorner extends PureComponent<Props> { ...@@ -63,7 +58,8 @@ export class PanelHeaderCorner extends PureComponent<Props> {
)} )}
</div> </div>
); );
return sanitize(html);
return html;
}; };
render() { render() {
...@@ -72,13 +68,12 @@ export class PanelHeaderCorner extends PureComponent<Props> { ...@@ -72,13 +68,12 @@ export class PanelHeaderCorner extends PureComponent<Props> {
if (!infoMode) { if (!infoMode) {
return null; return null;
} }
const infoContent = this.getInfoContent();
return ( return (
<> <>
{infoMode === InfoModes.Info || infoMode === InfoModes.Links ? ( {infoMode === InfoModes.Info || infoMode === InfoModes.Links ? (
<Tooltip <Tooltip
content={infoContent} content={this.getInfoContent}
className="absolute" className="absolute"
refClassName={`panel-info-corner panel-info-corner--${infoMode.toLowerCase()}`} refClassName={`panel-info-corner panel-info-corner--${infoMode.toLowerCase()}`}
> >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment