From 926631da9616d18742cfa0b9822b6757078a084e Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 20 Jan 2021 12:20:46 +0300 Subject: [PATCH] Use secondsToHms() from grafana/data --- src/datasource-zabbix/utils.ts | 5 ++--- src/test-setup/jest-setup.js | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/datasource-zabbix/utils.ts b/src/datasource-zabbix/utils.ts index f1b9c24..0b58123 100644 --- a/src/datasource-zabbix/utils.ts +++ b/src/datasource-zabbix/utils.ts @@ -1,9 +1,8 @@ import _ from 'lodash'; import moment from 'moment'; -import kbn from 'grafana/app/core/utils/kbn'; import * as c from './constants'; import { VariableQuery, VariableQueryTypes } from './types'; -import { arrowTableToDataFrame, isTableData, MappingType, ValueMap, ValueMapping, getValueFormats, DataFrame, FieldType } from '@grafana/data'; +import { MappingType, ValueMapping, getValueFormats, DataFrame, FieldType, rangeUtil } from '@grafana/data'; /* * This regex matches 3 types of variable reference with an optional format specifier @@ -214,7 +213,7 @@ export function isTemplateVariable(str, templateVariables) { export function getRangeScopedVars(range) { const msRange = range.to.diff(range.from); const sRange = Math.round(msRange / 1000); - const regularRange = kbn.secondsToHms(msRange / 1000); + const regularRange = rangeUtil.secondsToHms(msRange / 1000); return { __range_ms: { text: msRange, value: msRange }, __range_s: { text: sRange, value: sRange }, diff --git a/src/test-setup/jest-setup.js b/src/test-setup/jest-setup.js index 689b961..d8ef607 100644 --- a/src/test-setup/jest-setup.js +++ b/src/test-setup/jest-setup.js @@ -68,13 +68,6 @@ jest.mock('grafana/app/core/utils/datemath', () => { }; }, {virtual: true}); -jest.mock('grafana/app/core/utils/kbn', () => { - return { - round_interval: n => n, - secondsToHms: n => n + 'ms' - }; -}, {virtual: true}); - jest.mock('grafana/app/core/table_model', () => { return class TableModel { constructor() {