From 9b7748ec133cb2ce4b092e523cb6d70a7b89de83 Mon Sep 17 00:00:00 2001 From: Dominik Prokop Date: Thu, 31 Oct 2019 10:48:05 +0100 Subject: [PATCH] Chore: Reorg packages (#20111) 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 --- packages/grafana-data/package.json | 5 +- .../src/field}/displayProcessor.test.ts | 3 +- .../src/field}/displayProcessor.ts | 20 +- .../src/field}/fieldDisplay.test.ts | 12 +- .../src/field}/fieldDisplay.ts | 25 +- packages/grafana-data/src/field/index.ts | 2 + packages/grafana-data/src/index.ts | 2 + .../src/types/app.ts | 5 +- packages/grafana-data/src/types/appEvent.ts | 4 - .../src/types/{events.ts => appEvents.ts} | 5 + .../src/types/datasource.ts | 20 +- packages/grafana-data/src/types/index.ts | 14 +- .../src/types/panel.ts | 5 +- .../src/types/panelEvents.ts} | 5 +- .../src/types/plugin.ts | 2 +- packages/grafana-data/src/types/theme.ts | 236 +++++++++++++++++ packages/grafana-data/src/types/utils.ts | 2 +- .../src/utils/flotPairs.test.ts | 4 +- .../src/utils/flotPairs.ts | 7 +- packages/grafana-data/src/utils/index.ts | 2 + .../src/utils/namedColorsPalette.test.ts | 2 +- .../src/utils/namedColorsPalette.ts | 2 +- .../valueFormats/arithmeticFormatters.test.ts | 0 .../src}/valueFormats/arithmeticFormatters.ts | 3 +- .../src}/valueFormats/categories.ts | 0 .../valueFormats/dateTimeFormatters.test.ts | 2 +- .../src}/valueFormats/dateTimeFormatters.ts | 3 +- .../grafana-data/src/valueFormats/index.ts | 1 + .../valueFormats/symbolFormatters.test.ts | 0 .../src}/valueFormats/symbolFormatters.ts | 3 +- .../src}/valueFormats/valueFormats.test.ts | 0 .../src}/valueFormats/valueFormats.ts | 3 +- packages/grafana-runtime/src/config.ts | 3 +- .../src/services/dataSourceSrv.ts | 3 +- .../src/cli/tasks/plugin.ci.ts | 2 +- .../src/config/utils/pluginValidation.ts | 2 +- packages/grafana-toolkit/src/plugins/aws.ts | 2 +- .../src/plugins/e2e/settings.ts | 2 +- packages/grafana-toolkit/src/plugins/env.ts | 2 +- packages/grafana-toolkit/src/plugins/types.ts | 3 +- .../components/AlphaNotice/AlphaNotice.tsx | 3 +- .../components/BarGauge/BarGauge.story.tsx | 2 +- .../src/components/BarGauge/BarGauge.test.tsx | 2 +- .../src/components/BarGauge/BarGauge.tsx | 5 +- .../src/components/BigValue/BigValue.tsx | 4 +- .../grafana-ui/src/components/Button/types.ts | 2 +- .../CallToActionCard/CallToActionCard.tsx | 3 +- .../src/components/Collapse/Collapse.tsx | 2 +- .../components/ColorPicker/ColorPicker.tsx | 2 +- .../ColorPicker/ColorPickerPopover.test.tsx | 3 +- .../ColorPicker/ColorPickerPopover.tsx | 4 +- .../ColorPicker/NamedColorsGroup.tsx | 2 +- .../ColorPicker/NamedColorsPalette.story.tsx | 2 +- .../ColorPicker/NamedColorsPalette.test.tsx | 3 +- .../ColorPicker/NamedColorsPalette.tsx | 2 +- .../ColorPicker/SpectrumPalette.tsx | 4 +- .../components/ContextMenu/ContextMenu.tsx | 3 +- .../components/DataLinks/DataLinkEditor.tsx | 2 +- .../components/DataLinks/DataLinkInput.tsx | 2 +- .../DataLinks/DataLinkSuggestions.tsx | 3 +- .../DataSourceHttpSettings.story.tsx | 2 +- .../DataSourceHttpSettings.tsx | 2 +- .../components/DataSourceSettings/types.ts | 2 +- .../src/components/Forms/Button.tsx | 2 +- .../Forms/FieldValidationMessage.tsx | 2 +- .../grafana-ui/src/components/Forms/Label.tsx | 2 +- .../src/components/Forms/Legend.tsx | 2 +- .../src/components/Forms/commonStyles.ts | 2 +- .../src/components/Forms/getFormStyles.ts | 2 +- .../grafana-ui/src/components/Gauge/Gauge.tsx | 2 +- .../src/components/Graph/GraphLegendItem.tsx | 2 +- .../src/components/Legend/LegendList.tsx | 2 +- .../src/components/Logs/LogLabel.tsx | 3 +- .../src/components/Logs/LogLabelStats.tsx | 3 +- .../src/components/Logs/LogLabelStatsRow.tsx | 2 +- .../grafana-ui/src/components/Logs/LogRow.tsx | 3 +- .../src/components/Logs/LogRowContext.tsx | 4 +- .../Logs/LogRowContextProvider.test.ts | 4 +- .../components/Logs/LogRowContextProvider.tsx | 2 +- .../src/components/Logs/LogRowMessage.tsx | 3 +- .../src/components/Logs/getLogRowStyles.ts | 2 +- .../grafana-ui/src/components/Modal/Modal.tsx | 2 +- .../src/components/PieChart/PieChart.tsx | 4 +- .../RefreshPicker/RefreshPicker.tsx | 2 +- .../SingleStatShared/FieldDisplayEditor.tsx | 11 +- .../FieldPropertiesEditor.tsx | 14 +- .../SingleStatShared/SingleStatBaseOptions.ts | 5 +- .../src/components/Table/Table.story.tsx | 2 +- .../src/components/Table/Table.test.tsx | 2 +- .../grafana-ui/src/components/Table/Table.tsx | 11 +- .../src/components/Table/TableCellBuilder.tsx | 14 +- .../src/components/Table/examples.ts | 3 +- .../src/components/TagsInput/TagItem.tsx | 2 +- .../ThresholdsEditor/ThresholdsEditor.tsx | 2 +- .../src/components/TimePicker/TimePicker.tsx | 2 +- .../TransformersUI/TransformationRow.tsx | 2 +- .../components/Typeahead/TypeaheadInfo.tsx | 3 +- .../components/Typeahead/TypeaheadItem.tsx | 6 +- .../src/components/UnitPicker/UnitPicker.tsx | 2 +- .../components/VizRepeater/VizRepeater.tsx | 2 +- packages/grafana-ui/src/components/index.ts | 2 +- .../grafana-ui/src/themes/ThemeContext.tsx | 3 +- .../src/themes/_variables.dark.scss.tmpl.ts | 2 +- .../src/themes/_variables.light.scss.tmpl.ts | 2 +- .../src/themes/_variables.scss.tmpl.ts | 2 +- packages/grafana-ui/src/themes/dark.ts | 2 +- packages/grafana-ui/src/themes/default.ts | 2 +- packages/grafana-ui/src/themes/getTheme.ts | 2 +- packages/grafana-ui/src/themes/light.ts | 2 +- .../src/themes/selectThemeVariant.test.ts | 2 +- .../src/themes/selectThemeVariant.ts | 2 +- packages/grafana-ui/src/types/index.ts | 11 +- packages/grafana-ui/src/types/theme.ts | 237 +----------------- packages/grafana-ui/src/utils/index.ts | 5 - .../src/utils/storybook/withTheme.tsx | 2 +- packages/grafana-ui/src/utils/typeahead.ts | 2 +- .../components/Select/DataSourcePicker.tsx | 5 +- .../core/components/search/SearchField.tsx | 3 +- public/app/core/logs_model.ts | 3 +- public/app/core/services/keybindingSrv.ts | 2 +- public/app/core/time_series2.ts | 3 +- public/app/core/utils/ConfigProvider.tsx | 3 +- public/app/core/utils/explore.test.ts | 4 +- public/app/core/utils/explore.ts | 16 +- public/app/core/utils/kbn.ts | 10 +- public/app/core/utils/query.test.ts | 2 +- public/app/core/utils/query.ts | 2 +- public/app/features/alerting/AlertTabCtrl.ts | 2 +- .../getAlertingValidationMessage.test.ts | 3 +- .../alerting/getAlertingValidationMessage.ts | 2 +- .../features/annotations/annotations_srv.ts | 3 +- .../DashExportModal/DashboardExporter.test.ts | 2 +- .../DashExportModal/DashboardExporter.ts | 2 +- .../DashLinks/DashLinksContainerCtrl.ts | 2 +- .../dashboard/dashgrid/DashboardGrid.tsx | 2 +- .../dashboard/dashgrid/DashboardPanel.tsx | 2 +- .../dashboard/dashgrid/PanelChrome.tsx | 15 +- .../dashgrid/PanelHeader/PanelHeaderMenu.tsx | 2 +- .../PanelHeader/PanelHeaderMenuItem.tsx | 2 +- .../dashboard/dashgrid/PanelPluginError.tsx | 3 +- .../dashboard/panel_editor/PanelEditor.tsx | 3 +- .../dashboard/panel_editor/QueriesTab.tsx | 20 +- .../panel_editor/QueryEditorRow.test.ts | 3 +- .../dashboard/panel_editor/QueryEditorRow.tsx | 13 +- .../panel_editor/QueryEditorRows.tsx | 2 +- .../dashboard/panel_editor/QueryInspector.tsx | 4 +- .../dashboard/panel_editor/QueryOptions.tsx | 12 +- .../panel_editor/VisualizationTab.tsx | 3 +- .../panel_editor/VizPickerSearch.tsx | 2 +- .../dashboard/panel_editor/VizTypePicker.tsx | 3 +- .../panel_editor/VizTypePickerPlugin.tsx | 2 +- .../dashboard/services/DashboardSrv.ts | 2 +- .../dashboard/state/DashboardModel.ts | 2 +- .../dashboard/state/PanelModel.test.ts | 2 +- .../features/dashboard/state/PanelModel.ts | 11 +- .../dashboard/state/PanelQueryRunner.test.ts | 3 +- .../dashboard/state/PanelQueryRunner.ts | 13 +- .../features/dashboard/state/initDashboard.ts | 2 +- .../dashboard/state/runRequest.test.ts | 11 +- .../features/dashboard/state/runRequest.ts | 8 +- .../features/dashboard/utils/getPanelMenu.ts | 2 +- .../datasources/DataSourceDashboards.test.tsx | 2 +- .../datasources/DataSourceDashboards.tsx | 2 +- .../features/datasources/DataSourcesList.tsx | 2 +- .../datasources/DataSourcesListItem.tsx | 2 +- .../datasources/DataSourcesListPage.test.tsx | 2 +- .../datasources/DataSourcesListPage.tsx | 2 +- .../datasources/NewDataSourcePage.tsx | 4 +- .../datasources/__mocks__/dataSourcesMocks.ts | 2 +- public/app/features/datasources/mocks.ts | 2 +- .../settings/DataSourceSettingsPage.test.tsx | 3 +- .../settings/DataSourceSettingsPage.tsx | 2 +- .../datasources/settings/PluginSettings.tsx | 2 +- .../app/features/datasources/state/actions.ts | 2 +- .../features/datasources/state/navModel.ts | 3 +- .../datasources/state/reducers.test.ts | 2 +- .../features/datasources/state/reducers.ts | 2 +- .../features/datasources/state/selectors.ts | 2 +- public/app/features/explore/AdHocFilter.tsx | 4 +- .../explore/AdHocFilterField.test.tsx | 2 +- .../app/features/explore/AdHocFilterField.tsx | 2 +- .../app/features/explore/ErrorContainer.tsx | 2 +- public/app/features/explore/Explore.tsx | 13 +- .../features/explore/ExploreGraphPanel.tsx | 3 +- .../app/features/explore/ExploreToolbar.tsx | 12 +- public/app/features/explore/LiveLogs.tsx | 4 +- .../app/features/explore/LiveTailButton.tsx | 3 +- public/app/features/explore/LogsContainer.tsx | 3 +- public/app/features/explore/QueryEditor.tsx | 2 +- public/app/features/explore/QueryRow.tsx | 13 +- .../app/features/explore/QueryStatus.test.tsx | 3 +- public/app/features/explore/QueryStatus.tsx | 3 +- .../app/features/explore/TimeSyncButton.tsx | 6 +- .../app/features/explore/state/actionTypes.ts | 14 +- .../features/explore/state/actions.test.ts | 3 +- public/app/features/explore/state/actions.ts | 7 +- .../features/explore/state/reducers.test.ts | 3 +- public/app/features/explore/state/reducers.ts | 13 +- .../expressions/ExpressionDatasource.ts | 2 +- .../expressions/ExpressionQueryEditor.tsx | 4 +- public/app/features/expressions/types.ts | 2 +- .../app/features/panel/metrics_panel_ctrl.ts | 15 +- public/app/features/panel/panel_ctrl.ts | 4 +- public/app/features/panel/panel_directive.ts | 2 +- public/app/features/panel/panel_header.ts | 2 +- .../panel/panellinks/linkSuppliers.ts | 2 +- public/app/features/plugins/AppRootPage.tsx | 3 +- .../app/features/plugins/PluginDashboards.tsx | 3 +- public/app/features/plugins/PluginList.tsx | 2 +- .../app/features/plugins/PluginListItem.tsx | 2 +- .../features/plugins/PluginListPage.test.tsx | 2 +- .../app/features/plugins/PluginListPage.tsx | 2 +- public/app/features/plugins/PluginPage.tsx | 8 +- .../features/plugins/PluginSettingsCache.ts | 2 +- .../app/features/plugins/PluginStateInfo.tsx | 3 +- .../features/plugins/__mocks__/pluginMocks.ts | 2 +- public/app/features/plugins/datasource_srv.ts | 3 +- .../app/features/plugins/plugin_component.ts | 2 +- .../features/plugins/plugin_loader.test.ts | 2 +- public/app/features/plugins/plugin_loader.ts | 3 +- .../app/features/plugins/plugin_page_ctrl.ts | 2 +- .../plugins/specs/datasource_srv.test.ts | 2 +- public/app/features/plugins/state/actions.ts | 2 +- public/app/features/plugins/state/reducers.ts | 2 +- .../plugins/variableQueryEditorLoader.tsx | 2 +- .../plugins/wrappers/AppConfigWrapper.tsx | 4 +- .../app/example-app/ExampleRootPage.tsx | 3 +- .../app/example-app/config/ExamplePage1.tsx | 2 +- .../app/example-app/config/ExamplePage2.tsx | 2 +- .../plugins/app/example-app/legacy/config.ts | 2 +- public/app/plugins/app/example-app/module.ts | 2 +- .../datasource/cloudwatch/datasource.ts | 11 +- .../cloudwatch/specs/datasource.test.ts | 2 +- .../plugins/datasource/cloudwatch/types.ts | 2 +- .../dashboard/DashboardQueryEditor.tsx | 4 +- .../datasource/dashboard/datasource.ts | 2 +- .../plugins/datasource/dashboard/module.ts | 2 +- .../dashboard/runSharedRequest.test.ts | 2 +- .../datasource/dashboard/runSharedRequest.ts | 3 +- .../app/plugins/datasource/dashboard/types.ts | 2 +- .../components/ElasticsearchQueryField.tsx | 6 +- .../configuration/ConfigEditor.tsx | 3 +- .../configuration/ElasticDetails.tsx | 4 +- .../elasticsearch/configuration/mocks.ts | 2 +- .../datasource/elasticsearch/datasource.ts | 2 +- .../elasticsearch/elastic_response.ts | 3 +- .../datasource/elasticsearch/module.ts | 2 +- .../elasticsearch/specs/datasource.test.ts | 2 +- .../plugins/datasource/elasticsearch/types.ts | 2 +- .../ConfigEditor.tsx | 3 +- .../app_insights/app_insights_datasource.ts | 2 +- .../azure_log_analytics_datasource.ts | 2 +- .../azure_monitor/azure_monitor_datasource.ts | 2 +- .../datasource.ts | 2 +- .../module.tsx | 2 +- .../query_ctrl.ts | 2 +- .../grafana-azure-monitor-datasource/types.ts | 2 +- .../app/plugins/datasource/graphite/gfunc.ts | 2 +- .../app/plugins/datasource/graphite/types.ts | 2 +- .../components/InfluxLogsQueryField.tsx | 2 +- .../influxdb/components/InfluxStartPage.tsx | 2 +- .../plugins/datasource/influxdb/datasource.ts | 3 +- .../app/plugins/datasource/influxdb/module.ts | 2 +- .../app/plugins/datasource/influxdb/types.ts | 2 +- .../datasource/input/InputConfigEditor.tsx | 4 +- .../datasource/input/InputDatasource.test.ts | 4 +- .../datasource/input/InputDatasource.ts | 6 +- .../datasource/input/InputQueryEditor.tsx | 4 +- public/app/plugins/datasource/input/module.ts | 2 +- public/app/plugins/datasource/input/types.ts | 3 +- .../loki/components/ConfigEditor.tsx | 3 +- .../loki/components/LokiCheatSheet.tsx | 2 +- .../loki/components/LokiQueryEditor.tsx | 3 +- .../loki/components/LokiQueryFieldForm.tsx | 4 +- .../datasource/loki/datasource.test.ts | 3 +- .../app/plugins/datasource/loki/datasource.ts | 13 +- .../datasource/loki/language_provider.ts | 4 +- public/app/plugins/datasource/loki/mocks.ts | 2 +- public/app/plugins/datasource/loki/module.ts | 2 +- public/app/plugins/datasource/loki/types.ts | 3 +- .../datasource/mixed/MixedDataSource.test.ts | 3 +- .../datasource/mixed/MixedDataSource.ts | 10 +- .../plugins/datasource/mssql/query_ctrl.ts | 2 +- .../plugins/datasource/mysql/query_ctrl.ts | 2 +- .../plugins/datasource/opentsdb/datasource.ts | 3 +- .../plugins/datasource/postgres/query_ctrl.ts | 2 +- .../prometheus/components/PromCheatSheet.tsx | 2 +- .../prometheus/components/PromLink.tsx | 2 +- .../prometheus/components/PromQueryEditor.tsx | 4 +- .../prometheus/components/PromQueryField.tsx | 7 +- .../datasource/prometheus/datasource.test.ts | 2 +- .../datasource/prometheus/datasource.ts | 23 +- .../prometheus/language_provider.ts | 11 +- .../datasource/prometheus/query_hints.ts | 2 +- .../prometheus/specs/datasource.test.ts | 3 +- .../specs/language_provider.test.ts | 2 +- .../specs/metric_find_query.test.ts | 3 +- .../specs/result_transformer.test.ts | 2 +- .../plugins/datasource/prometheus/types.ts | 2 +- .../stackdriver/components/QueryEditor.tsx | 2 +- .../datasource/stackdriver/datasource.ts | 3 +- .../stackdriver/specs/datasource.test.ts | 3 +- .../plugins/datasource/stackdriver/types.ts | 2 +- .../datasource/testdata/ConfigEditor.tsx | 2 +- .../datasource/testdata/QueryEditor.tsx | 3 +- .../datasource/testdata/StreamHandler.ts | 7 +- .../datasource/testdata/TestInfoTab.tsx | 2 +- .../plugins/datasource/testdata/datasource.ts | 5 +- .../plugins/datasource/testdata/module.tsx | 2 +- .../plugins/datasource/testdata/runStreams.ts | 12 +- .../app/plugins/datasource/testdata/types.ts | 2 +- public/app/plugins/panel/alertlist/module.ts | 2 +- .../plugins/panel/annolist/AnnoListEditor.tsx | 4 +- .../plugins/panel/annolist/AnnoListPanel.tsx | 4 +- public/app/plugins/panel/annolist/module.ts | 2 +- .../panel/bargauge/BarGaugeMigrations.test.ts | 2 +- .../panel/bargauge/BarGaugeMigrations.ts | 3 +- .../plugins/panel/bargauge/BarGaugePanel.tsx | 4 +- .../panel/bargauge/BarGaugePanelEditor.tsx | 4 +- public/app/plugins/panel/bargauge/module.tsx | 3 +- public/app/plugins/panel/bargauge/types.ts | 4 +- public/app/plugins/panel/dashlist/module.ts | 2 +- .../panel/gauge/GaugeMigrations.test.ts | 2 +- .../plugins/panel/gauge/GaugeMigrations.ts | 3 +- public/app/plugins/panel/gauge/GaugePanel.tsx | 5 +- .../plugins/panel/gauge/GaugePanelEditor.tsx | 4 +- public/app/plugins/panel/gauge/module.tsx | 2 +- public/app/plugins/panel/gauge/types.ts | 2 +- .../panel/gettingstarted/GettingStarted.tsx | 2 +- .../plugins/panel/gettingstarted/module.ts | 2 +- public/app/plugins/panel/graph/axes_editor.ts | 2 +- .../app/plugins/panel/graph/data_processor.ts | 4 +- public/app/plugins/panel/graph/graph.ts | 11 +- public/app/plugins/panel/graph/module.ts | 4 +- .../plugins/panel/graph/threshold_manager.ts | 2 +- .../panel/graph/time_region_manager.ts | 3 +- .../app/plugins/panel/graph2/GraphPanel.tsx | 3 +- .../panel/graph2/GraphPanelController.tsx | 4 +- .../plugins/panel/graph2/GraphPanelEditor.tsx | 3 +- .../panel/graph2/getGraphSeriesModel.ts | 5 +- public/app/plugins/panel/graph2/module.tsx | 2 +- .../app/plugins/panel/heatmap/color_legend.ts | 2 +- .../app/plugins/panel/heatmap/heatmap_ctrl.ts | 3 +- .../plugins/panel/heatmap/heatmap_tooltip.ts | 2 +- public/app/plugins/panel/heatmap/rendering.ts | 3 +- public/app/plugins/panel/logs/LogsPanel.tsx | 4 +- .../plugins/panel/logs/LogsPanelEditor.tsx | 4 +- public/app/plugins/panel/logs/module.tsx | 2 +- .../panel/piechart/PieChartOptionsBox.tsx | 4 +- .../plugins/panel/piechart/PieChartPanel.tsx | 5 +- .../panel/piechart/PieChartPanelEditor.tsx | 4 +- public/app/plugins/panel/piechart/module.tsx | 2 +- public/app/plugins/panel/piechart/types.ts | 4 +- public/app/plugins/panel/pluginlist/module.ts | 2 +- public/app/plugins/panel/singlestat/module.ts | 8 +- .../panel/singlestat/specs/singlestat.test.ts | 2 +- .../panel/singlestat2/SingleStatEditor.tsx | 4 +- .../panel/singlestat2/SingleStatPanel.tsx | 11 +- .../app/plugins/panel/singlestat2/module.tsx | 3 +- public/app/plugins/panel/singlestat2/types.ts | 5 +- .../app/plugins/panel/table/column_options.ts | 2 +- public/app/plugins/panel/table/module.ts | 2 +- public/app/plugins/panel/table/renderer.ts | 11 +- .../panel/table/specs/renderer.test.ts | 2 +- .../app/plugins/panel/table2/TablePanel.tsx | 3 +- .../plugins/panel/table2/TablePanelEditor.tsx | 3 +- public/app/plugins/panel/table2/module.tsx | 2 +- public/app/plugins/panel/text/module.ts | 2 +- public/app/plugins/panel/text2/TextPanel.tsx | 2 +- .../plugins/panel/text2/TextPanelEditor.tsx | 4 +- public/app/plugins/panel/text2/module.tsx | 2 +- public/app/types/datasources.ts | 2 +- public/app/types/explore.ts | 5 +- public/app/types/plugins.ts | 2 +- public/test/helpers/getQueryOptions.ts | 2 +- public/test/mocks/datasource_srv.ts | 2 +- public/test/mocks/mockExploreState.ts | 4 +- public/test/specs/helpers.ts | 2 +- yarn.lock | 5 - 379 files changed, 984 insertions(+), 892 deletions(-) rename packages/{grafana-ui/src/utils => grafana-data/src/field}/displayProcessor.test.ts (97%) rename packages/{grafana-ui/src/utils => grafana-data/src/field}/displayProcessor.ts (89%) rename packages/{grafana-ui/src/utils => grafana-data/src/field}/fieldDisplay.test.ts (93%) rename packages/{grafana-ui/src/utils => grafana-data/src/field}/fieldDisplay.ts (93%) create mode 100644 packages/grafana-data/src/field/index.ts rename packages/{grafana-ui => grafana-data}/src/types/app.ts (93%) delete mode 100644 packages/grafana-data/src/types/appEvent.ts rename packages/grafana-data/src/types/{events.ts => appEvents.ts} (80%) rename packages/{grafana-ui => grafana-data}/src/types/datasource.ts (98%) rename packages/{grafana-ui => grafana-data}/src/types/panel.ts (95%) rename packages/{grafana-ui/src/types/events.ts => grafana-data/src/types/panelEvents.ts} (91%) rename packages/{grafana-ui => grafana-data}/src/types/plugin.ts (98%) create mode 100644 packages/grafana-data/src/types/theme.ts rename packages/{grafana-ui => grafana-data}/src/utils/flotPairs.test.ts (91%) rename packages/{grafana-ui => grafana-data}/src/utils/flotPairs.ts (83%) rename packages/{grafana-ui => grafana-data}/src/utils/namedColorsPalette.test.ts (98%) rename packages/{grafana-ui => grafana-data}/src/utils/namedColorsPalette.ts (100%) rename packages/{grafana-ui/src/utils => grafana-data/src}/valueFormats/arithmeticFormatters.test.ts (100%) rename packages/{grafana-ui/src/utils => grafana-data/src}/valueFormats/arithmeticFormatters.ts (94%) rename packages/{grafana-ui/src/utils => grafana-data/src}/valueFormats/categories.ts (100%) rename packages/{grafana-ui/src/utils => grafana-data/src}/valueFormats/dateTimeFormatters.test.ts (99%) rename packages/{grafana-ui/src/utils => grafana-data/src}/valueFormats/dateTimeFormatters.ts (98%) create mode 100644 packages/grafana-data/src/valueFormats/index.ts rename packages/{grafana-ui/src/utils => grafana-data/src}/valueFormats/symbolFormatters.test.ts (100%) rename packages/{grafana-ui/src/utils => grafana-data/src}/valueFormats/symbolFormatters.ts (94%) rename packages/{grafana-ui/src/utils => grafana-data/src}/valueFormats/valueFormats.test.ts (100%) rename packages/{grafana-ui/src/utils => grafana-data/src}/valueFormats/valueFormats.ts (98%) diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 8900d34ecab..0328b1ba3bb 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -12,6 +12,7 @@ "url": "http://github.com/grafana/grafana.git" }, "main": "src/index.ts", + "types": "src/index.ts", "scripts": { "tslint": "tslint -c tslint.json --project tsconfig.json", "typecheck": "tsc --noEmit", @@ -37,8 +38,8 @@ "rollup-plugin-terser": "4.0.4", "rollup-plugin-typescript2": "0.19.3", "rollup-plugin-visualizer": "0.9.2", + "rxjs": "6.4.0", "sinon": "1.17.6", "typescript": "3.6.3" - }, - "types": "src/index.ts" + } } diff --git a/packages/grafana-ui/src/utils/displayProcessor.test.ts b/packages/grafana-data/src/field/displayProcessor.test.ts similarity index 97% rename from packages/grafana-ui/src/utils/displayProcessor.test.ts rename to packages/grafana-data/src/field/displayProcessor.test.ts index 1c59d780390..67e0f953808 100644 --- a/packages/grafana-ui/src/utils/displayProcessor.test.ts +++ b/packages/grafana-data/src/field/displayProcessor.test.ts @@ -1,5 +1,6 @@ -import { MappingType, ValueMapping, DisplayProcessor, DisplayValue } from '@grafana/data'; import { getDisplayProcessor, getColorFromThreshold } from './displayProcessor'; +import { DisplayProcessor, DisplayValue } from '../types/displayValue'; +import { ValueMapping, MappingType } from '../types/valueMapping'; function assertSame(input: any, processors: DisplayProcessor[], match: DisplayValue) { processors.forEach(processor => { diff --git a/packages/grafana-ui/src/utils/displayProcessor.ts b/packages/grafana-data/src/field/displayProcessor.ts similarity index 89% rename from packages/grafana-ui/src/utils/displayProcessor.ts rename to packages/grafana-data/src/field/displayProcessor.ts index b4aafdae546..4f457d045e9 100644 --- a/packages/grafana-ui/src/utils/displayProcessor.ts +++ b/packages/grafana-data/src/field/displayProcessor.ts @@ -1,21 +1,17 @@ // Libraries import _ from 'lodash'; -import { - Threshold, - getMappedValue, - FieldConfig, - DisplayProcessor, - DecimalInfo, - DisplayValue, - DecimalCount, -} from '@grafana/data'; // Utils -import { getValueFormat } from './valueFormats/valueFormats'; -import { getColorFromHexRgbOrName } from './namedColorsPalette'; +import { getColorFromHexRgbOrName } from '../utils/namedColorsPalette'; // Types -import { GrafanaTheme, GrafanaThemeType } from '../types/index'; +import { FieldConfig } from '../types/dataFrame'; +import { GrafanaTheme, GrafanaThemeType } from '../types/theme'; +import { DisplayProcessor, DisplayValue, DecimalCount, DecimalInfo } from '../types/displayValue'; +import { getValueFormat } from '../valueFormats/valueFormats'; +import { getMappedValue } from '../utils/valueMappings'; +import { Threshold } from '../types/threshold'; +// import { GrafanaTheme, GrafanaThemeType, FieldConfig } from '../types/index'; interface DisplayProcessorOptions { config?: FieldConfig; diff --git a/packages/grafana-ui/src/utils/fieldDisplay.test.ts b/packages/grafana-data/src/field/fieldDisplay.test.ts similarity index 93% rename from packages/grafana-ui/src/utils/fieldDisplay.test.ts rename to packages/grafana-data/src/field/fieldDisplay.test.ts index 05d710ac174..5d2920ba79a 100644 --- a/packages/grafana-ui/src/utils/fieldDisplay.test.ts +++ b/packages/grafana-data/src/field/fieldDisplay.test.ts @@ -1,7 +1,8 @@ import { getFieldProperties, getFieldDisplayValues, GetFieldDisplayValuesOptions } from './fieldDisplay'; -import { ReducerID, Threshold, toDataFrame } from '@grafana/data'; -import { GrafanaThemeType } from '../types/theme'; -import { getTheme } from '../themes/index'; +import { toDataFrame } from '../dataframe/processDataFrame'; +import { ReducerID } from '../transformations/fieldReducer'; +import { Threshold } from '../types/threshold'; +import { GrafanaTheme } from '../types/theme'; describe('FieldDisplay', () => { it('Construct simple field properties', () => { @@ -32,6 +33,7 @@ describe('FieldDisplay', () => { }); // Simple test dataset + const options: GetFieldDisplayValuesOptions = { data: [ toDataFrame({ @@ -51,7 +53,7 @@ describe('FieldDisplay', () => { override: {}, defaults: {}, }, - theme: getTheme(GrafanaThemeType.Dark), + theme: {} as GrafanaTheme, }; it('show first numeric values', () => { @@ -148,7 +150,7 @@ describe('FieldDisplay', () => { thresholds: [{ color: '#F2495C', value: 50 }], }, }, - theme: getTheme(GrafanaThemeType.Dark), + theme: {} as GrafanaTheme, }; const display = getFieldDisplayValues(options); diff --git a/packages/grafana-ui/src/utils/fieldDisplay.ts b/packages/grafana-data/src/field/fieldDisplay.ts similarity index 93% rename from packages/grafana-ui/src/utils/fieldDisplay.ts rename to packages/grafana-data/src/field/fieldDisplay.ts index 70f82f017df..94c3788ee11 100644 --- a/packages/grafana-ui/src/utils/fieldDisplay.ts +++ b/packages/grafana-data/src/field/fieldDisplay.ts @@ -1,22 +1,17 @@ -import { - ReducerID, - reduceField, - FieldType, - DataFrame, - FieldConfig, - DisplayValue, - GraphSeriesValue, - DataFrameView, - getTimeField, - ScopedVars, -} from '@grafana/data'; - import toNumber from 'lodash/toNumber'; import toString from 'lodash/toString'; -import { GrafanaTheme, InterpolateFunction } from '../types/index'; import { getDisplayProcessor } from './displayProcessor'; -import { getFlotPairs } from './flotPairs'; +import { getFlotPairs } from '../utils/flotPairs'; +import { FieldConfig, DataFrame, FieldType } from '../types/dataFrame'; +import { InterpolateFunction } from '../types/panel'; +import { DataFrameView } from '../dataframe/DataFrameView'; +import { GraphSeriesValue } from '../types/graph'; +import { DisplayValue } from '../types/displayValue'; +import { GrafanaTheme } from '../types/theme'; +import { ReducerID, reduceField } from '../transformations/fieldReducer'; +import { ScopedVars } from '../types/ScopedVars'; +import { getTimeField } from '../dataframe/processDataFrame'; export interface FieldDisplayOptions { values?: boolean; // If true show each row value diff --git a/packages/grafana-data/src/field/index.ts b/packages/grafana-data/src/field/index.ts new file mode 100644 index 00000000000..1e18439d6dd --- /dev/null +++ b/packages/grafana-data/src/field/index.ts @@ -0,0 +1,2 @@ +export * from './fieldDisplay'; +export * from './displayProcessor'; diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts index c5f3add1d5b..fab26964da0 100644 --- a/packages/grafana-data/src/index.ts +++ b/packages/grafana-data/src/index.ts @@ -5,3 +5,5 @@ export * from './dataframe'; export * from './transformations'; export * from './datetime'; export * from './text'; +export * from './valueFormats'; +export * from './field'; diff --git a/packages/grafana-ui/src/types/app.ts b/packages/grafana-data/src/types/app.ts similarity index 93% rename from packages/grafana-ui/src/types/app.ts rename to packages/grafana-data/src/types/app.ts index 4643671e4f1..421b565f623 100644 --- a/packages/grafana-ui/src/types/app.ts +++ b/packages/grafana-data/src/types/app.ts @@ -1,6 +1,7 @@ import { ComponentClass } from 'react'; -import { NavModel, KeyValue } from '@grafana/data'; -import { PluginMeta, PluginIncludeType, GrafanaPlugin } from './plugin'; +import { KeyValue } from './data'; +import { NavModel } from './navModel'; +import { PluginMeta, GrafanaPlugin, PluginIncludeType } from './plugin'; export interface AppRootProps { meta: AppPluginMeta; diff --git a/packages/grafana-data/src/types/appEvent.ts b/packages/grafana-data/src/types/appEvent.ts deleted file mode 100644 index 7edf2fdbb6c..00000000000 --- a/packages/grafana-data/src/types/appEvent.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface AppEvent { - readonly name: string; - payload?: T; -} diff --git a/packages/grafana-data/src/types/events.ts b/packages/grafana-data/src/types/appEvents.ts similarity index 80% rename from packages/grafana-data/src/types/events.ts rename to packages/grafana-data/src/types/appEvents.ts index ee029c29999..9f87c1ea204 100644 --- a/packages/grafana-data/src/types/events.ts +++ b/packages/grafana-data/src/types/appEvents.ts @@ -1,5 +1,10 @@ import { eventFactory } from './utils'; +export interface AppEvent { + readonly name: string; + payload?: T; +} + export type AlertPayload = [string, string?]; export const alertSuccess = eventFactory('alert-success'); diff --git a/packages/grafana-ui/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts similarity index 98% rename from packages/grafana-ui/src/types/datasource.ts rename to packages/grafana-data/src/types/datasource.ts index 31a78d46dec..dac78035e7a 100644 --- a/packages/grafana-ui/src/types/datasource.ts +++ b/packages/grafana-data/src/types/datasource.ts @@ -1,20 +1,12 @@ +import { Observable } from 'rxjs'; import { ComponentType } from 'react'; -import { - TimeRange, - RawTimeRange, - TableData, - TimeSeries, - DataFrame, - LogRowModel, - LoadingState, - DataFrameDTO, - AnnotationEvent, - ScopedVars, - KeyValue, -} from '@grafana/data'; import { PluginMeta, GrafanaPlugin } from './plugin'; import { PanelData } from './panel'; -import { Observable } from 'rxjs'; +import { LogRowModel } from './logs'; +import { AnnotationEvent, TimeSeries, TableData, LoadingState, KeyValue } from './data'; +import { DataFrame, DataFrameDTO } from './dataFrame'; +import { TimeRange, RawTimeRange } from './time'; +import { ScopedVars } from './ScopedVars'; export interface DataSourcePluginOptionsEditorProps { options: DataSourceSettings; diff --git a/packages/grafana-data/src/types/index.ts b/packages/grafana-data/src/types/index.ts index 11cbebe9ab4..e9f5bd435d6 100644 --- a/packages/grafana-data/src/types/index.ts +++ b/packages/grafana-data/src/types/index.ts @@ -13,7 +13,15 @@ export * from './graph'; export * from './ScopedVars'; export * from './transformations'; export * from './vector'; -export * from './appEvent'; +export * from './app'; +export * from './datasource'; +export * from './panel'; +export * from './plugin'; +export * from './theme'; -import * as AppEvents from './events'; -export { AppEvents }; +import * as AppEvents from './appEvents'; +import { AppEvent } from './appEvents'; +export { AppEvent, AppEvents }; + +import * as PanelEvents from './panelEvents'; +export { PanelEvents }; diff --git a/packages/grafana-ui/src/types/panel.ts b/packages/grafana-data/src/types/panel.ts similarity index 95% rename from packages/grafana-ui/src/types/panel.ts rename to packages/grafana-data/src/types/panel.ts index 6be690bb7a3..6135c9edf66 100644 --- a/packages/grafana-ui/src/types/panel.ts +++ b/packages/grafana-data/src/types/panel.ts @@ -1,7 +1,10 @@ import { ComponentClass, ComponentType } from 'react'; -import { LoadingState, DataFrame, TimeRange, TimeZone, ScopedVars, AbsoluteTimeRange } from '@grafana/data'; import { DataQueryRequest, DataQueryError } from './datasource'; import { PluginMeta, GrafanaPlugin } from './plugin'; +import { ScopedVars } from './ScopedVars'; +import { LoadingState } from './data'; +import { DataFrame } from './dataFrame'; +import { TimeRange, TimeZone, AbsoluteTimeRange } from './time'; export type InterpolateFunction = (value: string, scopedVars?: ScopedVars, format?: string | Function) => string; diff --git a/packages/grafana-ui/src/types/events.ts b/packages/grafana-data/src/types/panelEvents.ts similarity index 91% rename from packages/grafana-ui/src/types/events.ts rename to packages/grafana-data/src/types/panelEvents.ts index 45acbb8ab78..004eaa543c0 100644 --- a/packages/grafana-ui/src/types/events.ts +++ b/packages/grafana-data/src/types/panelEvents.ts @@ -1,8 +1,7 @@ -import { eventFactory } from '@grafana/data'; -import { DataQueryResponseData, DataQueryError } from '.'; +import { eventFactory } from './utils'; +import { DataQueryError, DataQueryResponseData } from './datasource'; /** Payloads */ - export interface PanelChangeViewPayload { fullscreen?: boolean; edit?: boolean; diff --git a/packages/grafana-ui/src/types/plugin.ts b/packages/grafana-data/src/types/plugin.ts similarity index 98% rename from packages/grafana-ui/src/types/plugin.ts rename to packages/grafana-data/src/types/plugin.ts index c6d83cb349c..259f9b28667 100644 --- a/packages/grafana-ui/src/types/plugin.ts +++ b/packages/grafana-data/src/types/plugin.ts @@ -1,5 +1,5 @@ import { ComponentClass } from 'react'; -import { KeyValue } from '@grafana/data'; +import { KeyValue } from './data'; export enum PluginState { alpha = 'alpha', // Only included it `enable_alpha` is true diff --git a/packages/grafana-data/src/types/theme.ts b/packages/grafana-data/src/types/theme.ts new file mode 100644 index 00000000000..538c08bdcd4 --- /dev/null +++ b/packages/grafana-data/src/types/theme.ts @@ -0,0 +1,236 @@ +export enum GrafanaThemeType { + Light = 'light', + Dark = 'dark', +} + +export interface GrafanaThemeCommons { + name: string; + // TODO: not sure if should be a part of theme + breakpoints: { + xs: string; + sm: string; + md: string; + lg: string; + xl: string; + }; + typography: { + fontFamily: { + sansSerif: string; + monospace: string; + }; + size: { + root: string; + base: string; + xs: string; + sm: string; + md: string; + lg: string; + }; + weight: { + light: number; + regular: number; + semibold: number; + bold: number; + }; + lineHeight: { + xs: number; //1 + sm: number; //1.1 + md: number; // 4/3 + lg: number; // 1.5 + }; + // TODO: Refactor to use size instead of custom defs + heading: { + h1: string; + h2: string; + h3: string; + h4: string; + h5: string; + h6: string; + }; + link: { + decoration: string; + hoverDecoration: string; + }; + }; + spacing: { + insetSquishMd: string; + d: string; + xxs: string; + xs: string; + sm: string; + md: string; + lg: string; + xl: string; + gutter: string; + + // Next-gen forms spacing variables + // TODO: Move variables definition to respective components when implementing + formSpacingBase: number; + formMargin: string; + formFieldsetMargin: string; + formLegendMargin: string; + formInputHeight: string; + formButtonHeight: number; + formInputPaddingHorizontal: string; + // Used for icons do define spacing between icon and input field + // Applied on the right(prefix) or left(suffix) + formInputAffixPaddingHorizontal: string; + formInputMargin: string; + formLabelPadding: string; + formLabelMargin: string; + formValidationMessagePadding: string; + }; + border: { + radius: { + sm: string; + md: string; + lg: string; + }; + width: { + sm: string; + }; + }; + height: { + sm: string; + md: string; + lg: string; + }; + panelPadding: number; + panelHeaderHeight: number; + zIndex: { + dropdown: string; + navbarFixed: string; + sidemenu: string; + tooltip: string; + modalBackdrop: string; + modal: string; + typeahead: string; + }; +} + +export interface GrafanaTheme extends GrafanaThemeCommons { + type: GrafanaThemeType; + isDark: boolean; + isLight: boolean; + background: { + dropdown: string; + scrollbar: string; + scrollbar2: string; + pageHeader: string; + }; + colors: { + black: string; + white: string; + dark1: string; + dark2: string; + dark3: string; + dark4: string; + dark5: string; + dark6: string; + dark7: string; + dark8: string; + dark9: string; + dark10: string; + gray1: string; + gray2: string; + gray3: string; + gray4: string; + gray5: string; + gray6: string; + gray7: string; + + // New greys palette used by next-gen form elements + gray98: string; + gray95: string; + gray85: string; + gray70: string; + gray33: string; + gray25: string; + gray15: string; + gray10: string; + gray05: string; + + // New blues palette used by next-gen form elements + blue95: string; + blue85: string; + blue77: string; + + // New reds palette used by next-gen form elements + red88: string; + + grayBlue: string; + inputBlack: string; + + // Accent colors + blue: string; + blueBase: string; + blueShade: string; + blueLight: string; + blueFaint: string; + redBase: string; + redShade: string; + greenBase: string; + greenShade: string; + red: string; + yellow: string; + purple: string; + variable: string; + orange: string; + orangeDark: string; + queryRed: string; + queryGreen: string; + queryPurple: string; + queryKeyword: string; + queryOrange: string; + brandPrimary: string; + brandSuccess: string; + brandWarning: string; + brandDanger: string; + + // Status colors + online: string; + warn: string; + critical: string; + + // Link colors + link: string; + linkDisabled: string; + linkHover: string; + linkExternal: string; + + // Text colors + body: string; + text: string; + textStrong: string; + textWeak: string; + textFaint: string; + textEmphasis: string; + + // TODO: move to background section + bodyBg: string; + pageBg: string; + headingColor: string; + + pageHeaderBorder: string; + + // Next-gen forms functional colors + formLabel: string; + formDescription: string; + formLegend: string; + formInputBg: string; + formInputBgDisabled: string; + formInputBorder: string; + formInputBorderHover: string; + formInputBorderActive: string; + formInputBorderInvalid: string; + formInputFocusOutline: string; + formInputText: string; + formInputTextStrong: string; + formInputTextWhite: string; + formValidationMessageText: string; + formValidationMessageBg: string; + }; + shadow: { + pageHeader: string; + }; +} diff --git a/packages/grafana-data/src/types/utils.ts b/packages/grafana-data/src/types/utils.ts index a70e0d2101b..355c502fc55 100644 --- a/packages/grafana-data/src/types/utils.ts +++ b/packages/grafana-data/src/types/utils.ts @@ -1,4 +1,4 @@ -import { AppEvent } from './appEvent'; +import { AppEvent } from './appEvents'; export type Omit = Pick>; export type Subtract = Omit; diff --git a/packages/grafana-ui/src/utils/flotPairs.test.ts b/packages/grafana-data/src/utils/flotPairs.test.ts similarity index 91% rename from packages/grafana-ui/src/utils/flotPairs.test.ts rename to packages/grafana-data/src/utils/flotPairs.test.ts index d94518b630e..74a13b2d6e5 100644 --- a/packages/grafana-ui/src/utils/flotPairs.test.ts +++ b/packages/grafana-data/src/utils/flotPairs.test.ts @@ -1,5 +1,7 @@ +import { MutableDataFrame } from '../dataframe/MutableDataFrame'; import { getFlotPairs, getFlotPairsConstant } from './flotPairs'; -import { MutableDataFrame, TimeRange, dateTime } from '@grafana/data'; +import { TimeRange } from '../types/time'; +import { dateTime } from '../datetime/moment_wrapper'; describe('getFlotPairs', () => { const series = new MutableDataFrame({ diff --git a/packages/grafana-ui/src/utils/flotPairs.ts b/packages/grafana-data/src/utils/flotPairs.ts similarity index 83% rename from packages/grafana-ui/src/utils/flotPairs.ts rename to packages/grafana-data/src/utils/flotPairs.ts index 81c7fcb5914..cca20b57abb 100644 --- a/packages/grafana-ui/src/utils/flotPairs.ts +++ b/packages/grafana-data/src/utils/flotPairs.ts @@ -1,5 +1,10 @@ +import { Field } from '../types/dataFrame'; +import { NullValueMode } from '../types/data'; +import { GraphSeriesValue } from '../types/graph'; +import { TimeRange } from '../types/time'; + // Types -import { NullValueMode, GraphSeriesValue, Field, TimeRange } from '@grafana/data'; +// import { NullValueMode, GraphSeriesValue, Field, TimeRange } from '@grafana/data'; export interface FlotPairsOptions { xField: Field; diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts index 5f3d7d23ef4..efe1868e8e9 100644 --- a/packages/grafana-data/src/utils/index.ts +++ b/packages/grafana-data/src/utils/index.ts @@ -6,5 +6,7 @@ export * from './labels'; export * from './labels'; export * from './object'; export * from './thresholds'; +export * from './namedColorsPalette'; export { getMappedValue } from './valueMappings'; +export { getFlotPairs, getFlotPairsConstant } from './flotPairs'; diff --git a/packages/grafana-ui/src/utils/namedColorsPalette.test.ts b/packages/grafana-data/src/utils/namedColorsPalette.test.ts similarity index 98% rename from packages/grafana-ui/src/utils/namedColorsPalette.test.ts rename to packages/grafana-data/src/utils/namedColorsPalette.test.ts index 3edc71c94ae..4a7a5a8e8f1 100644 --- a/packages/grafana-ui/src/utils/namedColorsPalette.test.ts +++ b/packages/grafana-data/src/utils/namedColorsPalette.test.ts @@ -5,7 +5,7 @@ import { getColorFromHexRgbOrName, getColorDefinitionByName, } from './namedColorsPalette'; -import { GrafanaThemeType } from '../types/index'; +import { GrafanaThemeType } from '../types/theme'; describe('colors', () => { const SemiDarkBlue = getColorDefinitionByName('semi-dark-blue'); diff --git a/packages/grafana-ui/src/utils/namedColorsPalette.ts b/packages/grafana-data/src/utils/namedColorsPalette.ts similarity index 100% rename from packages/grafana-ui/src/utils/namedColorsPalette.ts rename to packages/grafana-data/src/utils/namedColorsPalette.ts index deea2374205..e2d2c833fb5 100644 --- a/packages/grafana-ui/src/utils/namedColorsPalette.ts +++ b/packages/grafana-data/src/utils/namedColorsPalette.ts @@ -1,6 +1,6 @@ import flatten from 'lodash/flatten'; -import { GrafanaThemeType } from '../types/theme'; import tinycolor from 'tinycolor2'; +import { GrafanaThemeType } from '../types/theme'; type Hue = 'green' | 'yellow' | 'red' | 'blue' | 'orange' | 'purple'; diff --git a/packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.test.ts b/packages/grafana-data/src/valueFormats/arithmeticFormatters.test.ts similarity index 100% rename from packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.test.ts rename to packages/grafana-data/src/valueFormats/arithmeticFormatters.test.ts diff --git a/packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.ts b/packages/grafana-data/src/valueFormats/arithmeticFormatters.ts similarity index 94% rename from packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.ts rename to packages/grafana-data/src/valueFormats/arithmeticFormatters.ts index cc041b52765..48a6396c691 100644 --- a/packages/grafana-ui/src/utils/valueFormats/arithmeticFormatters.ts +++ b/packages/grafana-data/src/valueFormats/arithmeticFormatters.ts @@ -1,6 +1,5 @@ -import { DecimalCount } from '@grafana/data'; - import { toFixed } from './valueFormats'; +import { DecimalCount } from '../types/displayValue'; export function toPercent(size: number, decimals: DecimalCount) { if (size === null) { diff --git a/packages/grafana-ui/src/utils/valueFormats/categories.ts b/packages/grafana-data/src/valueFormats/categories.ts similarity index 100% rename from packages/grafana-ui/src/utils/valueFormats/categories.ts rename to packages/grafana-data/src/valueFormats/categories.ts diff --git a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts b/packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts similarity index 99% rename from packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts rename to packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts index 1640b63d907..d765872142f 100644 --- a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.test.ts +++ b/packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts @@ -9,7 +9,7 @@ import { toDurationInSeconds, toDurationInHoursMinutesSeconds, } from './dateTimeFormatters'; -import { toUtc, dateTime } from '@grafana/data'; +import { toUtc, dateTime } from '../datetime/moment_wrapper'; describe('date time formats', () => { const epoch = 1505634997920; diff --git a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts b/packages/grafana-data/src/valueFormats/dateTimeFormatters.ts similarity index 98% rename from packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts rename to packages/grafana-data/src/valueFormats/dateTimeFormatters.ts index 20ffbab6509..2368e1fb249 100644 --- a/packages/grafana-ui/src/utils/valueFormats/dateTimeFormatters.ts +++ b/packages/grafana-data/src/valueFormats/dateTimeFormatters.ts @@ -1,6 +1,7 @@ -import { toUtc, toDuration as duration, dateTime, DecimalCount } from '@grafana/data'; +import { toDuration as duration, toUtc, dateTime } from '../datetime/moment_wrapper'; import { toFixed, toFixedScaled } from './valueFormats'; +import { DecimalCount } from '../types/displayValue'; interface IntervalsInSeconds { [interval: string]: number; diff --git a/packages/grafana-data/src/valueFormats/index.ts b/packages/grafana-data/src/valueFormats/index.ts new file mode 100644 index 00000000000..c76a4438e41 --- /dev/null +++ b/packages/grafana-data/src/valueFormats/index.ts @@ -0,0 +1 @@ +export * from './valueFormats'; diff --git a/packages/grafana-ui/src/utils/valueFormats/symbolFormatters.test.ts b/packages/grafana-data/src/valueFormats/symbolFormatters.test.ts similarity index 100% rename from packages/grafana-ui/src/utils/valueFormats/symbolFormatters.test.ts rename to packages/grafana-data/src/valueFormats/symbolFormatters.test.ts diff --git a/packages/grafana-ui/src/utils/valueFormats/symbolFormatters.ts b/packages/grafana-data/src/valueFormats/symbolFormatters.ts similarity index 94% rename from packages/grafana-ui/src/utils/valueFormats/symbolFormatters.ts rename to packages/grafana-data/src/valueFormats/symbolFormatters.ts index 7e81cff3bdf..6e212d2daa8 100644 --- a/packages/grafana-ui/src/utils/valueFormats/symbolFormatters.ts +++ b/packages/grafana-data/src/valueFormats/symbolFormatters.ts @@ -1,6 +1,5 @@ -import { DecimalCount } from '@grafana/data'; - import { scaledUnits } from './valueFormats'; +import { DecimalCount } from '../types/displayValue'; export function currency(symbol: string) { const units = ['', 'K', 'M', 'B', 'T']; diff --git a/packages/grafana-ui/src/utils/valueFormats/valueFormats.test.ts b/packages/grafana-data/src/valueFormats/valueFormats.test.ts similarity index 100% rename from packages/grafana-ui/src/utils/valueFormats/valueFormats.test.ts rename to packages/grafana-data/src/valueFormats/valueFormats.test.ts diff --git a/packages/grafana-ui/src/utils/valueFormats/valueFormats.ts b/packages/grafana-data/src/valueFormats/valueFormats.ts similarity index 98% rename from packages/grafana-ui/src/utils/valueFormats/valueFormats.ts rename to packages/grafana-data/src/valueFormats/valueFormats.ts index fc2ea93c48b..0e99b6021c1 100644 --- a/packages/grafana-ui/src/utils/valueFormats/valueFormats.ts +++ b/packages/grafana-data/src/valueFormats/valueFormats.ts @@ -1,6 +1,5 @@ -import { DecimalCount } from '@grafana/data'; - import { getCategories } from './categories'; +import { DecimalCount } from '../types/displayValue'; export type ValueFormatter = ( value: number, diff --git a/packages/grafana-runtime/src/config.ts b/packages/grafana-runtime/src/config.ts index 19d90e5a379..bee1674a8ca 100644 --- a/packages/grafana-runtime/src/config.ts +++ b/packages/grafana-runtime/src/config.ts @@ -1,5 +1,6 @@ import extend from 'lodash/extend'; -import { GrafanaTheme, getTheme, GrafanaThemeType, PanelPluginMeta, DataSourceInstanceSettings } from '@grafana/ui'; +import { getTheme } from '@grafana/ui'; +import { GrafanaTheme, GrafanaThemeType, PanelPluginMeta, DataSourceInstanceSettings } from '@grafana/data'; export interface BuildInfo { version: string; diff --git a/packages/grafana-runtime/src/services/dataSourceSrv.ts b/packages/grafana-runtime/src/services/dataSourceSrv.ts index 5e3b7fe13d6..f0894644c80 100644 --- a/packages/grafana-runtime/src/services/dataSourceSrv.ts +++ b/packages/grafana-runtime/src/services/dataSourceSrv.ts @@ -1,5 +1,4 @@ -import { ScopedVars } from '@grafana/data'; -import { DataSourceApi } from '@grafana/ui'; +import { ScopedVars, DataSourceApi } from '@grafana/data'; export interface DataSourceSrv { get(name?: string, scopedVars?: ScopedVars): Promise; diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts index 0a3d9fd6447..a0c18f77fa4 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts +++ b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts @@ -3,7 +3,7 @@ import { pluginBuildRunner } from './plugin.build'; import { restoreCwd } from '../utils/cwd'; import { S3Client } from '../../plugins/aws'; import { getPluginJson } from '../../config/utils/pluginValidation'; -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; // @ts-ignore import execa = require('execa'); diff --git a/packages/grafana-toolkit/src/config/utils/pluginValidation.ts b/packages/grafana-toolkit/src/config/utils/pluginValidation.ts index ccc3db2990c..f2ff2cdf7df 100644 --- a/packages/grafana-toolkit/src/config/utils/pluginValidation.ts +++ b/packages/grafana-toolkit/src/config/utils/pluginValidation.ts @@ -1,4 +1,4 @@ -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; export const validatePluginJson = (pluginJson: any) => { if (!pluginJson.id) { diff --git a/packages/grafana-toolkit/src/plugins/aws.ts b/packages/grafana-toolkit/src/plugins/aws.ts index c92d83f82a0..038ca011be8 100644 --- a/packages/grafana-toolkit/src/plugins/aws.ts +++ b/packages/grafana-toolkit/src/plugins/aws.ts @@ -5,7 +5,7 @@ import fs from 'fs'; import { PluginPackageDetails, ZipFileInfo, TestResultsInfo } from './types'; import defaults from 'lodash/defaults'; import clone from 'lodash/clone'; -import { PluginMetaInfo } from '@grafana/ui'; +import { PluginMetaInfo } from '@grafana/data'; interface UploadArgs { local: string; diff --git a/packages/grafana-toolkit/src/plugins/e2e/settings.ts b/packages/grafana-toolkit/src/plugins/e2e/settings.ts index d5888070f37..64f0ce84531 100644 --- a/packages/grafana-toolkit/src/plugins/e2e/settings.ts +++ b/packages/grafana-toolkit/src/plugins/e2e/settings.ts @@ -1,4 +1,4 @@ -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; import path from 'path'; import fs from 'fs'; diff --git a/packages/grafana-toolkit/src/plugins/env.ts b/packages/grafana-toolkit/src/plugins/env.ts index a3394536306..7cdc0485cb7 100644 --- a/packages/grafana-toolkit/src/plugins/env.ts +++ b/packages/grafana-toolkit/src/plugins/env.ts @@ -1,7 +1,7 @@ import execa from 'execa'; import path from 'path'; import fs from 'fs'; -import { PluginBuildInfo } from '@grafana/ui'; +import { PluginBuildInfo } from '@grafana/data'; import { JobInfo } from './types'; const getJobFromProcessArgv = () => { diff --git a/packages/grafana-toolkit/src/plugins/types.ts b/packages/grafana-toolkit/src/plugins/types.ts index a06c8a01380..bb62cc83207 100644 --- a/packages/grafana-toolkit/src/plugins/types.ts +++ b/packages/grafana-toolkit/src/plugins/types.ts @@ -1,5 +1,4 @@ -import { PluginMeta, PluginBuildInfo } from '@grafana/ui'; -import { DataFrame, KeyValue } from '@grafana/data'; +import { PluginMeta, PluginBuildInfo, DataFrame, KeyValue } from '@grafana/data'; export interface PluginPackageDetails { plugin: ZipFileInfo; diff --git a/packages/grafana-ui/src/components/AlphaNotice/AlphaNotice.tsx b/packages/grafana-ui/src/components/AlphaNotice/AlphaNotice.tsx index a13efabc4c2..acc0441809a 100644 --- a/packages/grafana-ui/src/components/AlphaNotice/AlphaNotice.tsx +++ b/packages/grafana-ui/src/components/AlphaNotice/AlphaNotice.tsx @@ -1,6 +1,7 @@ import React, { FC, useContext } from 'react'; import { css, cx } from 'emotion'; -import { PluginState, ThemeContext } from '../../index'; +import { ThemeContext } from '../../index'; +import { PluginState } from '@grafana/data'; interface Props { state?: PluginState; diff --git a/packages/grafana-ui/src/components/BarGauge/BarGauge.story.tsx b/packages/grafana-ui/src/components/BarGauge/BarGauge.story.tsx index 930709364e8..dbb9cd0d70e 100644 --- a/packages/grafana-ui/src/components/BarGauge/BarGauge.story.tsx +++ b/packages/grafana-ui/src/components/BarGauge/BarGauge.story.tsx @@ -1,7 +1,7 @@ import { storiesOf } from '@storybook/react'; import { number, text } from '@storybook/addon-knobs'; import { BarGauge, Props } from './BarGauge'; -import { VizOrientation } from '../../types'; +import { VizOrientation } from '@grafana/data'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { renderComponentWithTheme } from '../../utils/storybook/withTheme'; diff --git a/packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx b/packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx index c2c00a779c8..f7872d50273 100644 --- a/packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx +++ b/packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx @@ -10,7 +10,7 @@ import { getTitleStyles, getValuePercent, } from './BarGauge'; -import { VizOrientation } from '../../types'; +import { VizOrientation } from '@grafana/data'; import { getTheme } from '../../themes'; // jest.mock('jquery', () => ({ diff --git a/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx b/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx index a4fc9404467..25a72b69955 100644 --- a/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx +++ b/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx @@ -4,10 +4,11 @@ import tinycolor from 'tinycolor2'; import { Threshold, TimeSeriesValue, getActiveThreshold, DisplayValue } from '@grafana/data'; // Utils -import { getColorFromHexRgbOrName } from '../../utils'; +import { getColorFromHexRgbOrName } from '@grafana/data'; // Types -import { Themeable, VizOrientation } from '../../types'; +import { VizOrientation } from '@grafana/data'; +import { Themeable } from '../../types'; const MIN_VALUE_HEIGHT = 18; const MAX_VALUE_HEIGHT = 50; diff --git a/packages/grafana-ui/src/components/BigValue/BigValue.tsx b/packages/grafana-ui/src/components/BigValue/BigValue.tsx index c4d67a06eb2..a7b0cb42321 100644 --- a/packages/grafana-ui/src/components/BigValue/BigValue.tsx +++ b/packages/grafana-ui/src/components/BigValue/BigValue.tsx @@ -5,10 +5,10 @@ import { Chart, Geom } from 'bizcharts'; import { DisplayValue } from '@grafana/data'; // Utils -import { getColorFromHexRgbOrName } from '../../utils'; +import { getColorFromHexRgbOrName, GrafanaTheme } from '@grafana/data'; // Types -import { Themeable, GrafanaTheme } from '../../types'; +import { Themeable } from '../../types'; export interface BigValueSparkline { data: any[][]; diff --git a/packages/grafana-ui/src/components/Button/types.ts b/packages/grafana-ui/src/components/Button/types.ts index 96385d68148..b3b12decf4d 100644 --- a/packages/grafana-ui/src/components/Button/types.ts +++ b/packages/grafana-ui/src/components/Button/types.ts @@ -1,4 +1,4 @@ -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; export type ButtonVariant = 'primary' | 'secondary' | 'danger' | 'inverse' | 'transparent' | 'destructive'; diff --git a/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.tsx b/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.tsx index af50edb7c8b..6f3d3162555 100644 --- a/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.tsx +++ b/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { Themeable, GrafanaTheme } from '../../types/theme'; +import { Themeable } from '../../types/theme'; +import { GrafanaTheme } from '@grafana/data'; import { selectThemeVariant } from '../../themes/selectThemeVariant'; import { css, cx } from 'emotion'; import { stylesFactory } from '../../themes'; diff --git a/packages/grafana-ui/src/components/Collapse/Collapse.tsx b/packages/grafana-ui/src/components/Collapse/Collapse.tsx index f2e56467dba..7c23bc1ec6b 100644 --- a/packages/grafana-ui/src/components/Collapse/Collapse.tsx +++ b/packages/grafana-ui/src/components/Collapse/Collapse.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent, useContext } from 'react'; import { css, cx } from 'emotion'; -import { GrafanaTheme } from '../../types/theme'; +import { GrafanaTheme } from '@grafana/data'; import { selectThemeVariant } from '../../themes/selectThemeVariant'; import { ThemeContext } from '../../themes/ThemeContext'; import { stylesFactory } from '../../themes/stylesFactory'; diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx index b1464189246..b9f66b9d62b 100644 --- a/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx +++ b/packages/grafana-ui/src/components/ColorPicker/ColorPicker.tsx @@ -3,7 +3,7 @@ import omit from 'lodash/omit'; import { PopoverController } from '../Tooltip/PopoverController'; import { Popover } from '../Tooltip/Popover'; import { ColorPickerPopover, ColorPickerProps, ColorPickerChangeHandler } from './ColorPickerPopover'; -import { getColorFromHexRgbOrName } from '../../utils/namedColorsPalette'; +import { getColorFromHexRgbOrName } from '@grafana/data'; import { SeriesColorPickerPopover } from './SeriesColorPickerPopover'; import { withTheme } from '../../themes/ThemeContext'; diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.test.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.test.tsx index df4b5bb24a2..8f96b2412d9 100644 --- a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.test.tsx +++ b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.test.tsx @@ -1,11 +1,10 @@ import React from 'react'; import { mount, ReactWrapper } from 'enzyme'; import { ColorPickerPopover } from './ColorPickerPopover'; -import { getColorDefinitionByName, getNamedColorPalette } from '../../utils/namedColorsPalette'; import { ColorSwatch } from './NamedColorsGroup'; import flatten from 'lodash/flatten'; -import { GrafanaThemeType } from '../../types'; import { getTheme } from '../../themes'; +import { GrafanaThemeType, getColorDefinitionByName, getNamedColorPalette } from '@grafana/data'; const allColors = flatten(Array.from(getNamedColorPalette().values())); diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx index e75985aca20..2395698837f 100644 --- a/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx +++ b/packages/grafana-ui/src/components/ColorPicker/ColorPickerPopover.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { NamedColorsPalette } from './NamedColorsPalette'; -import { getColorName, getColorFromHexRgbOrName } from '../../utils/namedColorsPalette'; import { PopoverContentProps } from '../Tooltip/Tooltip'; import SpectrumPalette from './SpectrumPalette'; -import { GrafanaThemeType, Themeable } from '../../types/theme'; +import { Themeable } from '../../types/theme'; import { warnAboutColorPickerPropsDeprecation } from './warnAboutColorPickerPropsDeprecation'; +import { GrafanaThemeType, getColorName, getColorFromHexRgbOrName } from '@grafana/data'; export type ColorPickerChangeHandler = (color: string) => void; diff --git a/packages/grafana-ui/src/components/ColorPicker/NamedColorsGroup.tsx b/packages/grafana-ui/src/components/ColorPicker/NamedColorsGroup.tsx index b488f14fd62..569ea90f010 100644 --- a/packages/grafana-ui/src/components/ColorPicker/NamedColorsGroup.tsx +++ b/packages/grafana-ui/src/components/ColorPicker/NamedColorsGroup.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from 'react'; import { Themeable } from '../../types'; -import { ColorDefinition, getColorForTheme } from '../../utils/namedColorsPalette'; +import { ColorDefinition, getColorForTheme } from '@grafana/data'; import { Color } from 'csstype'; import upperFirst from 'lodash/upperFirst'; import find from 'lodash/find'; diff --git a/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.story.tsx b/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.story.tsx index 3e5639172be..f29a4f33fa0 100644 --- a/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.story.tsx +++ b/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.story.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; import { NamedColorsPalette } from './NamedColorsPalette'; -import { getColorName, getColorDefinitionByName } from '../../utils/namedColorsPalette'; +import { getColorName, getColorDefinitionByName } from '@grafana/data'; import { select } from '@storybook/addon-knobs'; import { withCenteredStory } from '../../utils/storybook/withCenteredStory'; import { renderComponentWithTheme } from '../../utils/storybook/withTheme'; diff --git a/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx b/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx index 1f2ce33d235..96c2e95755f 100644 --- a/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx +++ b/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx @@ -2,9 +2,8 @@ import React from 'react'; import { mount, ReactWrapper } from 'enzyme'; import { NamedColorsPalette } from './NamedColorsPalette'; import { ColorSwatch } from './NamedColorsGroup'; -import { getColorDefinitionByName } from '../../utils'; +import { getColorDefinitionByName, GrafanaThemeType } from '@grafana/data'; import { getTheme } from '../../themes'; -import { GrafanaThemeType } from '../../types'; describe('NamedColorsPalette', () => { const BasicGreen = getColorDefinitionByName('green'); diff --git a/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.tsx b/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.tsx index 7bdd3c690b9..f65b8785f02 100644 --- a/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.tsx +++ b/packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Color, getNamedColorPalette } from '../../utils/namedColorsPalette'; +import { Color, getNamedColorPalette } from '@grafana/data'; import { Themeable } from '../../types/index'; import NamedColorsGroup from './NamedColorsGroup'; diff --git a/packages/grafana-ui/src/components/ColorPicker/SpectrumPalette.tsx b/packages/grafana-ui/src/components/ColorPicker/SpectrumPalette.tsx index 0661821f3da..f6e3e5cfbd1 100644 --- a/packages/grafana-ui/src/components/ColorPicker/SpectrumPalette.tsx +++ b/packages/grafana-ui/src/components/ColorPicker/SpectrumPalette.tsx @@ -2,11 +2,11 @@ import React from 'react'; import { CustomPicker, ColorResult } from 'react-color'; import { Saturation, Hue, Alpha } from 'react-color/lib/components/common'; -import { getColorFromHexRgbOrName } from '../../utils/namedColorsPalette'; import tinycolor from 'tinycolor2'; import ColorInput from './ColorInput'; -import { Themeable, GrafanaTheme } from '../../types'; +import { Themeable } from '../../types'; import SpectrumPalettePointer, { SpectrumPalettePointerProps } from './SpectrumPalettePointer'; +import { GrafanaTheme, getColorFromHexRgbOrName } from '@grafana/data'; export interface SpectrumPaletteProps extends Themeable { color: string; diff --git a/packages/grafana-ui/src/components/ContextMenu/ContextMenu.tsx b/packages/grafana-ui/src/components/ContextMenu/ContextMenu.tsx index 7d0b304f4b0..62e97fa3ef1 100644 --- a/packages/grafana-ui/src/components/ContextMenu/ContextMenu.tsx +++ b/packages/grafana-ui/src/components/ContextMenu/ContextMenu.tsx @@ -1,7 +1,8 @@ import React, { useContext, useRef, useState, useLayoutEffect } from 'react'; import { css, cx } from 'emotion'; import useClickAway from 'react-use/lib/useClickAway'; -import { GrafanaTheme, selectThemeVariant, ThemeContext } from '../../index'; +import { selectThemeVariant, ThemeContext } from '../../index'; +import { GrafanaTheme } from '@grafana/data'; import { stylesFactory } from '../../themes/stylesFactory'; import { Portal, List } from '../index'; import { LinkTarget } from '@grafana/data'; diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinkEditor.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinkEditor.tsx index 9d199fe36f1..e05aba24d67 100644 --- a/packages/grafana-ui/src/components/DataLinks/DataLinkEditor.tsx +++ b/packages/grafana-ui/src/components/DataLinks/DataLinkEditor.tsx @@ -5,7 +5,7 @@ import { VariableSuggestion } from './DataLinkSuggestions'; import { css } from 'emotion'; import { ThemeContext, stylesFactory } from '../../themes/index'; import { DataLinkInput } from './DataLinkInput'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; interface DataLinkEditorProps { index: number; diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx index d71a5663b5f..a5cd3e0f63e 100644 --- a/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx +++ b/packages/grafana-ui/src/components/DataLinks/DataLinkInput.tsx @@ -14,7 +14,7 @@ import { css, cx } from 'emotion'; import { SlatePrism } from '../../slate-plugins'; import { SCHEMA } from '../../utils/slate'; import { stylesFactory } from '../../themes'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; const modulo = (a: number, n: number) => a - n * Math.floor(a / n); diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinkSuggestions.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinkSuggestions.tsx index 821616d4454..909712242b6 100644 --- a/packages/grafana-ui/src/components/DataLinks/DataLinkSuggestions.tsx +++ b/packages/grafana-ui/src/components/DataLinks/DataLinkSuggestions.tsx @@ -1,4 +1,5 @@ -import { GrafanaTheme, selectThemeVariant, ThemeContext } from '../../index'; +import { selectThemeVariant, ThemeContext } from '../../index'; +import { GrafanaTheme } from '@grafana/data'; import { css, cx } from 'emotion'; import _ from 'lodash'; import React, { useRef, useContext, useMemo } from 'react'; diff --git a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx index 79ac03c1165..465f08f929c 100644 --- a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx +++ b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.story.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; import { DataSourceHttpSettings } from './DataSourceHttpSettings'; -import { DataSourceSettings } from '../../types'; +import { DataSourceSettings } from '@grafana/data'; import { UseState } from '../../utils/storybook/UseState'; const settingsMock: DataSourceSettings = { diff --git a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx index 4e55ef93281..f70a4526d7b 100644 --- a/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx +++ b/packages/grafana-ui/src/components/DataSourceSettings/DataSourceHttpSettings.tsx @@ -5,7 +5,7 @@ import { useTheme } from '../../themes'; import { BasicAuthSettings } from './BasicAuthSettings'; import { HttpProxySettings } from './HttpProxySettings'; import { TLSAuthSettings } from './TLSAuthSettings'; -import { DataSourceSettings } from '../../types'; +import { DataSourceSettings } from '@grafana/data'; import { HttpSettingsProps } from './types'; import { Select } from '../Select/Select'; import { Input } from '../Input/Input'; diff --git a/packages/grafana-ui/src/components/DataSourceSettings/types.ts b/packages/grafana-ui/src/components/DataSourceSettings/types.ts index a2d61443c95..1d9f475c582 100644 --- a/packages/grafana-ui/src/components/DataSourceSettings/types.ts +++ b/packages/grafana-ui/src/components/DataSourceSettings/types.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings } from '../../types'; +import { DataSourceSettings } from '@grafana/data'; export interface HttpSettingsBaseProps { dataSourceConfig: DataSourceSettings; diff --git a/packages/grafana-ui/src/components/Forms/Button.tsx b/packages/grafana-ui/src/components/Forms/Button.tsx index c1dac36551c..f7818aa7203 100644 --- a/packages/grafana-ui/src/components/Forms/Button.tsx +++ b/packages/grafana-ui/src/components/Forms/Button.tsx @@ -5,7 +5,7 @@ import { selectThemeVariant, stylesFactory, ThemeContext } from '../../themes'; import { Button as DefaultButton, LinkButton as DefaultLinkButton } from '../Button/Button'; import { getFocusStyle } from './commonStyles'; import { ButtonSize, StyleDeps } from '../Button/types'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; const buttonVariantStyles = (from: string, to: string, textColor: string) => css` background: linear-gradient(180deg, ${from} 0%, ${to} 100%); diff --git a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx b/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx index ca6341dd900..99f8249a0e5 100644 --- a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx +++ b/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useTheme, stylesFactory } from '../../themes'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; import { css, cx } from 'emotion'; export interface FieldValidationMessageProps { diff --git a/packages/grafana-ui/src/components/Forms/Label.tsx b/packages/grafana-ui/src/components/Forms/Label.tsx index 1b648f0ad49..1e28317bbfb 100644 --- a/packages/grafana-ui/src/components/Forms/Label.tsx +++ b/packages/grafana-ui/src/components/Forms/Label.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useTheme, stylesFactory } from '../../themes'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; import { css, cx } from 'emotion'; export interface LabelProps extends React.HTMLAttributes { diff --git a/packages/grafana-ui/src/components/Forms/Legend.tsx b/packages/grafana-ui/src/components/Forms/Legend.tsx index 17260714320..e42a768a61b 100644 --- a/packages/grafana-ui/src/components/Forms/Legend.tsx +++ b/packages/grafana-ui/src/components/Forms/Legend.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useTheme, stylesFactory } from '../../themes'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; import { css, cx } from 'emotion'; export interface LabelProps extends React.HTMLAttributes { diff --git a/packages/grafana-ui/src/components/Forms/commonStyles.ts b/packages/grafana-ui/src/components/Forms/commonStyles.ts index 746d1a099e4..140f5f9f9cc 100644 --- a/packages/grafana-ui/src/components/Forms/commonStyles.ts +++ b/packages/grafana-ui/src/components/Forms/commonStyles.ts @@ -1,5 +1,5 @@ import { css } from 'emotion'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; export const getFocusStyle = (theme: GrafanaTheme) => css` &[focus], diff --git a/packages/grafana-ui/src/components/Forms/getFormStyles.ts b/packages/grafana-ui/src/components/Forms/getFormStyles.ts index 9df8b9df080..c400be9393c 100644 --- a/packages/grafana-ui/src/components/Forms/getFormStyles.ts +++ b/packages/grafana-ui/src/components/Forms/getFormStyles.ts @@ -1,5 +1,5 @@ import { stylesFactory } from '../../themes'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; import { getLabelStyles } from './Label'; import { getLegendStyles } from './Legend'; import { getFieldValidationMessageStyles } from './FieldValidationMessage'; diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.tsx b/packages/grafana-ui/src/components/Gauge/Gauge.tsx index 420c1907693..5ffe4087884 100644 --- a/packages/grafana-ui/src/components/Gauge/Gauge.tsx +++ b/packages/grafana-ui/src/components/Gauge/Gauge.tsx @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import $ from 'jquery'; import { Threshold, DisplayValue } from '@grafana/data'; -import { getColorFromHexRgbOrName } from '../../utils'; +import { getColorFromHexRgbOrName } from '@grafana/data'; import { Themeable } from '../../types'; import { selectThemeVariant } from '../../themes'; diff --git a/packages/grafana-ui/src/components/Graph/GraphLegendItem.tsx b/packages/grafana-ui/src/components/Graph/GraphLegendItem.tsx index 3102e504f8a..91b62493bc3 100644 --- a/packages/grafana-ui/src/components/Graph/GraphLegendItem.tsx +++ b/packages/grafana-ui/src/components/Graph/GraphLegendItem.tsx @@ -6,7 +6,7 @@ import { SeriesColorChangeHandler } from './GraphWithLegend'; import { LegendStatsList } from '../Legend/LegendStatsList'; import { ThemeContext } from '../../themes/ThemeContext'; import { stylesFactory } from '../../themes'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; export interface GraphLegendItemProps { key?: React.Key; diff --git a/packages/grafana-ui/src/components/Legend/LegendList.tsx b/packages/grafana-ui/src/components/Legend/LegendList.tsx index ec5098d0fed..1fadaab76dc 100644 --- a/packages/grafana-ui/src/components/Legend/LegendList.tsx +++ b/packages/grafana-ui/src/components/Legend/LegendList.tsx @@ -5,7 +5,7 @@ import { List } from '../List/List'; import { css, cx } from 'emotion'; import { ThemeContext } from '../../themes/ThemeContext'; import { stylesFactory } from '../../themes'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; const getStyles = stylesFactory((theme: GrafanaTheme) => ({ item: css` diff --git a/packages/grafana-ui/src/components/Logs/LogLabel.tsx b/packages/grafana-ui/src/components/Logs/LogLabel.tsx index 4b9ff1652fa..d91f6a2316d 100644 --- a/packages/grafana-ui/src/components/Logs/LogLabel.tsx +++ b/packages/grafana-ui/src/components/Logs/LogLabel.tsx @@ -3,7 +3,8 @@ import { css, cx } from 'emotion'; import { LogRowModel, LogLabelStatsModel, calculateLogsLabelStats } from '@grafana/data'; import { LogLabelStats } from './LogLabelStats'; -import { GrafanaTheme, Themeable } from '../../types/theme'; +import { Themeable } from '../../types/theme'; +import { GrafanaTheme } from '@grafana/data'; import { selectThemeVariant } from '../../themes/selectThemeVariant'; import { withTheme } from '../../themes/ThemeContext'; import { stylesFactory } from '../../themes'; diff --git a/packages/grafana-ui/src/components/Logs/LogLabelStats.tsx b/packages/grafana-ui/src/components/Logs/LogLabelStats.tsx index 7f59e231613..e842c2bbf69 100644 --- a/packages/grafana-ui/src/components/Logs/LogLabelStats.tsx +++ b/packages/grafana-ui/src/components/Logs/LogLabelStats.tsx @@ -3,7 +3,8 @@ import { css, cx } from 'emotion'; import { LogLabelStatsModel } from '@grafana/data'; import { LogLabelStatsRow } from './LogLabelStatsRow'; -import { Themeable, GrafanaTheme } from '../../types/theme'; +import { Themeable } from '../../types/theme'; +import { GrafanaTheme } from '@grafana/data'; import { selectThemeVariant } from '../../themes/selectThemeVariant'; import { withTheme } from '../../themes/index'; diff --git a/packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx b/packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx index 4437ab93b7d..194380a7cb1 100644 --- a/packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx +++ b/packages/grafana-ui/src/components/Logs/LogLabelStatsRow.tsx @@ -2,7 +2,7 @@ import React, { FunctionComponent, useContext } from 'react'; import { css, cx } from 'emotion'; import { ThemeContext } from '../../themes/ThemeContext'; -import { GrafanaTheme } from '../../types/theme'; +import { GrafanaTheme } from '@grafana/data'; const getStyles = (theme: GrafanaTheme) => ({ logsStatsRow: css` diff --git a/packages/grafana-ui/src/components/Logs/LogRow.tsx b/packages/grafana-ui/src/components/Logs/LogRow.tsx index 9b8480d1308..5206e62c970 100644 --- a/packages/grafana-ui/src/components/Logs/LogRow.tsx +++ b/packages/grafana-ui/src/components/Logs/LogRow.tsx @@ -1,7 +1,6 @@ import React, { PureComponent } from 'react'; -import { LogRowModel, TimeZone } from '@grafana/data'; +import { LogRowModel, TimeZone, DataQueryResponse } from '@grafana/data'; import { cx } from 'emotion'; -import { DataQueryResponse } from '../../index'; import { LogRowContextRows, LogRowContextQueryErrors, diff --git a/packages/grafana-ui/src/components/Logs/LogRowContext.tsx b/packages/grafana-ui/src/components/Logs/LogRowContext.tsx index 6d1dcf12697..cd9eeed998d 100644 --- a/packages/grafana-ui/src/components/Logs/LogRowContext.tsx +++ b/packages/grafana-ui/src/components/Logs/LogRowContext.tsx @@ -4,9 +4,9 @@ import { css, cx } from 'emotion'; import { Alert } from '../Alert/Alert'; import { LogRowContextRows, LogRowContextQueryErrors, HasMoreContextRows } from './LogRowContextProvider'; -import { GrafanaTheme } from '../../types/theme'; +import { GrafanaTheme } from '@grafana/data'; import { selectThemeVariant } from '../../themes/selectThemeVariant'; -import { DataQueryError } from '../../types/datasource'; +import { DataQueryError } from '@grafana/data'; import { ThemeContext } from '../../themes/ThemeContext'; import { CustomScrollbar } from '../CustomScrollbar/CustomScrollbar'; import { List } from '../List/List'; diff --git a/packages/grafana-ui/src/components/Logs/LogRowContextProvider.test.ts b/packages/grafana-ui/src/components/Logs/LogRowContextProvider.test.ts index b853eb31778..f12b26242e9 100644 --- a/packages/grafana-ui/src/components/Logs/LogRowContextProvider.test.ts +++ b/packages/grafana-ui/src/components/Logs/LogRowContextProvider.test.ts @@ -1,7 +1,5 @@ -import { FieldType, LogRowModel, MutableDataFrame } from '@grafana/data'; +import { FieldType, LogRowModel, MutableDataFrame, Labels, LogLevel, DataQueryResponse } from '@grafana/data'; import { getRowContexts } from './LogRowContextProvider'; -import { Labels, LogLevel } from '@grafana/data/src'; -import { DataQueryResponse } from '../../types'; describe('getRowContexts', () => { describe('when called with a DataFrame and results are returned', () => { diff --git a/packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx b/packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx index 607364f7bb0..8095c51d46d 100644 --- a/packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx +++ b/packages/grafana-ui/src/components/Logs/LogRowContextProvider.tsx @@ -3,7 +3,7 @@ import { useState, useEffect } from 'react'; import flatten from 'lodash/flatten'; import useAsync from 'react-use/lib/useAsync'; -import { DataQueryResponse, DataQueryError } from '../../types/datasource'; +import { DataQueryResponse, DataQueryError } from '@grafana/data'; export interface LogRowContextRows { before?: string[]; diff --git a/packages/grafana-ui/src/components/Logs/LogRowMessage.tsx b/packages/grafana-ui/src/components/Logs/LogRowMessage.tsx index c09394a9269..e1f682c106e 100644 --- a/packages/grafana-ui/src/components/Logs/LogRowMessage.tsx +++ b/packages/grafana-ui/src/components/Logs/LogRowMessage.tsx @@ -12,7 +12,8 @@ import { } from '@grafana/data'; import tinycolor from 'tinycolor2'; import { css, cx } from 'emotion'; -import { GrafanaTheme, selectThemeVariant, ThemeContext } from '../../index'; +import { selectThemeVariant, ThemeContext } from '../../index'; +import { GrafanaTheme } from '@grafana/data'; import { LogRowContextQueryErrors, HasMoreContextRows, LogRowContextRows } from './LogRowContextProvider'; import { LogRowContext } from './LogRowContext'; import { LogMessageAnsi } from './LogMessageAnsi'; diff --git a/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts b/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts index a510ab69f39..d8a698515d5 100644 --- a/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts +++ b/packages/grafana-ui/src/components/Logs/getLogRowStyles.ts @@ -1,7 +1,7 @@ import { css } from 'emotion'; import { LogLevel } from '@grafana/data'; -import { GrafanaTheme } from '../../types/theme'; +import { GrafanaTheme } from '@grafana/data'; import { selectThemeVariant } from '../../themes/selectThemeVariant'; import { stylesFactory } from '../../themes'; diff --git a/packages/grafana-ui/src/components/Modal/Modal.tsx b/packages/grafana-ui/src/components/Modal/Modal.tsx index 5e2d3ffbe48..e5febd9535e 100644 --- a/packages/grafana-ui/src/components/Modal/Modal.tsx +++ b/packages/grafana-ui/src/components/Modal/Modal.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Portal } from '../Portal/Portal'; import { css, cx } from 'emotion'; import { stylesFactory, withTheme } from '../../themes'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; const getStyles = stylesFactory((theme: GrafanaTheme) => ({ modal: css` diff --git a/packages/grafana-ui/src/components/PieChart/PieChart.tsx b/packages/grafana-ui/src/components/PieChart/PieChart.tsx index 968b27fa539..52b781e6c6b 100644 --- a/packages/grafana-ui/src/components/PieChart/PieChart.tsx +++ b/packages/grafana-ui/src/components/PieChart/PieChart.tsx @@ -1,9 +1,7 @@ import React, { PureComponent } from 'react'; import { select, pie, arc, event } from 'd3'; import sum from 'lodash/sum'; -import { DisplayValue } from '@grafana/data'; - -import { GrafanaThemeType } from '../../types'; +import { DisplayValue, GrafanaThemeType } from '@grafana/data'; import { Themeable } from '../../index'; import { colors as grafana_colors } from '../../utils/index'; diff --git a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx index 5e7c4d7016a..4d2dee635c7 100644 --- a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx +++ b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx @@ -5,7 +5,7 @@ import { css } from 'emotion'; import { Tooltip } from '../Tooltip/Tooltip'; import { ButtonSelect } from '../Select/ButtonSelect'; import memoizeOne from 'memoize-one'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; import { withTheme } from '../../themes'; const defaultIntervals = ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d']; diff --git a/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx b/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx index a68348404d3..fc871da90a2 100644 --- a/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx +++ b/packages/grafana-ui/src/components/SingleStatShared/FieldDisplayEditor.tsx @@ -7,9 +7,16 @@ import { FormField } from '../FormField/FormField'; import { StatsPicker } from '../StatsPicker/StatsPicker'; // Types -import { FieldDisplayOptions, DEFAULT_FIELD_DISPLAY_VALUES_LIMIT } from '../../utils/fieldDisplay'; import Select from '../Select/Select'; -import { ReducerID, toNumberString, toIntegerOrUndefined, SelectableValue, FieldConfig } from '@grafana/data'; +import { + FieldDisplayOptions, + DEFAULT_FIELD_DISPLAY_VALUES_LIMIT, + ReducerID, + toNumberString, + toIntegerOrUndefined, + SelectableValue, + FieldConfig, +} from '@grafana/data'; const showOptions: Array> = [ { diff --git a/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx b/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx index 7eaa964e080..b66b71dc17a 100644 --- a/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx +++ b/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx @@ -7,9 +7,17 @@ import { FormLabel } from '../FormLabel/FormLabel'; import { UnitPicker } from '../UnitPicker/UnitPicker'; // Types -import { toIntegerOrUndefined, SelectableValue, FieldConfig, toFloatOrUndefined, toNumberString } from '@grafana/data'; - -import { VAR_SERIES_NAME, VAR_FIELD_NAME, VAR_CALC, VAR_CELL_PREFIX } from '../../utils/fieldDisplay'; +import { + VAR_SERIES_NAME, + VAR_FIELD_NAME, + VAR_CALC, + VAR_CELL_PREFIX, + toIntegerOrUndefined, + SelectableValue, + FieldConfig, + toFloatOrUndefined, + toNumberString, +} from '@grafana/data'; const labelWidth = 6; diff --git a/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts b/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts index 45857502112..63510fbbf7f 100644 --- a/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts +++ b/packages/grafana-ui/src/components/SingleStatShared/SingleStatBaseOptions.ts @@ -1,8 +1,6 @@ import cloneDeep from 'lodash/cloneDeep'; import omit from 'lodash/omit'; -import { VizOrientation, PanelModel } from '../../types/panel'; -import { FieldDisplayOptions } from '../../utils/fieldDisplay'; import { fieldReducers, Threshold, @@ -11,6 +9,9 @@ import { ReducerID, ValueMapping, MappingType, + VizOrientation, + PanelModel, + FieldDisplayOptions, } from '@grafana/data'; export interface SingleStatBaseOptions { diff --git a/packages/grafana-ui/src/components/Table/Table.story.tsx b/packages/grafana-ui/src/components/Table/Table.story.tsx index 1fb59d32522..0ad2bc135e0 100644 --- a/packages/grafana-ui/src/components/Table/Table.story.tsx +++ b/packages/grafana-ui/src/components/Table/Table.story.tsx @@ -4,7 +4,7 @@ import { Table } from './Table'; import { getTheme } from '../../themes'; import { migratedTestTable, migratedTestStyles, simpleTable } from './examples'; -import { GrafanaThemeType } from '../../types/theme'; +import { GrafanaThemeType } from '@grafana/data'; import { DataFrame, FieldType, ArrayVector, ScopedVars } from '@grafana/data'; import { withFullSizeStory } from '../../utils/storybook/withFullSizeStory'; import { number, boolean } from '@storybook/addon-knobs'; diff --git a/packages/grafana-ui/src/components/Table/Table.test.tsx b/packages/grafana-ui/src/components/Table/Table.test.tsx index 37e1acd93fc..34512cde7c5 100644 --- a/packages/grafana-ui/src/components/Table/Table.test.tsx +++ b/packages/grafana-ui/src/components/Table/Table.test.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { readCSV } from '@grafana/data'; import { Table, Props } from './Table'; import { getTheme } from '../../themes/index'; -import { GrafanaThemeType } from '../../types/theme'; +import { GrafanaThemeType } from '@grafana/data'; import renderer from 'react-test-renderer'; const series = readCSV('a,b,c\n1,2,3\n4,5,6')[0]; diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx index e0d7a220b65..ae75fec6e9c 100644 --- a/packages/grafana-ui/src/components/Table/Table.tsx +++ b/packages/grafana-ui/src/components/Table/Table.tsx @@ -12,7 +12,15 @@ import { } from 'react-virtualized'; import { Themeable } from '../../types/theme'; -import { stringToJsRegex, DataFrame, sortDataFrame, getDataFrameRow, ArrayVector, FieldType } from '@grafana/data'; +import { + stringToJsRegex, + DataFrame, + sortDataFrame, + getDataFrameRow, + ArrayVector, + FieldType, + InterpolateFunction, +} from '@grafana/data'; import { TableCellBuilder, @@ -21,7 +29,6 @@ import { TableCellBuilderOptions, simpleCellBuilder, } from './TableCellBuilder'; -import { InterpolateFunction } from '../../types/panel'; export interface Props extends Themeable { data: DataFrame; diff --git a/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx b/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx index 990c059a83e..70e37babda3 100644 --- a/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx +++ b/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx @@ -3,10 +3,16 @@ import _ from 'lodash'; import React, { ReactElement } from 'react'; import { GridCellProps } from 'react-virtualized'; import { Table, Props } from './Table'; -import { ValueFormatter, getValueFormat, getColorFromHexRgbOrName } from '../../utils/index'; -import { GrafanaTheme } from '../../types/theme'; -import { InterpolateFunction } from '../../types/panel'; -import { Field, dateTime, FieldConfig } from '@grafana/data'; +import { + Field, + dateTime, + FieldConfig, + getValueFormat, + GrafanaTheme, + ValueFormatter, + getColorFromHexRgbOrName, + InterpolateFunction, +} from '@grafana/data'; export interface TableCellBuilderOptions { value: any; diff --git a/packages/grafana-ui/src/components/Table/examples.ts b/packages/grafana-ui/src/components/Table/examples.ts index 527c2b10f5d..7250490edea 100644 --- a/packages/grafana-ui/src/components/Table/examples.ts +++ b/packages/grafana-ui/src/components/Table/examples.ts @@ -1,6 +1,5 @@ -import { toDataFrame } from '@grafana/data'; +import { toDataFrame, getColorDefinitionByName } from '@grafana/data'; import { ColumnStyle } from './TableCellBuilder'; -import { getColorDefinitionByName } from '../../utils/namedColorsPalette'; const SemiDarkOrange = getColorDefinitionByName('semi-dark-orange'); diff --git a/packages/grafana-ui/src/components/TagsInput/TagItem.tsx b/packages/grafana-ui/src/components/TagsInput/TagItem.tsx index 9949d826061..0775a886dad 100644 --- a/packages/grafana-ui/src/components/TagsInput/TagItem.tsx +++ b/packages/grafana-ui/src/components/TagsInput/TagItem.tsx @@ -2,7 +2,7 @@ import React, { FC } from 'react'; import { css, cx } from 'emotion'; import { getTagColorsFromName } from '../../utils'; import { stylesFactory, useTheme } from '../../themes'; -import { GrafanaTheme } from '../../types'; +import { GrafanaTheme } from '@grafana/data'; interface Props { name: string; diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx index 8895c8a4536..f79f4e57455 100644 --- a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx +++ b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx @@ -2,7 +2,7 @@ import React, { PureComponent, ChangeEvent } from 'react'; import { Threshold, sortThresholds } from '@grafana/data'; import { colors } from '../../utils'; import { ThemeContext } from '../../themes'; -import { getColorFromHexRgbOrName } from '../../utils'; +import { getColorFromHexRgbOrName } from '@grafana/data'; import { Input } from '../Input/Input'; import { ColorPicker } from '../ColorPicker/ColorPicker'; import { PanelOptionsGroup } from '../PanelOptionsGroup/PanelOptionsGroup'; diff --git a/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx b/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx index 377f41b38fa..e00619ff631 100644 --- a/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx +++ b/packages/grafana-ui/src/components/TimePicker/TimePicker.tsx @@ -18,7 +18,7 @@ import { withTheme } from '../../themes/ThemeContext'; // Types import { TimeRange, TimeOption, TimeZone, TIME_FORMAT, SelectableValue, dateMath } from '@grafana/data'; -import { GrafanaTheme } from '../../types/theme'; +import { GrafanaTheme } from '@grafana/data'; import { Themeable } from '../../types'; const getStyles = memoizeOne((theme: GrafanaTheme) => { diff --git a/packages/grafana-ui/src/components/TransformersUI/TransformationRow.tsx b/packages/grafana-ui/src/components/TransformersUI/TransformationRow.tsx index a78afd9ec91..56fcdb4ba84 100644 --- a/packages/grafana-ui/src/components/TransformersUI/TransformationRow.tsx +++ b/packages/grafana-ui/src/components/TransformersUI/TransformationRow.tsx @@ -3,7 +3,7 @@ import { ThemeContext } from '../../themes/ThemeContext'; import { css } from 'emotion'; import { DataFrame } from '@grafana/data'; import { JSONFormatter } from '../JSONFormatter/JSONFormatter'; -import { GrafanaTheme } from '../../types/theme'; +import { GrafanaTheme } from '@grafana/data'; interface TransformationRowProps { name: string; diff --git a/packages/grafana-ui/src/components/Typeahead/TypeaheadInfo.tsx b/packages/grafana-ui/src/components/Typeahead/TypeaheadInfo.tsx index a5df6b6ce1c..a6951ed58b7 100644 --- a/packages/grafana-ui/src/components/Typeahead/TypeaheadInfo.tsx +++ b/packages/grafana-ui/src/components/Typeahead/TypeaheadInfo.tsx @@ -1,7 +1,8 @@ import React, { useContext } from 'react'; import { css, cx } from 'emotion'; -import { CompletionItem, selectThemeVariant, ThemeContext, GrafanaTheme } from '../..'; +import { CompletionItem, selectThemeVariant, ThemeContext } from '../..'; +import { GrafanaTheme } from '@grafana/data'; const getStyles = (theme: GrafanaTheme, height: number, visible: boolean) => { return { diff --git a/packages/grafana-ui/src/components/Typeahead/TypeaheadItem.tsx b/packages/grafana-ui/src/components/Typeahead/TypeaheadItem.tsx index 098f73aabd7..fc1e23a9c2d 100644 --- a/packages/grafana-ui/src/components/Typeahead/TypeaheadItem.tsx +++ b/packages/grafana-ui/src/components/Typeahead/TypeaheadItem.tsx @@ -3,8 +3,10 @@ import React, { useContext } from 'react'; // @ts-ignore import Highlighter from 'react-highlight-words'; import { css, cx } from 'emotion'; - -import { CompletionItem, CompletionItemKind, GrafanaTheme, ThemeContext, selectThemeVariant } from '../..'; +import { GrafanaTheme } from '@grafana/data'; +import { selectThemeVariant } from '../../themes/selectThemeVariant'; +import { CompletionItem, CompletionItemKind } from '../../types/completion'; +import { ThemeContext } from '../../themes/ThemeContext'; interface Props { isSelected: boolean; diff --git a/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx b/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx index 50e04481ad6..0b6a1fdf212 100644 --- a/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx +++ b/packages/grafana-ui/src/components/UnitPicker/UnitPicker.tsx @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; import { Select } from '../Select/Select'; -import { getValueFormats } from '../../utils'; +import { getValueFormats } from '@grafana/data'; interface Props { onChange: (item: any) => void; diff --git a/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx b/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx index 52b81f1f849..c20b0482600 100644 --- a/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx +++ b/packages/grafana-ui/src/components/VizRepeater/VizRepeater.tsx @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { VizOrientation } from '../../types'; +import { VizOrientation } from '@grafana/data'; interface Props { renderValue: (value: T, width: number, height: number) => JSX.Element; diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts index f313d0f597c..6814b4fc4a9 100644 --- a/packages/grafana-ui/src/components/index.ts +++ b/packages/grafana-ui/src/components/index.ts @@ -47,7 +47,7 @@ export { Table } from './Table/Table'; export { TableInputCSV } from './Table/TableInputCSV'; // Visualizations -export { BigValue, SingleStatDisplayMode } from './BigValue/BigValue'; +export { BigValue, SingleStatDisplayMode, BigValueSparkline } from './BigValue/BigValue'; export { Gauge } from './Gauge/Gauge'; export { Graph } from './Graph/Graph'; export { GraphLegend } from './Graph/GraphLegend'; diff --git a/packages/grafana-ui/src/themes/ThemeContext.tsx b/packages/grafana-ui/src/themes/ThemeContext.tsx index 1e18c09e631..d557139d078 100644 --- a/packages/grafana-ui/src/themes/ThemeContext.tsx +++ b/packages/grafana-ui/src/themes/ThemeContext.tsx @@ -2,7 +2,8 @@ import React, { useContext } from 'react'; import hoistNonReactStatics from 'hoist-non-react-statics'; import { getTheme } from './getTheme'; -import { GrafanaThemeType, Themeable } from '../types/theme'; +import { Themeable } from '../types/theme'; +import { GrafanaThemeType } from '@grafana/data'; type Omit = Pick>; type Subtract = Omit; diff --git a/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts index 6dbd34473dc..6c5b5e04c2a 100644 --- a/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts +++ b/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts @@ -1,6 +1,6 @@ /* tslint:disable:max-line-length */ -import { GrafanaTheme } from '../types'; +import { GrafanaTheme } from '@grafana/data'; import { renderGeneratedFileBanner } from '../utils/generatedFileBanner'; export const darkThemeVarsTemplate = (theme: GrafanaTheme) => diff --git a/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts index 79293e2ebdb..353e5da3c54 100644 --- a/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts +++ b/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts @@ -1,6 +1,6 @@ /* tslint:disable:max-line-length */ -import { GrafanaTheme } from '../types'; +import { GrafanaTheme } from '@grafana/data'; import { renderGeneratedFileBanner } from '../utils/generatedFileBanner'; export const lightThemeVarsTemplate = (theme: GrafanaTheme) => diff --git a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts b/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts index 69db371f492..3799972998a 100644 --- a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts +++ b/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts @@ -1,6 +1,6 @@ /* tslint:disable:max-line-length */ -import { GrafanaThemeCommons } from '../types'; +import { GrafanaThemeCommons } from '@grafana/data'; import { renderGeneratedFileBanner } from '../utils/generatedFileBanner'; export const commonThemeVarsTemplate = (theme: GrafanaThemeCommons) => diff --git a/packages/grafana-ui/src/themes/dark.ts b/packages/grafana-ui/src/themes/dark.ts index dcd349a4e3c..a4b49559950 100644 --- a/packages/grafana-ui/src/themes/dark.ts +++ b/packages/grafana-ui/src/themes/dark.ts @@ -1,5 +1,5 @@ import defaultTheme, { commonColorsPalette } from './default'; -import { GrafanaTheme, GrafanaThemeType } from '../types/theme'; +import { GrafanaThemeType, GrafanaTheme } from '@grafana/data'; const basicColors = { ...commonColorsPalette, diff --git a/packages/grafana-ui/src/themes/default.ts b/packages/grafana-ui/src/themes/default.ts index 9db36f2ad17..72e2f3f03b9 100644 --- a/packages/grafana-ui/src/themes/default.ts +++ b/packages/grafana-ui/src/themes/default.ts @@ -1,4 +1,4 @@ -import { GrafanaThemeCommons } from '../types/theme'; +import { GrafanaThemeCommons } from '@grafana/data'; export const commonColorsPalette = { // New greys palette used by next-gen form elements diff --git a/packages/grafana-ui/src/themes/getTheme.ts b/packages/grafana-ui/src/themes/getTheme.ts index 9962f1a9a90..84e2b75986e 100644 --- a/packages/grafana-ui/src/themes/getTheme.ts +++ b/packages/grafana-ui/src/themes/getTheme.ts @@ -1,6 +1,6 @@ import darkTheme from './dark'; import lightTheme from './light'; -import { GrafanaTheme } from '../types/theme'; +import { GrafanaTheme } from '@grafana/data'; let themeMock: ((name?: string) => GrafanaTheme) | null; diff --git a/packages/grafana-ui/src/themes/light.ts b/packages/grafana-ui/src/themes/light.ts index eb56ae5e2e0..475c0046dd8 100644 --- a/packages/grafana-ui/src/themes/light.ts +++ b/packages/grafana-ui/src/themes/light.ts @@ -1,5 +1,5 @@ import defaultTheme, { commonColorsPalette } from './default'; -import { GrafanaTheme, GrafanaThemeType } from '../types/theme'; +import { GrafanaThemeType, GrafanaTheme } from '@grafana/data'; const basicColors = { ...commonColorsPalette, diff --git a/packages/grafana-ui/src/themes/selectThemeVariant.test.ts b/packages/grafana-ui/src/themes/selectThemeVariant.test.ts index 7c929f909d3..c4e5211ff02 100644 --- a/packages/grafana-ui/src/themes/selectThemeVariant.test.ts +++ b/packages/grafana-ui/src/themes/selectThemeVariant.test.ts @@ -1,4 +1,4 @@ -import { GrafanaThemeType } from '../types/theme'; +import { GrafanaThemeType } from '@grafana/data'; import { selectThemeVariant } from './selectThemeVariant'; import { mockTheme } from './index'; diff --git a/packages/grafana-ui/src/themes/selectThemeVariant.ts b/packages/grafana-ui/src/themes/selectThemeVariant.ts index 82cc1f0e0e7..95b80b04047 100644 --- a/packages/grafana-ui/src/themes/selectThemeVariant.ts +++ b/packages/grafana-ui/src/themes/selectThemeVariant.ts @@ -1,4 +1,4 @@ -import { GrafanaThemeType } from '../types/theme'; +import { GrafanaThemeType } from '@grafana/data'; type VariantDescriptor = { [key in GrafanaThemeType]: string | number }; diff --git a/packages/grafana-ui/src/types/index.ts b/packages/grafana-ui/src/types/index.ts index f636f38041c..9f67b558c31 100644 --- a/packages/grafana-ui/src/types/index.ts +++ b/packages/grafana-ui/src/types/index.ts @@ -1,10 +1,3 @@ -export * from './app'; -export * from './completion'; -export * from './datasource'; -export * from './input'; -export * from './panel'; -export * from './plugin'; export * from './theme'; - -import * as PanelEvents from './events'; -export { PanelEvents }; +export * from './input'; +export * from './completion'; diff --git a/packages/grafana-ui/src/types/theme.ts b/packages/grafana-ui/src/types/theme.ts index e28338ffa85..904ebdf93e9 100644 --- a/packages/grafana-ui/src/types/theme.ts +++ b/packages/grafana-ui/src/types/theme.ts @@ -1,239 +1,4 @@ -export enum GrafanaThemeType { - Light = 'light', - Dark = 'dark', -} - -export interface GrafanaThemeCommons { - name: string; - // TODO: not sure if should be a part of theme - breakpoints: { - xs: string; - sm: string; - md: string; - lg: string; - xl: string; - }; - typography: { - fontFamily: { - sansSerif: string; - monospace: string; - }; - size: { - root: string; - base: string; - xs: string; - sm: string; - md: string; - lg: string; - }; - weight: { - light: number; - regular: number; - semibold: number; - bold: number; - }; - lineHeight: { - xs: number; //1 - sm: number; //1.1 - md: number; // 4/3 - lg: number; // 1.5 - }; - // TODO: Refactor to use size instead of custom defs - heading: { - h1: string; - h2: string; - h3: string; - h4: string; - h5: string; - h6: string; - }; - link: { - decoration: string; - hoverDecoration: string; - }; - }; - spacing: { - insetSquishMd: string; - d: string; - xxs: string; - xs: string; - sm: string; - md: string; - lg: string; - xl: string; - gutter: string; - - // Next-gen forms spacing variables - // TODO: Move variables definition to respective components when implementing - formSpacingBase: number; - formMargin: string; - formFieldsetMargin: string; - formLegendMargin: string; - formInputHeight: string; - formButtonHeight: number; - formInputPaddingHorizontal: string; - // Used for icons do define spacing between icon and input field - // Applied on the right(prefix) or left(suffix) - formInputAffixPaddingHorizontal: string; - formInputMargin: string; - formLabelPadding: string; - formLabelMargin: string; - formValidationMessagePadding: string; - }; - border: { - radius: { - sm: string; - md: string; - lg: string; - }; - width: { - sm: string; - }; - }; - height: { - sm: string; - md: string; - lg: string; - }; - panelPadding: number; - panelHeaderHeight: number; - zIndex: { - dropdown: string; - navbarFixed: string; - sidemenu: string; - tooltip: string; - modalBackdrop: string; - modal: string; - typeahead: string; - }; -} - -export interface GrafanaTheme extends GrafanaThemeCommons { - type: GrafanaThemeType; - isDark: boolean; - isLight: boolean; - background: { - dropdown: string; - scrollbar: string; - scrollbar2: string; - pageHeader: string; - }; - colors: { - black: string; - white: string; - dark1: string; - dark2: string; - dark3: string; - dark4: string; - dark5: string; - dark6: string; - dark7: string; - dark8: string; - dark9: string; - dark10: string; - gray1: string; - gray2: string; - gray3: string; - gray4: string; - gray5: string; - gray6: string; - gray7: string; - - // New greys palette used by next-gen form elements - gray98: string; - gray95: string; - gray85: string; - gray70: string; - gray33: string; - gray25: string; - gray15: string; - gray10: string; - gray05: string; - - // New blues palette used by next-gen form elements - blue95: string; - blue85: string; - blue77: string; - - // New reds palette used by next-gen form elements - red88: string; - - grayBlue: string; - inputBlack: string; - - // Accent colors - blue: string; - blueBase: string; - blueShade: string; - blueLight: string; - blueFaint: string; - redBase: string; - redShade: string; - greenBase: string; - greenShade: string; - red: string; - yellow: string; - purple: string; - variable: string; - orange: string; - orangeDark: string; - queryRed: string; - queryGreen: string; - queryPurple: string; - queryKeyword: string; - queryOrange: string; - brandPrimary: string; - brandSuccess: string; - brandWarning: string; - brandDanger: string; - - // Status colors - online: string; - warn: string; - critical: string; - - // Link colors - link: string; - linkDisabled: string; - linkHover: string; - linkExternal: string; - - // Text colors - body: string; - text: string; - textStrong: string; - textWeak: string; - textFaint: string; - textEmphasis: string; - - // TODO: move to background section - bodyBg: string; - pageBg: string; - headingColor: string; - - pageHeaderBorder: string; - - // Next-gen forms functional colors - formLabel: string; - formDescription: string; - formLegend: string; - formInputBg: string; - formInputBgDisabled: string; - formInputBorder: string; - formInputBorderHover: string; - formInputBorderActive: string; - formInputBorderInvalid: string; - formInputFocusOutline: string; - formInputText: string; - formInputTextStrong: string; - formInputTextWhite: string; - formValidationMessageText: string; - formValidationMessageBg: string; - }; - shadow: { - pageHeader: string; - }; -} +import { GrafanaTheme } from '@grafana/data'; export interface Themeable { theme: GrafanaTheme; diff --git a/packages/grafana-ui/src/utils/index.ts b/packages/grafana-ui/src/utils/index.ts index d387661f2cc..f32d8cfebad 100644 --- a/packages/grafana-ui/src/utils/index.ts +++ b/packages/grafana-ui/src/utils/index.ts @@ -1,10 +1,5 @@ -export * from './valueFormats/valueFormats'; export * from './colors'; -export * from './namedColorsPalette'; -export * from './displayProcessor'; -export * from './fieldDisplay'; export * from './validate'; -export { getFlotPairs, getFlotPairsConstant } from './flotPairs'; export * from './slate'; export * from './dataLinks'; export * from './tags'; diff --git a/packages/grafana-ui/src/utils/storybook/withTheme.tsx b/packages/grafana-ui/src/utils/storybook/withTheme.tsx index 7799f3ceb9c..d189bb041f9 100644 --- a/packages/grafana-ui/src/utils/storybook/withTheme.tsx +++ b/packages/grafana-ui/src/utils/storybook/withTheme.tsx @@ -3,7 +3,7 @@ import { RenderFunction } from '@storybook/react'; import { ThemeContext } from '../../themes/ThemeContext'; import { select } from '@storybook/addon-knobs'; import { getTheme } from '../../themes/index'; -import { GrafanaThemeType } from '../../types/theme'; +import { GrafanaThemeType } from '@grafana/data'; type SassThemeChangeHandler = (theme: GrafanaThemeType) => void; const ThemableStory: React.FunctionComponent<{ handleSassThemeChange: SassThemeChangeHandler }> = ({ diff --git a/packages/grafana-ui/src/utils/typeahead.ts b/packages/grafana-ui/src/utils/typeahead.ts index b3491e0a2a7..a71da5a97b5 100644 --- a/packages/grafana-ui/src/utils/typeahead.ts +++ b/packages/grafana-ui/src/utils/typeahead.ts @@ -1,6 +1,6 @@ import { default as calculateSize } from 'calculate-size'; import { CompletionItemGroup, CompletionItem, CompletionItemKind } from '../types/completion'; -import { GrafanaTheme } from '..'; +import { GrafanaTheme } from '@grafana/data'; export const flattenGroupItems = (groupedItems: CompletionItemGroup[]): CompletionItem[] => { return groupedItems.reduce((all, current) => { diff --git a/public/app/core/components/Select/DataSourcePicker.tsx b/public/app/core/components/Select/DataSourcePicker.tsx index 984c7d062e5..a641566f8b7 100644 --- a/public/app/core/components/Select/DataSourcePicker.tsx +++ b/public/app/core/components/Select/DataSourcePicker.tsx @@ -3,10 +3,7 @@ import React, { PureComponent } from 'react'; // Components import { Select } from '@grafana/ui'; -import { SelectableValue } from '@grafana/data'; - -// Types -import { DataSourceSelectItem } from '@grafana/ui'; +import { SelectableValue, DataSourceSelectItem } from '@grafana/data'; export interface Props { onChange: (ds: DataSourceSelectItem) => void; diff --git a/public/app/core/components/search/SearchField.tsx b/public/app/core/components/search/SearchField.tsx index a72782e21c7..1b768704ff3 100644 --- a/public/app/core/components/search/SearchField.tsx +++ b/public/app/core/components/search/SearchField.tsx @@ -3,7 +3,8 @@ import React, { useContext } from 'react'; import tinycolor from 'tinycolor2'; import { SearchQuery } from './search'; import { css, cx } from 'emotion'; -import { ThemeContext, GrafanaTheme, selectThemeVariant } from '@grafana/ui'; +import { ThemeContext, selectThemeVariant } from '@grafana/ui'; +import { GrafanaTheme } from '@grafana/data'; type Omit = Pick>; diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts index f25b1fe66ec..f7385bc163d 100644 --- a/public/app/core/logs_model.ts +++ b/public/app/core/logs_model.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { colors, getFlotPairs, ansicolor } from '@grafana/ui'; +import { colors, ansicolor } from '@grafana/ui'; import { Labels, @@ -22,6 +22,7 @@ import { toDataFrame, FieldCache, FieldWithIndex, + getFlotPairs, } from '@grafana/data'; import { getThemeColor } from 'app/core/utils/colors'; import { hasAnsiCodes } from 'app/core/utils/text'; diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts index 02a0e5bfb7a..01e8329625d 100644 --- a/public/app/core/services/keybindingSrv.ts +++ b/public/app/core/services/keybindingSrv.ts @@ -8,7 +8,7 @@ import { store } from 'app/store/store'; import { CoreEvents, AppEventEmitter } from 'app/types'; import Mousetrap from 'mousetrap'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; import 'mousetrap-global-bind'; import { ContextSrv } from './context_srv'; import { ILocationService, ITimeoutService, IRootScopeService } from 'angular'; diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts index 6f88d13d784..26577900f28 100644 --- a/public/app/core/time_series2.ts +++ b/public/app/core/time_series2.ts @@ -1,7 +1,6 @@ import { getFlotTickDecimals } from 'app/core/utils/ticks'; import _ from 'lodash'; -import { getValueFormat, ValueFormatter } from '@grafana/ui'; -import { stringToJsRegex, DecimalCount } from '@grafana/data'; +import { getValueFormat, ValueFormatter, stringToJsRegex, DecimalCount } from '@grafana/data'; function matchSeriesOverride(aliasOrRegex: string, seriesAlias: string) { if (!aliasOrRegex) { diff --git a/public/app/core/utils/ConfigProvider.tsx b/public/app/core/utils/ConfigProvider.tsx index a7a5f630d10..58c4705fc04 100644 --- a/public/app/core/utils/ConfigProvider.tsx +++ b/public/app/core/utils/ConfigProvider.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { config, GrafanaBootConfig } from '@grafana/runtime'; -import { GrafanaThemeType, ThemeContext, getTheme } from '@grafana/ui'; +import { ThemeContext, getTheme } from '@grafana/ui'; +import { GrafanaThemeType } from '@grafana/data'; export const ConfigContext = React.createContext(config); export const ConfigConsumer = ConfigContext.Consumer; diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts index 2fa2811c030..819a46c5c65 100644 --- a/public/app/core/utils/explore.test.ts +++ b/public/app/core/utils/explore.test.ts @@ -15,8 +15,8 @@ import { } from './explore'; import { ExploreUrlState, ExploreMode } from 'app/types/explore'; import store from 'app/core/store'; -import { LogsDedupStrategy, LogsModel, LogLevel, dateTime } from '@grafana/data'; -import { DataQueryError, RefreshPicker } from '@grafana/ui'; +import { DataQueryError, LogsDedupStrategy, LogsModel, LogLevel, dateTime } from '@grafana/data'; +import { RefreshPicker } from '@grafana/ui'; const DEFAULT_EXPLORE_STATE: ExploreUrlState = { datasource: null, diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts index bcae86b757c..2f88258b158 100644 --- a/public/app/core/utils/explore.ts +++ b/public/app/core/utils/explore.ts @@ -14,6 +14,12 @@ import { LogsDedupStrategy, IntervalValues, DefaultTimeZone, + DataQuery, + DataSourceApi, + DataQueryError, + DataQueryRequest, + PanelModel, + HistoryItem, } from '@grafana/data'; import { renderUrl } from 'app/core/utils/url'; import store from 'app/core/store'; @@ -21,15 +27,7 @@ import kbn from 'app/core/utils/kbn'; import { getNextRefIdChar } from './query'; // Types -import { - DataQuery, - DataSourceApi, - DataQueryError, - DataQueryRequest, - PanelModel, - RefreshPicker, - HistoryItem, -} from '@grafana/ui'; +import { RefreshPicker } from '@grafana/ui'; import { ExploreUrlState, QueryTransaction, QueryOptions, ExploreMode } from 'app/types/explore'; import { config } from '../config'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts index 289bffa29fe..2f8d9b5da11 100644 --- a/public/app/core/utils/kbn.ts +++ b/public/app/core/utils/kbn.ts @@ -1,6 +1,12 @@ import { has } from 'lodash'; -import { getValueFormat, getValueFormatterIndex, getValueFormats } from '@grafana/ui'; -import { stringToJsRegex, TimeRange, deprecationWarning } from '@grafana/data'; +import { + getValueFormat, + getValueFormatterIndex, + getValueFormats, + stringToJsRegex, + TimeRange, + deprecationWarning, +} from '@grafana/data'; const kbn: any = {}; diff --git a/public/app/core/utils/query.test.ts b/public/app/core/utils/query.test.ts index a69162751a4..c6a46b181e0 100644 --- a/public/app/core/utils/query.test.ts +++ b/public/app/core/utils/query.test.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/ui'; +import { DataQuery } from '@grafana/data'; import { getNextRefIdChar } from './query'; const dataQueries: DataQuery[] = [ diff --git a/public/app/core/utils/query.ts b/public/app/core/utils/query.ts index 487653b0880..5a6cdfb0b52 100644 --- a/public/app/core/utils/query.ts +++ b/public/app/core/utils/query.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { DataQuery } from '@grafana/ui/'; +import { DataQuery } from '@grafana/data'; export const getNextRefIdChar = (queries: DataQuery[]): string => { const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; diff --git a/public/app/features/alerting/AlertTabCtrl.ts b/public/app/features/alerting/AlertTabCtrl.ts index 793b3d632d9..fed58ece7b6 100644 --- a/public/app/features/alerting/AlertTabCtrl.ts +++ b/public/app/features/alerting/AlertTabCtrl.ts @@ -8,7 +8,7 @@ import appEvents from 'app/core/app_events'; import { BackendSrv } from 'app/core/services/backend_srv'; import { DashboardSrv } from '../dashboard/services/DashboardSrv'; import DatasourceSrv from '../plugins/datasource_srv'; -import { DataQuery } from '@grafana/ui/src/types/datasource'; +import { DataQuery } from '@grafana/data'; import { PanelModel } from 'app/features/dashboard/state'; import { getDefaultCondition } from './getAlertingValidationMessage'; import { CoreEvents } from 'app/types'; diff --git a/public/app/features/alerting/getAlertingValidationMessage.test.ts b/public/app/features/alerting/getAlertingValidationMessage.test.ts index 723754ce257..06848a20aea 100644 --- a/public/app/features/alerting/getAlertingValidationMessage.test.ts +++ b/public/app/features/alerting/getAlertingValidationMessage.test.ts @@ -1,6 +1,5 @@ import { DataSourceSrv } from '@grafana/runtime'; -import { DataSourceApi, PluginMeta } from '@grafana/ui'; -import { DataTransformerConfig } from '@grafana/data'; +import { DataSourceApi, PluginMeta, DataTransformerConfig } from '@grafana/data'; import { ElasticsearchQuery } from '../../plugins/datasource/elasticsearch/types'; import { getAlertingValidationMessage } from './getAlertingValidationMessage'; diff --git a/public/app/features/alerting/getAlertingValidationMessage.ts b/public/app/features/alerting/getAlertingValidationMessage.ts index 4add3bd19c5..2d89e506040 100644 --- a/public/app/features/alerting/getAlertingValidationMessage.ts +++ b/public/app/features/alerting/getAlertingValidationMessage.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/ui'; +import { DataQuery } from '@grafana/data'; import { DataSourceSrv } from '@grafana/runtime'; import { DataTransformerConfig } from '@grafana/data'; diff --git a/public/app/features/annotations/annotations_srv.ts b/public/app/features/annotations/annotations_srv.ts index 8f8d85742e8..c583333b0a2 100644 --- a/public/app/features/annotations/annotations_srv.ts +++ b/public/app/features/annotations/annotations_srv.ts @@ -14,8 +14,7 @@ import { DashboardModel } from '../dashboard/state/DashboardModel'; import DatasourceSrv from '../plugins/datasource_srv'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TimeSrv } from '../dashboard/services/TimeSrv'; -import { DataSourceApi, PanelEvents } from '@grafana/ui'; -import { AnnotationEvent, AppEvents } from '@grafana/data'; +import { DataSourceApi, PanelEvents, AnnotationEvent, AppEvents } from '@grafana/data'; import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; export class AnnotationsSrv { diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts index 00959e98a3c..5d6ad6780b2 100644 --- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts +++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts @@ -9,7 +9,7 @@ import config from 'app/core/config'; import { DashboardExporter } from './DashboardExporter'; import { DashboardModel } from '../../state/DashboardModel'; import { DatasourceSrv } from 'app/features/plugins/datasource_srv'; -import { PanelPluginMeta } from '@grafana/ui'; +import { PanelPluginMeta } from '@grafana/data'; describe('given dashboard with repeated panels', () => { let dash: any, exported: any; diff --git a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts index 79cbe918434..4883f254780 100644 --- a/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts +++ b/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts @@ -4,7 +4,7 @@ import config from 'app/core/config'; import { DashboardModel } from '../../state/DashboardModel'; import DatasourceSrv from 'app/features/plugins/datasource_srv'; import { PanelModel } from 'app/features/dashboard/state'; -import { PanelPluginMeta } from '@grafana/ui'; +import { PanelPluginMeta } from '@grafana/data'; interface Input { name: string; diff --git a/public/app/features/dashboard/components/DashLinks/DashLinksContainerCtrl.ts b/public/app/features/dashboard/components/DashLinks/DashLinksContainerCtrl.ts index 216784e413b..1aef641080c 100644 --- a/public/app/features/dashboard/components/DashLinks/DashLinksContainerCtrl.ts +++ b/public/app/features/dashboard/components/DashLinks/DashLinksContainerCtrl.ts @@ -4,7 +4,7 @@ import { iconMap } from './DashLinksEditorCtrl'; import { LinkSrv } from 'app/features/panel/panellinks/link_srv'; import { BackendSrv } from 'app/core/services/backend_srv'; import { DashboardSrv } from '../../services/DashboardSrv'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; import { CoreEvents } from 'app/types'; import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx index 6ef8ce489e3..eaf63186b0b 100644 --- a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx +++ b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx @@ -11,7 +11,7 @@ import { GRID_CELL_HEIGHT, GRID_CELL_VMARGIN, GRID_COLUMN_COUNT } from 'app/core import { DashboardPanel } from './DashboardPanel'; import { DashboardModel, PanelModel } from '../state'; import { CoreEvents } from 'app/types'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; import { panelAdded, panelRemoved } from '../state/PanelModel'; let lastGridWidth = 1200; diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx index 5ef3e0c5b66..b2749b60460 100644 --- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx +++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx @@ -15,7 +15,7 @@ import { PanelResizer } from './PanelResizer'; // Types import { PanelModel, DashboardModel } from '../state'; -import { PanelPluginMeta, PanelPlugin } from '@grafana/ui/src/types/panel'; +import { PanelPluginMeta, PanelPlugin } from '@grafana/data'; import { AutoSizer } from 'react-virtualized'; export interface Props { diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx index 450cddb8fc3..159a1b8e280 100644 --- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx +++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx @@ -4,7 +4,7 @@ import classNames from 'classnames'; import { Unsubscribable } from 'rxjs'; // Components import { PanelHeader } from './PanelHeader/PanelHeader'; -import { ErrorBoundary, PanelData, PanelPlugin } from '@grafana/ui'; +import { ErrorBoundary } from '@grafana/ui'; // Utils & Services import { getTimeSrv, TimeSrv } from '../services/TimeSrv'; import { applyPanelTimeOverrides, calculateInnerPanelHeight } from 'app/features/dashboard/utils/panel'; @@ -14,8 +14,17 @@ import templateSrv from 'app/features/templating/template_srv'; import config from 'app/core/config'; // Types import { DashboardModel, PanelModel } from '../state'; -import { LoadingState, ScopedVars, AbsoluteTimeRange, DefaultTimeRange, toUtc, toDataFrameDTO } from '@grafana/data'; -import { PanelEvents } from '@grafana/ui'; +import { + LoadingState, + ScopedVars, + AbsoluteTimeRange, + DefaultTimeRange, + toUtc, + toDataFrameDTO, + PanelEvents, + PanelData, + PanelPlugin, +} from '@grafana/data'; const DEFAULT_PLUGIN_ERROR = 'Error in plugin'; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx index 5a0b6bbecb6..7c2fc90882b 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx @@ -3,7 +3,7 @@ import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; import { PanelHeaderMenuItem } from './PanelHeaderMenuItem'; import { getPanelMenu } from 'app/features/dashboard/utils/getPanelMenu'; -import { PanelMenuItem } from '@grafana/ui'; +import { PanelMenuItem } from '@grafana/data'; export interface Props { panel: PanelModel; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx index a50af1eb56c..15d0b8e9513 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { PanelMenuItem } from '@grafana/ui'; +import { PanelMenuItem } from '@grafana/data'; interface Props { children: any; diff --git a/public/app/features/dashboard/dashgrid/PanelPluginError.tsx b/public/app/features/dashboard/dashgrid/PanelPluginError.tsx index 643282f7092..ce6a9a5e67a 100644 --- a/public/app/features/dashboard/dashgrid/PanelPluginError.tsx +++ b/public/app/features/dashboard/dashgrid/PanelPluginError.tsx @@ -4,7 +4,8 @@ import React, { PureComponent, ReactNode } from 'react'; // Types import { AppNotificationSeverity } from 'app/types'; -import { PanelProps, PanelPlugin, PluginType, PanelPluginMeta, Alert } from '@grafana/ui'; +import { Alert } from '@grafana/ui'; +import { PanelProps, PanelPlugin, PluginType, PanelPluginMeta } from '@grafana/data'; interface Props { title: string; diff --git a/public/app/features/dashboard/panel_editor/PanelEditor.tsx b/public/app/features/dashboard/panel_editor/PanelEditor.tsx index 299942d2fbf..dc8ed92f2a5 100644 --- a/public/app/features/dashboard/panel_editor/PanelEditor.tsx +++ b/public/app/features/dashboard/panel_editor/PanelEditor.tsx @@ -2,7 +2,8 @@ import React, { PureComponent } from 'react'; import classNames from 'classnames'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { PanelPlugin, PanelPluginMeta, Tooltip } from '@grafana/ui'; +import { Tooltip } from '@grafana/ui'; +import { PanelPlugin, PanelPluginMeta } from '@grafana/data'; import { AngularComponent, config } from '@grafana/runtime'; import { QueriesTab } from './QueriesTab'; diff --git a/public/app/features/dashboard/panel_editor/QueriesTab.tsx b/public/app/features/dashboard/panel_editor/QueriesTab.tsx index 5355f181c30..4089daf3282 100644 --- a/public/app/features/dashboard/panel_editor/QueriesTab.tsx +++ b/public/app/features/dashboard/panel_editor/QueriesTab.tsx @@ -7,15 +7,7 @@ import { EditorTabBody, EditorToolbarView } from './EditorTabBody'; import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker'; import { QueryInspector } from './QueryInspector'; import { QueryOptions } from './QueryOptions'; -import { - PanelOptionsGroup, - TransformationsEditor, - DataQuery, - DataSourceSelectItem, - PanelData, - AlphaNotice, - PluginState, -} from '@grafana/ui'; +import { PanelOptionsGroup, TransformationsEditor, AlphaNotice } from '@grafana/ui'; import { QueryEditorRows } from './QueryEditorRows'; // Services import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; @@ -24,7 +16,15 @@ import config from 'app/core/config'; // Types import { PanelModel } from '../state/PanelModel'; import { DashboardModel } from '../state/DashboardModel'; -import { LoadingState, DataTransformerConfig, DefaultTimeRange } from '@grafana/data'; +import { + LoadingState, + DataTransformerConfig, + DefaultTimeRange, + DataSourceSelectItem, + DataQuery, + PanelData, + PluginState, +} from '@grafana/data'; import { PluginHelp } from 'app/core/components/PluginHelp/PluginHelp'; import { addQuery } from 'app/core/utils/query'; import { Unsubscribable } from 'rxjs'; diff --git a/public/app/features/dashboard/panel_editor/QueryEditorRow.test.ts b/public/app/features/dashboard/panel_editor/QueryEditorRow.test.ts index 708d9929230..009e93d85c0 100644 --- a/public/app/features/dashboard/panel_editor/QueryEditorRow.test.ts +++ b/public/app/features/dashboard/panel_editor/QueryEditorRow.test.ts @@ -1,5 +1,4 @@ -import { LoadingState, toDataFrame, dateTime } from '@grafana/data'; -import { PanelData, DataQueryRequest } from '@grafana/ui'; +import { LoadingState, toDataFrame, dateTime, PanelData, DataQueryRequest } from '@grafana/data'; import { filterPanelDataToQuery } from './QueryEditorRow'; function makePretendRequest(requestId: string, subRequests?: DataQueryRequest[]): DataQueryRequest { diff --git a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx index ea1ffcd8f6d..1fc3977dcde 100644 --- a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx +++ b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx @@ -9,8 +9,17 @@ import { Emitter } from 'app/core/utils/emitter'; import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; // Types import { PanelModel } from '../state/PanelModel'; -import { DataQuery, DataSourceApi, PanelData, DataQueryRequest, ErrorBoundaryAlert, PanelEvents } from '@grafana/ui'; -import { TimeRange, LoadingState, toLegacyResponseData } from '@grafana/data'; +import { ErrorBoundaryAlert } from '@grafana/ui'; +import { + DataQuery, + DataSourceApi, + PanelData, + DataQueryRequest, + PanelEvents, + TimeRange, + LoadingState, + toLegacyResponseData, +} from '@grafana/data'; import { DashboardModel } from '../state/DashboardModel'; interface Props { diff --git a/public/app/features/dashboard/panel_editor/QueryEditorRows.tsx b/public/app/features/dashboard/panel_editor/QueryEditorRows.tsx index 9ee8c50e174..c773a39750d 100644 --- a/public/app/features/dashboard/panel_editor/QueryEditorRows.tsx +++ b/public/app/features/dashboard/panel_editor/QueryEditorRows.tsx @@ -6,7 +6,7 @@ import _ from 'lodash'; // Types import { PanelModel } from '../state/PanelModel'; -import { DataQuery, PanelData, DataSourceSelectItem } from '@grafana/ui'; +import { DataQuery, PanelData, DataSourceSelectItem } from '@grafana/data'; import { DashboardModel } from '../state/DashboardModel'; import { QueryEditorRow } from './QueryEditorRow'; import { addQuery } from 'app/core/utils/query'; diff --git a/public/app/features/dashboard/panel_editor/QueryInspector.tsx b/public/app/features/dashboard/panel_editor/QueryInspector.tsx index fa0a14abedd..a4ea5af09ae 100644 --- a/public/app/features/dashboard/panel_editor/QueryInspector.tsx +++ b/public/app/features/dashboard/panel_editor/QueryInspector.tsx @@ -1,9 +1,9 @@ import React, { PureComponent } from 'react'; import appEvents from 'app/core/app_events'; import { CopyToClipboard } from 'app/core/components/CopyToClipboard/CopyToClipboard'; -import { LoadingPlaceholder, JSONFormatter, PanelEvents } from '@grafana/ui'; +import { LoadingPlaceholder, JSONFormatter } from '@grafana/ui'; import { CoreEvents } from 'app/types'; -import { AppEvents } from '@grafana/data'; +import { AppEvents, PanelEvents } from '@grafana/data'; interface DsQuery { isLoading: boolean; diff --git a/public/app/features/dashboard/panel_editor/QueryOptions.tsx b/public/app/features/dashboard/panel_editor/QueryOptions.tsx index 2bdce086782..aefeda46a44 100644 --- a/public/app/features/dashboard/panel_editor/QueryOptions.tsx +++ b/public/app/features/dashboard/panel_editor/QueryOptions.tsx @@ -2,18 +2,10 @@ import React, { PureComponent, ChangeEvent, FocusEvent, ReactText } from 'react'; // Utils -import { rangeUtil } from '@grafana/data'; +import { rangeUtil, DataSourceSelectItem } from '@grafana/data'; // Components -import { - DataSourceSelectItem, - EventsWithValidation, - Input, - InputStatus, - Switch, - ValidationEvents, - FormLabel, -} from '@grafana/ui'; +import { EventsWithValidation, Input, InputStatus, Switch, ValidationEvents, FormLabel } from '@grafana/ui'; import { DataSourceOption } from './DataSourceOption'; // Types diff --git a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx index 3b9bca2d48d..8a72d724236 100644 --- a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx +++ b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx @@ -14,10 +14,9 @@ import { FadeIn } from 'app/core/components/Animations/FadeIn'; import { PanelModel, DashboardModel } from '../state'; import { VizPickerSearch } from './VizPickerSearch'; import PluginStateinfo from 'app/features/plugins/PluginStateInfo'; -import { PanelPlugin, PanelPluginMeta, PanelData } from '@grafana/ui'; import { PanelCtrl } from 'app/plugins/sdk'; import { Unsubscribable } from 'rxjs'; -import { LoadingState, DefaultTimeRange } from '@grafana/data'; +import { PanelPlugin, PanelPluginMeta, PanelData, LoadingState, DefaultTimeRange } from '@grafana/data'; interface Props { panel: PanelModel; diff --git a/public/app/features/dashboard/panel_editor/VizPickerSearch.tsx b/public/app/features/dashboard/panel_editor/VizPickerSearch.tsx index d4773f15895..48dbd623a50 100644 --- a/public/app/features/dashboard/panel_editor/VizPickerSearch.tsx +++ b/public/app/features/dashboard/panel_editor/VizPickerSearch.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import { FilterInput } from 'app/core/components/FilterInput/FilterInput'; -import { PanelPluginMeta } from '@grafana/ui'; +import { PanelPluginMeta } from '@grafana/data'; interface Props { plugin: PanelPluginMeta; diff --git a/public/app/features/dashboard/panel_editor/VizTypePicker.tsx b/public/app/features/dashboard/panel_editor/VizTypePicker.tsx index 0d0f5c2be48..44b25d41b7f 100644 --- a/public/app/features/dashboard/panel_editor/VizTypePicker.tsx +++ b/public/app/features/dashboard/panel_editor/VizTypePicker.tsx @@ -2,7 +2,8 @@ import React, { PureComponent } from 'react'; import config from 'app/core/config'; import VizTypePickerPlugin from './VizTypePickerPlugin'; -import { PanelPluginMeta, EmptySearchResult } from '@grafana/ui'; +import { EmptySearchResult } from '@grafana/ui'; +import { PanelPluginMeta } from '@grafana/data'; export interface Props { current: PanelPluginMeta; diff --git a/public/app/features/dashboard/panel_editor/VizTypePickerPlugin.tsx b/public/app/features/dashboard/panel_editor/VizTypePickerPlugin.tsx index dd04d2fd624..3f13db037bc 100644 --- a/public/app/features/dashboard/panel_editor/VizTypePickerPlugin.tsx +++ b/public/app/features/dashboard/panel_editor/VizTypePickerPlugin.tsx @@ -1,6 +1,6 @@ import React from 'react'; import classNames from 'classnames'; -import { PanelPluginMeta } from '@grafana/ui'; +import { PanelPluginMeta } from '@grafana/data'; interface Props { isCurrent: boolean; diff --git a/public/app/features/dashboard/services/DashboardSrv.ts b/public/app/features/dashboard/services/DashboardSrv.ts index faf4efefcd5..41275533424 100644 --- a/public/app/features/dashboard/services/DashboardSrv.ts +++ b/public/app/features/dashboard/services/DashboardSrv.ts @@ -8,7 +8,7 @@ import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; import { BackendSrv } from 'app/core/services/backend_srv'; import { ILocationService } from 'angular'; import { AppEvents } from '@grafana/data'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; interface DashboardSaveOptions { folderId?: number; diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts index 85b804cc31b..f85e4805cf5 100644 --- a/public/app/features/dashboard/state/DashboardModel.ts +++ b/public/app/features/dashboard/state/DashboardModel.ts @@ -15,7 +15,7 @@ import { PanelModel, GridPos, panelAdded, panelRemoved } from './PanelModel'; import { DashboardMigrator } from './DashboardMigrator'; import { TimeRange, TimeZone, AppEvent } from '@grafana/data'; import { UrlQueryValue } from '@grafana/runtime'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; import { KIOSK_MODE_TV, DashboardMeta, CoreEvents } from 'app/types'; import { toUtc, DateTimeInput, dateTime, isDateTime } from '@grafana/data'; diff --git a/public/app/features/dashboard/state/PanelModel.test.ts b/public/app/features/dashboard/state/PanelModel.test.ts index f3d8d1497df..a5f0e889a6e 100644 --- a/public/app/features/dashboard/state/PanelModel.test.ts +++ b/public/app/features/dashboard/state/PanelModel.test.ts @@ -1,6 +1,6 @@ import { PanelModel } from './PanelModel'; import { getPanelPlugin } from '../../plugins/__mocks__/pluginMocks'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; class TablePanelCtrl {} diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts index 67035e46f15..5620d8dd485 100644 --- a/public/app/features/dashboard/state/PanelModel.ts +++ b/public/app/features/dashboard/state/PanelModel.ts @@ -4,8 +4,15 @@ import _ from 'lodash'; import { Emitter } from 'app/core/utils/emitter'; import { getNextRefIdChar } from 'app/core/utils/query'; // Types -import { DataQuery, DataQueryResponseData, PanelPlugin, PanelEvents } from '@grafana/ui'; -import { DataLink, DataTransformerConfig, ScopedVars } from '@grafana/data'; +import { + DataQuery, + DataQueryResponseData, + PanelPlugin, + PanelEvents, + DataLink, + DataTransformerConfig, + ScopedVars, +} from '@grafana/data'; import config from 'app/core/config'; diff --git a/public/app/features/dashboard/state/PanelQueryRunner.test.ts b/public/app/features/dashboard/state/PanelQueryRunner.test.ts index 0f8f55d7e39..33cf9153f4a 100644 --- a/public/app/features/dashboard/state/PanelQueryRunner.test.ts +++ b/public/app/features/dashboard/state/PanelQueryRunner.test.ts @@ -1,6 +1,5 @@ import { PanelQueryRunner } from './PanelQueryRunner'; -import { PanelData, DataQueryRequest } from '@grafana/ui'; -import { dateTime, ScopedVars } from '@grafana/data'; +import { PanelData, DataQueryRequest, dateTime, ScopedVars } from '@grafana/data'; import { PanelModel } from './PanelModel'; jest.mock('app/core/services/backend_srv'); diff --git a/public/app/features/dashboard/state/PanelQueryRunner.ts b/public/app/features/dashboard/state/PanelQueryRunner.ts index 052ba7c714d..62537dca961 100644 --- a/public/app/features/dashboard/state/PanelQueryRunner.ts +++ b/public/app/features/dashboard/state/PanelQueryRunner.ts @@ -12,8 +12,17 @@ import { runRequest, preProcessPanelData } from './runRequest'; import { runSharedRequest, isSharedDashboardQuery } from '../../../plugins/datasource/dashboard'; // Types -import { PanelData, DataQuery, DataQueryRequest, DataSourceApi, DataSourceJsonData } from '@grafana/ui'; -import { TimeRange, DataTransformerConfig, transformDataFrame, ScopedVars } from '@grafana/data'; +import { + PanelData, + DataQuery, + DataQueryRequest, + DataSourceApi, + DataSourceJsonData, + TimeRange, + DataTransformerConfig, + transformDataFrame, + ScopedVars, +} from '@grafana/data'; export interface QueryRunnerOptions< TQuery extends DataQuery = DataQuery, diff --git a/public/app/features/dashboard/state/initDashboard.ts b/public/app/features/dashboard/state/initDashboard.ts index ea76490664e..baa3342e27f 100644 --- a/public/app/features/dashboard/state/initDashboard.ts +++ b/public/app/features/dashboard/state/initDashboard.ts @@ -24,7 +24,7 @@ import { import { DashboardRouteInfo, StoreState, ThunkDispatch, ThunkResult, DashboardDTO, ExploreItemState } from 'app/types'; import { DashboardModel } from './DashboardModel'; import { resetExploreAction } from 'app/features/explore/state/actionTypes'; -import { DataQuery } from '@grafana/ui'; +import { DataQuery } from '@grafana/data'; export interface InitDashboardArgs { $injector: any; diff --git a/public/app/features/dashboard/state/runRequest.test.ts b/public/app/features/dashboard/state/runRequest.test.ts index 233fab4e657..6d08ee9fa85 100644 --- a/public/app/features/dashboard/state/runRequest.test.ts +++ b/public/app/features/dashboard/state/runRequest.test.ts @@ -1,5 +1,12 @@ -import { DataFrame, LoadingState, dateTime } from '@grafana/data'; -import { PanelData, DataSourceApi, DataQueryRequest, DataQueryResponse } from '@grafana/ui'; +import { + DataFrame, + LoadingState, + dateTime, + PanelData, + DataSourceApi, + DataQueryRequest, + DataQueryResponse, +} from '@grafana/data'; import { Subscriber, Observable, Subscription } from 'rxjs'; import { runRequest } from './runRequest'; import { deepFreeze } from '../../../../test/core/redux/reducerTester'; diff --git a/public/app/features/dashboard/state/runRequest.ts b/public/app/features/dashboard/state/runRequest.ts index 3ac44d80a17..9b07e07a363 100644 --- a/public/app/features/dashboard/state/runRequest.ts +++ b/public/app/features/dashboard/state/runRequest.ts @@ -12,8 +12,12 @@ import { DataQueryResponse, DataQueryResponseData, DataQueryError, -} from '@grafana/ui'; -import { LoadingState, dateMath, toDataFrame, DataFrame, guessFieldTypes } from '@grafana/data'; + LoadingState, + dateMath, + toDataFrame, + DataFrame, + guessFieldTypes, +} from '@grafana/data'; import { ExpressionDatasourceID, expressionDatasource } from 'app/features/expressions/ExpressionDatasource'; type MapOfResponsePackets = { [str: string]: DataQueryResponse }; diff --git a/public/app/features/dashboard/utils/getPanelMenu.ts b/public/app/features/dashboard/utils/getPanelMenu.ts index a6e967b733f..ce12700f92d 100644 --- a/public/app/features/dashboard/utils/getPanelMenu.ts +++ b/public/app/features/dashboard/utils/getPanelMenu.ts @@ -4,7 +4,7 @@ import { store } from 'app/store/store'; import { removePanel, duplicatePanel, copyPanel, editPanelJson, sharePanel } from 'app/features/dashboard/utils/panel'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; -import { PanelMenuItem } from '@grafana/ui'; +import { PanelMenuItem } from '@grafana/data'; export const getPanelMenu = (dashboard: DashboardModel, panel: PanelModel) => { const onViewPanel = () => { diff --git a/public/app/features/datasources/DataSourceDashboards.test.tsx b/public/app/features/datasources/DataSourceDashboards.test.tsx index c6cc6438ba2..f47ba005e05 100644 --- a/public/app/features/datasources/DataSourceDashboards.test.tsx +++ b/public/app/features/datasources/DataSourceDashboards.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DataSourceDashboards, Props } from './DataSourceDashboards'; -import { DataSourceSettings } from '@grafana/ui'; +import { DataSourceSettings } from '@grafana/data'; import { NavModel } from '@grafana/data'; import { PluginDashboard } from 'app/types'; diff --git a/public/app/features/datasources/DataSourceDashboards.tsx b/public/app/features/datasources/DataSourceDashboards.tsx index cbbb063d589..a9dc3aa19d8 100644 --- a/public/app/features/datasources/DataSourceDashboards.tsx +++ b/public/app/features/datasources/DataSourceDashboards.tsx @@ -17,7 +17,7 @@ import { getDataSource } from './state/selectors'; // Types import { PluginDashboard, StoreState } from 'app/types'; -import { DataSourceSettings } from '@grafana/ui'; +import { DataSourceSettings } from '@grafana/data'; import { NavModel } from '@grafana/data'; export interface Props { diff --git a/public/app/features/datasources/DataSourcesList.tsx b/public/app/features/datasources/DataSourcesList.tsx index 86993806413..de1e9afa762 100644 --- a/public/app/features/datasources/DataSourcesList.tsx +++ b/public/app/features/datasources/DataSourcesList.tsx @@ -6,7 +6,7 @@ import classNames from 'classnames'; import DataSourcesListItem from './DataSourcesListItem'; // Types -import { DataSourceSettings } from '@grafana/ui'; +import { DataSourceSettings } from '@grafana/data'; import { LayoutMode, LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector'; export interface Props { diff --git a/public/app/features/datasources/DataSourcesListItem.tsx b/public/app/features/datasources/DataSourcesListItem.tsx index ff4cd794f75..dc6f50ebf4a 100644 --- a/public/app/features/datasources/DataSourcesListItem.tsx +++ b/public/app/features/datasources/DataSourcesListItem.tsx @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { DataSourceSettings } from '@grafana/ui'; +import { DataSourceSettings } from '@grafana/data'; export interface Props { dataSource: DataSourceSettings; diff --git a/public/app/features/datasources/DataSourcesListPage.test.tsx b/public/app/features/datasources/DataSourcesListPage.test.tsx index ea16ad99816..79b96d45dd1 100644 --- a/public/app/features/datasources/DataSourcesListPage.test.tsx +++ b/public/app/features/datasources/DataSourcesListPage.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DataSourcesListPage, Props } from './DataSourcesListPage'; -import { DataSourceSettings } from '@grafana/ui'; +import { DataSourceSettings } from '@grafana/data'; import { NavModel } from '@grafana/data'; import { LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector'; import { getMockDataSources } from './__mocks__/dataSourcesMocks'; diff --git a/public/app/features/datasources/DataSourcesListPage.tsx b/public/app/features/datasources/DataSourcesListPage.tsx index 4c0ef5c9d7d..babb35c7e4a 100644 --- a/public/app/features/datasources/DataSourcesListPage.tsx +++ b/public/app/features/datasources/DataSourcesListPage.tsx @@ -10,7 +10,7 @@ import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA'; import DataSourcesList from './DataSourcesList'; // Types -import { DataSourceSettings } from '@grafana/ui'; +import { DataSourceSettings } from '@grafana/data'; import { NavModel } from '@grafana/data'; import { StoreState } from 'app/types'; import { LayoutMode } from 'app/core/components/LayoutSelector/LayoutSelector'; diff --git a/public/app/features/datasources/NewDataSourcePage.tsx b/public/app/features/datasources/NewDataSourcePage.tsx index 23e64ebd024..51b3dcae5c9 100644 --- a/public/app/features/datasources/NewDataSourcePage.tsx +++ b/public/app/features/datasources/NewDataSourcePage.tsx @@ -6,8 +6,8 @@ import { StoreState } from 'app/types'; import { addDataSource, loadDataSourceTypes, setDataSourceTypeSearchQuery } from './state/actions'; import { getDataSourceTypes } from './state/selectors'; import { FilterInput } from 'app/core/components/FilterInput/FilterInput'; -import { DataSourcePluginMeta, List, PluginType } from '@grafana/ui'; -import { NavModel } from '@grafana/data'; +import { List } from '@grafana/ui'; +import { DataSourcePluginMeta, NavModel, PluginType } from '@grafana/data'; export interface Props { navModel: NavModel; diff --git a/public/app/features/datasources/__mocks__/dataSourcesMocks.ts b/public/app/features/datasources/__mocks__/dataSourcesMocks.ts index f44521a1a98..9abd7eb48d0 100644 --- a/public/app/features/datasources/__mocks__/dataSourcesMocks.ts +++ b/public/app/features/datasources/__mocks__/dataSourcesMocks.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings } from '@grafana/ui'; +import { DataSourceSettings } from '@grafana/data'; export const getMockDataSources = (amount: number) => { const dataSources = []; diff --git a/public/app/features/datasources/mocks.ts b/public/app/features/datasources/mocks.ts index 88cffaeabf6..c9d21aa5907 100644 --- a/public/app/features/datasources/mocks.ts +++ b/public/app/features/datasources/mocks.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings } from '@grafana/ui'; +import { DataSourceSettings } from '@grafana/data'; export function createDatasourceSettings(jsonData: T): DataSourceSettings { return { diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx index 12ca27ce15f..aaef1841220 100644 --- a/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx +++ b/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx @@ -1,8 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DataSourceSettingsPage, Props } from './DataSourceSettingsPage'; -import { DataSourceSettings, DataSourcePlugin, DataSourceConstructor } from '@grafana/ui'; -import { NavModel } from '@grafana/data'; +import { DataSourceSettings, DataSourcePlugin, DataSourceConstructor, NavModel } from '@grafana/data'; import { getMockDataSource } from '../__mocks__/dataSourcesMocks'; import { getMockPlugin } from '../../plugins/__mocks__/pluginMocks'; import { setDataSourceName, setIsDefault, dataSourceLoaded } from '../state/actions'; diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx index c55e78eceef..e0e9b5e58b1 100644 --- a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx +++ b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx @@ -31,7 +31,7 @@ import { getRouteParamsId } from 'app/core/selectors/location'; // Types import { StoreState, CoreEvents } from 'app/types/'; import { UrlQueryMap } from '@grafana/runtime'; -import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/data'; import { NavModel } from '@grafana/data'; import { getDataSourceLoadingNav } from '../state/navModel'; import PluginStateinfo from 'app/features/plugins/PluginStateInfo'; diff --git a/public/app/features/datasources/settings/PluginSettings.tsx b/public/app/features/datasources/settings/PluginSettings.tsx index 58da3cc55f4..8a288fd289b 100644 --- a/public/app/features/datasources/settings/PluginSettings.tsx +++ b/public/app/features/datasources/settings/PluginSettings.tsx @@ -7,7 +7,7 @@ import { DataSourceApi, DataQuery, DataSourceJsonData, -} from '@grafana/ui'; +} from '@grafana/data'; import { getAngularLoader, AngularComponent } from '@grafana/runtime'; export type GenericDataSourcePlugin = DataSourcePlugin>; diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts index 673d321184f..4ca15f1c2db 100644 --- a/public/app/features/datasources/state/actions.ts +++ b/public/app/features/datasources/state/actions.ts @@ -5,7 +5,7 @@ import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; import { LayoutMode } from 'app/core/components/LayoutSelector/LayoutSelector'; import { updateLocation, updateNavIndex, UpdateNavIndexAction } from 'app/core/actions'; import { buildNavModel } from './navModel'; -import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/data'; import { StoreState } from 'app/types'; import { LocationUpdate } from '@grafana/runtime'; import { actionCreatorFactory } from 'app/core/redux'; diff --git a/public/app/features/datasources/state/navModel.ts b/public/app/features/datasources/state/navModel.ts index 3574c751c4a..f97ecacd603 100644 --- a/public/app/features/datasources/state/navModel.ts +++ b/public/app/features/datasources/state/navModel.ts @@ -1,5 +1,4 @@ -import { DataSourceSettings, PluginType, PluginInclude } from '@grafana/ui'; -import { NavModel, NavModelItem } from '@grafana/data'; +import { DataSourceSettings, PluginType, PluginInclude, NavModel, NavModelItem } from '@grafana/data'; import config from 'app/core/config'; import { GenericDataSourcePlugin } from '../settings/PluginSettings'; diff --git a/public/app/features/datasources/state/reducers.test.ts b/public/app/features/datasources/state/reducers.test.ts index cda106478a4..63495ba0f0a 100644 --- a/public/app/features/datasources/state/reducers.test.ts +++ b/public/app/features/datasources/state/reducers.test.ts @@ -15,7 +15,7 @@ import { import { getMockDataSources, getMockDataSource } from '../__mocks__/dataSourcesMocks'; import { LayoutModes } from 'app/core/components/LayoutSelector/LayoutSelector'; import { DataSourcesState } from 'app/types'; -import { PluginMetaInfo, PluginType, PluginMeta } from '@grafana/ui'; +import { PluginMetaInfo, PluginType, PluginMeta } from '@grafana/data'; const mockPlugin = () => ({ diff --git a/public/app/features/datasources/state/reducers.ts b/public/app/features/datasources/state/reducers.ts index 3d7fae53f00..4871f4f9be2 100644 --- a/public/app/features/datasources/state/reducers.ts +++ b/public/app/features/datasources/state/reducers.ts @@ -1,5 +1,5 @@ import { DataSourcesState } from 'app/types'; -import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/data'; import { dataSourceLoaded, dataSourcesLoaded, diff --git a/public/app/features/datasources/state/selectors.ts b/public/app/features/datasources/state/selectors.ts index 3a117ec7b1a..d9b939e272f 100644 --- a/public/app/features/datasources/state/selectors.ts +++ b/public/app/features/datasources/state/selectors.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/data'; import { DataSourcesState } from '../../../types/datasources'; import { UrlQueryValue } from '@grafana/runtime'; diff --git a/public/app/features/explore/AdHocFilter.tsx b/public/app/features/explore/AdHocFilter.tsx index 464264bb98f..1eb59ca07fb 100644 --- a/public/app/features/explore/AdHocFilter.tsx +++ b/public/app/features/explore/AdHocFilter.tsx @@ -1,7 +1,7 @@ import React, { useContext } from 'react'; -import { Select, GrafanaTheme, ThemeContext } from '@grafana/ui'; +import { Select, ThemeContext } from '@grafana/ui'; import { css, cx } from 'emotion'; -import { SelectableValue } from '@grafana/data'; +import { GrafanaTheme, SelectableValue } from '@grafana/data'; const getStyles = (theme: GrafanaTheme) => ({ keyValueContainer: css` diff --git a/public/app/features/explore/AdHocFilterField.test.tsx b/public/app/features/explore/AdHocFilterField.test.tsx index 1f56b80cadd..90002cb17a2 100644 --- a/public/app/features/explore/AdHocFilterField.test.tsx +++ b/public/app/features/explore/AdHocFilterField.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; -import { DataSourceApi } from '@grafana/ui'; +import { DataSourceApi } from '@grafana/data'; import { AdHocFilterField, DEFAULT_REMOVE_FILTER_VALUE, KeyValuePair, Props } from './AdHocFilterField'; import { AdHocFilter } from './AdHocFilter'; diff --git a/public/app/features/explore/AdHocFilterField.tsx b/public/app/features/explore/AdHocFilterField.tsx index a42c21ed91e..9a50e9f081d 100644 --- a/public/app/features/explore/AdHocFilterField.tsx +++ b/public/app/features/explore/AdHocFilterField.tsx @@ -1,6 +1,6 @@ import React from 'react'; import _ from 'lodash'; -import { DataSourceApi, DataQuery, DataSourceJsonData } from '@grafana/ui'; +import { DataSourceApi, DataQuery, DataSourceJsonData } from '@grafana/data'; import { AdHocFilter } from './AdHocFilter'; export const DEFAULT_REMOVE_FILTER_VALUE = '-- remove filter --'; diff --git a/public/app/features/explore/ErrorContainer.tsx b/public/app/features/explore/ErrorContainer.tsx index ff8ac3d8210..72f02d18a5f 100644 --- a/public/app/features/explore/ErrorContainer.tsx +++ b/public/app/features/explore/ErrorContainer.tsx @@ -1,5 +1,5 @@ import React, { FunctionComponent } from 'react'; -import { DataQueryError } from '@grafana/ui'; +import { DataQueryError } from '@grafana/data'; import { FadeIn } from 'app/core/components/Animations/FadeIn'; import { getFirstQueryErrorWithoutRefId, getValueWithRefId } from 'app/core/utils/explore'; diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index 2eb7a04d339..cf62bf31fb2 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -9,7 +9,7 @@ import memoizeOne from 'memoize-one'; // Services & Utils import store from 'app/core/store'; // Components -import { ErrorBoundaryAlert, DataQuery, ExploreStartPageProps, DataSourceApi, PanelData } from '@grafana/ui'; +import { ErrorBoundaryAlert } from '@grafana/ui'; import LogsContainer from './LogsContainer'; import QueryRows from './QueryRows'; import TableContainer from './TableContainer'; @@ -25,7 +25,16 @@ import { toggleGraph, } from './state/actions'; // Types -import { RawTimeRange, GraphSeriesXY, TimeZone, AbsoluteTimeRange } from '@grafana/data'; +import { + DataQuery, + ExploreStartPageProps, + DataSourceApi, + PanelData, + RawTimeRange, + GraphSeriesXY, + TimeZone, + AbsoluteTimeRange, +} from '@grafana/data'; import { ExploreItemState, ExploreUrlState, diff --git a/public/app/features/explore/ExploreGraphPanel.tsx b/public/app/features/explore/ExploreGraphPanel.tsx index f3ebfd3e9d0..36393b52785 100644 --- a/public/app/features/explore/ExploreGraphPanel.tsx +++ b/public/app/features/explore/ExploreGraphPanel.tsx @@ -1,9 +1,8 @@ import React, { PureComponent } from 'react'; import { css, cx } from 'emotion'; -import { TimeZone, AbsoluteTimeRange, GraphSeriesXY, dateTimeForTimeZone } from '@grafana/data'; +import { GrafanaTheme, TimeZone, AbsoluteTimeRange, GraphSeriesXY, dateTimeForTimeZone } from '@grafana/data'; import { - GrafanaTheme, selectThemeVariant, Themeable, GraphWithLegend, diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx index 7f055600fe2..d029b904a1e 100644 --- a/public/app/features/explore/ExploreToolbar.tsx +++ b/public/app/features/explore/ExploreToolbar.tsx @@ -7,16 +7,8 @@ import classNames from 'classnames'; import { css } from 'emotion'; import { ExploreId, ExploreItemState, ExploreMode } from 'app/types/explore'; -import { - DataSourceSelectItem, - ToggleButtonGroup, - ToggleButton, - DataQuery, - Tooltip, - ButtonSelect, - SetInterval, -} from '@grafana/ui'; -import { RawTimeRange, TimeZone, TimeRange } from '@grafana/data'; +import { ToggleButtonGroup, ToggleButton, Tooltip, ButtonSelect, SetInterval } from '@grafana/ui'; +import { RawTimeRange, TimeZone, TimeRange, DataSourceSelectItem, DataQuery } from '@grafana/data'; import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker'; import { StoreState } from 'app/types/store'; import { diff --git a/public/app/features/explore/LiveLogs.tsx b/public/app/features/explore/LiveLogs.tsx index 078dd97c14e..7081b59759d 100644 --- a/public/app/features/explore/LiveLogs.tsx +++ b/public/app/features/explore/LiveLogs.tsx @@ -2,8 +2,8 @@ import React, { PureComponent } from 'react'; import { css, cx } from 'emotion'; import tinycolor from 'tinycolor2'; -import { Themeable, withTheme, GrafanaTheme, getLogRowStyles } from '@grafana/ui'; -import { LogsModel, LogRowModel, TimeZone } from '@grafana/data'; +import { Themeable, withTheme, getLogRowStyles } from '@grafana/ui'; +import { GrafanaTheme, LogsModel, LogRowModel, TimeZone } from '@grafana/data'; import ElapsedTime from './ElapsedTime'; diff --git a/public/app/features/explore/LiveTailButton.tsx b/public/app/features/explore/LiveTailButton.tsx index 5fd1d9bd692..9360d061050 100644 --- a/public/app/features/explore/LiveTailButton.tsx +++ b/public/app/features/explore/LiveTailButton.tsx @@ -6,7 +6,8 @@ import tinycolor from 'tinycolor2'; import { CSSTransition } from 'react-transition-group'; import { ResponsiveButton } from './ResponsiveButton'; -import { GrafanaTheme, useTheme, Tooltip } from '@grafana/ui'; +import { useTheme, Tooltip } from '@grafana/ui'; +import { GrafanaTheme } from '@grafana/data'; const getStyles = memoizeOne((theme: GrafanaTheme) => { const orangeLighter = tinycolor(theme.colors.orangeDark) diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx index 8d712654f6c..5aba50a1e8b 100644 --- a/public/app/features/explore/LogsContainer.tsx +++ b/public/app/features/explore/LogsContainer.tsx @@ -1,9 +1,10 @@ import React, { PureComponent } from 'react'; import { hot } from 'react-hot-loader'; import { connect } from 'react-redux'; -import { DataSourceApi, Collapse } from '@grafana/ui'; +import { Collapse } from '@grafana/ui'; import { + DataSourceApi, RawTimeRange, LogLevel, TimeZone, diff --git a/public/app/features/explore/QueryEditor.tsx b/public/app/features/explore/QueryEditor.tsx index 023222891d2..a0d7737e58b 100644 --- a/public/app/features/explore/QueryEditor.tsx +++ b/public/app/features/explore/QueryEditor.tsx @@ -7,7 +7,7 @@ import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv'; // Types import { Emitter } from 'app/core/utils/emitter'; -import { DataQuery } from '@grafana/ui'; +import { DataQuery } from '@grafana/data'; import { TimeRange } from '@grafana/data'; import 'app/features/plugins/plugin_loader'; import { dateTime } from '@grafana/data'; diff --git a/public/app/features/explore/QueryRow.tsx b/public/app/features/explore/QueryRow.tsx index 61bb0112e09..5b782ccdf71 100644 --- a/public/app/features/explore/QueryRow.tsx +++ b/public/app/features/explore/QueryRow.tsx @@ -12,8 +12,17 @@ import { QueryRowActions } from './QueryRowActions'; import { changeQuery, modifyQueries, runQueries, addQueryRow } from './state/actions'; // Types import { StoreState } from 'app/types'; -import { TimeRange, AbsoluteTimeRange, LoadingState } from '@grafana/data'; -import { DataQuery, DataSourceApi, QueryFixAction, PanelData, HistoryItem } from '@grafana/ui'; +import { + DataQuery, + DataSourceApi, + QueryFixAction, + PanelData, + HistoryItem, + TimeRange, + AbsoluteTimeRange, + LoadingState, +} from '@grafana/data'; + import { ExploreItemState, ExploreId, ExploreMode } from 'app/types/explore'; import { Emitter } from 'app/core/utils/emitter'; import { highlightLogsExpressionAction, removeQueryRowAction } from './state/actionTypes'; diff --git a/public/app/features/explore/QueryStatus.test.tsx b/public/app/features/explore/QueryStatus.test.tsx index e3e44f9ffca..ecfc962e0f0 100644 --- a/public/app/features/explore/QueryStatus.test.tsx +++ b/public/app/features/explore/QueryStatus.test.tsx @@ -1,8 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { LoadingState, TimeRange } from '@grafana/data'; -import { PanelData } from '@grafana/ui'; +import { LoadingState, TimeRange, PanelData } from '@grafana/data'; import QueryStatus from './QueryStatus'; diff --git a/public/app/features/explore/QueryStatus.tsx b/public/app/features/explore/QueryStatus.tsx index aabcec7ced8..1d88db8c1c5 100644 --- a/public/app/features/explore/QueryStatus.tsx +++ b/public/app/features/explore/QueryStatus.tsx @@ -1,8 +1,7 @@ import React, { PureComponent } from 'react'; import ElapsedTime from './ElapsedTime'; -import { LoadingState } from '@grafana/data'; -import { PanelData } from '@grafana/ui'; +import { PanelData, LoadingState } from '@grafana/data'; function formatLatency(value: number) { return `${(value / 1000).toFixed(1)}s`; diff --git a/public/app/features/explore/TimeSyncButton.tsx b/public/app/features/explore/TimeSyncButton.tsx index 85d5a98a331..6331e0715fd 100644 --- a/public/app/features/explore/TimeSyncButton.tsx +++ b/public/app/features/explore/TimeSyncButton.tsx @@ -2,10 +2,8 @@ import React from 'react'; import classNames from 'classnames'; import { css } from 'emotion'; -import { GrafanaTheme, useTheme, stylesFactory } from '@grafana/ui'; - -//Components -import { Tooltip } from '@grafana/ui'; +import { Tooltip, useTheme, stylesFactory } from '@grafana/ui'; +import { GrafanaTheme } from '@grafana/data'; const getStyles = stylesFactory((theme: GrafanaTheme) => { return { diff --git a/public/app/features/explore/state/actionTypes.ts b/public/app/features/explore/state/actionTypes.ts index 59c581acf29..e8ee9a7ef42 100644 --- a/public/app/features/explore/state/actionTypes.ts +++ b/public/app/features/explore/state/actionTypes.ts @@ -1,9 +1,19 @@ // Types import { Unsubscribable } from 'rxjs'; import { Emitter } from 'app/core/core'; -import { DataQuery, DataSourceSelectItem, DataSourceApi, QueryFixAction, PanelData, HistoryItem } from '@grafana/ui'; -import { LogLevel, TimeRange, LoadingState, AbsoluteTimeRange } from '@grafana/data'; +import { + DataQuery, + DataSourceSelectItem, + DataSourceApi, + QueryFixAction, + PanelData, + HistoryItem, + LogLevel, + TimeRange, + LoadingState, + AbsoluteTimeRange, +} from '@grafana/data'; import { ExploreId, ExploreItemState, ExploreUIState, ExploreMode } from 'app/types/explore'; import { actionCreatorFactory, ActionOf } from 'app/core/redux/actionCreatorFactory'; diff --git a/public/app/features/explore/state/actions.test.ts b/public/app/features/explore/state/actions.test.ts index 6b8771f5df5..d1625c513f3 100644 --- a/public/app/features/explore/state/actions.test.ts +++ b/public/app/features/explore/state/actions.test.ts @@ -12,8 +12,7 @@ import { import { Emitter } from 'app/core/core'; import { ActionOf } from 'app/core/redux/actionCreatorFactory'; import { makeInitialUpdateState } from './reducers'; -import { DataQuery } from '@grafana/ui/src/types/datasource'; -import { DefaultTimeZone, RawTimeRange, LogsDedupStrategy, toUtc } from '@grafana/data'; +import { DataQuery, DefaultTimeZone, RawTimeRange, LogsDedupStrategy, toUtc } from '@grafana/data'; jest.mock('app/features/plugins/datasource_srv', () => ({ getDatasourceSrv: () => ({ diff --git a/public/app/features/explore/state/actions.ts b/public/app/features/explore/state/actions.ts index 3de226e7c6a..49b07b9f9c0 100644 --- a/public/app/features/explore/state/actions.ts +++ b/public/app/features/explore/state/actions.ts @@ -22,9 +22,14 @@ import { } from 'app/core/utils/explore'; // Types import { ThunkResult, ExploreUrlState, ExploreItemState } from 'app/types'; -import { DataSourceApi, DataQuery, DataSourceSelectItem, QueryFixAction, PanelData, RefreshPicker } from '@grafana/ui'; +import { RefreshPicker } from '@grafana/ui'; import { + DataSourceApi, + DataQuery, + DataSourceSelectItem, + QueryFixAction, + PanelData, RawTimeRange, LogsDedupStrategy, AbsoluteTimeRange, diff --git a/public/app/features/explore/state/reducers.test.ts b/public/app/features/explore/state/reducers.test.ts index 7ab3f3d5dff..0f8f9e58f46 100644 --- a/public/app/features/explore/state/reducers.test.ts +++ b/public/app/features/explore/state/reducers.test.ts @@ -25,8 +25,7 @@ import { ActionOf } from 'app/core/redux/actionCreatorFactory'; import { updateLocation } from 'app/core/actions/location'; import { serializeStateToUrlParam } from 'app/core/utils/explore'; import TableModel from 'app/core/table_model'; -import { DataSourceApi, DataQuery } from '@grafana/ui'; -import { LogsDedupStrategy, dateTime, LoadingState } from '@grafana/data'; +import { DataSourceApi, DataQuery, LogsDedupStrategy, dateTime, LoadingState } from '@grafana/data'; describe('Explore item reducer', () => { describe('scanning', () => { diff --git a/public/app/features/explore/state/reducers.ts b/public/app/features/explore/state/reducers.ts index bea72733ea1..3a6c494efe3 100644 --- a/public/app/features/explore/state/reducers.ts +++ b/public/app/features/explore/state/reducers.ts @@ -10,8 +10,17 @@ import { refreshIntervalToSortOrder, } from 'app/core/utils/explore'; import { ExploreItemState, ExploreState, ExploreId, ExploreUpdateState, ExploreMode } from 'app/types/explore'; -import { LoadingState, toLegacyResponseData, DefaultTimeRange } from '@grafana/data'; -import { DataQuery, DataSourceApi, PanelData, DataQueryRequest, RefreshPicker, PanelEvents } from '@grafana/ui'; +import { + LoadingState, + toLegacyResponseData, + DefaultTimeRange, + DataQuery, + DataSourceApi, + PanelData, + DataQueryRequest, + PanelEvents, +} from '@grafana/data'; +import { RefreshPicker } from '@grafana/ui'; import { HigherOrderAction, ActionTypes, diff --git a/public/app/features/expressions/ExpressionDatasource.ts b/public/app/features/expressions/ExpressionDatasource.ts index 86870e7b17b..99632b762d4 100644 --- a/public/app/features/expressions/ExpressionDatasource.ts +++ b/public/app/features/expressions/ExpressionDatasource.ts @@ -4,7 +4,7 @@ import { DataQueryResponse, DataSourceInstanceSettings, DataSourcePluginMeta, -} from '@grafana/ui'; +} from '@grafana/data'; import { ExpressionQuery, GELQueryType } from './types'; import { ExpressionQueryEditor } from './ExpressionQueryEditor'; import { Observable, from } from 'rxjs'; diff --git a/public/app/features/expressions/ExpressionQueryEditor.tsx b/public/app/features/expressions/ExpressionQueryEditor.tsx index fb4f8c7064e..0799c4edc22 100644 --- a/public/app/features/expressions/ExpressionQueryEditor.tsx +++ b/public/app/features/expressions/ExpressionQueryEditor.tsx @@ -1,8 +1,8 @@ // Libraries import React, { PureComponent, ChangeEvent } from 'react'; -import { FormLabel, QueryEditorProps, Select, FormField } from '@grafana/ui'; -import { SelectableValue, ReducerID } from '@grafana/data'; +import { FormLabel, Select, FormField } from '@grafana/ui'; +import { SelectableValue, ReducerID, QueryEditorProps } from '@grafana/data'; // Types import { ExpressionQuery, GELQueryType } from './types'; diff --git a/public/app/features/expressions/types.ts b/public/app/features/expressions/types.ts index a233e242961..172c608c19e 100644 --- a/public/app/features/expressions/types.ts +++ b/public/app/features/expressions/types.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/ui'; +import { DataQuery } from '@grafana/data'; export enum GELQueryType { math = 'math', diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts index 9c0a7640cf5..75d9e17f478 100644 --- a/public/app/features/panel/metrics_panel_ctrl.ts +++ b/public/app/features/panel/metrics_panel_ctrl.ts @@ -6,9 +6,18 @@ import { PanelCtrl } from 'app/features/panel/panel_ctrl'; import { getExploreUrl } from 'app/core/utils/explore'; import { applyPanelTimeOverrides, getResolution } from 'app/features/dashboard/utils/panel'; import { ContextSrv } from 'app/core/services/context_srv'; -import { toLegacyResponseData, toDataFrameDTO, TimeRange, LoadingState, DataFrame } from '@grafana/data'; - -import { LegacyResponseData, DataSourceApi, PanelData, DataQueryResponse, PanelEvents } from '@grafana/ui'; +import { + toLegacyResponseData, + toDataFrameDTO, + TimeRange, + LoadingState, + DataFrame, + LegacyResponseData, + DataSourceApi, + PanelData, + DataQueryResponse, + PanelEvents, +} from '@grafana/data'; import { Unsubscribable } from 'rxjs'; import { PanelModel } from 'app/features/dashboard/state'; import { CoreEvents } from 'app/types'; diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts index 68545c93d90..4499805e08d 100644 --- a/public/app/features/panel/panel_ctrl.ts +++ b/public/app/features/panel/panel_ctrl.ts @@ -1,6 +1,5 @@ import _ from 'lodash'; import { sanitize, escapeHtml } from 'app/core/utils/text'; -import { renderMarkdown, AppEvent } from '@grafana/data'; import config from 'app/core/config'; import { profiler } from 'app/core/core'; @@ -17,9 +16,8 @@ import { import { GRID_COLUMN_COUNT } from 'app/core/constants'; import { auto } from 'angular'; import { TemplateSrv } from '../templating/template_srv'; -import { PanelPluginMeta } from '@grafana/ui/src/types/panel'; import { getPanelLinksSupplier } from './panellinks/linkSuppliers'; -import { PanelEvents } from '@grafana/ui'; +import { renderMarkdown, AppEvent, PanelEvents, PanelPluginMeta } from '@grafana/data'; export class PanelCtrl { panel: any; diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts index ef6594a255d..c5bb50b7054 100644 --- a/public/app/features/panel/panel_directive.ts +++ b/public/app/features/panel/panel_directive.ts @@ -4,7 +4,7 @@ import $ from 'jquery'; import Drop from 'tether-drop'; // @ts-ignore import baron from 'baron'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; const module = angular.module('grafana.directives'); diff --git a/public/app/features/panel/panel_header.ts b/public/app/features/panel/panel_header.ts index e68ebd8a572..86a08b92dd1 100644 --- a/public/app/features/panel/panel_header.ts +++ b/public/app/features/panel/panel_header.ts @@ -1,5 +1,5 @@ import { coreModule } from 'app/core/core'; -import { AngularPanelMenuItem } from '@grafana/ui'; +import { AngularPanelMenuItem } from '@grafana/data'; const template = ` diff --git a/public/app/features/panel/panellinks/linkSuppliers.ts b/public/app/features/panel/panellinks/linkSuppliers.ts index fa0fa60fe53..6c0392a394e 100644 --- a/public/app/features/panel/panellinks/linkSuppliers.ts +++ b/public/app/features/panel/panellinks/linkSuppliers.ts @@ -1,5 +1,5 @@ import { PanelModel } from 'app/features/dashboard/state/PanelModel'; -import { FieldDisplay } from '@grafana/ui'; +import { FieldDisplay } from '@grafana/data'; import { LinkModelSupplier, getTimeField, Labels, ScopedVars, ScopedVar } from '@grafana/data'; import { getLinkSrv } from './link_srv'; diff --git a/public/app/features/plugins/AppRootPage.tsx b/public/app/features/plugins/AppRootPage.tsx index 9702dab99b0..1b3c9121741 100644 --- a/public/app/features/plugins/AppRootPage.tsx +++ b/public/app/features/plugins/AppRootPage.tsx @@ -10,8 +10,7 @@ import { UrlQueryMap } from '@grafana/runtime'; import Page from 'app/core/components/Page/Page'; import { getPluginSettings } from './PluginSettingsCache'; import { importAppPlugin } from './plugin_loader'; -import { AppPlugin, AppPluginMeta, PluginType } from '@grafana/ui'; -import { NavModel, AppEvents } from '@grafana/data'; +import { AppPlugin, AppPluginMeta, PluginType, NavModel, AppEvents } from '@grafana/data'; import { getLoadingNav } from './PluginPage'; import { getNotFoundNav, getWarningNav } from 'app/core/nav_model_srv'; import { appEvents } from 'app/core/core'; diff --git a/public/app/features/plugins/PluginDashboards.tsx b/public/app/features/plugins/PluginDashboards.tsx index 84a110b1ce8..ab9e6b8d7ce 100644 --- a/public/app/features/plugins/PluginDashboards.tsx +++ b/public/app/features/plugins/PluginDashboards.tsx @@ -2,12 +2,11 @@ import React, { PureComponent } from 'react'; import extend from 'lodash/extend'; -import { PluginMeta, DataSourceApi } from '@grafana/ui'; import { PluginDashboard } from 'app/types'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { appEvents } from 'app/core/core'; import DashboardsTable from 'app/features/datasources/DashboardsTable'; -import { AppEvents } from '@grafana/data'; +import { AppEvents, PluginMeta, DataSourceApi } from '@grafana/data'; interface Props { plugin: PluginMeta; diff --git a/public/app/features/plugins/PluginList.tsx b/public/app/features/plugins/PluginList.tsx index eb630b34a72..44150d13722 100644 --- a/public/app/features/plugins/PluginList.tsx +++ b/public/app/features/plugins/PluginList.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import classNames from 'classnames'; import PluginListItem from './PluginListItem'; -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; import { LayoutMode, LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector'; interface Props { diff --git a/public/app/features/plugins/PluginListItem.tsx b/public/app/features/plugins/PluginListItem.tsx index f0438109b7f..684baa83e4c 100644 --- a/public/app/features/plugins/PluginListItem.tsx +++ b/public/app/features/plugins/PluginListItem.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; interface Props { plugin: PluginMeta; diff --git a/public/app/features/plugins/PluginListPage.test.tsx b/public/app/features/plugins/PluginListPage.test.tsx index bc1fc955af9..549fcb85533 100644 --- a/public/app/features/plugins/PluginListPage.test.tsx +++ b/public/app/features/plugins/PluginListPage.test.tsx @@ -3,7 +3,7 @@ import { shallow } from 'enzyme'; import { PluginListPage, Props } from './PluginListPage'; import { LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector'; import { NavModel } from '@grafana/data'; -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; const setup = (propOverrides?: object) => { const props: Props = { diff --git a/public/app/features/plugins/PluginListPage.tsx b/public/app/features/plugins/PluginListPage.tsx index bd7e9dda83e..7690d24ce16 100644 --- a/public/app/features/plugins/PluginListPage.tsx +++ b/public/app/features/plugins/PluginListPage.tsx @@ -9,7 +9,7 @@ import { getNavModel } from 'app/core/selectors/navModel'; import { getLayoutMode, getPlugins, getPluginsSearchQuery } from './state/selectors'; import { LayoutMode } from 'app/core/components/LayoutSelector/LayoutSelector'; import { NavModel } from '@grafana/data'; -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; import { StoreState } from 'app/types'; export interface Props { diff --git a/public/app/features/plugins/PluginPage.tsx b/public/app/features/plugins/PluginPage.tsx index c7a938db41f..2713ebe686f 100644 --- a/public/app/features/plugins/PluginPage.tsx +++ b/public/app/features/plugins/PluginPage.tsx @@ -6,8 +6,8 @@ import find from 'lodash/find'; // Types import { UrlQueryMap } from '@grafana/runtime'; import { StoreState, AppNotificationSeverity, CoreEvents } from 'app/types'; +import { Alert, Tooltip } from '@grafana/ui'; import { - Alert, AppPlugin, GrafanaPlugin, PluginDependencies, @@ -16,9 +16,9 @@ import { PluginMeta, PluginMetaInfo, PluginType, - Tooltip, -} from '@grafana/ui'; -import { NavModel, NavModelItem } from '@grafana/data'; + NavModel, + NavModelItem, +} from '@grafana/data'; import Page from 'app/core/components/Page/Page'; import { getPluginSettings } from './PluginSettingsCache'; diff --git a/public/app/features/plugins/PluginSettingsCache.ts b/public/app/features/plugins/PluginSettingsCache.ts index 4aea42f499d..b3a295bbda8 100644 --- a/public/app/features/plugins/PluginSettingsCache.ts +++ b/public/app/features/plugins/PluginSettingsCache.ts @@ -1,5 +1,5 @@ import { getBackendSrv } from 'app/core/services/backend_srv'; -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; type PluginCache = { [key: string]: PluginMeta; diff --git a/public/app/features/plugins/PluginStateInfo.tsx b/public/app/features/plugins/PluginStateInfo.tsx index afa2dc56c93..7d48ba84aed 100644 --- a/public/app/features/plugins/PluginStateInfo.tsx +++ b/public/app/features/plugins/PluginStateInfo.tsx @@ -1,5 +1,6 @@ import React, { FC } from 'react'; -import { PluginState, AlphaNotice } from '@grafana/ui'; +import { AlphaNotice } from '@grafana/ui'; +import { PluginState } from '@grafana/data'; import { css } from 'emotion'; interface Props { diff --git a/public/app/features/plugins/__mocks__/pluginMocks.ts b/public/app/features/plugins/__mocks__/pluginMocks.ts index a3d477c47a8..a0517eec91b 100644 --- a/public/app/features/plugins/__mocks__/pluginMocks.ts +++ b/public/app/features/plugins/__mocks__/pluginMocks.ts @@ -1,4 +1,4 @@ -import { PanelPluginMeta, PluginMeta, PluginType, PanelPlugin, PanelProps } from '@grafana/ui'; +import { PanelPluginMeta, PluginMeta, PluginType, PanelPlugin, PanelProps } from '@grafana/data'; import { ComponentType } from 'enzyme'; export const getMockPlugins = (amount: number): PluginMeta[] => { diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts index 78feb49a351..8fe8edeb131 100644 --- a/public/app/features/plugins/datasource_srv.ts +++ b/public/app/features/plugins/datasource_srv.ts @@ -8,8 +8,7 @@ import { importDataSourcePlugin } from './plugin_loader'; import { DataSourceSrv as DataSourceService, getDataSourceSrv as getDataSourceService } from '@grafana/runtime'; // Types -import { DataSourceApi, DataSourceSelectItem } from '@grafana/ui'; -import { ScopedVars, AppEvents } from '@grafana/data'; +import { DataSourceApi, DataSourceSelectItem, ScopedVars, AppEvents } from '@grafana/data'; import { auto } from 'angular'; import { TemplateSrv } from '../templating/template_srv'; import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; diff --git a/public/app/features/plugins/plugin_component.ts b/public/app/features/plugins/plugin_component.ts index 4e008e343ef..a7bc0670d19 100644 --- a/public/app/features/plugins/plugin_component.ts +++ b/public/app/features/plugins/plugin_component.ts @@ -4,7 +4,7 @@ import _ from 'lodash'; import config from 'app/core/config'; import coreModule from 'app/core/core_module'; -import { DataSourceApi } from '@grafana/ui'; +import { DataSourceApi } from '@grafana/data'; import { importPanelPlugin, importDataSourcePlugin, importAppPlugin } from './plugin_loader'; import DatasourceSrv from './datasource_srv'; import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; diff --git a/public/app/features/plugins/plugin_loader.test.ts b/public/app/features/plugins/plugin_loader.test.ts index e2abb5a5cb0..809a2f179b2 100644 --- a/public/app/features/plugins/plugin_loader.test.ts +++ b/public/app/features/plugins/plugin_loader.test.ts @@ -14,7 +14,7 @@ jest.mock('app/core/core', () => { }); import { SystemJS } from '@grafana/runtime'; -import { AppPluginMeta, PluginMetaInfo, PluginType, PluginIncludeType, AppPlugin } from '@grafana/ui'; +import { AppPluginMeta, PluginMetaInfo, PluginType, PluginIncludeType, AppPlugin } from '@grafana/data'; import { importAppPlugin } from './plugin_loader'; class MyCustomApp extends AppPlugin { diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts index a42689c7308..41ccbc3e3c0 100644 --- a/public/app/features/plugins/plugin_loader.ts +++ b/public/app/features/plugins/plugin_loader.ts @@ -22,8 +22,7 @@ import config from 'app/core/config'; import TimeSeries from 'app/core/time_series2'; import TableModel from 'app/core/table_model'; import { coreModule, appEvents, contextSrv } from 'app/core/core'; -import { DataSourcePlugin, AppPlugin, PanelPlugin, PluginMeta, DataSourcePluginMeta } from '@grafana/ui'; -import { dateMath } from '@grafana/data'; +import { DataSourcePlugin, AppPlugin, PanelPlugin, PluginMeta, DataSourcePluginMeta, dateMath } from '@grafana/data'; import * as fileExport from 'app/core/utils/file_export'; import * as flatten from 'app/core/utils/flatten'; import * as ticks from 'app/core/utils/ticks'; diff --git a/public/app/features/plugins/plugin_page_ctrl.ts b/public/app/features/plugins/plugin_page_ctrl.ts index 83d0b221b19..b7b8a19cbd7 100644 --- a/public/app/features/plugins/plugin_page_ctrl.ts +++ b/public/app/features/plugins/plugin_page_ctrl.ts @@ -2,7 +2,7 @@ import angular, { IQService } from 'angular'; import _ from 'lodash'; import { getPluginSettings } from './PluginSettingsCache'; -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; import { NavModelSrv } from 'app/core/core'; import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; import { AppEvents } from '@grafana/data'; diff --git a/public/app/features/plugins/specs/datasource_srv.test.ts b/public/app/features/plugins/specs/datasource_srv.test.ts index 46b469a93a5..d2e4435f7ae 100644 --- a/public/app/features/plugins/specs/datasource_srv.test.ts +++ b/public/app/features/plugins/specs/datasource_srv.test.ts @@ -1,7 +1,7 @@ import config from 'app/core/config'; import 'app/features/plugins/datasource_srv'; import { DatasourceSrv } from 'app/features/plugins/datasource_srv'; -import { PluginMeta, DataSourcePluginMeta } from '@grafana/ui'; +import { PluginMeta, DataSourcePluginMeta } from '@grafana/data'; // Datasource variable $datasource with current value 'BBB' const templateSrv: any = { diff --git a/public/app/features/plugins/state/actions.ts b/public/app/features/plugins/state/actions.ts index da0e1471763..f51ee7c1c3a 100644 --- a/public/app/features/plugins/state/actions.ts +++ b/public/app/features/plugins/state/actions.ts @@ -3,7 +3,7 @@ import { ThunkAction } from 'redux-thunk'; import { getBackendSrv } from '@grafana/runtime'; import { LayoutMode } from '../../../core/components/LayoutSelector/LayoutSelector'; import { PluginDashboard } from '../../../types/plugins'; -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; export enum ActionTypes { LoadPlugins = 'LOAD_PLUGINS', diff --git a/public/app/features/plugins/state/reducers.ts b/public/app/features/plugins/state/reducers.ts index 054b32f636d..9527950c040 100644 --- a/public/app/features/plugins/state/reducers.ts +++ b/public/app/features/plugins/state/reducers.ts @@ -2,7 +2,7 @@ import { Action, ActionTypes } from './actions'; import { PluginsState } from 'app/types'; import { LayoutModes } from '../../../core/components/LayoutSelector/LayoutSelector'; import { PluginDashboard } from '../../../types/plugins'; -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; export const initialState: PluginsState = { plugins: [] as PluginMeta[], diff --git a/public/app/features/plugins/variableQueryEditorLoader.tsx b/public/app/features/plugins/variableQueryEditorLoader.tsx index f231198a72c..51d4bcca22d 100644 --- a/public/app/features/plugins/variableQueryEditorLoader.tsx +++ b/public/app/features/plugins/variableQueryEditorLoader.tsx @@ -3,7 +3,7 @@ import { importDataSourcePlugin } from './plugin_loader'; import React from 'react'; import ReactDOM from 'react-dom'; import DefaultVariableQueryEditor from '../templating/DefaultVariableQueryEditor'; -import { DataSourcePluginMeta } from '@grafana/ui'; +import { DataSourcePluginMeta } from '@grafana/data'; import { TemplateSrv } from '../templating/template_srv'; async function loadComponent(meta: DataSourcePluginMeta) { diff --git a/public/app/features/plugins/wrappers/AppConfigWrapper.tsx b/public/app/features/plugins/wrappers/AppConfigWrapper.tsx index 8fec25f5f21..67ecf02b33b 100644 --- a/public/app/features/plugins/wrappers/AppConfigWrapper.tsx +++ b/public/app/features/plugins/wrappers/AppConfigWrapper.tsx @@ -3,8 +3,8 @@ import React, { PureComponent } from 'react'; import cloneDeep from 'lodash/cloneDeep'; import extend from 'lodash/extend'; -import { PluginMeta, AppPlugin, Button } from '@grafana/ui'; -import { deprecationWarning } from '@grafana/data'; +import { Button } from '@grafana/ui'; +import { PluginMeta, AppPlugin, deprecationWarning } from '@grafana/data'; import { AngularComponent, getAngularLoader } from '@grafana/runtime'; import { getBackendSrv } from 'app/core/services/backend_srv'; diff --git a/public/app/plugins/app/example-app/ExampleRootPage.tsx b/public/app/plugins/app/example-app/ExampleRootPage.tsx index 070c61f5189..d884731730a 100644 --- a/public/app/plugins/app/example-app/ExampleRootPage.tsx +++ b/public/app/plugins/app/example-app/ExampleRootPage.tsx @@ -2,8 +2,7 @@ import React, { PureComponent } from 'react'; // Types -import { NavModelItem } from '@grafana/data'; -import { AppRootProps } from '@grafana/ui'; +import { NavModelItem, AppRootProps } from '@grafana/data'; interface Props extends AppRootProps {} diff --git a/public/app/plugins/app/example-app/config/ExamplePage1.tsx b/public/app/plugins/app/example-app/config/ExamplePage1.tsx index c25eee35e53..6674b19f3e1 100644 --- a/public/app/plugins/app/example-app/config/ExamplePage1.tsx +++ b/public/app/plugins/app/example-app/config/ExamplePage1.tsx @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; // Types -import { PluginConfigPageProps, AppPlugin } from '@grafana/ui'; +import { PluginConfigPageProps, AppPlugin } from '@grafana/data'; interface Props extends PluginConfigPageProps {} diff --git a/public/app/plugins/app/example-app/config/ExamplePage2.tsx b/public/app/plugins/app/example-app/config/ExamplePage2.tsx index 596bb88e9ba..70e51c66cc3 100644 --- a/public/app/plugins/app/example-app/config/ExamplePage2.tsx +++ b/public/app/plugins/app/example-app/config/ExamplePage2.tsx @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; // Types -import { PluginConfigPageProps, AppPlugin } from '@grafana/ui'; +import { PluginConfigPageProps, AppPlugin } from '@grafana/data'; interface Props extends PluginConfigPageProps {} diff --git a/public/app/plugins/app/example-app/legacy/config.ts b/public/app/plugins/app/example-app/legacy/config.ts index 3892d61c14c..3d7c1618fbe 100644 --- a/public/app/plugins/app/example-app/legacy/config.ts +++ b/public/app/plugins/app/example-app/legacy/config.ts @@ -1,4 +1,4 @@ -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; export class ExampleConfigCtrl { static templateUrl = 'legacy/config.html'; diff --git a/public/app/plugins/app/example-app/module.ts b/public/app/plugins/app/example-app/module.ts index 8b7ea7b42f4..ff7cf9112b6 100644 --- a/public/app/plugins/app/example-app/module.ts +++ b/public/app/plugins/app/example-app/module.ts @@ -1,7 +1,7 @@ // Angular pages import { ExampleConfigCtrl } from './legacy/config'; import { AngularExamplePageCtrl } from './legacy/angular_example_page'; -import { AppPlugin } from '@grafana/ui'; +import { AppPlugin } from '@grafana/data'; import { ExamplePage1 } from './config/ExamplePage1'; import { ExamplePage2 } from './config/ExamplePage2'; import { ExampleRootPage } from './ExampleRootPage'; diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts index 83628fd7967..dd7428e20e5 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.ts +++ b/public/app/plugins/datasource/cloudwatch/datasource.ts @@ -1,9 +1,16 @@ import angular, { IQService } from 'angular'; import _ from 'lodash'; -import { dateMath, ScopedVars, toDataFrame, TimeRange } from '@grafana/data'; +import { + dateMath, + ScopedVars, + toDataFrame, + TimeRange, + DataSourceApi, + DataQueryRequest, + DataSourceInstanceSettings, +} from '@grafana/data'; import kbn from 'app/core/utils/kbn'; import { CloudWatchQuery } from './types'; -import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings } from '@grafana/ui'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts index 78df1db18f2..1a7ffa6cacc 100644 --- a/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts +++ b/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts @@ -5,7 +5,7 @@ import { TemplateSrv } from 'app/features/templating/template_srv'; import { CustomVariable } from 'app/features/templating/all'; import _ from 'lodash'; import { CloudWatchQuery } from '../types'; -import { DataSourceInstanceSettings } from '@grafana/ui'; +import { DataSourceInstanceSettings } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/plugins/datasource/cloudwatch/types.ts b/public/app/plugins/datasource/cloudwatch/types.ts index 7547d0d4215..c18cbd528bb 100644 --- a/public/app/plugins/datasource/cloudwatch/types.ts +++ b/public/app/plugins/datasource/cloudwatch/types.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/ui'; +import { DataQuery } from '@grafana/data'; export interface CloudWatchQuery extends DataQuery { id: string; diff --git a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx index 64681156ca5..6edfbea75ba 100644 --- a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx +++ b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx @@ -2,8 +2,8 @@ import React, { PureComponent } from 'react'; // Types -import { Select, DataQuery, DataQueryError, PanelData } from '@grafana/ui'; -import { DataFrame, SelectableValue } from '@grafana/data'; +import { Select } from '@grafana/ui'; +import { DataQuery, DataQueryError, PanelData, DataFrame, SelectableValue } from '@grafana/data'; import { DashboardQuery } from './types'; import config from 'app/core/config'; import { css } from 'emotion'; diff --git a/public/app/plugins/datasource/dashboard/datasource.ts b/public/app/plugins/datasource/dashboard/datasource.ts index c4aee63ffa1..0f7f8d8d3f3 100644 --- a/public/app/plugins/datasource/dashboard/datasource.ts +++ b/public/app/plugins/datasource/dashboard/datasource.ts @@ -1,4 +1,4 @@ -import { DataSourceApi, DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings } from '@grafana/ui'; +import { DataSourceApi, DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings } from '@grafana/data'; import { DashboardQuery } from './types'; /** diff --git a/public/app/plugins/datasource/dashboard/module.ts b/public/app/plugins/datasource/dashboard/module.ts index da529a23466..ac32bca87e3 100644 --- a/public/app/plugins/datasource/dashboard/module.ts +++ b/public/app/plugins/datasource/dashboard/module.ts @@ -1,4 +1,4 @@ import { DashboardDatasource } from './datasource'; -import { DataSourcePlugin } from '@grafana/ui'; +import { DataSourcePlugin } from '@grafana/data'; export const plugin = new DataSourcePlugin(DashboardDatasource); diff --git a/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts b/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts index 2a3e17fb87f..3fd99ce97da 100644 --- a/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts +++ b/public/app/plugins/datasource/dashboard/runSharedRequest.test.ts @@ -1,5 +1,5 @@ import { isSharedDashboardQuery } from './runSharedRequest'; -import { DataSourceApi } from '@grafana/ui'; +import { DataSourceApi } from '@grafana/data'; describe('SharedQueryRunner', () => { it('should identify shared queries', () => { diff --git a/public/app/plugins/datasource/dashboard/runSharedRequest.ts b/public/app/plugins/datasource/dashboard/runSharedRequest.ts index 0941d85bc67..d63b2600c55 100644 --- a/public/app/plugins/datasource/dashboard/runSharedRequest.ts +++ b/public/app/plugins/datasource/dashboard/runSharedRequest.ts @@ -1,9 +1,8 @@ import { Observable } from 'rxjs'; -import { DataQuery, PanelData, DataSourceApi } from '@grafana/ui'; import { QueryRunnerOptions } from 'app/features/dashboard/state/PanelQueryRunner'; import { DashboardQuery, SHARED_DASHBODARD_QUERY } from './types'; import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv'; -import { LoadingState, DefaultTimeRange } from '@grafana/data'; +import { LoadingState, DefaultTimeRange, DataQuery, PanelData, DataSourceApi } from '@grafana/data'; export function isSharedDashboardQuery(datasource: string | DataSourceApi) { if (!datasource) { diff --git a/public/app/plugins/datasource/dashboard/types.ts b/public/app/plugins/datasource/dashboard/types.ts index c9c55805339..dfb3aee6682 100644 --- a/public/app/plugins/datasource/dashboard/types.ts +++ b/public/app/plugins/datasource/dashboard/types.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/ui/src/types'; +import { DataQuery } from '@grafana/data'; export const SHARED_DASHBODARD_QUERY = '-- Dashboard --'; diff --git a/public/app/plugins/datasource/elasticsearch/components/ElasticsearchQueryField.tsx b/public/app/plugins/datasource/elasticsearch/components/ElasticsearchQueryField.tsx index 473b12130ce..bf1c553b07e 100644 --- a/public/app/plugins/datasource/elasticsearch/components/ElasticsearchQueryField.tsx +++ b/public/app/plugins/datasource/elasticsearch/components/ElasticsearchQueryField.tsx @@ -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'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx index cac7d42f6ea..a8822bb4383 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx @@ -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'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx index 1c3852dfa32..043ec15c2e1 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx @@ -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' }, diff --git a/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts b/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts index c52a749f5a7..ea7b451b061 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts +++ b/public/app/plugins/datasource/elasticsearch/configuration/mocks.ts @@ -1,4 +1,4 @@ -import { DataSourceSettings } from '@grafana/ui'; +import { DataSourceSettings } from '@grafana/data'; import { ElasticsearchOptions } from '../types'; import { createDatasourceSettings } from '../../../../features/datasources/mocks'; diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts index bc1fd4fdaee..54d637a4f28 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.ts +++ b/public/app/plugins/datasource/elasticsearch/datasource.ts @@ -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'; diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.ts b/public/app/plugins/datasource/elasticsearch/elastic_response.ts index 923d41c4cb6..32b69c32a56 100644 --- a/public/app/plugins/datasource/elasticsearch/elastic_response.ts +++ b/public/app/plugins/datasource/elasticsearch/elastic_response.ts @@ -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 { diff --git a/public/app/plugins/datasource/elasticsearch/module.ts b/public/app/plugins/datasource/elasticsearch/module.ts index b8ef8048087..2e8c7452a9b 100644 --- a/public/app/plugins/datasource/elasticsearch/module.ts +++ b/public/app/plugins/datasource/elasticsearch/module.ts @@ -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'; diff --git a/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts b/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts index 0345875944d..70941ec4620 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/datasource.test.ts @@ -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) { diff --git a/public/app/plugins/datasource/elasticsearch/types.ts b/public/app/plugins/datasource/elasticsearch/types.ts index ef88a8512fd..7e3ea49b4cc 100644 --- a/public/app/plugins/datasource/elasticsearch/types.ts +++ b/public/app/plugins/datasource/elasticsearch/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui'; +import { DataQuery, DataSourceJsonData } from '@grafana/data'; export interface ElasticsearchOptions extends DataSourceJsonData { timeField: string; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/ConfigEditor.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/ConfigEditor.tsx index d11ab3d1c3a..88016952e01 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/ConfigEditor.tsx +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/ConfigEditor.tsx @@ -1,6 +1,5 @@ import React, { PureComponent } from 'react'; -import { SelectableValue } from '@grafana/data'; -import { DataSourcePluginOptionsEditorProps } from '@grafana/ui'; +import { SelectableValue, DataSourcePluginOptionsEditorProps } from '@grafana/data'; import { MonitorConfig } from './components/MonitorConfig'; import { AnalyticsConfig } from './components/AnalyticsConfig'; import { TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.ts index 740ff1b174d..b61ab0efacb 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.ts @@ -1,5 +1,5 @@ import { TimeSeries, toDataFrame } from '@grafana/data'; -import { DataQueryRequest, DataQueryResponseData, DataSourceInstanceSettings } from '@grafana/ui'; +import { DataQueryRequest, DataQueryResponseData, DataSourceInstanceSettings } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; import _ from 'lodash'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts index 7583fd350a1..d5dd3f0ca21 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import LogAnalyticsQuerystringBuilder from '../log_analytics/querystring_builder'; import ResponseParser from './response_parser'; import { AzureMonitorQuery, AzureDataSourceJsonData } from '../types'; -import { DataQueryRequest, DataSourceInstanceSettings } from '@grafana/ui'; +import { DataQueryRequest, DataSourceInstanceSettings } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts index a1317680159..2d4ed4f1395 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts @@ -9,7 +9,7 @@ import { AzureMonitorMetricDefinitionsResponse, AzureMonitorResourceGroupsResponse, } from '../types'; -import { DataQueryRequest, DataQueryResponseData, DataSourceInstanceSettings } from '@grafana/ui'; +import { DataQueryRequest, DataQueryResponseData, DataSourceInstanceSettings } from '@grafana/data'; import { TimeSeries, toDataFrame } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts index aad04a6e030..a6fae69185c 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts @@ -3,7 +3,7 @@ import AzureMonitorDatasource from './azure_monitor/azure_monitor_datasource'; import AppInsightsDatasource from './app_insights/app_insights_datasource'; import AzureLogAnalyticsDatasource from './azure_log_analytics/azure_log_analytics_datasource'; import { AzureMonitorQuery, AzureDataSourceJsonData } from './types'; -import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings } from '@grafana/ui'; +import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { IQService } from 'angular'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/module.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/module.tsx index fec3c5f6760..44e60e97e4d 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/module.tsx +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/module.tsx @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/ui'; +import { DataSourcePlugin } from '@grafana/data'; import { AzureMonitorQueryCtrl } from './query_ctrl'; import Datasource from './datasource'; import { ConfigEditor } from './ConfigEditor'; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts index 0b9fd39b2b2..02b2f1788c6 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts @@ -8,7 +8,7 @@ import kbn from 'app/core/utils/kbn'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { auto, IPromise } from 'angular'; import { DataFrame } from '@grafana/data'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; export interface ResultFormat { text: string; diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts index b32ed8f7305..f6d0961d641 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui'; +import { DataQuery, DataSourceJsonData } from '@grafana/data'; export interface AzureMonitorQuery extends DataQuery { refId: string; diff --git a/public/app/plugins/datasource/graphite/gfunc.ts b/public/app/plugins/datasource/graphite/gfunc.ts index b1b23f03e24..ac854009033 100644 --- a/public/app/plugins/datasource/graphite/gfunc.ts +++ b/public/app/plugins/datasource/graphite/gfunc.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import { isVersionGtOrEq } from 'app/core/utils/version'; -import { InterpolateFunction } from '@grafana/ui'; +import { InterpolateFunction } from '@grafana/data'; const index: any = {}; diff --git a/public/app/plugins/datasource/graphite/types.ts b/public/app/plugins/datasource/graphite/types.ts index 5620c1f8e5a..930205a96d4 100644 --- a/public/app/plugins/datasource/graphite/types.ts +++ b/public/app/plugins/datasource/graphite/types.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/ui'; +import { DataQuery } from '@grafana/data'; export interface GraphiteQuery extends DataQuery { target?: string; diff --git a/public/app/plugins/datasource/influxdb/components/InfluxLogsQueryField.tsx b/public/app/plugins/datasource/influxdb/components/InfluxLogsQueryField.tsx index a6adf99afd1..dde33828bbb 100644 --- a/public/app/plugins/datasource/influxdb/components/InfluxLogsQueryField.tsx +++ b/public/app/plugins/datasource/influxdb/components/InfluxLogsQueryField.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ExploreQueryFieldProps } from '@grafana/ui'; +import { ExploreQueryFieldProps } from '@grafana/data'; // @ts-ignore import Cascader from 'rc-cascader'; diff --git a/public/app/plugins/datasource/influxdb/components/InfluxStartPage.tsx b/public/app/plugins/datasource/influxdb/components/InfluxStartPage.tsx index 7163beecbe8..53b435cabd7 100644 --- a/public/app/plugins/datasource/influxdb/components/InfluxStartPage.tsx +++ b/public/app/plugins/datasource/influxdb/components/InfluxStartPage.tsx @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { ExploreStartPageProps } from '@grafana/ui'; +import { ExploreStartPageProps } from '@grafana/data'; import InfluxCheatSheet from './InfluxCheatSheet'; export default class InfluxStartPage extends PureComponent { diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index 0adfc1538d4..8444831836b 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -1,11 +1,10 @@ import _ from 'lodash'; -import { dateMath } from '@grafana/data'; +import { dateMath, DataSourceApi, DataSourceInstanceSettings } from '@grafana/data'; import InfluxSeries from './influx_series'; import InfluxQueryModel from './influx_query_model'; import ResponseParser from './response_parser'; import { InfluxQueryBuilder } from './query_builder'; -import { DataSourceApi, DataSourceInstanceSettings } from '@grafana/ui'; import { InfluxQuery, InfluxOptions } from './types'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/influxdb/module.ts b/public/app/plugins/datasource/influxdb/module.ts index f15f4f181eb..9f12ba94f57 100644 --- a/public/app/plugins/datasource/influxdb/module.ts +++ b/public/app/plugins/datasource/influxdb/module.ts @@ -8,7 +8,7 @@ import { createResetHandler, PasswordFieldEnum, } from '../../../features/datasources/utils/passwordHandlers'; -import { DataSourcePlugin } from '@grafana/ui'; +import { DataSourcePlugin } from '@grafana/data'; class InfluxConfigCtrl { static templateUrl = 'partials/config.html'; diff --git a/public/app/plugins/datasource/influxdb/types.ts b/public/app/plugins/datasource/influxdb/types.ts index d406ef57eb7..858af5efb64 100644 --- a/public/app/plugins/datasource/influxdb/types.ts +++ b/public/app/plugins/datasource/influxdb/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui'; +import { DataQuery, DataSourceJsonData } from '@grafana/data'; export interface InfluxOptions extends DataSourceJsonData { timeInterval: string; diff --git a/public/app/plugins/datasource/input/InputConfigEditor.tsx b/public/app/plugins/datasource/input/InputConfigEditor.tsx index 51cc1fefbc6..975bea26e1f 100644 --- a/public/app/plugins/datasource/input/InputConfigEditor.tsx +++ b/public/app/plugins/datasource/input/InputConfigEditor.tsx @@ -4,8 +4,8 @@ import React, { PureComponent } from 'react'; // Types import { InputOptions } from './types'; -import { DataSourcePluginOptionsEditorProps, TableInputCSV } from '@grafana/ui'; -import { DataFrame, MutableDataFrame } from '@grafana/data'; +import { TableInputCSV } from '@grafana/ui'; +import { DataSourcePluginOptionsEditorProps, DataFrame, MutableDataFrame } from '@grafana/data'; import { dataFrameToCSV } from './utils'; interface Props extends DataSourcePluginOptionsEditorProps {} diff --git a/public/app/plugins/datasource/input/InputDatasource.test.ts b/public/app/plugins/datasource/input/InputDatasource.test.ts index 9e6146b15cf..ef2179dbd29 100644 --- a/public/app/plugins/datasource/input/InputDatasource.test.ts +++ b/public/app/plugins/datasource/input/InputDatasource.test.ts @@ -1,7 +1,7 @@ import InputDatasource, { describeDataFrame } from './InputDatasource'; import { InputQuery, InputOptions } from './types'; -import { readCSV, DataFrame, MutableDataFrame } from '@grafana/data'; -import { DataSourceInstanceSettings, PluginMeta } from '@grafana/ui'; +import { readCSV, DataFrame, MutableDataFrame, DataSourceInstanceSettings, PluginMeta } from '@grafana/data'; + import { getQueryOptions } from 'test/helpers/getQueryOptions'; describe('InputDatasource', () => { diff --git a/public/app/plugins/datasource/input/InputDatasource.ts b/public/app/plugins/datasource/input/InputDatasource.ts index 70ee942b623..5aadbcdd38b 100644 --- a/public/app/plugins/datasource/input/InputDatasource.ts +++ b/public/app/plugins/datasource/input/InputDatasource.ts @@ -5,8 +5,10 @@ import { DataSourceApi, DataSourceInstanceSettings, MetricFindValue, -} from '@grafana/ui'; -import { DataFrame, DataFrameDTO, toDataFrame } from '@grafana/data'; + DataFrame, + DataFrameDTO, + toDataFrame, +} from '@grafana/data'; import { InputQuery, InputOptions } from './types'; diff --git a/public/app/plugins/datasource/input/InputQueryEditor.tsx b/public/app/plugins/datasource/input/InputQueryEditor.tsx index 127adf579c9..53700f09f71 100644 --- a/public/app/plugins/datasource/input/InputQueryEditor.tsx +++ b/public/app/plugins/datasource/input/InputQueryEditor.tsx @@ -5,8 +5,8 @@ import React, { PureComponent } from 'react'; import { InputDatasource, describeDataFrame } from './InputDatasource'; import { InputQuery, InputOptions } from './types'; -import { FormLabel, Select, QueryEditorProps, TableInputCSV } from '@grafana/ui'; -import { DataFrame, toCSV, SelectableValue, MutableDataFrame } from '@grafana/data'; +import { FormLabel, Select, TableInputCSV } from '@grafana/ui'; +import { DataFrame, toCSV, SelectableValue, MutableDataFrame, QueryEditorProps } from '@grafana/data'; import { dataFrameToCSV } from './utils'; diff --git a/public/app/plugins/datasource/input/module.ts b/public/app/plugins/datasource/input/module.ts index ef41af9ce0c..708c95a841e 100644 --- a/public/app/plugins/datasource/input/module.ts +++ b/public/app/plugins/datasource/input/module.ts @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/ui'; +import { DataSourcePlugin } from '@grafana/data'; import { InputDatasource } from './InputDatasource'; diff --git a/public/app/plugins/datasource/input/types.ts b/public/app/plugins/datasource/input/types.ts index 81a9e04b325..9dc0164a32a 100644 --- a/public/app/plugins/datasource/input/types.ts +++ b/public/app/plugins/datasource/input/types.ts @@ -1,5 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui'; -import { DataFrameDTO } from '@grafana/data'; +import { DataQuery, DataSourceJsonData, DataFrameDTO } from '@grafana/data'; export interface InputQuery extends DataQuery { // Data saved in the panel diff --git a/public/app/plugins/datasource/loki/components/ConfigEditor.tsx b/public/app/plugins/datasource/loki/components/ConfigEditor.tsx index 6306cc4c9e7..495b7c4804c 100644 --- a/public/app/plugins/datasource/loki/components/ConfigEditor.tsx +++ b/public/app/plugins/datasource/loki/components/ConfigEditor.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { DataSourceHttpSettings, DataSourcePluginOptionsEditorProps, DataSourceSettings, FormField } from '@grafana/ui'; +import { DataSourcePluginOptionsEditorProps, DataSourceSettings } from '@grafana/data'; +import { FormField, DataSourceHttpSettings } from '@grafana/ui'; import { LokiOptions } from '../types'; export type Props = DataSourcePluginOptionsEditorProps; diff --git a/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx b/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx index a88a00504ba..80e79da3f47 100644 --- a/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx +++ b/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import { shuffle } from 'lodash'; -import { ExploreStartPageProps, DataQuery } from '@grafana/ui'; +import { ExploreStartPageProps, DataQuery } from '@grafana/data'; import LokiLanguageProvider from '../language_provider'; const DEFAULT_EXAMPLES = ['{job="default/prometheus"}']; diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx index 66f0bd50312..ab95e0cba1a 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx @@ -2,8 +2,7 @@ import React, { memo } from 'react'; // Types -import { AbsoluteTimeRange } from '@grafana/data'; -import { QueryEditorProps } from '@grafana/ui'; +import { AbsoluteTimeRange, QueryEditorProps } from '@grafana/data'; import { LokiDatasource } from '../datasource'; import { LokiQuery } from '../types'; import { LokiQueryField } from './LokiQueryField'; diff --git a/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx b/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx index 4188d5f64c9..19af2973783 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx @@ -11,8 +11,8 @@ import { Plugin, Node } from 'slate'; // Types import { LokiQuery } from '../types'; -import { ExploreQueryFieldProps, DOMUtil } from '@grafana/ui'; -import { AbsoluteTimeRange } from '@grafana/data'; +import { DOMUtil } from '@grafana/ui'; +import { ExploreQueryFieldProps, AbsoluteTimeRange } from '@grafana/data'; import { Grammar } from 'prismjs'; import LokiLanguageProvider, { LokiHistoryItem } from '../language_provider'; import LokiDatasource from '../datasource'; diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts index 66507c2211a..3324be98108 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -1,8 +1,7 @@ import LokiDatasource from './datasource'; import { LokiQuery } from './types'; import { getQueryOptions } from 'test/helpers/getQueryOptions'; -import { AnnotationQueryRequest, DataSourceApi } from '@grafana/ui'; -import { DataFrame, dateTime } from '@grafana/data'; +import { AnnotationQueryRequest, DataSourceApi, DataFrame, dateTime } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index a17dee3a8cb..de65c148038 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -9,13 +9,6 @@ import { AnnotationEvent, DataFrameView, LoadingState, -} from '@grafana/data'; -import { addLabelToSelector } from 'app/plugins/datasource/prometheus/add_label_to_query'; -import LanguageProvider from './language_provider'; -import { logStreamToDataFrame } from './result_transformer'; -import { formatQuery, parseQuery, getHighlighterExpressionsFromQuery } from './query_utils'; -// Types -import { PluginMeta, DataSourceApi, DataSourceInstanceSettings, @@ -23,7 +16,11 @@ import { DataQueryRequest, DataQueryResponse, AnnotationQueryRequest, -} from '@grafana/ui'; +} from '@grafana/data'; +import { addLabelToSelector } from 'app/plugins/datasource/prometheus/add_label_to_query'; +import LanguageProvider from './language_provider'; +import { logStreamToDataFrame } from './result_transformer'; +import { formatQuery, parseQuery, getHighlighterExpressionsFromQuery } from './query_utils'; import { LokiQuery, LokiOptions, LokiLogsStream, LokiResponse } from './types'; import { BackendSrv } from 'app/core/services/backend_srv'; diff --git a/public/app/plugins/datasource/loki/language_provider.ts b/public/app/plugins/datasource/loki/language_provider.ts index d9812c1a536..5cec47755d7 100644 --- a/public/app/plugins/datasource/loki/language_provider.ts +++ b/public/app/plugins/datasource/loki/language_provider.ts @@ -7,11 +7,11 @@ import syntax from './syntax'; // Types import { LokiQuery } from './types'; -import { dateTime, AbsoluteTimeRange } from '@grafana/data'; +import { dateTime, AbsoluteTimeRange, LanguageProvider, HistoryItem } from '@grafana/data'; import { PromQuery } from '../prometheus/types'; import LokiDatasource from './datasource'; -import { CompletionItem, TypeaheadInput, TypeaheadOutput, LanguageProvider, HistoryItem } from '@grafana/ui'; +import { CompletionItem, TypeaheadInput, TypeaheadOutput } from '@grafana/ui'; const DEFAULT_KEYS = ['job', 'namespace']; const EMPTY_SELECTOR = '{}'; diff --git a/public/app/plugins/datasource/loki/mocks.ts b/public/app/plugins/datasource/loki/mocks.ts index 84e75244f80..f2fea5a9d54 100644 --- a/public/app/plugins/datasource/loki/mocks.ts +++ b/public/app/plugins/datasource/loki/mocks.ts @@ -1,5 +1,5 @@ import LokiDatasource from './datasource'; -import { DataSourceSettings } from '@grafana/ui'; +import { DataSourceSettings } from '@grafana/data'; import { LokiOptions } from './types'; import { createDatasourceSettings } from '../../../features/datasources/mocks'; diff --git a/public/app/plugins/datasource/loki/module.ts b/public/app/plugins/datasource/loki/module.ts index a2cd2bcc589..3b8349dabb6 100644 --- a/public/app/plugins/datasource/loki/module.ts +++ b/public/app/plugins/datasource/loki/module.ts @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/ui'; +import { DataSourcePlugin } from '@grafana/data'; import Datasource from './datasource'; import LokiCheatSheet from './components/LokiCheatSheet'; diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts index 65a6fdf4294..efc786cb6f0 100644 --- a/public/app/plugins/datasource/loki/types.ts +++ b/public/app/plugins/datasource/loki/types.ts @@ -1,5 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui'; -import { Labels } from '@grafana/data'; +import { Labels, DataQuery, DataSourceJsonData } from '@grafana/data'; export interface LokiQuery extends DataQuery { expr: string; diff --git a/public/app/plugins/datasource/mixed/MixedDataSource.test.ts b/public/app/plugins/datasource/mixed/MixedDataSource.test.ts index 42fea21f0cf..fb74bffb030 100644 --- a/public/app/plugins/datasource/mixed/MixedDataSource.test.ts +++ b/public/app/plugins/datasource/mixed/MixedDataSource.test.ts @@ -1,8 +1,7 @@ import { DatasourceSrvMock, MockDataSourceApi } from 'test/mocks/datasource_srv'; import { getDataSourceSrv } from '@grafana/runtime'; import { getQueryOptions } from 'test/helpers/getQueryOptions'; -import { DataSourceInstanceSettings } from '@grafana/ui'; -import { LoadingState } from '@grafana/data'; +import { LoadingState, DataSourceInstanceSettings } from '@grafana/data'; import { MixedDatasource } from './module'; import { from } from 'rxjs'; diff --git a/public/app/plugins/datasource/mixed/MixedDataSource.ts b/public/app/plugins/datasource/mixed/MixedDataSource.ts index 96287a54b2b..ff96ab20a7b 100644 --- a/public/app/plugins/datasource/mixed/MixedDataSource.ts +++ b/public/app/plugins/datasource/mixed/MixedDataSource.ts @@ -3,8 +3,14 @@ import groupBy from 'lodash/groupBy'; import { from, of, Observable, merge } from 'rxjs'; import { tap } from 'rxjs/operators'; -import { LoadingState } from '@grafana/data'; -import { DataSourceApi, DataQuery, DataQueryRequest, DataQueryResponse, DataSourceInstanceSettings } from '@grafana/ui'; +import { + LoadingState, + DataSourceApi, + DataQuery, + DataQueryRequest, + DataQueryResponse, + DataSourceInstanceSettings, +} from '@grafana/data'; import { getDataSourceSrv } from '@grafana/runtime'; import { mergeMap, map } from 'rxjs/operators'; diff --git a/public/app/plugins/datasource/mssql/query_ctrl.ts b/public/app/plugins/datasource/mssql/query_ctrl.ts index cd485ab9104..f52950a3fd9 100644 --- a/public/app/plugins/datasource/mssql/query_ctrl.ts +++ b/public/app/plugins/datasource/mssql/query_ctrl.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import { QueryCtrl } from 'app/plugins/sdk'; import { auto } from 'angular'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; export interface MssqlQuery { refId: string; diff --git a/public/app/plugins/datasource/mysql/query_ctrl.ts b/public/app/plugins/datasource/mysql/query_ctrl.ts index e762a7e7fc8..6b87d8febb3 100644 --- a/public/app/plugins/datasource/mysql/query_ctrl.ts +++ b/public/app/plugins/datasource/mysql/query_ctrl.ts @@ -8,7 +8,7 @@ import sqlPart from './sql_part'; import { auto, IQService } from 'angular'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { CoreEvents } from 'app/types'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; export interface QueryMeta { sql: string; diff --git a/public/app/plugins/datasource/opentsdb/datasource.ts b/public/app/plugins/datasource/opentsdb/datasource.ts index 6239b0b5af9..5dc0962b07c 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.ts +++ b/public/app/plugins/datasource/opentsdb/datasource.ts @@ -1,9 +1,8 @@ import angular, { IQService } from 'angular'; import _ from 'lodash'; -import { dateMath } from '@grafana/data'; +import { dateMath, DataQueryRequest } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; -import { DataQueryRequest } from '@grafana/ui'; export default class OpenTsDatasource { type: any; diff --git a/public/app/plugins/datasource/postgres/query_ctrl.ts b/public/app/plugins/datasource/postgres/query_ctrl.ts index 3ebef534c91..2e2c119bf10 100644 --- a/public/app/plugins/datasource/postgres/query_ctrl.ts +++ b/public/app/plugins/datasource/postgres/query_ctrl.ts @@ -8,7 +8,7 @@ import sqlPart from './sql_part'; import { auto, IQService } from 'angular'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { CoreEvents } from 'app/types'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; export interface QueryMeta { sql: string; diff --git a/public/app/plugins/datasource/prometheus/components/PromCheatSheet.tsx b/public/app/plugins/datasource/prometheus/components/PromCheatSheet.tsx index e6aebfb7805..e1c8c56bf13 100644 --- a/public/app/plugins/datasource/prometheus/components/PromCheatSheet.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromCheatSheet.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ExploreStartPageProps, DataQuery } from '@grafana/ui'; +import { ExploreStartPageProps, DataQuery } from '@grafana/data'; const CHEAT_SHEET_ITEMS = [ { diff --git a/public/app/plugins/datasource/prometheus/components/PromLink.tsx b/public/app/plugins/datasource/prometheus/components/PromLink.tsx index 73e5c73f961..3cf24c8e5f7 100644 --- a/public/app/plugins/datasource/prometheus/components/PromLink.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromLink.tsx @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { PrometheusDatasource } from '../datasource'; import { PromQuery } from '../types'; -import { DataQueryRequest, PanelData } from '@grafana/ui'; +import { DataQueryRequest, PanelData } from '@grafana/data'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; interface Props { diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx index e8e06a82303..75883e4cef3 100644 --- a/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromQueryEditor.tsx @@ -2,8 +2,8 @@ import _ from 'lodash'; import React, { PureComponent } from 'react'; // Types -import { FormLabel, Select, Switch, QueryEditorProps } from '@grafana/ui'; -import { SelectableValue } from '@grafana/data'; +import { FormLabel, Select, Switch } from '@grafana/ui'; +import { SelectableValue, QueryEditorProps } from '@grafana/data'; import { PrometheusDatasource } from '../datasource'; import { PromQuery, PromOptions } from '../types'; diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx index 4d8442c8f62..877dcb210ad 100644 --- a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx @@ -4,16 +4,15 @@ import React from 'react'; import Cascader from 'rc-cascader'; import { Plugin } from 'slate'; -import { SlatePrism, TypeaheadInput, TypeaheadOutput, QueryField, BracesPlugin, HistoryItem } from '@grafana/ui'; +import { SlatePrism, TypeaheadInput, TypeaheadOutput, QueryField, BracesPlugin } from '@grafana/ui'; import Prism from 'prismjs'; // dom also includes Element polyfills import { PromQuery, PromContext, PromOptions } from '../types'; import { CancelablePromise, makePromiseCancelable } from 'app/core/utils/CancelablePromise'; -import { ExploreQueryFieldProps, QueryHint, DOMUtil } from '@grafana/ui'; -import { isDataFrame, toLegacyResponseData } from '@grafana/data'; -import { SuggestionsState } from '@grafana/ui'; +import { ExploreQueryFieldProps, QueryHint, isDataFrame, toLegacyResponseData, HistoryItem } from '@grafana/data'; +import { DOMUtil, SuggestionsState } from '@grafana/ui'; import { PrometheusDatasource } from '../datasource'; import PromQlLanguageProvider from '../language_provider'; diff --git a/public/app/plugins/datasource/prometheus/datasource.test.ts b/public/app/plugins/datasource/prometheus/datasource.test.ts index 36db7a754f7..cade53e0dce 100644 --- a/public/app/plugins/datasource/prometheus/datasource.test.ts +++ b/public/app/plugins/datasource/prometheus/datasource.test.ts @@ -1,5 +1,5 @@ import { PrometheusDatasource } from './datasource'; -import { DataSourceInstanceSettings } from '@grafana/ui'; +import { DataSourceInstanceSettings } from '@grafana/data'; import { PromContext, PromOptions } from './types'; import { dateTime, LoadingState } from '@grafana/data'; diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts index 654aa279fa1..99b2c1d9dcd 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -3,7 +3,20 @@ import _ from 'lodash'; import $ from 'jquery'; // Services & Utils import kbn from 'app/core/utils/kbn'; -import { AnnotationEvent, dateMath, DateTime, LoadingState, TimeRange, TimeSeries } from '@grafana/data'; +import { + AnnotationEvent, + dateMath, + DateTime, + LoadingState, + TimeRange, + TimeSeries, + DataQueryError, + DataQueryRequest, + DataQueryResponse, + DataQueryResponseData, + DataSourceApi, + DataSourceInstanceSettings, +} from '@grafana/data'; import { from, merge, Observable, of, forkJoin } from 'rxjs'; import { filter, map, tap } from 'rxjs/operators'; @@ -16,14 +29,6 @@ import { getQueryHints } from './query_hints'; import { expandRecordingRules } from './language_utils'; // Types import { PromContext, PromOptions, PromQuery, PromQueryRequest } from './types'; -import { - DataQueryError, - DataQueryRequest, - DataQueryResponse, - DataQueryResponseData, - DataSourceApi, - DataSourceInstanceSettings, -} from '@grafana/ui'; import { safeStringifyValue } from 'app/core/utils/explore'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/plugins/datasource/prometheus/language_provider.ts b/public/app/plugins/datasource/prometheus/language_provider.ts index 290621a5a13..2409307768e 100644 --- a/public/app/plugins/datasource/prometheus/language_provider.ts +++ b/public/app/plugins/datasource/prometheus/language_provider.ts @@ -1,14 +1,7 @@ import _ from 'lodash'; -import { dateTime } from '@grafana/data'; -import { - CompletionItem, - TypeaheadInput, - TypeaheadOutput, - CompletionItemGroup, - LanguageProvider, - HistoryItem, -} from '@grafana/ui'; +import { dateTime, LanguageProvider, HistoryItem } from '@grafana/data'; +import { CompletionItem, TypeaheadInput, TypeaheadOutput, CompletionItemGroup } from '@grafana/ui'; import { parseSelector, processLabels, processHistogramLabels } from './language_utils'; import PromqlSyntax, { FUNCTIONS, RATE_RANGES } from './promql'; diff --git a/public/app/plugins/datasource/prometheus/query_hints.ts b/public/app/plugins/datasource/prometheus/query_hints.ts index 8b47ef70f82..6f2fea082c2 100644 --- a/public/app/plugins/datasource/prometheus/query_hints.ts +++ b/public/app/plugins/datasource/prometheus/query_hints.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { QueryHint, QueryFix } from '@grafana/ui'; +import { QueryHint, QueryFix } from '@grafana/data'; /** * Number of time series results needed before starting to suggest sum aggregation hints diff --git a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts index ab2680904c0..5192598b602 100644 --- a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts +++ b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts @@ -8,8 +8,7 @@ import { prometheusRegularEscape, prometheusSpecialRegexEscape, } from '../datasource'; -import { dateTime } from '@grafana/data'; -import { DataSourceInstanceSettings, DataQueryResponseData, DataQueryRequest } from '@grafana/ui'; +import { DataSourceInstanceSettings, DataQueryResponseData, DataQueryRequest, dateTime } from '@grafana/data'; import { PromOptions, PromQuery, PromContext } from '../types'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/plugins/datasource/prometheus/specs/language_provider.test.ts b/public/app/plugins/datasource/prometheus/specs/language_provider.test.ts index 8095922b80a..72a7154275b 100644 --- a/public/app/plugins/datasource/prometheus/specs/language_provider.test.ts +++ b/public/app/plugins/datasource/prometheus/specs/language_provider.test.ts @@ -2,7 +2,7 @@ import Plain from 'slate-plain-serializer'; import { Editor as SlateEditor } from 'slate'; import LanguageProvider from '../language_provider'; import { PrometheusDatasource } from '../datasource'; -import { HistoryItem } from '@grafana/ui'; +import { HistoryItem } from '@grafana/data'; import { PromQuery } from '../types'; describe('Language completion provider', () => { diff --git a/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts b/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts index 1dcd73e5c21..812a38faa8c 100644 --- a/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts +++ b/public/app/plugins/datasource/prometheus/specs/metric_find_query.test.ts @@ -2,8 +2,7 @@ import { PrometheusDatasource } from '../datasource'; import PrometheusMetricFindQuery from '../metric_find_query'; //@ts-ignore import q from 'q'; -import { toUtc } from '@grafana/data'; -import { DataSourceInstanceSettings } from '@grafana/ui'; +import { toUtc, DataSourceInstanceSettings } from '@grafana/data'; import { PromOptions } from '../types'; describe('PrometheusMetricFindQuery', () => { diff --git a/public/app/plugins/datasource/prometheus/specs/result_transformer.test.ts b/public/app/plugins/datasource/prometheus/specs/result_transformer.test.ts index dd451e439f5..d295a629127 100644 --- a/public/app/plugins/datasource/prometheus/specs/result_transformer.test.ts +++ b/public/app/plugins/datasource/prometheus/specs/result_transformer.test.ts @@ -1,5 +1,5 @@ import { ResultTransformer } from '../result_transformer'; -import { DataQueryResponseData } from '@grafana/ui'; +import { DataQueryResponseData } from '@grafana/data'; describe('Prometheus Result Transformer', () => { const ctx: any = {}; diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts index fba388bf1c2..92d6140e664 100644 --- a/public/app/plugins/datasource/prometheus/types.ts +++ b/public/app/plugins/datasource/prometheus/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui'; +import { DataQuery, DataSourceJsonData } from '@grafana/data'; export enum PromContext { Explore = 'explore', diff --git a/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx b/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx index 1b32dcfebe1..060b0e3d5ce 100644 --- a/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx +++ b/public/app/plugins/datasource/stackdriver/components/QueryEditor.tsx @@ -14,7 +14,7 @@ import { StackdriverQuery, MetricDescriptor } from '../types'; import { getAlignmentPickerData } from '../functions'; import StackdriverDatasource from '../datasource'; import { TimeSeries, SelectableValue } from '@grafana/data'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; export interface Props { onQueryChange: (target: StackdriverQuery) => void; diff --git a/public/app/plugins/datasource/stackdriver/datasource.ts b/public/app/plugins/datasource/stackdriver/datasource.ts index 5a4f3a78554..fc2c458b872 100644 --- a/public/app/plugins/datasource/stackdriver/datasource.ts +++ b/public/app/plugins/datasource/stackdriver/datasource.ts @@ -3,8 +3,7 @@ import appEvents from 'app/core/app_events'; import _ from 'lodash'; import StackdriverMetricFindQuery from './StackdriverMetricFindQuery'; import { StackdriverQuery, MetricDescriptor, StackdriverOptions } from './types'; -import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings } from '@grafana/ui'; -import { ScopedVars } from '@grafana/data'; +import { DataSourceApi, DataQueryRequest, DataSourceInstanceSettings, ScopedVars } from '@grafana/data'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/plugins/datasource/stackdriver/specs/datasource.test.ts b/public/app/plugins/datasource/stackdriver/specs/datasource.test.ts index 5c1692b690e..74df7fc93dd 100644 --- a/public/app/plugins/datasource/stackdriver/specs/datasource.test.ts +++ b/public/app/plugins/datasource/stackdriver/specs/datasource.test.ts @@ -2,8 +2,7 @@ import StackdriverDataSource from '../datasource'; import { metricDescriptors } from './testData'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { CustomVariable } from 'app/features/templating/all'; -import { toUtc } from '@grafana/data'; -import { DataSourceInstanceSettings } from '@grafana/ui'; +import { DataSourceInstanceSettings, toUtc } from '@grafana/data'; import { StackdriverOptions } from '../types'; import { BackendSrv } from 'app/core/services/backend_srv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; diff --git a/public/app/plugins/datasource/stackdriver/types.ts b/public/app/plugins/datasource/stackdriver/types.ts index 141a822f9a2..c854e2ad491 100644 --- a/public/app/plugins/datasource/stackdriver/types.ts +++ b/public/app/plugins/datasource/stackdriver/types.ts @@ -1,4 +1,4 @@ -import { DataQuery, DataSourceJsonData } from '@grafana/ui'; +import { DataQuery, DataSourceJsonData } from '@grafana/data'; export enum MetricFindQueryTypes { Services = 'services', diff --git a/public/app/plugins/datasource/testdata/ConfigEditor.tsx b/public/app/plugins/datasource/testdata/ConfigEditor.tsx index ec4b2a667a2..9cc333215bb 100644 --- a/public/app/plugins/datasource/testdata/ConfigEditor.tsx +++ b/public/app/plugins/datasource/testdata/ConfigEditor.tsx @@ -1,7 +1,7 @@ // Libraries import React, { PureComponent } from 'react'; -import { DataSourcePluginOptionsEditorProps } from '@grafana/ui'; +import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; type Props = DataSourcePluginOptionsEditorProps; diff --git a/public/app/plugins/datasource/testdata/QueryEditor.tsx b/public/app/plugins/datasource/testdata/QueryEditor.tsx index d07487b466a..e05892baadb 100644 --- a/public/app/plugins/datasource/testdata/QueryEditor.tsx +++ b/public/app/plugins/datasource/testdata/QueryEditor.tsx @@ -7,10 +7,9 @@ import { getBackendSrv } from '@grafana/runtime'; // Components import { FormLabel, Select } from '@grafana/ui'; -import { SelectableValue } from '@grafana/data'; +import { QueryEditorProps, SelectableValue } from '@grafana/data'; // Types -import { QueryEditorProps } from '@grafana/ui'; import { TestDataDataSource } from './datasource'; import { TestDataQuery, Scenario } from './types'; diff --git a/public/app/plugins/datasource/testdata/StreamHandler.ts b/public/app/plugins/datasource/testdata/StreamHandler.ts index 2d01f3ef4b8..9f125c08afb 100644 --- a/public/app/plugins/datasource/testdata/StreamHandler.ts +++ b/public/app/plugins/datasource/testdata/StreamHandler.ts @@ -1,7 +1,10 @@ import defaults from 'lodash/defaults'; -import { DataQueryRequest, DataQueryResponse, DataQueryError, DataStreamObserver, DataStreamState } from '@grafana/ui'; - import { + DataQueryRequest, + DataQueryResponse, + DataQueryError, + DataStreamObserver, + DataStreamState, FieldType, Field, LoadingState, diff --git a/public/app/plugins/datasource/testdata/TestInfoTab.tsx b/public/app/plugins/datasource/testdata/TestInfoTab.tsx index f51b9adeaf6..0a8b7a1130c 100644 --- a/public/app/plugins/datasource/testdata/TestInfoTab.tsx +++ b/public/app/plugins/datasource/testdata/TestInfoTab.tsx @@ -2,7 +2,7 @@ import React, { PureComponent } from 'react'; // Types -import { PluginConfigPageProps, DataSourcePlugin } from '@grafana/ui'; +import { PluginConfigPageProps, DataSourcePlugin } from '@grafana/data'; import { TestDataDataSource } from './datasource'; interface Props extends PluginConfigPageProps> {} diff --git a/public/app/plugins/datasource/testdata/datasource.ts b/public/app/plugins/datasource/testdata/datasource.ts index d8779c435ca..a465fc318c8 100644 --- a/public/app/plugins/datasource/testdata/datasource.ts +++ b/public/app/plugins/datasource/testdata/datasource.ts @@ -4,8 +4,9 @@ import { DataSourceApi, DataSourceInstanceSettings, MetricFindValue, -} from '@grafana/ui'; -import { TableData, TimeSeries } from '@grafana/data'; + TableData, + TimeSeries, +} from '@grafana/data'; import { Scenario, TestDataQuery } from './types'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { queryMetricTree } from './metricTree'; diff --git a/public/app/plugins/datasource/testdata/module.tsx b/public/app/plugins/datasource/testdata/module.tsx index 4e476bc9ca7..64d181ac5c3 100644 --- a/public/app/plugins/datasource/testdata/module.tsx +++ b/public/app/plugins/datasource/testdata/module.tsx @@ -1,4 +1,4 @@ -import { DataSourcePlugin } from '@grafana/ui'; +import { DataSourcePlugin } from '@grafana/data'; import { TestDataDataSource } from './datasource'; import { TestDataQueryCtrl } from './query_ctrl'; import { TestInfoTab } from './TestInfoTab'; diff --git a/public/app/plugins/datasource/testdata/runStreams.ts b/public/app/plugins/datasource/testdata/runStreams.ts index 12e7168c1c3..b7a42ba7a73 100644 --- a/public/app/plugins/datasource/testdata/runStreams.ts +++ b/public/app/plugins/datasource/testdata/runStreams.ts @@ -1,9 +1,15 @@ import { defaults } from 'lodash'; import { Observable } from 'rxjs'; -import { DataQueryRequest, DataQueryResponse } from '@grafana/ui'; - -import { FieldType, CircularDataFrame, CSVReader, Field, LoadingState } from '@grafana/data'; +import { + DataQueryRequest, + DataQueryResponse, + FieldType, + CircularDataFrame, + CSVReader, + Field, + LoadingState, +} from '@grafana/data'; import { TestDataQuery, StreamingQuery } from './types'; import { getRandomLine } from './LogIpsum'; diff --git a/public/app/plugins/datasource/testdata/types.ts b/public/app/plugins/datasource/testdata/types.ts index 47ed6c24b50..27882719746 100644 --- a/public/app/plugins/datasource/testdata/types.ts +++ b/public/app/plugins/datasource/testdata/types.ts @@ -1,4 +1,4 @@ -import { DataQuery } from '@grafana/ui'; +import { DataQuery } from '@grafana/data'; export interface Scenario { id: string; diff --git a/public/app/plugins/panel/alertlist/module.ts b/public/app/plugins/panel/alertlist/module.ts index fbe244090c6..713f06cc54d 100644 --- a/public/app/plugins/panel/alertlist/module.ts +++ b/public/app/plugins/panel/alertlist/module.ts @@ -3,7 +3,7 @@ import alertDef from '../../../features/alerting/state/alertDef'; import { PanelCtrl } from 'app/plugins/sdk'; import { dateMath, dateTime } from '@grafana/data'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; import { auto } from 'angular'; import { BackendSrv } from '@grafana/runtime'; diff --git a/public/app/plugins/panel/annolist/AnnoListEditor.tsx b/public/app/plugins/panel/annolist/AnnoListEditor.tsx index 4213f24ad1f..78f5eb336df 100644 --- a/public/app/plugins/panel/annolist/AnnoListEditor.tsx +++ b/public/app/plugins/panel/annolist/AnnoListEditor.tsx @@ -2,9 +2,9 @@ import React, { PureComponent, ChangeEvent } from 'react'; // Components -import { PanelEditorProps, PanelOptionsGroup, PanelOptionsGrid, Switch, FormField, FormLabel } from '@grafana/ui'; +import { PanelOptionsGroup, PanelOptionsGrid, Switch, FormField, FormLabel } from '@grafana/ui'; -import { toIntegerOrUndefined, toNumberString } from '@grafana/data'; +import { PanelEditorProps, toIntegerOrUndefined, toNumberString } from '@grafana/data'; // Types import { AnnoOptions } from './types'; diff --git a/public/app/plugins/panel/annolist/AnnoListPanel.tsx b/public/app/plugins/panel/annolist/AnnoListPanel.tsx index 56c458eea8c..691f1e8b486 100644 --- a/public/app/plugins/panel/annolist/AnnoListPanel.tsx +++ b/public/app/plugins/panel/annolist/AnnoListPanel.tsx @@ -3,8 +3,8 @@ import React, { PureComponent } from 'react'; // Types import { AnnoOptions } from './types'; -import { dateTime, DurationUnit, AnnotationEvent, AppEvents } from '@grafana/data'; -import { PanelProps, Tooltip } from '@grafana/ui'; +import { PanelProps, dateTime, DurationUnit, AnnotationEvent, AppEvents } from '@grafana/data'; +import { Tooltip } from '@grafana/ui'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { AbstractList } from '@grafana/ui/src/components/List/AbstractList'; import { TagBadge } from 'app/core/components/TagFilter/TagBadge'; diff --git a/public/app/plugins/panel/annolist/module.ts b/public/app/plugins/panel/annolist/module.ts index 4f7156361af..f00af0ee65e 100644 --- a/public/app/plugins/panel/annolist/module.ts +++ b/public/app/plugins/panel/annolist/module.ts @@ -1,7 +1,7 @@ import { AnnoListPanel } from './AnnoListPanel'; import { AnnoOptions, defaults } from './types'; import { AnnoListEditor } from './AnnoListEditor'; -import { PanelPlugin } from '@grafana/ui'; +import { PanelPlugin } from '@grafana/data'; export const plugin = new PanelPlugin(AnnoListPanel) .setDefaults(defaults) diff --git a/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts b/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts index 3a5a556ad57..73bb3504007 100644 --- a/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts +++ b/public/app/plugins/panel/bargauge/BarGaugeMigrations.test.ts @@ -1,4 +1,4 @@ -import { PanelModel } from '@grafana/ui'; +import { PanelModel } from '@grafana/data'; import { barGaugePanelMigrationHandler } from './BarGaugeMigrations'; describe('BarGauge Panel Migrations', () => { diff --git a/public/app/plugins/panel/bargauge/BarGaugeMigrations.ts b/public/app/plugins/panel/bargauge/BarGaugeMigrations.ts index 065c8ce8c01..29c78535f35 100644 --- a/public/app/plugins/panel/bargauge/BarGaugeMigrations.ts +++ b/public/app/plugins/panel/bargauge/BarGaugeMigrations.ts @@ -1,4 +1,5 @@ -import { PanelModel, sharedSingleStatMigrationHandler } from '@grafana/ui'; +import { PanelModel } from '@grafana/data'; +import { sharedSingleStatMigrationHandler } from '@grafana/ui'; import { BarGaugeOptions } from './types'; export const barGaugePanelMigrationHandler = (panel: PanelModel): Partial => { diff --git a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx index 86b3dce9550..09c88e0ea49 100644 --- a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx +++ b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx @@ -5,11 +5,11 @@ import React, { PureComponent } from 'react'; import { config } from 'app/core/config'; // Components -import { BarGauge, VizRepeater, getFieldDisplayValues, FieldDisplay, DataLinksContextMenu } from '@grafana/ui'; +import { BarGauge, VizRepeater, DataLinksContextMenu } from '@grafana/ui'; // Types import { BarGaugeOptions } from './types'; -import { PanelProps } from '@grafana/ui'; +import { getFieldDisplayValues, FieldDisplay, PanelProps } from '@grafana/data'; import { getFieldLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers'; export class BarGaugePanel extends PureComponent> { diff --git a/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx b/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx index 31fcecbc971..e40256bf886 100644 --- a/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx +++ b/public/app/plugins/panel/bargauge/BarGaugePanelEditor.tsx @@ -6,15 +6,13 @@ import { ValueMappingsEditor, PanelOptionsGrid, FieldDisplayEditor, - FieldDisplayOptions, FieldPropertiesEditor, PanelOptionsGroup, FormLabel, - PanelEditorProps, Select, DataLinksEditor, } from '@grafana/ui'; -import { FieldConfig, DataLink } from '@grafana/data'; +import { FieldDisplayOptions, FieldConfig, DataLink, PanelEditorProps } from '@grafana/data'; import { Threshold, ValueMapping } from '@grafana/data'; import { BarGaugeOptions, orientationOptions, displayModes } from './types'; diff --git a/public/app/plugins/panel/bargauge/module.tsx b/public/app/plugins/panel/bargauge/module.tsx index 8742ab774de..10e8b1611e7 100644 --- a/public/app/plugins/panel/bargauge/module.tsx +++ b/public/app/plugins/panel/bargauge/module.tsx @@ -1,4 +1,5 @@ -import { PanelPlugin, sharedSingleStatPanelChangedHandler } from '@grafana/ui'; +import { sharedSingleStatPanelChangedHandler } from '@grafana/ui'; +import { PanelPlugin } from '@grafana/data'; import { BarGaugePanel } from './BarGaugePanel'; import { BarGaugePanelEditor } from './BarGaugePanelEditor'; import { BarGaugeOptions, defaults } from './types'; diff --git a/public/app/plugins/panel/bargauge/types.ts b/public/app/plugins/panel/bargauge/types.ts index cb10d6b48d5..83669b19ecf 100644 --- a/public/app/plugins/panel/bargauge/types.ts +++ b/public/app/plugins/panel/bargauge/types.ts @@ -1,6 +1,6 @@ -import { VizOrientation, SingleStatBaseOptions } from '@grafana/ui'; +import { SingleStatBaseOptions } from '@grafana/ui'; import { standardGaugeFieldOptions } from '../gauge/types'; -import { SelectableValue } from '@grafana/data'; +import { VizOrientation, SelectableValue } from '@grafana/data'; export interface BarGaugeOptions extends SingleStatBaseOptions { displayMode: 'basic' | 'lcd' | 'gradient'; diff --git a/public/app/plugins/panel/dashlist/module.ts b/public/app/plugins/panel/dashlist/module.ts index 2f5deea7ace..38ac4226626 100644 --- a/public/app/plugins/panel/dashlist/module.ts +++ b/public/app/plugins/panel/dashlist/module.ts @@ -4,7 +4,7 @@ import impressionSrv from 'app/core/services/impression_srv'; import { auto } from 'angular'; import { BackendSrv } from 'app/core/services/backend_srv'; import { DashboardSrv } from 'app/features/dashboard/services/DashboardSrv'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; class DashListCtrl extends PanelCtrl { static templateUrl = 'module.html'; diff --git a/public/app/plugins/panel/gauge/GaugeMigrations.test.ts b/public/app/plugins/panel/gauge/GaugeMigrations.test.ts index 8e00a4c635b..8def4a8b341 100644 --- a/public/app/plugins/panel/gauge/GaugeMigrations.test.ts +++ b/public/app/plugins/panel/gauge/GaugeMigrations.test.ts @@ -1,4 +1,4 @@ -import { PanelModel } from '@grafana/ui'; +import { PanelModel } from '@grafana/data'; import { gaugePanelMigrationHandler, gaugePanelChangedHandler } from './GaugeMigrations'; describe('Gauge Panel Migrations', () => { diff --git a/public/app/plugins/panel/gauge/GaugeMigrations.ts b/public/app/plugins/panel/gauge/GaugeMigrations.ts index 0dceaedb038..83e3be05f82 100644 --- a/public/app/plugins/panel/gauge/GaugeMigrations.ts +++ b/public/app/plugins/panel/gauge/GaugeMigrations.ts @@ -1,4 +1,5 @@ -import { PanelModel, sharedSingleStatPanelChangedHandler, sharedSingleStatMigrationHandler } from '@grafana/ui'; +import { sharedSingleStatPanelChangedHandler, sharedSingleStatMigrationHandler } from '@grafana/ui'; +import { PanelModel } from '@grafana/data'; import { GaugeOptions } from './types'; // This is called when the panel first loads diff --git a/public/app/plugins/panel/gauge/GaugePanel.tsx b/public/app/plugins/panel/gauge/GaugePanel.tsx index 5bdb2de6d71..a88ec950cda 100644 --- a/public/app/plugins/panel/gauge/GaugePanel.tsx +++ b/public/app/plugins/panel/gauge/GaugePanel.tsx @@ -5,11 +5,12 @@ import React, { PureComponent } from 'react'; import { config } from 'app/core/config'; // Components -import { Gauge, FieldDisplay, getFieldDisplayValues, VizOrientation, DataLinksContextMenu } from '@grafana/ui'; +import { Gauge, DataLinksContextMenu } from '@grafana/ui'; // Types import { GaugeOptions } from './types'; -import { PanelProps, VizRepeater } from '@grafana/ui'; +import { VizRepeater } from '@grafana/ui'; +import { FieldDisplay, getFieldDisplayValues, VizOrientation, PanelProps } from '@grafana/data'; import { getFieldLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers'; export class GaugePanel extends PureComponent> { diff --git a/public/app/plugins/panel/gauge/GaugePanelEditor.tsx b/public/app/plugins/panel/gauge/GaugePanelEditor.tsx index 7e7f53b6b53..925ef5fb5c3 100644 --- a/public/app/plugins/panel/gauge/GaugePanelEditor.tsx +++ b/public/app/plugins/panel/gauge/GaugePanelEditor.tsx @@ -1,18 +1,16 @@ // Libraries import React, { PureComponent } from 'react'; import { - PanelEditorProps, ThresholdsEditor, PanelOptionsGrid, ValueMappingsEditor, - FieldDisplayOptions, FieldDisplayEditor, FieldPropertiesEditor, Switch, PanelOptionsGroup, DataLinksEditor, } from '@grafana/ui'; -import { Threshold, ValueMapping, FieldConfig, DataLink } from '@grafana/data'; +import { PanelEditorProps, FieldDisplayOptions, Threshold, ValueMapping, FieldConfig, DataLink } from '@grafana/data'; import { GaugeOptions } from './types'; import { diff --git a/public/app/plugins/panel/gauge/module.tsx b/public/app/plugins/panel/gauge/module.tsx index ed014550d1f..65b63d863d8 100644 --- a/public/app/plugins/panel/gauge/module.tsx +++ b/public/app/plugins/panel/gauge/module.tsx @@ -1,4 +1,4 @@ -import { PanelPlugin } from '@grafana/ui'; +import { PanelPlugin } from '@grafana/data'; import { GaugePanelEditor } from './GaugePanelEditor'; import { GaugePanel } from './GaugePanel'; import { GaugeOptions, defaults } from './types'; diff --git a/public/app/plugins/panel/gauge/types.ts b/public/app/plugins/panel/gauge/types.ts index 2c1f3fb7c5f..bd14ebe1b57 100644 --- a/public/app/plugins/panel/gauge/types.ts +++ b/public/app/plugins/panel/gauge/types.ts @@ -1,4 +1,4 @@ -import { VizOrientation, FieldDisplayOptions } from '@grafana/ui'; +import { VizOrientation, FieldDisplayOptions } from '@grafana/data'; import { SingleStatBaseOptions } from '@grafana/ui/src/components/SingleStatShared/SingleStatBaseOptions'; import { standardFieldDisplayOptions } from '../singlestat2/types'; diff --git a/public/app/plugins/panel/gettingstarted/GettingStarted.tsx b/public/app/plugins/panel/gettingstarted/GettingStarted.tsx index 676b3c22ec3..b335cdc3ae9 100644 --- a/public/app/plugins/panel/gettingstarted/GettingStarted.tsx +++ b/public/app/plugins/panel/gettingstarted/GettingStarted.tsx @@ -1,7 +1,7 @@ // Libraries import React, { PureComponent } from 'react'; -import { PanelProps } from '@grafana/ui'; +import { PanelProps } from '@grafana/data'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { contextSrv } from 'app/core/core'; diff --git a/public/app/plugins/panel/gettingstarted/module.ts b/public/app/plugins/panel/gettingstarted/module.ts index d0cfb4eb311..c41ea4ee67a 100644 --- a/public/app/plugins/panel/gettingstarted/module.ts +++ b/public/app/plugins/panel/gettingstarted/module.ts @@ -1,4 +1,4 @@ -import { PanelPlugin } from '@grafana/ui'; +import { PanelPlugin } from '@grafana/data'; import { GettingStarted } from './GettingStarted'; // Simplest possible panel plugin diff --git a/public/app/plugins/panel/graph/axes_editor.ts b/public/app/plugins/panel/graph/axes_editor.ts index a4d6da5cf02..b9b44f66b1b 100644 --- a/public/app/plugins/panel/graph/axes_editor.ts +++ b/public/app/plugins/panel/graph/axes_editor.ts @@ -1,4 +1,4 @@ -import { getValueFormats } from '@grafana/ui'; +import { getValueFormats } from '@grafana/data'; import { GraphCtrl } from './module'; export class AxesEditorCtrl { diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts index cd68c4993e2..ad9b820e5bb 100644 --- a/public/app/plugins/panel/graph/data_processor.ts +++ b/public/app/plugins/panel/graph/data_processor.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; -import { colors, getColorFromHexRgbOrName } from '@grafana/ui'; -import { TimeRange, FieldType, Field, DataFrame, getTimeField } from '@grafana/data'; +import { colors } from '@grafana/ui'; +import { getColorFromHexRgbOrName, TimeRange, FieldType, Field, DataFrame, getTimeField } from '@grafana/data'; import TimeSeries from 'app/core/time_series2'; import config from 'app/core/config'; diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts index a4dc1f71d00..67aceb031da 100644 --- a/public/app/plugins/panel/graph/graph.ts +++ b/public/app/plugins/panel/graph/graph.ts @@ -24,17 +24,18 @@ import ReactDOM from 'react-dom'; import { GraphLegendProps, Legend } from './Legend/Legend'; import { GraphCtrl } from './module'; +import { ContextMenuGroup, ContextMenuItem } from '@grafana/ui'; +import { provideTheme, getCurrentTheme } from 'app/core/utils/ConfigProvider'; import { + toUtc, + LinkModelSupplier, + DataFrameView, getValueFormat, - ContextMenuGroup, FieldDisplay, - ContextMenuItem, getDisplayProcessor, getFlotPairsConstant, PanelEvents, -} from '@grafana/ui'; -import { provideTheme, getCurrentTheme } from 'app/core/utils/ConfigProvider'; -import { toUtc, LinkModelSupplier, DataFrameView } from '@grafana/data'; +} from '@grafana/data'; import { GraphContextMenuCtrl } from './GraphContextMenuCtrl'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { ContextSrv } from 'app/core/services/context_srv'; diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts index 4c513161b33..e2316ade455 100644 --- a/public/app/plugins/panel/graph/module.ts +++ b/public/app/plugins/panel/graph/module.ts @@ -11,9 +11,9 @@ import { DataProcessor } from './data_processor'; import { axesEditorComponent } from './axes_editor'; import config from 'app/core/config'; import TimeSeries from 'app/core/time_series2'; -import { getColorFromHexRgbOrName, VariableSuggestion, PanelEvents } from '@grafana/ui'; +import { VariableSuggestion } from '@grafana/ui'; import { getProcessedDataFrames } from 'app/features/dashboard/state/runRequest'; -import { DataFrame, DataLink, DateTimeInput } from '@grafana/data'; +import { getColorFromHexRgbOrName, PanelEvents, DataFrame, DataLink, DateTimeInput } from '@grafana/data'; import { GraphContextMenuCtrl } from './GraphContextMenuCtrl'; import { getDataLinksVariableSuggestions } from 'app/features/panel/panellinks/link_srv'; diff --git a/public/app/plugins/panel/graph/threshold_manager.ts b/public/app/plugins/panel/graph/threshold_manager.ts index 9c5634b05a3..6ffc899f549 100644 --- a/public/app/plugins/panel/graph/threshold_manager.ts +++ b/public/app/plugins/panel/graph/threshold_manager.ts @@ -1,7 +1,7 @@ import 'vendor/flot/jquery.flot'; import $ from 'jquery'; import _ from 'lodash'; -import { getColorFromHexRgbOrName } from '@grafana/ui'; +import { getColorFromHexRgbOrName } from '@grafana/data'; import { CoreEvents } from 'app/types'; import { PanelCtrl } from 'app/features/panel/panel_ctrl'; diff --git a/public/app/plugins/panel/graph/time_region_manager.ts b/public/app/plugins/panel/graph/time_region_manager.ts index 4322d134106..8181fbf006e 100644 --- a/public/app/plugins/panel/graph/time_region_manager.ts +++ b/public/app/plugins/panel/graph/time_region_manager.ts @@ -1,7 +1,6 @@ import 'vendor/flot/jquery.flot'; import _ from 'lodash'; -import { GrafanaThemeType, getColorFromHexRgbOrName } from '@grafana/ui'; -import { dateTime, DateTime, AbsoluteTimeRange } from '@grafana/data'; +import { GrafanaThemeType, getColorFromHexRgbOrName, dateTime, DateTime, AbsoluteTimeRange } from '@grafana/data'; type TimeRegionColorDefinition = { fill: string | null; diff --git a/public/app/plugins/panel/graph2/GraphPanel.tsx b/public/app/plugins/panel/graph2/GraphPanel.tsx index e1804521201..6f5daf978d4 100644 --- a/public/app/plugins/panel/graph2/GraphPanel.tsx +++ b/public/app/plugins/panel/graph2/GraphPanel.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { PanelProps, GraphWithLegend } from '@grafana/ui'; +import { GraphWithLegend } from '@grafana/ui'; +import { PanelProps } from '@grafana/data'; import { Options } from './types'; import { GraphPanelController } from './GraphPanelController'; import { LegendDisplayMode } from '@grafana/ui/src/components/Legend/Legend'; diff --git a/public/app/plugins/panel/graph2/GraphPanelController.tsx b/public/app/plugins/panel/graph2/GraphPanelController.tsx index 107dbcac755..655b51b70d7 100644 --- a/public/app/plugins/panel/graph2/GraphPanelController.tsx +++ b/public/app/plugins/panel/graph2/GraphPanelController.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { PanelData, GraphSeriesToggler } from '@grafana/ui'; -import { GraphSeriesXY, AbsoluteTimeRange } from '@grafana/data'; +import { GraphSeriesToggler } from '@grafana/ui'; +import { PanelData, GraphSeriesXY, AbsoluteTimeRange } from '@grafana/data'; import { getGraphSeriesModel } from './getGraphSeriesModel'; import { Options, SeriesOptions } from './types'; diff --git a/public/app/plugins/panel/graph2/GraphPanelEditor.tsx b/public/app/plugins/panel/graph2/GraphPanelEditor.tsx index 23da9442f68..921c4370caa 100644 --- a/public/app/plugins/panel/graph2/GraphPanelEditor.tsx +++ b/public/app/plugins/panel/graph2/GraphPanelEditor.tsx @@ -3,7 +3,8 @@ import _ from 'lodash'; import React, { PureComponent } from 'react'; // Types -import { PanelEditorProps, Switch, LegendOptions } from '@grafana/ui'; +import { PanelEditorProps } from '@grafana/data'; +import { Switch, LegendOptions } from '@grafana/ui'; import { Options, GraphOptions } from './types'; import { GraphLegendEditor } from './GraphLegendEditor'; diff --git a/public/app/plugins/panel/graph2/getGraphSeriesModel.ts b/public/app/plugins/panel/graph2/getGraphSeriesModel.ts index 7307ea6e9aa..53ea982a3fa 100644 --- a/public/app/plugins/panel/graph2/getGraphSeriesModel.ts +++ b/public/app/plugins/panel/graph2/getGraphSeriesModel.ts @@ -1,5 +1,8 @@ -import { colors, getFlotPairs, getColorFromHexRgbOrName, getDisplayProcessor } from '@grafana/ui'; +import { colors } from '@grafana/ui'; import { + getFlotPairs, + getColorFromHexRgbOrName, + getDisplayProcessor, NullValueMode, reduceField, FieldType, diff --git a/public/app/plugins/panel/graph2/module.tsx b/public/app/plugins/panel/graph2/module.tsx index 0daf85c3f91..7b8b5799c9e 100644 --- a/public/app/plugins/panel/graph2/module.tsx +++ b/public/app/plugins/panel/graph2/module.tsx @@ -1,4 +1,4 @@ -import { PanelPlugin } from '@grafana/ui'; +import { PanelPlugin } from '@grafana/data'; import { GraphPanelEditor } from './GraphPanelEditor'; import { GraphPanel } from './GraphPanel'; import { Options, defaults } from './types'; diff --git a/public/app/plugins/panel/heatmap/color_legend.ts b/public/app/plugins/panel/heatmap/color_legend.ts index d2bb775cbb6..633d4278401 100644 --- a/public/app/plugins/panel/heatmap/color_legend.ts +++ b/public/app/plugins/panel/heatmap/color_legend.ts @@ -5,7 +5,7 @@ import { contextSrv } from 'app/core/core'; import { tickStep } from 'app/core/utils/ticks'; import { getColorScale, getOpacityScale } from './color_scale'; import coreModule from 'app/core/core_module'; -import { PanelEvents, GrafanaThemeType, getColorFromHexRgbOrName } from '@grafana/ui'; +import { PanelEvents, GrafanaThemeType, getColorFromHexRgbOrName } from '@grafana/data'; const LEGEND_HEIGHT_PX = 6; const LEGEND_WIDTH_PX = 100; diff --git a/public/app/plugins/panel/heatmap/heatmap_ctrl.ts b/public/app/plugins/panel/heatmap/heatmap_ctrl.ts index 91238a0f805..b45b122271b 100644 --- a/public/app/plugins/panel/heatmap/heatmap_ctrl.ts +++ b/public/app/plugins/panel/heatmap/heatmap_ctrl.ts @@ -13,10 +13,9 @@ import { sortSeriesByLabel, } from './heatmap_data_converter'; import { auto } from 'angular'; -import { LegacyResponseData, PanelEvents } from '@grafana/ui'; import { getProcessedDataFrames } from 'app/features/dashboard/state/runRequest'; import { DataProcessor } from '../graph/data_processor'; -import { DataFrame } from '@grafana/data'; +import { LegacyResponseData, PanelEvents, DataFrame } from '@grafana/data'; import { CoreEvents } from 'app/types'; const X_BUCKET_NUMBER_DEFAULT = 30; diff --git a/public/app/plugins/panel/heatmap/heatmap_tooltip.ts b/public/app/plugins/panel/heatmap/heatmap_tooltip.ts index 714db655084..6509eb0b53d 100644 --- a/public/app/plugins/panel/heatmap/heatmap_tooltip.ts +++ b/public/app/plugins/panel/heatmap/heatmap_tooltip.ts @@ -2,7 +2,7 @@ import * as d3 from 'd3'; import $ from 'jquery'; import _ from 'lodash'; import { getValueBucketBound } from './heatmap_data_converter'; -import { getValueFormat } from '@grafana/ui'; +import { getValueFormat } from '@grafana/data'; const TOOLTIP_PADDING_X = 30; const TOOLTIP_PADDING_Y = 5; diff --git a/public/app/plugins/panel/heatmap/rendering.ts b/public/app/plugins/panel/heatmap/rendering.ts index ba83a967f74..22dd0cfd811 100644 --- a/public/app/plugins/panel/heatmap/rendering.ts +++ b/public/app/plugins/panel/heatmap/rendering.ts @@ -6,8 +6,7 @@ import * as ticksUtils from 'app/core/utils/ticks'; import { HeatmapTooltip } from './heatmap_tooltip'; import { mergeZeroBuckets } from './heatmap_data_converter'; import { getColorScale, getOpacityScale } from './color_scale'; -import { PanelEvents, GrafanaThemeType, getColorFromHexRgbOrName, getValueFormat } from '@grafana/ui'; -import { toUtc } from '@grafana/data'; +import { toUtc, PanelEvents, GrafanaThemeType, getColorFromHexRgbOrName, getValueFormat } from '@grafana/data'; import { CoreEvents } from 'app/types'; const MIN_CARD_SIZE = 1, diff --git a/public/app/plugins/panel/logs/LogsPanel.tsx b/public/app/plugins/panel/logs/LogsPanel.tsx index d2822f5a755..c926fef69ed 100644 --- a/public/app/plugins/panel/logs/LogsPanel.tsx +++ b/public/app/plugins/panel/logs/LogsPanel.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { PanelProps, LogRows, CustomScrollbar } from '@grafana/ui'; +import { LogRows, CustomScrollbar } from '@grafana/ui'; +import { LogsDedupStrategy, PanelProps } from '@grafana/data'; import { Options } from './types'; -import { LogsDedupStrategy } from '@grafana/data'; import { dataFrameToLogsModel } from 'app/core/logs_model'; import { sortLogsResult } from 'app/core/utils/explore'; diff --git a/public/app/plugins/panel/logs/LogsPanelEditor.tsx b/public/app/plugins/panel/logs/LogsPanelEditor.tsx index ad56cd02eda..83cc3a8485e 100644 --- a/public/app/plugins/panel/logs/LogsPanelEditor.tsx +++ b/public/app/plugins/panel/logs/LogsPanelEditor.tsx @@ -1,11 +1,11 @@ // Libraries import React, { PureComponent } from 'react'; -import { PanelEditorProps, Switch, PanelOptionsGrid, PanelOptionsGroup, FormLabel, Select } from '@grafana/ui'; +import { Switch, PanelOptionsGrid, PanelOptionsGroup, FormLabel, Select } from '@grafana/ui'; // Types import { Options } from './types'; import { SortOrder } from 'app/core/utils/explore'; -import { SelectableValue } from '@grafana/data'; +import { PanelEditorProps, SelectableValue } from '@grafana/data'; const sortOrderOptions = [ { value: SortOrder.Descending, label: 'Descending' }, diff --git a/public/app/plugins/panel/logs/module.tsx b/public/app/plugins/panel/logs/module.tsx index 2075ed75acb..0cffab9733c 100644 --- a/public/app/plugins/panel/logs/module.tsx +++ b/public/app/plugins/panel/logs/module.tsx @@ -1,4 +1,4 @@ -import { PanelPlugin } from '@grafana/ui'; +import { PanelPlugin } from '@grafana/data'; import { Options, defaults } from './types'; import { LogsPanel } from './LogsPanel'; import { LogsPanelEditor } from './LogsPanelEditor'; diff --git a/public/app/plugins/panel/piechart/PieChartOptionsBox.tsx b/public/app/plugins/panel/piechart/PieChartOptionsBox.tsx index 78d37b04b65..2a06163d75e 100644 --- a/public/app/plugins/panel/piechart/PieChartOptionsBox.tsx +++ b/public/app/plugins/panel/piechart/PieChartOptionsBox.tsx @@ -5,8 +5,8 @@ import React, { PureComponent } from 'react'; import { Select, FormLabel, PanelOptionsGroup } from '@grafana/ui'; // Types -import { FormField, PanelEditorProps } from '@grafana/ui'; -import { PieChartType } from '@grafana/ui'; +import { PanelEditorProps } from '@grafana/data'; +import { FormField, PieChartType } from '@grafana/ui'; import { PieChartOptions } from './types'; const labelWidth = 8; diff --git a/public/app/plugins/panel/piechart/PieChartPanel.tsx b/public/app/plugins/panel/piechart/PieChartPanel.tsx index a04e8fee897..ef5f2c68da6 100644 --- a/public/app/plugins/panel/piechart/PieChartPanel.tsx +++ b/public/app/plugins/panel/piechart/PieChartPanel.tsx @@ -5,11 +5,12 @@ import React, { PureComponent } from 'react'; import { config } from 'app/core/config'; // Components -import { PieChart, getFieldDisplayValues } from '@grafana/ui'; +import { PieChart } from '@grafana/ui'; +import { getFieldDisplayValues } from '@grafana/data'; // Types import { PieChartOptions } from './types'; -import { PanelProps } from '@grafana/ui'; +import { PanelProps } from '@grafana/data'; interface Props extends PanelProps {} diff --git a/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx b/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx index 30e9d11bf71..df61b02d404 100644 --- a/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx +++ b/public/app/plugins/panel/piechart/PieChartPanelEditor.tsx @@ -1,14 +1,12 @@ import React, { PureComponent } from 'react'; import { - PanelEditorProps, PanelOptionsGrid, ValueMappingsEditor, FieldDisplayEditor, - FieldDisplayOptions, FieldPropertiesEditor, PanelOptionsGroup, } from '@grafana/ui'; -import { ValueMapping, FieldConfig } from '@grafana/data'; +import { ValueMapping, FieldConfig, PanelEditorProps, FieldDisplayOptions } from '@grafana/data'; import { PieChartOptionsBox } from './PieChartOptionsBox'; import { PieChartOptions } from './types'; diff --git a/public/app/plugins/panel/piechart/module.tsx b/public/app/plugins/panel/piechart/module.tsx index 83c7ddeb5c9..c5dedf9ac67 100644 --- a/public/app/plugins/panel/piechart/module.tsx +++ b/public/app/plugins/panel/piechart/module.tsx @@ -1,4 +1,4 @@ -import { PanelPlugin } from '@grafana/ui'; +import { PanelPlugin } from '@grafana/data'; import { PieChartPanelEditor } from './PieChartPanelEditor'; import { PieChartPanel } from './PieChartPanel'; import { PieChartOptions, defaults } from './types'; diff --git a/public/app/plugins/panel/piechart/types.ts b/public/app/plugins/panel/piechart/types.ts index 8d1319e07e7..e97af994bc9 100644 --- a/public/app/plugins/panel/piechart/types.ts +++ b/public/app/plugins/panel/piechart/types.ts @@ -1,6 +1,6 @@ -import { PieChartType, VizOrientation, SingleStatBaseOptions } from '@grafana/ui'; +import { PieChartType, SingleStatBaseOptions } from '@grafana/ui'; import { standardFieldDisplayOptions } from '../singlestat2/types'; -import { ReducerID } from '@grafana/data'; +import { ReducerID, VizOrientation } from '@grafana/data'; export interface PieChartOptions extends SingleStatBaseOptions { pieType: PieChartType; diff --git a/public/app/plugins/panel/pluginlist/module.ts b/public/app/plugins/panel/pluginlist/module.ts index 6110c264f60..abf6551d858 100644 --- a/public/app/plugins/panel/pluginlist/module.ts +++ b/public/app/plugins/panel/pluginlist/module.ts @@ -2,7 +2,7 @@ import _ from 'lodash'; import { PanelCtrl } from '../../../features/panel/panel_ctrl'; import { auto } from 'angular'; import { BackendSrv } from '@grafana/runtime'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; import { ContextSrv } from '../../../core/services/context_srv'; import { CoreEvents } from 'app/types'; diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts index 939a769e5c1..59f3a94bd0d 100644 --- a/public/app/plugins/panel/singlestat/module.ts +++ b/public/app/plugins/panel/singlestat/module.ts @@ -16,16 +16,14 @@ import { LinkModel, reduceField, ReducerID, -} from '@grafana/data'; - -import { LegacyResponseData, getFlotPairs, getDisplayProcessor, - convertOldAngularValueMapping, getColorFromHexRgbOrName, PanelEvents, -} from '@grafana/ui'; +} from '@grafana/data'; + +import { convertOldAngularValueMapping } from '@grafana/ui'; import { CoreEvents } from 'app/types'; import kbn from 'app/core/utils/kbn'; diff --git a/public/app/plugins/panel/singlestat/specs/singlestat.test.ts b/public/app/plugins/panel/singlestat/specs/singlestat.test.ts index 51c62266489..9dbcb8faaaa 100644 --- a/public/app/plugins/panel/singlestat/specs/singlestat.test.ts +++ b/public/app/plugins/panel/singlestat/specs/singlestat.test.ts @@ -1,7 +1,7 @@ import { SingleStatCtrl, ShowData } from '../module'; import { dateTime, ReducerID } from '@grafana/data'; import { LinkSrv } from 'app/features/panel/panellinks/link_srv'; -import { LegacyResponseData } from '@grafana/ui'; +import { LegacyResponseData } from '@grafana/data'; interface TestContext { ctrl: SingleStatCtrl; diff --git a/public/app/plugins/panel/singlestat2/SingleStatEditor.tsx b/public/app/plugins/panel/singlestat2/SingleStatEditor.tsx index 0b5c3c208ab..83ab33f5d4a 100644 --- a/public/app/plugins/panel/singlestat2/SingleStatEditor.tsx +++ b/public/app/plugins/panel/singlestat2/SingleStatEditor.tsx @@ -2,11 +2,9 @@ import React, { PureComponent } from 'react'; import { - PanelEditorProps, ThresholdsEditor, PanelOptionsGrid, ValueMappingsEditor, - FieldDisplayOptions, FieldDisplayEditor, FieldPropertiesEditor, PanelOptionsGroup, @@ -15,7 +13,7 @@ import { Select, } from '@grafana/ui'; -import { Threshold, ValueMapping, FieldConfig, DataLink } from '@grafana/data'; +import { Threshold, ValueMapping, FieldConfig, DataLink, PanelEditorProps, FieldDisplayOptions } from '@grafana/data'; import { SingleStatOptions, SparklineOptions, displayModes, colorModes } from './types'; import { SparklineEditor } from './SparklineEditor'; diff --git a/public/app/plugins/panel/singlestat2/SingleStatPanel.tsx b/public/app/plugins/panel/singlestat2/SingleStatPanel.tsx index 61a0bd6dbab..9784ad01e48 100644 --- a/public/app/plugins/panel/singlestat2/SingleStatPanel.tsx +++ b/public/app/plugins/panel/singlestat2/SingleStatPanel.tsx @@ -6,15 +6,8 @@ import { config } from 'app/core/config'; // Types import { SingleStatOptions } from './types'; -import { - PanelProps, - getFieldDisplayValues, - VizRepeater, - FieldDisplay, - BigValue, - DataLinksContextMenu, -} from '@grafana/ui'; -import { BigValueSparkline } from '@grafana/ui/src/components/BigValue/BigValue'; +import { VizRepeater, BigValue, DataLinksContextMenu, BigValueSparkline } from '@grafana/ui'; +import { PanelProps, getFieldDisplayValues, FieldDisplay } from '@grafana/data'; import { getFieldLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers'; export class SingleStatPanel extends PureComponent> { diff --git a/public/app/plugins/panel/singlestat2/module.tsx b/public/app/plugins/panel/singlestat2/module.tsx index a78ebdd6375..a81547ad8d4 100644 --- a/public/app/plugins/panel/singlestat2/module.tsx +++ b/public/app/plugins/panel/singlestat2/module.tsx @@ -1,4 +1,5 @@ -import { PanelPlugin, sharedSingleStatMigrationHandler, sharedSingleStatPanelChangedHandler } from '@grafana/ui'; +import { sharedSingleStatMigrationHandler, sharedSingleStatPanelChangedHandler } from '@grafana/ui'; +import { PanelPlugin } from '@grafana/data'; import { SingleStatOptions, defaults } from './types'; import { SingleStatPanel } from './SingleStatPanel'; import { SingleStatEditor } from './SingleStatEditor'; diff --git a/public/app/plugins/panel/singlestat2/types.ts b/public/app/plugins/panel/singlestat2/types.ts index 2fa64c87547..6476f7f6eb7 100644 --- a/public/app/plugins/panel/singlestat2/types.ts +++ b/public/app/plugins/panel/singlestat2/types.ts @@ -1,6 +1,5 @@ -import { VizOrientation, SingleStatBaseOptions, FieldDisplayOptions, SingleStatDisplayMode } from '@grafana/ui'; -import { ReducerID } from '@grafana/data'; -import { SelectableValue } from '@grafana/data'; +import { SingleStatBaseOptions, SingleStatDisplayMode } from '@grafana/ui'; +import { VizOrientation, ReducerID, FieldDisplayOptions, SelectableValue } from '@grafana/data'; export interface SparklineOptions { show: boolean; diff --git a/public/app/plugins/panel/table/column_options.ts b/public/app/plugins/panel/table/column_options.ts index 7fe67a621a0..3af546fc84c 100644 --- a/public/app/plugins/panel/table/column_options.ts +++ b/public/app/plugins/panel/table/column_options.ts @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { getValueFormats } from '@grafana/ui'; +import { getValueFormats } from '@grafana/data'; export class ColumnOptionsCtrl { panel: any; diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts index f09ffbadf9a..0319e28fbef 100644 --- a/public/app/plugins/panel/table/module.ts +++ b/public/app/plugins/panel/table/module.ts @@ -8,7 +8,7 @@ import { columnOptionsTab } from './column_options'; import { TableRenderer } from './renderer'; import { isTableData } from '@grafana/data'; import { TemplateSrv } from 'app/features/templating/template_srv'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; import { CoreEvents } from 'app/types'; class TablePanelCtrl extends MetricsPanelCtrl { diff --git a/public/app/plugins/panel/table/renderer.ts b/public/app/plugins/panel/table/renderer.ts index c98d45c5bce..6f64e7b92f8 100644 --- a/public/app/plugins/panel/table/renderer.ts +++ b/public/app/plugins/panel/table/renderer.ts @@ -1,8 +1,13 @@ import _ from 'lodash'; -import { getValueFormat, getColorFromHexRgbOrName, GrafanaThemeType } from '@grafana/ui'; -import { stringToJsRegex, ScopedVars } from '@grafana/data'; +import { + dateTime, + getValueFormat, + getColorFromHexRgbOrName, + GrafanaThemeType, + stringToJsRegex, + ScopedVars, +} from '@grafana/data'; import { ColumnStyle } from '@grafana/ui/src/components/Table/TableCellBuilder'; -import { dateTime } from '@grafana/data'; import { TemplateSrv } from 'app/features/templating/template_srv'; import { TableRenderModel, ColumnRender } from './types'; diff --git a/public/app/plugins/panel/table/specs/renderer.test.ts b/public/app/plugins/panel/table/specs/renderer.test.ts index 4bfda6ccad1..b351aac285e 100644 --- a/public/app/plugins/panel/table/specs/renderer.test.ts +++ b/public/app/plugins/panel/table/specs/renderer.test.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import TableModel from 'app/core/table_model'; import { TableRenderer } from '../renderer'; -import { getColorDefinitionByName } from '@grafana/ui'; +import { getColorDefinitionByName } from '@grafana/data'; import { ScopedVars } from '@grafana/data'; describe('when rendering table', () => { diff --git a/public/app/plugins/panel/table2/TablePanel.tsx b/public/app/plugins/panel/table2/TablePanel.tsx index 863fc9ef703..659503661e9 100644 --- a/public/app/plugins/panel/table2/TablePanel.tsx +++ b/public/app/plugins/panel/table2/TablePanel.tsx @@ -2,7 +2,8 @@ import React, { Component } from 'react'; // Types -import { PanelProps, ThemeContext } from '@grafana/ui'; +import { ThemeContext } from '@grafana/ui'; +import { PanelProps } from '@grafana/data'; import { Options } from './types'; import Table from '@grafana/ui/src/components/Table/Table'; diff --git a/public/app/plugins/panel/table2/TablePanelEditor.tsx b/public/app/plugins/panel/table2/TablePanelEditor.tsx index 2a381b0ee74..98574b222ae 100644 --- a/public/app/plugins/panel/table2/TablePanelEditor.tsx +++ b/public/app/plugins/panel/table2/TablePanelEditor.tsx @@ -3,7 +3,8 @@ import _ from 'lodash'; import React, { PureComponent } from 'react'; // Types -import { PanelEditorProps, Switch, FormField } from '@grafana/ui'; +import { PanelEditorProps } from '@grafana/data'; +import { Switch, FormField } from '@grafana/ui'; import { Options } from './types'; export class TablePanelEditor extends PureComponent> { diff --git a/public/app/plugins/panel/table2/module.tsx b/public/app/plugins/panel/table2/module.tsx index 297abee5e27..5373cb486d4 100644 --- a/public/app/plugins/panel/table2/module.tsx +++ b/public/app/plugins/panel/table2/module.tsx @@ -1,4 +1,4 @@ -import { PanelPlugin } from '@grafana/ui'; +import { PanelPlugin } from '@grafana/data'; import { TablePanelEditor } from './TablePanelEditor'; import { TablePanel } from './TablePanel'; diff --git a/public/app/plugins/panel/text/module.ts b/public/app/plugins/panel/text/module.ts index 9aba417a8cb..8456de471d0 100644 --- a/public/app/plugins/panel/text/module.ts +++ b/public/app/plugins/panel/text/module.ts @@ -5,7 +5,7 @@ import { sanitize, escapeHtml } from 'app/core/utils/text'; import config from 'app/core/config'; import { auto, ISCEService } from 'angular'; import { TemplateSrv } from 'app/features/templating/template_srv'; -import { PanelEvents } from '@grafana/ui'; +import { PanelEvents } from '@grafana/data'; import { renderMarkdown } from '@grafana/data'; const defaultContent = ` diff --git a/public/app/plugins/panel/text2/TextPanel.tsx b/public/app/plugins/panel/text2/TextPanel.tsx index 8bad12388e9..67bb2d4daf3 100644 --- a/public/app/plugins/panel/text2/TextPanel.tsx +++ b/public/app/plugins/panel/text2/TextPanel.tsx @@ -9,7 +9,7 @@ import config from 'app/core/config'; // Types import { TextOptions } from './types'; -import { PanelProps } from '@grafana/ui'; +import { PanelProps } from '@grafana/data'; interface Props extends PanelProps {} interface State { diff --git a/public/app/plugins/panel/text2/TextPanelEditor.tsx b/public/app/plugins/panel/text2/TextPanelEditor.tsx index 634a4d98070..62ecf2c104f 100644 --- a/public/app/plugins/panel/text2/TextPanelEditor.tsx +++ b/public/app/plugins/panel/text2/TextPanelEditor.tsx @@ -2,8 +2,8 @@ import React, { PureComponent, ChangeEvent } from 'react'; // Components -import { PanelEditorProps, PanelOptionsGroup, Select } from '@grafana/ui'; -import { SelectableValue } from '@grafana/data'; +import { PanelOptionsGroup, Select } from '@grafana/ui'; +import { PanelEditorProps, SelectableValue } from '@grafana/data'; // Types import { TextOptions, TextMode } from './types'; diff --git a/public/app/plugins/panel/text2/module.tsx b/public/app/plugins/panel/text2/module.tsx index ca3f981a946..babc3713da9 100644 --- a/public/app/plugins/panel/text2/module.tsx +++ b/public/app/plugins/panel/text2/module.tsx @@ -1,4 +1,4 @@ -import { PanelPlugin } from '@grafana/ui'; +import { PanelPlugin } from '@grafana/data'; import { TextPanelEditor } from './TextPanelEditor'; import { TextPanel } from './TextPanel'; diff --git a/public/app/types/datasources.ts b/public/app/types/datasources.ts index ac7c6a6afe2..e036a0104dc 100644 --- a/public/app/types/datasources.ts +++ b/public/app/types/datasources.ts @@ -1,5 +1,5 @@ import { LayoutMode } from '../core/components/LayoutSelector/LayoutSelector'; -import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui'; +import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/data'; export interface DataSourcesState { dataSources: DataSourceSettings[]; diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts index 8cf7c13b353..de4298c45bf 100644 --- a/public/app/types/explore.ts +++ b/public/app/types/explore.ts @@ -1,6 +1,7 @@ import { Unsubscribable } from 'rxjs'; import { ComponentType } from 'react'; import { + HistoryItem, DataQuery, DataSourceSelectItem, DataSourceApi, @@ -8,10 +9,6 @@ import { ExploreStartPageProps, PanelData, DataQueryRequest, - HistoryItem, -} from '@grafana/ui'; - -import { RawTimeRange, LogLevel, TimeRange, diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts index d640ebc5004..e5c249094e6 100644 --- a/public/app/types/plugins.ts +++ b/public/app/types/plugins.ts @@ -1,4 +1,4 @@ -import { PluginMeta } from '@grafana/ui'; +import { PluginMeta } from '@grafana/data'; export interface PluginDashboard { dashboardId: number; diff --git a/public/test/helpers/getQueryOptions.ts b/public/test/helpers/getQueryOptions.ts index acd458639f4..b5340b804fe 100644 --- a/public/test/helpers/getQueryOptions.ts +++ b/public/test/helpers/getQueryOptions.ts @@ -1,4 +1,4 @@ -import { DataQueryRequest, DataQuery } from '@grafana/ui'; +import { DataQueryRequest, DataQuery } from '@grafana/data'; import { dateTime } from '@grafana/data'; export function getQueryOptions( diff --git a/public/test/mocks/datasource_srv.ts b/public/test/mocks/datasource_srv.ts index 5677ef68bd4..8f7ae41ca87 100644 --- a/public/test/mocks/datasource_srv.ts +++ b/public/test/mocks/datasource_srv.ts @@ -4,7 +4,7 @@ import { DataQueryResponse, DataSourceInstanceSettings, DataSourcePluginMeta, -} from '@grafana/ui'; +} from '@grafana/data'; export class DatasourceSrvMock { constructor(private defaultDS: DataSourceApi, private datasources: { [name: string]: DataSourceApi }) { diff --git a/public/test/mocks/mockExploreState.ts b/public/test/mocks/mockExploreState.ts index e0b6ba9c3ed..e92d9c23453 100644 --- a/public/test/mocks/mockExploreState.ts +++ b/public/test/mocks/mockExploreState.ts @@ -1,9 +1,7 @@ -import { DataSourceApi } from '@grafana/ui/src/types/datasource'; - import { ExploreId, ExploreItemState, ExploreState } from 'app/types/explore'; import { makeExploreItemState } from 'app/features/explore/state/reducers'; import { StoreState, UserState } from 'app/types'; -import { TimeRange, dateTime } from '@grafana/data'; +import { TimeRange, dateTime, DataSourceApi } from '@grafana/data'; export const mockExploreState = (options: any = {}) => { const isLive = options.isLive || false; diff --git a/public/test/specs/helpers.ts b/public/test/specs/helpers.ts index b064fff51da..63ea9f60c99 100644 --- a/public/test/specs/helpers.ts +++ b/public/test/specs/helpers.ts @@ -6,7 +6,7 @@ import { dateMath } from '@grafana/data'; import { angularMocks, sinon } from '../lib/common'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; import { RawTimeRange } from '@grafana/data'; -import { PanelPluginMeta } from '@grafana/ui'; +import { PanelPluginMeta } from '@grafana/data'; import { GrafanaRootScope } from 'app/routes/GrafanaCtrl'; export function ControllerTestContext(this: any) { diff --git a/yarn.lock b/yarn.lock index 8b5b0592fb2..96919b7b99d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5862,11 +5862,6 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-db@1.0.30000772: - version "1.0.30000772" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000772.tgz#51aae891768286eade4a3d8319ea76d6a01b512b" - integrity sha1-UarokXaChureSj2DGep21qAbUSs= - caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000947, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30000999: version "1.0.30000999" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz#427253a69ad7bea4aa8d8345687b8eec51ca0e43"