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

PanelModel: Clear queryRunner on destroy (#16906)

Browse Source 
* PanelModel: Clear queryRunner on destroy

* fix test asumptions
This commit is contained in:
Torkel Ödegaard 2019-05-06 19:35:10 +02:00 committed by GitHub
parent 48ae93048b
commit f8393fb339
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/app/features/dashboard/state/PanelModel.test.ts
View File

@ -87,10 +87,7 @@ describe('PanelModel', () => {
}); });
describe('when changing panel type', () => { describe('when changing panel type', () => {
let panelQueryRunner: any;
beforeEach(() => { beforeEach(() => {
panelQueryRunner = model.getQueryRunner();
model.changePlugin(getPanelPlugin({ id: 'graph' })); model.changePlugin(getPanelPlugin({ id: 'graph' }));
model.alert = { id: 2 }; model.alert = { id: 2 };
}); });
@ -109,9 +106,9 @@ describe('PanelModel', () => {
expect(model.alert).toBe(undefined); expect(model.alert).toBe(undefined);
}); });
it('getQueryRunner() should return same instance after plugin change', () => { it('panelQueryRunner should be cleared', () => {
const sameQueryRunner = model.getQueryRunner(); const panelQueryRunner = (model as any).queryRunner;
expect(panelQueryRunner).toBe(sameQueryRunner); expect(panelQueryRunner).toBeFalsy();
}); });
}); });
@ -131,12 +128,15 @@ describe('PanelModel', () => {
}); });
}); });
describe('when changing to react panel', () => { describe('when changing to react panel from angular panel', () => {
let panelQueryRunner: any;
const onPanelTypeChanged = jest.fn(); const onPanelTypeChanged = jest.fn();
const reactPlugin = getPanelPlugin({ id: 'react' }).setPanelChangeHandler(onPanelTypeChanged as any); const reactPlugin = getPanelPlugin({ id: 'react' }).setPanelChangeHandler(onPanelTypeChanged as any);
beforeEach(() => { beforeEach(() => {
model.changePlugin(reactPlugin); model.changePlugin(reactPlugin);
panelQueryRunner = model.getQueryRunner();
}); });
it('should call react onPanelTypeChanged', () => { it('should call react onPanelTypeChanged', () => {
@ -144,6 +144,12 @@ describe('PanelModel', () => {
expect(onPanelTypeChanged.mock.calls[0][1]).toBe('table'); expect(onPanelTypeChanged.mock.calls[0][1]).toBe('table');
expect(onPanelTypeChanged.mock.calls[0][2].thresholds).toBeDefined(); expect(onPanelTypeChanged.mock.calls[0][2].thresholds).toBeDefined();
}); });
it('getQueryRunner() should return same instance after changing to another react panel', () => {
model.changePlugin(getPanelPlugin({ id: 'react2' }));
const sameQueryRunner = model.getQueryRunner();
expect(panelQueryRunner).toBe(sameQueryRunner);
});
}); });
describe('get panel options', () => { describe('get panel options', () => {

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

@ -336,6 +336,7 @@ export class PanelModel {
if (this.queryRunner) { if (this.queryRunner) {
this.queryRunner.destroy(); this.queryRunner.destroy();
this.queryRunner = null;
} }
} }
} }

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

@ -41,7 +41,7 @@ export class PanelQueryState {
sendLegacy = false; sendLegacy = false;
// A promise for the running query // A promise for the running query
private executor?: Promise<PanelData>; private executor?: Promise<PanelData> = null;
private rejector = (reason?: any) => {}; private rejector = (reason?: any) => {};
private datasource: DataSourceApi = {} as any; private datasource: DataSourceApi = {} as any;