From 4b801be98ca8aa013c29a5e5b565402179626ee0 Mon Sep 17 00:00:00 2001 From: Alex Khomenko Date: Wed, 14 Apr 2021 16:48:53 +0300 Subject: [PATCH] Silcense warning message for row (#32985) --- public/app/features/dashboard/dashgrid/PanelPluginError.tsx | 5 +++-- public/app/features/dashboard/state/actions.ts | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/public/app/features/dashboard/dashgrid/PanelPluginError.tsx b/public/app/features/dashboard/dashgrid/PanelPluginError.tsx index 3418663942c..bdb8c4a9503 100644 --- a/public/app/features/dashboard/dashgrid/PanelPluginError.tsx +++ b/public/app/features/dashboard/dashgrid/PanelPluginError.tsx @@ -51,14 +51,15 @@ export function getPanelPluginLoadError(meta: PanelPluginMeta, err: any): PanelP return plugin; } -export function getPanelPluginNotFound(id: string): PanelPlugin { +export function getPanelPluginNotFound(id: string, silent?: boolean): PanelPlugin { const NotFound = class NotFound extends PureComponent { render() { return ; } }; - const plugin = new PanelPlugin(NotFound); + const plugin = new PanelPlugin(silent ? () => null : NotFound); + plugin.meta = { id: id, name: id, diff --git a/public/app/features/dashboard/state/actions.ts b/public/app/features/dashboard/state/actions.ts index d771d902355..30d718b8e19 100644 --- a/public/app/features/dashboard/state/actions.ts +++ b/public/app/features/dashboard/state/actions.ts @@ -134,8 +134,10 @@ export function initDashboardPanel(panel: PanelModel): ThunkResult { plugin = await dispatch(loadPanelPlugin(pluginToLoad)); } catch (e) { // When plugin not found - plugin = getPanelPluginNotFound(pluginToLoad); - notFound = true; + plugin = getPanelPluginNotFound(pluginToLoad, pluginToLoad === 'row'); + if (pluginToLoad !== 'row') { + notFound = true; + } } }