Add error handling to onDataRecevied, fixes #213

Author: torkelo

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v0.2.1
+
+- Fixes partial (not full height) map on first render [#212](https://github.com/grafana/worldmap-panel/issues/212)
+
+## v0.2.0
+
+- Convert to TypeScript, webpack and Jest
+- Use Yarn on CircleCI
+- Add missing dev dependencies
+- Tweak for incorrect height on render
+  which occurs more frequently in Grafana 6.0
+
 ## v0.1.2
 
 - Map centering ignores configured location [#149](https://github.com/grafana/worldmap-panel/issues/149) Thanks [@clompsy](https://github.com/clompsy)
@@ -13,7 +25,7 @@
 ## v0.1.0
 
 - Configuration option for turning mouse wheel zoom on or off. [#140](https://github.com/grafana/worldmap-panel/issues/140) Thanks [@Perlovka](https://github.com/Perlovka)
-- Upgrade to Leaflet JS [#132](https://github.com/grafana/worldmap-panel/pull/132) Thanks [@cbarbier](https://github.com/cbarbier)  
+- Upgrade to Leaflet JS [#132](https://github.com/grafana/worldmap-panel/pull/132) Thanks [@cbarbier](https://github.com/cbarbier)
 
 ## v0.0.21
 

dist/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v0.2.1
+
+- Fixes partial (not full height) map on first render [#212](https://github.com/grafana/worldmap-panel/issues/212)
+
+## v0.2.0
+
+- Convert to TypeScript, webpack and Jest
+- Use Yarn on CircleCI
+- Add missing dev dependencies
+- Tweak for incorrect height on render
+  which occurs more frequently in Grafana 6.0
+
 ## v0.1.2
 
 - Map centering ignores configured location [#149](https://github.com/grafana/worldmap-panel/issues/149) Thanks [@clompsy](https://github.com/clompsy)
@@ -13,7 +25,7 @@
 ## v0.1.0
 
 - Configuration option for turning mouse wheel zoom on or off. [#140](https://github.com/grafana/worldmap-panel/issues/140) Thanks [@Perlovka](https://github.com/Perlovka)
-- Upgrade to Leaflet JS [#132](https://github.com/grafana/worldmap-panel/pull/132) Thanks [@cbarbier](https://github.com/cbarbier)  
+- Upgrade to Leaflet JS [#132](https://github.com/grafana/worldmap-panel/pull/132) Thanks [@cbarbier](https://github.com/cbarbier)
 
 ## v0.0.21
 

dist/module.js

@@ -23,8 +23,8 @@
       {"name": "USA", "path": "images/worldmap-usa.png"},
       {"name": "Light Theme", "path": "images/worldmap-light-theme.png"}
     ],
-    "version": "0.2.0",
-    "updated": "2019-02-21"
+    "version": "0.2.1",
+    "updated": "2019-08-29"
   },
 
   "dependencies": {

dist/module.js.map

@@ -23,8 +23,8 @@
       {"name": "USA", "path": "images/worldmap-usa.png"},
       {"name": "Light Theme", "path": "images/worldmap-light-theme.png"}
     ],
-    "version": "0.2.0",
-    "updated": "2019-02-21"
+    "version": "0.2.1",
+    "updated": "2019-08-29"
   },
 
   "dependencies": {

dist/plugin.json

@@ -1,5 +1,6 @@
 import { MetricsPanelCtrl } from "grafana/app/plugins/sdk";
 import TimeSeries from "grafana/app/core/time_series2";
+import appEvents from 'grafana/app/core/app_events';
 
 import * as _ from "lodash";
 import DataFormatter from "./data_formatter";
@@ -182,32 +183,36 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
       return;
     }
 
-    if (this.dashboard.snapshot && this.locations) {
-      this.panel.snapshotLocationData = this.locations;
-    }
-
-    const data = [];
+    try {
+      if (this.dashboard.snapshot && this.locations) {
+        this.panel.snapshotLocationData = this.locations;
+      }
 
-    if (this.panel.locationData === "geohash") {
-      this.dataFormatter.setGeohashValues(dataList, data);
-    } else if (this.panel.locationData === "table") {
-      const tableData = dataList.map(DataFormatter.tableHandler.bind(this));
-      this.dataFormatter.setTableValues(tableData, data);
-    } else if (this.panel.locationData === "json result") {
-      this.series = dataList;
-      this.dataFormatter.setJsonValues(data);
-    } else {
-      this.series = dataList.map(this.seriesHandler.bind(this));
-      this.dataFormatter.setValues(data);
-    }
-    this.data = data;
+      const data = [];
+
+      if (this.panel.locationData === "geohash") {
+        this.dataFormatter.setGeohashValues(dataList, data);
+      } else if (this.panel.locationData === "table") {
+        const tableData = dataList.map(DataFormatter.tableHandler.bind(this));
+        this.dataFormatter.setTableValues(tableData, data);
+      } else if (this.panel.locationData === "json result") {
+        this.series = dataList;
+        this.dataFormatter.setJsonValues(data);
+      } else {
+        this.series = dataList.map(this.seriesHandler.bind(this));
+        this.dataFormatter.setValues(data);
+      }
+      this.data = data;
 
-    this.updateThresholdData();
+      this.updateThresholdData();
 
-    if (this.data.length && this.panel.mapCenter === "Last GeoHash") {
-      this.centerOnLastGeoHash();
-    } else {
-      this.render();
+      if (this.data.length && this.panel.mapCenter === "Last GeoHash") {
+        this.centerOnLastGeoHash();
+      } else {
+        this.render();
+      }
+    } catch (err) {
+      appEvents.emit('alert-error', ['Data error', err.toString()])
     }
   }
 
@@ -295,16 +300,25 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
   }
 
   link(scope, elem, attrs, ctrl) {
+    let firstRender = true;
+
     ctrl.events.on("render", () => {
       render();
       ctrl.renderingCompleted();
     });
 
-    function render() {
+     function render() {
       if (!ctrl.data) {
         return;
       }
 
+      // delay first render as the map panel sizing is bugged first render even though the element has correct height
+      if (firstRender) {
+        firstRender = false;
+        setTimeout(render, 100);
+        return;
+      }
+
       const mapContainer = elem.find(".mapcontainer");
 
       if (mapContainer[0].id.indexOf("{{") > -1) {
@@ -317,9 +331,7 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
         ctrl.map = map;
       }
 
-      setTimeout(() => {
-        ctrl.map.resize();
-      }, 1);
+      ctrl.map.resize();
 
       if (ctrl.mapCenterMoved) {
         ctrl.map.panToMapCenter();