fix an issue where a single value wasn't interpolated by double quotes (#445)

Author: arturminchukov

CHANGELOG.md

@@ -5,6 +5,7 @@
 * FEATURE: add bars as the default type of visualization for explore mode. Adjust the width of the bars to match the step size. See [#420](https://github.com/VictoriaMetrics/victorialogs-datasource/pull/420).
 
 * BUGFIX: fix an issue where a warning was displayed when using the regexp operator not with a variable. See [#438](https://github.com/VictoriaMetrics/victorialogs-datasource/pull/438).
+* BUGFIX: fix an issue where a single value wasn't interpolated by double quotes. See [#444](https://github.com/VictoriaMetrics/victorialogs-datasource/pull/444).
 
 ## v0.21.4
 

src/datasource.test.ts

@@ -49,7 +49,7 @@ describe('VictoriaLogsDatasource', () => {
     });
 
     it('should return a value escaped by stringify for one array element', () => {
-      expect(ds.interpolateQueryExpr(['arg // for &  test " this string ` end test'] as any, customVariable)).toEqual("arg // for &  test \" this string ` end test");
+      expect(ds.interpolateQueryExpr(['arg // for &  test " this string ` end test'] as any, customVariable)).toEqual("$_StartMultiVariable_arg // for &  test \" this string ` end test_EndMultiVariable");
     });
   });
 

src/datasource.ts

@@ -210,11 +210,11 @@ export class VictoriaLogsDatasource
 
   interpolateQueryExpr(value: any, _variable: any) {
     if (typeof value === 'string') {
-      return value ? JSON.stringify(value) : value;
+      return value ? `${JSON.stringify(value)}` : value;
     }
 
     if (Array.isArray(value)) {
-      return value.length > 1 ? `$_StartMultiVariable_${value.join("_separator_")}_EndMultiVariable` : value[0] || "";
+      return value.length > 0 ? `$_StartMultiVariable_${value.join("_separator_")}_EndMultiVariable` : "";
     }
 
     return value;
@@ -288,8 +288,8 @@ export class VictoriaLogsDatasource
   }
 
   replaceAllOption(queryExpr: string, variableName: string, regExpAllValue: string): string {
-    queryExpr = queryExpr.replace(`~"$${variableName}"`, `~"${regExpAllValue}"` || '~".*"');
-    queryExpr = queryExpr.replace(`$${variableName}`, '*');
+    queryExpr = queryExpr.replaceAll(`~"$${variableName}"`, `~"${regExpAllValue}"` || '~".*"');
+    queryExpr = queryExpr.replaceAll(`$${variableName}`, '*');
     return queryExpr;
   }