Commit d8c22646 by Torkel Ödegaard Committed by GitHub

Merge pull request #15970 from grafana/dashboard-rendering-error-handling

Improved error handling when rendering dashboard panels
parents e31029ad 2333cf3f
...@@ -163,14 +163,20 @@ export class DashboardPage extends PureComponent<Props, State> { ...@@ -163,14 +163,20 @@ export class DashboardPage extends PureComponent<Props, State> {
fullscreenPanel: null, fullscreenPanel: null,
scrollTop: this.state.rememberScrollTop, scrollTop: this.state.rememberScrollTop,
}, },
() => { this.triggerPanelsRendering.bind(this)
dashboard.render();
}
); );
this.setPanelFullscreenClass(false); this.setPanelFullscreenClass(false);
} }
triggerPanelsRendering() {
try {
this.props.dashboard.render();
} catch (err) {
this.props.notifyApp(createErrorNotification(`Panel rendering error`, err));
}
}
handleFullscreenPanelNotFound(urlPanelId: string) { handleFullscreenPanelNotFound(urlPanelId: string) {
// Panel not found // Panel not found
this.props.notifyApp(createErrorNotification(`Panel with id ${urlPanelId} not found`)); this.props.notifyApp(createErrorNotification(`Panel with id ${urlPanelId} not found`));
......
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