From a78ca939d14ebf46f48b3bcb4930339cf2009707 Mon Sep 17 00:00:00 2001 From: Dominik Prokop Date: Sun, 19 Apr 2020 13:18:36 +0200 Subject: [PATCH] Fix: grafana/ui imports (#23680) --- packages/grafana-ui/src/components/index.ts | 1 + .../components/PanelEditor/DynamicConfigValueEditor.tsx | 4 ++-- .../dashboard/components/PanelEditor/FieldConfigEditor.tsx | 7 +++---- .../dashboard/components/PanelEditor/PanelOptionsTab.tsx | 7 +++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts index 41373e0b284..ba3c182880c 100644 --- a/packages/grafana-ui/src/components/index.ts +++ b/packages/grafana-ui/src/components/index.ts @@ -53,6 +53,7 @@ export { TableInputCSV } from './TableInputCSV/TableInputCSV'; export { TabsBar } from './Tabs/TabsBar'; export { Tab } from './Tabs/Tab'; export { TabContent } from './Tabs/TabContent'; +export { Counter } from './Tabs/Counter'; // Visualizations export { diff --git a/public/app/features/dashboard/components/PanelEditor/DynamicConfigValueEditor.tsx b/public/app/features/dashboard/components/PanelEditor/DynamicConfigValueEditor.tsx index 2862bef22d0..7e640a5bb8e 100644 --- a/public/app/features/dashboard/components/PanelEditor/DynamicConfigValueEditor.tsx +++ b/public/app/features/dashboard/components/PanelEditor/DynamicConfigValueEditor.tsx @@ -1,9 +1,9 @@ import { DynamicConfigValue, FieldConfigOptionsRegistry, FieldOverrideContext, GrafanaTheme } from '@grafana/data'; import React from 'react'; -import { Field, HorizontalGroup, IconButton, Label, stylesFactory, useTheme } from '@grafana/ui'; +import { Counter, Field, HorizontalGroup, IconButton, Label, stylesFactory, useTheme } from '@grafana/ui'; import { css, cx } from 'emotion'; import { OptionsGroup } from './OptionsGroup'; -import { Counter } from '@grafana/ui/src/components/Tabs/Counter'; + interface DynamicConfigValueEditorProps { property: DynamicConfigValue; registry: FieldConfigOptionsRegistry; diff --git a/public/app/features/dashboard/components/PanelEditor/FieldConfigEditor.tsx b/public/app/features/dashboard/components/PanelEditor/FieldConfigEditor.tsx index dd458ec85e8..7e63d38b339 100644 --- a/public/app/features/dashboard/components/PanelEditor/FieldConfigEditor.tsx +++ b/public/app/features/dashboard/components/PanelEditor/FieldConfigEditor.tsx @@ -1,19 +1,18 @@ import React, { useCallback } from 'react'; import cloneDeep from 'lodash/cloneDeep'; import { - FieldConfigSource, DataFrame, FieldConfigPropertyItem, - VariableSuggestionsScope, + FieldConfigSource, PanelPlugin, SelectableValue, + VariableSuggestionsScope, } from '@grafana/data'; -import { fieldMatchersUI, ValuePicker, Label, Field, Container } from '@grafana/ui'; +import { Container, Counter, Field, fieldMatchersUI, Label, ValuePicker } from '@grafana/ui'; import { getDataLinksVariableSuggestions } from '../../../panel/panellinks/link_srv'; import { OverrideEditor } from './OverrideEditor'; import groupBy from 'lodash/groupBy'; import { OptionsGroup } from './OptionsGroup'; -import { Counter } from '@grafana/ui/src/components/Tabs/Counter'; interface Props { plugin: PanelPlugin; diff --git a/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx b/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx index bb0c88d3243..5adf137f36a 100644 --- a/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx +++ b/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx @@ -1,13 +1,12 @@ import React, { FC, useMemo } from 'react'; -import { PanelModel, DashboardModel } from '../../state'; -import { SelectableValue, PanelPlugin, FieldConfigSource, PanelData } from '@grafana/data'; -import { Switch, Select, DataLinksInlineEditor, Input, TextArea, RadioButtonGroup, Field } from '@grafana/ui'; +import { DashboardModel, PanelModel } from '../../state'; +import { FieldConfigSource, PanelData, PanelPlugin, SelectableValue } from '@grafana/data'; +import { Counter, DataLinksInlineEditor, Field, Input, RadioButtonGroup, Select, Switch, TextArea } from '@grafana/ui'; import { OptionsGroup } from './OptionsGroup'; import { getPanelLinksVariableSuggestions } from '../../../panel/panellinks/link_srv'; import { getVariables } from '../../../variables/state/selectors'; import { PanelOptionsEditor } from './PanelOptionsEditor'; import { AngularPanelOptions } from '../../panel_editor/AngularPanelOptions'; -import { Counter } from '@grafana/ui/src/components/Tabs/Counter'; interface Props { panel: PanelModel;