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

fix(row repeat): fix for row repeat where repeated row was added to the bottom and not next to the source row, fixes #2942

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-02-04 22:33:53 +01:00
parent 660ce3a61d
commit a167eb4fa1
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@
* **Playlist**: Fix for memory leak when running a playlist, closes [#3794](https://github.com/grafana/grafana/pull/3794)
* **InfluxDB**: Fix for InfluxDB and table panel when using Format As Table and having group by time, fixes [#3928](https://github.com/grafana/grafana/issues/3928)
* **Panel Time shift**: Fix for panel time range and using dashboard times liek `Today` and `This Week`, fixes [#3941](https://github.com/grafana/grafana/issues/3941)
* **Row repeat**: Repeated rows will now appear next to each other and not by the bottom of the dashboard, fixes [#3942](https://github.com/grafana/grafana/issues/3942)
# 2.6.1 (unrelased, 2.6.x branch)

16
public/app/features/dashboard/dynamicDashboardSrv.js
View File

@ -34,7 +34,7 @@ function (angular, _) {
// handle row repeats
if (row.repeat) {
this.repeatRow(row);
this.repeatRow(row, i);
}
// clean up old left overs
else if (row.repeatRowId && row.repeatIteration !== this.iteration) {
@ -58,13 +58,13 @@ function (angular, _) {
};
// returns a new row clone or reuses a clone from previous iteration
this.getRowClone = function(sourceRow, index) {
if (index === 0) {
this.getRowClone = function(sourceRow, repeatIndex, sourceRowIndex) {
if (repeatIndex === 0) {
return sourceRow;
}
var i, panel, row, copy;
var sourceRowId = _.indexOf(this.dashboard.rows, sourceRow) + 1;
var sourceRowId = sourceRowIndex + 1;
// look for row to reuse
for (i = 0; i < this.dashboard.rows.length; i++) {
@ -77,7 +77,7 @@ function (angular, _) {
if (!copy) {
copy = angular.copy(sourceRow);
this.dashboard.rows.push(copy);
this.dashboard.rows.splice(sourceRowIndex + repeatIndex, 0, copy);
// set new panel ids
for (i = 0; i < copy.panels.length; i++) {
@ -92,8 +92,8 @@ function (angular, _) {
return copy;
};
// returns a new panel clone or reuses a clone from previous iteration
this.repeatRow = function(row) {
// returns a new row clone or reuses a clone from previous iteration
this.repeatRow = function(row, rowIndex) {
var variables = this.dashboard.templating.list;
var variable = _.findWhere(variables, {name: row.repeat});
if (!variable) {
@ -108,7 +108,7 @@ function (angular, _) {
}
_.each(selected, function(option, index) {
copy = self.getRowClone(row, index);
copy = self.getRowClone(row, index, rowIndex);
copy.scopedVars = {};
copy.scopedVars[variable.name] = option;

9
public/test/specs/dynamicDashboardSrv-specs.js
View File

@ -106,6 +106,7 @@ define([
repeat: 'servers',
panels: [{id: 2}]
});
dash.rows.push({panels: []});
dash.templating.list.push({
name: 'servers',
current: {
@ -120,14 +121,14 @@ define([
});
it('should repeat row one time', function() {
expect(ctx.rows.length).to.be(2);
expect(ctx.rows.length).to.be(3);
});
it('should keep panel ids on first row', function() {
expect(ctx.rows[0].panels[0].id).to.be(2);
});
it('should mark second row as repeated', function() {
it('should keep first row as repeat', function() {
expect(ctx.rows[0].repeat).to.be('servers');
});
@ -159,7 +160,7 @@ define([
});
it('should still only have 2 rows', function() {
expect(ctx.rows.length).to.be(2);
expect(ctx.rows.length).to.be(3);
});
it.skip('should have updated props from source', function() {
@ -178,7 +179,7 @@ define([
});
it('should remove repeated second row', function() {
expect(ctx.rows.length).to.be(1);
expect(ctx.rows.length).to.be(2);
});
});
});