[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 30035b2367)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-08-26 12:14:33 +02:00
committed by GitHub
co-authored by Konrad Lalik
parent e118342401
commit 777de57319
@@ -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,
};