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

Merge branch 'bar-gauge-poc' of github.com:grafana/grafana into bar-gauge-poc

Browse Source
This commit is contained in:
Torkel Ödegaard
2019-02-18 12:01:15 +01:00
parent 711e4e926b dede40d459
commit 26d02180e5
10 changed files with 111 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/features/dashboard/dashgrid/DashboardPanel.tsx
View File

@@ -76,21 +76,19 @@ export class DashboardPanel extends PureComponent<Props, State> {
// unmount angular panel
this.cleanUpAngularPanel();
if (panel.type !== pluginId) {
this.props.panel.changeType(pluginId, fromAngularPanel);
}
if (plugin.exports) {
this.setState({ plugin, angularPanel: null });
} else {
if (!plugin.exports) {
try {
plugin.exports = await importPluginModule(plugin.module);
} catch (e) {
plugin = getPanelPluginNotFound(pluginId);
}
this.setState({ plugin, angularPanel: null });
}
if (panel.type !== pluginId) {
this.props.panel.changeType(pluginId, fromAngularPanel);
}
this.setState({ plugin, angularPanel: null });
}
}