Added Variable Substitution in Variable Query

clackner-gpa · clackner-gpa · commit 138d9e5974b3 · 2025-05-22T14:13:26.000-04:00
diff --git a/src/datasource.ts b/src/datasource.ts
@@ -71,9 +71,11 @@ export class DataSource extends DataSourceApi<OpenHistorianQuery, OpenHistorianD
       query.fieldNames = ["*"];
     }
 
+    const queryCondition = (query.condition?.length ?? 0) === 0 ? "" : ` WHERE ${getTemplateSrv().replace(query.condition, options.scopedVars)}`;
+
     let data = await getBackendSrv().post(this.url + "/Search", {
       dataTypeIndex: -1 /* unrestricted search */,
-      expression: `SELECT DISTINCT ${query.fieldNames} FROM ${query.tableName} ${(query.condition?.length ?? 0) === 0 ? "" : ` WHERE ${query.condition}`}`
+      expression: `SELECT DISTINCT ${query.fieldNames} FROM ${query.tableName} ${queryCondition}`
     })
     return data.map((s: string) => ({ text: s }));
   }

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,11 @@ export class DataSource extends DataSourceApi<OpenHistorianQuery, OpenHistorianD`
`71`	`71`	`query.fieldNames = ["*"];`
`72`	`72`	`}`
`73`	`73`
	`74`	+ const queryCondition = (query.condition?.length ?? 0) === 0 ? "" : ` WHERE ${getTemplateSrv().replace(query.condition, options.scopedVars)}`;
	`75`	`+`
`74`	`76`	`let data = await getBackendSrv().post(this.url + "/Search", {`
`75`	`77`	`dataTypeIndex: -1 /* unrestricted search */,`
`76`		- expression: `SELECT DISTINCT ${query.fieldNames} FROM ${query.tableName} ${(query.condition?.length ?? 0) === 0 ? "" : ` WHERE ${query.condition}`}`
	`78`	+ expression: `SELECT DISTINCT ${query.fieldNames} FROM ${query.tableName} ${queryCondition}`
`77`	`79`	`})`
`78`	`80`	`return data.map((s: string) => ({ text: s }));`
`79`	`81`	`}`