Merge pull request #83 from sreemukha/master

Fixing threshold color picker, updating to v1.1.2

CHANGES.md

@@ -1,3 +1,7 @@
+## GlobalNOC Networkmap Panel v1.1.2 - Wed Apr 29 2019
+
+* Fixed issue with `<color-picker>` in threshold legend mode
+
 ## GlobalNOC Networkmap Panel v1.1.1 - Wed Apr 24 2019
 
 * Updated `<spectrum-picker>` to `<color-picker>` to fix issues in Grafana v6

Makefile

@@ -1,5 +1,5 @@
 NAME = grnoc-grafana-worldview
-VERSION = 1.1.1
+VERSION = 1.1.2
 
 rpm:    dist
 		rpmbuild -ta dist/$(NAME)-$(VERSION).tar.gz

grnoc-grafana-worldview.spec

@@ -1,5 +1,5 @@
 Name: grnoc-grafana-worldview
-Version: 1.1.1
+Version: 1.1.2
 Release: 1%{?dist}
 Summary: GRNOC Worldview Grafana Plugin
 Group: GRNOC

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Network-Map" ,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "GlobalNOC Networkmap Panel for Grafana",
   "main": "index.js",
   "scripts": {

src/atlas3.js

@@ -72,7 +72,7 @@ const panelDefaults = {
     legendTypes: ['opacity','spectrum','threshold'],
     opacityScales: ['linear', 'sqrt'],
     colorScheme : 'interpolateRdYlGn',
-    threshold_colors: []
+    threshold_colors: ['#37872D', '#C4162A']
 };
 
 var tempArray=[];
@@ -407,6 +407,18 @@ export class Atlas3 extends MetricsPanelCtrl {
         this.render();
     }
 
+    updateThresholdDefaults() {
+        console.log(this.panel.legend.thresholds);
+        if(!this.panel.threshold_colors[0]) {
+            this.panel.threshold_colors[0] = "rgb(200,200,200)";
+        }
+        this.panel.legend.thresholds.forEach((threshold,idx) => {
+            if(!this.panel.threshold_colors[idx+1]) {
+                this.panel.threshold_colors[idx+1] = "rgb(200,200,200)";
+            }
+        });
+    }
+
     jsonModal(){
         var modalScope = this.$scope.$new(false);
         modalScope.panel = this.panel;

src/partials/display_editor.html

@@ -57,7 +57,7 @@ <h5 class="section-heading">Colors</h5>
                 <label class="gf-form-label width-8">Thresholds
                     <tip>Comma separated values in increasing order between (0,100)</tip>
                 </label>
-                <input type="text" class="gf-form-input width-10" ng-model="ctrl.panel.legend.thresholds" placeholder="50,80" ng-blur="ctrl.render()" array-join>
+                <input type="text" class="gf-form-input width-10" ng-model="ctrl.panel.legend.thresholds" placeholder="50,80" ng-blur="ctrl.updateThresholdDefaults()" array-join>
             </div>
             <div class="gf-form">
                 <label class="gf-form-label width-8">Colors</label>

src/plugin.json

@@ -14,8 +14,8 @@
         {"name": "Github", "url": "https://github.com/GlobalNOC/globalnoc-networkmap-panel"},
         {"name": "Apache License", "url": "https://raw.githubusercontent.com/globalnoc/globalnoc-networkmap-panel/master/LICENSE"}
     ],
-    "version": "1.1.1",
-    "updated": "2019-04-24"
+    "version": "1.1.2",
+    "updated": "2019-04-29"
   },
 
   "dependencies": {