IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 01:53:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Dashboard: Fix export for sharing when panels use default data source (#19315)

Browse Source 
* PanelModel: moved datasource: null away from defaults that are removed

* Added unit test
This commit is contained in:
Torkel Ödegaard 2019-09-24 12:15:35 +02:00 committed by GitHub
parent 4dbedb8405
commit ac3fb6452d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,11 @@ describe('PanelModel', () => {
expect(saveModel.gridPos).toBe(undefined);
});
it('getSaveModel should not remove datasource default', () => {
const saveModel = model.getSaveModel();
expect(saveModel.datasource).toBe(null);
});
it('getSaveModel should remove nonPersistedProperties', () => {
const saveModel = model.getSaveModel();
expect(saveModel.events).toBe(undefined);

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

@ -69,7 +69,6 @@ const mustKeepProps: { [str: string]: boolean } = {
const defaults: any = {
gridPos: { x: 0, y: 0, h: 3, w: 6 },
datasource: null,
targets: [{ refId: 'A' }],
cachedPluginOptions: {},
transparent: false,
@ -126,6 +125,10 @@ export class PanelModel {
constructor(model: any) {
this.events = new Emitter();
// should not be part of defaults as defaults are removed in save model and
// this should not be removed in save model as exporter needs to templatize it
this.datasource = null;
// copy properties from persisted model
for (const property in model) {
(this as any)[property] = model[property];