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

migrate panels in collapsed rows (#10948)

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2018-02-19 17:07:29 +09:00 committed by Torkel Ödegaard
parent a1d79997be
commit f47542db28
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/dashboard/dashboard_migration.ts
View File

@ -18,7 +18,7 @@ export class DashboardMigrator {
} }
updateSchema(old) { updateSchema(old) {
var i, j, k; var i, j, k, n;
var oldVersion = this.dashboard.schemaVersion; var oldVersion = this.dashboard.schemaVersion;
var panelUpgrades = []; var panelUpgrades = [];
this.dashboard.schemaVersion = 16; this.dashboard.schemaVersion = 16;
@ -372,6 +372,11 @@ export class DashboardMigrator {
for (j = 0; j < this.dashboard.panels.length; j++) { for (j = 0; j < this.dashboard.panels.length; j++) {
for (k = 0; k < panelUpgrades.length; k++) { for (k = 0; k < panelUpgrades.length; k++) {
panelUpgrades[k].call(this, this.dashboard.panels[j]); panelUpgrades[k].call(this, this.dashboard.panels[j]);
if (this.dashboard.panels[j].panels) {
for (n = 0; n < this.dashboard.panels[j].panels.length; n++) {
panelUpgrades[k].call(this, this.dashboard.panels[j].panels[n]);
}
}
} }
} }
} }

8
public/app/features/dashboard/specs/dashboard_migration.jest.ts
View File

@ -371,6 +371,14 @@ describe('DashboardModel', function() {
let dashboard = new DashboardModel(model); let dashboard = new DashboardModel(model);
expect(dashboard.panels[0].minSpan).toBe(24); expect(dashboard.panels[0].minSpan).toBe(24);
}); });
it('should assign id', function() {
model.rows = [createRow({ collapse: true, height: 8 }, [[6], [6]])];
model.rows[0].panels[0] = { };
let dashboard = new DashboardModel(model);
expect(dashboard.panels[0].id).toBe(1);
});
}); });
}); });