Iss #182 - fixed template variables inside regex.

This commit is contained in:
Alexander Zobnin
2016-04-11 22:21:19 +03:00
parent 9f2265bd36
commit eb9722aef0
2 changed files with 43 additions and 16 deletions

View File

@@ -23,7 +23,7 @@ export function expandItemName(name, key) {
}
// Pattern for testing regex
var regexPattern = /^\/(.*)\/([gmi]*)$/m;
export var regexPattern = /^\/(.*)\/([gmi]*)$/m;
export function isRegex(str) {
return regexPattern.test(str);
@@ -36,6 +36,12 @@ export function buildRegex(str) {
return new RegExp(pattern, flags);
}
// Need for template variables replace
// From Grafana's templateSrv.js
export function escapeRegex(value) {
return value.replace(/[\\^$*+?.()|[\]{}\/]/g, '\\$&');
}
export function parseInterval(interval) {
var intervalPattern = /(^[\d]+)(y|M|w|d|h|m|s)/g;
var momentInterval = intervalPattern.exec(interval);