From 30035b23674cba6fc8985e1230b61ccdd807183d Mon Sep 17 00:00:00 2001 From: Konrad Lalik Date: Mon, 26 Aug 2024 11:39:53 +0200 Subject: [PATCH] Alerting: Fix invalid loading condition for vanilla Prometheus rules (#92390) Remove invalid loading condition --- .../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 8e1e0dd4987..af5e843ad9d 100644 --- a/public/app/features/alerting/unified/hooks/useCombinedRule.ts +++ b/public/app/features/alerting/unified/hooks/useCombinedRule.ts @@ -119,12 +119,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(() => { @@ -166,7 +161,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, };