Improved error handling when rendering dashboard panels, fixes #15913

(cherry picked from commit 2333cf3fd1)
2019-03-19 14:06:06 +01:00
parent 74c89ecbb9
commit b7ad897c46
1 changed files with 9 additions and 3 deletions
@@ -163,14 +163,20 @@ export class DashboardPage extends PureComponent<Props, State> {
        fullscreenPanel: null,
        scrollTop: this.state.rememberScrollTop,
      },
-      () => {
-        dashboard.render();
-      }
+      this.triggerPanelsRendering.bind(this)
    );

    this.setPanelFullscreenClass(false);
  }

+  triggerPanelsRendering() {
+    try {
+      this.props.dashboard.render();
+    } catch (err) {
+      this.props.notifyApp(createErrorNotification(`Panel rendering error`, err));
+    }
+  }
+
  handleFullscreenPanelNotFound(urlPanelId: string) {
    // Panel not found
    this.props.notifyApp(createErrorNotification(`Panel with id ${urlPanelId} not found`));