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..d6667de 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,10 @@ 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) }; + console.log("Called"); + console.log(pt); + const range = { from: moment.utc(pt.start), to: moment.utc(pt.start + pt.ms) }; + console.log(range); this.timeSrv.setTime(range); this.clear(); }