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 adhoc filters restoration (#9303)

Browse Source
This commit is contained in:
tamayika 2017-09-19 21:25:35 +09:00 committed by Torkel Ödegaard
parent 3b565dccd8
commit bef4b9b3b0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/templating/adhoc_variable.ts
View File

@ -67,11 +67,11 @@ export class AdhocVariable implements Variable {
} }
escapeDelimiter(value) { escapeDelimiter(value) {
return value.replace('|', '__gfp__'); return value.replace(/\|/g, '__gfp__');
} }
unescapeDelimiter(value) { unescapeDelimiter(value) {
return value.replace('__gfp__', '|'); return value.replace(/__gfp__/g, '|');
} }
setFilters(filters: any[]) { setFilters(filters: any[]) {

8
public/app/features/templating/specs/adhoc_variable_specs.ts
View File

@ -11,11 +11,11 @@ describe('AdhocVariable', function() {
filters: [ filters: [
{key: 'key1', operator: '=', value: 'value1'}, {key: 'key1', operator: '=', value: 'value1'},
{key: 'key2', operator: '!=', value: 'value2'}, {key: 'key2', operator: '!=', value: 'value2'},
{key: 'key3', operator: '=', value: 'value3a|value3b'}, {key: 'key3', operator: '=', value: 'value3a|value3b|value3c'},
] ]
}); });
var urlValue = variable.getValueForUrl(); var urlValue = variable.getValueForUrl();
expect(urlValue).to.eql(["key1|=|value1", "key2|!=|value2", "key3|=|value3a__gfp__value3b"]); expect(urlValue).to.eql(["key1|=|value1", "key2|!=|value2", "key3|=|value3a__gfp__value3b__gfp__value3c"]);
}); });
}); });
@ -24,7 +24,7 @@ describe('AdhocVariable', function() {
it('should restore filters', function() { it('should restore filters', function() {
var variable = new AdhocVariable({}); var variable = new AdhocVariable({});
variable.setValueFromUrl(["key1|=|value1", "key2|!=|value2", "key3|=|value3a__gfp__value3b"]); variable.setValueFromUrl(["key1|=|value1", "key2|!=|value2", "key3|=|value3a__gfp__value3b__gfp__value3c"]);
expect(variable.filters[0].key).to.be('key1'); expect(variable.filters[0].key).to.be('key1');
expect(variable.filters[0].operator).to.be('='); expect(variable.filters[0].operator).to.be('=');
@ -36,7 +36,7 @@ describe('AdhocVariable', function() {
expect(variable.filters[2].key).to.be('key3'); expect(variable.filters[2].key).to.be('key3');
expect(variable.filters[2].operator).to.be('='); expect(variable.filters[2].operator).to.be('=');
expect(variable.filters[2].value).to.be('value3a|value3b'); expect(variable.filters[2].value).to.be('value3a|value3b|value3c');
}); });
}); });