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

templating: allow whitespace values

Browse Source 
closes #7382
This commit is contained in:
bergquist 2017-02-16 15:09:37 +01:00
parent d72011589e
commit a747d33373
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/features/templating/query_variable.ts
View File

@ -140,8 +140,13 @@ export class QueryVariable implements Variable {
} }
for (i = 0; i < metricNames.length; i++) { for (i = 0; i < metricNames.length; i++) {
var item = metricNames[i]; var item = metricNames[i];
var value = item.value || item.text; var text = item.text === undefined || item.text === null
var text = item.text || item.value; ? item.value
: item.text;
var value = item.value === undefined || item.value === null
? item.text
: item.value;
if (_.isNumber(value)) { if (_.isNumber(value)) {
value = value.toString(); value = value.toString();
@ -178,7 +183,7 @@ export class QueryVariable implements Variable {
if (sortType === 1) { if (sortType === 1) {
options = _.sortBy(options, 'text'); options = _.sortBy(options, 'text');
} else if (sortType === 2) { } else if (sortType === 2) {
options = _.sortBy(options, function(opt) { options = _.sortBy(options, (opt) => {
var matches = opt.text.match(/.*?(\d+).*/); var matches = opt.text.match(/.*?(\d+).*/);
if (!matches || matches.length < 2) { if (!matches || matches.length < 2) {
return -1; return -1;

13
public/app/features/templating/specs/query_variable_specs.ts
View File

@ -51,20 +51,23 @@ describe('QueryVariable', () => {
var input = [ var input = [
{text: '0', value: '0'}, {text: '0', value: '0'},
{text: '1', value: '1'}, {text: '1', value: '1'},
{text: '', value: ''},
{text: null, value: 3}, {text: null, value: 3},
{text: undefined, value: 4}, {text: undefined, value: 4},
{text: '5', value: null}, {text: '5', value: null},
{text: '6', value: undefined}, {text: '6', value: undefined},
{text: null, value: '3'}, {text: null, value: '7'},
{text: undefined, value: '4'}, {text: undefined, value: '8'},
{text: 5, value: null}, {text: 9, value: null},
{text: 6, value: undefined}, {text: 10, value: undefined},
{text: '', value: undefined},
{text: undefined, value: ''},
]; ];
var result = variable.metricNamesToVariableValues(input); var result = variable.metricNamesToVariableValues(input);
it('should return in same order', () => { it('should return in same order', () => {
var i = 0; var i = 0;
expect(result.length).to.be(11);
expect(result[i++].text).to.be(''); expect(result[i++].text).to.be('');
expect(result[i++].text).to.be('0'); expect(result[i++].text).to.be('0');
expect(result[i++].text).to.be('1'); expect(result[i++].text).to.be('1');