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

refactor to not crash when no links

Browse Source
This commit is contained in:
Peter Holmberg 2018-12-18 15:30:34 +01:00
parent bf7ba9a4d1
commit 659b5a3c15
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/app/core/components/PanelHelp/PluginHelp.tsx
View File

@ -25,18 +25,24 @@ export default class PluginHelp extends PureComponent<Props, State> {
this.loadHelp();
}
constructPlaceholderInfo() {
constructPlaceholderInfo = () => {
const { plugin } = this.props;
const markdown = new Remarkable();
return markdown.render(
const fallBack = markdown.render(
`## ${plugin.name} \n by _${plugin.info.author.name} (<${plugin.info.author.url}>)_\n\n${
plugin.info.description
}\n\n### Links \n ${plugin.info.links.map(link => {
return `${link.name}: <${link.url}>\n`;
})}`
}\n\n${
plugin.info.links
? `### Links \n ${plugin.info.links.map(link => {
return `${link.name}: <${link.url}>\n`;
})}`
: ''
}`
);
}
return fallBack;
};
loadHelp = () => {
const { plugin, type } = this.props;
@ -48,7 +54,7 @@ export default class PluginHelp extends PureComponent<Props, State> {
const markdown = new Remarkable();
const helpHtml = markdown.render(response);
if (response === '' && this.props.type === 'help') {
if (response === '' && type === 'help') {
this.setState({
isError: false,
isLoading: false,

2
public/app/features/dashboard/dashgrid/VisualizationTab.tsx
View File

@ -205,7 +205,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
}
};
renderHelp = () => <PluginHelp plugin={this.state.currentDataSource.meta} type="panel_help" />;
renderHelp = () => <PluginHelp plugin={this.state.currentDataSource.meta} type="help" />;
render() {
const { plugin } = this.props;