Rename "point_" prefix to "__field_" when interpolating datapoint field values

Author: amotl

CHANGELOG.md

@@ -28,7 +28,7 @@
   add basic variable interpolation based on keys from `dataPoint`.
 - Introduce the regular Grafana templating mechanism for interpolating variables
   into clickthrough links. As we are now interpolating dashboard **and** `dataPoint`
-  variables, the latter one will get prefixed with `point_` to avoid collisions.
+  variables, the latter one will get prefixed with `__field_` to avoid collisions.
 - Apply Grafana-style variable interpolation to **all** panel settings.
 - Add query parameters into the interpolation dictionary, prefixed by `request_`.
 - Use request parameters prefixed with "panel-" to optionally override the
@@ -47,6 +47,7 @@
 - Add `hideTimepickerNavigation` option.
 - Add `circleOptions.strokeEnabled` and `circleOptions.strokeWeight`.
 - Add options `customAttribution` and `customAttributionText`.
+- Rename `point_` prefix to `__field_` when interpolating datapoint field values
 
 ## v0.2.0
 

src/data_formatter.ts

@@ -363,10 +363,10 @@ export default class DataFormatter {
           link: link,
         };
 
-        // Add all values from the original datapoint as attributes prefixed with `point_`.
+        // Add all values from the original datapoint as attributes prefixed with `__field_`.
         for (let key in datapoint) {
           const value = datapoint[key];
-          key = 'point_' + key;
+          key = '__field_' + key;
           dataValue[key] = value;
         }
 

src/partials/editor.html

@@ -446,8 +446,11 @@ <h5>Popup labels</h5>
     <div class="gf-form-group">
       <h5>Clickthrough links</h5>
       <div class="gf-form">
-        <label class="gf-form-label width-10">Clickthrough URL</label>
-        <input type="text" class="input-small gf-form-input width-20" ng-model="ctrl.panel.clickthroughUrl" ng-change="ctrl.refresh()" ng-model-onblur />
+        <label class="gf-form-label width-10">
+          Clickthrough URL
+          <i class="grafana-tip fa fa-question-circle" bs-tooltip="'Address field values by prefixing $__field, e.g. $__field_geohash'"></i>
+        </label>
+        <input type="text" class="input-small gf-form-input width-20" ng-model="ctrl.panel.clickthroughUrl" ng-change="ctrl.refresh()" ng-model-onblur/>
       </div>
       <div class="gf-form">
         <label class="gf-form-label width-10">Clickthrough Window</label>

src/settings.ts

@@ -78,7 +78,7 @@ export default class PluginSettings {
         // When given, use request variable "panel-*", making things like these possible.
         // - ?panel-mapCenterLatitude=62.2
         // - ?panel-showZoomControl=false
-        // - ?panel-clickthroughUrl=/path/to/?geohash=$point_geohash
+        // - ?panel-clickthroughUrl=/path/to/?geohash=$__field_geohash
         // - https://daq.example.org/d/D1Fx12kWk/magic-dashboard?panel-clickthroughUrl=/path/to/?foobar=$request_foobar&foobar=hello
         const panel_query_name = 'panel-' + name;
         const panel_query_value = this._request[panel_query_name];