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(templating): fixed scoped vars issue when generating urls for panel links, fixes #2410

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-07-30 08:28:42 +02:00
parent aaae23e9f0
commit 2cc53f328b
4 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/panellinks/linkSrv.js
View File

@ -59,21 +59,21 @@ function (angular, kbn, _) {
return info; return info;
}; };
this.getPanelLinkAnchorInfo = function(link) { this.getPanelLinkAnchorInfo = function(link, scopedVars) {
var info = {}; var info = {};
if (link.type === 'absolute') { if (link.type === 'absolute') {
info.target = link.targetBlank ? '_blank' : '_self'; info.target = link.targetBlank ? '_blank' : '_self';
info.href = templateSrv.replace(link.url || ''); info.href = templateSrv.replace(link.url || '', scopedVars);
info.title = templateSrv.replace(link.title || ''); info.title = templateSrv.replace(link.title || '', scopedVars);
info.href += '?'; info.href += '?';
} }
else if (link.dashUri) { else if (link.dashUri) {
info.href = 'dashboard/' + link.dashUri + '?'; info.href = 'dashboard/' + link.dashUri + '?';
info.title = templateSrv.replace(link.title || ''); info.title = templateSrv.replace(link.title || '', scopedVars);
info.target = link.targetBlank ? '_blank' : ''; info.target = link.targetBlank ? '_blank' : '';
} }
else { else {
info.title = templateSrv.replace(link.title || ''); info.title = templateSrv.replace(link.title || '', scopedVars);
var slug = kbn.slugifyForUrl(link.dashboard || ''); var slug = kbn.slugifyForUrl(link.dashboard || '');
info.href = 'dashboard/db/' + slug + '?'; info.href = 'dashboard/db/' + slug + '?';
} }
@ -87,12 +87,12 @@ function (angular, kbn, _) {
} }
if (link.includeVars) { if (link.includeVars) {
templateSrv.fillVariableValuesForUrl(params); templateSrv.fillVariableValuesForUrl(params, scopedVars);
} }
info.href = this.addParamsToUrl(info.href, params); info.href = this.addParamsToUrl(info.href, params);
if (link.params) { if (link.params) {
info.href += "&" + templateSrv.replace(link.params); info.href += "&" + templateSrv.replace(link.params, scopedVars);
} }
return info; return info;

23
public/app/features/templating/templateSrv.js
View File

@ -115,17 +115,20 @@ function (angular, _) {
}); });
}; };
this.fillVariableValuesForUrl = function(params) { this.fillVariableValuesForUrl = function(params, scopedVars) {
var toUrlVal = function(current) {
if (current.text === 'All') {
return 'All';
} else {
return current.value;
}
};
_.each(this.variables, function(variable) { _.each(this.variables, function(variable) {
params['var-' + variable.name] = toUrlVal(variable.current); var current = variable.current;
var value = current.value;
if (current.text === 'All') {
value = 'All';
}
if (scopedVars && scopedVars[variable.name] !== void 0) {
value = scopedVars[variable.name].value;
}
params['var-' + variable.name] = value;
}); });
}; };

2
public/app/panels/singlestat/singleStatPanel.js
View File

@ -183,7 +183,7 @@ function (angular, app, _, $) {
elem.click(function() { elem.click(function() {
if (panel.links.length === 0) { return; } if (panel.links.length === 0) { return; }
var link = panel.links[0]; var link = panel.links[0];
var linkInfo = linkSrv.getPanelLinkAnchorInfo(link); var linkInfo = linkSrv.getPanelLinkAnchorInfo(link, scope.panel.scopedVars);
if (panel.links[0].targetBlank) { if (panel.links[0].targetBlank) {
var redirectWindow = window.open(linkInfo.href, '_blank'); var redirectWindow = window.open(linkInfo.href, '_blank');
redirectWindow.location; redirectWindow.location;

26
public/test/specs/templateSrv-specs.js
View File

@ -109,7 +109,6 @@ define([
describe('when checking if a string contains a variable', function() { describe('when checking if a string contains a variable', function() {
beforeEach(function() { beforeEach(function() {
_templateSrv.init([{ name: 'test', current: { value: 'muuuu' } }]); _templateSrv.init([{ name: 'test', current: { value: 'muuuu' } }]);
_templateSrv.updateTemplateData();
}); });
it('should find it with $var syntax', function() { it('should find it with $var syntax', function() {
@ -127,7 +126,6 @@ define([
describe('updateTemplateData with simple value', function() { describe('updateTemplateData with simple value', function() {
beforeEach(function() { beforeEach(function() {
_templateSrv.init([{ name: 'test', current: { value: 'muuuu' } }]); _templateSrv.init([{ name: 'test', current: { value: 'muuuu' } }]);
_templateSrv.updateTemplateData();
}); });
it('should set current value and update template data', function() { it('should set current value and update template data', function() {
@ -136,6 +134,30 @@ define([
}); });
}); });
describe('fillVariableValuesForUrl with multi value', function() {
beforeEach(function() {
_templateSrv.init([{ name: 'test', current: { value: ['val1', 'val2'] }}]);
});
it('should set multiple url params', function() {
var params = {};
_templateSrv.fillVariableValuesForUrl(params);
expect(params['var-test']).to.eql(['val1', 'val2']);
});
});
describe('fillVariableValuesForUrl with multi value and scopedVars', function() {
beforeEach(function() {
_templateSrv.init([{ name: 'test', current: { value: ['val1', 'val2'] }}]);
});
it('should set multiple url params', function() {
var params = {};
_templateSrv.fillVariableValuesForUrl(params, {'test': {value: 'val1'}});
expect(params['var-test']).to.eql('val1');
});
});
describe('replaceWithText', function() { describe('replaceWithText', function() {
beforeEach(function() { beforeEach(function() {
_templateSrv.init([ _templateSrv.init([