diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 0cfe41302bf..86f13dce934 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -23,6 +23,7 @@ "@types/papaparse": "4.5.9", "@types/pretty-format": "20.0.1", "@types/react": "16.8.16", + "@types/sinon": "^7.0.11", "awesome-typescript-loader": "^5.2.1", "lodash": "^4.17.10", "pretty-format": "^24.5.0", @@ -33,6 +34,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/types/data.ts b/packages/grafana-data/src/types/data.ts similarity index 100% rename from packages/grafana-ui/src/types/data.ts rename to packages/grafana-data/src/types/data.ts diff --git a/packages/grafana-data/src/types/index.ts b/packages/grafana-data/src/types/index.ts index c9c46d2f061..1fe90da0637 100644 --- a/packages/grafana-data/src/types/index.ts +++ b/packages/grafana-data/src/types/index.ts @@ -1 +1,5 @@ +export * from './data'; +export * from './logs'; export * from './navModel'; +export * from './time'; +export * from './utils'; diff --git a/packages/grafana-ui/src/types/logs.ts b/packages/grafana-data/src/types/logs.ts similarity index 100% rename from packages/grafana-ui/src/types/logs.ts rename to packages/grafana-data/src/types/logs.ts diff --git a/packages/grafana-ui/src/types/time.ts b/packages/grafana-data/src/types/time.ts similarity index 100% rename from packages/grafana-ui/src/types/time.ts rename to packages/grafana-data/src/types/time.ts diff --git a/packages/grafana-ui/src/types/utils.ts b/packages/grafana-data/src/types/utils.ts similarity index 100% rename from packages/grafana-ui/src/types/utils.ts rename to packages/grafana-data/src/types/utils.ts diff --git a/packages/grafana-ui/src/utils/__snapshots__/csv.test.ts.snap b/packages/grafana-data/src/utils/__snapshots__/csv.test.ts.snap similarity index 100% rename from packages/grafana-ui/src/utils/__snapshots__/csv.test.ts.snap rename to packages/grafana-data/src/utils/__snapshots__/csv.test.ts.snap diff --git a/packages/grafana-ui/src/utils/csv.test.ts b/packages/grafana-data/src/utils/csv.test.ts similarity index 100% rename from packages/grafana-ui/src/utils/csv.test.ts rename to packages/grafana-data/src/utils/csv.test.ts diff --git a/packages/grafana-ui/src/utils/csv.ts b/packages/grafana-data/src/utils/csv.ts similarity index 99% rename from packages/grafana-ui/src/utils/csv.ts rename to packages/grafana-data/src/utils/csv.ts index f1f4663d1c2..a5382a6a70a 100644 --- a/packages/grafana-ui/src/utils/csv.ts +++ b/packages/grafana-data/src/utils/csv.ts @@ -4,7 +4,7 @@ import defaults from 'lodash/defaults'; import isNumber from 'lodash/isNumber'; // Types -import { DataFrame, Field, FieldType } from '../types/index'; +import { DataFrame, Field, FieldType } from '../types'; import { guessFieldTypeFromValue } from './processDataFrame'; export enum CSVHeaderStyle { diff --git a/packages/grafana-ui/src/utils/datemath.test.ts b/packages/grafana-data/src/utils/datemath.test.ts similarity index 100% rename from packages/grafana-ui/src/utils/datemath.test.ts rename to packages/grafana-data/src/utils/datemath.test.ts diff --git a/packages/grafana-ui/src/utils/datemath.ts b/packages/grafana-data/src/utils/datemath.ts similarity index 99% rename from packages/grafana-ui/src/utils/datemath.ts rename to packages/grafana-data/src/utils/datemath.ts index bd14403070b..5b614606f7c 100644 --- a/packages/grafana-ui/src/utils/datemath.ts +++ b/packages/grafana-data/src/utils/datemath.ts @@ -1,6 +1,6 @@ import includes from 'lodash/includes'; import isDate from 'lodash/isDate'; -import { DateTime, dateTime, toUtc, ISO_8601, isDateTime, DurationUnit } from '../utils/moment_wrapper'; +import { DateTime, dateTime, toUtc, ISO_8601, isDateTime, DurationUnit } from './moment_wrapper'; import { TimeZone } from '../types'; const units: DurationUnit[] = ['y', 'M', 'w', 'd', 'h', 'm', 's']; diff --git a/packages/grafana-ui/src/utils/fieldCache.test.ts b/packages/grafana-data/src/utils/fieldCache.test.ts similarity index 100% rename from packages/grafana-ui/src/utils/fieldCache.test.ts rename to packages/grafana-data/src/utils/fieldCache.test.ts diff --git a/packages/grafana-ui/src/utils/fieldCache.ts b/packages/grafana-data/src/utils/fieldCache.ts similarity index 100% rename from packages/grafana-ui/src/utils/fieldCache.ts rename to packages/grafana-data/src/utils/fieldCache.ts diff --git a/packages/grafana-ui/src/utils/fieldReducer.test.ts b/packages/grafana-data/src/utils/fieldReducer.test.ts similarity index 96% rename from packages/grafana-ui/src/utils/fieldReducer.test.ts rename to packages/grafana-data/src/utils/fieldReducer.test.ts index bd07bffb64d..abd29307ddf 100644 --- a/packages/grafana-ui/src/utils/fieldReducer.test.ts +++ b/packages/grafana-data/src/utils/fieldReducer.test.ts @@ -1,4 +1,4 @@ -import { getFieldReducers, ReducerID, reduceField } from './fieldReducer'; +import { getFieldReducers, ReducerID, reduceField } from './index'; import _ from 'lodash'; diff --git a/packages/grafana-ui/src/utils/fieldReducer.ts b/packages/grafana-data/src/utils/fieldReducer.ts similarity index 100% rename from packages/grafana-ui/src/utils/fieldReducer.ts rename to packages/grafana-data/src/utils/fieldReducer.ts diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts index 0174d82b35b..9784c7ba7bb 100644 --- a/packages/grafana-data/src/utils/index.ts +++ b/packages/grafana-data/src/utils/index.ts @@ -1,2 +1,14 @@ export * from './string'; export * from './markdown'; +export * from './processDataFrame'; +export * from './csv'; +export * from './fieldReducer'; +export * from './logs'; +export * from './labels'; +export * from './labels'; +export * from './object'; +export * from './fieldCache'; +export * from './moment_wrapper'; + +// Names are too general to export +// rangeutils, datemath diff --git a/packages/grafana-ui/src/utils/labels.test.ts b/packages/grafana-data/src/utils/labels.test.ts similarity index 100% rename from packages/grafana-ui/src/utils/labels.test.ts rename to packages/grafana-data/src/utils/labels.test.ts diff --git a/packages/grafana-ui/src/utils/labels.ts b/packages/grafana-data/src/utils/labels.ts similarity index 100% rename from packages/grafana-ui/src/utils/labels.ts rename to packages/grafana-data/src/utils/labels.ts diff --git a/packages/grafana-ui/src/utils/logs.test.ts b/packages/grafana-data/src/utils/logs.test.ts similarity index 100% rename from packages/grafana-ui/src/utils/logs.test.ts rename to packages/grafana-data/src/utils/logs.test.ts diff --git a/packages/grafana-ui/src/utils/logs.ts b/packages/grafana-data/src/utils/logs.ts similarity index 100% rename from packages/grafana-ui/src/utils/logs.ts rename to packages/grafana-data/src/utils/logs.ts diff --git a/packages/grafana-ui/src/utils/moment_wrapper.ts b/packages/grafana-data/src/utils/moment_wrapper.ts similarity index 100% rename from packages/grafana-ui/src/utils/moment_wrapper.ts rename to packages/grafana-data/src/utils/moment_wrapper.ts diff --git a/packages/grafana-ui/src/utils/object.ts b/packages/grafana-data/src/utils/object.ts similarity index 100% rename from packages/grafana-ui/src/utils/object.ts rename to packages/grafana-data/src/utils/object.ts diff --git a/packages/grafana-ui/src/utils/processDataFrame.test.ts b/packages/grafana-data/src/utils/processDataFrame.test.ts similarity index 100% rename from packages/grafana-ui/src/utils/processDataFrame.test.ts rename to packages/grafana-data/src/utils/processDataFrame.test.ts diff --git a/packages/grafana-ui/src/utils/processDataFrame.ts b/packages/grafana-data/src/utils/processDataFrame.ts similarity index 100% rename from packages/grafana-ui/src/utils/processDataFrame.ts rename to packages/grafana-data/src/utils/processDataFrame.ts diff --git a/packages/grafana-ui/src/utils/rangeutil.ts b/packages/grafana-data/src/utils/rangeutil.ts similarity index 100% rename from packages/grafana-ui/src/utils/rangeutil.ts rename to packages/grafana-data/src/utils/rangeutil.ts diff --git a/packages/grafana-ui/src/utils/testdata/roundtrip.csv b/packages/grafana-data/src/utils/testdata/roundtrip.csv similarity index 100% rename from packages/grafana-ui/src/utils/testdata/roundtrip.csv rename to packages/grafana-data/src/utils/testdata/roundtrip.csv diff --git a/packages/grafana-ui/src/utils/testdata/simple.csv b/packages/grafana-data/src/utils/testdata/simple.csv similarity index 100% rename from packages/grafana-ui/src/utils/testdata/simple.csv rename to packages/grafana-data/src/utils/testdata/simple.csv diff --git a/packages/grafana-ui/src/utils/testdata/withHeaders.csv b/packages/grafana-data/src/utils/testdata/withHeaders.csv similarity index 100% rename from packages/grafana-ui/src/utils/testdata/withHeaders.csv rename to packages/grafana-data/src/utils/testdata/withHeaders.csv diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 0f4858b11df..53728cb7b8f 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -57,7 +57,6 @@ "@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", @@ -75,7 +74,6 @@ "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/BarGauge/BarGauge.tsx b/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx index cb08d1b15ab..b60c5f242cf 100644 --- a/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx +++ b/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx @@ -6,7 +6,8 @@ import tinycolor from 'tinycolor2'; import { getColorFromHexRgbOrName, getThresholdForValue } from '../../utils'; // Types -import { DisplayValue, Themeable, TimeSeriesValue, Threshold, VizOrientation } from '../../types'; +import { DisplayValue, Themeable, Threshold, VizOrientation } from '../../types'; +import { TimeSeriesValue } from '@grafana/data'; const MIN_VALUE_HEIGHT = 18; const MAX_VALUE_HEIGHT = 50; diff --git a/packages/grafana-ui/src/components/Graph/Graph.tsx b/packages/grafana-ui/src/components/Graph/Graph.tsx index 60068da4c3d..8c3bac26113 100644 --- a/packages/grafana-ui/src/components/Graph/Graph.tsx +++ b/packages/grafana-ui/src/components/Graph/Graph.tsx @@ -4,7 +4,8 @@ import React, { PureComponent } from 'react'; import uniqBy from 'lodash/uniqBy'; // Types -import { TimeRange, GraphSeriesXY } from '../../types'; +import { GraphSeriesXY } from '../../types'; +import { TimeRange } from '@grafana/data'; export interface GraphProps { series: GraphSeriesXY[]; diff --git a/packages/grafana-ui/src/components/Graph/mockGraphWithLegendData.ts b/packages/grafana-ui/src/components/Graph/mockGraphWithLegendData.ts index 54d3a354b27..28899d90510 100644 --- a/packages/grafana-ui/src/components/Graph/mockGraphWithLegendData.ts +++ b/packages/grafana-ui/src/components/Graph/mockGraphWithLegendData.ts @@ -1,6 +1,6 @@ import { GraphWithLegendProps } from './GraphWithLegend'; import { LegendDisplayMode } from '../Legend/Legend'; -import { dateTime } from '../../utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; // import { LegendList } from '../Legend/LegendList'; export const mockGraphWithLegendData = ({ diff --git a/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx b/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx index 570a8c2ad32..c487c1398e1 100644 --- a/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx +++ b/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx @@ -8,10 +8,8 @@ import { StatsPicker } from '../StatsPicker/StatsPicker'; // Types import { FieldDisplayOptions, DEFAULT_FIELD_DISPLAY_VALUES_LIMIT } from '../../utils/fieldDisplay'; -import { Field } from '../../types/data'; import Select, { SelectOptionItem } from '../Select/Select'; -import { toNumberString, toIntegerOrUndefined } from '@grafana/data'; -import { ReducerID } from '../../utils/fieldReducer'; +import { Field, ReducerID, toNumberString, toIntegerOrUndefined } from '@grafana/data'; const showOptions: Array> = [ { diff --git a/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx b/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx index 60ae3b46921..994d3fe803e 100644 --- a/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx +++ b/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx @@ -7,8 +7,7 @@ import { FormLabel } from '../FormLabel/FormLabel'; import { UnitPicker } from '../UnitPicker/UnitPicker'; // Types -import { Field } from '../../types/data'; -import { toIntegerOrUndefined } from '@grafana/data'; +import { toIntegerOrUndefined, Field } from '@grafana/data'; import { SelectOptionItem } from '../Select/Select'; import { VAR_SERIES_NAME, VAR_FIELD_NAME, VAR_CALC, VAR_CELL_PREFIX } from '../../utils/fieldDisplay'; diff --git a/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts b/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts index 6bcf3d712c2..047dd68ffcc 100644 --- a/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts +++ b/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts @@ -3,8 +3,7 @@ import omit from 'lodash/omit'; import { VizOrientation, PanelModel } from '../../types/panel'; import { FieldDisplayOptions } from '../../utils/fieldDisplay'; -import { Field } from '../../types'; -import { getFieldReducers } from '../../utils/index'; +import { Field, getFieldReducers } from '@grafana/data'; export interface SingleStatBaseOptions { fieldOptions: FieldDisplayOptions; diff --git a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx index 85ff49eadbe..e7625ab4bb9 100644 --- a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx +++ b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx @@ -5,7 +5,7 @@ import difference from 'lodash/difference'; import { Select } from '../index'; -import { getFieldReducers } from '../../utils/fieldReducer'; +import { getFieldReducers } from '@grafana/data'; import { SelectOptionItem } from '../Select/Select'; interface Props { diff --git a/packages/grafana-ui/src/components/Table/Table.story.tsx b/packages/grafana-ui/src/components/Table/Table.story.tsx index e2042fa8176..083c3d578e9 100644 --- a/packages/grafana-ui/src/components/Table/Table.story.tsx +++ b/packages/grafana-ui/src/components/Table/Table.story.tsx @@ -4,7 +4,8 @@ import { Table } from './Table'; import { getTheme } from '../../themes'; import { migratedTestTable, migratedTestStyles, simpleTable } from './examples'; -import { ScopedVars, DataFrame, GrafanaThemeType } from '../../types/index'; +import { ScopedVars, GrafanaThemeType } from '../../types/index'; +import { DataFrame } from '@grafana/data'; import { withFullSizeStory } from '../../utils/storybook/withFullSizeStory'; import { number, boolean } from '@storybook/addon-knobs'; diff --git a/packages/grafana-ui/src/components/Table/Table.test.tsx b/packages/grafana-ui/src/components/Table/Table.test.tsx index 43947c9455f..37e1acd93fc 100644 --- a/packages/grafana-ui/src/components/Table/Table.test.tsx +++ b/packages/grafana-ui/src/components/Table/Table.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { readCSV } from '../../utils/csv'; +import { readCSV } from '@grafana/data'; import { Table, Props } from './Table'; import { getTheme } from '../../themes/index'; import { GrafanaThemeType } from '../../types/theme'; diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx index 969fe6b69f9..dd8b258441d 100644 --- a/packages/grafana-ui/src/components/Table/Table.tsx +++ b/packages/grafana-ui/src/components/Table/Table.tsx @@ -12,7 +12,7 @@ import { } from 'react-virtualized'; import { Themeable } from '../../types/theme'; -import { sortDataFrame } from '../../utils/processDataFrame'; +import { stringToJsRegex, DataFrame, sortDataFrame } from '@grafana/data'; import { TableCellBuilder, @@ -21,8 +21,6 @@ import { TableCellBuilderOptions, simpleCellBuilder, } from './TableCellBuilder'; -import { stringToJsRegex } from '@grafana/data'; -import { DataFrame } from '../../types/data'; import { InterpolateFunction } from '../../types/panel'; export interface Props extends Themeable { diff --git a/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx b/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx index 1fff51127f5..ec3e324a400 100644 --- a/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx +++ b/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx @@ -6,8 +6,7 @@ import { Table, Props } from './Table'; import { ValueFormatter, getValueFormat, getColorFromHexRgbOrName } from '../../utils/index'; import { GrafanaTheme } from '../../types/theme'; import { InterpolateFunction } from '../../types/panel'; -import { Field } from '../../types/data'; -import { dateTime } from '../../utils/moment_wrapper'; +import { Field, dateTime } from '@grafana/data'; export interface TableCellBuilderOptions { value: any; diff --git a/packages/grafana-ui/src/components/Table/TableInputCSV.story.tsx b/packages/grafana-ui/src/components/Table/TableInputCSV.story.tsx index df1b99cacef..73d7dd3951e 100644 --- a/packages/grafana-ui/src/components/Table/TableInputCSV.story.tsx +++ b/packages/grafana-ui/src/components/Table/TableInputCSV.story.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; import TableInputCSV from './TableInputCSV'; import { action } from '@storybook/addon-actions'; -import { DataFrame } from '../../types/data'; +import { DataFrame } from '@grafana/data'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; const TableInputStories = storiesOf('UI/Table/Input', module); diff --git a/packages/grafana-ui/src/components/Table/TableInputCSV.test.tsx b/packages/grafana-ui/src/components/Table/TableInputCSV.test.tsx index 29ba77d3a49..4e08b103027 100644 --- a/packages/grafana-ui/src/components/Table/TableInputCSV.test.tsx +++ b/packages/grafana-ui/src/components/Table/TableInputCSV.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import renderer from 'react-test-renderer'; import TableInputCSV from './TableInputCSV'; -import { DataFrame } from '../../types/data'; +import { DataFrame } from '@grafana/data'; describe('TableInputCSV', () => { it('renders correctly', () => { diff --git a/packages/grafana-ui/src/components/Table/TableInputCSV.tsx b/packages/grafana-ui/src/components/Table/TableInputCSV.tsx index 6e3644c8840..a7d5afdc621 100644 --- a/packages/grafana-ui/src/components/Table/TableInputCSV.tsx +++ b/packages/grafana-ui/src/components/Table/TableInputCSV.tsx @@ -1,7 +1,6 @@ import React from 'react'; import debounce from 'lodash/debounce'; -import { DataFrame } from '../../types/data'; -import { CSVConfig, readCSV } from '../../utils/csv'; +import { DataFrame, CSVConfig, readCSV } from '@grafana/data'; interface Props { config?: CSVConfig; diff --git a/packages/grafana-ui/src/components/Table/examples.ts b/packages/grafana-ui/src/components/Table/examples.ts index 3edba42732d..3c09f5795f1 100644 --- a/packages/grafana-ui/src/components/Table/examples.ts +++ b/packages/grafana-ui/src/components/Table/examples.ts @@ -1,4 +1,4 @@ -import { DataFrame } from '../../types/data'; +import { DataFrame } from '@grafana/data'; import { ColumnStyle } from './TableCellBuilder'; import { getColorDefinitionByName } from '../../utils/namedColorsPalette'; diff --git a/packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx b/packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx index b37e9386e69..4c2123b9c4d 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePicker.story.tsx @@ -5,8 +5,7 @@ import { action } from '@storybook/addon-actions'; import { TimePicker } from './TimePicker'; import { UseState } from '../../utils/storybook/UseState'; import { withRighAlignedStory } from '../../utils/storybook/withRightAlignedStory'; -import { TimeFragment } from '../../types/time'; -import { dateTime } from '../../utils/moment_wrapper'; +import { TimeFragment, dateTime } from '@grafana/data'; const TimePickerStories = storiesOf('UI/TimePicker', module); diff --git a/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx b/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx index 9195e2c824f..3411c15e3d2 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx @@ -8,12 +8,12 @@ import { TimePickerPopover } from './TimePickerPopover'; import { ClickOutsideWrapper } from '../ClickOutsideWrapper/ClickOutsideWrapper'; // Utils & Services -import { isDateTime } from '../../utils/moment_wrapper'; -import * as rangeUtil from '../../utils/rangeutil'; +import { isDateTime } from '@grafana/data'; +import * as rangeUtil from '@grafana/data/src/utils/rangeutil'; import { rawToTimeRange } from './time'; // Types -import { TimeRange, TimeOption, TimeZone, TIME_FORMAT } from '../../types/time'; +import { TimeRange, TimeOption, TimeZone, TIME_FORMAT } from '@grafana/data'; import { SelectOptionItem } from '../Select/Select'; export interface Props { diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.story.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.story.tsx index a6ccb3baf3f..45221b0e3f8 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.story.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.story.tsx @@ -5,7 +5,7 @@ import { action } from '@storybook/addon-actions'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { TimePickerCalendar } from './TimePickerCalendar'; import { UseState } from '../../utils/storybook/UseState'; -import { TimeFragment } from '../../types/time'; +import { TimeFragment } from '@grafana/data'; const TimePickerCalendarStories = storiesOf('UI/TimePicker/TimePickerCalendar', module); diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx index d5e333c56dc..04084bee796 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import Calendar from 'react-calendar/dist/entry.nostyle'; -import { TimeFragment, TimeZone, TIME_FORMAT } from '../../types/time'; -import { DateTime, dateTime, toUtc } from '../../utils/moment_wrapper'; +import { TimeFragment, TimeZone, TIME_FORMAT } from '@grafana/data'; +import { DateTime, dateTime, toUtc } from '@grafana/data'; import { stringToDateTimeType } from './time'; export interface Props { diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerInput.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerInput.tsx index a291aa5fa73..03f988c6649 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePickerInput.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePickerInput.tsx @@ -1,8 +1,7 @@ import React, { PureComponent, ChangeEvent } from 'react'; -import { TimeFragment, TIME_FORMAT, TimeZone } from '../../types/time'; +import { TimeFragment, TIME_FORMAT, TimeZone, isDateTime } from '@grafana/data'; import { Input } from '../Input/Input'; import { stringToDateTimeType, isValidTimeString } from './time'; -import { isDateTime } from '../../utils/moment_wrapper'; export interface Props { value: TimeFragment; diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.story.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.story.tsx index e7a397cee84..02d00a903dd 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.story.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.story.tsx @@ -5,7 +5,7 @@ import { storiesOf } from '@storybook/react'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { TimePickerPopover } from './TimePickerPopover'; import { UseState } from '../../utils/storybook/UseState'; -import { dateTime, DateTime } from '../../utils/moment_wrapper'; +import { dateTime, DateTime } from '@grafana/data'; const TimePickerPopoverStories = storiesOf('UI/TimePicker/TimePickerPopover', module); diff --git a/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx b/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx index 2d94d4feab4..23f3c580e91 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePickerPopover.tsx @@ -7,8 +7,7 @@ import { TimePickerInput } from './TimePickerInput'; import { rawToTimeRange } from './time'; // Types -import { DateTime } from '../../utils/moment_wrapper'; -import { TimeRange, TimeZone } from '../../types/time'; +import { DateTime, TimeRange, TimeZone } from '@grafana/data'; 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 c794bf406dc..3163d44f2ef 100644 --- a/packages/grafana-ui/src/components/TimePicker/time.ts +++ b/packages/grafana-ui/src/components/TimePicker/time.ts @@ -1,7 +1,7 @@ -import { TimeRange, TIME_FORMAT, RawTimeRange, TimeZone } from '../../types/time'; -import { describeTimeRange } from '../../utils/rangeutil'; -import * as dateMath from '../../utils/datemath'; -import { isDateTime, dateTime, DateTime, toUtc } from '../../utils/moment_wrapper'; +import { TimeRange, TIME_FORMAT, RawTimeRange, TimeZone } from '@grafana/data'; +import { describeTimeRange } from '@grafana/data/src/utils/rangeutil'; +import * as dateMath from '@grafana/data/src/utils/datemath'; +import { isDateTime, dateTime, DateTime, toUtc } from '@grafana/data'; export const rawToTimeRange = (raw: RawTimeRange, timeZone?: TimeZone): TimeRange => { const from = stringToDateTimeType(raw.from, false, timeZone); diff --git a/packages/grafana-ui/src/types/datasource.ts b/packages/grafana-ui/src/types/datasource.ts index 976b5e06a9a..40ecb63d377 100644 --- a/packages/grafana-ui/src/types/datasource.ts +++ b/packages/grafana-ui/src/types/datasource.ts @@ -1,9 +1,7 @@ import { ComponentType, ComponentClass } from 'react'; -import { TimeRange, RawTimeRange } from './time'; +import { TimeRange, RawTimeRange, TableData, TimeSeries, DataFrame, LogRowModel, LoadingState } from '@grafana/data'; import { PluginMeta, GrafanaPlugin } from './plugin'; -import { TableData, TimeSeries, DataFrame, LoadingState } from './data'; import { PanelData } from './panel'; -import { LogRowModel } from './logs'; // NOTE: this seems more general than just DataSource export interface DataSourcePluginOptionsEditorProps { diff --git a/packages/grafana-ui/src/types/index.ts b/packages/grafana-ui/src/types/index.ts index b391561df7f..b4789653ddb 100644 --- a/packages/grafana-ui/src/types/index.ts +++ b/packages/grafana-ui/src/types/index.ts @@ -1,5 +1,3 @@ -export * from './data'; -export * from './time'; export * from './panel'; export * from './plugin'; export * from './app'; @@ -8,6 +6,4 @@ export * from './theme'; export * from './graph'; export * from './threshold'; export * from './input'; -export * from './logs'; export * from './displayValue'; -export * from './utils'; diff --git a/packages/grafana-ui/src/types/panel.ts b/packages/grafana-ui/src/types/panel.ts index 5b62c349242..1c883925b01 100644 --- a/packages/grafana-ui/src/types/panel.ts +++ b/packages/grafana-ui/src/types/panel.ts @@ -1,6 +1,5 @@ import { ComponentClass, ComponentType } from 'react'; -import { LoadingState, DataFrame } from './data'; -import { TimeRange } from './time'; +import { LoadingState, DataFrame, TimeRange } from '@grafana/data'; import { ScopedVars, DataQueryRequest, DataQueryError, LegacyResponseData } from './datasource'; import { PluginMeta, GrafanaPlugin } from './plugin'; diff --git a/packages/grafana-ui/src/utils/displayValue.ts b/packages/grafana-ui/src/utils/displayValue.ts index 6565985f445..46dbf32f1d0 100644 --- a/packages/grafana-ui/src/utils/displayValue.ts +++ b/packages/grafana-ui/src/utils/displayValue.ts @@ -15,9 +15,8 @@ import { GrafanaTheme, GrafanaThemeType, DecimalCount, - Field, } from '../types'; -import { DateTime, dateTime } from './moment_wrapper'; +import { DateTime, dateTime, Field } from '@grafana/data'; export type DisplayProcessor = (value: any) => DisplayValue; diff --git a/packages/grafana-ui/src/utils/fieldDisplay.test.ts b/packages/grafana-ui/src/utils/fieldDisplay.test.ts index d676c29af00..458a97be2ad 100644 --- a/packages/grafana-ui/src/utils/fieldDisplay.test.ts +++ b/packages/grafana-ui/src/utils/fieldDisplay.test.ts @@ -1,6 +1,5 @@ import { getFieldProperties, getFieldDisplayValues, GetFieldDisplayValuesOptions } from './fieldDisplay'; -import { FieldType } from '../types/data'; -import { ReducerID } from './fieldReducer'; +import { FieldType, ReducerID } from '@grafana/data'; import { GrafanaThemeType } from '../types/theme'; import { getTheme } from '../themes/index'; diff --git a/packages/grafana-ui/src/utils/fieldDisplay.ts b/packages/grafana-ui/src/utils/fieldDisplay.ts index 4948df3240b..11677498449 100644 --- a/packages/grafana-ui/src/utils/fieldDisplay.ts +++ b/packages/grafana-ui/src/utils/fieldDisplay.ts @@ -5,18 +5,14 @@ import { ValueMapping, Threshold, DisplayValue, - FieldType, - NullValueMode, GrafanaTheme, - DataFrame, InterpolateFunction, - Field, ScopedVars, GraphSeriesValue, } from '../types/index'; import { getDisplayProcessor } from './displayValue'; import { getFlotPairs } from './flotPairs'; -import { ReducerID, reduceField } from './fieldReducer'; +import { ReducerID, reduceField, FieldType, NullValueMode, DataFrame, Field } from '@grafana/data'; export interface FieldDisplayOptions { values?: boolean; // If true show each row value diff --git a/packages/grafana-ui/src/utils/flotPairs.ts b/packages/grafana-ui/src/utils/flotPairs.ts index 72792a94fd4..0f3635b2834 100644 --- a/packages/grafana-ui/src/utils/flotPairs.ts +++ b/packages/grafana-ui/src/utils/flotPairs.ts @@ -1,5 +1,6 @@ // Types -import { NullValueMode, GraphSeriesValue, DataFrame } from '../types/index'; +import { GraphSeriesValue } from '../types/index'; +import { NullValueMode, DataFrame } from '@grafana/data'; export interface FlotPairsOptions { series: DataFrame; diff --git a/packages/grafana-ui/src/utils/index.ts b/packages/grafana-ui/src/utils/index.ts index 13542b1985e..59c8d44cd1f 100644 --- a/packages/grafana-ui/src/utils/index.ts +++ b/packages/grafana-ui/src/utils/index.ts @@ -1,23 +1,11 @@ -export * from './processDataFrame'; export * from './valueFormats/valueFormats'; export * from './colors'; export * from './namedColorsPalette'; export * from './thresholds'; -export * from './csv'; -export * from './fieldReducer'; export * from './displayValue'; export * from './fieldDisplay'; export * from './deprecationWarning'; -export * from './logs'; -export * from './labels'; -export * from './labels'; export { getMappedValue } from './valueMappings'; export * from './validate'; export { getFlotPairs } from './flotPairs'; -export * from './object'; -export * from './fieldCache'; -export * from './moment_wrapper'; export * from './slate'; - -// Names are too general to export -// rangeutils, datemath diff --git a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts index f800d2b75fd..2fa851867f5 100644 --- a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts +++ b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts @@ -8,7 +8,7 @@ import { toDurationInMilliseconds, toDurationInSeconds, } from './dateTimeFormatters'; -import { toUtc, dateTime } from '../moment_wrapper'; +import { toUtc, dateTime } from '@grafana/data'; describe('date time formats', () => { const epoch = 1505634997920; diff --git a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts index 2c2ab346816..c00d5aaa6d9 100644 --- a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts +++ b/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts @@ -1,6 +1,6 @@ import { toFixed, toFixedScaled } from './valueFormats'; import { DecimalCount } from '../../types'; -import { toUtc, toDuration as duration, dateTime } from '../moment_wrapper'; +import { toUtc, toDuration as duration, dateTime } from '@grafana/data'; interface IntervalsInSeconds { [interval: string]: number; diff --git a/public/app/app.ts b/public/app/app.ts index 9bc44616f2e..56f300af756 100644 --- a/public/app/app.ts +++ b/public/app/app.ts @@ -34,7 +34,7 @@ import { setupAngularRoutes } from 'app/routes/routes'; import 'app/routes/GrafanaCtrl'; import 'app/features/all'; -import { setLocale } from '@grafana/ui/src/utils/moment_wrapper'; +import { setLocale } from '@grafana/data'; import { setMarkdownOptions } from '@grafana/data'; // import symlinked extensions diff --git a/public/app/core/components/Select/DataSourcePicker.tsx b/public/app/core/components/Select/DataSourcePicker.tsx index d853392ae9c..25718b74293 100644 --- a/public/app/core/components/Select/DataSourcePicker.tsx +++ b/public/app/core/components/Select/DataSourcePicker.tsx @@ -5,7 +5,7 @@ import React, { PureComponent } from 'react'; import { Select, SelectOptionItem } from '@grafana/ui'; // Types -import { DataSourceSelectItem } from '@grafana/ui/src/types'; +import { DataSourceSelectItem } from '@grafana/ui'; export interface Props { onChange: (ds: DataSourceSelectItem) => void; diff --git a/public/app/core/directives/ng_model_on_blur.ts b/public/app/core/directives/ng_model_on_blur.ts index 12be069af40..1032c4cab8f 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 '@grafana/ui/src/utils/rangeutil'; +import * as rangeUtil from '@grafana/data/src/utils/rangeutil'; function ngModelOnBlur() { return { diff --git a/public/app/core/filters/filters.ts b/public/app/core/filters/filters.ts index 1176395d09a..4627c4c1d39 100644 --- a/public/app/core/filters/filters.ts +++ b/public/app/core/filters/filters.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import angular from 'angular'; import coreModule from '../core_module'; import { TemplateSrv } from 'app/features/templating/template_srv'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; coreModule.filter('stringSort', () => { return (input: any) => { diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts index 97fe3f7ccc2..8328ea75327 100644 --- a/public/app/core/logs_model.ts +++ b/public/app/core/logs_model.ts @@ -1,8 +1,9 @@ import _ from 'lodash'; import ansicolor from 'vendor/ansicolor/ansicolor'; +import { colors } from '@grafana/ui'; + import { - colors, TimeSeries, Labels, LogLevel, @@ -21,10 +22,10 @@ import { LogsParser, LogLabelStatsModel, LogsDedupStrategy, -} from '@grafana/ui'; +} from '@grafana/data'; import { getThemeColor } from 'app/core/utils/colors'; import { hasAnsiCodes } from 'app/core/utils/text'; -import { dateTime, toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime, toUtc } from '@grafana/data'; export const LogLevelColor = { [LogLevel.critical]: colors[7], diff --git a/public/app/core/specs/logs_model.test.ts b/public/app/core/specs/logs_model.test.ts index bccbe9ed34a..2cceaf66c66 100644 --- a/public/app/core/specs/logs_model.test.ts +++ b/public/app/core/specs/logs_model.test.ts @@ -1,4 +1,4 @@ -import { DataFrame, FieldType, LogsModel, LogsMetaKind, LogsDedupStrategy, LogLevel } from '@grafana/ui'; +import { DataFrame, FieldType, LogsModel, LogsMetaKind, LogsDedupStrategy, LogLevel } from '@grafana/data'; import { dedupLogRows, calculateFieldStats, diff --git a/public/app/core/specs/rangeutil.test.ts b/public/app/core/specs/rangeutil.test.ts index 3ecdb8b6c71..1b69d95d885 100644 --- a/public/app/core/specs/rangeutil.test.ts +++ b/public/app/core/specs/rangeutil.test.ts @@ -1,6 +1,6 @@ -import * as rangeUtil from '@grafana/ui/src/utils/rangeutil'; +import * as rangeUtil from '@grafana/data/src/utils/rangeutil'; import _ from 'lodash'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; describe('rangeUtil', () => { describe('Can get range grouped list of ranges', () => { diff --git a/public/app/core/table_model.ts b/public/app/core/table_model.ts index d193e7fcbe7..71301cf4405 100644 --- a/public/app/core/table_model.ts +++ b/public/app/core/table_model.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { Column, TableData } from '@grafana/ui'; +import { Column, TableData } from '@grafana/data'; /** * Extends the standard Column class with variables that get diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts index a2e2e1a2eb8..bb93b2a8815 100644 --- a/public/app/core/utils/explore.test.ts +++ b/public/app/core/utils/explore.test.ts @@ -12,7 +12,8 @@ import { } from './explore'; import { ExploreUrlState, ExploreMode } from 'app/types/explore'; import store from 'app/core/store'; -import { DataQueryError, LogsDedupStrategy } from '@grafana/ui'; +import { LogsDedupStrategy } from '@grafana/data'; +import { DataQueryError } from '@grafana/ui'; const DEFAULT_EXPLORE_STATE: ExploreUrlState = { datasource: null, diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts index 31760ab75f4..3ddfa89765d 100644 --- a/public/app/core/utils/explore.ts +++ b/public/app/core/utils/explore.ts @@ -1,11 +1,10 @@ // Libraries import _ from 'lodash'; import { from } from 'rxjs'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; import { isLive } from '@grafana/ui/src/components/RefreshPicker/RefreshPicker'; // Services & Utils -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import { renderUrl } from 'app/core/utils/url'; import kbn from 'app/core/utils/kbn'; import store from 'app/core/store'; @@ -13,21 +12,24 @@ import { getNextRefIdChar } from './query'; // Types import { - TimeRange, - RawTimeRange, - TimeZone, - IntervalValues, DataQuery, DataSourceApi, - TimeFragment, DataQueryError, - LogRowModel, - LogsModel, - LogsDedupStrategy, DataSourceJsonData, DataQueryRequest, DataStreamObserver, } from '@grafana/ui'; +import { + toUtc, + TimeRange, + RawTimeRange, + TimeZone, + IntervalValues, + TimeFragment, + LogRowModel, + LogsModel, + LogsDedupStrategy, +} from '@grafana/data'; import { ExploreUrlState, HistoryItem, diff --git a/public/app/core/utils/file_export.ts b/public/app/core/utils/file_export.ts index ae8d0ad06de..212c619e7ea 100644 --- a/public/app/core/utils/file_export.ts +++ b/public/app/core/utils/file_export.ts @@ -1,7 +1,7 @@ import { isBoolean, isNumber, sortedUniq, sortedIndexOf, unescape as htmlUnescaped } from 'lodash'; import { saveAs } from 'file-saver'; import { isNullOrUndefined } from 'util'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; const DEFAULT_DATETIME_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ'; const POINT_TIME_INDEX = 1; diff --git a/public/app/core/utils/timePicker.test.ts b/public/app/core/utils/timePicker.test.ts index b9c54a92d8a..aeca99657ec 100644 --- a/public/app/core/utils/timePicker.test.ts +++ b/public/app/core/utils/timePicker.test.ts @@ -1,4 +1,4 @@ -import { toUtc, AbsoluteTimeRange } from '@grafana/ui'; +import { toUtc, AbsoluteTimeRange } from '@grafana/data'; import { getShiftedTimeRange, getZoomedTimeRange } from './timePicker'; diff --git a/public/app/core/utils/timePicker.ts b/public/app/core/utils/timePicker.ts index 974588857a5..7b6c01c59c7 100644 --- a/public/app/core/utils/timePicker.ts +++ b/public/app/core/utils/timePicker.ts @@ -1,4 +1,4 @@ -import { TimeRange, toUtc, AbsoluteTimeRange } from '@grafana/ui'; +import { TimeRange, toUtc, AbsoluteTimeRange } from '@grafana/data'; export const getShiftedTimeRange = (direction: number, origRange: TimeRange): AbsoluteTimeRange => { const range = { diff --git a/public/app/features/admin/AdminEditUserCtrl.ts b/public/app/features/admin/AdminEditUserCtrl.ts index 70a6b6d4fe8..8eba14fbcdc 100644 --- a/public/app/features/admin/AdminEditUserCtrl.ts +++ b/public/app/features/admin/AdminEditUserCtrl.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { dateTime } from '@grafana/ui'; +import { dateTime } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { NavModelSrv } from 'app/core/core'; import { User } from 'app/core/services/context_srv'; diff --git a/public/app/features/alerting/TestRuleResult.tsx b/public/app/features/alerting/TestRuleResult.tsx index 2f914cdd365..a85ffb2a332 100644 --- a/public/app/features/alerting/TestRuleResult.tsx +++ b/public/app/features/alerting/TestRuleResult.tsx @@ -4,7 +4,7 @@ import appEvents from 'app/core/app_events'; import { CopyToClipboard } from 'app/core/components/CopyToClipboard/CopyToClipboard'; import { getBackendSrv } from '@grafana/runtime'; import { DashboardModel } from '../dashboard/state/DashboardModel'; -import { LoadingPlaceholder } from '@grafana/ui/src'; +import { LoadingPlaceholder } from '@grafana/ui'; export interface Props { panelId: number; diff --git a/public/app/features/alerting/state/reducers.ts b/public/app/features/alerting/state/reducers.ts index a47638752ac..e68638a1aed 100644 --- a/public/app/features/alerting/state/reducers.ts +++ b/public/app/features/alerting/state/reducers.ts @@ -1,7 +1,7 @@ import { AlertRuleDTO, AlertRule, AlertRulesState } from 'app/types'; import { Action, ActionTypes } from './actions'; import alertDef from './alertDef'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; export const initialState: AlertRulesState = { items: [], searchQuery: '', isLoading: false }; diff --git a/public/app/features/annotations/event_editor.ts b/public/app/features/annotations/event_editor.ts index 3cec5f13d7a..d450640d4b2 100644 --- a/public/app/features/annotations/event_editor.ts +++ b/public/app/features/annotations/event_editor.ts @@ -1,8 +1,8 @@ import _ from 'lodash'; import { coreModule } from 'app/core/core'; import { MetricsPanelCtrl } from 'app/plugins/sdk'; -import { AnnotationEvent } from '@grafana/ui'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { AnnotationEvent } from '@grafana/data'; +import { dateTime } from '@grafana/data'; export class EventEditorCtrl { panelCtrl: MetricsPanelCtrl; diff --git a/public/app/features/annotations/event_manager.ts b/public/app/features/annotations/event_manager.ts index fbd7897ba92..ebd2934c16a 100644 --- a/public/app/features/annotations/event_manager.ts +++ b/public/app/features/annotations/event_manager.ts @@ -10,7 +10,7 @@ import { } from '@grafana/ui'; import { MetricsPanelCtrl } from 'app/plugins/sdk'; -import { AnnotationEvent } from '@grafana/ui'; +import { AnnotationEvent } from '@grafana/data'; export class EventManager { event: AnnotationEvent; diff --git a/public/app/features/api-keys/ApiKeysPage.tsx b/public/app/features/api-keys/ApiKeysPage.tsx index cb932334ec8..e761deefd54 100644 --- a/public/app/features/api-keys/ApiKeysPage.tsx +++ b/public/app/features/api-keys/ApiKeysPage.tsx @@ -19,7 +19,7 @@ import { store } from 'app/store/store'; import kbn from 'app/core/utils/kbn'; // Utils -import { dateTime, isDateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime, isDateTime } from '@grafana/data'; import { getTimeZone } from 'app/features/profile/state/selectors'; const timeRangeValidationEvents: ValidationEvents = { diff --git a/public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx b/public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx index 6e24e6db246..a872f1ba432 100644 --- a/public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx +++ b/public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx @@ -1,17 +1,17 @@ // Libaries import React, { Component } from 'react'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; // Types import { DashboardModel } from '../../state'; import { LocationState } from 'app/types'; -import { TimeRange, TimeOption } from '@grafana/ui'; +import { TimeRange, TimeOption, RawTimeRange } from '@grafana/data'; // State import { updateLocation } from 'app/core/actions'; // Components -import { TimePicker, RefreshPicker, RawTimeRange } from '@grafana/ui'; +import { TimePicker, RefreshPicker } from '@grafana/ui'; // Utils & Services import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts b/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts index 0874e8e55b5..8eb7b325c58 100644 --- a/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts +++ b/public/app/features/dashboard/components/ShareModal/ShareModalCtrl.ts @@ -1,6 +1,6 @@ import angular from 'angular'; import config from 'app/core/config'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; import { appendQueryToUrl, toUrlParams } from 'app/core/utils/url'; /** @ngInject */ diff --git a/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts index cc918330a5e..0d15c4bf1bf 100644 --- a/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts +++ b/public/app/features/dashboard/components/VersionHistory/HistoryListCtrl.ts @@ -4,7 +4,7 @@ import angular from 'angular'; import locationUtil from 'app/core/utils/location_util'; import { DashboardModel } from '../../state/DashboardModel'; import { HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv } from './HistorySrv'; -import { dateTime, toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime, toUtc } from '@grafana/data'; export class HistoryListCtrl { appending: boolean; diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx index e13cf5c6a61..bb26da8c994 100644 --- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx +++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx @@ -17,8 +17,8 @@ import config from 'app/core/config'; // Types import { DashboardModel, PanelModel } from '../state'; -import { LoadingState, PanelData, PanelPlugin } from '@grafana/ui'; -import { ScopedVars } from '@grafana/ui'; +import { ScopedVars, PanelData, PanelPlugin } from '@grafana/ui'; +import { LoadingState } from '@grafana/data'; const DEFAULT_PLUGIN_ERROR = 'Error in plugin'; diff --git a/public/app/features/dashboard/panel_editor/QueriesTab.tsx b/public/app/features/dashboard/panel_editor/QueriesTab.tsx index 75f4ded618e..711e26a2164 100644 --- a/public/app/features/dashboard/panel_editor/QueriesTab.tsx +++ b/public/app/features/dashboard/panel_editor/QueriesTab.tsx @@ -18,7 +18,8 @@ import config from 'app/core/config'; // Types import { PanelModel } from '../state/PanelModel'; import { DashboardModel } from '../state/DashboardModel'; -import { DataQuery, DataSourceSelectItem, PanelData, LoadingState } from '@grafana/ui/src/types'; +import { DataQuery, DataSourceSelectItem, PanelData } from '@grafana/ui'; +import { LoadingState } from '@grafana/data'; import { PluginHelp } from 'app/core/components/PluginHelp/PluginHelp'; import { PanelQueryRunnerFormat } from '../state/PanelQueryRunner'; import { Unsubscribable } from 'rxjs'; diff --git a/public/app/features/dashboard/panel_editor/QueryEditorRow.test.ts b/public/app/features/dashboard/panel_editor/QueryEditorRow.test.ts index ccddec2657b..5c224bfef6c 100644 --- a/public/app/features/dashboard/panel_editor/QueryEditorRow.test.ts +++ b/public/app/features/dashboard/panel_editor/QueryEditorRow.test.ts @@ -1,4 +1,5 @@ -import { PanelData, LoadingState, DataQueryRequest } from '@grafana/ui'; +import { LoadingState } from '@grafana/data'; +import { PanelData, DataQueryRequest } from '@grafana/ui'; import { filterPanelDataToQuery } from './QueryEditorRow'; function makePretendRequest(requestId: string, subRequests?: DataQueryRequest[]): DataQueryRequest { diff --git a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx index ca66d84ad78..a5ecd978076 100644 --- a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx +++ b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx @@ -11,7 +11,8 @@ import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; // Types import { PanelModel } from '../state/PanelModel'; -import { DataQuery, DataSourceApi, TimeRange, PanelData, LoadingState, DataQueryRequest } from '@grafana/ui'; +import { DataQuery, DataSourceApi, PanelData, DataQueryRequest } from '@grafana/ui'; +import { TimeRange, LoadingState } from '@grafana/data'; import { DashboardModel } from '../state/DashboardModel'; interface Props { diff --git a/public/app/features/dashboard/panel_editor/QueryOptions.tsx b/public/app/features/dashboard/panel_editor/QueryOptions.tsx index c1cb892317d..e47b12cdb55 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 '@grafana/ui/src/utils/rangeutil'; +import { isValidTimeSpan } from '@grafana/data/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 2d1c0b556b0..0dc5b46abdc 100644 --- a/public/app/features/dashboard/services/DashboardLoaderSrv.ts +++ b/public/app/features/dashboard/services/DashboardLoaderSrv.ts @@ -4,7 +4,7 @@ import moment from 'moment'; import _ from 'lodash'; import $ from 'jquery'; import kbn from 'app/core/utils/kbn'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import impressionSrv from 'app/core/services/impression_srv'; export class DashboardLoaderSrv { diff --git a/public/app/features/dashboard/services/TimeSrv.test.ts b/public/app/features/dashboard/services/TimeSrv.test.ts index c54bfddc140..11918955de1 100644 --- a/public/app/features/dashboard/services/TimeSrv.test.ts +++ b/public/app/features/dashboard/services/TimeSrv.test.ts @@ -1,6 +1,6 @@ import { TimeSrv } from './TimeSrv'; import { ContextSrvStub } from 'test/specs/helpers'; -import { isDateTime, dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { isDateTime, dateTime } from '@grafana/data'; describe('timeSrv', () => { const rootScope = { diff --git a/public/app/features/dashboard/services/TimeSrv.ts b/public/app/features/dashboard/services/TimeSrv.ts index 5c1a305a2ba..60643b42c02 100644 --- a/public/app/features/dashboard/services/TimeSrv.ts +++ b/public/app/features/dashboard/services/TimeSrv.ts @@ -4,14 +4,14 @@ import _ from 'lodash'; // Utils import kbn from 'app/core/utils/kbn'; import coreModule from 'app/core/core_module'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; // Types -import { TimeRange, RawTimeRange, TimeZone } from '@grafana/ui'; +import { TimeRange, RawTimeRange, TimeZone } from '@grafana/data'; import { ITimeoutService, ILocationService } from 'angular'; import { ContextSrv } from 'app/core/services/context_srv'; import { DashboardModel } from '../state/DashboardModel'; -import { toUtc, dateTime, isDateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc, dateTime, isDateTime } from '@grafana/data'; import { getZoomedTimeRange } from 'app/core/utils/timePicker'; export class TimeSrv { diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts index ff8fe5ac8d6..5e27090886e 100644 --- a/public/app/features/dashboard/state/DashboardModel.ts +++ b/public/app/features/dashboard/state/DashboardModel.ts @@ -13,10 +13,10 @@ import sortByKeys from 'app/core/utils/sort_by_keys'; // Types import { PanelModel, GridPos } from './PanelModel'; import { DashboardMigrator } from './DashboardMigrator'; -import { TimeRange, TimeZone } from '@grafana/ui'; +import { TimeRange, TimeZone } from '@grafana/data'; import { UrlQueryValue } from '@grafana/runtime'; import { KIOSK_MODE_TV, DashboardMeta } from 'app/types'; -import { toUtc, DateTimeInput, dateTime, isDateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc, DateTimeInput, dateTime, isDateTime } from '@grafana/data'; export interface CloneOptions { saveVariables?: boolean; diff --git a/public/app/features/dashboard/state/PanelQueryRunner.test.ts b/public/app/features/dashboard/state/PanelQueryRunner.test.ts index 4e9cba5100c..0336d48d340 100644 --- a/public/app/features/dashboard/state/PanelQueryRunner.test.ts +++ b/public/app/features/dashboard/state/PanelQueryRunner.test.ts @@ -1,13 +1,8 @@ import { PanelQueryRunner } from './PanelQueryRunner'; -import { - PanelData, - DataQueryRequest, - DataStreamObserver, - DataStreamState, - LoadingState, - ScopedVars, -} from '@grafana/ui/src/types'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { PanelData, DataQueryRequest, DataStreamObserver, DataStreamState, ScopedVars } from '@grafana/ui'; + +import { LoadingState } from '@grafana/data'; +import { dateTime } from '@grafana/data'; jest.mock('app/core/services/backend_srv'); diff --git a/public/app/features/dashboard/state/PanelQueryRunner.ts b/public/app/features/dashboard/state/PanelQueryRunner.ts index b75a538f496..ee937ef94eb 100644 --- a/public/app/features/dashboard/state/PanelQueryRunner.ts +++ b/public/app/features/dashboard/state/PanelQueryRunner.ts @@ -10,15 +10,9 @@ import templateSrv from 'app/features/templating/template_srv'; import { PanelQueryState } from './PanelQueryState'; // Types -import { - PanelData, - DataQuery, - TimeRange, - ScopedVars, - DataQueryRequest, - DataSourceApi, - DataSourceJsonData, -} from '@grafana/ui'; +import { PanelData, DataQuery, ScopedVars, DataQueryRequest, DataSourceApi, DataSourceJsonData } from '@grafana/ui'; + +import { TimeRange } from '@grafana/data'; export interface QueryRunnerOptions< TQuery extends DataQuery = DataQuery, diff --git a/public/app/features/dashboard/state/PanelQueryState.test.ts b/public/app/features/dashboard/state/PanelQueryState.test.ts index 2155803b49d..230ee40d23a 100644 --- a/public/app/features/dashboard/state/PanelQueryState.test.ts +++ b/public/app/features/dashboard/state/PanelQueryState.test.ts @@ -1,6 +1,7 @@ import { toDataQueryError, PanelQueryState, getProcessedDataFrame } from './PanelQueryState'; import { MockDataSourceApi } from 'test/mocks/datasource_srv'; -import { DataQueryResponse, LoadingState } from '@grafana/ui'; +import { LoadingState } from '@grafana/data'; +import { DataQueryResponse } from '@grafana/ui'; import { getQueryOptions } from 'test/helpers/getQueryOptions'; describe('PanelQueryState', () => { diff --git a/public/app/features/dashboard/state/PanelQueryState.ts b/public/app/features/dashboard/state/PanelQueryState.ts index 75a87400595..824c49b7177 100644 --- a/public/app/features/dashboard/state/PanelQueryState.ts +++ b/public/app/features/dashboard/state/PanelQueryState.ts @@ -4,20 +4,24 @@ import isEqual from 'lodash/isEqual'; // Utils & Services import { getBackendSrv } from 'app/core/services/backend_srv'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; -import { guessFieldTypes, toDataFrame, isDataFrame } from '@grafana/ui/src/utils'; +import * as dateMath from '@grafana/data/src/utils/datemath'; +import { + guessFieldTypes, + LoadingState, + toLegacyResponseData, + DataFrame, + toDataFrame, + isDataFrame, +} from '@grafana/data'; // Types import { DataSourceApi, DataQueryRequest, PanelData, - LoadingState, - toLegacyResponseData, DataQueryError, DataStreamObserver, DataStreamState, - DataFrame, DataQueryResponseData, } from '@grafana/ui'; diff --git a/public/app/features/dashboard/utils/panel.test.ts b/public/app/features/dashboard/utils/panel.test.ts index a05c54b2ab7..0874eaa939e 100644 --- a/public/app/features/dashboard/utils/panel.test.ts +++ b/public/app/features/dashboard/utils/panel.test.ts @@ -1,7 +1,7 @@ -import { TimeRange } from '@grafana/ui'; +import { TimeRange } from '@grafana/data'; import { applyPanelTimeOverrides } from 'app/features/dashboard/utils/panel'; import { advanceTo, clear } from 'jest-date-mock'; -import { dateTime, DateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime, DateTime } from '@grafana/data'; const dashboardTimeRange: TimeRange = { from: dateTime([2019, 1, 11, 12, 0]), diff --git a/public/app/features/dashboard/utils/panel.ts b/public/app/features/dashboard/utils/panel.ts index 7548c459903..6016335f49f 100644 --- a/public/app/features/dashboard/utils/panel.ts +++ b/public/app/features/dashboard/utils/panel.ts @@ -4,12 +4,12 @@ import store from 'app/core/store'; // Models import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; -import { TimeRange } from '@grafana/ui'; +import { TimeRange } from '@grafana/data'; // Utils import { isString as _isString } from 'lodash'; -import * as rangeUtil from '@grafana/ui/src/utils/rangeutil'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as rangeUtil from '@grafana/data/src/utils/rangeutil'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import appEvents from 'app/core/app_events'; import config from 'app/core/config'; diff --git a/public/app/features/datasources/DataSourcesList.tsx b/public/app/features/datasources/DataSourcesList.tsx index 0da12263aed..86993806413 100644 --- a/public/app/features/datasources/DataSourcesList.tsx +++ b/public/app/features/datasources/DataSourcesList.tsx @@ -6,7 +6,7 @@ import classNames from 'classnames'; import DataSourcesListItem from './DataSourcesListItem'; // Types -import { DataSourceSettings } from '@grafana/ui/src/types'; +import { DataSourceSettings } from '@grafana/ui'; import { LayoutMode, LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector'; export interface Props { diff --git a/public/app/features/datasources/DataSourcesListItem.tsx b/public/app/features/datasources/DataSourcesListItem.tsx index de3ac71f0b1..ff4cd794f75 100644 --- a/public/app/features/datasources/DataSourcesListItem.tsx +++ b/public/app/features/datasources/DataSourcesListItem.tsx @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { DataSourceSettings } from '@grafana/ui/src/types'; +import { DataSourceSettings } from '@grafana/ui'; export interface Props { dataSource: DataSourceSettings; diff --git a/public/app/features/datasources/__mocks__/dataSourcesMocks.ts b/public/app/features/datasources/__mocks__/dataSourcesMocks.ts index 6658464ef7f..dbeb14045c7 100644 --- a/public/app/features/datasources/__mocks__/dataSourcesMocks.ts +++ b/public/app/features/datasources/__mocks__/dataSourcesMocks.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings } from '@grafana/ui/src/types'; +import { DataSourceSettings } from '@grafana/ui'; export const getMockDataSources = (amount: number): DataSourceSettings[] => { const dataSources = []; diff --git a/public/app/features/datasources/state/selectors.ts b/public/app/features/datasources/state/selectors.ts index c2b44076885..dffd242a895 100644 --- a/public/app/features/datasources/state/selectors.ts +++ b/public/app/features/datasources/state/selectors.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui/src/types'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui'; export const getDataSources = state => { const regex = new RegExp(state.searchQuery, 'i'); diff --git a/public/app/features/explore/ElapsedTime.tsx b/public/app/features/explore/ElapsedTime.tsx index 7f649c49703..d14e774121b 100644 --- a/public/app/features/explore/ElapsedTime.tsx +++ b/public/app/features/explore/ElapsedTime.tsx @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { toDuration } from '@grafana/ui/src/utils/moment_wrapper'; +import { toDuration } from '@grafana/data'; const INTERVAL = 150; diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index e4ca595cd59..9ffb5b5ebbd 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -30,7 +30,9 @@ import { } from './state/actions'; // Types -import { RawTimeRange, DataQuery, ExploreStartPageProps, DataSourceApi, DataQueryError } from '@grafana/ui'; +import { RawTimeRange } from '@grafana/data'; + +import { DataQuery, ExploreStartPageProps, DataSourceApi, DataQueryError } from '@grafana/ui'; import { ExploreItemState, ExploreUrlState, diff --git a/public/app/features/explore/ExploreTimeControls.tsx b/public/app/features/explore/ExploreTimeControls.tsx index 7ae5bf10a7b..91bf1ae057f 100644 --- a/public/app/features/explore/ExploreTimeControls.tsx +++ b/public/app/features/explore/ExploreTimeControls.tsx @@ -3,12 +3,12 @@ import React, { Component } from 'react'; // Types import { ExploreId } from 'app/types'; -import { TimeRange, TimeOption, TimeZone, SetInterval, toUtc, dateTime } from '@grafana/ui'; +import { TimeRange, TimeOption, TimeZone, toUtc, dateTime, RawTimeRange } from '@grafana/data'; // State // Components -import { TimePicker, RefreshPicker, RawTimeRange } from '@grafana/ui'; +import { TimePicker, RefreshPicker, SetInterval } from '@grafana/ui'; // Utils & Services import { defaultSelectOptions } from '@grafana/ui/src/components/TimePicker/TimePicker'; diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx index 1b81d42181e..e6770be5b03 100644 --- a/public/app/features/explore/ExploreToolbar.tsx +++ b/public/app/features/explore/ExploreToolbar.tsx @@ -3,7 +3,8 @@ import { connect } from 'react-redux'; import { hot } from 'react-hot-loader'; import { ExploreId, ExploreMode } from 'app/types/explore'; -import { DataSourceSelectItem, RawTimeRange, TimeZone, TimeRange, SelectOptionItem, LoadingState } from '@grafana/ui'; +import { DataSourceSelectItem, SelectOptionItem } from '@grafana/ui'; +import { RawTimeRange, TimeZone, TimeRange, LoadingState } from '@grafana/data'; import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker'; import { StoreState } from 'app/types/store'; import { diff --git a/public/app/features/explore/Graph.test.tsx b/public/app/features/explore/Graph.test.tsx index 9c082211b7f..301b819717d 100644 --- a/public/app/features/explore/Graph.test.tsx +++ b/public/app/features/explore/Graph.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { Graph } from './Graph'; import { mockData } from './__mocks__/mockData'; -import { DefaultTimeZone } from '@grafana/ui'; +import { DefaultTimeZone } from '@grafana/data'; const setup = (propOverrides?: object) => { const props = { diff --git a/public/app/features/explore/Graph.tsx b/public/app/features/explore/Graph.tsx index e57d533ee68..9bb10a41033 100644 --- a/public/app/features/explore/Graph.tsx +++ b/public/app/features/explore/Graph.tsx @@ -7,7 +7,8 @@ import 'vendor/flot/jquery.flot.time'; import 'vendor/flot/jquery.flot.selection'; import 'vendor/flot/jquery.flot.stack'; -import { TimeZone, AbsoluteTimeRange, GraphLegend, LegendItem, LegendDisplayMode } from '@grafana/ui'; +import { GraphLegend, LegendItem, LegendDisplayMode } from '@grafana/ui'; +import { TimeZone, AbsoluteTimeRange } from '@grafana/data'; import TimeSeries from 'app/core/time_series2'; const MAX_NUMBER_OF_TIME_SERIES = 20; diff --git a/public/app/features/explore/GraphContainer.tsx b/public/app/features/explore/GraphContainer.tsx index 4c17c43b23c..773111e9fee 100644 --- a/public/app/features/explore/GraphContainer.tsx +++ b/public/app/features/explore/GraphContainer.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { TimeZone, AbsoluteTimeRange, LoadingState } from '@grafana/ui'; +import { TimeZone, AbsoluteTimeRange, LoadingState } from '@grafana/data'; import { ExploreId, ExploreItemState } from 'app/types/explore'; import { StoreState } from 'app/types'; diff --git a/public/app/features/explore/LiveLogs.tsx b/public/app/features/explore/LiveLogs.tsx index c06fc0cf99b..e6184239b56 100644 --- a/public/app/features/explore/LiveLogs.tsx +++ b/public/app/features/explore/LiveLogs.tsx @@ -1,15 +1,8 @@ import React, { PureComponent } from 'react'; import { css, cx } from 'emotion'; -import { - Themeable, - withTheme, - GrafanaTheme, - selectThemeVariant, - LinkButton, - LogsModel, - LogRowModel, - TimeZone, -} from '@grafana/ui'; +import { Themeable, withTheme, GrafanaTheme, selectThemeVariant, LinkButton } from '@grafana/ui'; + +import { LogsModel, LogRowModel, TimeZone } from '@grafana/data'; import ElapsedTime from './ElapsedTime'; diff --git a/public/app/features/explore/LogLabel.tsx b/public/app/features/explore/LogLabel.tsx index 1794d60b689..ac6274b531b 100644 --- a/public/app/features/explore/LogLabel.tsx +++ b/public/app/features/explore/LogLabel.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import { LogLabelStats } from './LogLabelStats'; -import { LogRowModel, LogLabelStatsModel } from '@grafana/ui'; +import { LogRowModel, LogLabelStatsModel } from '@grafana/data'; import { calculateLogsLabelStats } from 'app/core/logs_model'; interface Props { diff --git a/public/app/features/explore/LogLabelStats.tsx b/public/app/features/explore/LogLabelStats.tsx index 07f33d8aff7..b2581ca9634 100644 --- a/public/app/features/explore/LogLabelStats.tsx +++ b/public/app/features/explore/LogLabelStats.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import classnames from 'classnames'; -import { LogLabelStatsModel } from '@grafana/ui'; +import { LogLabelStatsModel } from '@grafana/data'; function LogLabelStatsRow(logLabelStatsModel: LogLabelStatsModel) { const { active, count, proportion, value } = logLabelStatsModel; diff --git a/public/app/features/explore/LogLabels.tsx b/public/app/features/explore/LogLabels.tsx index 9dffca38a66..1bac6f035a9 100644 --- a/public/app/features/explore/LogLabels.tsx +++ b/public/app/features/explore/LogLabels.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import { LogLabel } from './LogLabel'; -import { Labels, LogRowModel } from '@grafana/ui'; +import { Labels, LogRowModel } from '@grafana/data'; interface Props { getRows?: () => LogRowModel[]; diff --git a/public/app/features/explore/LogRow.tsx b/public/app/features/explore/LogRow.tsx index 10657eb9bda..af4d165b732 100644 --- a/public/app/features/explore/LogRow.tsx +++ b/public/app/features/explore/LogRow.tsx @@ -16,16 +16,9 @@ import { HasMoreContextRows, LogRowContextQueryErrors, } from './LogRowContextProvider'; -import { - ThemeContext, - selectThemeVariant, - GrafanaTheme, - DataQueryResponse, - LogRowModel, - LogLabelStatsModel, - LogsParser, - TimeZone, -} from '@grafana/ui'; +import { ThemeContext, selectThemeVariant, GrafanaTheme, DataQueryResponse } from '@grafana/ui'; + +import { LogRowModel, LogLabelStatsModel, LogsParser, TimeZone } from '@grafana/data'; import { LogRowContext } from './LogRowContext'; import tinycolor from 'tinycolor2'; diff --git a/public/app/features/explore/LogRowContext.tsx b/public/app/features/explore/LogRowContext.tsx index 2e0e4b4c186..e4451d14f52 100644 --- a/public/app/features/explore/LogRowContext.tsx +++ b/public/app/features/explore/LogRowContext.tsx @@ -7,8 +7,9 @@ import { ClickOutsideWrapper, CustomScrollbar, DataQueryError, - LogRowModel, } from '@grafana/ui'; + +import { LogRowModel } from '@grafana/data'; import { css, cx } from 'emotion'; import { LogRowContextRows, HasMoreContextRows, LogRowContextQueryErrors } from './LogRowContextProvider'; import { Alert } from './Error'; diff --git a/public/app/features/explore/LogRowContextProvider.tsx b/public/app/features/explore/LogRowContextProvider.tsx index e503f11a736..08bddaa9f90 100644 --- a/public/app/features/explore/LogRowContextProvider.tsx +++ b/public/app/features/explore/LogRowContextProvider.tsx @@ -1,4 +1,5 @@ -import { DataQueryResponse, DataQueryError, LogRowModel } from '@grafana/ui'; +import { DataQueryResponse, DataQueryError } from '@grafana/ui'; +import { LogRowModel } from '@grafana/data'; import { useState, useEffect } from 'react'; import flatten from 'lodash/flatten'; import useAsync from 'react-use/lib/useAsync'; diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx index e2a9539be97..eb0177f1c0e 100644 --- a/public/app/features/explore/Logs.tsx +++ b/public/app/features/explore/Logs.tsx @@ -1,10 +1,10 @@ import _ from 'lodash'; import React, { PureComponent } from 'react'; -import * as rangeUtil from '@grafana/ui/src/utils/rangeutil'; +import * as rangeUtil from '@grafana/data/src/utils/rangeutil'; +import { Switch } from '@grafana/ui'; import { RawTimeRange, - Switch, LogLevel, TimeZone, AbsoluteTimeRange, @@ -12,7 +12,7 @@ import { LogsModel, LogsDedupStrategy, LogRowModel, -} from '@grafana/ui'; +} from '@grafana/data'; import TimeSeries from 'app/core/time_series2'; import ToggleButtonGroup, { ToggleButton } from 'app/core/components/ToggleButtonGroup/ToggleButtonGroup'; diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx index 20da384dc1f..ece5f6d65a7 100644 --- a/public/app/features/explore/LogsContainer.tsx +++ b/public/app/features/explore/LogsContainer.tsx @@ -1,18 +1,19 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; +import { DataSourceApi } from '@grafana/ui'; + import { RawTimeRange, LogLevel, TimeZone, AbsoluteTimeRange, - DataSourceApi, LogsModel, LogRowModel, LogsDedupStrategy, LoadingState, TimeRange, -} from '@grafana/ui'; +} from '@grafana/data'; import { ExploreId, ExploreItemState } from 'app/types/explore'; import { StoreState } from 'app/types'; diff --git a/public/app/features/explore/QueryEditor.tsx b/public/app/features/explore/QueryEditor.tsx index 53212c4d76e..2f689409179 100644 --- a/public/app/features/explore/QueryEditor.tsx +++ b/public/app/features/explore/QueryEditor.tsx @@ -7,9 +7,10 @@ import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; // Types import { Emitter } from 'app/core/utils/emitter'; -import { DataQuery, TimeRange } from '@grafana/ui'; +import { DataQuery } from '@grafana/ui'; +import { TimeRange } from '@grafana/data'; import 'app/features/plugins/plugin_loader'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; interface QueryEditorProps { error?: any; diff --git a/public/app/features/explore/QueryRow.tsx b/public/app/features/explore/QueryRow.tsx index 1750b403983..5b5361fcff7 100644 --- a/public/app/features/explore/QueryRow.tsx +++ b/public/app/features/explore/QueryRow.tsx @@ -13,15 +13,8 @@ import { changeQuery, modifyQueries, runQueries, addQueryRow } from './state/act // Types import { StoreState } from 'app/types'; -import { - TimeRange, - DataQuery, - DataSourceApi, - QueryFixAction, - DataSourceStatus, - PanelData, - DataQueryError, -} from '@grafana/ui'; +import { TimeRange } from '@grafana/data'; +import { DataQuery, DataSourceApi, QueryFixAction, DataSourceStatus, PanelData, DataQueryError } from '@grafana/ui'; import { HistoryItem, ExploreItemState, ExploreId, ExploreMode } from 'app/types/explore'; import { Emitter } from 'app/core/utils/emitter'; import { highlightLogsExpressionAction, removeQueryRowAction } from './state/actionTypes'; diff --git a/public/app/features/explore/QueryStatus.tsx b/public/app/features/explore/QueryStatus.tsx index 54b3b8129ef..1560adedaf2 100644 --- a/public/app/features/explore/QueryStatus.tsx +++ b/public/app/features/explore/QueryStatus.tsx @@ -1,7 +1,8 @@ import React, { PureComponent } from 'react'; import ElapsedTime from './ElapsedTime'; -import { PanelData, LoadingState } from '@grafana/ui'; +import { LoadingState } from '@grafana/data'; +import { PanelData } from '@grafana/ui'; function formatLatency(value) { return `${(value / 1000).toFixed(1)}s`; diff --git a/public/app/features/explore/TableContainer.tsx b/public/app/features/explore/TableContainer.tsx index ea227e78b97..239a65fa3be 100644 --- a/public/app/features/explore/TableContainer.tsx +++ b/public/app/features/explore/TableContainer.tsx @@ -9,7 +9,7 @@ import { toggleTable } from './state/actions'; import Table from './Table'; import Panel from './Panel'; import TableModel from 'app/core/table_model'; -import { LoadingState } from '@grafana/ui'; +import { LoadingState } from '@grafana/data'; interface TableContainerProps { exploreId: ExploreId; diff --git a/public/app/features/explore/state/actionTypes.ts b/public/app/features/explore/state/actionTypes.ts index 579a026d4dc..ab8aaebd935 100644 --- a/public/app/features/explore/state/actionTypes.ts +++ b/public/app/features/explore/state/actionTypes.ts @@ -1,21 +1,24 @@ // Types import { Emitter } from 'app/core/core'; import { - RawTimeRange, DataQuery, DataSourceSelectItem, DataSourceApi, QueryFixAction, + DataQueryError, + DataQueryResponseData, +} from '@grafana/ui'; + +import { + RawTimeRange, LogLevel, TimeRange, - DataQueryError, DataFrame, LogsModel, TimeSeries, - DataQueryResponseData, LoadingState, AbsoluteTimeRange, -} from '@grafana/ui/src/types'; +} from '@grafana/data'; import { ExploreId, ExploreItemState, HistoryItem, ExploreUIState, ExploreMode, QueryOptions } from 'app/types/explore'; import { actionCreatorFactory, noPayloadActionCreatorFactory, ActionOf } from 'app/core/redux/actionCreatorFactory'; import TableModel from 'app/core/table_model'; diff --git a/public/app/features/explore/state/actions.test.ts b/public/app/features/explore/state/actions.test.ts index a50d9d08010..38e0f5f4822 100644 --- a/public/app/features/explore/state/actions.test.ts +++ b/public/app/features/explore/state/actions.test.ts @@ -17,8 +17,8 @@ import { Emitter } from 'app/core/core'; import { ActionOf } from 'app/core/redux/actionCreatorFactory'; import { makeInitialUpdateState } from './reducers'; import { DataQuery } from '@grafana/ui/src/types/datasource'; -import { DefaultTimeZone, RawTimeRange, LogsDedupStrategy } from '@grafana/ui'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { DefaultTimeZone, RawTimeRange, LogsDedupStrategy } from '@grafana/data'; +import { toUtc } from '@grafana/data'; jest.mock('app/features/plugins/datasource_srv', () => ({ getDatasourceSrv: () => ({ diff --git a/public/app/features/explore/state/actions.ts b/public/app/features/explore/state/actions.ts index 27b9f649c30..556b657f3a4 100644 --- a/public/app/features/explore/state/actions.ts +++ b/public/app/features/explore/state/actions.ts @@ -17,15 +17,9 @@ import { // Types import { ThunkResult } from 'app/types'; -import { - RawTimeRange, - DataSourceApi, - DataQuery, - DataSourceSelectItem, - QueryFixAction, - LogsDedupStrategy, - AbsoluteTimeRange, -} from '@grafana/ui'; +import { DataSourceApi, DataQuery, DataSourceSelectItem, QueryFixAction } from '@grafana/ui'; + +import { RawTimeRange, LogsDedupStrategy, AbsoluteTimeRange } from '@grafana/data'; import { ExploreId, ExploreUIState, QueryTransaction, ExploreMode } from 'app/types/explore'; import { updateDatasourceInstanceAction, diff --git a/public/app/features/explore/state/epics/limitMessageRateEpic.ts b/public/app/features/explore/state/epics/limitMessageRateEpic.ts index 62013706968..a2eb256e312 100644 --- a/public/app/features/explore/state/epics/limitMessageRateEpic.ts +++ b/public/app/features/explore/state/epics/limitMessageRateEpic.ts @@ -1,6 +1,6 @@ import { Epic } from 'redux-observable'; import { map, throttleTime } from 'rxjs/operators'; -import { LoadingState } from '@grafana/ui'; +import { LoadingState } from '@grafana/data'; import { StoreState } from 'app/types'; import { ActionOf } from '../../../../core/redux/actionCreatorFactory'; diff --git a/public/app/features/explore/state/epics/processQueryResultsEpic.test.ts b/public/app/features/explore/state/epics/processQueryResultsEpic.test.ts index 5848bb2d3b2..f5623817875 100644 --- a/public/app/features/explore/state/epics/processQueryResultsEpic.test.ts +++ b/public/app/features/explore/state/epics/processQueryResultsEpic.test.ts @@ -8,7 +8,7 @@ import { updateTimeRangeAction, runQueriesAction, } from '../actionTypes'; -import { DataFrame, LoadingState } from '@grafana/ui'; +import { DataFrame, LoadingState } from '@grafana/data'; import { processQueryResultsEpic } from './processQueryResultsEpic'; import TableModel from 'app/core/table_model'; diff --git a/public/app/features/explore/state/epics/processQueryResultsEpic.ts b/public/app/features/explore/state/epics/processQueryResultsEpic.ts index db46659eb6e..e2328d730fb 100644 --- a/public/app/features/explore/state/epics/processQueryResultsEpic.ts +++ b/public/app/features/explore/state/epics/processQueryResultsEpic.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import { Epic } from 'redux-observable'; import { mergeMap } from 'rxjs/operators'; import { NEVER } from 'rxjs'; -import { LoadingState } from '@grafana/ui'; +import { LoadingState } from '@grafana/data'; import { ActionOf } from 'app/core/redux/actionCreatorFactory'; import { StoreState } from 'app/types/store'; diff --git a/public/app/features/explore/state/epics/runQueriesBatchEpic.test.ts b/public/app/features/explore/state/epics/runQueriesBatchEpic.test.ts index 7498f27aea4..65c1aae20f6 100644 --- a/public/app/features/explore/state/epics/runQueriesBatchEpic.test.ts +++ b/public/app/features/explore/state/epics/runQueriesBatchEpic.test.ts @@ -14,7 +14,8 @@ import { clearQueriesAction, stateSaveAction, } from '../actionTypes'; -import { LoadingState, DataQueryRequest, DataFrame, FieldType } from '@grafana/ui'; +import { LoadingState, DataFrame, FieldType } from '@grafana/data'; +import { DataQueryRequest } from '@grafana/ui'; const testContext = () => { const series: DataFrame[] = [ diff --git a/public/app/features/explore/state/epics/runQueriesBatchEpic.ts b/public/app/features/explore/state/epics/runQueriesBatchEpic.ts index 7f4ab4afd8c..733d374fc50 100644 --- a/public/app/features/explore/state/epics/runQueriesBatchEpic.ts +++ b/public/app/features/explore/state/epics/runQueriesBatchEpic.ts @@ -3,15 +3,10 @@ import { Observable, Subject } from 'rxjs'; import { mergeMap, catchError, takeUntil, filter } from 'rxjs/operators'; import _, { isString } from 'lodash'; import { isLive } from '@grafana/ui/src/components/RefreshPicker/RefreshPicker'; -import { - DataStreamState, - LoadingState, - DataQueryResponse, - DataFrame, - DataQueryResponseData, - AbsoluteTimeRange, -} from '@grafana/ui'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import { DataStreamState, DataQueryResponse, DataQueryResponseData } from '@grafana/ui'; + +import { LoadingState, DataFrame, AbsoluteTimeRange } from '@grafana/data'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import { ActionOf } from 'app/core/redux/actionCreatorFactory'; import { StoreState } from 'app/types/store'; diff --git a/public/app/features/explore/state/epics/stateSaveEpic.ts b/public/app/features/explore/state/epics/stateSaveEpic.ts index e696734d9b9..1b36f92ecb0 100644 --- a/public/app/features/explore/state/epics/stateSaveEpic.ts +++ b/public/app/features/explore/state/epics/stateSaveEpic.ts @@ -1,7 +1,7 @@ import { Epic } from 'redux-observable'; import { mergeMap } from 'rxjs/operators'; -import { RawTimeRange, TimeRange } from '@grafana/ui/src/types/time'; -import { isDateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { RawTimeRange, TimeRange } from '@grafana/data'; +import { isDateTime } from '@grafana/data'; import { ActionOf } from 'app/core/redux/actionCreatorFactory'; import { StoreState } from 'app/types/store'; diff --git a/public/app/features/explore/state/epics/timeEpic.test.ts b/public/app/features/explore/state/epics/timeEpic.test.ts index 350f72527bf..7fbae3a1ee4 100644 --- a/public/app/features/explore/state/epics/timeEpic.test.ts +++ b/public/app/features/explore/state/epics/timeEpic.test.ts @@ -1,4 +1,4 @@ -import { dateTime, DefaultTimeZone } from '@grafana/ui'; +import { dateTime, DefaultTimeZone } from '@grafana/data'; import { epicTester } from 'test/core/redux/epicTester'; import { mockExploreState } from 'test/mocks/mockExploreState'; diff --git a/public/app/features/explore/state/epics/timeEpic.ts b/public/app/features/explore/state/epics/timeEpic.ts index 29fdb60355a..0d066319d7b 100644 --- a/public/app/features/explore/state/epics/timeEpic.ts +++ b/public/app/features/explore/state/epics/timeEpic.ts @@ -1,6 +1,6 @@ import { Epic } from 'redux-observable'; import { map } from 'rxjs/operators'; -import { AbsoluteTimeRange, RawTimeRange } from '@grafana/ui'; +import { AbsoluteTimeRange, RawTimeRange } from '@grafana/data'; import { ActionOf } from 'app/core/redux/actionCreatorFactory'; import { StoreState } from 'app/types/store'; diff --git a/public/app/features/explore/state/reducers.test.ts b/public/app/features/explore/state/reducers.test.ts index 9404e1591f4..58125ea0a88 100644 --- a/public/app/features/explore/state/reducers.test.ts +++ b/public/app/features/explore/state/reducers.test.ts @@ -24,7 +24,8 @@ import { ActionOf } from 'app/core/redux/actionCreatorFactory'; import { updateLocation } from 'app/core/actions/location'; import { serializeStateToUrlParam } from 'app/core/utils/explore'; import TableModel from 'app/core/table_model'; -import { DataSourceApi, DataQuery, LogsModel, LogsDedupStrategy, LoadingState } from '@grafana/ui'; +import { DataSourceApi, DataQuery } from '@grafana/ui'; +import { LogsModel, LogsDedupStrategy, LoadingState } from '@grafana/data'; describe('Explore item reducer', () => { describe('scanning', () => { diff --git a/public/app/features/explore/state/reducers.ts b/public/app/features/explore/state/reducers.ts index 56fb29b0273..ad294669989 100644 --- a/public/app/features/explore/state/reducers.ts +++ b/public/app/features/explore/state/reducers.ts @@ -9,7 +9,8 @@ import { sortLogsResult, } from 'app/core/utils/explore'; import { ExploreItemState, ExploreState, ExploreId, ExploreUpdateState, ExploreMode } from 'app/types/explore'; -import { DataQuery, LoadingState } from '@grafana/ui'; +import { LoadingState } from '@grafana/data'; +import { DataQuery } from '@grafana/ui'; import { HigherOrderAction, ActionTypes, diff --git a/public/app/features/explore/state/selectors.test.ts b/public/app/features/explore/state/selectors.test.ts index 52f8d27811d..10ce6135221 100644 --- a/public/app/features/explore/state/selectors.test.ts +++ b/public/app/features/explore/state/selectors.test.ts @@ -1,5 +1,5 @@ import { deduplicatedLogsSelector } from './selectors'; -import { LogsDedupStrategy } from '@grafana/ui'; +import { LogsDedupStrategy } from '@grafana/data'; import { ExploreItemState } from 'app/types'; const state = { diff --git a/public/app/features/explore/utils/ResultProcessor.test.ts b/public/app/features/explore/utils/ResultProcessor.test.ts index 50b1bd5cecf..dc80dffc60e 100644 --- a/public/app/features/explore/utils/ResultProcessor.test.ts +++ b/public/app/features/explore/utils/ResultProcessor.test.ts @@ -1,4 +1,4 @@ -jest.mock('@grafana/ui/src/utils/moment_wrapper', () => ({ +jest.mock('@grafana/data/src/utils/moment_wrapper', () => ({ dateTime: (ts: any) => { return { valueOf: () => ts, @@ -16,7 +16,8 @@ jest.mock('@grafana/ui/src/utils/moment_wrapper', () => ({ import { ResultProcessor } from './ResultProcessor'; import { ExploreItemState, ExploreMode } from 'app/types/explore'; import TableModel from 'app/core/table_model'; -import { toFixed, TimeSeries, LogRowModel, LogsMetaItem } from '@grafana/ui'; +import { toFixed } from '@grafana/ui'; +import { TimeSeries, LogRowModel, LogsMetaItem } from '@grafana/data'; const testContext = (options: any = {}) => { const response = [ diff --git a/public/app/features/explore/utils/ResultProcessor.ts b/public/app/features/explore/utils/ResultProcessor.ts index 586b04255ea..f2d5efc1df3 100644 --- a/public/app/features/explore/utils/ResultProcessor.ts +++ b/public/app/features/explore/utils/ResultProcessor.ts @@ -1,13 +1,6 @@ -import { - DataQueryResponse, - TableData, - isTableData, - LogsModel, - toDataFrame, - guessFieldTypes, - DataQueryResponseData, - TimeSeries, -} from '@grafana/ui'; +import { DataQueryResponse, DataQueryResponseData } from '@grafana/ui'; + +import { TableData, isTableData, LogsModel, toDataFrame, guessFieldTypes, TimeSeries } from '@grafana/data'; import { ExploreItemState, ExploreMode } from 'app/types/explore'; import { getProcessedDataFrame } from 'app/features/dashboard/state/PanelQueryState'; diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts index 27eeaed8c42..ba8d6af3bff 100644 --- a/public/app/features/panel/metrics_panel_ctrl.ts +++ b/public/app/features/panel/metrics_panel_ctrl.ts @@ -6,17 +6,9 @@ import { PanelCtrl } from 'app/features/panel/panel_ctrl'; import { getExploreUrl } from 'app/core/utils/explore'; import { applyPanelTimeOverrides, getResolution } from 'app/features/dashboard/utils/panel'; import { ContextSrv } from 'app/core/services/context_srv'; -import { - toLegacyResponseData, - isDataFrame, - LegacyResponseData, - TimeRange, - DataSourceApi, - PanelData, - LoadingState, - DataQueryResponse, - DataFrame, -} from '@grafana/ui'; +import { toLegacyResponseData, isDataFrame, TimeRange, LoadingState, DataFrame } from '@grafana/data'; + +import { LegacyResponseData, DataSourceApi, PanelData, DataQueryResponse } from '@grafana/ui'; import { Unsubscribable } from 'rxjs'; import { PanelModel } from 'app/features/dashboard/state'; import { PanelQueryRunnerFormat } from '../dashboard/state/PanelQueryRunner'; diff --git a/public/app/features/panel/panellinks/link_srv.ts b/public/app/features/panel/panellinks/link_srv.ts index 901d3e4bf46..4b4c2941d52 100644 --- a/public/app/features/panel/panellinks/link_srv.ts +++ b/public/app/features/panel/panellinks/link_srv.ts @@ -3,8 +3,8 @@ import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import templateSrv, { TemplateSrv } from 'app/features/templating/template_srv'; import coreModule from 'app/core/core_module'; import { appendQueryToUrl, toUrlParams } from 'app/core/utils/url'; -import { DataLink, VariableSuggestion, KeyValue, ScopedVars, DateTime, dateTime } from '@grafana/ui'; -import { TimeSeriesValue } from '@grafana/ui'; +import { DataLink, VariableSuggestion, KeyValue, ScopedVars } from '@grafana/ui'; +import { TimeSeriesValue, DateTime, dateTime } from '@grafana/data'; import { deprecationWarning, VariableOrigin } from '@grafana/ui'; export const DataLinkBuiltInVars = { diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts index c1c45f8acc4..b99f88f40d6 100644 --- a/public/app/features/plugins/datasource_srv.ts +++ b/public/app/features/plugins/datasource_srv.ts @@ -8,7 +8,7 @@ import { importDataSourcePlugin } from './plugin_loader'; import { DataSourceSrv as DataSourceService, getDataSourceSrv as getDataSourceService } from '@grafana/runtime'; // Types -import { DataSourceApi, DataSourceSelectItem, ScopedVars } from '@grafana/ui/src/types'; +import { DataSourceApi, DataSourceSelectItem, ScopedVars } from '@grafana/ui'; export class DatasourceSrv implements DataSourceService { datasources: { [name: string]: DataSourceApi }; diff --git a/public/app/features/plugins/plugin_component.ts b/public/app/features/plugins/plugin_component.ts index ab761f0f379..b096db84915 100644 --- a/public/app/features/plugins/plugin_component.ts +++ b/public/app/features/plugins/plugin_component.ts @@ -4,7 +4,7 @@ import _ from 'lodash'; import config from 'app/core/config'; import coreModule from 'app/core/core_module'; -import { DataSourceApi } from '@grafana/ui/src/types'; +import { DataSourceApi } from '@grafana/ui'; import { importPanelPlugin, importDataSourcePlugin, importAppPlugin } from './plugin_loader'; /** @ngInject */ diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts index 2f821b31a79..4553f278079 100644 --- a/public/app/features/plugins/plugin_loader.ts +++ b/public/app/features/plugins/plugin_loader.ts @@ -18,8 +18,8 @@ import config from 'app/core/config'; 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 '@grafana/ui/src/utils/datemath'; +import { DataSourcePlugin, AppPlugin, PanelPlugin, PluginMeta, DataSourcePluginMeta } from '@grafana/ui'; +import * as dateMath from '@grafana/data/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'; @@ -109,7 +109,7 @@ exposeToPlugin('app/core/services/backend_srv', { }); exposeToPlugin('app/plugins/sdk', sdk); -exposeToPlugin('app/core/utils/datemath', datemath); +exposeToPlugin('app/core/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/features/plugins/specs/datasource_srv.test.ts b/public/app/features/plugins/specs/datasource_srv.test.ts index 424bae457a0..b8718add892 100644 --- a/public/app/features/plugins/specs/datasource_srv.test.ts +++ b/public/app/features/plugins/specs/datasource_srv.test.ts @@ -1,7 +1,7 @@ import config from 'app/core/config'; import 'app/features/plugins/datasource_srv'; import { DatasourceSrv } from 'app/features/plugins/datasource_srv'; -import { PluginMeta, DataSourcePluginMeta } from '@grafana/ui/src/types'; +import { PluginMeta, DataSourcePluginMeta } from '@grafana/ui'; // Datasource variable $datasource with current value 'BBB' const templateSrv = { diff --git a/public/app/features/profile/ProfileCtrl.ts b/public/app/features/profile/ProfileCtrl.ts index a6a612bcaf5..86aa7815baf 100644 --- a/public/app/features/profile/ProfileCtrl.ts +++ b/public/app/features/profile/ProfileCtrl.ts @@ -1,6 +1,6 @@ import config from 'app/core/config'; import { coreModule } from 'app/core/core'; -import { dateTime } from '@grafana/ui'; +import { dateTime } from '@grafana/data'; import { UserSession } from 'app/types'; export class ProfileCtrl { diff --git a/public/app/features/templating/specs/variable_srv.test.ts b/public/app/features/templating/specs/variable_srv.test.ts index b9ab0bd887f..87615bbc727 100644 --- a/public/app/features/templating/specs/variable_srv.test.ts +++ b/public/app/features/templating/specs/variable_srv.test.ts @@ -2,7 +2,7 @@ import '../all'; import { VariableSrv } from '../variable_srv'; import { DashboardModel } from '../../dashboard/state/DashboardModel'; import $q from 'q'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; import { CustomVariable } from '../custom_variable'; describe('VariableSrv', function(this: any) { diff --git a/public/app/features/templating/template_srv.ts b/public/app/features/templating/template_srv.ts index c55f200ab97..9e5a662e3e3 100644 --- a/public/app/features/templating/template_srv.ts +++ b/public/app/features/templating/template_srv.ts @@ -1,7 +1,8 @@ import kbn from 'app/core/utils/kbn'; import _ from 'lodash'; import { variableRegex } from 'app/features/templating/variable'; -import { TimeRange, ScopedVars } from '@grafana/ui/src'; +import { ScopedVars } from '@grafana/ui'; +import { TimeRange } from '@grafana/data'; function luceneEscape(value) { return value.replace(/([\!\*\+\-\=<>\s\&\|\(\)\[\]\{\}\^\~\?\:\\/"])/g, '\\$1'); diff --git a/public/app/features/templating/variable_srv.ts b/public/app/features/templating/variable_srv.ts index e536d35a406..7c6e8657969 100644 --- a/public/app/features/templating/variable_srv.ts +++ b/public/app/features/templating/variable_srv.ts @@ -11,7 +11,7 @@ import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; // Types -import { TimeRange } from '@grafana/ui/src'; +import { TimeRange } from '@grafana/data'; export class VariableSrv { dashboard: DashboardModel; diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts index 5a92122f221..6334188b599 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.ts +++ b/public/app/plugins/datasource/cloudwatch/datasource.ts @@ -1,9 +1,9 @@ import angular from 'angular'; import _ from 'lodash'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import kbn from 'app/core/utils/kbn'; import { CloudWatchQuery } from './types'; -import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings } from '@grafana/ui/src/types'; +import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings } from '@grafana/ui'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts index faa169e5394..6536ce7df41 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 '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/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/cloudwatch/types.ts b/public/app/plugins/datasource/cloudwatch/types.ts index 8436d63e7c8..aaffcad0df3 100644 --- a/public/app/plugins/datasource/cloudwatch/types.ts +++ b/public/app/plugins/datasource/cloudwatch/types.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/ui/src/types'; +import { DataQuery } from '@grafana/ui'; export interface CloudWatchQuery extends DataQuery { id: string; diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts index dd69b7fbf3d..59dec5cf9a0 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.ts +++ b/public/app/plugins/datasource/elasticsearch/datasource.ts @@ -4,7 +4,7 @@ import { DataSourceApi, DataSourceInstanceSettings, DataQueryRequest, DataQueryR import { ElasticResponse } from './elastic_response'; import { IndexPattern } from './index_pattern'; import { ElasticQueryBuilder } from './query_builder'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; import * as queryDef from './query_def'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.ts b/public/app/plugins/datasource/elasticsearch/elastic_response.ts index db7aab4d45a..5eed3a1af1d 100644 --- a/public/app/plugins/datasource/elasticsearch/elastic_response.ts +++ b/public/app/plugins/datasource/elasticsearch/elastic_response.ts @@ -2,7 +2,8 @@ import _ from 'lodash'; import flatten from 'app/core/utils/flatten'; import * as queryDef from './query_def'; import TableModel from 'app/core/table_model'; -import { DataFrame, DataQueryResponse, toDataFrame, FieldType } from '@grafana/ui'; +import { DataFrame, toDataFrame, FieldType } from '@grafana/data'; +import { DataQueryResponse } from '@grafana/ui'; export class ElasticResponse { constructor(private targets, private response) { diff --git a/public/app/plugins/datasource/elasticsearch/index_pattern.ts b/public/app/plugins/datasource/elasticsearch/index_pattern.ts index 630777690b0..3d62f6661b1 100644 --- a/public/app/plugins/datasource/elasticsearch/index_pattern.ts +++ b/public/app/plugins/datasource/elasticsearch/index_pattern.ts @@ -1,4 +1,4 @@ -import { toUtc, dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc, dateTime } from '@grafana/data'; const intervalMap = { Hourly: { startOf: 'hour', amount: 'hours' }, diff --git a/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts index 75a34e48d52..d3f0007c746 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts @@ -1,8 +1,8 @@ import angular, { IQService } from 'angular'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import _ from 'lodash'; import { ElasticDatasource, getMaxConcurrenShardRequestOrDefault } from '../datasource'; -import { toUtc, dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc, dateTime } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/elasticsearch/specs/index_pattern.test.ts b/public/app/plugins/datasource/elasticsearch/specs/index_pattern.test.ts index b930d88d77a..fbb97d4264a 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/index_pattern.test.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/index_pattern.test.ts @@ -1,7 +1,7 @@ /// import { IndexPattern } from '../index_pattern'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; describe('IndexPattern', () => { describe('when getting index for today', () => { diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts index df8c36175ae..76d37950467 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts @@ -1,7 +1,7 @@ import AzureMonitorDatasource from '../datasource'; import Q from 'q'; import { TemplateSrv } from 'app/features/templating/template_srv'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; describe('AppInsightsDatasource', () => { const ctx: any = { diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_querystring_builder.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_querystring_builder.test.ts index 6ef7e051034..006ae1fc25a 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_querystring_builder.test.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_querystring_builder.test.ts @@ -1,5 +1,5 @@ import AppInsightsQuerystringBuilder from './app_insights_querystring_builder'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; describe('AppInsightsQuerystringBuilder', () => { let builder: AppInsightsQuerystringBuilder; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/response_parser.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/response_parser.ts index a346907b6dd..ac9bdfce0ef 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/response_parser.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/response_parser.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; export default class ResponseParser { constructor(private results: any) {} diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.test.ts index 55dd9eee98f..12272be2052 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.test.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.test.ts @@ -4,7 +4,7 @@ import FakeSchemaData from './__mocks__/schema'; import Q from 'q'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { KustoSchema } from '../types'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; describe('AzureLogAnalyticsDatasource', () => { const ctx: any = { diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts index c50d2c4e77e..790228fe87b 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import LogAnalyticsQuerystringBuilder from '../log_analytics/querystring_builder'; import ResponseParser from './response_parser'; import { AzureMonitorQuery, AzureDataSourceJsonData } from '../types'; -import { DataQueryRequest, DataSourceInstanceSettings } from '@grafana/ui/src/types'; +import { DataQueryRequest, DataSourceInstanceSettings } from '@grafana/ui'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { IQService } from 'angular'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts index 9c7fc128d9f..5e067435735 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; import { AzureLogsVariable, AzureLogsTableData, @@ -9,7 +9,7 @@ import { KustoSchema, KustoColumn, } from '../types'; -import { TimeSeries, AnnotationEvent } from '@grafana/ui/src/types'; +import { TimeSeries, AnnotationEvent } from '@grafana/data'; export default class ResponseParser { columns: string[]; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts index ee5147cffe2..96967e674c6 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts @@ -2,7 +2,7 @@ import AzureMonitorDatasource from '../datasource'; // @ts-ignore import Q from 'q'; import { TemplateSrv } from 'app/features/templating/template_srv'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; describe('AzureMonitorDatasource', () => { const ctx: any = { diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts index 3c1788cf427..a17dc1cf6a3 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts @@ -9,13 +9,9 @@ import { AzureMonitorMetricDefinitionsResponse, AzureMonitorResourceGroupsResponse, } from '../types'; -import { - DataQueryRequest, - DataQueryResponseData, - DataSourceInstanceSettings, - TimeSeries, - toDataFrame, -} from '@grafana/ui'; +import { DataQueryRequest, DataQueryResponseData, DataSourceInstanceSettings } from '@grafana/ui'; + +import { TimeSeries, toDataFrame } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts index 59e9a170237..a2c47d7c56d 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts @@ -3,7 +3,7 @@ import AzureMonitorDatasource from './azure_monitor/azure_monitor_datasource'; import AppInsightsDatasource from './app_insights/app_insights_datasource'; import AzureLogAnalyticsDatasource from './azure_log_analytics/azure_log_analytics_datasource'; import { AzureMonitorQuery, AzureDataSourceJsonData } from './types'; -import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings } from '@grafana/ui/src/types'; +import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings } from '@grafana/ui'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { IQService } from 'angular'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts index 186c78743f8..7e5ee1b3004 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts @@ -1,5 +1,5 @@ import LogAnalyticsQuerystringBuilder from './querystring_builder'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; describe('LogAnalyticsDatasource', () => { let builder: LogAnalyticsQuerystringBuilder; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts index 8e764b8a55e..fda4ef5d772 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts @@ -1,4 +1,4 @@ -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; export default class LogAnalyticsQuerystringBuilder { constructor(public rawQueryString: string, public options: any, public defaultTimeField: any) {} diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts index 64cc8e36790..55d5db938ac 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts @@ -7,7 +7,7 @@ import kbn from 'app/core/utils/kbn'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { auto } from 'angular'; -import { DataFrame } from '@grafana/ui'; +import { DataFrame } from '@grafana/data'; export interface ResultFormat { text: string; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts index 2f1b29204f7..5db97068d86 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui/src/types'; +import { DataQuery, DataSourceJsonData } from '@grafana/ui'; export interface AzureMonitorQuery extends DataQuery { format: string; diff --git a/public/app/plugins/datasource/grafana/specs/datasource.test.ts b/public/app/plugins/datasource/grafana/specs/datasource.test.ts index c1ee1bb65a3..6ddf3d4b863 100644 --- a/public/app/plugins/datasource/grafana/specs/datasource.test.ts +++ b/public/app/plugins/datasource/grafana/specs/datasource.test.ts @@ -1,7 +1,7 @@ import { GrafanaDatasource } from '../datasource'; // @ts-ignore import q from 'q'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; describe('grafana data source', () => { describe('when executing an annotations query', () => { diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts index c0f924649f5..088a5344078 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 '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import { isVersionGtOrEq, SemVersion } from 'app/core/utils/version'; import gfunc from './gfunc'; import { IQService } from 'angular'; diff --git a/public/app/plugins/datasource/graphite/specs/datasource.test.ts b/public/app/plugins/datasource/graphite/specs/datasource.test.ts index ef5b8a55bb6..eb4920b7739 100644 --- a/public/app/plugins/datasource/graphite/specs/datasource.test.ts +++ b/public/app/plugins/datasource/graphite/specs/datasource.test.ts @@ -3,7 +3,7 @@ import _ from 'lodash'; // @ts-ignore import $q from 'q'; import { TemplateSrvStub } from 'test/specs/helpers'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; describe('graphiteDatasource', () => { const ctx: any = { diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index 79575a19ca8..8bcadf53b2c 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 '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import InfluxSeries from './influx_series'; import InfluxQueryModel from './influx_query_model'; import ResponseParser from './response_parser'; diff --git a/public/app/plugins/datasource/influxdb/influx_series.ts b/public/app/plugins/datasource/influxdb/influx_series.ts index 96db2633000..1ea68c6b314 100644 --- a/public/app/plugins/datasource/influxdb/influx_series.ts +++ b/public/app/plugins/datasource/influxdb/influx_series.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import TableModel from 'app/core/table_model'; -import { FieldType } from '@grafana/ui'; +import { FieldType } from '@grafana/data'; export default class InfluxSeries { series: any; diff --git a/public/app/plugins/datasource/influxdb/types.ts b/public/app/plugins/datasource/influxdb/types.ts index 048afcea5d7..d406ef57eb7 100644 --- a/public/app/plugins/datasource/influxdb/types.ts +++ b/public/app/plugins/datasource/influxdb/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui/src/types'; +import { DataQuery, DataSourceJsonData } from '@grafana/ui'; export interface InfluxOptions extends DataSourceJsonData { timeInterval: string; diff --git a/public/app/plugins/datasource/input/InputConfigEditor.tsx b/public/app/plugins/datasource/input/InputConfigEditor.tsx index a5dc70d24d2..f06cfea5696 100644 --- a/public/app/plugins/datasource/input/InputConfigEditor.tsx +++ b/public/app/plugins/datasource/input/InputConfigEditor.tsx @@ -4,7 +4,8 @@ import React, { PureComponent } from 'react'; // Types import { InputOptions } from './types'; -import { DataSourcePluginOptionsEditorProps, DataSourceSettings, DataFrame, TableInputCSV, toCSV } from '@grafana/ui'; +import { DataSourcePluginOptionsEditorProps, DataSourceSettings, TableInputCSV } from '@grafana/ui'; +import { DataFrame, toCSV } from '@grafana/data'; type InputSettings = DataSourceSettings; diff --git a/public/app/plugins/datasource/input/InputDatasource.test.ts b/public/app/plugins/datasource/input/InputDatasource.test.ts index 8268a9d4755..3993bc8eda7 100644 --- a/public/app/plugins/datasource/input/InputDatasource.test.ts +++ b/public/app/plugins/datasource/input/InputDatasource.test.ts @@ -1,6 +1,7 @@ import InputDatasource, { describeDataFrame } from './InputDatasource'; import { InputQuery, InputOptions } from './types'; -import { readCSV, DataSourceInstanceSettings, PluginMeta } from '@grafana/ui'; +import { readCSV } from '@grafana/data'; +import { DataSourceInstanceSettings, PluginMeta } from '@grafana/ui'; import { getQueryOptions } from 'test/helpers/getQueryOptions'; describe('InputDatasource', () => { diff --git a/public/app/plugins/datasource/input/InputDatasource.ts b/public/app/plugins/datasource/input/InputDatasource.ts index eca8a542b8f..6754b021c63 100644 --- a/public/app/plugins/datasource/input/InputDatasource.ts +++ b/public/app/plugins/datasource/input/InputDatasource.ts @@ -1,12 +1,13 @@ // Types import { DataQueryRequest, - DataFrame, DataQueryResponse, DataSourceApi, DataSourceInstanceSettings, MetricFindValue, -} from '@grafana/ui/src/types'; +} from '@grafana/ui'; +import { DataFrame } from '@grafana/data'; + import { InputQuery, InputOptions } from './types'; export class InputDatasource extends DataSourceApi { diff --git a/public/app/plugins/datasource/input/InputQueryEditor.tsx b/public/app/plugins/datasource/input/InputQueryEditor.tsx index 73f0d8da39d..df48f12db42 100644 --- a/public/app/plugins/datasource/input/InputQueryEditor.tsx +++ b/public/app/plugins/datasource/input/InputQueryEditor.tsx @@ -5,7 +5,8 @@ import React, { PureComponent } from 'react'; import { InputDatasource, describeDataFrame } from './InputDatasource'; import { InputQuery, InputOptions } from './types'; -import { FormLabel, Select, QueryEditorProps, SelectOptionItem, DataFrame, TableInputCSV, toCSV } from '@grafana/ui'; +import { FormLabel, Select, QueryEditorProps, SelectOptionItem, TableInputCSV } from '@grafana/ui'; +import { DataFrame, toCSV } from '@grafana/data'; type Props = QueryEditorProps; diff --git a/public/app/plugins/datasource/input/types.ts b/public/app/plugins/datasource/input/types.ts index 7ad2b0b2a28..1d96ce663a6 100644 --- a/public/app/plugins/datasource/input/types.ts +++ b/public/app/plugins/datasource/input/types.ts @@ -1,4 +1,5 @@ -import { DataQuery, DataFrame, DataSourceJsonData } from '@grafana/ui/src/types'; +import { DataQuery, DataSourceJsonData } from '@grafana/ui'; +import { DataFrame } from '@grafana/data'; export interface InputQuery extends DataQuery { // Data saved in the panel diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx index f36623596d2..71310b43ded 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx @@ -5,7 +5,7 @@ import React, { PureComponent } from 'react'; // import { Select, SelectOptionItem } from '@grafana/ui'; // Types -import { QueryEditorProps } from '@grafana/ui/src/types'; +import { QueryEditorProps } from '@grafana/ui'; import { LokiDatasource } from '../datasource'; import { LokiQuery } from '../types'; // import { LokiQueryField } from './LokiQueryField'; diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts index e511a759f61..b05cfa0cbf5 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -1,7 +1,8 @@ import LokiDatasource from './datasource'; import { LokiQuery } from './types'; import { getQueryOptions } from 'test/helpers/getQueryOptions'; -import { DataFrame, DataSourceApi } from '@grafana/ui'; +import { DataSourceApi } from '@grafana/ui'; +import { DataFrame } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index e77f7252544..2ac41add6c4 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -5,7 +5,7 @@ import { webSocket } from 'rxjs/webSocket'; import { catchError, map } from 'rxjs/operators'; // Services & Utils -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import { addLabelToSelector } from 'app/plugins/datasource/prometheus/add_label_to_query'; import LanguageProvider from './language_provider'; import { logStreamToDataFrame } from './result_transformer'; @@ -14,18 +14,16 @@ import { formatQuery, parseQuery, getHighlighterExpressionsFromQuery } from './q // Types import { PluginMeta, - DataQueryRequest, - DataFrame, DataSourceApi, DataSourceInstanceSettings, DataQueryError, - LogRowModel, + DataQueryRequest, DataStreamObserver, - LoadingState, DataStreamState, DataQueryResponse, - DateTime, } from '@grafana/ui'; + +import { DataFrame, LogRowModel, LoadingState, DateTime } from '@grafana/data'; import { LokiQuery, LokiOptions } from './types'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/loki/language_provider.ts b/public/app/plugins/datasource/loki/language_provider.ts index ff187bd8842..0c4877066d7 100644 --- a/public/app/plugins/datasource/loki/language_provider.ts +++ b/public/app/plugins/datasource/loki/language_provider.ts @@ -15,7 +15,7 @@ import { HistoryItem, } from 'app/types/explore'; import { LokiQuery } from './types'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; import { PromQuery } from '../prometheus/types'; const DEFAULT_KEYS = ['job', 'namespace']; diff --git a/public/app/plugins/datasource/loki/result_transformer.ts b/public/app/plugins/datasource/loki/result_transformer.ts index aaae47f3090..e3ae19564e5 100644 --- a/public/app/plugins/datasource/loki/result_transformer.ts +++ b/public/app/plugins/datasource/loki/result_transformer.ts @@ -1,5 +1,5 @@ import { LokiLogsStream } from './types'; -import { DataFrame, parseLabels, FieldType, Labels } from '@grafana/ui'; +import { DataFrame, parseLabels, FieldType, Labels } from '@grafana/data'; export function logStreamToDataFrame(stream: LokiLogsStream): DataFrame { let labels: Labels = stream.parsedLabels; diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts index e733c3b47cb..8becdb608fd 100644 --- a/public/app/plugins/datasource/loki/types.ts +++ b/public/app/plugins/datasource/loki/types.ts @@ -1,4 +1,5 @@ -import { DataQuery, Labels, DataSourceJsonData } from '@grafana/ui/src/types'; +import { DataQuery, DataSourceJsonData } from '@grafana/ui'; +import { Labels } from '@grafana/data'; export interface LokiQuery extends DataQuery { expr: string; diff --git a/public/app/plugins/datasource/mssql/specs/datasource.test.ts b/public/app/plugins/datasource/mssql/specs/datasource.test.ts index b4d1b088ae8..b99d916cfc6 100644 --- a/public/app/plugins/datasource/mssql/specs/datasource.test.ts +++ b/public/app/plugins/datasource/mssql/specs/datasource.test.ts @@ -3,7 +3,7 @@ import { TemplateSrvStub, TimeSrvStub } from 'test/specs/helpers'; import { CustomVariable } from 'app/features/templating/custom_variable'; // @ts-ignore import q from 'q'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; describe('MSSQLDatasource', () => { const ctx: any = { diff --git a/public/app/plugins/datasource/mysql/specs/datasource.test.ts b/public/app/plugins/datasource/mysql/specs/datasource.test.ts index c9b7c6b1afa..3e16949df94 100644 --- a/public/app/plugins/datasource/mysql/specs/datasource.test.ts +++ b/public/app/plugins/datasource/mysql/specs/datasource.test.ts @@ -1,6 +1,6 @@ import { MysqlDatasource } from '../datasource'; import { CustomVariable } from 'app/features/templating/custom_variable'; -import { toUtc, dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc, dateTime } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; describe('MySQLDatasource', () => { diff --git a/public/app/plugins/datasource/opentsdb/datasource.ts b/public/app/plugins/datasource/opentsdb/datasource.ts index 46d692f99d4..08add4b97ac 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.ts +++ b/public/app/plugins/datasource/opentsdb/datasource.ts @@ -1,6 +1,6 @@ import angular, { IQService } from 'angular'; import _ from 'lodash'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { DataQueryRequest } from '@grafana/ui'; diff --git a/public/app/plugins/datasource/postgres/specs/datasource.test.ts b/public/app/plugins/datasource/postgres/specs/datasource.test.ts index f762f39d608..819e8e5eb08 100644 --- a/public/app/plugins/datasource/postgres/specs/datasource.test.ts +++ b/public/app/plugins/datasource/postgres/specs/datasource.test.ts @@ -1,6 +1,6 @@ import { PostgresDatasource } from '../datasource'; import { CustomVariable } from 'app/features/templating/custom_variable'; -import { toUtc, dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc, dateTime } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { IQService } from 'angular'; diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.test.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.test.tsx index d3f0ff2aa2b..46dfc70e876 100644 --- a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.test.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { dateTime } from '@grafana/ui'; +import { dateTime } from '@grafana/data'; import { PromQueryEditor } from './PromQueryEditor'; import { PrometheusDatasource } from '../datasource'; diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx index 7e45dc6f53c..773e1dadb45 100644 --- a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx @@ -3,7 +3,7 @@ import React, { PureComponent } from 'react'; // Types import { FormLabel, Select, SelectOptionItem, Switch } from '@grafana/ui'; -import { QueryEditorProps, DataSourceStatus } from '@grafana/ui/src/types'; +import { QueryEditorProps, DataSourceStatus } from '@grafana/ui'; import { PrometheusDatasource } from '../datasource'; import { PromQuery, PromOptions } from '../types'; diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx index 9a7c839e303..c50fdb5d39b 100644 --- a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx @@ -15,7 +15,8 @@ import BracesPlugin from 'app/features/explore/slate-plugins/braces'; import QueryField, { TypeaheadInput, QueryFieldState } from 'app/features/explore/QueryField'; import { PromQuery, PromContext, PromOptions } from '../types'; import { CancelablePromise, makePromiseCancelable } from 'app/core/utils/CancelablePromise'; -import { ExploreQueryFieldProps, DataSourceStatus, QueryHint, isDataFrame, toLegacyResponseData } from '@grafana/ui'; +import { ExploreQueryFieldProps, DataSourceStatus, QueryHint } from '@grafana/ui'; +import { isDataFrame, toLegacyResponseData } from '@grafana/data'; import { PrometheusDatasource } from '../datasource'; const HISTOGRAM_GROUP = '__histograms__'; diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts index de85be08ebb..e833f57c454 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -6,7 +6,7 @@ import { single, map, filter, catchError } from 'rxjs/operators'; // Services & Utils import kbn from 'app/core/utils/kbn'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import PrometheusMetricFindQuery from './metric_find_query'; import { ResultTransformer } from './result_transformer'; import PrometheusLanguageProvider from './language_provider'; @@ -20,19 +20,17 @@ import { PromQuery, PromOptions, PromQueryRequest, PromContext } from './types'; import { DataQueryRequest, DataSourceApi, - AnnotationEvent, DataSourceInstanceSettings, DataQueryError, DataStreamObserver, - LoadingState, DataStreamState, DataQueryResponseData, -} from '@grafana/ui/src/types'; +} from '@grafana/ui'; import { ExploreUrlState } from 'app/types/explore'; import { safeStringifyValue } from 'app/core/utils/explore'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; -import { TimeRange, DateTime } from '@grafana/ui/src'; +import { TimeRange, DateTime, LoadingState, AnnotationEvent } from '@grafana/data'; export interface PromDataQueryResponse { data: { diff --git a/public/app/plugins/datasource/prometheus/language_provider.ts b/public/app/plugins/datasource/prometheus/language_provider.ts index b281fe03336..294ad9b2880 100644 --- a/public/app/plugins/datasource/prometheus/language_provider.ts +++ b/public/app/plugins/datasource/prometheus/language_provider.ts @@ -10,7 +10,7 @@ import { import { parseSelector, processLabels, processHistogramLabels } from './language_utils'; import PromqlSyntax, { FUNCTIONS, RATE_RANGES } from './promql'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; const DEFAULT_KEYS = ['job', 'instance']; const EMPTY_SELECTOR = '{}'; diff --git a/public/app/plugins/datasource/prometheus/metric_find_query.ts b/public/app/plugins/datasource/prometheus/metric_find_query.ts index 60f7c15f3b9..3836ce86eac 100644 --- a/public/app/plugins/datasource/prometheus/metric_find_query.ts +++ b/public/app/plugins/datasource/prometheus/metric_find_query.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { TimeRange } from '@grafana/ui'; +import { TimeRange } from '@grafana/data'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { PrometheusDatasource, PromDataQueryResponse } from './datasource'; import { PromQueryRequest } from './types'; diff --git a/public/app/plugins/datasource/prometheus/query_hints.ts b/public/app/plugins/datasource/prometheus/query_hints.ts index 734090f8abb..cc0f13ce166 100644 --- a/public/app/plugins/datasource/prometheus/query_hints.ts +++ b/public/app/plugins/datasource/prometheus/query_hints.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { QueryHint, QueryFix } from '@grafana/ui/src/types'; +import { QueryHint, QueryFix } from '@grafana/ui'; /** * Number of time series results needed before starting to suggest sum aggregation hints diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts index 92027dd2717..204a5490815 100644 --- a/public/app/plugins/datasource/prometheus/result_transformer.ts +++ b/public/app/plugins/datasource/prometheus/result_transformer.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import TableModel from 'app/core/table_model'; -import { TimeSeries, FieldType } from '@grafana/ui'; +import { TimeSeries, FieldType } from '@grafana/data'; import { TemplateSrv } from 'app/features/templating/template_srv'; export class ResultTransformer { diff --git a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts index 433b6520bdd..1e51b7687e1 100644 --- a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts +++ b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts @@ -8,7 +8,7 @@ import { prometheusRegularEscape, prometheusSpecialRegexEscape, } from '../datasource'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; import { DataSourceInstanceSettings, DataQueryResponseData } from '@grafana/ui'; import { PromOptions } from '../types'; import { TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts b/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts index e3c3b27ad3b..1dcd73e5c21 100644 --- a/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts +++ b/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts @@ -2,7 +2,7 @@ import { PrometheusDatasource } from '../datasource'; import PrometheusMetricFindQuery from '../metric_find_query'; //@ts-ignore import q from 'q'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; import { DataSourceInstanceSettings } from '@grafana/ui'; import { PromOptions } from '../types'; diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts index 6ea155b4d7b..dc548ae13ea 100644 --- a/public/app/plugins/datasource/prometheus/types.ts +++ b/public/app/plugins/datasource/prometheus/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui/src/types'; +import { DataQuery, DataSourceJsonData } from '@grafana/ui'; export enum PromContext { Explore = 'explore', diff --git a/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx b/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx index 7e566dfdb10..983736b7c44 100644 --- a/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx +++ b/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx @@ -13,7 +13,8 @@ import { Help } from './Help'; import { StackdriverQuery, MetricDescriptor } from '../types'; import { getAlignmentPickerData } from '../functions'; import StackdriverDatasource from '../datasource'; -import { SelectOptionItem, TimeSeries } from '@grafana/ui'; +import { SelectOptionItem } from '@grafana/ui'; +import { TimeSeries } from '@grafana/data'; export interface Props { onQueryChange: (target: StackdriverQuery) => void; diff --git a/public/app/plugins/datasource/stackdriver/datasource.ts b/public/app/plugins/datasource/stackdriver/datasource.ts index 8f2ba3203a3..02a69583059 100644 --- a/public/app/plugins/datasource/stackdriver/datasource.ts +++ b/public/app/plugins/datasource/stackdriver/datasource.ts @@ -3,7 +3,7 @@ import appEvents from 'app/core/app_events'; import _ from 'lodash'; import StackdriverMetricFindQuery from './StackdriverMetricFindQuery'; import { StackdriverQuery, MetricDescriptor, StackdriverOptions } from './types'; -import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings, ScopedVars } from '@grafana/ui/src/types'; +import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings, ScopedVars } from '@grafana/ui'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/plugins/datasource/stackdriver/specs/datasource.test.ts b/public/app/plugins/datasource/stackdriver/specs/datasource.test.ts index 4252bc7932b..1c850a3843e 100644 --- a/public/app/plugins/datasource/stackdriver/specs/datasource.test.ts +++ b/public/app/plugins/datasource/stackdriver/specs/datasource.test.ts @@ -2,7 +2,7 @@ import StackdriverDataSource from '../datasource'; import { metricDescriptors } from './testData'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { CustomVariable } from 'app/features/templating/all'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; import { DataSourceInstanceSettings } from '@grafana/ui'; import { StackdriverOptions } from '../types'; import { BackendSrv } from 'app/core/services/backend_srv'; diff --git a/public/app/plugins/datasource/stackdriver/types.ts b/public/app/plugins/datasource/stackdriver/types.ts index 258153bb2d4..141a822f9a2 100644 --- a/public/app/plugins/datasource/stackdriver/types.ts +++ b/public/app/plugins/datasource/stackdriver/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui/src/types'; +import { DataQuery, DataSourceJsonData } from '@grafana/ui'; export enum MetricFindQueryTypes { Services = 'services', diff --git a/public/app/plugins/datasource/testdata/QueryEditor.tsx b/public/app/plugins/datasource/testdata/QueryEditor.tsx index 324848400ff..7fc059ef216 100644 --- a/public/app/plugins/datasource/testdata/QueryEditor.tsx +++ b/public/app/plugins/datasource/testdata/QueryEditor.tsx @@ -9,7 +9,7 @@ import { getBackendSrv } from '@grafana/runtime'; import { FormLabel, Select, SelectOptionItem } from '@grafana/ui'; // Types -import { QueryEditorProps } from '@grafana/ui/src/types'; +import { QueryEditorProps } from '@grafana/ui'; import { TestDataDatasource } from './datasource'; import { TestDataQuery, Scenario } from './types'; diff --git a/public/app/plugins/datasource/testdata/StreamHandler.ts b/public/app/plugins/datasource/testdata/StreamHandler.ts index 42b80db0bf8..be8c74524d2 100644 --- a/public/app/plugins/datasource/testdata/StreamHandler.ts +++ b/public/app/plugins/datasource/testdata/StreamHandler.ts @@ -1,16 +1,7 @@ import defaults from 'lodash/defaults'; -import { - DataQueryRequest, - FieldType, - DataFrame, - DataQueryResponse, - DataQueryError, - DataStreamObserver, - DataStreamState, - LoadingState, - LogLevel, - CSVReader, -} from '@grafana/ui'; +import { DataQueryRequest, DataQueryResponse, DataQueryError, DataStreamObserver, DataStreamState } from '@grafana/ui'; + +import { FieldType, DataFrame, LoadingState, LogLevel, CSVReader } from '@grafana/data'; import { TestDataQuery, StreamingQuery } from './types'; export const defaultQuery: StreamingQuery = { diff --git a/public/app/plugins/datasource/testdata/datasource.ts b/public/app/plugins/datasource/testdata/datasource.ts index c3b706153b3..903915d3c1c 100644 --- a/public/app/plugins/datasource/testdata/datasource.ts +++ b/public/app/plugins/datasource/testdata/datasource.ts @@ -1,12 +1,7 @@ import _ from 'lodash'; -import { - DataSourceApi, - DataQueryRequest, - TableData, - TimeSeries, - DataSourceInstanceSettings, - DataStreamObserver, -} from '@grafana/ui'; +import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings, DataStreamObserver } from '@grafana/ui'; + +import { TableData, TimeSeries } from '@grafana/data'; import { TestDataQuery, Scenario } from './types'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { StreamHandler } from './StreamHandler'; diff --git a/public/app/plugins/datasource/testdata/query_ctrl.ts b/public/app/plugins/datasource/testdata/query_ctrl.ts index 1e661cdb771..0df7d4f13df 100644 --- a/public/app/plugins/datasource/testdata/query_ctrl.ts +++ b/public/app/plugins/datasource/testdata/query_ctrl.ts @@ -3,7 +3,7 @@ import _ from 'lodash'; import { QueryCtrl } from 'app/plugins/sdk'; import { defaultQuery } from './StreamHandler'; import { getBackendSrv } from 'app/core/services/backend_srv'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; export class TestDataQueryCtrl extends QueryCtrl { static templateUrl = 'partials/query.editor.html'; diff --git a/public/app/plugins/datasource/testdata/types.ts b/public/app/plugins/datasource/testdata/types.ts index 12c14426b40..7b458655590 100644 --- a/public/app/plugins/datasource/testdata/types.ts +++ b/public/app/plugins/datasource/testdata/types.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/ui/src/types'; +import { DataQuery } from '@grafana/ui'; export interface Scenario { id: string; diff --git a/public/app/plugins/panel/alertlist/module.ts b/public/app/plugins/panel/alertlist/module.ts index 85acd9cb2d0..edafee0daf5 100644 --- a/public/app/plugins/panel/alertlist/module.ts +++ b/public/app/plugins/panel/alertlist/module.ts @@ -2,8 +2,8 @@ import _ from 'lodash'; import alertDef from '../../../features/alerting/state/alertDef'; import { PanelCtrl } from 'app/plugins/sdk'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import * as dateMath from '@grafana/data/src/utils/datemath'; +import { dateTime } from '@grafana/data'; import { auto } from 'angular'; import { BackendSrv } from '@grafana/runtime'; diff --git a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx index f861ca10842..b0df78da0f2 100644 --- a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx +++ b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx @@ -9,7 +9,7 @@ import { BarGauge, VizRepeater, getFieldDisplayValues, FieldDisplay } from '@gra // Types import { BarGaugeOptions } from './types'; -import { PanelProps } from '@grafana/ui/src/types'; +import { PanelProps } from '@grafana/ui'; export class BarGaugePanel extends PureComponent> { renderValue = (value: FieldDisplay, width: number, height: number): JSX.Element => { diff --git a/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx b/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx index 4a0bdc95a7e..aef5e21ea95 100644 --- a/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx +++ b/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx @@ -8,10 +8,10 @@ import { PanelOptionsGrid, FieldDisplayEditor, FieldDisplayOptions, - Field, FieldPropertiesEditor, PanelOptionsGroup, } from '@grafana/ui'; +import { Field } from '@grafana/data'; // Types import { FormLabel, PanelEditorProps, Threshold, Select, ValueMapping } from '@grafana/ui'; diff --git a/public/app/plugins/panel/gauge/GaugeMigrations.ts b/public/app/plugins/panel/gauge/GaugeMigrations.ts index 090dcd14a41..961c1e07c71 100644 --- a/public/app/plugins/panel/gauge/GaugeMigrations.ts +++ b/public/app/plugins/panel/gauge/GaugeMigrations.ts @@ -1,4 +1,5 @@ -import { PanelModel, Field, getFieldReducers } from '@grafana/ui'; +import { Field, getFieldReducers } from '@grafana/data'; +import { PanelModel } from '@grafana/ui'; import { GaugeOptions } from './types'; import { sharedSingleStatMigrationCheck } from '@grafana/ui/src/components/SingleStatShared/SingleStatBaseOptions'; import { FieldDisplayOptions } from '@grafana/ui/src/utils/fieldDisplay'; diff --git a/public/app/plugins/panel/gauge/GaugePanelEditor.tsx b/public/app/plugins/panel/gauge/GaugePanelEditor.tsx index 9236dfe04f2..638c97dd41f 100644 --- a/public/app/plugins/panel/gauge/GaugePanelEditor.tsx +++ b/public/app/plugins/panel/gauge/GaugePanelEditor.tsx @@ -9,11 +9,11 @@ import { ValueMapping, FieldDisplayOptions, FieldDisplayEditor, - Field, FieldPropertiesEditor, Switch, PanelOptionsGroup, } from '@grafana/ui'; +import { Field } from '@grafana/data'; import { GaugeOptions } from './types'; diff --git a/public/app/plugins/panel/gettingstarted/GettingStarted.tsx b/public/app/plugins/panel/gettingstarted/GettingStarted.tsx index 007e940ba1e..43ad7c3ab85 100644 --- a/public/app/plugins/panel/gettingstarted/GettingStarted.tsx +++ b/public/app/plugins/panel/gettingstarted/GettingStarted.tsx @@ -1,7 +1,7 @@ // Libraries import React, { PureComponent } from 'react'; -import { PanelProps } from '@grafana/ui/src/types'; +import { PanelProps } from '@grafana/ui'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { contextSrv } from 'app/core/core'; diff --git a/public/app/plugins/panel/graph/GraphContextMenu.tsx b/public/app/plugins/panel/graph/GraphContextMenu.tsx index 12c4e5747f3..b9758e61950 100644 --- a/public/app/plugins/panel/graph/GraphContextMenu.tsx +++ b/public/app/plugins/panel/graph/GraphContextMenu.tsx @@ -1,6 +1,7 @@ import React, { useContext } from 'react'; import { FlotDataPoint } from './GraphContextMenuCtrl'; -import { ContextMenu, ContextMenuProps, dateTime, SeriesIcon, ThemeContext } from '@grafana/ui'; +import { ContextMenu, ContextMenuProps, SeriesIcon, ThemeContext } from '@grafana/ui'; +import { dateTime } from '@grafana/data'; import { css } from 'emotion'; type GraphContextMenuProps = ContextMenuProps & { diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts index bbc438e1c57..55ddeb7a42f 100644 --- a/public/app/plugins/panel/graph/data_processor.ts +++ b/public/app/plugins/panel/graph/data_processor.ts @@ -1,5 +1,6 @@ import _ from 'lodash'; -import { TimeRange, colors, getColorFromHexRgbOrName, FieldCache, FieldType, Field, DataFrame } from '@grafana/ui'; +import { colors, getColorFromHexRgbOrName } from '@grafana/ui'; +import { TimeRange, FieldCache, FieldType, Field, DataFrame } from '@grafana/data'; import TimeSeries from 'app/core/time_series2'; import config from 'app/core/config'; diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts index 42e5590947a..98af26e1d61 100644 --- a/public/app/plugins/panel/graph/graph.ts +++ b/public/app/plugins/panel/graph/graph.ts @@ -27,7 +27,7 @@ import { GraphLegendProps, Legend } from './Legend/Legend'; import { GraphCtrl } from './module'; import { getValueFormat, ContextMenuItem, ContextMenuGroup, DataLink } from '@grafana/ui'; import { provideTheme } from 'app/core/utils/ConfigProvider'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; import { GraphContextMenuCtrl, FlotDataPoint } from './GraphContextMenuCtrl'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { ContextSrv } from 'app/core/services/context_srv'; diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts index 511593ed0c4..ec657432a0e 100644 --- a/public/app/plugins/panel/graph/module.ts +++ b/public/app/plugins/panel/graph/module.ts @@ -11,7 +11,8 @@ import { DataProcessor } from './data_processor'; import { axesEditorComponent } from './axes_editor'; import config from 'app/core/config'; import TimeSeries from 'app/core/time_series2'; -import { getColorFromHexRgbOrName, LegacyResponseData, DataFrame, DataLink, VariableSuggestion } from '@grafana/ui'; +import { DataFrame } from '@grafana/data'; +import { getColorFromHexRgbOrName, LegacyResponseData, DataLink, VariableSuggestion } from '@grafana/ui'; import { getProcessedDataFrame } from 'app/features/dashboard/state/PanelQueryState'; import { PanelQueryRunnerFormat } from 'app/features/dashboard/state/PanelQueryRunner'; import { GraphContextMenuCtrl } from './GraphContextMenuCtrl'; diff --git a/public/app/plugins/panel/graph/specs/graph.test.ts b/public/app/plugins/panel/graph/specs/graph.test.ts index 5f09abecea5..cf13eefe885 100644 --- a/public/app/plugins/panel/graph/specs/graph.test.ts +++ b/public/app/plugins/panel/graph/specs/graph.test.ts @@ -26,7 +26,7 @@ import config from 'app/core/config'; import TimeSeries from 'app/core/time_series2'; import $ from 'jquery'; import { graphDirective } from '../graph'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; const ctx = {} as any; let ctrl: any; diff --git a/public/app/plugins/panel/graph/specs/graph_ctrl.test.ts b/public/app/plugins/panel/graph/specs/graph_ctrl.test.ts index 1fe9a533b75..3c59baf6433 100644 --- a/public/app/plugins/panel/graph/specs/graph_ctrl.test.ts +++ b/public/app/plugins/panel/graph/specs/graph_ctrl.test.ts @@ -1,5 +1,5 @@ import { GraphCtrl } from '../module'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; jest.mock('../graph', () => ({})); diff --git a/public/app/plugins/panel/graph/specs/time_region_manager.test.ts b/public/app/plugins/panel/graph/specs/time_region_manager.test.ts index 056efab99bc..00c5354c496 100644 --- a/public/app/plugins/panel/graph/specs/time_region_manager.test.ts +++ b/public/app/plugins/panel/graph/specs/time_region_manager.test.ts @@ -1,5 +1,5 @@ import { TimeRegionManager, colorModes } from '../time_region_manager'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; describe('TimeRegionManager', () => { function plotOptionsScenario(desc: string, func: any) { diff --git a/public/app/plugins/panel/graph/time_region_manager.ts b/public/app/plugins/panel/graph/time_region_manager.ts index ca53ac7197a..f966b5f6c3c 100644 --- a/public/app/plugins/panel/graph/time_region_manager.ts +++ b/public/app/plugins/panel/graph/time_region_manager.ts @@ -1,7 +1,7 @@ import 'vendor/flot/jquery.flot'; import _ from 'lodash'; -import { GrafanaThemeType, getColorFromHexRgbOrName, AbsoluteTimeRange } from '@grafana/ui'; -import { dateTime, DateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { GrafanaThemeType, getColorFromHexRgbOrName } from '@grafana/ui'; +import { dateTime, DateTime, AbsoluteTimeRange } from '@grafana/data'; type TimeRegionColorDefinition = { fill: string; diff --git a/public/app/plugins/panel/graph2/getGraphSeriesModel.ts b/public/app/plugins/panel/graph2/getGraphSeriesModel.ts index 322d6066e64..bde0b102d37 100644 --- a/public/app/plugins/panel/graph2/getGraphSeriesModel.ts +++ b/public/app/plugins/panel/graph2/getGraphSeriesModel.ts @@ -1,16 +1,13 @@ import { GraphSeriesXY, - NullValueMode, - reduceField, colors, getFlotPairs, getColorFromHexRgbOrName, getDisplayProcessor, DisplayValue, PanelData, - FieldCache, - FieldType, } from '@grafana/ui'; +import { NullValueMode, reduceField, FieldCache, FieldType } from '@grafana/data'; import { SeriesOptions, GraphOptions } from './types'; import { GraphLegendEditorLegendOptions } from './GraphLegendEditor'; diff --git a/public/app/plugins/panel/heatmap/rendering.ts b/public/app/plugins/panel/heatmap/rendering.ts index 4c8b7aacb98..74edcff29da 100644 --- a/public/app/plugins/panel/heatmap/rendering.ts +++ b/public/app/plugins/panel/heatmap/rendering.ts @@ -7,7 +7,7 @@ import { HeatmapTooltip } from './heatmap_tooltip'; import { mergeZeroBuckets } from './heatmap_data_converter'; import { getColorScale, getOpacityScale } from './color_scale'; import { GrafanaThemeType, getColorFromHexRgbOrName, getValueFormat } from '@grafana/ui'; -import { toUtc } from '@grafana/ui/src/utils/moment_wrapper'; +import { toUtc } from '@grafana/data'; const MIN_CARD_SIZE = 1, CARD_PADDING = 1, diff --git a/public/app/plugins/panel/heatmap/specs/heatmap_ctrl.test.ts b/public/app/plugins/panel/heatmap/specs/heatmap_ctrl.test.ts index b30b4a6fb16..aac28d9656c 100644 --- a/public/app/plugins/panel/heatmap/specs/heatmap_ctrl.test.ts +++ b/public/app/plugins/panel/heatmap/specs/heatmap_ctrl.test.ts @@ -1,5 +1,5 @@ import { HeatmapCtrl } from '../heatmap_ctrl'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; describe('HeatmapCtrl', () => { diff --git a/public/app/plugins/panel/piechart/PieChartPanel.tsx b/public/app/plugins/panel/piechart/PieChartPanel.tsx index 9356b080feb..a04e8fee897 100644 --- a/public/app/plugins/panel/piechart/PieChartPanel.tsx +++ b/public/app/plugins/panel/piechart/PieChartPanel.tsx @@ -9,7 +9,7 @@ import { PieChart, getFieldDisplayValues } from '@grafana/ui'; // Types import { PieChartOptions } from './types'; -import { PanelProps } from '@grafana/ui/src/types'; +import { PanelProps } from '@grafana/ui'; interface Props extends PanelProps {} diff --git a/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx b/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx index 2576b21c681..243c5c92f98 100644 --- a/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx +++ b/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx @@ -7,9 +7,9 @@ import { FieldDisplayEditor, FieldDisplayOptions, FieldPropertiesEditor, - Field, PanelOptionsGroup, } from '@grafana/ui'; +import { Field } from '@grafana/data'; import { PieChartOptionsBox } from './PieChartOptionsBox'; import { PieChartOptions } from './types'; diff --git a/public/app/plugins/panel/piechart/types.ts b/public/app/plugins/panel/piechart/types.ts index 5b848486b3f..8d1319e07e7 100644 --- a/public/app/plugins/panel/piechart/types.ts +++ b/public/app/plugins/panel/piechart/types.ts @@ -1,5 +1,6 @@ -import { PieChartType, ReducerID, VizOrientation, SingleStatBaseOptions } from '@grafana/ui'; +import { PieChartType, VizOrientation, SingleStatBaseOptions } from '@grafana/ui'; import { standardFieldDisplayOptions } from '../singlestat2/types'; +import { ReducerID } from '@grafana/data'; export interface PieChartOptions extends SingleStatBaseOptions { pieType: PieChartType; diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts index 937ece9cad2..96a99ac0d4f 100644 --- a/public/app/plugins/panel/singlestat/module.ts +++ b/public/app/plugins/panel/singlestat/module.ts @@ -9,7 +9,8 @@ import kbn from 'app/core/utils/kbn'; import config from 'app/core/config'; import TimeSeries from 'app/core/time_series2'; import { MetricsPanelCtrl } from 'app/plugins/sdk'; -import { GrafanaThemeType, getValueFormat, getColorFromHexRgbOrName, isTableData } from '@grafana/ui'; +import { isTableData } from '@grafana/data'; +import { GrafanaThemeType, getValueFormat, getColorFromHexRgbOrName } from '@grafana/ui'; import { auto } from 'angular'; import { LinkSrv } from 'app/features/panel/panellinks/link_srv'; import TableModel from 'app/core/table_model'; diff --git a/public/app/plugins/panel/singlestat/specs/singlestat.test.ts b/public/app/plugins/panel/singlestat/specs/singlestat.test.ts index 67e038363bb..a604c08504e 100644 --- a/public/app/plugins/panel/singlestat/specs/singlestat.test.ts +++ b/public/app/plugins/panel/singlestat/specs/singlestat.test.ts @@ -1,5 +1,5 @@ import { SingleStatCtrl } from '../module'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; import { LinkSrv } from 'app/features/panel/panellinks/link_srv'; describe('SingleStatCtrl', () => { diff --git a/public/app/plugins/panel/singlestat2/SingleStatEditor.tsx b/public/app/plugins/panel/singlestat2/SingleStatEditor.tsx index 232030dd12b..24d20e9bf1c 100644 --- a/public/app/plugins/panel/singlestat2/SingleStatEditor.tsx +++ b/public/app/plugins/panel/singlestat2/SingleStatEditor.tsx @@ -10,9 +10,9 @@ import { FieldDisplayOptions, FieldDisplayEditor, FieldPropertiesEditor, - Field, PanelOptionsGroup, } from '@grafana/ui'; +import { Field } from '@grafana/data'; import { SingleStatOptions, SparklineOptions } from './types'; import { ColoringEditor } from './ColoringEditor'; diff --git a/public/app/plugins/panel/singlestat2/types.ts b/public/app/plugins/panel/singlestat2/types.ts index bef9097744a..c86d5976c83 100644 --- a/public/app/plugins/panel/singlestat2/types.ts +++ b/public/app/plugins/panel/singlestat2/types.ts @@ -1,4 +1,5 @@ -import { VizOrientation, ReducerID, SingleStatBaseOptions, FieldDisplayOptions } from '@grafana/ui'; +import { VizOrientation, SingleStatBaseOptions, FieldDisplayOptions } from '@grafana/ui'; +import { ReducerID } from '@grafana/data'; export interface SparklineOptions { show: boolean; diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts index 30c5e3960f9..075765d626d 100644 --- a/public/app/plugins/panel/table/module.ts +++ b/public/app/plugins/panel/table/module.ts @@ -6,7 +6,7 @@ import { transformDataToTable } from './transformers'; import { tablePanelEditor } from './editor'; import { columnOptionsTab } from './column_options'; import { TableRenderer } from './renderer'; -import { isTableData } from '@grafana/ui'; +import { isTableData } from '@grafana/data'; import { TemplateSrv } from 'app/features/templating/template_srv'; class TablePanelCtrl extends MetricsPanelCtrl { diff --git a/public/app/plugins/panel/table/renderer.ts b/public/app/plugins/panel/table/renderer.ts index 269df568342..c605ebd11f2 100644 --- a/public/app/plugins/panel/table/renderer.ts +++ b/public/app/plugins/panel/table/renderer.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import { getValueFormat, getColorFromHexRgbOrName, GrafanaThemeType, ScopedVars } from '@grafana/ui'; import { stringToJsRegex } from '@grafana/data'; import { ColumnStyle } from '@grafana/ui/src/components/Table/TableCellBuilder'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { TableRenderModel, ColumnRender } from './types'; diff --git a/public/app/plugins/panel/table/specs/transformers.test.ts b/public/app/plugins/panel/table/specs/transformers.test.ts index 86dbab3a30a..2bdd0eb1b9c 100644 --- a/public/app/plugins/panel/table/specs/transformers.test.ts +++ b/public/app/plugins/panel/table/specs/transformers.test.ts @@ -1,5 +1,5 @@ import { transformers, transformDataToTable } from '../transformers'; -import { TableData } from '@grafana/ui'; +import { TableData } from '@grafana/data'; describe('when transforming time series table', () => { let table: TableData; diff --git a/public/app/plugins/panel/table/transformers.ts b/public/app/plugins/panel/table/transformers.ts index 68cf4b99613..17674273c9e 100644 --- a/public/app/plugins/panel/table/transformers.ts +++ b/public/app/plugins/panel/table/transformers.ts @@ -3,7 +3,7 @@ import flatten from 'app/core/utils/flatten'; import TimeSeries from 'app/core/time_series2'; import TableModel, { mergeTablesIntoModel } from 'app/core/table_model'; import { TableTransform } from './types'; -import { Column, TableData } from '@grafana/ui'; +import { Column, TableData } from '@grafana/data'; const transformers: { [key: string]: TableTransform } = {}; diff --git a/public/app/plugins/panel/table/types.ts b/public/app/plugins/panel/table/types.ts index ff16dc709ea..10f46e99b96 100644 --- a/public/app/plugins/panel/table/types.ts +++ b/public/app/plugins/panel/table/types.ts @@ -1,5 +1,5 @@ import TableModel from 'app/core/table_model'; -import { Column } from '@grafana/ui'; +import { Column } from '@grafana/data'; import { ColumnStyle } from '@grafana/ui/src/components/Table/TableCellBuilder'; export interface TableTransform { diff --git a/public/app/plugins/panel/text2/TextPanel.tsx b/public/app/plugins/panel/text2/TextPanel.tsx index bc15509c5cc..8bad12388e9 100644 --- a/public/app/plugins/panel/text2/TextPanel.tsx +++ b/public/app/plugins/panel/text2/TextPanel.tsx @@ -9,7 +9,7 @@ import config from 'app/core/config'; // Types import { TextOptions } from './types'; -import { PanelProps } from '@grafana/ui/src/types'; +import { PanelProps } from '@grafana/ui'; interface Props extends PanelProps {} interface State { diff --git a/public/app/store/configureStore.ts b/public/app/store/configureStore.ts index 6b3c3dafcbc..c431d736330 100644 --- a/public/app/store/configureStore.ts +++ b/public/app/store/configureStore.ts @@ -28,6 +28,9 @@ import { DataSourceJsonData, DataQueryRequest, DataStreamObserver, +} from '@grafana/ui'; + +import { TimeZone, RawTimeRange, TimeRange, @@ -37,7 +40,7 @@ import { toUtc, dateTime, AbsoluteTimeRange, -} from '@grafana/ui'; +} from '@grafana/data'; import { Observable } from 'rxjs'; import { getQueryResponse } from 'app/core/utils/explore'; import { StoreState } from 'app/types/store'; diff --git a/public/app/types/datasources.ts b/public/app/types/datasources.ts index 12fd607521a..ac7c6a6afe2 100644 --- a/public/app/types/datasources.ts +++ b/public/app/types/datasources.ts @@ -1,5 +1,5 @@ import { LayoutMode } from '../core/components/LayoutSelector/LayoutSelector'; -import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui/src/types'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui'; export interface DataSourcesState { dataSources: DataSourceSettings[]; diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts index 2ca3fa99b8d..d816255ba84 100644 --- a/public/app/types/explore.ts +++ b/public/app/types/explore.ts @@ -1,19 +1,22 @@ import { ComponentClass } from 'react'; import { - RawTimeRange, DataQuery, DataSourceSelectItem, DataSourceApi, QueryHint, ExploreStartPageProps, + DataQueryError, +} from '@grafana/ui'; + +import { + RawTimeRange, LogLevel, TimeRange, - DataQueryError, LogsModel, LogsDedupStrategy, LoadingState, AbsoluteTimeRange, -} from '@grafana/ui'; +} from '@grafana/data'; import { Emitter } from 'app/core/core'; import TableModel from 'app/core/table_model'; diff --git a/public/app/types/user.ts b/public/app/types/user.ts index ec3761c7137..f1863f0387d 100644 --- a/public/app/types/user.ts +++ b/public/app/types/user.ts @@ -1,4 +1,4 @@ -import { TimeZone } from '@grafana/ui/src/types'; +import { TimeZone } from '@grafana/data'; export interface OrgUser { avatarUrl: string; diff --git a/public/test/core/redux/epicTester.ts b/public/test/core/redux/epicTester.ts index 7b5f0a47b76..44f68a58332 100644 --- a/public/test/core/redux/epicTester.ts +++ b/public/test/core/redux/epicTester.ts @@ -8,8 +8,8 @@ import { DataStreamObserver, DataQueryResponse, DataStreamState, - DefaultTimeZone, } from '@grafana/ui'; +import { DefaultTimeZone } from '@grafana/data'; import { ActionOf } from 'app/core/redux/actionCreatorFactory'; import { StoreState } from 'app/types/store'; diff --git a/public/test/helpers/getQueryOptions.ts b/public/test/helpers/getQueryOptions.ts index 2d63e166776..acd458639f4 100644 --- a/public/test/helpers/getQueryOptions.ts +++ b/public/test/helpers/getQueryOptions.ts @@ -1,5 +1,5 @@ import { DataQueryRequest, DataQuery } from '@grafana/ui'; -import { dateTime } from '@grafana/ui/src/utils/moment_wrapper'; +import { dateTime } from '@grafana/data'; export function getQueryOptions( options: Partial> diff --git a/public/test/mocks/mockExploreState.ts b/public/test/mocks/mockExploreState.ts index 87a25441ba1..108b4a63faf 100644 --- a/public/test/mocks/mockExploreState.ts +++ b/public/test/mocks/mockExploreState.ts @@ -3,7 +3,7 @@ import { DataSourceApi } from '@grafana/ui/src/types/datasource'; import { ExploreId, ExploreItemState, ExploreState } from 'app/types/explore'; import { makeExploreItemState } from 'app/features/explore/state/reducers'; import { StoreState, UserState } from 'app/types'; -import { TimeRange, dateTime } from '@grafana/ui'; +import { TimeRange, dateTime } from '@grafana/data'; export const mockExploreState = (options: any = {}) => { const isLive = options.isLive || false; diff --git a/public/test/specs/helpers.ts b/public/test/specs/helpers.ts index aeef0404582..d36fbf7d0e9 100644 --- a/public/test/specs/helpers.ts +++ b/public/test/specs/helpers.ts @@ -1,9 +1,10 @@ import _ from 'lodash'; import config from 'app/core/config'; -import * as dateMath from '@grafana/ui/src/utils/datemath'; +import * as dateMath from '@grafana/data/src/utils/datemath'; import { angularMocks, sinon } from '../lib/common'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; -import { PanelPluginMeta, RawTimeRange } from '@grafana/ui'; +import { RawTimeRange } from '@grafana/data'; +import { PanelPluginMeta } from '@grafana/ui'; export function ControllerTestContext(this: any) { const self = this;