From 38b5d7862fb9ca4a5dca6731abdea66cb431089d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 15 Dec 2018 12:08:33 -0800 Subject: [PATCH] Fix for no metrics panels, now goes to viz tab and does not show queries tab --- .../features/dashboard/dashgrid/PanelEditor.tsx | 16 ++++++++++++++-- public/app/plugins/panel/text/module.ts | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/public/app/features/dashboard/dashgrid/PanelEditor.tsx b/public/app/features/dashboard/dashgrid/PanelEditor.tsx index 9252f1ada29..a746d6c4b91 100644 --- a/public/app/features/dashboard/dashgrid/PanelEditor.tsx +++ b/public/app/features/dashboard/dashgrid/PanelEditor.tsx @@ -72,14 +72,26 @@ export class PanelEditor extends PureComponent { render() { const { plugin } = this.props; - const activeTab = store.getState().location.query.tab || 'queries'; + let activeTab = store.getState().location.query.tab || 'queries'; - const tabs = [ + const tabs: PanelEditorTab[] = [ { id: 'queries', text: 'Queries' }, { id: 'visualization', text: 'Visualization' }, { id: 'advanced', text: 'Panel Options' }, ]; + // handle panels that do not have queries tab + if (plugin.exports.PanelCtrl) { + if (!plugin.exports.PanelCtrl.prototype.onDataReceived) { + // remove queries tab + tabs.shift(); + // switch tab + if (activeTab === 'queries') { + activeTab = 'visualization'; + } + } + } + if (config.alertingEnabled && plugin.id === 'graph') { tabs.push({ id: 'alert', diff --git a/public/app/plugins/panel/text/module.ts b/public/app/plugins/panel/text/module.ts index 875a7728568..874691fab97 100644 --- a/public/app/plugins/panel/text/module.ts +++ b/public/app/plugins/panel/text/module.ts @@ -7,6 +7,8 @@ const defaultContent = ` For markdown syntax help: [commonmark.org/help](https://commonmark.org/help/) + + `; export class TextPanelCtrl extends PanelCtrl {