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

Plugins: Fix importing panel modules (#45590)

Browse Source
This commit is contained in:
Torkel Ödegaard 2022-02-18 12:51:55 +01:00 committed by GitHub
parent 530913dd37
commit 0838f4b1ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
public/app/features/plugins/importPanelPlugin.ts
View File

@ -28,22 +28,25 @@ export function importPanelPluginFromMeta(meta: grafanaData.PanelPluginMeta): Pr
return getPanelPlugin(meta); return getPanelPlugin(meta);
} }
async function getPanelPlugin(meta: grafanaData.PanelPluginMeta): Promise<grafanaData.PanelPlugin> { function getPanelPlugin(meta: grafanaData.PanelPluginMeta): Promise<grafanaData.PanelPlugin> {
try { return importPluginModule(meta.module, meta.info?.version)
const pluginExports = await importPluginModule(meta.module, meta.info?.version); .then((pluginExports) => {
let plugin = pluginExports.plugin; if (pluginExports.plugin) {
return pluginExports.plugin as grafanaData.PanelPlugin;
if (!plugin && pluginExports.PanelCtrl) { } else if (pluginExports.PanelCtrl) {
plugin = new grafanaData.PanelPlugin(null); const plugin = new grafanaData.PanelPlugin(null);
plugin.angularPanelCtrl = pluginExports.PanelCtrl; plugin.angularPanelCtrl = pluginExports.PanelCtrl;
} return plugin;
}
plugin.meta = meta; throw new Error('missing export: plugin or PanelCtrl');
})
return plugin; .then((plugin) => {
} catch (err) { plugin.meta = meta;
// TODO, maybe a different error plugin return plugin;
console.warn('Error loading panel plugin: ' + meta.id, err); })
return getPanelPluginLoadError(meta, err); .catch((err) => {
} // TODO, maybe a different error plugin
console.warn('Error loading panel plugin: ' + meta.id, err);
return getPanelPluginLoadError(meta, err);
});
} }