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

PanelQueryState: check for existing running query (#16894)

Browse Source 
Fixes #16880
This commit is contained in:
Ryan McKinley 2019-05-06 03:09:53 -07:00 committed by Torkel Ödegaard
parent ec500ed416
commit 513c79d392
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/features/dashboard/state/PanelQueryState.test.ts
View File

@ -34,14 +34,22 @@ describe('PanelQueryState', () => {
expect(empty.series.length).toBe(0);
expect(hasRun).toBeFalsy();
empty = await state.execute(
ds,
getQueryOptions({ targets: [{ hide: true, refId: 'X' }, { hide: true, refId: 'Y' }, { hide: true, refId: 'Z' }] })
);
const query = getQueryOptions({
targets: [{ hide: true, refId: 'X' }, { hide: true, refId: 'Y' }, { hide: true, refId: 'Z' }],
});
empty = await state.execute(ds, query);
// should not run any hidden queries'
expect(state.getActiveRunner()).toBeFalsy();
expect(empty.series.length).toBe(0);
expect(hasRun).toBeFalsy();
// Check for the same query
expect(state.isSameQuery(ds, query)).toBeTruthy();
// Check for differnet queries
expect(state.isSameQuery(new MockDataSourceApi('test'), query)).toBeFalsy();
expect(state.isSameQuery(ds, getQueryOptions({ targets: [{ refId: 'differnet' }] }))).toBeFalsy();
});
});

1
public/app/features/dashboard/state/PanelQueryState.ts
View File

@ -95,6 +95,7 @@ export class PanelQueryState {
execute(ds: DataSourceApi, req: DataQueryRequest): Promise<PanelData> {
this.request = req;
this.datasource = ds;
// Return early if there are no queries to run
if (!req.targets.length) {