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

Added row repeats

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-03-20 15:06:23 -04:00
parent 86e9d2cf07
commit 0aab51a73f
2 changed files with 84 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/features/dashboard/dynamicDashboardSrv.js
+66 -4
View File
@@ -10,13 +10,13 @@ function (angular, _) {
module.service('dynamicDashboardSrv', function() {
this.init = function(dashboard) {
this.removeLinkedPanels(dashboard);
this.handlePanelRepeats(dashboard);
this.handleRowRepeats(dashboard);
};
this.update = function(dashboard) {
this.removeLinkedPanels(dashboard);
this.handlePanelRepeats(dashboard);
this.handleRowRepeats(dashboard);
};
this.removeLinkedPanels = function(dashboard) {
@@ -26,7 +26,6 @@ function (angular, _) {
for (j = 0; j < row.panels.length; j++) {
panel = row.panels[j];
if (panel.linked) {
console.log('removing panel: ' + panel.id);
row.panels = _.without(row.panels, panel);
j = j - 1;
}
@@ -35,6 +34,8 @@ function (angular, _) {
};
this.handlePanelRepeats = function(dashboard) {
this.removeLinkedPanels(dashboard);
var i, j, row, panel;
for (i = 0; i < dashboard.rows.length; i++) {
row = dashboard.rows[i];
@@ -47,6 +48,68 @@ function (angular, _) {
}
};
this.removeLinkedRows = function(dashboard) {
var i, row;
for (i = 0; i < dashboard.rows.length; i++) {
row = dashboard.rows[i];
if (row.linked) {
dashboard.rows = _.without(dashboard.rows, row);
i = i - 1;
}
}
};
this.handleRowRepeats = function(dashboard) {
this.removeLinkedRows(dashboard);
var i, row;
for (i = 0; i < dashboard.rows.length; i++) {
row = dashboard.rows[i];
if (row.repeat) {
this.repeatRow(row, dashboard);
}
}
};
this.repeatRow = function(row, dashboard) {
console.log('repeat row');
var variables = dashboard.templating.list;
var variable = _.findWhere(variables, {name: row.repeat.replace('$', '')});
if (!variable) {
return;
}
var selected, copy, i, panel;
if (variable.current.text === 'All') {
selected = variable.options.slice(1, variable.options.length);
} else {
selected = _.filter(variable.options, {selected: true});
}
_.each(selected, function(option, index) {
if (index > 0) {
copy = angular.copy(row);
copy.repeat = null;
copy.linked = true;
// set new panel ids
for (i = 0; i < copy.panels.length; i++) {
panel = row.panels[i];
panel.id = dashboard.getNextPanelId();
}
dashboard.rows.push(copy);
} else {
copy = row;
}
for (i = 0; i < copy.panels.length; i++) {
panel = row.panels[i];
panel.scopedVars = {};
panel.scopedVars[variable.name] = option;
}
});
};
this.repeatPanel = function(panel, row, dashboard) {
var variables = dashboard.templating.list;
var variable = _.findWhere(variables, {name: panel.repeat.replace('$', '')});
@@ -76,7 +139,6 @@ function (angular, _) {
});
};
});
});
src/app/partials/roweditor.html
+18 -6
View File
@@ -17,15 +17,27 @@
<div class="gf-box-body">
<div class="editor-row" ng-if="editor.index == 0">
<div class="editor-option">
<label class="small">Title</label><input type="text" class="input-medium" ng-model='row.title'></input>
<div class="section">
<h5>Row details</h5>
<div class="editor-option">
<label class="small">Title</label><input type="text" class="input-medium" ng-model='row.title'></input>
</div>
<div class="editor-option">
<label class="small">Height</label><input type="text" class="input-mini" ng-model='row.height'></input>
</div>
<editor-opt-bool text="Editable" model="row.editable"></editor-opt-bool>
<editor-opt-bool text="Show title" model="row.showTitle"></editor-opt-bool>
</div>
<div class="editor-option">
<label class="small">Height</label><input type="text" class="input-mini" ng-model='row.height'></input>
<div class="section">
<h5>Templating options</h5>
<div class="editor-option">
<label class="small">Repeat row</label>
<input type="text" class="input-medium" ng-model='row.repeat'></input>
</div>
</div>
<editor-opt-bool text="Editable" model="row.editable"></editor-opt-bool>
<editor-opt-bool text="Show title" model="row.showTitle"></editor-opt-bool>
</div>
<div class="row-fluid" ng-if="editor.index == 1">
<div class="span12">
<table class="grafana-options-table" style="max-width: 400px; width: auto">