public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ignore iteration property when checking for unsaved changes

Browse Source 
closes #11063
This commit is contained in:
bergquist
2018-03-05 22:03:26 +01:00
parent 1a16e588f7
commit a7d62f44d3
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard/specs/unsaved_changes_srv_specs.ts
+5
View File
@@ -66,6 +66,11 @@ describe('unsavedChangesSrv', function() {
expect(tracker.hasChanges()).to.be(false); expect(tracker.hasChanges()).to.be(false);
}); });
it('Should ignore .iteration changes', () => {
dash.iteration = new Date().getTime() + 1;
expect(tracker.hasChanges()).to.be(false);
});
it.skip('Should ignore row collapse change', function() { it.skip('Should ignore row collapse change', function() {
dash.rows[0].collapse = true; dash.rows[0].collapse = true;
expect(tracker.hasChanges()).to.be(false); expect(tracker.hasChanges()).to.be(false);
public/app/features/dashboard/unsaved_changes_srv.ts
+3
View File
@@ -97,6 +97,9 @@ export class Tracker {
dash.refresh = 0; dash.refresh = 0;
dash.schemaVersion = 0; dash.schemaVersion = 0;
// ignore iteration property
delete dash.iteration;
// filter row and panels properties that should be ignored // filter row and panels properties that should be ignored
dash.rows = _.filter(dash.rows, function(row) { dash.rows = _.filter(dash.rows, function(row) {
if (row.repeatRowId) { if (row.repeatRowId) {