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: fix "no permissions" alert flashing (#59300)

Browse Source
This commit is contained in:
Gilles De Mey 2022-11-24 19:58:02 +01:00 committed by GitHub
parent f5c41ea497
commit 49f91721ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/features/alerting/unified/ExistingRuleEditor.tsx
View File

@ -19,9 +19,21 @@ interface ExistingRuleEditorProps {
export function ExistingRuleEditor({ identifier }: ExistingRuleEditorProps) { export function ExistingRuleEditor({ identifier }: ExistingRuleEditorProps) {
useCleanup((state) => (state.unifiedAlerting.ruleForm.existingRule = initialAsyncRequestState)); useCleanup((state) => (state.unifiedAlerting.ruleForm.existingRule = initialAsyncRequestState));
const { loading, result, error, dispatched } = useUnifiedAlertingSelector((state) => state.ruleForm.existingRule);
const {
loading: loadingAlertRule,
result,
error,
dispatched,
} = useUnifiedAlertingSelector((state) => state.ruleForm.existingRule);
const dispatch = useDispatch(); const dispatch = useDispatch();
const { isEditable } = useIsRuleEditable(ruleId.ruleIdentifierToRuleSourceName(identifier), result?.rule); const { isEditable, loading: loadingEditable } = useIsRuleEditable(
ruleId.ruleIdentifierToRuleSourceName(identifier),
result?.rule
);
const loading = loadingAlertRule || loadingEditable;
useEffect(() => { useEffect(() => {
if (!dispatched) { if (!dispatched) {

1
public/app/features/alerting/unified/hooks/useIsRuleEditable.ts
View File

@ -18,7 +18,6 @@ export function useIsRuleEditable(rulesSourceName: string, rule?: RulerRuleDTO):
const folderUID = rule && isGrafanaRulerRule(rule) ? rule.grafana_alert.namespace_uid : undefined; const folderUID = rule && isGrafanaRulerRule(rule) ? rule.grafana_alert.namespace_uid : undefined;
const rulePermission = getRulesPermissions(rulesSourceName); const rulePermission = getRulesPermissions(rulesSourceName);
const { folder, loading } = useFolder(folderUID); const { folder, loading } = useFolder(folderUID);
if (!rule) { if (!rule) {