elasticsearch: Interpolate datapoint field values into transformation

data prefixed with "__field_"

Author: amotl

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## development
 - Improve tests for checking "clickthroughUrl" interpolation
 - Add tests for elasticsearch query results, both for table- and timeseries-data
+- Interpolate datapoint field values with `__field_` prefix into transformation
+  data, now also for elasticsearch queries.
 
 
 ## v0.9.0

src/data_formatter.test.ts

@@ -365,15 +365,21 @@ describe('DataFormatter', () => {
           'columns': [
             {text: 'geopoint'},
             {text: 'metric'},
+            {text: 'foo'},
+            {text: 'bar'},
           ],
           'rows': [
             [
               'u0wt6pv2qqhz',
               123.45,
+              "42.42",
+              42.42,
             ],
             [
               'u33dbm6duz90',
               67.890,
+              "43.43",
+              43.43,
             ],
           ],
         },
@@ -386,7 +392,11 @@ describe('DataFormatter', () => {
 
     it('the fields should be available within transformed data', () => {
       expect(data[0].value).toEqual(123.45);
+      expect(data[0].__field_foo).toEqual("42.42");
+      expect(data[0].__field_bar).toEqual(42.42);
       expect(data[1].value).toEqual(67.890);
+      expect(data[1].__field_foo).toEqual("43.43");
+      expect(data[1].__field_bar).toEqual(43.43);
     });
 
   });
@@ -412,10 +422,14 @@ describe('DataFormatter', () => {
             {
               geopoint: 'u0wt6pv2qqhz',
               metric: 123.45,
+              foo: "42.42",
+              bar: 42.42,
             },
             {
               geopoint: 'u33dbm6duz90',
               metric: 67.890,
+              foo: "43.43",
+              bar: 43.43,
             },
           ],
         },
@@ -428,7 +442,11 @@ describe('DataFormatter', () => {
 
     it('the fields should be available within transformed data', () => {
       expect(data[0].value).toEqual(123.45);
+      expect(data[0].__field_foo).toEqual("42.42");
+      expect(data[0].__field_bar).toEqual(42.42);
       expect(data[1].value).toEqual(67.890);
+      expect(data[1].__field_foo).toEqual("43.43");
+      expect(data[1].__field_bar).toEqual(43.43);
     });
 
   });

src/data_formatter.ts

@@ -87,6 +87,7 @@ export default class DataFormatter {
           return loc.key.toUpperCase() === serie.alias.toUpperCase();
         });
 
+        // Todo: Propagate user-level notification?
         if (!location) {
           return;
         }
@@ -201,6 +202,15 @@ export default class DataFormatter {
             const link = this.settings.esLink ? row[columnNames[this.settings.esLink]] : null;
 
             const dataValue = this.createDataValue(encodedGeohash, decodedGeohash, locationName, value, link);
+
+            // Add all values from the original datapoint as attributes prefixed with `__field_`.
+            for (let columnName in columnNames) {
+              const value = row[columnNames[columnName]];
+              const key = '__field_' + columnName;
+              dataValue[key] = value;
+            }
+
+            // Bookkeeping for computing valueRange.
             if (dataValue.value > highestValue) {
               highestValue = dataValue.value;
             }
@@ -232,6 +242,15 @@ export default class DataFormatter {
             const link = this.settings.esLink ? datapoint[this.settings.esLink] : null;
 
             const dataValue = this.createDataValue(encodedGeohash, decodedGeohash, locationName, value, link);
+
+            // Add all values from the original datapoint as attributes prefixed with `__field_`.
+            for (let key in datapoint) {
+              const value = datapoint[key];
+              key = '__field_' + key;
+              dataValue[key] = value;
+            }
+
+            // Bookkeeping for computing valueRange.
             if (dataValue.value > highestValue) {
               highestValue = dataValue.value;
             }