Skip to content

Commit 787b852

Browse files
committed
Organize imports
1 parent f19d6a6 commit 787b852

11 files changed

+34
-42
lines changed

src/components/ConfigEditor.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import React, { ChangeEvent } from 'react';
2-
3-
import { DataSourceHttpSettings, InlineFieldRow, InlineField, Input } from '@grafana/ui';
1+
import {} from '@emotion/core';
42
import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
3+
import { DataSourceHttpSettings, InlineField, InlineFieldRow, Input } from '@grafana/ui';
4+
import React, { ChangeEvent } from 'react';
55
import { JsonApiDataSourceOptions } from '../types';
66

7-
import {} from '@emotion/core';
8-
97
type Props = DataSourcePluginOptionsEditorProps<JsonApiDataSourceOptions>;
108

119
/**

src/components/ExperimentalEditor.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { InfoBox, InlineField, InlineFieldRow, Select } from '@grafana/ui';
2+
import { JSONPath } from 'jsonpath-plus';
13
import React from 'react';
2-
import { InfoBox, InlineFieldRow, InlineField, Select } from '@grafana/ui';
34
import { JsonApiQuery } from 'types';
4-
import { JSONPath } from 'jsonpath-plus';
55

66
interface Props {
77
query: JsonApiQuery;

src/components/FieldEditor.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1+
import { FieldType, SelectableValue } from '@grafana/data';
2+
import { Icon, InlineField, InlineFieldRow, Input, Select } from '@grafana/ui';
13
import React from 'react';
2-
3-
import { SelectableValue, FieldType } from '@grafana/data';
4-
import { Icon, InlineFieldRow, InlineField, Select, Input } from '@grafana/ui';
5-
6-
import { JsonPathQueryField } from './JsonPathQueryField';
74
import { JsonField } from 'types';
5+
import { JsonPathQueryField } from './JsonPathQueryField';
86

97
interface Props {
108
limit?: number;

src/components/JsonPathQueryField.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
import { BracesPlugin, QueryField, SlatePrism, TypeaheadInput } from '@grafana/ui';
12
import React from 'react';
2-
3-
import { QueryField, SlatePrism, BracesPlugin, TypeaheadInput } from '@grafana/ui';
43
import { onSuggest } from 'suggestions';
54

65
interface Props {

src/components/KeyValueEditor.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import React from 'react';
2-
3-
import { css } from 'emotion';
1+
import { GrafanaTheme } from '@grafana/data';
42
import { Button, Icon, stylesFactory, useTheme } from '@grafana/ui';
3+
import { css } from 'emotion';
4+
import React from 'react';
55
import { Pair } from '../types';
6-
import { GrafanaTheme } from '@grafana/data';
76

87
interface Props {
98
columns: string[];

src/components/PathEditor.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import React from 'react';
2-
import { InlineFieldRow, InlineField, Input, Select } from '@grafana/ui';
31
import {} from '@emotion/core';
2+
import { InlineField, InlineFieldRow, Input, Select } from '@grafana/ui';
3+
import React from 'react';
44

55
interface Props {
66
method: string;

src/components/QueryEditor.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import React from 'react';
21
import { QueryEditorProps } from '@grafana/data';
3-
import { JsonApiQuery, JsonApiDataSourceOptions } from '../types';
42
import { JsonDataSource } from 'datasource';
5-
import { TabbedQueryEditor } from './TabbedQueryEditor';
6-
import { FieldEditor } from './FieldEditor';
3+
import React from 'react';
4+
import { JsonApiDataSourceOptions, JsonApiQuery } from '../types';
75
import { ExperimentalEditor } from './ExperimentalEditor';
6+
import { FieldEditor } from './FieldEditor';
7+
import { TabbedQueryEditor } from './TabbedQueryEditor';
88

99
interface Props extends QueryEditorProps<JsonDataSource, JsonApiQuery, JsonApiDataSourceOptions> {
1010
limitFields?: number;

src/components/TabbedQueryEditor.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import { TimeRange } from '@grafana/data';
2+
import { CodeEditor, InfoBox, InlineField, InlineFieldRow, RadioButtonGroup, Segment, useTheme } from '@grafana/ui';
3+
import { JsonDataSource } from 'datasource';
4+
import { css } from 'emotion';
15
import defaults from 'lodash/defaults';
26
import React, { useState } from 'react';
3-
import { InlineFieldRow, InlineField, Segment, RadioButtonGroup, CodeEditor, useTheme, InfoBox } from '@grafana/ui';
4-
import { TimeRange } from '@grafana/data';
5-
import { JsonApiQuery, defaultQuery, Pair } from '../types';
6-
import { KeyValueEditor } from './KeyValueEditor';
77
import AutoSizer from 'react-virtualized-auto-sizer';
8-
import { css } from 'emotion';
9-
import { JsonDataSource } from 'datasource';
8+
import { defaultQuery, JsonApiQuery, Pair } from '../types';
9+
import { KeyValueEditor } from './KeyValueEditor';
1010
import { PathEditor } from './PathEditor';
1111

1212
// Display a warning message when user adds any of the following headers.

src/datasource.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { dateTime, TimeRange } from '@grafana/data';
12
import { replaceMacros } from './datasource';
2-
import { TimeRange, dateTime } from '@grafana/data';
33

44
const sampleTimestampFrom = '2021-05-17T20:48:09.000Z'; // -> 1621284489
55
const sampleTimestmapTo = '2021-05-17T20:50:23.000Z'; // -> 1621284623

src/datasource.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
import _ from 'lodash';
2-
import { JSONPath } from 'jsonpath-plus';
3-
41
import {
2+
ArrayVector,
3+
DataFrame,
54
DataQueryRequest,
65
DataQueryResponse,
76
DataSourceApi,
87
DataSourceInstanceSettings,
9-
toDataFrame,
8+
Field,
109
MetricFindValue,
1110
ScopedVars,
1211
TimeRange,
13-
DataFrame,
14-
Field,
15-
ArrayVector,
12+
toDataFrame,
1613
} from '@grafana/data';
1714
import { getTemplateSrv } from '@grafana/runtime';
18-
15+
import { JSONPath } from 'jsonpath-plus';
16+
import _ from 'lodash';
1917
import API from './api';
2018
import { detectFieldType } from './detectFieldType';
2119
import { parseValues } from './parseValues';
22-
import { JsonApiQuery, JsonApiDataSourceOptions, Pair } from './types';
20+
import { JsonApiDataSourceOptions, JsonApiQuery, Pair } from './types';
2321

2422
export class JsonDataSource extends DataSourceApi<JsonApiQuery, JsonApiDataSourceOptions> {
2523
api: API;

src/module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { DataSourcePlugin } from '@grafana/data';
2-
import { JsonDataSource } from './datasource';
32
import { ConfigEditor } from './components/ConfigEditor';
43
import { QueryEditor } from './components/QueryEditor';
54
import { VariableQueryEditor } from './components/VariableQueryEditor';
6-
import { JsonApiQuery, JsonApiDataSourceOptions } from './types';
5+
import { JsonDataSource } from './datasource';
6+
import { JsonApiDataSourceOptions, JsonApiQuery } from './types';
77

88
export const plugin = new DataSourcePlugin<JsonDataSource, JsonApiQuery, JsonApiDataSourceOptions>(JsonDataSource)
99
.setConfigEditor(ConfigEditor)

0 commit comments

Comments
 (0)