Merge pull request #143 from GoshPosh/DATA-5475_apply_template_variab…

…les_in_expression [DATA-5475] Apply template variables in expression
GoshPosh · Mar 2, 2022 · c33c1a6 · c33c1a6
2 parents a678be6 + c808291
commit c33c1a6
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/dist/datasource.js b/dist/datasource.js
@@ -47,6 +47,24 @@ function (angular, _, dateMath, moment) {
       console.log("Do query");
       console.log(options);
 
+      // Replace the template variable in expression with its current value
+      options["targets"].forEach(function (target) {
+        if (target.hasOwnProperty("expression")) {
+            var expression = target.expression;
+            if (expression.indexOf("$") >= 0) {
+              var variables = datasourceSrv["templateSrv"]["variables"];
+              Object.keys(variables).sort().reverse() // Greedy matching
+              .forEach(function(key) {
+                var variable = "$" + variables[key]["name"];
+                if (expression.indexOf(variable) >= 0) {
+                  expression = expression.replace(variable, variables[key]["current"]["value"]);
+                  target.expression = expression;
+                }
+              });
+            }
+        }
+      });
+
       var _this = this;
       var promisesByRefId = {};
       var promises = [];

diff --git a/src/datasource.js b/src/datasource.js
@@ -47,6 +47,24 @@ function (angular, _, dateMath, moment) {
       console.log("Do query");
       console.log(options);
 
+      // Replace the template variable in expression with its current value
+      options["targets"].forEach(function (target) {
+        if (target.hasOwnProperty("expression")) {
+            var expression = target.expression;
+            if (expression.indexOf("$") >= 0) {
+              var variables = datasourceSrv["templateSrv"]["variables"];
+              Object.keys(variables).sort().reverse() // Greedy matching
+              .forEach(function(key) {
+                var variable = "$" + variables[key]["name"];
+                if (expression.indexOf(variable) >= 0) {
+                  expression = expression.replace(variable, variables[key]["current"]["value"]);
+                  target.expression = expression;
+                }
+              });
+            }
+        }
+      });
+
       var _this = this;
       var promisesByRefId = {};
       var promises = [];