From e37dde00363972fb6efc80bf9a5673f6168f4e62 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 3 Feb 2022 14:08:57 +0100
Subject: [PATCH] Alerting: load correct unified alerting tab (#44794) (#44832)

(cherry picked from commit 29b97361f70e8991069601a88842080d686dce9f)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
---
 .../components/PanelEditor/PanelEditorTabs.tsx     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
index 1c04cfc2473..8c903e3fbfa 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditorTabs.tsx
@@ -41,7 +41,7 @@ export const PanelEditorTabs: FC<PanelEditorTabsProps> = React.memo(({ panel, da
       <TabsBar className={styles.tabBar} hideBorder>
         {tabs.map((tab) => {
           if (tab.id === PanelEditorTabId.Alert) {
-            renderAlertTab(tab, panel, dashboard, onChangeTab);
+            return renderAlertTab(tab, panel, dashboard, onChangeTab);
           }
           return (
             <Tab
@@ -86,9 +86,13 @@ function renderAlertTab(
   dashboard: DashboardModel,
   onChangeTab: (tab: PanelEditorTab) => void
 ) {
-  if (!config.alertingEnabled || !config.unifiedAlertingEnabled) {
+  const alertingDisabled = !config.alertingEnabled && !config.unifiedAlertingEnabled;
+
+  if (alertingDisabled) {
     return null;
-  } else if (config.unifiedAlertingEnabled) {
+  }
+
+  if (config.unifiedAlertingEnabled) {
     return (
       <PanelAlertTab
         key={tab.id}
@@ -100,7 +104,9 @@ function renderAlertTab(
         dashboard={dashboard}
       />
     );
-  } else if (config.alertingEnabled) {
+  }
+
+  if (config.alertingEnabled) {
     return (
       <Tab
         key={tab.id}