public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15354 from grafana/fix/plugin-loading-failure

Browse Source 
Fix plugin loading failure message not being displayed
This commit is contained in:
Torkel Ödegaard
2019-02-11 12:49:08 +01:00
committed by GitHub
parent ba2f698b81 9485c67827
commit 6f16f70456
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+9 -4
View File
@@ -68,7 +68,7 @@ export class DashboardPanel extends PureComponent<Props, State> {
// handle plugin loading & changing of plugin type
if (!this.state.plugin || this.state.plugin.id !== pluginId) {
const plugin = config.panels[pluginId] || getPanelPluginNotFound(pluginId);
let plugin = config.panels[pluginId] || getPanelPluginNotFound(pluginId);
// remember if this is from an angular panel
const fromAngularPanel = this.state.angularPanel != null;
@@ -81,10 +81,15 @@ export class DashboardPanel extends PureComponent<Props, State> {
}
if (plugin.exports) {
this.setState({ plugin: plugin, angularPanel: null });
this.setState({ plugin, angularPanel: null });
} else {
plugin.exports = await importPluginModule(plugin.module);
this.setState({ plugin: plugin, angularPanel: null });
try {
plugin.exports = await importPluginModule(plugin.module);
} catch (e) {
plugin = getPanelPluginNotFound(pluginId);
}
this.setState({ plugin, angularPanel: null });
}
}
}