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

Alerting: load correct unified alerting tab (#44794) (#44832)

Browse Source 
(cherry picked from commit 29b97361f7)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
This commit is contained in:
Grot (@grafanabot) 2022-02-03 14:08:57 +01:00 committed by GitHub
parent 60fcb87a6b
commit e37dde0036
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
View File

@ -41,7 +41,7 @@ export const PanelEditorTabs: FC<PanelEditorTabsProps> = React.memo(({ panel, da
<TabsBar className={styles.tabBar} hideBorder> <TabsBar className={styles.tabBar} hideBorder>
{tabs.map((tab) => { {tabs.map((tab) => {
if (tab.id === PanelEditorTabId.Alert) { if (tab.id === PanelEditorTabId.Alert) {
renderAlertTab(tab, panel, dashboard, onChangeTab); return renderAlertTab(tab, panel, dashboard, onChangeTab);
} }
return ( return (
<Tab <Tab
@ -86,9 +86,13 @@ function renderAlertTab(
dashboard: DashboardModel, dashboard: DashboardModel,
onChangeTab: (tab: PanelEditorTab) => void onChangeTab: (tab: PanelEditorTab) => void
) { ) {
if (!config.alertingEnabled || !config.unifiedAlertingEnabled) { const alertingDisabled = !config.alertingEnabled && !config.unifiedAlertingEnabled;
if (alertingDisabled) {
return null; return null;
} else if (config.unifiedAlertingEnabled) { }
if (config.unifiedAlertingEnabled) {
return ( return (
<PanelAlertTab <PanelAlertTab
key={tab.id} key={tab.id}
@ -100,7 +104,9 @@ function renderAlertTab(
dashboard={dashboard} dashboard={dashboard}
/> />
); );
} else if (config.alertingEnabled) { }
if (config.alertingEnabled) {
return ( return (
<Tab <Tab
key={tab.id} key={tab.id}