IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix preview getting the correct queries from the form (#80458)

Browse Source 
* fix preview getting the correct queries from the form

* Remove setting queries in onChangeQueries handler as it only contains data queries and not expressions

* Keep setValue('queries') but also adding expressions
This commit is contained in:
Sonia Aguilar
2024-01-23 09:23:59 +01:00
committed by GitHub
parent b9d2f8c73b
commit 51f5e1af39
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/QueryAndExpressionsStep.tsx
+4 -3
View File
@@ -186,8 +186,9 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
// Invocation cycle => onChange -> dispatch(setDataQueries) -> onRunQueries -> setDataQueries Reducer
// As a workaround we update form values as soon as possible to avoid stale state
// This way we can access up to date queries in runQueriesPreview without waiting for re-render
setValue('queries', updatedQueries, { shouldValidate: false });
const previousQueries = getValues('queries');
const expressionQueries = previousQueries.filter((query) => isExpressionQuery(query.model));
setValue('queries', [...updatedQueries, ...expressionQueries], { shouldValidate: false });
updateExpressionAndDatasource(updatedQueries);
dispatch(setDataQueries(updatedQueries));
@@ -199,7 +200,7 @@ export const QueryAndExpressionsStep = ({ editingExistingRule, onDataChange }: P
dispatch(rewireExpressions({ oldRefId, newRefId }));
}
},
[queries, setValue, updateExpressionAndDatasource]
[queries, updateExpressionAndDatasource, getValues, setValue]
);
const onChangeRecordingRulesQueries = useCallback(