diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 1ae257b6016..425f1bb4977 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -59,6 +59,7 @@ "@types/react-custom-scrollbars": "4.0.5", "@types/react-test-renderer": "16.8.1", "@types/react-transition-group": "2.0.16", + "@types/sinon": "^7.0.11", "@types/storybook__addon-actions": "3.4.2", "@types/storybook__addon-info": "4.1.1", "@types/storybook__addon-knobs": "4.0.4", @@ -77,6 +78,7 @@ "rollup-plugin-terser": "4.0.4", "rollup-plugin-typescript2": "0.19.3", "rollup-plugin-visualizer": "0.9.2", + "sinon": "1.17.6", "typescript": "3.4.1" }, "resolutions": { diff --git a/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx b/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx index 383e7b84c3f..54d9cce30fd 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx @@ -1,12 +1,12 @@ import React, { PureComponent } from 'react'; import moment from 'moment'; import { TimeRange, TimeOptions, TimeOption, SelectOptionItem } from '@grafana/ui'; -import { ButtonSelect } from '@grafana/ui/src/components/Select/ButtonSelect'; +import { ButtonSelect } from '../Select/ButtonSelect'; import { mapTimeOptionToTimeRange, mapTimeRangeToRangeString } from './time'; import { Props as TimePickerPopoverProps } from './TimePickerPopover'; import { TimePickerOptionGroup } from './TimePickerOptionGroup'; -import { PopperContent } from '@grafana/ui/src/components/Tooltip/PopperController'; -import { Timezone } from '../../../../../public/app/core/utils/datemath'; +import { PopperContent } from '../Tooltip/PopperController'; +import { Timezone } from '../../utils/datemath'; export interface Props { value: TimeRange; diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx index 8332ad74fee..a693271c2b8 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from 'react'; import Calendar from 'react-calendar/dist/entry.nostyle'; import moment, { Moment } from 'moment'; -import { TimeFragment } from '@grafana/ui'; -import { Timezone } from '../../../../../public/app/core/utils/datemath'; +import { TimeFragment } from '../../types/time'; +import { Timezone } from '../../utils/datemath'; import { stringToMoment } from './time'; diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerInput.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerInput.tsx index 9c57cd4d716..e4064f870e7 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePickerInput.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePickerInput.tsx @@ -1,8 +1,9 @@ import React, { PureComponent, ChangeEvent } from 'react'; import moment from 'moment'; -import { TimeFragment, TIME_FORMAT, Input } from '@grafana/ui'; +import { TimeFragment, TIME_FORMAT } from '../../types/time'; import { stringToMoment, isValidTimeString } from './time'; +import { Input } from '../Input/Input'; export interface Props { value: TimeFragment; diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx index 8966374d849..03676598089 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx @@ -1,11 +1,11 @@ import React, { Component, SyntheticEvent } from 'react'; -import { TimeRange, TimeOptions, TimeOption } from '@grafana/ui'; +import { TimeRange, TimeOptions, TimeOption } from '../../types/time'; import { Moment } from 'moment'; import { TimePickerCalendar } from './TimePickerCalendar'; import { TimePickerInput } from './TimePickerInput'; import { mapTimeOptionToTimeRange } from './time'; -import { Timezone } from '../../../../../public/app/core/utils/datemath'; +import { Timezone } from '../../utils/datemath'; export interface Props { value: TimeRange; diff --git a/packages/grafana-ui/src/components/TimePicker/time.ts b/packages/grafana-ui/src/components/TimePicker/time.ts index b9bf318ed06..77a554b38de 100644 --- a/packages/grafana-ui/src/components/TimePicker/time.ts +++ b/packages/grafana-ui/src/components/TimePicker/time.ts @@ -1,8 +1,8 @@ import moment, { Moment } from 'moment'; import { TimeOption, TimeRange, TIME_FORMAT } from '@grafana/ui'; -import * as dateMath from '../../../../../public/app/core/utils/datemath'; -import { describeTimeRange } from '../../../../../public/app/core/utils/rangeutil'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; +import { describeTimeRange } from '@grafana/ui/src/utils/rangeutil'; export const mapTimeOptionToTimeRange = ( timeOption: TimeOption, diff --git a/public/app/core/specs/datemath.test.ts b/packages/grafana-ui/src/utils/datemath.test.ts similarity index 74% rename from public/app/core/specs/datemath.test.ts rename to packages/grafana-ui/src/utils/datemath.test.ts index 4ab5e5bcca2..73407d55821 100644 --- a/public/app/core/specs/datemath.test.ts +++ b/packages/grafana-ui/src/utils/datemath.test.ts @@ -1,15 +1,15 @@ -import sinon from 'sinon'; +import sinon, { SinonFakeTimers } from 'sinon'; -import * as dateMath from 'app/core/utils/datemath'; -import moment from 'moment'; -import _ from 'lodash'; +import * as dateMath from './datemath'; +import moment, { Moment, unitOfTime } from 'moment'; +import each from 'lodash/each'; describe('DateMath', () => { - const spans = ['s', 'm', 'h', 'd', 'w', 'M', 'y']; + const spans: unitOfTime.Base[] = ['s', 'm', 'h', 'd', 'w', 'M', 'y']; const anchor = '2014-01-01T06:06:06.666Z'; const unix = moment(anchor).valueOf(); const format = 'YYYY-MM-DDTHH:mm:ss.SSSZ'; - let clock; + let clock: SinonFakeTimers; describe('errors', () => { it('should return undefined if passed empty string', () => { @@ -42,7 +42,7 @@ describe('DateMath', () => { expected.setSeconds(0); expected.setMilliseconds(0); - const startOfDay = dateMath.parse('now/d', false).valueOf(); + const startOfDay = dateMath.parse('now/d', false)!.valueOf(); expect(startOfDay).toBe(expected.getTime()); }); @@ -50,13 +50,13 @@ describe('DateMath', () => { const today = new Date(); const expected = new Date(Date.UTC(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate(), 0, 0, 0, 0)); - const startOfDay = dateMath.parse('now/d', false, 'utc').valueOf(); + const startOfDay = dateMath.parse('now/d', false, 'utc')!.valueOf(); expect(startOfDay).toBe(expected.getTime()); }); describe('subtraction', () => { - let now; - let anchored; + let now: Moment; + let anchored: Moment; beforeEach(() => { clock = sinon.useFakeTimers(unix); @@ -64,16 +64,16 @@ describe('DateMath', () => { anchored = moment(anchor); }); - _.each(spans, span => { + each(spans, span => { const nowEx = 'now-5' + span; const thenEx = anchor + '||-5' + span; it('should return 5' + span + ' ago', () => { - expect(dateMath.parse(nowEx).format(format)).toEqual(now.subtract(5, span).format(format)); + expect(dateMath.parse(nowEx)!.format(format)).toEqual(now.subtract(5, span).format(format)); }); it('should return 5' + span + ' before ' + anchor, () => { - expect(dateMath.parse(thenEx).format(format)).toEqual(anchored.subtract(5, span).format(format)); + expect(dateMath.parse(thenEx)!.format(format)).toEqual(anchored.subtract(5, span).format(format)); }); }); @@ -83,20 +83,20 @@ describe('DateMath', () => { }); describe('rounding', () => { - let now; + let now: Moment; beforeEach(() => { clock = sinon.useFakeTimers(unix); now = moment(); }); - _.each(spans, span => { + each(spans, span => { it('should round now to the beginning of the ' + span, () => { - expect(dateMath.parse('now/' + span).format(format)).toEqual(now.startOf(span).format(format)); + expect(dateMath.parse('now/' + span)!.format(format)).toEqual(now.startOf(span).format(format)); }); it('should round now to the end of the ' + span, () => { - expect(dateMath.parse('now/' + span, true).format(format)).toEqual(now.endOf(span).format(format)); + expect(dateMath.parse('now/' + span, true)!.format(format)).toEqual(now.endOf(span).format(format)); }); }); @@ -117,12 +117,12 @@ describe('DateMath', () => { describe('relative time to date parsing', () => { it('should handle negative time', () => { const date = dateMath.parseDateMath('-2d', moment([2014, 1, 5])); - expect(date.valueOf()).toEqual(moment([2014, 1, 3]).valueOf()); + expect(date!.valueOf()).toEqual(moment([2014, 1, 3]).valueOf()); }); it('should handle multiple math expressions', () => { const date = dateMath.parseDateMath('-2d-6h', moment([2014, 1, 5])); - expect(date.valueOf()).toEqual(moment([2014, 1, 2, 18]).valueOf()); + expect(date!.valueOf()).toEqual(moment([2014, 1, 2, 18]).valueOf()); }); it('should return false when invalid expression', () => { diff --git a/public/app/core/utils/datemath.ts b/packages/grafana-ui/src/utils/datemath.ts similarity index 93% rename from public/app/core/utils/datemath.ts rename to packages/grafana-ui/src/utils/datemath.ts index d385f642158..af9719a73a3 100644 --- a/public/app/core/utils/datemath.ts +++ b/packages/grafana-ui/src/utils/datemath.ts @@ -1,8 +1,8 @@ -// @ts-ignore -import _ from 'lodash'; -import moment from 'moment'; +import includes from 'lodash/includes'; +import isDate from 'lodash/isDate'; +import moment, { unitOfTime } from 'moment'; -const units = ['y', 'M', 'w', 'd', 'h', 'm', 's']; +const units: unitOfTime.Base[] = ['y', 'M', 'w', 'd', 'h', 'm', 's']; export type Timezone = 'utc'; @@ -26,7 +26,7 @@ export function parse( if (moment.isMoment(text)) { return text; } - if (_.isDate(text)) { + if (isDate(text)) { return moment(text); } // We got some non string which is not a moment nor Date. TS should be able to check for that but not always. @@ -134,7 +134,7 @@ export function parseDateMath(mathString: string, time: any, roundUp?: boolean): } unit = mathString.charAt(i++); - if (!_.includes(units, unit)) { + if (!includes(units, unit)) { return undefined; } else { if (type === 0) { diff --git a/packages/grafana-ui/src/utils/index.ts b/packages/grafana-ui/src/utils/index.ts index 15bd5aaf19f..d3b11d3e207 100644 --- a/packages/grafana-ui/src/utils/index.ts +++ b/packages/grafana-ui/src/utils/index.ts @@ -16,3 +16,6 @@ export * from './validate'; export { getFlotPairs } from './flotPairs'; export * from './object'; export * from './fieldCache'; + +// Names are too general to export +// rangeutils, datemath diff --git a/public/app/core/utils/rangeutil.ts b/packages/grafana-ui/src/utils/rangeutil.ts similarity index 100% rename from public/app/core/utils/rangeutil.ts rename to packages/grafana-ui/src/utils/rangeutil.ts diff --git a/public/app/core/directives/ng_model_on_blur.ts b/public/app/core/directives/ng_model_on_blur.ts index 45991f99b55..12be069af40 100644 --- a/public/app/core/directives/ng_model_on_blur.ts +++ b/public/app/core/directives/ng_model_on_blur.ts @@ -1,5 +1,5 @@ import coreModule from '../core_module'; -import * as rangeUtil from 'app/core/utils/rangeutil'; +import * as rangeUtil from '@grafana/ui/src/utils/rangeutil'; function ngModelOnBlur() { return { diff --git a/public/app/core/specs/rangeutil.test.ts b/public/app/core/specs/rangeutil.test.ts index 7c5a74b3ef0..0094b714cd9 100644 --- a/public/app/core/specs/rangeutil.test.ts +++ b/public/app/core/specs/rangeutil.test.ts @@ -1,4 +1,4 @@ -import * as rangeUtil from 'app/core/utils/rangeutil'; +import * as rangeUtil from '@grafana/ui/src/utils/rangeutil'; import _ from 'lodash'; import moment from 'moment'; diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts index 2994fac71be..5df42ad92d9 100644 --- a/public/app/core/utils/explore.ts +++ b/public/app/core/utils/explore.ts @@ -3,7 +3,7 @@ import _ from 'lodash'; import moment, { Moment } from 'moment'; // Services & Utils -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import { renderUrl } from 'app/core/utils/url'; import kbn from 'app/core/utils/kbn'; import store from 'app/core/store'; diff --git a/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts b/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts index 5b973bfcebf..a710bded593 100644 --- a/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts +++ b/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import angular from 'angular'; import moment from 'moment'; -import * as rangeUtil from 'app/core/utils/rangeutil'; +import * as rangeUtil from '@grafana/ui/src/utils/rangeutil'; export class TimePickerCtrl { static tooltipFormat = 'MMM D, YYYY HH:mm:ss'; diff --git a/public/app/features/dashboard/components/TimePicker/validation.ts b/public/app/features/dashboard/components/TimePicker/validation.ts index 7de39dfacb2..7bf229441ec 100644 --- a/public/app/features/dashboard/components/TimePicker/validation.ts +++ b/public/app/features/dashboard/components/TimePicker/validation.ts @@ -1,5 +1,5 @@ import moment from 'moment'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; export function inputDateDirective() { return { diff --git a/public/app/features/dashboard/panel_editor/QueryOptions.tsx b/public/app/features/dashboard/panel_editor/QueryOptions.tsx index 377582d7ce5..c1cb892317d 100644 --- a/public/app/features/dashboard/panel_editor/QueryOptions.tsx +++ b/public/app/features/dashboard/panel_editor/QueryOptions.tsx @@ -2,7 +2,7 @@ import React, { PureComponent, ChangeEvent, FocusEvent } from 'react'; // Utils -import { isValidTimeSpan } from 'app/core/utils/rangeutil'; +import { isValidTimeSpan } from '@grafana/ui/src/utils/rangeutil'; // Components import { DataSourceSelectItem, EventsWithValidation, Input, InputStatus, Switch, ValidationEvents } from '@grafana/ui'; diff --git a/public/app/features/dashboard/services/DashboardLoaderSrv.ts b/public/app/features/dashboard/services/DashboardLoaderSrv.ts index 572a92f07bc..7cde345ee99 100644 --- a/public/app/features/dashboard/services/DashboardLoaderSrv.ts +++ b/public/app/features/dashboard/services/DashboardLoaderSrv.ts @@ -3,7 +3,7 @@ import moment from 'moment'; import _ from 'lodash'; import $ from 'jquery'; import kbn from 'app/core/utils/kbn'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import impressionSrv from 'app/core/services/impression_srv'; export class DashboardLoaderSrv { diff --git a/public/app/features/dashboard/services/TimeSrv.ts b/public/app/features/dashboard/services/TimeSrv.ts index 5fa0c63c35e..d6f0e91940e 100644 --- a/public/app/features/dashboard/services/TimeSrv.ts +++ b/public/app/features/dashboard/services/TimeSrv.ts @@ -5,7 +5,7 @@ import _ from 'lodash'; // Utils import kbn from 'app/core/utils/kbn'; import coreModule from 'app/core/core_module'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; // Types import { TimeRange, RawTimeRange } from '@grafana/ui'; diff --git a/public/app/features/dashboard/state/PanelQueryState.ts b/public/app/features/dashboard/state/PanelQueryState.ts index 40bdc85d18f..8f355bcd16e 100644 --- a/public/app/features/dashboard/state/PanelQueryState.ts +++ b/public/app/features/dashboard/state/PanelQueryState.ts @@ -4,7 +4,7 @@ import isEqual from 'lodash/isEqual'; // Utils & Services import { getBackendSrv } from 'app/core/services/backend_srv'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import { guessFieldTypes, toSeriesData, isSeriesData } from '@grafana/ui/src/utils'; // Types diff --git a/public/app/features/dashboard/utils/panel.ts b/public/app/features/dashboard/utils/panel.ts index 57f4b81a0e0..9eca346f0ad 100644 --- a/public/app/features/dashboard/utils/panel.ts +++ b/public/app/features/dashboard/utils/panel.ts @@ -8,8 +8,8 @@ import { TimeRange } from '@grafana/ui'; // Utils import { isString as _isString } from 'lodash'; -import * as rangeUtil from 'app/core/utils/rangeutil'; -import * as dateMath from 'app/core/utils/datemath'; +import * as rangeUtil from '@grafana/ui/src/utils/rangeutil'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import appEvents from 'app/core/app_events'; // Services diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx index f67a08b31e7..6603ac0330d 100644 --- a/public/app/features/explore/Logs.tsx +++ b/public/app/features/explore/Logs.tsx @@ -1,7 +1,7 @@ import _ from 'lodash'; import React, { PureComponent } from 'react'; -import * as rangeUtil from 'app/core/utils/rangeutil'; +import * as rangeUtil from '@grafana/ui/src/utils/rangeutil'; import { RawTimeRange, Switch, LogLevel, TimeZone, TimeRange, AbsoluteTimeRange } from '@grafana/ui'; import TimeSeries from 'app/core/time_series2'; diff --git a/public/app/features/explore/TimePicker.test.tsx b/public/app/features/explore/TimePicker.test.tsx index 09b8287673c..49242675ab9 100644 --- a/public/app/features/explore/TimePicker.test.tsx +++ b/public/app/features/explore/TimePicker.test.tsx @@ -3,8 +3,8 @@ import { shallow } from 'enzyme'; import sinon from 'sinon'; import moment from 'moment'; -import * as dateMath from 'app/core/utils/datemath'; -import * as rangeUtil from 'app/core/utils/rangeutil'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as rangeUtil from '@grafana/ui/src/utils/rangeutil'; import TimePicker from './TimePicker'; import { RawTimeRange, TimeRange, TIME_FORMAT } from '@grafana/ui'; diff --git a/public/app/features/explore/TimePicker.tsx b/public/app/features/explore/TimePicker.tsx index b5b0ef09d64..0e039d9a177 100644 --- a/public/app/features/explore/TimePicker.tsx +++ b/public/app/features/explore/TimePicker.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import moment from 'moment'; -import * as rangeUtil from 'app/core/utils/rangeutil'; +import * as rangeUtil from '@grafana/ui/src/utils/rangeutil'; import { Input, RawTimeRange, TimeRange, TIME_FORMAT } from '@grafana/ui'; interface TimePickerProps { diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts index 3bef9c93621..c66803906f5 100644 --- a/public/app/features/plugins/plugin_loader.ts +++ b/public/app/features/plugins/plugin_loader.ts @@ -19,7 +19,7 @@ import TimeSeries from 'app/core/time_series2'; import TableModel from 'app/core/table_model'; import { coreModule, appEvents, contextSrv } from 'app/core/core'; import { DataSourcePlugin, AppPlugin, PanelPlugin, PluginMeta, DataSourcePluginMeta } from '@grafana/ui/src/types'; -import * as datemath from 'app/core/utils/datemath'; +import * as datemath from '@grafana/ui/src/utils/datemath'; import * as fileExport from 'app/core/utils/file_export'; import * as flatten from 'app/core/utils/flatten'; import * as ticks from 'app/core/utils/ticks'; @@ -105,7 +105,7 @@ exposeToPlugin('app/core/services/backend_srv', { }); exposeToPlugin('app/plugins/sdk', sdk); -exposeToPlugin('app/core/utils/datemath', datemath); +exposeToPlugin('@grafana/ui/src/utils/datemath', datemath); exposeToPlugin('app/core/utils/file_export', fileExport); exposeToPlugin('app/core/utils/flatten', flatten); exposeToPlugin('app/core/utils/kbn', kbn); diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts index abbdc8ca5d3..205d7cad07c 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.ts +++ b/public/app/plugins/datasource/cloudwatch/datasource.ts @@ -1,6 +1,6 @@ import angular from 'angular'; import _ from 'lodash'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import kbn from 'app/core/utils/kbn'; import { CloudWatchQuery } from './types'; import { DataSourceApi, DataQueryRequest } from '@grafana/ui/src/types'; diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts index 38bafb7dfe8..fb9fa41bf05 100644 --- a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts +++ b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts @@ -1,6 +1,6 @@ import '../datasource'; import CloudWatchDatasource from '../datasource'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { CustomVariable } from 'app/features/templating/all'; import _ from 'lodash'; diff --git a/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts index 9293bc787b2..01fa68959ca 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts @@ -1,5 +1,5 @@ import angular from 'angular'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import _ from 'lodash'; import moment from 'moment'; import { ElasticDatasource } from '../datasource'; diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts index 8a720cb3f35..ea41dc126e1 100644 --- a/public/app/plugins/datasource/graphite/datasource.ts +++ b/public/app/plugins/datasource/graphite/datasource.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import { isVersionGtOrEq, SemVersion } from 'app/core/utils/version'; import gfunc from './gfunc'; diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index 71ed01776e8..40ba26c0b59 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import InfluxSeries from './influx_series'; import InfluxQuery from './influx_query'; import ResponseParser from './response_parser'; diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index 8a30a714c21..48e085682e9 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; // Services & Utils -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import { addLabelToSelector } from 'app/plugins/datasource/prometheus/add_label_to_query'; import LanguageProvider from './language_provider'; import { logStreamToSeriesData } from './result_transformer'; diff --git a/public/app/plugins/datasource/opentsdb/datasource.ts b/public/app/plugins/datasource/opentsdb/datasource.ts index e6e81c1ebe9..680034f23af 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.ts +++ b/public/app/plugins/datasource/opentsdb/datasource.ts @@ -1,6 +1,6 @@ import angular from 'angular'; import _ from 'lodash'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; export default class OpenTsDatasource { type: any; diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts index 9ac535c089e..e445eec9668 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -4,7 +4,7 @@ import $ from 'jquery'; // Services & Utils import kbn from 'app/core/utils/kbn'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import PrometheusMetricFindQuery from './metric_find_query'; import { ResultTransformer } from './result_transformer'; import PrometheusLanguageProvider from './language_provider'; diff --git a/public/app/plugins/panel/alertlist/module.ts b/public/app/plugins/panel/alertlist/module.ts index ef7f72c6572..56cfe47ca6f 100644 --- a/public/app/plugins/panel/alertlist/module.ts +++ b/public/app/plugins/panel/alertlist/module.ts @@ -3,7 +3,7 @@ import moment from 'moment'; import alertDef from '../../../features/alerting/state/alertDef'; import { PanelCtrl } from 'app/plugins/sdk'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; class AlertListPanel extends PanelCtrl { static templateUrl = 'module.html'; diff --git a/public/test/specs/helpers.ts b/public/test/specs/helpers.ts index 8b38f95f03e..c7505a9aa8d 100644 --- a/public/test/specs/helpers.ts +++ b/public/test/specs/helpers.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import config from 'app/core/config'; -import * as dateMath from 'app/core/utils/datemath'; +import * as dateMath from '@grafana/ui/src/utils/datemath'; import { angularMocks, sinon } from '../lib/common'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; import { PanelPluginMeta, RawTimeRange } from '@grafana/ui';