support key=>value template variables

Altinity · Dec 5, 2017 · c99570f · c99570f
1 parent 3f4b28e
commit c99570f
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 52 deletions.
diff --git a/dist/response_parser.d.ts b/dist/response_parser.d.ts
@@ -1,4 +1,4 @@
 /// <reference path="../node_modules/grafana-sdk-mocks/app/headers/common.d.ts" />
 export default class ResponseParser {
-    parse(query: any, results: any): any;
+    parse(query: any, results: any): any[];
 }
diff --git a/dist/response_parser.js b/dist/response_parser.js
diff --git a/dist/response_parser.js.map b/dist/response_parser.js.map
diff --git a/dist/response_parser.ts b/dist/response_parser.ts
@@ -2,28 +2,24 @@
 import _ from 'lodash';
 
 export default class ResponseParser {
-
   parse(query, results) {
     if (!results || results.data.length === 0) { return []; }
 
     var sqlResults = results.data;
-    var res = [], v;
-    _.each(sqlResults, row => {
-        _.each(row, value => {
-            if (_.isArray(value) || _.isObject(value)) {
-              v = value[0];
-            } else {
-              v = value;
-            }
-
-            if ( res.indexOf( v ) === -1 ) {
-                res.push(v);
-            }
-        });
+    var res = [];
+    _.each(sqlResults, r => {
+        if (r && r.text && r.value) {
+            res.push({ text: r.text, value: r.value });
+            return
+        }
+        if (_.isObject(r)) {
+            var key = Object.keys(r)[0];
+            res.push({ text: r[key]});
+            return
+        }
+        res.push({ text: r });
     });
 
-    return _.map(res, value => {
-      return { text: value};
-    });
+    return res
   }
 }
diff --git a/src/response_parser.ts b/src/response_parser.ts
@@ -2,28 +2,24 @@
 import _ from 'lodash';
 
 export default class ResponseParser {
-
   parse(query, results) {
     if (!results || results.data.length === 0) { return []; }
 
     var sqlResults = results.data;
-    var res = [], v;
-    _.each(sqlResults, row => {
-        _.each(row, value => {
-            if (_.isArray(value) || _.isObject(value)) {
-              v = value[0];
-            } else {
-              v = value;
-            }
-
-            if ( res.indexOf( v ) === -1 ) {
-                res.push(v);
-            }
-        });
+    var res = [];
+    _.each(sqlResults, r => {
+        if (r && r.text && r.value) {
+            res.push({ text: r.text, value: r.value });
+            return
+        }
+        if (_.isObject(r)) {
+            var key = Object.keys(r)[0];
+            res.push({ text: r[key]});
+            return
+        }
+        res.push({ text: r });
     });
 
-    return _.map(res, value => {
-      return { text: value};
-    });
+    return res
   }
 }