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

More refinements of tag selection and state restoration after dashboard load

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-06-01 19:32:50 +02:00
parent b5a846154a
commit b0451dc1b3
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
public/app/directives/variableValueSelect.js
View File

@ -27,7 +27,6 @@ function (angular, app, _) {
}); });
vm.selectedValues = _.filter(vm.options, {selected: true}); vm.selectedValues = _.filter(vm.options, {selected: true});
vm.selectedTags = vm.selectedTags || [];
if (!vm.tags) { if (!vm.tags) {
vm.tags = _.map(vm.variable.tags, function(value) { vm.tags = _.map(vm.variable.tags, function(value) {
@ -40,21 +39,37 @@ function (angular, app, _) {
}; };
vm.updateLinkText = function() { vm.updateLinkText = function() {
// var currentValues = vm.variable.current.text; var current = vm.variable.current;
// var currentValues = current.value;
// if (vm.variable.current.tags) {
// selectedOptions = _.filter(selectedOptions, function(test) { if (_.isArray(currentValues) && current.tags.length) {
// for (var i = 0; i < vm.variable.current.tags; i++) { // filer out values that are in selected tags
// var tag = vm.selectedTags[i]; currentValues = _.filter(currentValues, function(test) {
// if (_.indexOf(tag.values, test.text) !== -1) { for (var i = 0; i < current.tags.length; i++) {
// return false; if (_.indexOf(current.tags[i].values, test) !== -1) {
// } return false;
// } }
// return true; }
// }); return true;
// } });
// // convert values to text
var currentTexts = _.map(currentValues, function(value) {
for (var i = 0; i < vm.variable.options.length; i++) {
var option = vm.variable.options[i];
if (option.value === value) {
return option.text;
}
}
return value;
});
// join texts
vm.linkText = currentTexts.join(' + ');
if (vm.linkText.length > 0) {
vm.linkText += ' + ';
}
} else {
vm.linkText = vm.variable.current.text; vm.linkText = vm.variable.current.text;
}
}; };
vm.clearSelections = function() { vm.clearSelections = function() {
@ -202,6 +217,7 @@ function (angular, app, _) {
}; };
vm.init = function() { vm.init = function() {
vm.selectedTags = vm.variable.current.tags || [];
vm.updateLinkText(); vm.updateLinkText();
}; };

3
public/test/specs/selectDropdownCtrl-specs.js
View File

@ -94,11 +94,10 @@ function () {
it("should select values", function() { it("should select values", function() {
expect(ctrl.options[0].selected).to.be(true); expect(ctrl.options[0].selected).to.be(true);
expect(ctrl.options[2].selected).to.be(true); expect(ctrl.options[2].selected).to.be(true);
expect(ctrl.linkText).to.be('server-1 + server-2');
}); });
it("link text should not include tag values", function() { it("link text should not include tag values", function() {
expect(ctrl.linkText).to.not.contain('server-1'); expect(ctrl.linkText).to.be('');
}); });
describe('and then dropdown is opened and closed without changes', function() { describe('and then dropdown is opened and closed without changes', function() {