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

fix(templating): fixed unique filter after regex pass, fixes #6086

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-09-21 15:30:11 +02:00
parent b4111d78e1
commit 9e26a4cfcb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/templating/query_variable.ts
+2 -2
View File
@@ -115,14 +115,14 @@ export class QueryVariable implements Variable {
if (!matches) { continue; }
if (matches.length > 1) {
value = matches[1];
text = value;
text = matches[1];
}
}
options.push({text: text, value: value});
}
options = _.uniq(options, 'value');
options = _.uniqBy(options, 'value');
return this.sortVariableValues(options, this.sort);
}
public/app/features/templating/specs/variable_srv_specs.ts
+1 -1
View File
@@ -250,7 +250,7 @@ describe('VariableSrv', function() {
describeUpdateVariable('regex pattern remove duplicates', function(scenario) {
scenario.setup(function() {
scenario.variableModel = {type: 'query', query: 'apps.*', name: 'test'};
scenario.variableModel.regex = 'backend_01';
scenario.variableModel.regex = '/backend_01/';
scenario.queryResult = [{text: 'apps.backend.backend_01.counters.req'}, {text: 'apps.backend.backend_01.counters.req'}];
});