IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-28 01:41:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PanelQueryRunner: Fix diff between multiple errors (#89868)

Browse Source
This commit is contained in:
jjaychen 2024-10-10 17:02:33 +08:00 committed by GitHub
parent 6dbd324ef9
commit 636d17c111
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/query/state/PanelQueryRunner.ts
View File

@ -1,4 +1,4 @@
import { cloneDeep, merge } from 'lodash';
import { cloneDeep, merge, isEqual } from 'lodash';
import { Observable, of, ReplaySubject, Unsubscribable } from 'rxjs';
import { map, mergeMap, catchError } from 'rxjs/operators';
@ -371,6 +371,7 @@ export class PanelQueryRunner {
let sameSeries = compareArrayValues(last.series ?? [], next.series ?? [], (a, b) => a === b);
let sameAnnotations = compareArrayValues(last.annotations ?? [], next.annotations ?? [], (a, b) => a === b);
let sameState = last.state === next.state;
let sameErrors = compareArrayValues(last.errors ?? [], next.errors ?? [], (a, b) => isEqual(a, b));
if (sameSeries) {
next.series = last.series;
@ -380,7 +381,7 @@ export class PanelQueryRunner {
next.annotations = last.annotations;
}
if (sameSeries && sameAnnotations && sameState) {
if (sameSeries && sameAnnotations && sameState && sameErrors) {
return;
}
}