Remove query parameter value from Custom entity (#132)

* Remove query parameter value from Custom entity

* Update query generation for Custom entity

* Fix linter issue

Author: SRozhina

src/templates/custom.ts

@@ -69,7 +69,7 @@ class Custom {
         }
 
         const newOptions = [];
-        const newQuery = [];
+        const queryParts = [];
 
         let hasAll = false;
         for (let i = 0; i < this.state.options.length; i++) {
@@ -90,7 +90,11 @@ class Custom {
             }
 
             newOptions.push(opt);
-            newQuery.push(opt.value);
+            const valueWithEscapedCommas = String(opt.value).replace(
+                /,/g,
+                '\\,'
+            );
+            queryParts.push(`${opt.text} : ${valueWithEscapedCommas}`);
         }
 
         if (this.defaultValue !== '') {
@@ -112,7 +116,7 @@ class Custom {
         }
 
         this.state.options = newOptions;
-        this.state.query = newQuery.join(',');
+        this.state.query = queryParts.join(', ');
     }
 
     generate() {

test/fixtures/override_dashboard.ts

@@ -57,7 +57,7 @@ const overrideDashboard: GrafanaDashboard = {
                         value: 'b',
                     },
                 ],
-                query: 'a,b',
+                query: 'a : a, b : b',
                 refresh: 0,
                 refresh_on_load: false,
                 type: 'custom',
@@ -94,7 +94,7 @@ const overrideDashboard: GrafanaDashboard = {
                         value: '1min',
                     },
                 ],
-                query: '30min,10min,5min,2min,1min',
+                query: '30min : 30min, 10min : 10min, 5min : 5min, 2min : 2min, 1min : 1min',
                 refresh: 0,
                 refresh_on_load: false,
                 type: 'custom',

test/fixtures/templates/override_custom.ts

@@ -39,7 +39,7 @@ const overrideCustomTemplate: GrafanaCustomTemplate = {
     includeAll: false,
     allValue: '',
     allFormat: 'glob',
-    query: 'a,b',
+    query: 'a : a, b : b',
     current: {
         text: 'a',
         value: 'a',

test/fixtures/templates/override_custom_text_value.ts

@@ -35,7 +35,7 @@ const overrideCustomTextValue: GrafanaCustomTemplate = {
     includeAll: false,
     allValue: '',
     allFormat: 'glob',
-    query: 'myValue',
+    query: 'myText : myValue',
     current: {
         text: 'myText',
         value: 'myValue',