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 Recording Rule QueryEditor builder view (#73348)

Browse Source 
* Add missing props when changing recording rule query

* Use optional chaining for model prop
This commit is contained in:
Virginia Cepeda
2023-08-22 10:13:55 -03:00
committed by GitHub
parent 8fc3be6b5a
commit 2c9b74b651
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/features/alerting/unified/components/rule-editor/RecordingRuleEditor.tsx
View File

@@ -60,14 +60,17 @@ export const RecordingRuleEditor: FC<RecordingRuleEditorProps> = ({
const merged = {
...query,
refId: changedQuery.refId,
queryType: changedQuery.queryType ?? '',
...changedQuery,
datasourceUid: dataSourceId,
expr,
model: {
refId: changedQuery.refId,
expr,
editorMode: 'code',
datasource: changedQuery.datasource,
refId: changedQuery.refId,
editorMode: changedQuery.editorMode,
instant: Boolean(changedQuery.instant),
range: Boolean(changedQuery.range),
legendFormat: changedQuery.legendFormat,
},
};
onChangeQuery([merged]);

2
public/app/features/alerting/unified/components/rule-editor/query-and-alert-condition/reducer.ts
View File

@@ -80,7 +80,7 @@ export const queriesAndExpressionsReducer = createReducer(initialState, (builder
const query = payload.recordingRuleQueries[0];
const recordingRuleQuery = {
...query,
...{ expr: payload.expression, model: { expr: payload.expression, refId: query.model.refId } },
...{ expr: payload.expression, model: query?.model },
};
state.queries = [recordingRuleQuery];