Rename to grafana-worldmap-panel-ng to allow side-by-side installation

Author: amotl

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## v0.3.0-dev
+
+## v0.4.0
+- Rename to `grafana-worldmap-panel-ng` to allow side-by-side installation
+  with upstream *Grafana Worldmap Panel 0.2.0*.
+
+
+## v0.3.0
 
 - Add new mapping options `table+json` and `table+jsonp` to retrieve
   location information from JSON endpoint, even for table data.

Makefile.Homebrew

@@ -4,4 +4,4 @@ grafana-start:
 	grafana-server --config=/usr/local/etc/grafana/grafana.ini --homepath /usr/local/share/grafana cfg:default.paths.logs=/usr/local/var/log/grafana cfg:default.paths.data=/usr/local/var/lib/grafana cfg:default.paths.plugins=/usr/local/var/lib/grafana/plugins
 
 link-plugin:
-	ln -s `pwd` /usr/local/var/lib/grafana/plugins/
+	ln -s `pwd` /usr/local/var/lib/grafana/plugins/grafana-worldmap-panel-ng

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "worldmap-panel",
-  "version": "1.0.0",
+  "name": "grafana-worldmap-panel-ng",
+  "version": "0.4.0",
   "description": "Worldmap Panel Plugin for Grafana",
   "main": "src/module.js",
   "scripts": {

src/core.ts

@@ -87,7 +87,7 @@ export class WorldmapCore {
 
       // Compute URL to builtin JSON resource.
       const url =
-        "public/plugins/grafana-worldmap-panel/data/" +
+        `public/plugins/${this.ctrl.pluginId}/data/` +
         this.settings.locationData +
         ".json";
 

src/data_formatter.test.ts

@@ -105,7 +105,7 @@ describe('DataFormatter', () => {
      * - https://github.com/grafana/worldmap-panel/pull/177
      * - https://community.hiveeyes.org/t/erneuerung-der-luftdatenpumpe/1199
      * - https://community.hiveeyes.org/t/ldi-data-plane-v2/1412
-     * - https://community.hiveeyes.org/t/grafana-worldmap-panel-0-3-0-dev-series/1824/2
+     * - https://community.hiveeyes.org/t/grafana-worldmap-panel-ng/1824/2
      */
     beforeEach(() => {
       const ctrl = {

src/module.ts

@@ -1,12 +1,6 @@
 /* eslint import/no-extraneous-dependencies: 0 */
-import {loadPluginCss} from 'grafana/app/plugins/sdk';
 import WorldmapCtrl from './worldmap_ctrl';
 
-loadPluginCss({
-  dark: 'plugins/grafana-worldmap-panel/css/worldmap.dark.css',
-  light: 'plugins/grafana-worldmap-panel/css/worldmap.light.css'
-});
-
 export {
   WorldmapCtrl as PanelCtrl
 };

src/partials/editor.html

@@ -1,20 +1,33 @@
+<!-- Development / Beta badge -->
+<span>
+
+  The
+  <a href="https://github.com/hiveeyes/grafana-worldmap-panel" class="editor-link-color" target="_blank">
+    Worldmap Panel NG
+  </a>
+  (<a href="https://github.com/hiveeyes/grafana-worldmap-panel/blob/develop/CHANGELOG.md" class="editor-link-color" target="_blank">changes</a>)
+  is work in progress.
+
+  Enjoy
+  <a href="https://community.hiveeyes.org/t/grafana-worldmap-panel-ng/1824" class="editor-link-color" target="_blank">following the development</a>
+  and testing it.
+
+  We will be happy to receive feedback from the community at
+  <a href="https://community.grafana.com/t/giving-the-grafana-worldmap-panel-some-love/17210" class="editor-link-color" target="_blank">[1]</a>,
+  <a href="https://github.com/grafana/worldmap-panel/issues/197" class="editor-link-color" target="_blank">[2]</a>
+  and
+  <a href="https://github.com/hiveeyes/grafana-worldmap-panel" class="editor-link-color" target="_blank">[3]</a>.
+
+  Please don't use this software in production yet.
+
+</span>
+<hr/>
+
+
 <!-- Data mapping -->
 <div class="editor-row">
 
-  <h3 class="main-section-heading pull-left">Location source</h3>
-
-  <!-- Development / Beta badge -->
-  <span class="pull-right" style="max-width: 450px; text-align: right">
-    The
-    <a href="https://github.com/hiveeyes/grafana-worldmap-panel" class="editor-link-color" target="_blank">
-      Grafana Worldmap Panel 0.3.0-dev series
-    </a>
-    (<a href="https://github.com/hiveeyes/grafana-worldmap-panel/blob/develop/CHANGELOG.md" class="editor-link-color" target="_blank">changes</a>)
-    is a work in progress, please don't use it in production yet.
-    We are happy for testing and feedback.
-  </span>
-  <div style="clear: both"/>
-  <br/>
+  <h3 class="main-section-heading">Location source</h3>
 
   <!-- Data source -->
   <div class="section editor-column">

src/plugin.json

@@ -1,10 +1,10 @@
 {
   "type": "panel",
-  "name": "Worldmap Panel",
-  "id": "grafana-worldmap-panel",
+  "name": "Worldmap Panel NG",
+  "id": "grafana-worldmap-panel-ng",
 
   "info": {
-    "description": "World Map panel for Grafana. Displays time series data or geohash data from Elasticsearch overlaid on a world map.",
+    "description": "World Map panel for Grafana. Displays time series data or geohash data on a world map.",
     "author": {
       "name": "Grafana Labs",
       "url": "https://grafana.com"
@@ -15,16 +15,16 @@
       "large": "images/worldmap_logo.svg"
     },
     "links": [
-      {"name": "Project site", "url": "https://github.com/grafana/worldmap-panel"},
-      {"name": "MIT License", "url": "https://github.com/grafana/worldmap-panel/blob/master/LICENSE"}
+      {"name": "Project site", "url": "https://github.com/hiveeyes/grafana-worldmap-panel"},
+      {"name": "MIT License", "url": "https://github.com/hiveeyes/grafana-worldmap-panel/blob/master/LICENSE"}
     ],
     "screenshots": [
       {"name": "World", "path": "images/worldmap-world.png"},
       {"name": "USA", "path": "images/worldmap-usa.png"},
       {"name": "Light Theme", "path": "images/worldmap-light-theme.png"}
     ],
-    "version": "0.3.0-dev6",
-    "updated": "2019-05-06"
+    "version": "0.4.0",
+    "updated": "2019-06-08"
   },
 
   "dependencies": {

src/worldmap.test.ts

@@ -325,7 +325,7 @@ describe('Worldmap', () => {
      * options here to proof they actually toggle the visibility
      * of the respective control elements.
      *
-     * See also https://community.hiveeyes.org/t/grafana-worldmap-panel-0-3-0-dev-series/1824/3
+     * See also https://community.hiveeyes.org/t/grafana-worldmap-panel-ng/1824/3
      */
     beforeEach(() => {
       ctrl.data = new DataBuilder().withThresholdValues([2, 4, 6]).build();
@@ -390,7 +390,7 @@ describe('WorldmapFoundation', () => {
    * options here to proof they actually toggle the visibility
    * of the respective control elements.
    *
-   * See also https://community.hiveeyes.org/t/grafana-worldmap-panel-0-3-0-dev-series/1824/3
+   * See also https://community.hiveeyes.org/t/grafana-worldmap-panel-ng/1824/3
    */
 
   let worldMap;

src/worldmap_ctrl.ts

@@ -1,4 +1,4 @@
-import { MetricsPanelCtrl } from "grafana/app/plugins/sdk";
+import {loadPluginCss, MetricsPanelCtrl} from "grafana/app/plugins/sdk";
 
 import * as _ from "lodash";
 import "./css/worldmap-panel.css";
@@ -107,6 +107,8 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
     this.$document = $document;
     this.contextSrv = contextSrv;
 
+    this.loadCss();
+
     this.initializing = true;
 
     this.errors = new ErrorManager();
@@ -124,6 +126,14 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
     this.loadLocationData();
   }
 
+  loadCss() {
+    loadPluginCss({
+      dark: `plugins/${this.pluginId}/css/worldmap.dark.css`,
+      light: `plugins/${this.pluginId}/css/worldmap.light.css`
+    });
+
+  }
+
   loadSettings() {
     /*
      * Initialize the plugin setting subsystem to provide `this.settings`.
@@ -358,7 +368,7 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
   onInitEditMode() {
     this.addEditorTab(
       "Worldmap",
-      "public/plugins/grafana-worldmap-panel/partials/editor.html",
+      `public/plugins/${this.pluginId}/partials/editor.html`,
       2
     );
   }