From c057890e10954fc25807abed8cdef232267cb1ac Mon Sep 17 00:00:00 2001
From: takkaO_Work <secondpc.sc@gmail.com>
Date: Thu, 2 Jun 2022 14:54:17 +0900
Subject: [PATCH] [fix] unexpected error when select time range

---
 package.json         | 1 +
 src/canvas-metric.ts | 4 ++--
 src/module.ts        | 4 ++--
 yarn.lock            | 5 +++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 6b84abf..69c41af 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "@types/grafana": "github:CorpGlory/types-grafana.git",
     "@types/lodash": "^4.14.182",
     "dayjs": "^1.11.2",
+    "moment": "^2.22.1",
     "jquery": "^3.2.1",
     "lodash": "^4.17.10"
   },
diff --git a/src/canvas-metric.ts b/src/canvas-metric.ts
index 136c901..b730ec2 100644
--- a/src/canvas-metric.ts
+++ b/src/canvas-metric.ts
@@ -1,7 +1,7 @@
 import { MetricsPanelCtrl } from 'grafana/app/plugins/sdk';
 
 /* eslint-disable id-blacklist, no-restricted-imports, @typescript-eslint/ban-types */
-//import moment from 'moment';
+import moment from 'moment';
 import dayjs, { extend } from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import relativeTime from 'dayjs/plugin/relativeTime';
@@ -244,7 +244,7 @@ export class CanvasPanelCtrl extends MetricsPanelCtrl {
           } else {
             const min = Math.min(this.mouse.down.ts, up.ts);
             const max = Math.max(this.mouse.down.ts, up.ts);
-            const range = { from: dayjs.utc(min), to: dayjs.utc(max) };
+            const range = { from: moment.utc(min), to: moment.utc(max) };
             this.mouse.position = up;
             this.onMouseSelectedRange(range, evt);
           }
diff --git a/src/module.ts b/src/module.ts
index d467663..d9913b1 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -22,7 +22,7 @@ import kbn from 'grafana/app/core/utils/kbn';
 import appEvents from 'grafana/app/core/app_events';
 
 /* eslint-disable id-blacklist, no-restricted-imports, @typescript-eslint/ban-types */
-//import moment from 'moment';
+import moment from 'moment';
 import dayjs, { extend } from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import relativeTime from 'dayjs/plugin/relativeTime';
@@ -740,7 +740,7 @@ class DiscretePanelCtrl extends CanvasPanelCtrl {
 
     const pt = this.hoverPoint;
     if (pt && pt.start) {
-      const range = { from: dayjs.utc(pt.start), to: dayjs.utc(pt.start + pt.ms) };
+      const range = { from: moment.utc(pt.start), to: moment.utc(pt.start + pt.ms) };
       this.timeSrv.setTime(range);
       this.clear();
     }
diff --git a/yarn.lock b/yarn.lock
index 6833e27..16bbe6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8124,6 +8124,11 @@ moment@2.x:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
   integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
 
+moment@^2.22.1:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3"
+  integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
+
 monaco-editor@*:
   version "0.21.2"
   resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.21.2.tgz#37054e63e480d51a2dd17d609dcfb192304d5605"