project: Fix compatibility with Grafana v7.0.0

In Grafana v7.0.0-beta1 DashboardModel.isTimezoneUtc got removed and cannot be used anymore in plugins. Replace it with its implementation `this.getTimezone() === 'utc'`. See: grafana/grafana#23586
fetzerch · May 24, 2020 · 3ae2372 · 3ae2372
1 parent 0ce87c9
commit 3ae2372
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.6] - 2020-05-24
+
+### Fixed
+
+- Compatibility with Grafana 7.0.
+
 ## [0.1.5] - 2019-08-01
 
 ### Fixed
@@ -50,7 +56,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial version with sun and moon calculation and annotations.
 
-[Unreleased]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.5...HEAD
+[Unreleased]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.6...HEAD
+[0.1.6]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.5...v0.1.6
 [0.1.5]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.4...v0.1.5
 [0.1.4]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.2...v0.1.3

diff --git a/dist/CHANGELOG.md b/dist/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.6] - 2020-05-24
+
+### Fixed
+
+- Compatibility with Grafana 7.0.
+
 ## [0.1.5] - 2019-08-01
 
 ### Fixed
@@ -50,7 +56,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial version with sun and moon calculation and annotations.
 
-[Unreleased]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.5...HEAD
+[Unreleased]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.6...HEAD
+[0.1.6]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.5...v0.1.6
 [0.1.5]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.4...v0.1.5
 [0.1.4]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/fetzerch/grafana-sunandmoon-datasource/compare/v0.1.2...v0.1.3

diff --git a/dist/module.js b/dist/module.js
@@ -318,7 +318,7 @@ var SunAndMoonDatasource = /** @class */ (function () {
             var moonTimes = SunCalc.getMoonTimes(date.toDate(), this.position.latitude, this.position.longitude);
             var values = lodash_1.default.merge({}, sunTimes, lodash_1.default.mapKeys(moonTimes, function (value, key) { return "moon" + key; }));
             var setHours = Date.prototype.setHours;
-            if (options.dashboard !== undefined && options.dashboard.isTimezoneUtc()) {
+            if (options.dashboard !== undefined && options.dashboard.getTimezone() === "utc") {
                 setHours = Date.prototype.setUTCHours;
             }
             values.noon = setHours.call(date.toDate(), 12, 0, 0);

diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -30,8 +30,8 @@
     "screenshots": [
       {"name": "Sun and Moon Position", "path": "src/img/screenshot.png"}
     ],
-    "version": "0.1.5",
-    "updated": "2019-08-01"
+    "version": "0.1.6",
+    "updated": "2020-05-24"
   },
 
   "dependencies": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sunandmoon-datasource",
   "private": true,
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/plugin.json b/plugin.json
@@ -30,8 +30,8 @@
     "screenshots": [
       {"name": "Sun and Moon Position", "path": "src/img/screenshot.png"}
     ],
-    "version": "0.1.5",
-    "updated": "2019-08-01"
+    "version": "0.1.6",
+    "updated": "2020-05-24"
   },
 
   "dependencies": {

diff --git a/spec/datasource.jest.ts b/spec/datasource.jest.ts
@@ -54,7 +54,7 @@ describe("SunAndMoonDatasource", () => {
   it("annotationQuery should return all values", () => {
     const options = {
       annotation: {},
-        dashboard: { isTimezoneUtc: () => true },
+        dashboard: { getTimezone: () => "utc" },
       range: {
         from: moment("2019/03/26", "YYYY/MM/DD"),
         to: moment("2019/03/26", "YYYY/MM/DD")
@@ -68,7 +68,7 @@ describe("SunAndMoonDatasource", () => {
   it("annotationQuery should return specified values", () => {
     const options = {
       annotation: { query: "dusk, dawn"},
-        dashboard: { isTimezoneUtc: () => true },
+        dashboard: { getTimezone: () => "utc" },
       range: {
         from: moment("2019/03/26", "YYYY/MM/DD"),
         to: moment("2019/03/26", "YYYY/MM/DD")
@@ -82,7 +82,7 @@ describe("SunAndMoonDatasource", () => {
   it("annotationQuery should support local time", () => {
     const options = {
       annotation: {},
-        dashboard: { isTimezoneUtc: () => false },
+        dashboard: { getTimezone: () => "Europe/Berlin" },
       range: {
         from: moment("2019/03/26", "YYYY/MM/DD"),
         to: moment("2019/03/26", "YYYY/MM/DD")

diff --git a/src/datasource.ts b/src/datasource.ts
@@ -217,7 +217,7 @@ export class SunAndMoonDatasource {
       const values = _.merge({}, sunTimes,
           _.mapKeys(moonTimes, (value, key) => "moon" + key));
       let setHours = Date.prototype.setHours;
-      if (options.dashboard !== undefined && options.dashboard.isTimezoneUtc()) {
+      if (options.dashboard !== undefined && options.dashboard.getTimezone() === "utc") {
           setHours = Date.prototype.setUTCHours;
       }
       values.noon = setHours.call(date.toDate(), 12, 0, 0);