Merge pull request #119 from flant/fix_0_3_1

fix: set version to 0.3.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.3.1
+
+- Fix to work in Grafana 7.1.0
+
 ## v0.3.0
 
 - Tooltip freeze on click

README.md

@@ -28,7 +28,7 @@
 * Tested with Grafana:
   - 5.4.3
   - 6.3, 6.6, 6.7
-  - 7.0
+  - 7.0, 7.1
 
 ## Installation
 

dist/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.3.1
+
+- Fix to work in Grafana 7.1.0
+
 ## v0.3.0
 
 - Tooltip freeze on click

dist/README.md

@@ -28,7 +28,7 @@
 * Tested with Grafana:
   - 5.4.3
   - 6.3, 6.6, 6.7
-  - 7.0
+  - 7.0, 7.1
 
 ## Installation
 

dist/module.js

@@ -163,21 +163,20 @@ System.register(["lodash", "./color_legend", "./options_editor", "./tooltip_edit
       _export("PanelCtrl", _export("StatusHeatmapCtrl", StatusHeatmapCtrl =
       /*#__PURE__*/
       function (_MetricsPanelCtrl) {
-        StatusHeatmapCtrl.$inject = ["$scope", "$injector", "timeSrv", "annotationsSrv", "$window", "datasourceSrv", "variableSrv", "templateSrv"];
+        StatusHeatmapCtrl.$inject = ["$scope", "$injector", "annotationsSrv"];
 
         _inherits(StatusHeatmapCtrl, _MetricsPanelCtrl);
 
         // TODO remove this transient variable: use ng-model-options="{ getterSetter: true }"
 
         /** @ngInject */
-        function StatusHeatmapCtrl($scope, $injector, timeSrv, annotationsSrv, $window, datasourceSrv, variableSrv, templateSrv) {
+        function StatusHeatmapCtrl($scope, $injector, annotationsSrv) {
           var _this;
 
           _classCallCheck(this, StatusHeatmapCtrl);
 
           _this = _possibleConstructorReturn(this, _getPrototypeOf(StatusHeatmapCtrl).call(this, $scope, $injector));
           _this.annotationsSrv = annotationsSrv;
-          _this.variableSrv = variableSrv;
 
           _defineProperty(_assertThisInitialized(_this), "data", void 0);
 
@@ -312,7 +311,6 @@ System.register(["lodash", "./color_legend", "./options_editor", "./tooltip_edit
           };
           _this.annotations = [];
           _this.annotationsSrv = annotationsSrv;
-          _this.timeSrv = timeSrv;
 
           _this.events.on(PanelEvents.render, _this.onRender.bind(_assertThisInitialized(_this)));
 

dist/partials/options_editor.html

@@ -81,9 +81,7 @@
           </div>
           <div class="gf-form">
             <label class="gf-form-label">
-              <a class="pointer" tabindex="1" ng-click="editor.onRemoveThreshold($index)">
+              <i class="fa fa-trash pointer" ng-click="editor.onRemoveThreshold($index)"></i>
-                <i class="fa fa-trash"/>
-              </a>
             </label>
           </div>
         </div>

dist/plugin.json

@@ -24,8 +24,8 @@
       {"name": "Color mapping", "path": "img/color-mapping.png"},
       {"name": "Queries example", "path": "img/queries-example.png"}
     ],
-    "version": "0.3.0",
+    "version": "0.3.1",
-    "updated": "2020-07-14"
+    "updated": "2020-07-21"
   },
 
   "dependencies": {

package-lock.json

@@ -3580,7 +3580,7 @@
     },
     "chalk": {
       "version": "1.1.3",
-      "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "dev": true,
       "requires": {
@@ -7794,9 +7794,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.15",
+      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
     },
     "lodash.memoize": {
       "version": "4.1.2",

package.json

@@ -56,7 +56,7 @@
   "dependencies": {
     "d3": "4.13.0",
     "d3-scale-chromatic": "1.5.0",
-    "lodash": "4.17.15",
+    "lodash": "4.17.19",
     "moment": "2.24.0"
   }
 }

src/module.ts

@@ -144,7 +144,7 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
   };
 
   /** @ngInject */
-  constructor($scope: any, $injector: auto.IInjectorService, timeSrv, private annotationsSrv: AnnotationsSrv, $window, datasourceSrv, public variableSrv: any, templateSrv) {
+  constructor($scope: any, $injector: auto.IInjectorService, private annotationsSrv: AnnotationsSrv) {
     super($scope, $injector);
 
     if(!Polygrafill.hasAppEventCompatibleEmitter(this.events)){
@@ -197,8 +197,6 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
     this.annotations = [];
     this.annotationsSrv = annotationsSrv;
 
-    this.timeSrv = timeSrv;
-
     this.events.on(PanelEvents.render, this.onRender.bind(this));
     this.events.on(PanelEvents.dataReceived, this.onDataReceived.bind(this));
     this.events.on(PanelEvents.dataError, this.onDataError.bind(this));

src/partials/options_editor.html

@@ -81,9 +81,7 @@
           </div>
           <div class="gf-form">
             <label class="gf-form-label">
-              <a class="pointer" tabindex="1" ng-click="editor.onRemoveThreshold($index)">
+              <i class="fa fa-trash pointer" ng-click="editor.onRemoveThreshold($index)"></i>
-                <i class="fa fa-trash"/>
-              </a>
             </label>
           </div>
         </div>

src/plugin.json

@@ -24,8 +24,8 @@
       {"name": "Color mapping", "path": "img/color-mapping.png"},
       {"name": "Queries example", "path": "img/queries-example.png"}
     ],
-    "version": "0.3.0",
+    "version": "0.3.1",
-    "updated": "2020-07-14"
+    "updated": "2020-07-21"
   },
 
   "dependencies": {