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

PanelEditor: Fixed issue with PanelModel change plugin type (#23949)

Browse Source
This commit is contained in:
Torkel Ödegaard
2020-04-27 17:32:35 +02:00
committed by GitHub
parent 76650e60e4
commit 458f6bdb87
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,10 +214,15 @@ describe('PanelModel', () => {
}); });
}); });
model.editSourceId = 1001;
model.changePlugin(newPlugin); model.changePlugin(newPlugin);
model.alert = { id: 2 }; model.alert = { id: 2 };
}); });
it('should keep editSourceId', () => {
expect(model.editSourceId).toBe(1001);
});
it('should apply next panel option defaults', () => { it('should apply next panel option defaults', () => {
expect(model.getOptions().showThresholdLabels).toBeFalsy(); expect(model.getOptions().showThresholdLabels).toBeFalsy();
expect(model.getOptions().showThresholds).toBeUndefined(); expect(model.getOptions().showThresholds).toBeUndefined();

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

@@ -84,6 +84,7 @@ const mustKeepProps: { [str: string]: boolean } = {
queryRunner: true, queryRunner: true,
transformations: true, transformations: true,
fieldConfig: true, fieldConfig: true,
editSourceId: true,
}; };
const defaults: any = { const defaults: any = {