fix template vars (#35)

Scott Lepper · web-flow · commit b219db56910f · 2022-01-13T11:15:42.000-05:00
* fix template vars
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.9.5
+
+Bug - Fix global template variables.
+
 ## 0.9.4
 
 Bug - Fix query type variables.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clickhouse-datasource",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Clickhouse Datasource",
   "scripts": {
     "build": "grafana-toolkit plugin:build",
diff --git a/src/data/CHDatasource.ts b/src/data/CHDatasource.ts
@@ -40,7 +40,7 @@ export class Datasource extends DataSourceWithBackend<CHQuery, CHConfig> {
   applyTemplateVariables(query: CHQuery, scoped: ScopedVars): CHQuery {
     return {
       ...query,
-      rawSql: this.replace(query.rawSql || '') || '',
+      rawSql: this.replace(query.rawSql || '', scoped) || '',
     };
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "clickhouse-datasource",`
`3`		`- "version": "0.9.4",`
	`3`	`+ "version": "0.9.5",`
`4`	`4`	`"description": "Clickhouse Datasource",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "grafana-toolkit plugin:build",`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export class Datasource extends DataSourceWithBackend<CHQuery, CHConfig> {`
`40`	`40`	`applyTemplateVariables(query: CHQuery, scoped: ScopedVars): CHQuery {`
`41`	`41`	`return {`
`42`	`42`	`...query,`
`43`		`- rawSql: this.replace(query.rawSql \|\| '') \|\| '',`
	`43`	`+ rawSql: this.replace(query.rawSql \|\| '', scoped) \|\| '',`
`44`	`44`	`};`
`45`	`45`	`}`
`46`	`46`