diff --git a/packages/grafana-data/src/dataframe/FieldCache.test.ts b/packages/grafana-data/src/dataframe/FieldCache.test.ts index 8d888797a61..d38946bd712 100644 --- a/packages/grafana-data/src/dataframe/FieldCache.test.ts +++ b/packages/grafana-data/src/dataframe/FieldCache.test.ts @@ -1,6 +1,6 @@ import { FieldCache } from './FieldCache'; -import { toDataFrame } from '../utils'; import { FieldType } from '../types/dataFrame'; +import { toDataFrame } from './processDataFrame'; describe('FieldCache', () => { it('when creating a new FieldCache from fields should be able to query cache', () => { diff --git a/packages/grafana-data/src/dataframe/MutableDataFrame.ts b/packages/grafana-data/src/dataframe/MutableDataFrame.ts index ff9971a2206..9ff9aa0f3ae 100644 --- a/packages/grafana-data/src/dataframe/MutableDataFrame.ts +++ b/packages/grafana-data/src/dataframe/MutableDataFrame.ts @@ -1,6 +1,6 @@ import { Field, DataFrame, DataFrameDTO, FieldDTO, FieldType } from '../types/dataFrame'; import { KeyValue, QueryResultMeta, Labels } from '../types/data'; -import { guessFieldTypeFromValue, guessFieldTypeForField, toDataFrameDTO } from '../utils/processDataFrame'; +import { guessFieldTypeFromValue, guessFieldTypeForField, toDataFrameDTO } from './processDataFrame'; import isArray from 'lodash/isArray'; import isString from 'lodash/isString'; import { makeFieldParser } from '../utils/fieldParser'; diff --git a/packages/grafana-data/src/dataframe/index.ts b/packages/grafana-data/src/dataframe/index.ts index 56d98921612..e2cfc615ce4 100644 --- a/packages/grafana-data/src/dataframe/index.ts +++ b/packages/grafana-data/src/dataframe/index.ts @@ -2,3 +2,4 @@ export * from './DataFrameView'; export * from './FieldCache'; export * from './CircularDataFrame'; export * from './MutableDataFrame'; +export * from './processDataFrame'; diff --git a/packages/grafana-data/src/utils/processDataFrame.test.ts b/packages/grafana-data/src/dataframe/processDataFrame.test.ts similarity index 98% rename from packages/grafana-data/src/utils/processDataFrame.test.ts rename to packages/grafana-data/src/dataframe/processDataFrame.test.ts index 978f1d6ada1..975232e3902 100644 --- a/packages/grafana-data/src/utils/processDataFrame.test.ts +++ b/packages/grafana-data/src/dataframe/processDataFrame.test.ts @@ -8,8 +8,8 @@ import { sortDataFrame, } from './processDataFrame'; import { FieldType, TimeSeries, TableData, DataFrameDTO } from '../types/index'; -import { dateTime } from './moment_wrapper'; -import { MutableDataFrame } from '../dataframe/MutableDataFrame'; +import { dateTime } from '../utils/moment_wrapper'; +import { MutableDataFrame } from './MutableDataFrame'; describe('toDataFrame', () => { it('converts timeseries to series', () => { diff --git a/packages/grafana-data/src/utils/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts similarity index 98% rename from packages/grafana-data/src/utils/processDataFrame.ts rename to packages/grafana-data/src/dataframe/processDataFrame.ts index 3dfeb59103e..110799ce2ed 100644 --- a/packages/grafana-data/src/utils/processDataFrame.ts +++ b/packages/grafana-data/src/dataframe/processDataFrame.ts @@ -17,10 +17,10 @@ import { FieldDTO, DataFrameDTO, } from '../types/index'; -import { isDateTime } from './moment_wrapper'; -import { deprecationWarning } from './deprecationWarning'; +import { isDateTime } from '../utils/moment_wrapper'; +import { deprecationWarning } from '../utils/deprecationWarning'; import { ArrayVector } from '../vector/ArrayVector'; -import { MutableDataFrame } from '../dataframe/MutableDataFrame'; +import { MutableDataFrame } from './MutableDataFrame'; import { SortedVector } from '../vector/SortedVector'; function convertTableToDataFrame(table: TableData): DataFrame { diff --git a/packages/grafana-data/src/transformations/matchers/fieldTypeMatcher.test.ts b/packages/grafana-data/src/transformations/matchers/fieldTypeMatcher.test.ts index 1d539585bc3..4c66af8dec8 100644 --- a/packages/grafana-data/src/transformations/matchers/fieldTypeMatcher.test.ts +++ b/packages/grafana-data/src/transformations/matchers/fieldTypeMatcher.test.ts @@ -1,7 +1,7 @@ import { FieldType } from '../../types/dataFrame'; import { fieldMatchers } from './matchers'; import { FieldMatcherID } from './ids'; -import { toDataFrame } from '../../utils/processDataFrame'; +import { toDataFrame } from '../../dataframe/processDataFrame'; export const simpleSeriesWithTypes = toDataFrame({ fields: [ diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts index 9bf238dadef..273c0d915d1 100644 --- a/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts +++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.test.ts @@ -1,6 +1,6 @@ import { getFieldMatcher } from './matchers'; import { FieldMatcherID } from './ids'; -import { toDataFrame } from '../../utils/processDataFrame'; +import { toDataFrame } from '../../dataframe/processDataFrame'; describe('Field Name Matcher', () => { it('Match all with wildcard regex', () => { diff --git a/packages/grafana-data/src/transformations/transformers/append.test.ts b/packages/grafana-data/src/transformations/transformers/append.test.ts index 53cbff29782..8e7d5dc1b7d 100644 --- a/packages/grafana-data/src/transformations/transformers/append.test.ts +++ b/packages/grafana-data/src/transformations/transformers/append.test.ts @@ -1,5 +1,5 @@ import { DataTransformerID } from './ids'; -import { toDataFrame } from '../../utils/processDataFrame'; +import { toDataFrame } from '../../dataframe/processDataFrame'; import { transformDataFrame } from '../transformDataFrame'; import { transformersRegistry } from '../transformersRegistry'; diff --git a/packages/grafana-data/src/transformations/transformers/filter.test.ts b/packages/grafana-data/src/transformations/transformers/filter.test.ts index 300a1d63b08..984a4fbd005 100644 --- a/packages/grafana-data/src/transformations/transformers/filter.test.ts +++ b/packages/grafana-data/src/transformations/transformers/filter.test.ts @@ -1,6 +1,6 @@ import { FieldType } from '../../types/dataFrame'; import { DataTransformerID } from './ids'; -import { toDataFrame } from '../../utils/processDataFrame'; +import { toDataFrame } from '../../dataframe/processDataFrame'; import { transformDataFrame } from '../transformDataFrame'; import { FieldMatcherID } from '../matchers/ids'; diff --git a/packages/grafana-data/src/transformations/transformers/filterByName.test.ts b/packages/grafana-data/src/transformations/transformers/filterByName.test.ts index c08178c4e46..3b601c46954 100644 --- a/packages/grafana-data/src/transformations/transformers/filterByName.test.ts +++ b/packages/grafana-data/src/transformations/transformers/filterByName.test.ts @@ -1,5 +1,4 @@ -import { toDataFrame } from '../../utils/index'; -import { FieldType } from '../../index'; +import { FieldType, toDataFrame } from '../../index'; import { DataTransformerID } from './ids'; import { transformDataFrame } from '../transformDataFrame'; diff --git a/packages/grafana-data/src/transformations/transformers/reduce.test.ts b/packages/grafana-data/src/transformations/transformers/reduce.test.ts index a8d06ffd244..5aff74e1e2b 100644 --- a/packages/grafana-data/src/transformations/transformers/reduce.test.ts +++ b/packages/grafana-data/src/transformations/transformers/reduce.test.ts @@ -1,6 +1,6 @@ import { ReducerID } from '../../utils/fieldReducer'; import { DataTransformerID } from './ids'; -import { toDataFrame, toDataFrameDTO } from '../../utils/processDataFrame'; +import { toDataFrame, toDataFrameDTO } from '../../dataframe/processDataFrame'; import { transformDataFrame } from '../transformDataFrame'; const seriesWithValues = toDataFrame({ diff --git a/packages/grafana-data/src/transformations/transformers/reduce.ts b/packages/grafana-data/src/transformations/transformers/reduce.ts index 507db09d9ae..de7f2a077a5 100644 --- a/packages/grafana-data/src/transformations/transformers/reduce.ts +++ b/packages/grafana-data/src/transformations/transformers/reduce.ts @@ -5,7 +5,7 @@ import { alwaysFieldMatcher } from '../matchers/predicates'; import { DataFrame, Field, FieldType } from '../../types/dataFrame'; import { ArrayVector } from '../../vector/ArrayVector'; import { KeyValue } from '../../types/data'; -import { guessFieldTypeForField } from '../../utils/processDataFrame'; +import { guessFieldTypeForField } from '../../dataframe/processDataFrame'; import { getFieldMatcher } from '../matchers/matchers'; export interface ReduceTransformerOptions { diff --git a/packages/grafana-data/src/transformations/transformersRegistry.test.ts b/packages/grafana-data/src/transformations/transformersRegistry.test.ts index 814790f1094..fb5980e9558 100644 --- a/packages/grafana-data/src/transformations/transformersRegistry.test.ts +++ b/packages/grafana-data/src/transformations/transformersRegistry.test.ts @@ -1,6 +1,6 @@ import { DataTransformerID } from './transformers/ids'; import { transformersRegistry } from './transformersRegistry'; -import { toDataFrame } from '../utils/processDataFrame'; +import { toDataFrame } from '../dataframe/processDataFrame'; import { ReducerID } from '../utils/fieldReducer'; import { DataFrameView } from '../dataframe/DataFrameView'; diff --git a/packages/grafana-data/src/utils/csv.test.ts b/packages/grafana-data/src/utils/csv.test.ts index 23adebcf467..c7ed640bfa9 100644 --- a/packages/grafana-data/src/utils/csv.test.ts +++ b/packages/grafana-data/src/utils/csv.test.ts @@ -1,9 +1,9 @@ import { readCSV, toCSV, CSVHeaderStyle } from './csv'; -import { getDataFrameRow } from './processDataFrame'; +import { getDataFrameRow } from '../dataframe/processDataFrame'; // Test with local CSV files import fs from 'fs'; -import { toDataFrameDTO } from './processDataFrame'; +import { toDataFrameDTO } from '../dataframe/processDataFrame'; describe('read csv', () => { it('should get X and y', () => { diff --git a/packages/grafana-data/src/utils/csv.ts b/packages/grafana-data/src/utils/csv.ts index 6cbbb5737b0..3d787163101 100644 --- a/packages/grafana-data/src/utils/csv.ts +++ b/packages/grafana-data/src/utils/csv.ts @@ -5,7 +5,7 @@ import isNumber from 'lodash/isNumber'; // Types import { DataFrame, Field, FieldType, FieldConfig } from '../types'; -import { guessFieldTypeFromValue } from './processDataFrame'; +import { guessFieldTypeFromValue } from '../dataframe/processDataFrame'; import { MutableDataFrame } from '../dataframe/MutableDataFrame'; export enum CSVHeaderStyle { diff --git a/packages/grafana-data/src/utils/dataFrameView.ts b/packages/grafana-data/src/utils/dataFrameView.ts deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/grafana-data/src/utils/fieldParser.ts b/packages/grafana-data/src/utils/fieldParser.ts index 6df6aa9d7ee..939f4e401f2 100644 --- a/packages/grafana-data/src/utils/fieldParser.ts +++ b/packages/grafana-data/src/utils/fieldParser.ts @@ -1,5 +1,5 @@ import { Field, FieldType } from '../types/dataFrame'; -import { guessFieldTypeFromValue } from './processDataFrame'; +import { guessFieldTypeFromValue } from '../dataframe/processDataFrame'; export function makeFieldParser(value: any, field: Field): (value: string) => any { if (!field.type) { diff --git a/packages/grafana-data/src/utils/fieldReducer.test.ts b/packages/grafana-data/src/utils/fieldReducer.test.ts index 916fd5bc31c..0dfc1d349a1 100644 --- a/packages/grafana-data/src/utils/fieldReducer.test.ts +++ b/packages/grafana-data/src/utils/fieldReducer.test.ts @@ -3,7 +3,7 @@ import difference from 'lodash/difference'; import { fieldReducers, ReducerID, reduceField } from './fieldReducer'; import { Field, FieldType } from '../types/index'; -import { guessFieldTypeFromValue } from './processDataFrame'; +import { guessFieldTypeFromValue } from '../dataframe/processDataFrame'; import { MutableDataFrame } from '../dataframe/MutableDataFrame'; import { ArrayVector } from '../vector/ArrayVector'; diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts index fb011851ba2..a61f4ccafeb 100644 --- a/packages/grafana-data/src/utils/index.ts +++ b/packages/grafana-data/src/utils/index.ts @@ -1,7 +1,6 @@ export * from './string'; export * from './registry'; export * from './markdown'; -export * from './processDataFrame'; export * from './deprecationWarning'; export * from './csv'; export * from './fieldReducer';