mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
PublicDashboards: Query order bug fixed (#73293)
This commit is contained in:
parent
d7574a9a74
commit
c9ed2c80b2
@ -90,8 +90,6 @@ export class PublicDashboardDataSource extends DataSourceApi<DataQuery, DataSour
|
|||||||
queryCachingTTL,
|
queryCachingTTL,
|
||||||
range: { from: fromRange, to: toRange },
|
range: { from: fromRange, to: toRange },
|
||||||
} = request;
|
} = request;
|
||||||
let queries: DataQuery[];
|
|
||||||
|
|
||||||
// Return early if no queries exist
|
// Return early if no queries exist
|
||||||
if (!request.targets.length) {
|
if (!request.targets.length) {
|
||||||
return of({ data: [] });
|
return of({ data: [] });
|
||||||
@ -129,7 +127,7 @@ export class PublicDashboardDataSource extends DataSourceApi<DataQuery, DataSour
|
|||||||
})
|
})
|
||||||
.pipe(
|
.pipe(
|
||||||
switchMap((raw) => {
|
switchMap((raw) => {
|
||||||
return of(toDataQueryResponse(raw, queries));
|
return of(toDataQueryResponse(raw, request.targets));
|
||||||
}),
|
}),
|
||||||
catchError((err) => {
|
catchError((err) => {
|
||||||
return of(toDataQueryResponse(err));
|
return of(toDataQueryResponse(err));
|
||||||
|
Loading…
Reference in New Issue
Block a user