Refactor: move some files to @grafana/data (#17952)

* moving to data WIP

* more refactoring

* add missing test

* mock full path

* remove sinon from grafana-ui
This commit is contained in:
Ryan McKinley
2019-07-05 23:05:53 -07:00
committed by Torkel Ödegaard
parent baed5d7bd9
commit 3f15170914
249 changed files with 381 additions and 427 deletions

View File

@@ -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';

View File

@@ -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';

View File

@@ -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__';

View File

@@ -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: {

View File

@@ -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 = '{}';

View File

@@ -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';

View File

@@ -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

View File

@@ -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 {

View File

@@ -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';

View File

@@ -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';

View File

@@ -1,4 +1,4 @@
import { DataQuery, DataSourceJsonData } from '@grafana/ui/src/types';
import { DataQuery, DataSourceJsonData } from '@grafana/ui';
export enum PromContext {
Explore = 'explore',