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 broken UI because of query being optional for some ExpressionQuer… (#69650)

Browse Source 
* Fix broken UI because of query being optional for some ExpressionQuery coditions field

* Delete query field from conditions in utils.test.ts
This commit is contained in:
Sonia Aguilar 2023-06-07 10:58:08 +02:00 committed by GitHub
parent 498f8ea4ea
commit 848eb01a89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/alerting/unified/components/rule-editor/util.test.ts
View File

@ -396,16 +396,6 @@ function createThresholdExample(thresholdType: string): AlertQuery[] {
params: [0, 10],
type: thresholdType ?? 'gt',
},
operator: {
type: 'and',
},
query: {
params: ['B'],
},
reducer: {
params: [],
type: 'last',
},
},
],
expression: 'B',

2
public/app/features/alerting/unified/components/rule-editor/util.ts
View File

@ -152,7 +152,7 @@ export function getThresholdsForQueries(queries: AlertQuery[]) {
const threshold = condition.evaluator.params;
// "classic_conditions" use `condition.query.params[]` and "threshold" uses `query.model.expression`
const refId = condition.query.params[0] ?? query.model.expression;
const refId = condition.query?.params[0] ?? query.model.expression;
// if an expression hasn't been linked to a data query yet, it won't have a refId
if (!refId) {