From 777de5731943c5507c7c8e562b9b700681de0068 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:14:33 +0200
Subject: [PATCH] [v11.2.x] Alerting: Fix invalid loading condition for vanilla
 Prometheus rules (#92395)

Alerting: Fix invalid loading condition for vanilla Prometheus rules (#92390)

Remove invalid loading condition

(cherry picked from commit 30035b23674cba6fc8985e1230b61ccdd807183d)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
---
 .../features/alerting/unified/hooks/useCombinedRule.ts   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/public/app/features/alerting/unified/hooks/useCombinedRule.ts b/public/app/features/alerting/unified/hooks/useCombinedRule.ts
index 60782c18315..a67a54a6410 100644
--- a/public/app/features/alerting/unified/hooks/useCombinedRule.ts
+++ b/public/app/features/alerting/unified/hooks/useCombinedRule.ts
@@ -211,12 +211,7 @@ export function useCombinedRule({ ruleIdentifier, limitAlerts }: Props): Request
 
   const [
     fetchRulerRuleGroup,
-    {
-      currentData: rulerRuleGroup,
-      isLoading: isLoadingRulerGroup,
-      error: rulerRuleGroupError,
-      isUninitialized: rulerRuleGroupUninitialized,
-    },
+    { currentData: rulerRuleGroup, isLoading: isLoadingRulerGroup, error: rulerRuleGroupError },
   ] = alertRuleApi.endpoints.getRuleGroupForNamespace.useLazyQuery();
 
   useEffect(() => {
@@ -258,7 +253,7 @@ export function useCombinedRule({ ruleIdentifier, limitAlerts }: Props): Request
   }, [ruleIdentifier, ruleSourceName, promRuleNs, rulerRuleGroup, ruleSource]);
 
   return {
-    loading: isLoadingDsFeatures || isLoadingPromRules || isLoadingRulerGroup || rulerRuleGroupUninitialized,
+    loading: isLoadingDsFeatures || isLoadingPromRules || isLoadingRulerGroup,
     error: ruleLocationError ?? promRuleNsError ?? rulerRuleGroupError,
     result: rule,
   };