Alerting: fix "no permissions" alert flashing (#59300)

pull/59336/head
Gilles De Mey 3 years ago committed by GitHub
parent f5c41ea497
commit 49f91721ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      public/app/features/alerting/unified/ExistingRuleEditor.tsx
  2. 1
      public/app/features/alerting/unified/hooks/useIsRuleEditable.ts

@ -19,9 +19,21 @@ interface ExistingRuleEditorProps {
export function ExistingRuleEditor({ identifier }: ExistingRuleEditorProps) {
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 { isEditable } = useIsRuleEditable(ruleId.ruleIdentifierToRuleSourceName(identifier), result?.rule);
const { isEditable, loading: loadingEditable } = useIsRuleEditable(
ruleId.ruleIdentifierToRuleSourceName(identifier),
result?.rule
);
const loading = loadingAlertRule || loadingEditable;
useEffect(() => {
if (!dispatched) {

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

Loading…
Cancel
Save