IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Reorg packages (#20111)

Browse Source 
Primarily- moving majority of the types and utils from @grafana/ui to @grafana/data

* Move types from grafana-ui to grafana-data

* Move valueFormats to grafana-data

* Move utils from grafana-ui to grafana-data

* Update imports in grafana-ui

* revert data's tsconfig change

* Update imports in grafana-runtime

* Fix import paths in grafana-ui

* Move rxjs to devDeps

* Core import updates batch 1

* Import updates batch 2

* Imports fix batch 3

* Imports fixes batch i don't know

* Fix imorts in grafana-toolkit

* Fix imports after master merge
This commit is contained in:
Dominik Prokop
2019-10-31 10:48:05 +01:00
committed by GitHub
parent 3e8c00dad1
commit 9b7748ec13
379 changed files with 984 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/elasticsearch/components/ElasticsearchQueryField.tsx
View File

@@ -1,10 +1,8 @@
import _ from 'lodash';
import React from 'react';
import { SlatePrism } from '@grafana/ui';
// dom also includes Element polyfills
import { QueryField, ExploreQueryFieldProps } from '@grafana/ui';
import { QueryField, SlatePrism } from '@grafana/ui';
import { ExploreQueryFieldProps } from '@grafana/data';
import { ElasticDatasource } from '../datasource';
import { ElasticsearchOptions, ElasticsearchQuery } from '../types';

3
public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx
View File

@@ -1,5 +1,6 @@
import React, { useEffect } from 'react';
import { DataSourceHttpSettings, DataSourcePluginOptionsEditorProps } from '@grafana/ui';
import { DataSourceHttpSettings } from '@grafana/ui';
import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
import { ElasticsearchOptions } from '../types';
import { defaultMaxConcurrentShardRequests, ElasticDetails } from './ElasticDetails';
import { LogsConfig } from './LogsConfig';

4
public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx
View File

@@ -1,7 +1,7 @@
import React from 'react';
import { DataSourceSettings, EventsWithValidation, FormField, Input, regexValidation, Select } from '@grafana/ui';
import { EventsWithValidation, FormField, Input, regexValidation, Select } from '@grafana/ui';
import { ElasticsearchOptions } from '../types';
import { SelectableValue } from '@grafana/data';
import { DataSourceSettings, SelectableValue } from '@grafana/data';
const indexPatternTypes = [
{ label: 'No pattern', value: 'none' },

2
public/app/plugins/datasource/elasticsearch/configuration/mocks.ts
View File

@@ -1,4 +1,4 @@
import { DataSourceSettings } from '@grafana/ui';
import { DataSourceSettings } from '@grafana/data';
import { ElasticsearchOptions } from '../types';
import { createDatasourceSettings } from '../../../../features/datasources/mocks';

2
public/app/plugins/datasource/elasticsearch/datasource.ts
View File

@@ -1,6 +1,6 @@
import angular, { IQService } from 'angular';
import _ from 'lodash';
import { DataSourceApi, DataSourceInstanceSettings, DataQueryRequest, DataQueryResponse } from '@grafana/ui';
import { DataSourceApi, DataSourceInstanceSettings, DataQueryRequest, DataQueryResponse } from '@grafana/data';
import { ElasticResponse } from './elastic_response';
import { IndexPattern } from './index_pattern';
import { ElasticQueryBuilder } from './query_builder';

3
public/app/plugins/datasource/elasticsearch/elastic_response.ts
View File

@@ -2,8 +2,7 @@ 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, toDataFrame, FieldType, MutableDataFrame } from '@grafana/data';
import { DataQueryResponse } from '@grafana/ui';
import { DataQueryResponse, DataFrame, toDataFrame, FieldType, MutableDataFrame } from '@grafana/data';
import { ElasticsearchAggregation } from './types';
export class ElasticResponse {

2
public/app/plugins/datasource/elasticsearch/module.ts
View File

@@ -1,4 +1,4 @@
import { DataSourcePlugin } from '@grafana/ui';
import { DataSourcePlugin } from '@grafana/data';
import { ElasticDatasource } from './datasource';
import { ElasticQueryCtrl } from './query_ctrl';
import ElasticsearchQueryField from './components/ElasticsearchQueryField';

2
public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts
View File

@@ -6,7 +6,7 @@ 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';
import { DataSourceInstanceSettings } from '@grafana/ui';
import { DataSourceInstanceSettings } from '@grafana/data';
import { ElasticsearchOptions } from '../types';
describe('ElasticDatasource', function(this: any) {

2
public/app/plugins/datasource/elasticsearch/types.ts
View File

@@ -1,4 +1,4 @@
import { DataQuery, DataSourceJsonData } from '@grafana/ui';
import { DataQuery, DataSourceJsonData } from '@grafana/data';
export interface ElasticsearchOptions extends DataSourceJsonData {
timeField: string;