From c9f563e5765e71a1f20b886007a6bbf896d71ac3 Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Wed, 12 Mar 2025 14:14:32 +0100 Subject: [PATCH] Grafana UI: Use package.json exports for internal code (#101815) * feat(grafana-ui): introduce development exports to prevent importing from grafana/ui/src * refactor(theme-generation): move theme templates into scripts so themes continue to build * refactor(frontend): replace grafana/ui paths that use nested src with /internal or /unstable * chore(betterer): update better results file * feat(grafana-ui): support enterprise, remove Text component from internal * docs(packages): update readme with exporting code conventions --- .betterer.results | 590 ++++-------------- packages/README.md | 10 +- packages/grafana-plugin-configs/tsconfig.json | 4 +- packages/grafana-ui/package.json | 16 + packages/grafana-ui/src/internal/index.ts | 104 +++ .../TopSearchBarCommandPaletteTrigger.tsx | 2 +- .../app/core/components/GraphNG/GraphNG.tsx | 6 +- public/app/core/components/Indent/Indent.tsx | 2 +- .../NestedFolderPicker/NestedFolderList.tsx | 3 +- .../components/NestedFolderPicker/Trigger.tsx | 2 +- .../app/core/components/OptionsUI/color.tsx | 2 +- .../core/components/OptionsUI/registry.tsx | 2 +- .../app/core/components/OptionsUI/slider.tsx | 4 +- .../PasswordField/PasswordField.tsx | 2 +- .../RolePicker/RoleMenuGroupOption.tsx | 2 +- .../components/RolePicker/RoleMenuOption.tsx | 2 +- .../components/RolePicker/RolePickerInput.tsx | 2 +- .../components/RolePicker/RolePickerMenu.tsx | 2 +- .../RolePicker/RolePickerSubMenu.tsx | 2 +- .../core/components/TimeSeries/TimeSeries.tsx | 5 +- .../app/core/components/TimeSeries/utils.ts | 12 +- .../core/components/TimelineChart/utils.ts | 2 +- .../core/context/ModalsContextProvider.tsx | 2 +- public/app/core/core.ts | 2 +- public/app/features/actions/ActionEditor.tsx | 10 +- .../actions/ActionEditorModalContent.tsx | 3 +- public/app/features/actions/ParamsEditor.tsx | 6 +- public/app/features/admin/AdminOrgsTable.tsx | 2 +- .../app/features/admin/AdminSettingsTable.tsx | 2 +- .../DashboardsListModalButton.tsx | 2 +- .../DeleteUserModalButton.tsx | 2 +- .../UserListPublicDashboardPage.tsx | 2 +- .../GrafanaAlertmanagerDeliveryWarning.tsx | 2 +- .../rule-editor/CloudAlertPreview.tsx | 2 +- .../rule-editor/GrafanaAlertStatePicker.tsx | 3 +- .../route-settings/RouteSettings.tsx | 2 +- .../components/rules/RuleConfigStatus.tsx | 2 +- .../unified/home/PluginIntegrations.tsx | 3 +- .../unified/plugins/PluginOriginBadge.tsx | 2 +- .../browse-dashboards/components/NameCell.tsx | 2 +- .../features/canvas/elements/metricValue.tsx | 3 +- .../ConfigEmailSharing/ConfigEmailSharing.tsx | 3 +- .../EmailListConfiguration.tsx | 3 +- .../EmailShare/CreateEmailSharing.tsx | 3 +- .../share-externally/ShareConfiguration.tsx | 3 +- .../share-snapshot/UpsertSnapshot.tsx | 3 +- .../ShareDrawer/ShareDrawerConfirmAction.tsx | 5 +- .../PanelEditor/OverrideCategoryTitle.tsx | 2 +- .../PanelEditor/PanelHeaderCorner.tsx | 3 +- .../PanelEditor/PanelNotSupported.tsx | 25 +- .../PanelEditor/VisualizationSelectPane.tsx | 3 +- .../PublicDashboardNotAvailable.tsx | 2 +- .../ConfigPublicDashboard.tsx | 18 +- .../ConfigPublicDashboard/Configuration.tsx | 15 +- .../AcknowledgeCheckboxes.tsx | 2 +- .../ModalAlerts/NoUpsertPermissionsAlert.tsx | 2 +- .../ModalAlerts/SaveDashboardChangesAlert.tsx | 2 +- .../UnsupportedDataSourcesAlert.tsx | 2 +- .../UnsupportedTemplateVariablesAlert.tsx | 2 +- .../SharePublicDashboard.tsx | 2 +- .../components/SubMenu/AnnotationPicker.tsx | 2 +- .../SubMenu/DashboardLinksDashboard.tsx | 4 +- .../PanelHeader/PanelHeaderNotice.tsx | 2 +- .../dashboard/state/DashboardMigrator.ts | 2 +- .../editors/BackgroundSizeEditor.tsx | 2 +- .../editors/ColorDimensionEditor.tsx | 2 +- .../editors/ResourceDimensionEditor.tsx | 2 +- .../dimensions/editors/ResourcePicker.tsx | 2 +- .../editors/ScalarDimensionEditor.tsx | 2 +- .../editors/ScaleDimensionEditor.tsx | 2 +- .../editors/TextDimensionEditor.tsx | 2 +- .../ContentOutlineItemButton.tsx | 2 +- public/app/features/explore/Explore.tsx | 2 +- public/app/features/explore/Logs/Logs.tsx | 2 +- .../explore/Logs/LogsColumnSearch.tsx | 2 +- .../app/features/explore/Logs/LogsTable.tsx | 2 +- .../explore/Logs/LogsTableActiveFields.tsx | 2 +- .../explore/Logs/LogsTableAvailableFields.tsx | 2 +- .../explore/Logs/LogsTableMultiSelect.tsx | 2 +- .../features/explore/Logs/LogsTableWrap.tsx | 2 +- .../explore/PrometheusListView/ItemLabels.tsx | 2 +- .../explore/PrometheusListView/ItemValues.tsx | 2 +- .../PrometheusListView/RawListContainer.tsx | 2 +- .../PrometheusListView/RawListItem.tsx | 2 +- .../RawListItemAttributes.tsx | 2 +- .../SearchBar/NextPrevResult.tsx | 2 +- .../SearchBar/TracePageSearchBar.tsx | 2 +- .../LibraryPanelCard/LibraryPanelCard.tsx | 2 +- .../DeletePublicDashboardButton.tsx | 2 +- .../DeletePublicDashboardModal.tsx | 2 +- .../components/SnapshotListTableRow.tsx | 2 +- .../migrate-to-cloud/onprem/NameCell.tsx | 2 +- .../shared/AlertWithTraceID.tsx | 2 +- .../VizTypePicker/PanelTypeCard.tsx | 2 +- public/app/features/playlist/PlaylistCard.tsx | 2 +- .../features/playlist/PlaylistPageList.tsx | 2 +- .../admin/components/PluginListItem.tsx | 2 +- .../plugins/loader/sharedDependencies.ts | 2 +- .../app/features/sandbox/BenchmarksPage.tsx | 2 +- .../page/components/SearchResultsTable.tsx | 3 +- .../components/ServiceAccountsListItem.tsx | 2 +- .../features/trails/Breakdown/SortByScene.tsx | 3 +- public/app/features/trails/DataTrailsHome.tsx | 3 +- .../calculateHeatmap/editor/helper.ts | 2 +- .../ConvertFieldTypeTransformerEditor.tsx | 3 +- .../editors/FormatStringTransformerEditor.tsx | 2 +- .../editors/JoinByFieldTransformerEditor.tsx | 2 +- .../ExtractFieldsTransformerEditor.tsx | 2 +- .../FieldLookupTransformerEditor.tsx | 2 +- .../PartitionByValuesEditor.tsx | 2 +- .../regression/regressionEditor.tsx | 2 +- .../suggestionsInput/SuggestionsInput.tsx | 5 +- .../app/features/users/TokenRevokedModal.tsx | 2 +- .../variables/pickers/shared/VariableLink.tsx | 2 +- .../data-hover/ExemplarHoverView.tsx | 2 +- .../components/LogsQueryEditor/RawQuery.tsx | 2 +- .../azuremonitor/components/shared/Field.tsx | 2 +- .../components/CheatSheet/LogsCheatSheet.tsx | 2 +- .../code-editors/PPLQueryEditor.tsx | 2 +- .../LogGroups/LegacyLogGroupSelector.tsx | 3 +- .../grafana/components/TimeRegionEditor.tsx | 3 +- .../editor/annotation/AnnotationEditor.tsx | 2 +- .../editor/query/flux/FluxQueryEditor.tsx | 2 +- .../editor/query/fsql/FSQLEditor.tsx | 2 +- .../editor/variable/VariableQueryEditor.tsx | 3 +- .../mssql/azureauth/AzureAuthSettings.tsx | 2 +- .../mssql/azureauth/AzureCredentialsForm.tsx | 2 +- public/app/plugins/datasource/mssql/types.ts | 2 +- .../configuration/AzureAuthSettings.tsx | 2 +- .../DataSourceHttpSettingsOverhaulPackage.tsx | 2 +- .../datasources/prometheus/RawQuery.tsx | 2 +- .../plugins/panel/annolist/AnnoListPanel.tsx | 2 +- .../plugins/panel/barchart/BarChartLegend.tsx | 2 +- .../plugins/panel/barchart/BarChartPanel.tsx | 2 +- public/app/plugins/panel/barchart/bars.ts | 3 +- public/app/plugins/panel/barchart/module.tsx | 2 +- public/app/plugins/panel/barchart/utils.ts | 3 +- .../plugins/panel/bargauge/BarGaugeLegend.tsx | 2 +- .../plugins/panel/bargauge/BarGaugePanel.tsx | 2 +- .../panel/candlestick/CandlestickPanel.tsx | 4 +- .../panel/canvas/components/CanvasTooltip.tsx | 12 +- .../panel/canvas/editor/LineStyleEditor.tsx | 2 +- .../editor/element/QuickPositioning.tsx | 2 +- .../canvas/editor/inline/InlineEditBody.tsx | 2 +- .../panel/canvas/editor/inline/TabsEditor.tsx | 2 +- .../components/DatagridContextMenu.tsx | 2 +- public/app/plugins/panel/gauge/GaugePanel.tsx | 2 +- .../geomap/editor/FrameSelectionEditor.tsx | 6 +- .../panel/geomap/editor/StyleRuleEditor.tsx | 2 +- .../plugins/panel/heatmap/HeatmapPanel.tsx | 2 +- .../plugins/panel/heatmap/HeatmapTooltip.tsx | 14 +- public/app/plugins/panel/heatmap/module.tsx | 2 +- .../app/plugins/panel/histogram/Histogram.tsx | 2 +- .../panel/histogram/HistogramPanel.tsx | 2 +- .../panel/histogram/HistogramTooltip.tsx | 14 +- public/app/plugins/panel/histogram/module.tsx | 2 +- .../app/plugins/panel/news/component/News.tsx | 2 +- .../nodeGraph/editor/ArcOptionsEditor.tsx | 2 +- .../app/plugins/panel/piechart/PieChart.tsx | 3 +- public/app/plugins/panel/piechart/module.tsx | 2 +- public/app/plugins/panel/stat/StatPanel.tsx | 2 +- .../state-timeline/StateTimelinePanel.tsx | 2 +- .../state-timeline/StateTimelineTooltip2.tsx | 14 +- .../status-history/StatusHistoryPanel.tsx | 2 +- public/app/plugins/panel/table/TablePanel.tsx | 2 +- .../cells/SparklineCellOptionsEditor.tsx | 2 +- .../panel/timeseries/TimeSeriesPanel.tsx | 2 +- .../panel/timeseries/TimeSeriesTooltip.tsx | 14 +- .../app/plugins/panel/timeseries/module.tsx | 2 +- .../plugins/ThresholdControlsPlugin.tsx | 2 +- public/app/plugins/panel/timeseries/utils.ts | 2 +- public/app/plugins/panel/trend/TrendPanel.tsx | 2 +- public/app/plugins/panel/trend/module.tsx | 2 +- .../plugins/panel/xychart/SeriesEditor.tsx | 2 +- .../plugins/panel/xychart/XYChartPanel.tsx | 3 +- .../plugins/panel/xychart/XYChartTooltip.tsx | 13 +- public/app/plugins/panel/xychart/scatter.ts | 2 +- scripts/cli/generateSassVariableFiles.ts | 7 +- .../_variables.dark.scss.tmpl.ts | 2 +- .../_variables.light.scss.tmpl.ts | 2 +- .../themeTemplates}/_variables.scss.tmpl.ts | 2 +- .../themeTemplates}/generatedFileBanner.ts | 0 182 files changed, 527 insertions(+), 743 deletions(-) create mode 100644 packages/grafana-ui/src/internal/index.ts rename {packages/grafana-ui/src/themes => scripts/cli/themeTemplates}/_variables.dark.scss.tmpl.ts (98%) rename {packages/grafana-ui/src/themes => scripts/cli/themeTemplates}/_variables.light.scss.tmpl.ts (98%) rename {packages/grafana-ui/src/themes => scripts/cli/themeTemplates}/_variables.scss.tmpl.ts (98%) rename {packages/grafana-ui/src/utils => scripts/cli/themeTemplates}/generatedFileBanner.ts (100%) diff --git a/.betterer.results b/.betterer.results index 4df170e7dc1..eccc02ef7df 100644 --- a/.betterer.results +++ b/.betterer.results @@ -939,9 +939,6 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] ], - "public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/themes/mixins\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/core/components/Breadcrumbs/Breadcrumbs.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], @@ -970,26 +967,18 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/core/components/GraphNG/GraphNG.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/Plot\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/config/UPlotConfigBuilder\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/config/UPlotScaleBuilder\' import is restricted from being used by a pattern. Import from the public export instead.", "3"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "4"], - [0, 0, 0, "Do not use any type assertions.", "5"], - [0, 0, 0, "Do not use any type assertions.", "6"], - [0, 0, 0, "Do not use any type assertions.", "7"], - [0, 0, 0, "Do not use any type assertions.", "8"], - [0, 0, 0, "Unexpected any. Specify a different type.", "9"], - [0, 0, 0, "Unexpected any. Specify a different type.", "10"] + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "Do not use any type assertions.", "2"], + [0, 0, 0, "Do not use any type assertions.", "3"], + [0, 0, 0, "Unexpected any. Specify a different type.", "4"], + [0, 0, 0, "Unexpected any. Specify a different type.", "5"] ], "public/app/core/components/GraphNG/utils.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/joinDataFrames\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], [0, 0, 0, "\'@grafana/data/src/transformations/transformers/nulls/nullInsertThreshold\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], [0, 0, 0, "\'@grafana/data/src/transformations/transformers/nulls/nullToUndefThreshold\' import is restricted from being used by a pattern. Import from the public export instead.", "2"] ], - "public/app/core/components/Indent/Indent.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Layout/utils/responsiveness\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/core/components/Layers/LayerDragDropList.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], @@ -1006,25 +995,14 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] ], - "public/app/core/components/NestedFolderPicker/NestedFolderList.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Text/Text\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], - "public/app/core/components/NestedFolderPicker/Trigger.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/themes/mixins\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/core/components/OptionsUI/color.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/ColorPicker/ColorSwatch\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/core/components/OptionsUI/fieldColor.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/core/components/OptionsUI/registry.tsx:5381": [ - [0, 0, 0, "\'@grafana/data/src/field/overrides/processors\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] - ], - "public/app/core/components/OptionsUI/slider.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Slider/styles\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] + [0, 0, 0, "\'@grafana/data/src/field/overrides/processors\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/core/components/OptionsUI/units.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] @@ -1036,9 +1014,6 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] ], - "public/app/core/components/PasswordField/PasswordField.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Input/Input\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/core/components/PluginHelp/PluginHelp.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], @@ -1046,23 +1021,16 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/core/components/RolePicker/RoleMenuGroupOption.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Select/getSelectStyles\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/core/components/RolePicker/RoleMenuOption.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Select/getSelectStyles\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] - ], - "public/app/core/components/RolePicker/RolePickerInput.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/themes/mixins\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/core/components/RolePicker/RolePickerMenu.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Select/getSelectStyles\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/core/components/RolePicker/RolePickerSubMenu.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Select/getSelectStyles\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/core/components/RolePickerDrawer/RolePickerBadges.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] @@ -1112,19 +1080,10 @@ exports[`better eslint`] = { "public/app/core/components/TagFilter/TagOption.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], - "public/app/core/components/TimeSeries/TimeSeries.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/PlotLegend\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/config/UPlotConfigBuilder\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/themes/ThemeContext\' import is restricted from being used by a pattern. Import from the public export instead.", "2"] - ], "public/app/core/components/TimeSeries/utils.ts:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/config/UPlotConfigBuilder\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/config/gradientFills\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/internal\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "3"], - [0, 0, 0, "Do not use any type assertions.", "4"], - [0, 0, 0, "Unexpected any. Specify a different type.", "5"], - [0, 0, 0, "Unexpected any. Specify a different type.", "6"] + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Unexpected any. Specify a different type.", "1"], + [0, 0, 0, "Unexpected any. Specify a different type.", "2"] ], "public/app/core/components/TimelineChart/timeline.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/themes/colorManipulator\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] @@ -1132,16 +1091,12 @@ exports[`better eslint`] = { "public/app/core/components/TimelineChart/utils.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/joinDataFrames\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], [0, 0, 0, "\'@grafana/data/src/transformations/transformers/nulls/nullInsertThreshold\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/data/src/transformations/transformers/nulls/nullToValue\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "3"] + [0, 0, 0, "\'@grafana/data/src/transformations/transformers/nulls/nullToValue\' import is restricted from being used by a pattern. Import from the public export instead.", "2"] ], "public/app/core/config.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`Settings\`)", "0"], [0, 0, 0, "Do not re-export imported variable (\`config\`)", "1"] ], - "public/app/core/context/ModalsContextProvider.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Modal/ModalsContext\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/core/core.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`JsonExplorer\`)", "0"], [0, 0, 0, "Do not re-export imported variable (\`TimeSeries\`)", "1"], @@ -1259,32 +1214,16 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "1"] ], "public/app/features/actions/ActionEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Forms/Field\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/Forms/InlineField\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/Forms/InlineFieldRow\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup\' import is restricted from being used by a pattern. Import from the public export instead.", "3"], - [0, 0, 0, "\'@grafana/ui/src/components/JSONFormatter/JSONFormatter\' import is restricted from being used by a pattern. Import from the public export instead.", "4"], - [0, 0, 0, "\'@grafana/ui/src/themes\' import is restricted from being used by a pattern. Import from the public export instead.", "5"], - [0, 0, 0, "\'@grafana/ui/src/utils/i18n\' import is restricted from being used by a pattern. Import from the public export instead.", "6"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "7"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "8"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "9"] - ], - "public/app/features/actions/ActionEditorModalContent.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Button\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/Modal/Modal\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"] ], "public/app/features/actions/ParamsEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/IconButton/IconButton\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/Input/Input\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/Layout/Stack/Stack\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/Select/Select\' import is restricted from being used by a pattern. Import from the public export instead.", "3"], - [0, 0, 0, "\'@grafana/ui/src/themes\' import is restricted from being used by a pattern. Import from the public export instead.", "4"], - [0, 0, 0, "Do not use any type assertions.", "5"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "6"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "7"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "8"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "9"] + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"] ], "public/app/features/admin/AdminEditOrgPage.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], @@ -1297,12 +1236,8 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "3"] ], "public/app/features/admin/AdminOrgsTable.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/unstable\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"] - ], - "public/app/features/admin/AdminSettingsTable.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/unstable\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] ], "public/app/features/admin/OrgRolePicker.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] @@ -2103,9 +2038,6 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"] ], - "public/app/features/alerting/unified/components/rule-editor/GrafanaAlertStatePicker.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Select/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], @@ -2226,18 +2158,17 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] ], "public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Select/MultiValue\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "5"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "5"], [0, 0, 0, "No untranslated strings. Wrap text with ", "6"], [0, 0, 0, "No untranslated strings. Wrap text with ", "7"], [0, 0, 0, "No untranslated strings. Wrap text with ", "8"], [0, 0, 0, "No untranslated strings. Wrap text with ", "9"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "10"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "11"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "10"] ], "public/app/features/alerting/unified/components/rule-editor/dag.test.ts:5381": [ [0, 0, 0, "\'@grafana/runtime/src/utils/DataSourceWithBackend\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] @@ -2757,9 +2688,6 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "4"], [0, 0, 0, "Unexpected any. Specify a different type.", "5"] ], - "public/app/features/alerting/unified/plugins/PluginOriginBadge.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Icon/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/alerting/unified/rule-editor/CloneRuleEditor.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], @@ -2970,8 +2898,7 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "0"] ], "public/app/features/browse-dashboards/components/NameCell.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Icon/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "1"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "0"] ], "public/app/features/browse-dashboards/state/index.ts:5381": [ [0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"], @@ -2981,10 +2908,6 @@ exports[`better eslint`] = { "public/app/features/canvas/element.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/panel/PanelPlugin\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], - "public/app/features/canvas/elements/metricValue.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] - ], "public/app/features/canvas/elements/notFound.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"] ], @@ -3501,24 +3424,14 @@ exports[`better eslint`] = { "public/app/features/dashboard-scene/sharing/ShareButton/ShareButton.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], - "public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/ConfigEmailSharing/ConfigEmailSharing.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Input/Input\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/ConfigEmailSharing/EmailListConfiguration.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], - "public/app/features/dashboard-scene/sharing/ShareButton/share-externally/ShareConfiguration.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Switch/Switch\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/dashboard-scene/sharing/ShareButton/share-snapshot/ShareSnapshot.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/features/dashboard-scene/sharing/ShareButton/share-snapshot/UpsertSnapshot.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Input/Input\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] - ], - "public/app/features/dashboard-scene/sharing/ShareDrawer/ShareDrawerConfirmAction.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/ConfirmModal/ConfirmContent\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/features/dashboard-scene/sharing/public-dashboards/ConfigPublicDashboard.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"] @@ -3721,10 +3634,9 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "3"] ], "public/app/features/dashboard/components/PanelEditor/OverrideCategoryTitle.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "1"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"] + [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"] ], "public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx:5381": [ [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"], @@ -3745,20 +3657,16 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/features/dashboard/components/PanelEditor/PanelNotSupported.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Layout/Layout\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'Layout\' import from \'@grafana/ui/src/components/Layout/Layout\' is restricted from being used by a pattern. Use Stack component instead.", "1"], - [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "2"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "3"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "0"] ], "public/app/features/dashboard/components/PanelEditor/VisualizationButton.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] ], "public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Forms/Field\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], - [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "3"] + [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"] ], "public/app/features/dashboard/components/PanelEditor/getFieldOverrideElements.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], @@ -3873,21 +3781,17 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], "public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Layout/Layout\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui/src\' is restricted from being used by a pattern. Use Stack component instead.", "1"], - [0, 0, 0, "\'Layout\' import from \'@grafana/ui/src/components/Layout/Layout\' is restricted from being used by a pattern. Use Stack component instead.", "2"] + [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"] ], "public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/Configuration.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Layout/Layout\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'Layout\' import from \'@grafana/ui/src/components/Layout/Layout\' is restricted from being used by a pattern. Use Stack component instead.", "1"], - [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui/src\' is restricted from being used by a pattern. Use Stack component instead.", "2"] + [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"] ], "public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/AcknowledgeCheckboxes.tsx:5381": [ - [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui/src\' is restricted from being used by a pattern. Use Stack component instead.", "0"], - [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui/src\' is restricted from being used by a pattern. Use Stack component instead.", "1"] + [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"], + [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "1"] ], "public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"] @@ -3898,18 +3802,14 @@ exports[`better eslint`] = { "public/app/features/dashboard/components/ShareModal/ViewJsonModal.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], - "public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/PanelChrome/LoadingIndicator\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/text/sanitize\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/text/sanitize\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/Button\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "Do not use any type assertions.", "2"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], - [0, 0, 0, "Unexpected any. Specify a different type.", "4"] + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], + [0, 0, 0, "Unexpected any. Specify a different type.", "3"] ], "public/app/features/dashboard/components/SubMenu/SubMenu.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] @@ -4002,9 +3902,6 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings. Wrap text with ", "1"] ], - "public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotice.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/themes/mixins\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/dashboard/dashgrid/PanelLinks.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], @@ -4033,11 +3930,11 @@ exports[`better eslint`] = { "public/app/features/dashboard/state/DashboardMigrator.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/labelsToFields\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], [0, 0, 0, "\'@grafana/data/src/transformations/transformers/merge\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/Table/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], + [0, 0, 0, "Do not use any type assertions.", "2"], [0, 0, 0, "Do not use any type assertions.", "3"], [0, 0, 0, "Do not use any type assertions.", "4"], [0, 0, 0, "Do not use any type assertions.", "5"], - [0, 0, 0, "Do not use any type assertions.", "6"], + [0, 0, 0, "Unexpected any. Specify a different type.", "6"], [0, 0, 0, "Unexpected any. Specify a different type.", "7"], [0, 0, 0, "Unexpected any. Specify a different type.", "8"], [0, 0, 0, "Unexpected any. Specify a different type.", "9"], @@ -4060,8 +3957,7 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "26"], [0, 0, 0, "Unexpected any. Specify a different type.", "27"], [0, 0, 0, "Unexpected any. Specify a different type.", "28"], - [0, 0, 0, "Unexpected any. Specify a different type.", "29"], - [0, 0, 0, "Unexpected any. Specify a different type.", "30"] + [0, 0, 0, "Unexpected any. Specify a different type.", "29"] ], "public/app/features/dashboard/state/DashboardModel.repeat.test.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], @@ -4259,9 +4155,6 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"] ], - "public/app/features/dimensions/editors/ColorDimensionEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/dimensions/editors/FileUploader.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings. Wrap text with ", "1"] @@ -4271,17 +4164,15 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] ], "public/app/features/dimensions/editors/ResourceDimensionEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "5"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "4"] ], "public/app/features/dimensions/editors/ResourcePicker.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/utils/closePopover\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "2"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "1"] ], "public/app/features/dimensions/editors/ResourcePickerPopover.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], @@ -4290,24 +4181,21 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "3"] ], "public/app/features/dimensions/editors/ScalarDimensionEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] + ], + "public/app/features/dimensions/editors/ScaleDimensionEditor.tsx:5381": [ + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"] ], - "public/app/features/dimensions/editors/ScaleDimensionEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"] - ], "public/app/features/dimensions/editors/TextDimensionEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "Do not use any type assertions.", "2"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "5"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "6"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "5"] ], "public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.tsx:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], @@ -4382,8 +4270,7 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "0"] ], "public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Tooltip\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], "public/app/features/explore/CorrelationEditorModeBar.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], @@ -4422,7 +4309,7 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "3"] ], "public/app/features/explore/Explore.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Table/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], @@ -4430,8 +4317,7 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "5"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "6"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "7"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "8"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "9"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "8"] ], "public/app/features/explore/ExploreRunQueryButton.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], @@ -4460,7 +4346,7 @@ exports[`better eslint`] = { [0, 0, 0, "\'@grafana/data/src/transformations/transformers/organize\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/features/explore/Logs/Logs.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/VizLegend/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], @@ -4469,9 +4355,8 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "6"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "7"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "8"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "9"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "10"], - [0, 0, 0, "Unexpected any. Specify a different type.", "11"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "9"], + [0, 0, 0, "Unexpected any. Specify a different type.", "10"] ], "public/app/features/explore/Logs/LogsColumnSearch.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] @@ -4503,9 +4388,6 @@ exports[`better eslint`] = { "public/app/features/explore/Logs/LogsTable.test.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/organize\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], - "public/app/features/explore/Logs/LogsTable.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Table/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/explore/Logs/LogsTableAvailableFields.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], @@ -4597,26 +4479,24 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "2"] ], "public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Button\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "2"], [0, 0, 0, "No untranslated strings. Wrap text with ", "3"], [0, 0, 0, "No untranslated strings. Wrap text with ", "4"], [0, 0, 0, "No untranslated strings. Wrap text with ", "5"], [0, 0, 0, "No untranslated strings. Wrap text with ", "6"], [0, 0, 0, "No untranslated strings. Wrap text with ", "7"], [0, 0, 0, "No untranslated strings. Wrap text with ", "8"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "9"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "10"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "9"] ], "public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Button\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "3"], [0, 0, 0, "No untranslated strings. Wrap text with ", "4"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "5"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "6"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "5"] ], "public/app/features/explore/TraceView/components/TracePageHeader/SpanFilters/SpanFilters.tsx:5381": [ [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"], @@ -4995,8 +4875,7 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "5"] ], "public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/unstable\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "1"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "0"] ], "public/app/features/library-panels/components/LibraryPanelInfo/LibraryPanelInfo.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], @@ -5139,9 +5018,6 @@ exports[`better eslint`] = { "public/app/features/manage-dashboards/components/SnapshotListTable.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"] ], - "public/app/features/manage-dashboards/components/SnapshotListTableRow.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/unstable\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/manage-dashboards/state/actions.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"], @@ -5164,13 +5040,9 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"] ], "public/app/features/migrate-to-cloud/onprem/NameCell.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Icon/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], [0, 0, 0, "No untranslated strings. Wrap text with ", "1"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "2"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "3"] - ], - "public/app/features/migrate-to-cloud/shared/AlertWithTraceID.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Alert/Alert\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "2"] ], "public/app/features/notifications/StoredNotifications.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], @@ -5229,10 +5101,9 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "3"] ], "public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/unstable\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], - [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "3"] + [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"] ], "public/app/features/panel/components/VizTypePicker/VisualizationSuggestions.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], @@ -5247,16 +5118,10 @@ exports[`better eslint`] = { "public/app/features/panel/panellinks/link_srv.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], - "public/app/features/playlist/PlaylistCard.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/unstable\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/playlist/PlaylistForm.tsx:5381": [ [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"], [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"] ], - "public/app/features/playlist/PlaylistPageList.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/unstable\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/playlist/PlaylistTableRows.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings. Wrap text with ", "1"], @@ -5399,9 +5264,8 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "2"] ], "public/app/features/plugins/admin/components/PluginListItem.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/unstable\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "2"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "1"] ], "public/app/features/plugins/admin/components/PluginSignatureDetailsBadge.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], @@ -5671,9 +5535,6 @@ exports[`better eslint`] = { "public/app/features/query/state/updateQueries.ts:5381": [ [0, 0, 0, "\'@grafana/runtime/src/utils/DataSourceWithBackend\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], - "public/app/features/sandbox/BenchmarksPage.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/ThemeDemos/EmotionPerfTest\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/sandbox/TestStuffPage.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], [0, 0, 0, "No untranslated strings. Wrap text with ", "1"], @@ -5684,10 +5545,8 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "0"] ], "public/app/features/search/page/components/SearchResultsTable.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Table/TableCell\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/Table/styles\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "3"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "1"] ], "public/app/features/search/page/components/columns.tsx:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], @@ -5783,14 +5642,13 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "7"] ], "public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/unstable\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "4"], [0, 0, 0, "No untranslated strings. Wrap text with ", "5"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "6"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "7"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "6"] ], "public/app/features/serviceaccounts/state/reducers.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"] @@ -5922,9 +5780,6 @@ exports[`better eslint`] = { [0, 0, 0, "\'@grafana/data/src/datetime/rangeutil\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], [0, 0, 0, "No untranslated strings. Wrap text with ", "1"] ], - "public/app/features/trails/DataTrailsHome.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Text/Text\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/trails/MetricScene.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], @@ -6007,8 +5862,7 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"] ], "public/app/features/transformers/calculateHeatmap/editor/helper.ts:5381": [ - [0, 0, 0, "\'@grafana/ui/src/options/builder\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"] + [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], "public/app/features/transformers/calculateHeatmap/heatmap.test.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/dataframe/processDataFrame\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] @@ -6083,9 +5937,9 @@ exports[`better eslint`] = { ], "public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/convertFieldType\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldTypeMatcherEditor\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "Do not use any type assertions.", "3"], + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "5"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "6"], @@ -6099,9 +5953,7 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "14"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "15"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "16"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "17"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "18"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "19"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "17"] ], "public/app/features/transformers/editors/EnumMappingEditor.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/convertFieldType\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], @@ -6130,10 +5982,9 @@ exports[`better eslint`] = { ], "public/app/features/transformers/editors/FormatStringTransformerEditor.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/formatString\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"] ], "public/app/features/transformers/editors/FormatTimeTransformerEditor.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/formatTime\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], @@ -6176,10 +6027,9 @@ exports[`better eslint`] = { ], "public/app/features/transformers/editors/JoinByFieldTransformerEditor.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/joinByField\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"] ], "public/app/features/transformers/editors/LabelsToFieldsTransformerEditor.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/labelsToFields\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], @@ -6239,9 +6089,9 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "5"] ], "public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "Do not use any type assertions.", "2"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "5"], @@ -6251,9 +6101,8 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "9"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "10"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "11"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "12"], - [0, 0, 0, "Unexpected any. Specify a different type.", "13"], - [0, 0, 0, "Unexpected any. Specify a different type.", "14"] + [0, 0, 0, "Unexpected any. Specify a different type.", "12"], + [0, 0, 0, "Unexpected any. Specify a different type.", "13"] ], "public/app/features/transformers/extractFields/components/JSONPathEditor.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], @@ -6308,10 +6157,9 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings. Wrap text with ", "9"] ], "public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"] + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"] ], "public/app/features/transformers/lookupGazetteer/fieldLookup.test.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/dataframe/processDataFrame\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], @@ -6321,15 +6169,14 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], "public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "1"], + [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "5"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "6"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "7"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "8"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "7"] ], "public/app/features/transformers/partitionByValues/partitionByValues.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/filterByName\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], @@ -6361,13 +6208,12 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "1"] ], "public/app/features/transformers/regression/regressionEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "2"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"], [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "4"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "5"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "6"] + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "5"] ], "public/app/features/transformers/spatial/optionsHelper.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/panel/PanelPlugin\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], @@ -6384,12 +6230,10 @@ exports[`better eslint`] = { [0, 0, 0, "\'@grafana/data/src/transformations/transformers/ids\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] ], "public/app/features/transformers/suggestionsInput/SuggestionsInput.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/DataLinks/DataLinkSuggestions\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/Input/Input\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"], [0, 0, 0, "Do not use any type assertions.", "2"], - [0, 0, 0, "Do not use any type assertions.", "3"], - [0, 0, 0, "Do not use any type assertions.", "4"], - [0, 0, 0, "Do not use any type assertions.", "5"] + [0, 0, 0, "Do not use any type assertions.", "3"] ], "public/app/features/transformers/timeSeriesTable/TimeSeriesTableTransformEditor.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], @@ -6398,13 +6242,12 @@ exports[`better eslint`] = { [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "3"] ], "public/app/features/users/TokenRevokedModal.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Modal/getModalStyles\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "1"], + [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], + [0, 0, 0, "No untranslated strings. Wrap text with ", "1"], [0, 0, 0, "No untranslated strings. Wrap text with ", "2"], [0, 0, 0, "No untranslated strings. Wrap text with ", "3"], [0, 0, 0, "No untranslated strings. Wrap text with ", "4"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "5"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "6"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "5"] ], "public/app/features/users/UsersActionBar.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], @@ -6538,9 +6381,6 @@ exports[`better eslint`] = { "public/app/features/variables/pickers/index.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`./OptionsPicker/OptionsPicker\`)", "0"] ], - "public/app/features/variables/pickers/shared/VariableLink.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/PanelChrome/LoadingIndicator\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/features/variables/pickers/shared/VariableOptions.tsx:5381": [ [0, 0, 0, "No untranslated strings in text props. Wrap text with or use t()", "0"], [0, 0, 0, "No untranslated strings. Wrap text with ", "1"], @@ -6666,9 +6506,6 @@ exports[`better eslint`] = { "public/app/features/visualization/data-hover/DataHoverView.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"] ], - "public/app/features/visualization/data-hover/ExemplarHoverView.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipRow\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/datasource/alertmanager/DataSource.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], @@ -6716,9 +6553,6 @@ exports[`better eslint`] = { "public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.test.tsx:5381": [ [0, 0, 0, "* import is invalid because \'Layout,HorizontalGroup,VerticalGroup\' from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"] ], - "public/app/plugins/datasource/azuremonitor/components/shared/Field.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Forms/InlineField\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/datasource/azuremonitor/types/index.ts:5381": [ [0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"], [0, 0, 0, "Do not use export all (\`export * from ...\`)", "1"], @@ -6826,12 +6660,6 @@ exports[`better eslint`] = { [0, 0, 0, "Do not re-export imported variable (\`./thirdArgAfterSearchQuery\`)", "4"], [0, 0, 0, "Do not re-export imported variable (\`./withinStringQuery\`)", "5"] ], - "public/app/plugins/datasource/cloudwatch/components/CheatSheet/LogsCheatSheet.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/slate-plugins/slate-prism\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], - "public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/PPLQueryEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Monaco/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx:5381": [ [0, 0, 0, "* import is invalid because \'Layout,HorizontalGroup,VerticalGroup\' from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"] ], @@ -6841,9 +6669,6 @@ exports[`better eslint`] = { "public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryEditor.test.tsx:5381": [ [0, 0, 0, "Do not re-export imported variable (\`./MetricsQueryEditor/SQLCodeEditor\`)", "0"] ], - "public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupSelector.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Select/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/index.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`./MetricStatEditor\`)", "0"] ], @@ -7025,10 +6850,6 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "1"], [0, 0, 0, "Unexpected any. Specify a different type.", "2"] ], - "public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOffset\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneTitle\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] - ], "public/app/plugins/datasource/grafana/datasource.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"], @@ -7201,15 +7022,6 @@ exports[`better eslint`] = { [0, 0, 0, "Do not re-export imported variable (\`Datasource\`)", "0"], [0, 0, 0, "Do not re-export imported variable (\`MixedDatasource\`)", "1"] ], - "public/app/plugins/datasource/mssql/azureauth/AzureAuthSettings.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/DataSourceSettings/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], - "public/app/plugins/datasource/mssql/azureauth/AzureCredentialsForm.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], - "public/app/plugins/datasource/mssql/types.ts:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/DataSourceSettings/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/datasource/opentsdb/datasource.d.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], @@ -7236,12 +7048,6 @@ exports[`better eslint`] = { "public/app/plugins/datasource/parca/webpack.config.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`config\`)", "0"] ], - "public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/DataSourceSettings/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], - "public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/DataSourceSettings/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/datasource/tempo/QueryField.tsx:5381": [ [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"] ], @@ -7306,47 +7112,24 @@ exports[`better eslint`] = { [0, 0, 0, "Do not re-export imported variable (\`config\`)", "0"] ], "public/app/plugins/panel/annolist/AnnoListPanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/List/AbstractList\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"] - ], - "public/app/plugins/panel/barchart/BarChartLegend.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], - "public/app/plugins/panel/barchart/BarChartPanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] + [0, 0, 0, "Do not use any type assertions.", "0"] ], "public/app/plugins/panel/barchart/TickSpacingEditor.tsx:5381": [ [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"] ], "public/app/plugins/panel/barchart/bars.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/themes/colorManipulator\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "Do not use any type assertions.", "3"] - ], - "public/app/plugins/panel/barchart/module.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/options/builder/tooltip\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] + [0, 0, 0, "Do not use any type assertions.", "1"] ], "public/app/plugins/panel/barchart/quadtree.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], "public/app/plugins/panel/barchart/utils.ts:5381": [ - [0, 0, 0, "\'@grafana/data/src/field/fieldState\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "2"] - ], - "public/app/plugins/panel/bargauge/BarGaugeLegend.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], - "public/app/plugins/panel/bargauge/BarGaugePanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/DataLinks/DataLinksContextMenu\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] + [0, 0, 0, "\'@grafana/data/src/field/fieldState\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/candlestick/CandlestickPanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/config/UPlotScaleBuilder\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "Do not use any type assertions.", "3"], - [0, 0, 0, "Unexpected any. Specify a different type.", "4"] + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Unexpected any. Specify a different type.", "1"] ], "public/app/plugins/panel/candlestick/fields.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/joinDataFrames\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] @@ -7362,12 +7145,7 @@ exports[`better eslint`] = { [0, 0, 0, "Do not re-export imported variable (\`defaultCandlestickColors\`)", "7"] ], "public/app/plugins/panel/canvas/components/CanvasTooltip.tsx:5381": [ - [0, 0, 0, "\'@grafana/data/src/types/action\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipContent\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipFooter\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipHeader\' import is restricted from being used by a pattern. Import from the public export instead.", "3"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/types\' import is restricted from being used by a pattern. Import from the public export instead.", "4"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/plugins/CloseButton\' import is restricted from being used by a pattern. Import from the public export instead.", "5"] + [0, 0, 0, "\'@grafana/data/src/types/action\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/canvas/editor/connectionEditor.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/utils/OptionsUIBuilders\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] @@ -7386,8 +7164,7 @@ exports[`better eslint`] = { [0, 0, 0, "\'@grafana/data/src/panel/PanelPlugin\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx:5381": [ - [0, 0, 0, "\'@grafana/data/src/transformations/transformers/convertFieldType\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/Menu/MenuDivider\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] + [0, 0, 0, "\'@grafana/data/src/transformations/transformers/convertFieldType\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/debug/CursorView.tsx:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], @@ -7400,18 +7177,12 @@ exports[`better eslint`] = { "public/app/plugins/panel/gauge/GaugeMigrations.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], - "public/app/plugins/panel/gauge/GaugePanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/DataLinks/DataLinksContextMenu\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/panel/geomap/components/MarkersLegend.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/field/scale\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"], [0, 0, 0, "Do not use any type assertions.", "2"], [0, 0, 0, "Unexpected any. Specify a different type.", "3"] ], - "public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/panel/geomap/editor/GeomapStyleRulesEditor.tsx:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"] ], @@ -7434,8 +7205,7 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "12"] ], "public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldValueMatcher\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"] + [0, 0, 0, "Do not use any type assertions.", "0"] ], "public/app/plugins/panel/geomap/editor/layerEditor.tsx:5381": [ [0, 0, 0, "\'@grafana/data/src/utils/OptionsUIBuilders\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] @@ -7471,23 +7241,12 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "0"] ], "public/app/plugins/panel/heatmap/HeatmapPanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "Unexpected any. Specify a different type.", "2"] - ], - "public/app/plugins/panel/heatmap/HeatmapTooltip.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipContent\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipFooter\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipHeader\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipWrapper\' import is restricted from being used by a pattern. Import from the public export instead.", "3"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/types\' import is restricted from being used by a pattern. Import from the public export instead.", "4"] + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Unexpected any. Specify a different type.", "1"] ], "public/app/plugins/panel/heatmap/migrations.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], - "public/app/plugins/panel/heatmap/module.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/options/builder\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/panel/heatmap/palettes.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"] @@ -7516,24 +7275,13 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "16"] ], "public/app/plugins/panel/histogram/Histogram.tsx:5381": [ - [0, 0, 0, "\'@grafana/data/src/transformations/transformers/histogram\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] + [0, 0, 0, "\'@grafana/data/src/transformations/transformers/histogram\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/histogram/HistogramPanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/data/src/transformations/transformers/histogram\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] - ], - "public/app/plugins/panel/histogram/HistogramTooltip.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipContent\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipFooter\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipHeader\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipWrapper\' import is restricted from being used by a pattern. Import from the public export instead.", "3"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/types\' import is restricted from being used by a pattern. Import from the public export instead.", "4"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "5"] + [0, 0, 0, "\'@grafana/data/src/transformations/transformers/histogram\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/histogram/module.tsx:5381": [ - [0, 0, 0, "\'@grafana/data/src/transformations/transformers/histogram\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/options/builder\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] + [0, 0, 0, "\'@grafana/data/src/transformations/transformers/histogram\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/histogram/utils.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/histogram\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] @@ -7550,9 +7298,6 @@ exports[`better eslint`] = { "public/app/plugins/panel/logs/types.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`./panelcfg.gen\`)", "0"] ], - "public/app/plugins/panel/news/component/News.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/unstable\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/panel/nodeGraph/Edge.tsx:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"] ], @@ -7567,9 +7312,6 @@ exports[`better eslint`] = { [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "1"], [0, 0, 0, "Unexpected any. Specify a different type.", "2"] ], - "public/app/plugins/panel/nodeGraph/editor/ArcOptionsEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/panel/nodeGraph/index.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`./NodeGraph\`)", "0"] ], @@ -7579,48 +7321,22 @@ exports[`better eslint`] = { "public/app/plugins/panel/nodeGraph/types.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`./panelcfg.gen\`)", "0"] ], - "public/app/plugins/panel/piechart/PieChart.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/themes/mixins\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/utils/useComponetInstanceId\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] - ], "public/app/plugins/panel/piechart/migrations.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"] ], - "public/app/plugins/panel/piechart/module.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/options/builder/tooltip\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/panel/stat/StatMigrations.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], "public/app/plugins/panel/stat/StatPanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/data/src/field/fieldOverrides\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/DataLinks/DataLinksContextMenu\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] - ], - "public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], - "public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipContent\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipFooter\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipHeader\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipWrapper\' import is restricted from being used by a pattern. Import from the public export instead.", "3"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/types\' import is restricted from being used by a pattern. Import from the public export instead.", "4"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "5"] + [0, 0, 0, "\'@grafana/data/src/field/fieldOverrides\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/state-timeline/migrations.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"] ], - "public/app/plugins/panel/status-history/StatusHistoryPanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], - "public/app/plugins/panel/table/TablePanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Table/types\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/Table/SparklineCell\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "1"] + [0, 0, 0, "\'VerticalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"] ], "public/app/plugins/panel/table/migrations.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/reduce\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], @@ -7641,17 +7357,6 @@ exports[`better eslint`] = { "public/app/plugins/panel/timeseries/SpanNullsEditor.tsx:5381": [ [0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"] ], - "public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], - "public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipContent\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipFooter\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipHeader\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipWrapper\' import is restricted from being used by a pattern. Import from the public export instead.", "3"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/types\' import is restricted from being used by a pattern. Import from the public export instead.", "4"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "5"] - ], "public/app/plugins/panel/timeseries/migrations.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"], @@ -7664,15 +7369,9 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "8"], [0, 0, 0, "Unexpected any. Specify a different type.", "9"] ], - "public/app/plugins/panel/timeseries/module.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/options/builder/tooltip\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin2.tsx:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], - "public/app/plugins/panel/timeseries/plugins/ThresholdControlsPlugin.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/internal\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] - ], "public/app/plugins/panel/timeseries/plugins/annotations2/AnnotationEditor2.tsx:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], @@ -7686,42 +7385,29 @@ exports[`better eslint`] = { "public/app/plugins/panel/timeseries/utils.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/transformations/transformers/convertFieldType\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], [0, 0, 0, "\'@grafana/data/src/transformations/transformers/nulls/nullInsertThreshold\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/data/src/transformations/transformers/nulls/nullToValue\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/internal\' import is restricted from being used by a pattern. Import from the public export instead.", "3"] + [0, 0, 0, "\'@grafana/data/src/transformations/transformers/nulls/nullToValue\' import is restricted from being used by a pattern. Import from the public export instead.", "2"] ], "public/app/plugins/panel/trend/TrendPanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/data/src/transformations/transformers/joinDataFrames\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2\' import is restricted from being used by a pattern. Import from the public export instead.", "1"] - ], - "public/app/plugins/panel/trend/module.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/options/builder/tooltip\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] + [0, 0, 0, "\'@grafana/data/src/transformations/transformers/joinDataFrames\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/xychart/SeriesEditor.tsx:5381": [ - [0, 0, 0, "\'@grafana/ui/src/components/MatchersUI/FieldNamePicker\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], + [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"], [0, 0, 0, "Do not use any type assertions.", "2"], - [0, 0, 0, "Do not use any type assertions.", "3"], - [0, 0, 0, "Do not use any type assertions.", "4"] + [0, 0, 0, "Do not use any type assertions.", "3"] ], "public/app/plugins/panel/xychart/XYChartPanel.tsx:5381": [ - [0, 0, 0, "\'@grafana/data/src/themes/colorManipulator\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/utils\' import is restricted from being used by a pattern. Import from the public export instead.", "2"] + [0, 0, 0, "\'@grafana/data/src/themes/colorManipulator\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/xychart/XYChartTooltip.tsx:5381": [ - [0, 0, 0, "\'@grafana/data/src/themes/colorManipulator\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipContent\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipFooter\' import is restricted from being used by a pattern. Import from the public export instead.", "2"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipHeader\' import is restricted from being used by a pattern. Import from the public export instead.", "3"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/VizTooltipWrapper\' import is restricted from being used by a pattern. Import from the public export instead.", "4"], - [0, 0, 0, "\'@grafana/ui/src/components/VizTooltip/types\' import is restricted from being used by a pattern. Import from the public export instead.", "5"] + [0, 0, 0, "\'@grafana/data/src/themes/colorManipulator\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] ], "public/app/plugins/panel/xychart/migrations.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"] ], "public/app/plugins/panel/xychart/scatter.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/themes/colorManipulator\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/components/uPlot/types\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], + [0, 0, 0, "Do not use any type assertions.", "1"], [0, 0, 0, "Do not use any type assertions.", "2"], [0, 0, 0, "Do not use any type assertions.", "3"], [0, 0, 0, "Do not use any type assertions.", "4"], @@ -7735,11 +7421,10 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "12"], [0, 0, 0, "Do not use any type assertions.", "13"], [0, 0, 0, "Do not use any type assertions.", "14"], - [0, 0, 0, "Do not use any type assertions.", "15"], + [0, 0, 0, "Unexpected any. Specify a different type.", "15"], [0, 0, 0, "Unexpected any. Specify a different type.", "16"], [0, 0, 0, "Unexpected any. Specify a different type.", "17"], - [0, 0, 0, "Unexpected any. Specify a different type.", "18"], - [0, 0, 0, "Unexpected any. Specify a different type.", "19"] + [0, 0, 0, "Unexpected any. Specify a different type.", "18"] ], "public/app/plugins/panel/xychart/utils.ts:5381": [ [0, 0, 0, "\'@grafana/data/src/field/fieldState\' import is restricted from being used by a pattern. Import from the public export instead.", "0"] @@ -7875,11 +7560,6 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "2"], [0, 0, 0, "Unexpected any. Specify a different type.", "3"], [0, 0, 0, "Unexpected any. Specify a different type.", "4"] - ], - "scripts/cli/generateSassVariableFiles.ts:5381": [ - [0, 0, 0, "\'@grafana/ui/src/themes/_variables.dark.scss.tmpl\' import is restricted from being used by a pattern. Import from the public export instead.", "0"], - [0, 0, 0, "\'@grafana/ui/src/themes/_variables.light.scss.tmpl\' import is restricted from being used by a pattern. Import from the public export instead.", "1"], - [0, 0, 0, "\'@grafana/ui/src/themes/_variables.scss.tmpl\' import is restricted from being used by a pattern. Import from the public export instead.", "2"] ] }` }; diff --git a/packages/README.md b/packages/README.md index 5b84585fcef..e7c9d6df315 100644 --- a/packages/README.md +++ b/packages/README.md @@ -1,6 +1,14 @@ # Grafana frontend packages -This document contains information about Grafana frontend package versioning and releases. +## Exporting code conventions + +`@grafana/ui` makes use of `exports` in package.json to define three entrypoints that Grafana core and Grafana plugins can access. Before exposing anything in this package please consider the table below. + +| Entrypoint Name | Import Path | Description | Available to Grafana | Available to plugins | +| --------------- | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------- | -------------------- | +| `./` | `@grafana/ui` | The public API entrypoint. If the code is stable and you want to share it everywhere, this is the place to export it. | ✅ | ✅ | +| `./unstable` | `@grafana/ui/unstable` | The public API entrypoint for all experimental code. If you want to iterate and test code from Grafana and plugins, this is the place to export it. | ✅ | ✅ | +| `./internal` | `@grafana/ui/internal` | The private API entrypoint for internal code shared with Grafana. If you need to import code in Grafana but don't want to expose it to plugins, this is the place to export it. | ✅ | ❌ | ## Versioning diff --git a/packages/grafana-plugin-configs/tsconfig.json b/packages/grafana-plugin-configs/tsconfig.json index 81e50af6c47..1790c28c284 100644 --- a/packages/grafana-plugin-configs/tsconfig.json +++ b/packages/grafana-plugin-configs/tsconfig.json @@ -3,12 +3,14 @@ "jsx": "react-jsx", "alwaysStrict": true, "declaration": false, - "resolveJsonModule": true + "resolveJsonModule": true, + "moduleResolution": "bundler" }, "ts-node": { "compilerOptions": { "module": "commonjs", "target": "es5", + "moduleResolution": "Node", "esModuleInterop": true }, "transpileOnly": true diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 3beb518521f..d48a36d31d2 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -18,6 +18,22 @@ }, "main": "src/index.ts", "types": "src/index.ts", + "module": "src/index.ts", + "exports": { + "./package.json": "./package.json", + ".": { + "import": "./src/index.ts", + "require": "./src/index.ts" + }, + "./internal": { + "import": "./src/internal/index.ts", + "require": "./src/internal/index.ts" + }, + "./unstable": { + "import": "./src/unstable.ts", + "require": "./src/unstable.ts" + } + }, "publishConfig": { "main": "./dist/cjs/index.cjs", "module": "./dist/esm/index.mjs", diff --git a/packages/grafana-ui/src/internal/index.ts b/packages/grafana-ui/src/internal/index.ts new file mode 100644 index 00000000000..5dee05d7bb1 --- /dev/null +++ b/packages/grafana-ui/src/internal/index.ts @@ -0,0 +1,104 @@ +/** + * This file is used to share internal grafana/ui code with Grafana core. + * Note that these exports are also used within Enterprise. + * + * Through the exports declared in package.json we can import this code in core Grafana and the grafana/ui + * package will continue to be able to access all code when it's published to npm as it's private to the package. + * + * During the yarn pack lifecycle the exports[./internal] property is deleted from the package.json + * preventing the code from being importable by plugins or other npm packages making it truly "internal". + * + */ + +export { UPlotChart } from '../components/uPlot/Plot'; +export { type AxisProps, UPLOT_AXIS_FONT_SIZE, timeUnitSize } from '../components/uPlot/config/UPlotAxisBuilder'; +export { + type Renderers, + UPlotConfigBuilder, + type UPlotConfigPrepFn, +} from '../components/uPlot/config/UPlotConfigBuilder'; +export { type ScaleProps } from '../components/uPlot/config/UPlotScaleBuilder'; +export { + pluginLog, + preparePlotData2, + getStackingGroups, + getDisplayValuesForCalcs, + type StackingGroup, +} from '../components/uPlot/utils'; +export { hasVisibleLegendSeries, PlotLegend } from '../components/uPlot/PlotLegend'; +export { getScaleGradientFn } from '../components/uPlot/config/gradientFills'; +export { buildScaleKey } from '../components/uPlot/internal'; +export { CloseButton } from '../components/uPlot/plugins/CloseButton'; +export { type TimeRange2, TooltipHoverMode } from '../components/uPlot/plugins/TooltipPlugin2'; +export type { FacetedData, FacetSeries } from '../components/uPlot/types'; + +export { getResponsiveStyle, type ResponsiveProp } from '../components/Layout/utils/responsiveness'; +export { ColorSwatch } from '../components/ColorPicker/ColorSwatch'; + +export { FieldNamePicker } from '../components/MatchersUI/FieldNamePicker'; +export { comparisonOperationOptions } from '../components/MatchersUI/FieldValueMatcher'; +export { + frameHasName, + getFrameFieldsDisplayNames, + useFieldDisplayNames, + useSelectOptions, +} from '../components/MatchersUI/utils'; +export type { FieldMatcherUIRegistryItem } from '../components/MatchersUI/types'; +export { RefIDMultiPicker, RefIDPicker, stringsToRegexp } from '../components/MatchersUI/FieldsByFrameRefIdMatcher'; +export { allFieldTypeIconOptions } from '../components/MatchersUI/FieldTypeMatcherEditor'; + +export { getStyles as getSliderStyles } from '../components/Slider/styles'; +export { getSelectStyles } from '../components/Select/getSelectStyles'; +export type { Props as InputProps } from '../components/Input/Input'; +export type { ModalsContextState } from '../components/Modal/ModalsContext'; +export { getModalStyles } from '../components/Modal/getModalStyles'; +export { MultiValueRemove, type MultiValueRemoveProps } from '../components/Select/MultiValue'; +export { getSvgSize } from '../components/Icon/utils'; +export { LoadingIndicator } from '../components/PanelChrome/LoadingIndicator'; +export { type ButtonLinkProps, getButtonStyles } from '../components/Button'; +export { + type TableSortByFieldState, + type TableFieldOptions, + TableCellDisplayMode, + FILTER_FOR_OPERATOR, + FILTER_OUT_OPERATOR, +} from '../components/Table/types'; +export { defaultSparklineCellConfig } from '../components/Table/SparklineCell'; +export { TableCell } from '../components/Table/TableCell'; +export { useTableStyles } from '../components/Table/styles'; +export { migrateTableDisplayModeToCellOptions } from '../components/Table/utils'; +export { type DataLinksContextMenuApi } from '../components/DataLinks/DataLinksContextMenu'; +export { MenuDivider } from '../components/Menu/MenuDivider'; +export { AbstractList } from '../components/List/AbstractList'; +export type { HttpSettingsBaseProps, AzureAuthSettings } from '../components/DataSourceSettings/types'; +export { TimeZoneOffset, formatUtcOffset } from '../components/DateTimePickers/TimeZonePicker/TimeZoneOffset'; +export { TimeZoneTitle } from '../components/DateTimePickers/TimeZonePicker/TimeZoneTitle'; +export type { CodeEditorProps } from '../components/Monaco/types'; +export { type Props as InlineFieldProps } from '../components/Forms/InlineField'; +export { DataLinkSuggestions } from '../components/DataLinks/DataLinkSuggestions'; +export { type Props as AlertProps } from '../components/Alert/Alert'; +export { type TooltipPlacement } from '../components/Tooltip'; +export { ConfirmContent, type ConfirmContentProps } from '../components/ConfirmModal/ConfirmContent'; + +export { EmotionPerfTest } from '../components/ThemeDemos/EmotionPerfTest'; + +export { VizTooltipContent } from '../components/VizTooltip/VizTooltipContent'; +export { VizTooltipFooter } from '../components/VizTooltip/VizTooltipFooter'; +export { VizTooltipHeader } from '../components/VizTooltip/VizTooltipHeader'; +export { VizTooltipWrapper } from '../components/VizTooltip/VizTooltipWrapper'; +export { VizTooltipRow } from '../components/VizTooltip/VizTooltipRow'; +export { getContentItems } from '../components/VizTooltip/utils'; +export { ColorIndicator, ColorPlacement, type VizTooltipItem } from '../components/VizTooltip/types'; +export { mapMouseEventToMode } from '../components/VizLegend/utils'; + +export { getFocusStyles, getMouseFocusStyles, getTooltipContainerStyles } from '../themes/mixins'; + +export { optsWithHideZeros } from '../options/builder/tooltip'; +export { StackingEditor } from '../options/builder/stacking'; +export { addHideFrom } from '../options/builder/hideSeries'; +export { ScaleDistributionEditor } from '../options/builder/axis'; + +export { useComponentInstanceId } from '../utils/useComponetInstanceId'; +export { closePopover } from '../utils/closePopover'; + +export { flattenTokens } from '../slate-plugins/slate-prism'; diff --git a/public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx b/public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx index 5695169614d..f2d327d02e4 100644 --- a/public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx +++ b/public/app/core/components/AppChrome/TopBar/TopSearchBarCommandPaletteTrigger.tsx @@ -5,7 +5,7 @@ import { useMemo, useState } from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; import { getInputStyles, Icon, Text, ToolbarButton, useStyles2, useTheme2 } from '@grafana/ui'; -import { getFocusStyles } from '@grafana/ui/src/themes/mixins'; +import { getFocusStyles } from '@grafana/ui/internal'; import { useMediaQueryChange } from 'app/core/hooks/useMediaQueryChange'; import { t } from 'app/core/internationalization'; import { getModKey } from 'app/core/utils/browser'; diff --git a/public/app/core/components/GraphNG/GraphNG.tsx b/public/app/core/components/GraphNG/GraphNG.tsx index 8a8904f23ff..3babaa7ac63 100644 --- a/public/app/core/components/GraphNG/GraphNG.tsx +++ b/public/app/core/components/GraphNG/GraphNG.tsx @@ -16,11 +16,7 @@ import { } from '@grafana/data'; import { DashboardCursorSync, VizLegendOptions } from '@grafana/schema'; import { Themeable2, VizLayout } from '@grafana/ui'; -import { UPlotChart } from '@grafana/ui/src/components/uPlot/Plot'; -import { AxisProps } from '@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder'; -import { Renderers, UPlotConfigBuilder } from '@grafana/ui/src/components/uPlot/config/UPlotConfigBuilder'; -import { ScaleProps } from '@grafana/ui/src/components/uPlot/config/UPlotScaleBuilder'; -import { pluginLog } from '@grafana/ui/src/components/uPlot/utils'; +import { UPlotChart, AxisProps, Renderers, UPlotConfigBuilder, ScaleProps, pluginLog } from '@grafana/ui/internal'; import { GraphNGLegendEvent, XYFieldMatchers } from './types'; import { preparePlotFrame as defaultPreparePlotFrame } from './utils'; diff --git a/public/app/core/components/Indent/Indent.tsx b/public/app/core/components/Indent/Indent.tsx index 237ed907984..f9988e94f11 100644 --- a/public/app/core/components/Indent/Indent.tsx +++ b/public/app/core/components/Indent/Indent.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { GrafanaTheme2, ThemeSpacingTokens } from '@grafana/data'; import { useStyles2 } from '@grafana/ui'; -import { getResponsiveStyle, ResponsiveProp } from '@grafana/ui/src/components/Layout/utils/responsiveness'; +import { getResponsiveStyle, ResponsiveProp } from '@grafana/ui/internal'; interface IndentProps { children?: React.ReactNode; diff --git a/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx b/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx index 7c42696f45e..5dd67667c33 100644 --- a/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx +++ b/public/app/core/components/NestedFolderPicker/NestedFolderList.tsx @@ -6,8 +6,7 @@ import { FixedSizeList as List } from 'react-window'; import InfiniteLoader from 'react-window-infinite-loader'; import { GrafanaTheme2 } from '@grafana/data'; -import { IconButton, useStyles2 } from '@grafana/ui'; -import { Text } from '@grafana/ui/src/components/Text/Text'; +import { IconButton, useStyles2, Text } from '@grafana/ui'; import { Indent } from 'app/core/components/Indent/Indent'; import { Trans } from 'app/core/internationalization'; import { childrenByParentUIDSelector, rootItemsSelector } from 'app/features/browse-dashboards/state'; diff --git a/public/app/core/components/NestedFolderPicker/Trigger.tsx b/public/app/core/components/NestedFolderPicker/Trigger.tsx index fe352b806d3..8e4be7c050b 100644 --- a/public/app/core/components/NestedFolderPicker/Trigger.tsx +++ b/public/app/core/components/NestedFolderPicker/Trigger.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { Icon, getInputStyles, useTheme2, Text } from '@grafana/ui'; -import { getFocusStyles, getMouseFocusStyles } from '@grafana/ui/src/themes/mixins'; +import { getFocusStyles, getMouseFocusStyles } from '@grafana/ui/internal'; import { Trans, t } from 'app/core/internationalization'; import { FolderPickerSkeleton } from './Skeleton'; diff --git a/public/app/core/components/OptionsUI/color.tsx b/public/app/core/components/OptionsUI/color.tsx index f52ba1677f4..d45ab4cf3d4 100644 --- a/public/app/core/components/OptionsUI/color.tsx +++ b/public/app/core/components/OptionsUI/color.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data'; import { useTheme2, useStyles2, ColorPicker, IconButton } from '@grafana/ui'; -import { ColorSwatch } from '@grafana/ui/src/components/ColorPicker/ColorSwatch'; +import { ColorSwatch } from '@grafana/ui/internal'; export interface ColorValueEditorSettings { placeholder?: string; diff --git a/public/app/core/components/OptionsUI/registry.tsx b/public/app/core/components/OptionsUI/registry.tsx index 28fcc7ab9e6..da20681e556 100644 --- a/public/app/core/components/OptionsUI/registry.tsx +++ b/public/app/core/components/OptionsUI/registry.tsx @@ -32,7 +32,7 @@ import { import { actionsOverrideProcessor } from '@grafana/data/src/field/overrides/processors'; import { FieldConfig } from '@grafana/schema'; import { RadioButtonGroup, TimeZonePicker, Switch } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; +import { FieldNamePicker } from '@grafana/ui/internal'; import { ThresholdsValueEditor } from 'app/features/dimensions/editors/ThresholdsEditor/thresholds'; import { ValueMappingsEditor } from 'app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditor'; diff --git a/public/app/core/components/OptionsUI/slider.tsx b/public/app/core/components/OptionsUI/slider.tsx index 74930dabcd9..b9bb41bbd90 100644 --- a/public/app/core/components/OptionsUI/slider.tsx +++ b/public/app/core/components/OptionsUI/slider.tsx @@ -5,7 +5,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'; import { StandardEditorProps, GrafanaTheme2, SliderFieldConfigSettings } from '@grafana/data'; import { useTheme2 } from '@grafana/ui'; -import { getStyles } from '@grafana/ui/src/components/Slider/styles'; +import { getSliderStyles } from '@grafana/ui/internal'; import { NumberInput } from './NumberInput'; @@ -86,7 +86,7 @@ export const SliderValueEditor = ({ value, onChange, item }: Props) => { ); // Styles - const styles = getStyles(theme, isHorizontal, Boolean(marks)); + const styles = getSliderStyles(theme, isHorizontal, Boolean(marks)); const stylesSlider = getStylesSlider(theme, inputWidth); const sliderInputClassNames = !isHorizontal ? [styles.sliderInputVertical] : []; diff --git a/public/app/core/components/PasswordField/PasswordField.tsx b/public/app/core/components/PasswordField/PasswordField.tsx index c69873f4a5b..97012b08956 100644 --- a/public/app/core/components/PasswordField/PasswordField.tsx +++ b/public/app/core/components/PasswordField/PasswordField.tsx @@ -2,7 +2,7 @@ import { forwardRef, useState } from 'react'; import { selectors } from '@grafana/e2e-selectors'; import { Input, IconButton } from '@grafana/ui'; -import { Props as InputProps } from '@grafana/ui/src/components/Input/Input'; +import { InputProps } from '@grafana/ui/internal'; interface Props extends Omit {} diff --git a/public/app/core/components/RolePicker/RoleMenuGroupOption.tsx b/public/app/core/components/RolePicker/RoleMenuGroupOption.tsx index 599b591dee3..11398370081 100644 --- a/public/app/core/components/RolePicker/RoleMenuGroupOption.tsx +++ b/public/app/core/components/RolePicker/RoleMenuGroupOption.tsx @@ -3,7 +3,7 @@ import { FormEvent, memo } from 'react'; import * as React from 'react'; import { Checkbox, Portal, useStyles2, useTheme2 } from '@grafana/ui'; -import { getSelectStyles } from '@grafana/ui/src/components/Select/getSelectStyles'; +import { getSelectStyles } from '@grafana/ui/internal'; import { getStyles } from './styles'; diff --git a/public/app/core/components/RolePicker/RoleMenuOption.tsx b/public/app/core/components/RolePicker/RoleMenuOption.tsx index b5ef7b02358..a9875515129 100644 --- a/public/app/core/components/RolePicker/RoleMenuOption.tsx +++ b/public/app/core/components/RolePicker/RoleMenuOption.tsx @@ -2,7 +2,7 @@ import { cx } from '@emotion/css'; import { forwardRef, FormEvent } from 'react'; import { Checkbox, Icon, Tooltip, useStyles2, useTheme2 } from '@grafana/ui'; -import { getSelectStyles } from '@grafana/ui/src/components/Select/getSelectStyles'; +import { getSelectStyles } from '@grafana/ui/internal'; import { Role } from 'app/types'; import { getStyles } from './styles'; diff --git a/public/app/core/components/RolePicker/RolePickerInput.tsx b/public/app/core/components/RolePicker/RolePickerInput.tsx index ad10f265878..1711393e3e9 100644 --- a/public/app/core/components/RolePicker/RolePickerInput.tsx +++ b/public/app/core/components/RolePicker/RolePickerInput.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { useStyles2, getInputStyles, sharedInputStyle, Tooltip, Icon, Spinner } from '@grafana/ui'; -import { getFocusStyles } from '@grafana/ui/src/themes/mixins'; +import { getFocusStyles } from '@grafana/ui/internal'; import { Trans } from 'app/core/internationalization'; import { Role } from '../../../types'; diff --git a/public/app/core/components/RolePicker/RolePickerMenu.tsx b/public/app/core/components/RolePicker/RolePickerMenu.tsx index 6cbde84c0fb..ee92a323704 100644 --- a/public/app/core/components/RolePicker/RolePickerMenu.tsx +++ b/public/app/core/components/RolePicker/RolePickerMenu.tsx @@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css'; import { useEffect, useRef, useState } from 'react'; import { Button, ScrollContainer, Stack, TextLink, useStyles2, useTheme2 } from '@grafana/ui'; -import { getSelectStyles } from '@grafana/ui/src/components/Select/getSelectStyles'; +import { getSelectStyles } from '@grafana/ui/internal'; import { Trans } from 'app/core/internationalization'; import { OrgRole, Role } from 'app/types'; diff --git a/public/app/core/components/RolePicker/RolePickerSubMenu.tsx b/public/app/core/components/RolePicker/RolePickerSubMenu.tsx index 925480a6e53..702a08ef443 100644 --- a/public/app/core/components/RolePicker/RolePickerSubMenu.tsx +++ b/public/app/core/components/RolePicker/RolePickerSubMenu.tsx @@ -1,7 +1,7 @@ import { cx } from '@emotion/css'; import { Button, ScrollContainer, Stack, useStyles2, useTheme2 } from '@grafana/ui'; -import { getSelectStyles } from '@grafana/ui/src/components/Select/getSelectStyles'; +import { getSelectStyles } from '@grafana/ui/internal'; import { Trans } from 'app/core/internationalization'; import { Role } from 'app/types'; diff --git a/public/app/core/components/TimeSeries/TimeSeries.tsx b/public/app/core/components/TimeSeries/TimeSeries.tsx index 197d468fc21..5af30da15c5 100644 --- a/public/app/core/components/TimeSeries/TimeSeries.tsx +++ b/public/app/core/components/TimeSeries/TimeSeries.tsx @@ -1,9 +1,8 @@ import { Component } from 'react'; import { DataFrame, TimeRange } from '@grafana/data'; -import { hasVisibleLegendSeries, PlotLegend } from '@grafana/ui/src/components/uPlot/PlotLegend'; -import { UPlotConfigBuilder } from '@grafana/ui/src/components/uPlot/config/UPlotConfigBuilder'; -import { withTheme2 } from '@grafana/ui/src/themes/ThemeContext'; +import { withTheme2 } from '@grafana/ui'; +import { hasVisibleLegendSeries, PlotLegend, UPlotConfigBuilder } from '@grafana/ui/internal'; import { GraphNG, GraphNGProps, PropDiffFn } from '../GraphNG/GraphNG'; diff --git a/public/app/core/components/TimeSeries/utils.ts b/public/app/core/components/TimeSeries/utils.ts index 8774299b1ed..1d6b445149b 100644 --- a/public/app/core/components/TimeSeries/utils.ts +++ b/public/app/core/components/TimeSeries/utils.ts @@ -59,10 +59,14 @@ for (let i = 0; i < BIN_INCRS.length; i++) { BIN_INCRS[i] = 2 ** i; } -import { UPlotConfigBuilder, UPlotConfigPrepFn } from '@grafana/ui/src/components/uPlot/config/UPlotConfigBuilder'; -import { getScaleGradientFn } from '@grafana/ui/src/components/uPlot/config/gradientFills'; -import { buildScaleKey } from '@grafana/ui/src/components/uPlot/internal'; -import { getStackingGroups, preparePlotData2 } from '@grafana/ui/src/components/uPlot/utils'; +import { + UPlotConfigBuilder, + UPlotConfigPrepFn, + getScaleGradientFn, + buildScaleKey, + getStackingGroups, + preparePlotData2, +} from '@grafana/ui/internal'; const defaultFormatter = (v: any, decimals: DecimalCount = 1) => (v == null ? '-' : v.toFixed(decimals)); diff --git a/public/app/core/components/TimelineChart/utils.ts b/public/app/core/components/TimelineChart/utils.ts index 5a727990631..bf38c4bc5c5 100644 --- a/public/app/core/components/TimelineChart/utils.ts +++ b/public/app/core/components/TimelineChart/utils.ts @@ -33,7 +33,7 @@ import { MappingType, } from '@grafana/schema'; import { FIXED_UNIT, UPlotConfigBuilder, UPlotConfigPrepFn, VizLegendItem } from '@grafana/ui'; -import { preparePlotData2, getStackingGroups } from '@grafana/ui/src/components/uPlot/utils'; +import { preparePlotData2, getStackingGroups } from '@grafana/ui/internal'; import { getConfig, TimelineCoreOptions } from './timeline'; diff --git a/public/app/core/context/ModalsContextProvider.tsx b/public/app/core/context/ModalsContextProvider.tsx index 7566fc52d04..69aea1874be 100644 --- a/public/app/core/context/ModalsContextProvider.tsx +++ b/public/app/core/context/ModalsContextProvider.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import { textUtil } from '@grafana/data'; import { locationService } from '@grafana/runtime'; import { ConfirmModal, ConfirmModalProps, ModalsContext } from '@grafana/ui'; -import { ModalsContextState } from '@grafana/ui/src/components/Modal/ModalsContext'; +import { ModalsContextState } from '@grafana/ui/internal'; import { ShowConfirmModalEvent, ShowModalReactEvent } from 'app/types/events'; import appEvents from '../app_events'; diff --git a/public/app/core/core.ts b/public/app/core/core.ts index 3895898176d..80421c5d2f3 100644 --- a/public/app/core/core.ts +++ b/public/app/core/core.ts @@ -1,4 +1,4 @@ -import { colors, JsonExplorer } from '@grafana/ui/'; +import { colors, JsonExplorer } from '@grafana/ui'; import appEvents from './app_events'; import { profiler } from './profiler'; diff --git a/public/app/features/actions/ActionEditor.tsx b/public/app/features/actions/ActionEditor.tsx index 81500b9332a..c2ca0a02701 100644 --- a/public/app/features/actions/ActionEditor.tsx +++ b/public/app/features/actions/ActionEditor.tsx @@ -2,14 +2,8 @@ import { css } from '@emotion/css'; import { memo } from 'react'; import { Action, GrafanaTheme2, httpMethodOptions, HttpRequestMethod, VariableSuggestion } from '@grafana/data'; -import { Switch } from '@grafana/ui/'; -import { Field } from '@grafana/ui/src/components/Forms/Field'; -import { InlineField } from '@grafana/ui/src/components/Forms/InlineField'; -import { InlineFieldRow } from '@grafana/ui/src/components/Forms/InlineFieldRow'; -import { RadioButtonGroup } from '@grafana/ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup'; -import { JSONFormatter } from '@grafana/ui/src/components/JSONFormatter/JSONFormatter'; -import { useStyles2 } from '@grafana/ui/src/themes'; -import { t } from '@grafana/ui/src/utils/i18n'; +import { Switch, Field, InlineField, InlineFieldRow, RadioButtonGroup, JSONFormatter, useStyles2 } from '@grafana/ui'; +import { t } from 'app/core/internationalization'; import { HTMLElementType, SuggestionsInput } from '../transformers/suggestionsInput/SuggestionsInput'; diff --git a/public/app/features/actions/ActionEditorModalContent.tsx b/public/app/features/actions/ActionEditorModalContent.tsx index 19a52898042..e23554b4c67 100644 --- a/public/app/features/actions/ActionEditorModalContent.tsx +++ b/public/app/features/actions/ActionEditorModalContent.tsx @@ -1,8 +1,7 @@ import { useState } from 'react'; import { Action, DataFrame, VariableSuggestion } from '@grafana/data'; -import { Button } from '@grafana/ui/src/components/Button'; -import { Modal } from '@grafana/ui/src/components/Modal/Modal'; +import { Button, Modal } from '@grafana/ui'; import { Trans } from 'app/core/internationalization'; import { ActionEditor } from './ActionEditor'; diff --git a/public/app/features/actions/ParamsEditor.tsx b/public/app/features/actions/ParamsEditor.tsx index 46287cadf89..30cfc925f36 100644 --- a/public/app/features/actions/ParamsEditor.tsx +++ b/public/app/features/actions/ParamsEditor.tsx @@ -2,11 +2,7 @@ import { css } from '@emotion/css'; import { useEffect, useState } from 'react'; import { contentTypeOptions, GrafanaTheme2, VariableSuggestion } from '@grafana/data'; -import { IconButton } from '@grafana/ui/src/components/IconButton/IconButton'; -import { Input } from '@grafana/ui/src/components/Input/Input'; -import { Stack } from '@grafana/ui/src/components/Layout/Stack/Stack'; -import { Select } from '@grafana/ui/src/components/Select/Select'; -import { useStyles2 } from '@grafana/ui/src/themes'; +import { IconButton, Input, Stack, Select, useStyles2 } from '@grafana/ui'; import { SuggestionsInput } from '../transformers/suggestionsInput/SuggestionsInput'; diff --git a/public/app/features/admin/AdminOrgsTable.tsx b/public/app/features/admin/AdminOrgsTable.tsx index 19d5a26c877..02a2de9cc6b 100644 --- a/public/app/features/admin/AdminOrgsTable.tsx +++ b/public/app/features/admin/AdminOrgsTable.tsx @@ -4,7 +4,7 @@ import Skeleton from 'react-loading-skeleton'; import { GrafanaTheme2 } from '@grafana/data'; import { Button, ConfirmModal, useStyles2 } from '@grafana/ui'; -import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable'; +import { SkeletonComponent, attachSkeleton } from '@grafana/ui/unstable'; import { contextSrv } from 'app/core/core'; import { Trans } from 'app/core/internationalization'; import { AccessControlAction, Organization } from 'app/types'; diff --git a/public/app/features/admin/AdminSettingsTable.tsx b/public/app/features/admin/AdminSettingsTable.tsx index e12cf5ceb99..aae74032841 100644 --- a/public/app/features/admin/AdminSettingsTable.tsx +++ b/public/app/features/admin/AdminSettingsTable.tsx @@ -2,7 +2,7 @@ import { Fragment } from 'react'; import Skeleton from 'react-loading-skeleton'; import { ScrollContainer, Text } from '@grafana/ui'; -import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable'; +import { SkeletonComponent, attachSkeleton } from '@grafana/ui/unstable'; import { Settings } from './AdminSettings'; diff --git a/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx b/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx index 62081fe419d..cc0284d753d 100644 --- a/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx +++ b/public/app/features/admin/UserListPublicDashboardPage/DashboardsListModalButton.tsx @@ -3,7 +3,7 @@ import { css, cx } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/src'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; import { config } from '@grafana/runtime'; -import { Button, LoadingPlaceholder, Modal, ModalsController, useStyles2 } from '@grafana/ui/src'; +import { Button, LoadingPlaceholder, Modal, ModalsController, useStyles2 } from '@grafana/ui'; import { Trans, t } from 'app/core/internationalization'; import { generatePublicDashboardConfigUrl, diff --git a/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx b/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx index fd978a9ba4a..1ca1f8d6656 100644 --- a/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx +++ b/public/app/features/admin/UserListPublicDashboardPage/DeleteUserModalButton.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/src'; import { config } from '@grafana/runtime'; -import { Button, Modal, ModalsController, useStyles2 } from '@grafana/ui/src'; +import { Button, Modal, ModalsController, useStyles2 } from '@grafana/ui'; import { Trans, t } from 'app/core/internationalization'; import { SessionUser } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils'; diff --git a/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx b/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx index 0034b8aec3b..f9fe56cf3e3 100644 --- a/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx +++ b/public/app/features/admin/UserListPublicDashboardPage/UserListPublicDashboardPage.tsx @@ -1,5 +1,5 @@ import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; -import { Icon, Stack, Tag, Tooltip } from '@grafana/ui/src'; +import { Icon, Stack, Tag, Tooltip } from '@grafana/ui'; import { Page } from 'app/core/components/Page/Page'; import { Trans, t } from 'app/core/internationalization'; diff --git a/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.tsx b/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.tsx index 913001ffe66..239de85bd2d 100644 --- a/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.tsx +++ b/public/app/features/alerting/unified/components/GrafanaAlertmanagerDeliveryWarning.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/src'; -import { Alert, useStyles2 } from '@grafana/ui/src'; +import { Alert, useStyles2 } from '@grafana/ui'; import { AlertmanagerChoice } from '../../../../plugins/datasource/alertmanager/types'; import { alertmanagerApi } from '../api/alertmanagerApi'; diff --git a/public/app/features/alerting/unified/components/rule-editor/CloudAlertPreview.tsx b/public/app/features/alerting/unified/components/rule-editor/CloudAlertPreview.tsx index 67e447f29a6..a9d67203d14 100644 --- a/public/app/features/alerting/unified/components/rule-editor/CloudAlertPreview.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/CloudAlertPreview.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { DataFrame, GrafanaTheme2 } from '@grafana/data/src'; -import { Icon, TagList, Tooltip, useStyles2 } from '@grafana/ui/src'; +import { Icon, TagList, Tooltip, useStyles2 } from '@grafana/ui'; import { labelsToTags } from '../../utils/labels'; import { AlertStateTag } from '../rules/AlertStateTag'; diff --git a/public/app/features/alerting/unified/components/rule-editor/GrafanaAlertStatePicker.tsx b/public/app/features/alerting/unified/components/rule-editor/GrafanaAlertStatePicker.tsx index ed4ef5c481b..d35fa16a328 100644 --- a/public/app/features/alerting/unified/components/rule-editor/GrafanaAlertStatePicker.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/GrafanaAlertStatePicker.tsx @@ -1,8 +1,7 @@ import { useMemo } from 'react'; import { SelectableValue } from '@grafana/data'; -import { Select } from '@grafana/ui'; -import { SelectBaseProps } from '@grafana/ui/src/components/Select/types'; +import { Select, SelectBaseProps } from '@grafana/ui'; import { GrafanaAlertStateDecision } from 'app/types/unified-alerting-dto'; type Props = Omit, 'options'> & { diff --git a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx index 841ca01cbde..e4e2bc2d7a5 100644 --- a/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/alert-rule-form/simplifiedRouting/route-settings/RouteSettings.tsx @@ -5,7 +5,7 @@ import { Controller, useFormContext } from 'react-hook-form'; import { GrafanaTheme2, SelectableValue } from '@grafana/data'; import { Field, FieldValidationMessage, InlineField, MultiSelect, Stack, Switch, Text, useStyles2 } from '@grafana/ui'; -import { MultiValueRemove, MultiValueRemoveProps } from '@grafana/ui/src/components/Select/MultiValue'; +import { MultiValueRemove, MultiValueRemoveProps } from '@grafana/ui/internal'; import { RuleFormValues } from 'app/features/alerting/unified/types/rule-form'; import { commonGroupByOptions, diff --git a/public/app/features/alerting/unified/components/rules/RuleConfigStatus.tsx b/public/app/features/alerting/unified/components/rules/RuleConfigStatus.tsx index c0ed270d66f..8b10c1388bf 100644 --- a/public/app/features/alerting/unified/components/rules/RuleConfigStatus.tsx +++ b/public/app/features/alerting/unified/components/rules/RuleConfigStatus.tsx @@ -3,7 +3,7 @@ import { useMemo } from 'react'; import { GrafanaTheme2 } from '@grafana/data/src'; import { config } from '@grafana/runtime/src'; -import { Icon, Tooltip, useStyles2 } from '@grafana/ui/src'; +import { Icon, Tooltip, useStyles2 } from '@grafana/ui'; import { CombinedRule } from '../../../../../types/unified-alerting'; import { checkEvaluationIntervalGlobalLimit } from '../../utils/config'; diff --git a/public/app/features/alerting/unified/home/PluginIntegrations.tsx b/public/app/features/alerting/unified/home/PluginIntegrations.tsx index bb0e0cbda24..f07a0738934 100644 --- a/public/app/features/alerting/unified/home/PluginIntegrations.tsx +++ b/public/app/features/alerting/unified/home/PluginIntegrations.tsx @@ -1,8 +1,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/'; -import { Stack, Text } from '@grafana/ui'; -import { useStyles2 } from '@grafana/ui/'; +import { Stack, Text, useStyles2 } from '@grafana/ui'; import { useAlertingHomePageExtensions } from '../plugins/useAlertingHomePageExtensions'; diff --git a/public/app/features/alerting/unified/plugins/PluginOriginBadge.tsx b/public/app/features/alerting/unified/plugins/PluginOriginBadge.tsx index 4f7a853fc95..03c1eca7620 100644 --- a/public/app/features/alerting/unified/plugins/PluginOriginBadge.tsx +++ b/public/app/features/alerting/unified/plugins/PluginOriginBadge.tsx @@ -1,7 +1,7 @@ import { useAsync } from 'react-use'; import { Badge, IconSize, Tooltip } from '@grafana/ui'; -import { getSvgSize } from '@grafana/ui/src/components/Icon/utils'; +import { getSvgSize } from '@grafana/ui/internal'; import { getPluginSettings } from '../../../plugins/pluginSettings'; diff --git a/public/app/features/browse-dashboards/components/NameCell.tsx b/public/app/features/browse-dashboards/components/NameCell.tsx index dbdc60eba51..6316f767cf2 100644 --- a/public/app/features/browse-dashboards/components/NameCell.tsx +++ b/public/app/features/browse-dashboards/components/NameCell.tsx @@ -4,7 +4,7 @@ import Skeleton from 'react-loading-skeleton'; import { GrafanaTheme2 } from '@grafana/data'; import { reportInteraction } from '@grafana/runtime'; import { Icon, IconButton, Link, Spinner, useStyles2, Text } from '@grafana/ui'; -import { getSvgSize } from '@grafana/ui/src/components/Icon/utils'; +import { getSvgSize } from '@grafana/ui/internal'; import { t } from 'app/core/internationalization'; import { getIconForItem } from 'app/features/search/service/utils'; diff --git a/public/app/features/canvas/elements/metricValue.tsx b/public/app/features/canvas/elements/metricValue.tsx index 0ddec47734a..24174962d2c 100644 --- a/public/app/features/canvas/elements/metricValue.tsx +++ b/public/app/features/canvas/elements/metricValue.tsx @@ -6,8 +6,7 @@ import { of } from 'rxjs'; import { DataFrame, FieldNamePickerConfigSettings, GrafanaTheme2, StandardEditorsRegistryItem } from '@grafana/data'; import { TextDimensionMode } from '@grafana/schema'; import { usePanelContext, useStyles2 } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; -import { frameHasName, getFrameFieldsDisplayNames } from '@grafana/ui/src/components/MatchersUI/utils'; +import { FieldNamePicker, frameHasName, getFrameFieldsDisplayNames } from '@grafana/ui/internal'; import { DimensionContext } from 'app/features/dimensions/context'; import { ColorDimensionEditor } from 'app/features/dimensions/editors/ColorDimensionEditor'; import { TextDimensionEditor } from 'app/features/dimensions/editors/TextDimensionEditor'; diff --git a/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/ConfigEmailSharing/ConfigEmailSharing.tsx b/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/ConfigEmailSharing/ConfigEmailSharing.tsx index 3838ab9f642..dc3fdf0f6b5 100644 --- a/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/ConfigEmailSharing/ConfigEmailSharing.tsx +++ b/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/ConfigEmailSharing/ConfigEmailSharing.tsx @@ -1,8 +1,7 @@ import { useForm } from 'react-hook-form'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors'; -import { Button, Divider, Field, FieldSet, Icon, Stack, Tooltip } from '@grafana/ui'; -import { Input } from '@grafana/ui/src/components/Input/Input'; +import { Button, Divider, Field, FieldSet, Icon, Input, Stack, Tooltip } from '@grafana/ui'; import { contextSrv } from 'app/core/core'; import { t, Trans } from 'app/core/internationalization'; import { publicDashboardApi, useAddRecipientMutation } from 'app/features/dashboard/api/publicDashboardApi'; diff --git a/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/ConfigEmailSharing/EmailListConfiguration.tsx b/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/ConfigEmailSharing/EmailListConfiguration.tsx index fa0f08e7de1..3ec97930fe9 100644 --- a/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/ConfigEmailSharing/EmailListConfiguration.tsx +++ b/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/ConfigEmailSharing/EmailListConfiguration.tsx @@ -2,8 +2,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors'; -import { Dropdown, Field, Icon, Menu, Spinner, Stack, Text, useStyles2 } from '@grafana/ui'; -import { IconButton } from '@grafana/ui/'; +import { Dropdown, Field, Icon, IconButton, Menu, Spinner, Stack, Text, useStyles2 } from '@grafana/ui'; import { t } from 'app/core/internationalization'; import { useReshareAccessToRecipientMutation, diff --git a/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/CreateEmailSharing.tsx b/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/CreateEmailSharing.tsx index 36870a2abf3..cafb3fcd25e 100644 --- a/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/CreateEmailSharing.tsx +++ b/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/EmailShare/CreateEmailSharing.tsx @@ -3,8 +3,7 @@ import { useForm } from 'react-hook-form'; import { GrafanaTheme2 } from '@grafana/data'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors'; -import { Button, Checkbox, FieldSet, Spinner, Stack } from '@grafana/ui'; -import { useStyles2 } from '@grafana/ui/'; +import { Button, Checkbox, FieldSet, Spinner, Stack, useStyles2 } from '@grafana/ui'; import { contextSrv } from 'app/core/core'; import { t, Trans } from 'app/core/internationalization'; import { useCreatePublicDashboardMutation } from 'app/features/dashboard/api/publicDashboardApi'; diff --git a/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/ShareConfiguration.tsx b/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/ShareConfiguration.tsx index 0838aba20c3..fced3c10698 100644 --- a/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/ShareConfiguration.tsx +++ b/public/app/features/dashboard-scene/sharing/ShareButton/share-externally/ShareConfiguration.tsx @@ -4,8 +4,7 @@ import { Controller, useForm } from 'react-hook-form'; import { GrafanaTheme2 } from '@grafana/data'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors'; import { sceneGraph } from '@grafana/scenes'; -import { FieldSet, Icon, Label, Spinner, Stack, Text, TimeRangeLabel, Tooltip, useStyles2 } from '@grafana/ui'; -import { Switch } from '@grafana/ui/src/components/Switch/Switch'; +import { FieldSet, Icon, Label, Spinner, Stack, Switch, Text, TimeRangeLabel, Tooltip, useStyles2 } from '@grafana/ui'; import { contextSrv } from 'app/core/core'; import { t, Trans } from 'app/core/internationalization'; import { publicDashboardApi, useUpdatePublicDashboardMutation } from 'app/features/dashboard/api/publicDashboardApi'; diff --git a/public/app/features/dashboard-scene/sharing/ShareButton/share-snapshot/UpsertSnapshot.tsx b/public/app/features/dashboard-scene/sharing/ShareButton/share-snapshot/UpsertSnapshot.tsx index 57cd584afb1..5f2faa1af7f 100644 --- a/public/app/features/dashboard-scene/sharing/ShareButton/share-snapshot/UpsertSnapshot.tsx +++ b/public/app/features/dashboard-scene/sharing/ShareButton/share-snapshot/UpsertSnapshot.tsx @@ -3,8 +3,7 @@ import { PropsWithChildren } from 'react'; import { GrafanaTheme2, SelectableValue } from '@grafana/data'; import { SceneObjectRef, VizPanel } from '@grafana/scenes'; -import { Alert, Button, Divider, Field, RadioButtonGroup, Stack, Text, useStyles2 } from '@grafana/ui'; -import { Input } from '@grafana/ui/src/components/Input/Input'; +import { Alert, Button, Divider, Field, Input, RadioButtonGroup, Stack, Text, useStyles2 } from '@grafana/ui'; import { t, Trans } from 'app/core/internationalization'; import { getExpireOptions } from '../../ShareSnapshotTab'; diff --git a/public/app/features/dashboard-scene/sharing/ShareDrawer/ShareDrawerConfirmAction.tsx b/public/app/features/dashboard-scene/sharing/ShareDrawer/ShareDrawerConfirmAction.tsx index b6ce3e6fddb..89610036c0a 100644 --- a/public/app/features/dashboard-scene/sharing/ShareDrawer/ShareDrawerConfirmAction.tsx +++ b/public/app/features/dashboard-scene/sharing/ShareDrawer/ShareDrawerConfirmAction.tsx @@ -1,9 +1,8 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data'; -import { Spinner, Stack, Text } from '@grafana/ui'; -import { IconButton, useStyles2 } from '@grafana/ui/'; -import { ConfirmContent, ConfirmContentProps } from '@grafana/ui/src/components/ConfirmModal/ConfirmContent'; +import { IconButton, useStyles2, Spinner, Stack, Text } from '@grafana/ui'; +import { ConfirmContent, ConfirmContentProps } from '@grafana/ui/internal'; import { t } from 'app/core/internationalization'; export function ShareDrawerConfirmAction({ diff --git a/public/app/features/dashboard/components/PanelEditor/OverrideCategoryTitle.tsx b/public/app/features/dashboard/components/PanelEditor/OverrideCategoryTitle.tsx index eee7fbf8a9d..455a2669adb 100644 --- a/public/app/features/dashboard/components/PanelEditor/OverrideCategoryTitle.tsx +++ b/public/app/features/dashboard/components/PanelEditor/OverrideCategoryTitle.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/css'; import { FieldConfigOptionsRegistry, GrafanaTheme2, ConfigOverrideRule } from '@grafana/data'; import { Button, HorizontalGroup, Icon, useStyles2 } from '@grafana/ui'; -import { FieldMatcherUIRegistryItem } from '@grafana/ui/src/components/MatchersUI/types'; +import { FieldMatcherUIRegistryItem } from '@grafana/ui/internal'; interface Props { isExpanded: boolean; diff --git a/public/app/features/dashboard/components/PanelEditor/PanelHeaderCorner.tsx b/public/app/features/dashboard/components/PanelEditor/PanelHeaderCorner.tsx index c508a7050c3..07936f463b8 100644 --- a/public/app/features/dashboard/components/PanelEditor/PanelHeaderCorner.tsx +++ b/public/app/features/dashboard/components/PanelEditor/PanelHeaderCorner.tsx @@ -5,8 +5,7 @@ import { renderMarkdown, LinkModelSupplier, ScopedVars, IconName } from '@grafan import { GrafanaTheme2 } from '@grafana/data/'; import { selectors } from '@grafana/e2e-selectors'; import { locationService, getTemplateSrv } from '@grafana/runtime'; -import { Tooltip, PopoverContent, Icon, Themeable2, withTheme2 } from '@grafana/ui'; -import { useStyles2 } from '@grafana/ui/'; +import { Tooltip, PopoverContent, Icon, Themeable2, withTheme2, useStyles2 } from '@grafana/ui'; import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { PanelModel } from 'app/features/dashboard/state/PanelModel'; import { InspectTab } from 'app/features/inspector/types'; diff --git a/public/app/features/dashboard/components/PanelEditor/PanelNotSupported.tsx b/public/app/features/dashboard/components/PanelEditor/PanelNotSupported.tsx index ffd97689612..a3acd708231 100644 --- a/public/app/features/dashboard/components/PanelEditor/PanelNotSupported.tsx +++ b/public/app/features/dashboard/components/PanelEditor/PanelNotSupported.tsx @@ -1,8 +1,7 @@ import { useCallback } from 'react'; import { locationService } from '@grafana/runtime'; -import { Button, VerticalGroup } from '@grafana/ui'; -import { Layout } from '@grafana/ui/src/components/Layout/Layout'; +import { Button, Stack } from '@grafana/ui'; import { PanelEditorTabId } from './types'; @@ -16,15 +15,17 @@ export function PanelNotSupported({ message }: Props): JSX.Element { }, []); return ( - - -

{message}

-
- -
- - +
+ + +

{message}

+
+ +
+ + +
); } diff --git a/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx b/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx index 7d96f861177..76b001c12ab 100644 --- a/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx +++ b/public/app/features/dashboard/components/PanelEditor/VisualizationSelectPane.tsx @@ -4,8 +4,7 @@ import { useLocalStorage } from 'react-use'; import { GrafanaTheme2, PanelData, SelectableValue } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; -import { Button, FilterInput, RadioButtonGroup, ScrollContainer, useStyles2 } from '@grafana/ui'; -import { Field } from '@grafana/ui/src/components/Forms/Field'; +import { Button, Field, FilterInput, RadioButtonGroup, ScrollContainer, useStyles2 } from '@grafana/ui'; import { LS_VISUALIZATION_SELECT_TAB_KEY } from 'app/core/constants'; import { PanelLibraryOptionsGroup } from 'app/features/library-panels/components/PanelLibraryOptionsGroup/PanelLibraryOptionsGroup'; import { VisualizationSuggestions } from 'app/features/panel/components/VizTypePicker/VisualizationSuggestions'; diff --git a/public/app/features/dashboard/components/PublicDashboardNotAvailable/PublicDashboardNotAvailable.tsx b/public/app/features/dashboard/components/PublicDashboardNotAvailable/PublicDashboardNotAvailable.tsx index 3e3a2f591a2..4bf24218d60 100644 --- a/public/app/features/dashboard/components/PublicDashboardNotAvailable/PublicDashboardNotAvailable.tsx +++ b/public/app/features/dashboard/components/PublicDashboardNotAvailable/PublicDashboardNotAvailable.tsx @@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/src'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; -import { useStyles2 } from '@grafana/ui/src'; +import { useStyles2 } from '@grafana/ui'; import { Branding } from '../../../../core/components/Branding/Branding'; import { getLoginStyles } from '../../../../core/components/Login/LoginLayout'; diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx index f32b8d0a262..b83161aa968 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx @@ -9,12 +9,12 @@ import { Field, HorizontalGroup, Input, + Stack, Label, ModalsController, Switch, useStyles2, -} from '@grafana/ui/src'; -import { Layout } from '@grafana/ui/src/components/Layout/Layout'; +} from '@grafana/ui'; import { Trans, t } from 'app/core/internationalization'; import { useDeletePublicDashboardMutation, @@ -167,7 +167,7 @@ export function ConfigPublicDashboardBase({ - + Pause sharing dashboard - + @@ -207,10 +207,10 @@ export function ConfigPublicDashboardBase({ - - + ); } diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/Configuration.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/Configuration.tsx index e05e3a5e1b0..eb9a3d8a34f 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/Configuration.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/Configuration.tsx @@ -2,8 +2,7 @@ import { UseFormRegister } from 'react-hook-form'; import { TimeRange } from '@grafana/data/src'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; -import { FieldSet, Label, Switch, TimeRangeInput, VerticalGroup } from '@grafana/ui/src'; -import { Layout } from '@grafana/ui/src/components/Layout/Layout'; +import { FieldSet, Label, Switch, TimeRangeInput, Stack, VerticalGroup } from '@grafana/ui'; import { Trans, t } from 'app/core/internationalization'; import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions'; @@ -26,7 +25,7 @@ export const Configuration = ({ <>
- + {}} /> - - + + - - + + { @@ -80,7 +79,7 @@ export const Configuration = ({ > Show annotations - +
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/AcknowledgeCheckboxes.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/AcknowledgeCheckboxes.tsx index 0880b9eec80..574e289609a 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/AcknowledgeCheckboxes.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/CreatePublicDashboard/AcknowledgeCheckboxes.tsx @@ -3,7 +3,7 @@ import { UseFormRegister } from 'react-hook-form'; import { GrafanaTheme2 } from '@grafana/data/src'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; -import { Checkbox, FieldSet, HorizontalGroup, LinkButton, useStyles2, VerticalGroup } from '@grafana/ui/src'; +import { Checkbox, FieldSet, HorizontalGroup, LinkButton, useStyles2, VerticalGroup } from '@grafana/ui'; import { t, Trans } from 'app/core/internationalization'; import { SharePublicDashboardAcknowledgmentInputs } from './CreatePublicDashboard'; diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx index 5227335389b..ec925b916a5 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/NoUpsertPermissionsAlert.tsx @@ -1,6 +1,6 @@ import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; import { config } from '@grafana/runtime'; -import { Alert } from '@grafana/ui/src'; +import { Alert } from '@grafana/ui'; import { Trans, t } from 'app/core/internationalization'; const selectors = e2eSelectors.pages.ShareDashboardModal.PublicDashboard; diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/SaveDashboardChangesAlert.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/SaveDashboardChangesAlert.tsx index e322986eca1..6027c46d8b7 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/SaveDashboardChangesAlert.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/SaveDashboardChangesAlert.tsx @@ -1,4 +1,4 @@ -import { Alert } from '@grafana/ui/src'; +import { Alert } from '@grafana/ui'; import { t } from 'app/core/internationalization'; export const SaveDashboardChangesAlert = () => ( diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx index 0555533b905..3850c5e8b17 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedDataSourcesAlert.tsx @@ -4,7 +4,7 @@ import cx from 'classnames'; import { GrafanaTheme2 } from '@grafana/data/src'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; import { config } from '@grafana/runtime'; -import { Alert, useStyles2 } from '@grafana/ui/src'; +import { Alert, useStyles2 } from '@grafana/ui'; import { Trans, t } from 'app/core/internationalization'; const selectors = e2eSelectors.pages.ShareDashboardModal.PublicDashboard; diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedTemplateVariablesAlert.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedTemplateVariablesAlert.tsx index 673160baabf..2290fb63362 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedTemplateVariablesAlert.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ModalAlerts/UnsupportedTemplateVariablesAlert.tsx @@ -1,5 +1,5 @@ import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; -import { Alert } from '@grafana/ui/src'; +import { Alert } from '@grafana/ui'; import { Trans, t } from 'app/core/internationalization'; const selectors = e2eSelectors.pages.ShareDashboardModal.PublicDashboard; diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.tsx index 227193cbbf4..8cbfdd8bd57 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/src'; -import { Spinner, useStyles2 } from '@grafana/ui/src'; +import { Spinner, useStyles2 } from '@grafana/ui'; import { useGetPublicDashboardQuery } from 'app/features/dashboard/api/publicDashboardApi'; import { publicDashboardPersisted } from 'app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboardUtils'; import { ShareModalTabProps } from 'app/features/dashboard/components/ShareModal/types'; diff --git a/public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx b/public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx index 02a7ee2830f..78b04d0bef4 100644 --- a/public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx +++ b/public/app/features/dashboard/components/SubMenu/AnnotationPicker.tsx @@ -4,7 +4,7 @@ import { useEffect, useState } from 'react'; import { AnnotationQuery, EventBus, GrafanaTheme2 } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; import { InlineField, InlineFieldRow, InlineSwitch, useStyles2 } from '@grafana/ui'; -import { LoadingIndicator } from '@grafana/ui/src/components/PanelChrome/LoadingIndicator'; +import { LoadingIndicator } from '@grafana/ui/internal'; import { AnnotationQueryFinished, AnnotationQueryStarted } from '../../../../types/events'; import { getDashboardQueryRunner } from '../../../query/state/DashboardQueryRunner/DashboardQueryRunner'; diff --git a/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx b/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx index e490915ff0b..f36232b7b2b 100644 --- a/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx +++ b/public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx @@ -6,8 +6,8 @@ import { GrafanaTheme2, ScopedVars } from '@grafana/data'; import { sanitize, sanitizeUrl } from '@grafana/data/src/text/sanitize'; import { selectors } from '@grafana/e2e-selectors'; import { DashboardLink } from '@grafana/schema'; -import { Dropdown, Icon, Button, Menu, ScrollContainer, useStyles2 } from '@grafana/ui'; -import { ButtonLinkProps, LinkButton } from '@grafana/ui/src/components/Button'; +import { Dropdown, Icon, LinkButton, Button, Menu, ScrollContainer, useStyles2 } from '@grafana/ui'; +import { ButtonLinkProps } from '@grafana/ui/internal'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { DashboardSearchItem } from 'app/features/search/types'; diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotice.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotice.tsx index 0d828d7184f..9ad0aa464e5 100644 --- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotice.tsx +++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotice.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { GrafanaTheme2, QueryResultMetaNotice } from '@grafana/data'; import { Icon, ToolbarButton, Tooltip, useStyles2 } from '@grafana/ui'; -import { getFocusStyles, getMouseFocusStyles } from '@grafana/ui/src/themes/mixins'; +import { getFocusStyles, getMouseFocusStyles } from '@grafana/ui/internal'; interface Props { notice: QueryResultMetaNotice; diff --git a/public/app/features/dashboard/state/DashboardMigrator.ts b/public/app/features/dashboard/state/DashboardMigrator.ts index 7cfa50f0b7d..bab206f9792 100644 --- a/public/app/features/dashboard/state/DashboardMigrator.ts +++ b/public/app/features/dashboard/state/DashboardMigrator.ts @@ -32,7 +32,7 @@ import { mergeTransformer } from '@grafana/data/src/transformations/transformers import { getDataSourceSrv, setDataSourceSrv } from '@grafana/runtime'; import { DataTransformerConfig } from '@grafana/schema'; import { AxisPlacement, GraphFieldConfig } from '@grafana/ui'; -import { migrateTableDisplayModeToCellOptions } from '@grafana/ui/src/components/Table/utils'; +import { migrateTableDisplayModeToCellOptions } from '@grafana/ui/internal'; import { getAllOptionEditors, getAllStandardFieldConfigs } from 'app/core/components/OptionsUI/registry'; import { config } from 'app/core/config'; import { diff --git a/public/app/features/dimensions/editors/BackgroundSizeEditor.tsx b/public/app/features/dimensions/editors/BackgroundSizeEditor.tsx index 0e2df696124..c8e2e1181f9 100644 --- a/public/app/features/dimensions/editors/BackgroundSizeEditor.tsx +++ b/public/app/features/dimensions/editors/BackgroundSizeEditor.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react'; import { SelectableValue, StandardEditorProps } from '@grafana/data'; -import { InlineField, InlineFieldRow, RadioButtonGroup } from '@grafana/ui/src'; +import { InlineField, InlineFieldRow, RadioButtonGroup } from '@grafana/ui'; import { BackgroundImageSize } from 'app/plugins/panel/canvas/panelcfg.gen'; const options: Array> = [ diff --git a/public/app/features/dimensions/editors/ColorDimensionEditor.tsx b/public/app/features/dimensions/editors/ColorDimensionEditor.tsx index 7cb7c63c6ba..9227ddb7099 100644 --- a/public/app/features/dimensions/editors/ColorDimensionEditor.tsx +++ b/public/app/features/dimensions/editors/ColorDimensionEditor.tsx @@ -4,7 +4,7 @@ import { useCallback } from 'react'; import { GrafanaTheme2, SelectableValue, StandardEditorProps, FieldNamePickerBaseNameMode } from '@grafana/data'; import { ColorDimensionConfig } from '@grafana/schema'; import { Select, ColorPicker, useStyles2 } from '@grafana/ui'; -import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils'; +import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/internal'; const fixedColorOption: SelectableValue = { label: 'Fixed color', diff --git a/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx b/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx index 457152533eb..527195062f8 100644 --- a/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx +++ b/public/app/features/dimensions/editors/ResourceDimensionEditor.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import { FieldNamePickerConfigSettings, StandardEditorProps, StandardEditorsRegistryItem } from '@grafana/data'; import { ResourceDimensionConfig, ResourceDimensionMode } from '@grafana/schema'; import { InlineField, InlineFieldRow, RadioButtonGroup } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; +import { FieldNamePicker } from '@grafana/ui/internal'; import { getPublicOrAbsoluteUrl, ResourceFolderName } from '..'; import { MediaType, ResourceDimensionOptions, ResourcePickerSize } from '../types'; diff --git a/public/app/features/dimensions/editors/ResourcePicker.tsx b/public/app/features/dimensions/editors/ResourcePicker.tsx index ea207674663..624bd7fd5ff 100644 --- a/public/app/features/dimensions/editors/ResourcePicker.tsx +++ b/public/app/features/dimensions/editors/ResourcePicker.tsx @@ -14,7 +14,7 @@ import { useStyles2, useTheme2, } from '@grafana/ui'; -import { closePopover } from '@grafana/ui/src/utils/closePopover'; +import { closePopover } from '@grafana/ui/internal'; import { SanitizedSVG } from 'app/core/components/SVG/SanitizedSVG'; import { getPublicOrAbsoluteUrl } from '../resource'; diff --git a/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx b/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx index 4dc08ddfda5..70cefcd4982 100644 --- a/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx +++ b/public/app/features/dimensions/editors/ScalarDimensionEditor.tsx @@ -4,7 +4,7 @@ import { useCallback } from 'react'; import { FieldType, GrafanaTheme2, SelectableValue, StandardEditorProps } from '@grafana/data'; import { ScalarDimensionMode, ScalarDimensionConfig } from '@grafana/schema'; import { InlineField, InlineFieldRow, RadioButtonGroup, Select, useStyles2 } from '@grafana/ui'; -import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils'; +import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/internal'; import { NumberInput } from 'app/core/components/OptionsUI/NumberInput'; import { ScalarDimensionOptions } from '../types'; diff --git a/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx b/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx index 5c042e25a71..a35b5307f97 100644 --- a/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx +++ b/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx @@ -4,7 +4,7 @@ import { useCallback, useMemo } from 'react'; import { GrafanaTheme2, SelectableValue, StandardEditorProps } from '@grafana/data'; import { ScaleDimensionConfig } from '@grafana/schema'; import { InlineField, InlineFieldRow, Select, useStyles2 } from '@grafana/ui'; -import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils'; +import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/internal'; import { NumberInput } from 'app/core/components/OptionsUI/NumberInput'; import { validateScaleOptions, validateScaleConfig } from '../scale'; diff --git a/public/app/features/dimensions/editors/TextDimensionEditor.tsx b/public/app/features/dimensions/editors/TextDimensionEditor.tsx index 9f345e43a7e..e9c8a89d005 100644 --- a/public/app/features/dimensions/editors/TextDimensionEditor.tsx +++ b/public/app/features/dimensions/editors/TextDimensionEditor.tsx @@ -8,7 +8,7 @@ import { } from '@grafana/data'; import { TextDimensionConfig, TextDimensionMode } from '@grafana/schema'; import { Button, InlineField, InlineFieldRow, RadioButtonGroup } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; +import { FieldNamePicker } from '@grafana/ui/internal'; import { StringValueEditor } from 'app/core/components/OptionsUI/string'; import { TextDimensionOptions } from '../types'; diff --git a/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx b/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx index a12de2635f5..1610ff0152d 100644 --- a/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx +++ b/public/app/features/explore/ContentOutline/ContentOutlineItemButton.tsx @@ -4,7 +4,7 @@ import * as React from 'react'; import { IconName, isIconName, GrafanaTheme2 } from '@grafana/data'; import { Button, Icon, Tooltip, useTheme2 } from '@grafana/ui'; -import { TooltipPlacement } from '@grafana/ui/src/components/Tooltip'; +import { TooltipPlacement } from '@grafana/ui/internal'; type CommonProps = { contentOutlineExpanded?: boolean; diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx index 47c5928ff1c..206b006c66b 100644 --- a/public/app/features/explore/Explore.tsx +++ b/public/app/features/explore/Explore.tsx @@ -29,7 +29,7 @@ import { Themeable2, withTheme2, } from '@grafana/ui'; -import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR } from '@grafana/ui/src/components/Table/types'; +import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR } from '@grafana/ui/internal'; import { supportedFeatures } from 'app/core/history/richHistoryStorageProvider'; import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource'; import { StoreState } from 'app/types'; diff --git a/public/app/features/explore/Logs/Logs.tsx b/public/app/features/explore/Logs/Logs.tsx index f5c6912b76f..1ae6bcd7515 100644 --- a/public/app/features/explore/Logs/Logs.tsx +++ b/public/app/features/explore/Logs/Logs.tsx @@ -48,7 +48,7 @@ import { Themeable2, withTheme2, } from '@grafana/ui'; -import { mapMouseEventToMode } from '@grafana/ui/src/components/VizLegend/utils'; +import { mapMouseEventToMode } from '@grafana/ui/internal'; import { Trans } from 'app/core/internationalization'; import store from 'app/core/store'; import { createAndCopyShortLink, getLogsPermalinkRange } from 'app/core/utils/shortLinks'; diff --git a/public/app/features/explore/Logs/LogsColumnSearch.tsx b/public/app/features/explore/Logs/LogsColumnSearch.tsx index 1569d02bb76..16e24d48954 100644 --- a/public/app/features/explore/Logs/LogsColumnSearch.tsx +++ b/public/app/features/explore/Logs/LogsColumnSearch.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/css'; import * as React from 'react'; import { GrafanaTheme2 } from '@grafana/data/src'; -import { Field, Input, useTheme2 } from '@grafana/ui/src'; +import { Field, Input, useTheme2 } from '@grafana/ui'; function getStyles(theme: GrafanaTheme2) { return { diff --git a/public/app/features/explore/Logs/LogsTable.tsx b/public/app/features/explore/Logs/LogsTable.tsx index 4d629e1cc1a..7583a3c9b0b 100644 --- a/public/app/features/explore/Logs/LogsTable.tsx +++ b/public/app/features/explore/Logs/LogsTable.tsx @@ -19,7 +19,7 @@ import { } from '@grafana/data'; import { config } from '@grafana/runtime'; import { AdHocFilterItem, Table } from '@grafana/ui'; -import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR } from '@grafana/ui/src/components/Table/types'; +import { FILTER_FOR_OPERATOR, FILTER_OUT_OPERATOR } from '@grafana/ui/internal'; import { LogsFrame } from 'app/features/logs/logsFrame'; import { getFieldLinksForExplore } from '../utils/links'; diff --git a/public/app/features/explore/Logs/LogsTableActiveFields.tsx b/public/app/features/explore/Logs/LogsTableActiveFields.tsx index 31235f66bcb..eb833030106 100644 --- a/public/app/features/explore/Logs/LogsTableActiveFields.tsx +++ b/public/app/features/explore/Logs/LogsTableActiveFields.tsx @@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css'; import { DragDropContext, Draggable, DraggableProvided, Droppable, DropResult } from '@hello-pangea/dnd'; import { GrafanaTheme2 } from '@grafana/data/src'; -import { useTheme2 } from '@grafana/ui/src'; +import { useTheme2 } from '@grafana/ui'; import { LogsTableEmptyFields } from './LogsTableEmptyFields'; import { LogsTableNavField } from './LogsTableNavField'; diff --git a/public/app/features/explore/Logs/LogsTableAvailableFields.tsx b/public/app/features/explore/Logs/LogsTableAvailableFields.tsx index a0804ac82af..a305fac9bb6 100644 --- a/public/app/features/explore/Logs/LogsTableAvailableFields.tsx +++ b/public/app/features/explore/Logs/LogsTableAvailableFields.tsx @@ -1,4 +1,4 @@ -import { useTheme2 } from '@grafana/ui/src'; +import { useTheme2 } from '@grafana/ui'; import { getLogsFieldsStyles } from './LogsTableActiveFields'; import { LogsTableEmptyFields } from './LogsTableEmptyFields'; diff --git a/public/app/features/explore/Logs/LogsTableMultiSelect.tsx b/public/app/features/explore/Logs/LogsTableMultiSelect.tsx index 7bdca2b8fa7..10308e761a7 100644 --- a/public/app/features/explore/Logs/LogsTableMultiSelect.tsx +++ b/public/app/features/explore/Logs/LogsTableMultiSelect.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/src'; -import { useTheme2 } from '@grafana/ui/src'; +import { useTheme2 } from '@grafana/ui'; import { LogsTableActiveFields } from './LogsTableActiveFields'; import { LogsTableAvailableFields } from './LogsTableAvailableFields'; diff --git a/public/app/features/explore/Logs/LogsTableWrap.tsx b/public/app/features/explore/Logs/LogsTableWrap.tsx index d3755b6dc56..984bc875a8f 100644 --- a/public/app/features/explore/Logs/LogsTableWrap.tsx +++ b/public/app/features/explore/Logs/LogsTableWrap.tsx @@ -14,7 +14,7 @@ import { TimeRange, } from '@grafana/data'; import { reportInteraction } from '@grafana/runtime/src'; -import { InlineField, Select, Themeable2 } from '@grafana/ui/'; +import { InlineField, Select, Themeable2 } from '@grafana/ui'; import { parseLogsFrame } from '../../logs/logsFrame'; diff --git a/public/app/features/explore/PrometheusListView/ItemLabels.tsx b/public/app/features/explore/PrometheusListView/ItemLabels.tsx index f68765b6594..4f0884ab71b 100644 --- a/public/app/features/explore/PrometheusListView/ItemLabels.tsx +++ b/public/app/features/explore/PrometheusListView/ItemLabels.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/css'; import { Field, GrafanaTheme2 } from '@grafana/data/'; import { InstantQueryRefIdIndex } from '@grafana/prometheus'; -import { useStyles2 } from '@grafana/ui/'; +import { useStyles2 } from '@grafana/ui'; import { rawListItemColumnWidth } from './RawListItem'; diff --git a/public/app/features/explore/PrometheusListView/ItemValues.tsx b/public/app/features/explore/PrometheusListView/ItemValues.tsx index 74680b65322..2cb61be35c0 100644 --- a/public/app/features/explore/PrometheusListView/ItemValues.tsx +++ b/public/app/features/explore/PrometheusListView/ItemValues.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/'; -import { useStyles2 } from '@grafana/ui/'; +import { useStyles2 } from '@grafana/ui'; import { rawListItemColumnWidth, rawListPaddingToHoldSpaceForCopyIcon, RawListValue } from './RawListItem'; import { RawPrometheusListItemEmptyValue } from './utils/getRawPrometheusListItemsFromDataFrame'; diff --git a/public/app/features/explore/PrometheusListView/RawListContainer.tsx b/public/app/features/explore/PrometheusListView/RawListContainer.tsx index 852ce90c4a0..ee8dedfd5ab 100644 --- a/public/app/features/explore/PrometheusListView/RawListContainer.tsx +++ b/public/app/features/explore/PrometheusListView/RawListContainer.tsx @@ -6,7 +6,7 @@ import { VariableSizeList as List } from 'react-window'; import { DataFrame, Field as DataFrameField } from '@grafana/data/'; import { reportInteraction } from '@grafana/runtime/src'; -import { Field, Switch } from '@grafana/ui/'; +import { Field, Switch } from '@grafana/ui'; import { ItemLabels } from './ItemLabels'; import RawListItem from './RawListItem'; diff --git a/public/app/features/explore/PrometheusListView/RawListItem.tsx b/public/app/features/explore/PrometheusListView/RawListItem.tsx index 19945763aba..b5a4e5b9433 100644 --- a/public/app/features/explore/PrometheusListView/RawListItem.tsx +++ b/public/app/features/explore/PrometheusListView/RawListItem.tsx @@ -4,7 +4,7 @@ import { useCopyToClipboard } from 'react-use'; import { Field, GrafanaTheme2 } from '@grafana/data/'; import { isValidLegacyName, utf8Support } from '@grafana/prometheus/src/utf8_support'; import { reportInteraction } from '@grafana/runtime/src'; -import { IconButton, useStyles2 } from '@grafana/ui/'; +import { IconButton, useStyles2 } from '@grafana/ui'; import { ItemLabels } from './ItemLabels'; import { ItemValues } from './ItemValues'; diff --git a/public/app/features/explore/PrometheusListView/RawListItemAttributes.tsx b/public/app/features/explore/PrometheusListView/RawListItemAttributes.tsx index eb6d4d0a570..bbc7962c918 100644 --- a/public/app/features/explore/PrometheusListView/RawListItemAttributes.tsx +++ b/public/app/features/explore/PrometheusListView/RawListItemAttributes.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/'; -import { useStyles2 } from '@grafana/ui/'; +import { useStyles2 } from '@grafana/ui'; import { RawListValue } from './RawListItem'; diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx index ee8d279ba19..4f25b3ad677 100644 --- a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx +++ b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/NextPrevResult.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { config, reportInteraction } from '@grafana/runtime'; import { Icon, PopoverContent, Tooltip, useTheme2 } from '@grafana/ui'; -import { getButtonStyles } from '@grafana/ui/src/components/Button'; +import { getButtonStyles } from '@grafana/ui/internal'; import { Trace } from '../../types'; diff --git a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.tsx index 4be50e499a2..ef2fb3bbff6 100644 --- a/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.tsx +++ b/public/app/features/explore/TraceView/components/TracePageHeader/SearchBar/TracePageSearchBar.tsx @@ -17,7 +17,7 @@ import { memo, Dispatch, SetStateAction, useMemo } from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { Button, Switch, useStyles2 } from '@grafana/ui'; -import { getButtonStyles } from '@grafana/ui/src/components/Button'; +import { getButtonStyles } from '@grafana/ui/internal'; import { SearchProps } from '../../../useSearch'; import { Trace } from '../../types'; diff --git a/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx b/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx index 8c7c08141ba..d213e6cbf8d 100644 --- a/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx +++ b/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx @@ -5,7 +5,7 @@ import Skeleton from 'react-loading-skeleton'; import { GrafanaTheme2 } from '@grafana/data'; import { config } from '@grafana/runtime'; import { Icon, Link, useStyles2 } from '@grafana/ui'; -import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable'; +import { SkeletonComponent, attachSkeleton } from '@grafana/ui/unstable'; import { getPanelPluginNotFound } from 'app/features/panel/components/PanelPluginError'; import { PanelTypeCard } from 'app/features/panel/components/VizTypePicker/PanelTypeCard'; diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardButton.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardButton.tsx index 4156c57ebab..93c8e59c1ba 100644 --- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardButton.tsx +++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardButton.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { config } from '@grafana/runtime'; -import { Button, ModalsController, ButtonProps } from '@grafana/ui/src'; +import { Button, ModalsController, ButtonProps } from '@grafana/ui'; import { t } from 'app/core/internationalization'; import { useDeletePublicDashboardMutation } from 'app/features/dashboard/api/publicDashboardApi'; import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; diff --git a/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx b/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx index 096937064e4..8e3766ce457 100644 --- a/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx +++ b/public/app/features/manage-dashboards/components/PublicDashboardListTable/DeletePublicDashboardModal.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/src'; import { config } from '@grafana/runtime'; -import { ConfirmModal, useStyles2 } from '@grafana/ui/src'; +import { ConfirmModal, useStyles2 } from '@grafana/ui'; import { t } from 'app/core/internationalization'; const Body = () => { diff --git a/public/app/features/manage-dashboards/components/SnapshotListTableRow.tsx b/public/app/features/manage-dashboards/components/SnapshotListTableRow.tsx index ffbee0d001b..d5d3ede1cdb 100644 --- a/public/app/features/manage-dashboards/components/SnapshotListTableRow.tsx +++ b/public/app/features/manage-dashboards/components/SnapshotListTableRow.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/css'; import Skeleton from 'react-loading-skeleton'; import { Button, LinkButton, useStyles2 } from '@grafana/ui'; -import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable'; +import { SkeletonComponent, attachSkeleton } from '@grafana/ui/unstable'; import { t, Trans } from 'app/core/internationalization'; import { contextSrv } from 'app/core/services/context_srv'; import { Snapshot } from 'app/features/dashboard/services/SnapshotSrv'; diff --git a/public/app/features/migrate-to-cloud/onprem/NameCell.tsx b/public/app/features/migrate-to-cloud/onprem/NameCell.tsx index 3080a26fdd9..d0ec49a770b 100644 --- a/public/app/features/migrate-to-cloud/onprem/NameCell.tsx +++ b/public/app/features/migrate-to-cloud/onprem/NameCell.tsx @@ -5,7 +5,7 @@ import Skeleton from 'react-loading-skeleton'; import { DataSourceInstanceSettings } from '@grafana/data'; import { config } from '@grafana/runtime'; import { CellProps, Stack, Text, Icon, useStyles2 } from '@grafana/ui'; -import { getSvgSize } from '@grafana/ui/src/components/Icon/utils'; +import { getSvgSize } from '@grafana/ui/internal'; import { Trans } from 'app/core/internationalization'; import { useGetFolderQuery } from 'app/features/browse-dashboards/api/browseDashboardsAPI'; diff --git a/public/app/features/migrate-to-cloud/shared/AlertWithTraceID.tsx b/public/app/features/migrate-to-cloud/shared/AlertWithTraceID.tsx index d3daec019f4..6b3581c344a 100644 --- a/public/app/features/migrate-to-cloud/shared/AlertWithTraceID.tsx +++ b/public/app/features/migrate-to-cloud/shared/AlertWithTraceID.tsx @@ -1,6 +1,6 @@ import { isFetchError } from '@grafana/runtime'; import { Alert, Stack, Text } from '@grafana/ui'; -import { Props as AlertProps } from '@grafana/ui/src/components/Alert/Alert'; +import { AlertProps } from '@grafana/ui/internal'; interface AlertWithTraceIDProps extends AlertProps { error?: unknown; diff --git a/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx b/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx index 94b40699f2a..a3ab2e950ed 100644 --- a/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx +++ b/public/app/features/panel/components/VizTypePicker/PanelTypeCard.tsx @@ -6,7 +6,7 @@ import Skeleton from 'react-loading-skeleton'; import { GrafanaTheme2, isUnsignedPluginSignature, PanelPluginMeta, PluginState } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; import { IconButton, PluginSignatureBadge, useStyles2 } from '@grafana/ui'; -import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable'; +import { SkeletonComponent, attachSkeleton } from '@grafana/ui/unstable'; import { PluginStateInfo } from 'app/features/plugins/components/PluginStateInfo'; interface Props { diff --git a/public/app/features/playlist/PlaylistCard.tsx b/public/app/features/playlist/PlaylistCard.tsx index dcbb174ff9f..d11c0fa1aac 100644 --- a/public/app/features/playlist/PlaylistCard.tsx +++ b/public/app/features/playlist/PlaylistCard.tsx @@ -3,7 +3,7 @@ import Skeleton from 'react-loading-skeleton'; import { GrafanaTheme2 } from '@grafana/data'; import { Button, Card, LinkButton, ModalsController, Stack, useStyles2 } from '@grafana/ui'; -import { attachSkeleton, SkeletonComponent } from '@grafana/ui/src/unstable'; +import { attachSkeleton, SkeletonComponent } from '@grafana/ui/unstable'; import { t, Trans } from 'app/core/internationalization'; import { contextSrv } from 'app/core/services/context_srv'; import { DashNavButton } from 'app/features/dashboard/components/DashNav/DashNavButton'; diff --git a/public/app/features/playlist/PlaylistPageList.tsx b/public/app/features/playlist/PlaylistPageList.tsx index d55bd14deda..d65723735e0 100644 --- a/public/app/features/playlist/PlaylistPageList.tsx +++ b/public/app/features/playlist/PlaylistPageList.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data'; import { useStyles2 } from '@grafana/ui'; -import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable'; +import { SkeletonComponent, attachSkeleton } from '@grafana/ui/unstable'; import { PlaylistCard } from './PlaylistCard'; import { Playlist } from './types'; diff --git a/public/app/features/plugins/admin/components/PluginListItem.tsx b/public/app/features/plugins/admin/components/PluginListItem.tsx index d6b53c446b6..dce0ea7da73 100644 --- a/public/app/features/plugins/admin/components/PluginListItem.tsx +++ b/public/app/features/plugins/admin/components/PluginListItem.tsx @@ -4,7 +4,7 @@ import Skeleton from 'react-loading-skeleton'; import { GrafanaTheme2 } from '@grafana/data'; import { locationService, reportInteraction } from '@grafana/runtime'; import { Badge, Icon, Stack, useStyles2 } from '@grafana/ui'; -import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable'; +import { SkeletonComponent, attachSkeleton } from '@grafana/ui/unstable'; import { CatalogPlugin, PluginIconName } from '../types'; diff --git a/public/app/features/plugins/loader/sharedDependencies.ts b/public/app/features/plugins/loader/sharedDependencies.ts index 3d0ae285034..dc88d5a292c 100644 --- a/public/app/features/plugins/loader/sharedDependencies.ts +++ b/public/app/features/plugins/loader/sharedDependencies.ts @@ -54,7 +54,7 @@ export const sharedDependenciesMap = { '@grafana/runtime/unstable': () => import('@grafana/runtime/src/unstable'), '@grafana/slate-react': () => import('slate-react'), '@grafana/ui': grafanaUI, - '@grafana/ui/unstable': () => import('@grafana/ui/src/unstable'), + '@grafana/ui/unstable': () => import('@grafana/ui/unstable'), '@kusto/monaco-kusto': () => import('@kusto/monaco-kusto'), 'app/core/app_events': { default: appEvents, diff --git a/public/app/features/sandbox/BenchmarksPage.tsx b/public/app/features/sandbox/BenchmarksPage.tsx index 1738afe7088..9db89f68e57 100644 --- a/public/app/features/sandbox/BenchmarksPage.tsx +++ b/public/app/features/sandbox/BenchmarksPage.tsx @@ -1,4 +1,4 @@ -import { EmotionPerfTest } from '@grafana/ui/src/components/ThemeDemos/EmotionPerfTest'; +import { EmotionPerfTest } from '@grafana/ui/internal'; export const BenchmarksPage = () => { return ; diff --git a/public/app/features/search/page/components/SearchResultsTable.tsx b/public/app/features/search/page/components/SearchResultsTable.tsx index 7af88363425..7ec0a601da6 100644 --- a/public/app/features/search/page/components/SearchResultsTable.tsx +++ b/public/app/features/search/page/components/SearchResultsTable.tsx @@ -9,8 +9,7 @@ import { Observable } from 'rxjs'; import { Field, GrafanaTheme2 } from '@grafana/data'; import { TableCellHeight } from '@grafana/schema'; import { useStyles2, useTheme2 } from '@grafana/ui'; -import { TableCell } from '@grafana/ui/src/components/Table/TableCell'; -import { useTableStyles } from '@grafana/ui/src/components/Table/styles'; +import { useTableStyles, TableCell } from '@grafana/ui/internal'; import { useCustomFlexLayout } from 'app/features/browse-dashboards/components/customFlexTableLayout'; import { useSearchKeyboardNavigation } from '../../hooks/useSearchKeyboardSelection'; diff --git a/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx b/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx index b6003205b7b..34f35945b43 100644 --- a/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx +++ b/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx @@ -4,7 +4,7 @@ import Skeleton from 'react-loading-skeleton'; import { GrafanaTheme2, OrgRole } from '@grafana/data'; import { Button, Icon, IconButton, Stack, useStyles2 } from '@grafana/ui'; -import { SkeletonComponent, attachSkeleton } from '@grafana/ui/src/unstable'; +import { SkeletonComponent, attachSkeleton } from '@grafana/ui/unstable'; import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker'; import { contextSrv } from 'app/core/core'; import { OrgRolePicker } from 'app/features/admin/OrgRolePicker'; diff --git a/public/app/features/trails/Breakdown/SortByScene.tsx b/public/app/features/trails/Breakdown/SortByScene.tsx index 6282c758f5b..8454dfdc63b 100644 --- a/public/app/features/trails/Breakdown/SortByScene.tsx +++ b/public/app/features/trails/Breakdown/SortByScene.tsx @@ -2,8 +2,7 @@ import { css } from '@emotion/css'; import { BusEventBase, GrafanaTheme2, SelectableValue } from '@grafana/data'; import { SceneComponentProps, SceneObjectBase, SceneObjectState } from '@grafana/scenes'; -import { IconButton, Select } from '@grafana/ui'; -import { Field, useStyles2 } from '@grafana/ui/'; +import { IconButton, Select, Field, useStyles2 } from '@grafana/ui'; import { Trans } from '../../../core/internationalization'; import { getSortByPreference, setSortByPreference } from '../services/store'; diff --git a/public/app/features/trails/DataTrailsHome.tsx b/public/app/features/trails/DataTrailsHome.tsx index 4d21a05239c..6a35274cd85 100644 --- a/public/app/features/trails/DataTrailsHome.tsx +++ b/public/app/features/trails/DataTrailsHome.tsx @@ -3,8 +3,7 @@ import { useState } from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { SceneComponentProps, sceneGraph, SceneObject, SceneObjectBase, SceneObjectState } from '@grafana/scenes'; -import { Box, Button, Icon, Stack, TextLink, useStyles2, useTheme2 } from '@grafana/ui'; -import { Text } from '@grafana/ui/src/components/Text/Text'; +import { Box, Button, Icon, Stack, Text, TextLink, useStyles2, useTheme2 } from '@grafana/ui'; import { Trans } from 'app/core/internationalization'; import { DataTrail } from './DataTrail'; diff --git a/public/app/features/transformers/calculateHeatmap/editor/helper.ts b/public/app/features/transformers/calculateHeatmap/editor/helper.ts index 51df063fddb..e33c70210e8 100644 --- a/public/app/features/transformers/calculateHeatmap/editor/helper.ts +++ b/public/app/features/transformers/calculateHeatmap/editor/helper.ts @@ -1,6 +1,6 @@ import { PanelOptionsEditorBuilder } from '@grafana/data'; import { ScaleDistribution, HeatmapCalculationMode, HeatmapCalculationOptions } from '@grafana/schema'; -import { ScaleDistributionEditor } from '@grafana/ui/src/options/builder'; +import { ScaleDistributionEditor } from '@grafana/ui/internal'; import { AxisEditor } from './AxisEditor'; diff --git a/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx b/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx index 77a981540e4..c7d0f4f2f39 100644 --- a/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx +++ b/public/app/features/transformers/editors/ConvertFieldTypeTransformerEditor.tsx @@ -17,8 +17,7 @@ import { ConvertFieldTypeTransformerOptions, } from '@grafana/data/src/transformations/transformers/convertFieldType'; import { Button, InlineField, InlineFieldRow, Input, Select } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; -import { allFieldTypeIconOptions } from '@grafana/ui/src/components/MatchersUI/FieldTypeMatcherEditor'; +import { allFieldTypeIconOptions, FieldNamePicker } from '@grafana/ui/internal'; import { findField } from 'app/features/dimensions'; import { getTransformationContent } from '../docs/getTransformationContent'; diff --git a/public/app/features/transformers/editors/FormatStringTransformerEditor.tsx b/public/app/features/transformers/editors/FormatStringTransformerEditor.tsx index 16587421f48..e208d67976e 100644 --- a/public/app/features/transformers/editors/FormatStringTransformerEditor.tsx +++ b/public/app/features/transformers/editors/FormatStringTransformerEditor.tsx @@ -17,7 +17,7 @@ import { FormatStringTransformerOptions, } from '@grafana/data/src/transformations/transformers/formatString'; import { Select, InlineFieldRow, InlineField } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; +import { FieldNamePicker } from '@grafana/ui/internal'; import { NumberInput } from 'app/core/components/OptionsUI/NumberInput'; const fieldNamePickerSettings: StandardEditorsRegistryItem = { diff --git a/public/app/features/transformers/editors/JoinByFieldTransformerEditor.tsx b/public/app/features/transformers/editors/JoinByFieldTransformerEditor.tsx index e0b1eea12de..cccf062d843 100644 --- a/public/app/features/transformers/editors/JoinByFieldTransformerEditor.tsx +++ b/public/app/features/transformers/editors/JoinByFieldTransformerEditor.tsx @@ -11,7 +11,7 @@ import { import { JoinByFieldOptions, JoinMode } from '@grafana/data/src/transformations/transformers/joinByField'; import { getTemplateSrv } from '@grafana/runtime'; import { Select, InlineFieldRow, InlineField } from '@grafana/ui'; -import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils'; +import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/internal'; import { getTransformationContent } from '../docs/getTransformationContent'; diff --git a/public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx b/public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx index 728e9687f27..04ecc1ad0da 100644 --- a/public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx +++ b/public/app/features/transformers/extractFields/ExtractFieldsTransformerEditor.tsx @@ -10,7 +10,7 @@ import { TransformerCategory, } from '@grafana/data'; import { InlineField, InlineFieldRow, Select, InlineSwitch, Input, Combobox, ComboboxOption } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; +import { FieldNamePicker } from '@grafana/ui/internal'; import { getTransformationContent } from '../docs/getTransformationContent'; diff --git a/public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx b/public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx index 63e60fd7208..5dbc47a31ab 100644 --- a/public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx +++ b/public/app/features/transformers/lookupGazetteer/FieldLookupTransformerEditor.tsx @@ -11,7 +11,7 @@ import { TransformerCategory, } from '@grafana/data'; import { InlineField, InlineFieldRow } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; +import { FieldNamePicker } from '@grafana/ui/internal'; import { GazetteerPathEditor, GazetteerPathEditorConfigSettings } from 'app/features/geo/editor/GazetteerPathEditor'; import { getTransformationContent } from '../docs/getTransformationContent'; diff --git a/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx b/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx index 5396f85148c..3369ff35bf0 100644 --- a/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx +++ b/public/app/features/transformers/partitionByValues/PartitionByValuesEditor.tsx @@ -17,7 +17,7 @@ import { FieldValidationMessage, RadioButtonGroup, } from '@grafana/ui'; -import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/src/components/MatchersUI/utils'; +import { useFieldDisplayNames, useSelectOptions } from '@grafana/ui/internal'; import { getTransformationContent } from '../docs/getTransformationContent'; diff --git a/public/app/features/transformers/regression/regressionEditor.tsx b/public/app/features/transformers/regression/regressionEditor.tsx index 6c04f7ba258..4044035562d 100644 --- a/public/app/features/transformers/regression/regressionEditor.tsx +++ b/public/app/features/transformers/regression/regressionEditor.tsx @@ -10,7 +10,7 @@ import { Field, } from '@grafana/data'; import { InlineField, Select } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; +import { FieldNamePicker } from '@grafana/ui/internal'; import { NumberInput } from 'app/core/components/OptionsUI/NumberInput'; import { getTransformationContent } from '../docs/getTransformationContent'; diff --git a/public/app/features/transformers/suggestionsInput/SuggestionsInput.tsx b/public/app/features/transformers/suggestionsInput/SuggestionsInput.tsx index 3307542781b..33a804a712f 100644 --- a/public/app/features/transformers/suggestionsInput/SuggestionsInput.tsx +++ b/public/app/features/transformers/suggestionsInput/SuggestionsInput.tsx @@ -4,9 +4,8 @@ import { FormEvent, useCallback, useEffect, useRef, useState } from 'react'; import * as React from 'react'; import { GrafanaTheme2, VariableSuggestion } from '@grafana/data'; -import { FieldValidationMessage, Portal, ScrollContainer, TextArea, useTheme2 } from '@grafana/ui'; -import { DataLinkSuggestions } from '@grafana/ui/src/components/DataLinks/DataLinkSuggestions'; -import { Input } from '@grafana/ui/src/components/Input/Input'; +import { FieldValidationMessage, Input, Portal, ScrollContainer, TextArea, useTheme2 } from '@grafana/ui'; +import { DataLinkSuggestions } from '@grafana/ui/internal'; const modulo = (a: number, n: number) => a - n * Math.floor(a / n); const ERROR_TOOLTIP_OFFSET = 8; diff --git a/public/app/features/users/TokenRevokedModal.tsx b/public/app/features/users/TokenRevokedModal.tsx index c3d33be079b..c42bc4e3162 100644 --- a/public/app/features/users/TokenRevokedModal.tsx +++ b/public/app/features/users/TokenRevokedModal.tsx @@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data'; import { Button, InfoBox, Portal, useStyles2, useTheme2 } from '@grafana/ui'; -import { getModalStyles } from '@grafana/ui/src/components/Modal/getModalStyles'; +import { getModalStyles } from '@grafana/ui/internal'; interface Props { maxConcurrentSessions?: number; diff --git a/public/app/features/variables/pickers/shared/VariableLink.tsx b/public/app/features/variables/pickers/shared/VariableLink.tsx index f481fa68454..cd24609c235 100644 --- a/public/app/features/variables/pickers/shared/VariableLink.tsx +++ b/public/app/features/variables/pickers/shared/VariableLink.tsx @@ -4,7 +4,7 @@ import { MouseEvent, useCallback } from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; import { Icon, useStyles2 } from '@grafana/ui'; -import { LoadingIndicator } from '@grafana/ui/src/components/PanelChrome/LoadingIndicator'; +import { LoadingIndicator } from '@grafana/ui/internal'; import { t } from 'app/core/internationalization'; import { getStyles as getTagBadgeStyles } from '../../../../core/components/TagFilter/TagBadge'; diff --git a/public/app/features/visualization/data-hover/ExemplarHoverView.tsx b/public/app/features/visualization/data-hover/ExemplarHoverView.tsx index b2f17d17333..3325188ee5e 100644 --- a/public/app/features/visualization/data-hover/ExemplarHoverView.tsx +++ b/public/app/features/visualization/data-hover/ExemplarHoverView.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2, LinkModel } from '@grafana/data'; import { DataLinkButton, useStyles2 } from '@grafana/ui'; -import { VizTooltipRow } from '@grafana/ui/src/components/VizTooltip/VizTooltipRow'; +import { VizTooltipRow } from '@grafana/ui/internal'; import { renderValue } from 'app/plugins/panel/geomap/utils/uiUtils'; import { DisplayValue } from './DataHoverView'; diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/RawQuery.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/RawQuery.tsx index 60b0d6fd765..742b12b9d50 100644 --- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/RawQuery.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/RawQuery.tsx @@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css'; import Prism, { Grammar } from 'prismjs'; import { GrafanaTheme2 } from '@grafana/data/src'; -import { useTheme2 } from '@grafana/ui/src'; +import { useTheme2 } from '@grafana/ui'; export interface Props { query: string; diff --git a/public/app/plugins/datasource/azuremonitor/components/shared/Field.tsx b/public/app/plugins/datasource/azuremonitor/components/shared/Field.tsx index 3c5a9cf1123..6501e0438d8 100644 --- a/public/app/plugins/datasource/azuremonitor/components/shared/Field.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/shared/Field.tsx @@ -1,6 +1,6 @@ import { EditorField } from '@grafana/plugin-ui'; import { InlineField } from '@grafana/ui'; -import { Props as InlineFieldProps } from '@grafana/ui/src/components/Forms/InlineField'; +import { InlineFieldProps } from '@grafana/ui/internal'; interface Props extends InlineFieldProps { label: string; diff --git a/public/app/plugins/datasource/cloudwatch/components/CheatSheet/LogsCheatSheet.tsx b/public/app/plugins/datasource/cloudwatch/components/CheatSheet/LogsCheatSheet.tsx index 7f96528011e..0eda7a46736 100644 --- a/public/app/plugins/datasource/cloudwatch/components/CheatSheet/LogsCheatSheet.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/CheatSheet/LogsCheatSheet.tsx @@ -4,7 +4,7 @@ import { useState } from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { Collapse, useStyles2, Text } from '@grafana/ui'; -import { flattenTokens } from '@grafana/ui/src/slate-plugins/slate-prism'; +import { flattenTokens } from '@grafana/ui/internal'; import { trackSampleQuerySelection } from '../../tracking'; import { CloudWatchLogsQuery, CloudWatchQuery, LogsQueryLanguage } from '../../types'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/PPLQueryEditor.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/PPLQueryEditor.tsx index f08e9587fb9..84ff7e7738c 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/PPLQueryEditor.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/code-editors/PPLQueryEditor.tsx @@ -2,7 +2,7 @@ import type * as monacoType from 'monaco-editor/esm/vs/editor/editor.api'; import { useCallback, useRef } from 'react'; import { CodeEditor, Monaco } from '@grafana/ui'; -import { CodeEditorProps } from '@grafana/ui/src/components/Monaco/types'; +import { CodeEditorProps } from '@grafana/ui/internal'; import { CloudWatchDatasource } from '../../../../datasource'; import language from '../../../../language/cloudwatch-ppl/definition'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupSelector.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupSelector.tsx index 5b66c048f61..b02239c51ab 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupSelector.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupSelector.tsx @@ -4,8 +4,7 @@ import * as React from 'react'; import { AppEvents, SelectableValue, toOption } from '@grafana/data'; import { getAppEvents } from '@grafana/runtime'; -import { MultiSelect } from '@grafana/ui'; -import { InputActionMeta } from '@grafana/ui/src/components/Select/types'; +import { MultiSelect, InputActionMeta } from '@grafana/ui'; import { CloudWatchDatasource } from '../../../datasource'; import { appendTemplateVariables } from '../../../utils/utils'; diff --git a/public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx b/public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx index 79b52e5a571..8b5d40b6acd 100644 --- a/public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx +++ b/public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx @@ -15,8 +15,7 @@ import { TimeZonePicker, useStyles2, } from '@grafana/ui'; -import { TimeZoneOffset } from '@grafana/ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneOffset'; -import { TimeZoneTitle } from '@grafana/ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneTitle'; +import { TimeZoneOffset, TimeZoneTitle } from '@grafana/ui/internal'; import { t } from 'app/core/internationalization'; import { TimeRegionConfig, TimeRegionMode } from 'app/core/utils/timeRegions'; import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv'; diff --git a/public/app/plugins/datasource/influxdb/components/editor/annotation/AnnotationEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/annotation/AnnotationEditor.tsx index e77183eac0a..a0feea2669b 100644 --- a/public/app/plugins/datasource/influxdb/components/editor/annotation/AnnotationEditor.tsx +++ b/public/app/plugins/datasource/influxdb/components/editor/annotation/AnnotationEditor.tsx @@ -1,7 +1,7 @@ import { useState } from 'react'; import { QueryEditorProps } from '@grafana/data/src'; -import { InlineFormLabel, Input, Stack } from '@grafana/ui/src'; +import { InlineFormLabel, Input, Stack } from '@grafana/ui'; import InfluxDatasource from '../../../datasource'; import { InfluxOptions, InfluxQuery } from '../../../types'; diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/flux/FluxQueryEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/flux/FluxQueryEditor.tsx index 22f29eebd1e..b5b594f3445 100644 --- a/public/app/plugins/datasource/influxdb/components/editor/query/flux/FluxQueryEditor.tsx +++ b/public/app/plugins/datasource/influxdb/components/editor/query/flux/FluxQueryEditor.tsx @@ -13,7 +13,7 @@ import { Segment, Themeable2, withTheme2, -} from '@grafana/ui/src'; +} from '@grafana/ui'; import InfluxDatasource from '../../../../datasource'; import { InfluxQuery } from '../../../../types'; diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx index df20529d40d..4858da88623 100644 --- a/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx +++ b/public/app/plugins/datasource/influxdb/components/editor/query/fsql/FSQLEditor.tsx @@ -3,7 +3,7 @@ import { PureComponent } from 'react'; import { GrafanaTheme2 } from '@grafana/data/src'; import { SQLQuery, SqlQueryEditorLazy, applyQueryDefaults } from '@grafana/sql'; -import { InlineFormLabel, LinkButton, Themeable2, withTheme2 } from '@grafana/ui/src'; +import { InlineFormLabel, LinkButton, Themeable2, withTheme2 } from '@grafana/ui'; import InfluxDatasource from '../../../../datasource'; import { FlightSQLDatasource } from '../../../../fsql/datasource.flightsql'; diff --git a/public/app/plugins/datasource/influxdb/components/editor/variable/VariableQueryEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/variable/VariableQueryEditor.tsx index e7381c5a399..69290f8ab6a 100644 --- a/public/app/plugins/datasource/influxdb/components/editor/variable/VariableQueryEditor.tsx +++ b/public/app/plugins/datasource/influxdb/components/editor/variable/VariableQueryEditor.tsx @@ -1,6 +1,5 @@ import { QueryEditorProps } from '@grafana/data'; -import { InlineFieldRow, Input, TextArea } from '@grafana/ui'; -import { InlineField } from '@grafana/ui/'; +import { InlineField, InlineFieldRow, Input, TextArea } from '@grafana/ui'; import InfluxDatasource from '../../../datasource'; import { InfluxOptions, InfluxQuery, InfluxVariableQuery, InfluxVersion } from '../../../types'; diff --git a/public/app/plugins/datasource/mssql/azureauth/AzureAuthSettings.tsx b/public/app/plugins/datasource/mssql/azureauth/AzureAuthSettings.tsx index ba93261c515..0d53f030095 100644 --- a/public/app/plugins/datasource/mssql/azureauth/AzureAuthSettings.tsx +++ b/public/app/plugins/datasource/mssql/azureauth/AzureAuthSettings.tsx @@ -4,7 +4,7 @@ import { useEffectOnce } from 'react-use'; import { AzureCredentials, AzureCloud, updateDatasourceCredentials } from '@grafana/azure-sdk'; import { SelectableValue } from '@grafana/data'; import { config } from '@grafana/runtime'; -import { HttpSettingsBaseProps } from '@grafana/ui/src/components/DataSourceSettings/types'; +import { HttpSettingsBaseProps } from '@grafana/ui/internal'; import { getCredentials } from './AzureCredentialsConfig'; import { AzureCredentialsForm } from './AzureCredentialsForm'; diff --git a/public/app/plugins/datasource/mssql/azureauth/AzureCredentialsForm.tsx b/public/app/plugins/datasource/mssql/azureauth/AzureCredentialsForm.tsx index ba2124a3c38..f7681d27013 100644 --- a/public/app/plugins/datasource/mssql/azureauth/AzureCredentialsForm.tsx +++ b/public/app/plugins/datasource/mssql/azureauth/AzureCredentialsForm.tsx @@ -2,7 +2,7 @@ import { ChangeEvent } from 'react'; import { AzureCredentials, AzureAuthType } from '@grafana/azure-sdk'; import { SelectableValue } from '@grafana/data'; -import { Button, Field, Select, Input } from '@grafana/ui/src/components'; +import { Button, Field, Select, Input } from '@grafana/ui'; export interface Props { managedIdentityEnabled: boolean; diff --git a/public/app/plugins/datasource/mssql/types.ts b/public/app/plugins/datasource/mssql/types.ts index 4562abb7623..22066dcdd03 100644 --- a/public/app/plugins/datasource/mssql/types.ts +++ b/public/app/plugins/datasource/mssql/types.ts @@ -1,6 +1,6 @@ import { AzureCredentials } from '@grafana/azure-sdk'; import { SQLOptions } from '@grafana/sql'; -import { HttpSettingsBaseProps } from '@grafana/ui/src/components/DataSourceSettings/types'; +import { HttpSettingsBaseProps } from '@grafana/ui/internal'; export enum MSSQLAuthenticationType { sqlAuth = 'SQL Server Authentication', diff --git a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx index 5ce68d35c9d..141117637c5 100644 --- a/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx @@ -5,7 +5,7 @@ import { useEffectOnce } from 'react-use'; import { AzureCredentials } from '@grafana/azure-sdk'; import { config } from '@grafana/runtime'; import { InlineField, InlineFieldRow, InlineSwitch, Input } from '@grafana/ui'; -import { HttpSettingsBaseProps } from '@grafana/ui/src/components/DataSourceSettings/types'; +import { HttpSettingsBaseProps } from '@grafana/ui/internal'; import { getAzureCloudOptions, getCredentials, updateCredentials } from './AzureCredentialsConfig'; import { AzureCredentialsForm } from './AzureCredentialsForm'; diff --git a/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx b/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx index 010c1ba2f63..f427d8c2181 100644 --- a/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx +++ b/public/app/plugins/datasource/prometheus/configuration/DataSourceHttpSettingsOverhaulPackage.tsx @@ -5,7 +5,7 @@ import { Auth, ConnectionSettings, convertLegacyAuthProps, AuthMethod } from '@g import { docsTip, overhaulStyles } from '@grafana/prometheus'; import { Alert, SecureSocksProxySettings, useTheme2 } from '@grafana/ui'; // NEED TO EXPORT THIS FROM GRAFANA/UI FOR EXTERNAL DS -import { AzureAuthSettings } from '@grafana/ui/src/components/DataSourceSettings/types'; +import { AzureAuthSettings } from '@grafana/ui/internal'; import { AzurePromDataSourceSettings } from './AzureCredentialsConfig'; diff --git a/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/RawQuery.tsx b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/RawQuery.tsx index 60b0d6fd765..742b12b9d50 100644 --- a/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/RawQuery.tsx +++ b/public/app/plugins/datasource/tempo/_importedDependencies/datasources/prometheus/RawQuery.tsx @@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css'; import Prism, { Grammar } from 'prismjs'; import { GrafanaTheme2 } from '@grafana/data/src'; -import { useTheme2 } from '@grafana/ui/src'; +import { useTheme2 } from '@grafana/ui'; export interface Props { query: string; diff --git a/public/app/plugins/panel/annolist/AnnoListPanel.tsx b/public/app/plugins/panel/annolist/AnnoListPanel.tsx index 8e622d5166e..9ad76a71491 100644 --- a/public/app/plugins/panel/annolist/AnnoListPanel.tsx +++ b/public/app/plugins/panel/annolist/AnnoListPanel.tsx @@ -14,7 +14,7 @@ import { } from '@grafana/data'; import { config, getBackendSrv, locationService } from '@grafana/runtime'; import { Button, ScrollContainer, stylesFactory, TagList } from '@grafana/ui'; -import { AbstractList } from '@grafana/ui/src/components/List/AbstractList'; +import { AbstractList } from '@grafana/ui/internal'; import appEvents from 'app/core/app_events'; import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv'; diff --git a/public/app/plugins/panel/barchart/BarChartLegend.tsx b/public/app/plugins/panel/barchart/BarChartLegend.tsx index d65579dec7a..5433a1ef0bb 100644 --- a/public/app/plugins/panel/barchart/BarChartLegend.tsx +++ b/public/app/plugins/panel/barchart/BarChartLegend.tsx @@ -12,7 +12,7 @@ import { } from '@grafana/data'; import { VizLegendOptions, AxisPlacement } from '@grafana/schema'; import { UPlotConfigBuilder, VizLayout, VizLayoutLegendProps, VizLegend, VizLegendItem, useTheme2 } from '@grafana/ui'; -import { getDisplayValuesForCalcs } from '@grafana/ui/src/components/uPlot/utils'; +import { getDisplayValuesForCalcs } from '@grafana/ui/internal'; import { getThresholdItems, getValueMappingItems } from 'app/core/components/TimelineChart/utils'; interface BarChartLegend2Props extends VizLegendOptions, Omit { data: DataFrame[]; diff --git a/public/app/plugins/panel/barchart/BarChartPanel.tsx b/public/app/plugins/panel/barchart/BarChartPanel.tsx index 424bbd16de0..fdb05575741 100644 --- a/public/app/plugins/panel/barchart/BarChartPanel.tsx +++ b/public/app/plugins/panel/barchart/BarChartPanel.tsx @@ -12,7 +12,7 @@ import { // usePanelContext, useTheme2, } from '@grafana/ui'; -import { TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2'; +import { TooltipHoverMode } from '@grafana/ui/internal'; import { TimeSeriesTooltip } from '../timeseries/TimeSeriesTooltip'; diff --git a/public/app/plugins/panel/barchart/bars.ts b/public/app/plugins/panel/barchart/bars.ts index 3574b6d5045..7d3e318eea3 100644 --- a/public/app/plugins/panel/barchart/bars.ts +++ b/public/app/plugins/panel/barchart/bars.ts @@ -11,8 +11,7 @@ import { VizLegendOptions, } from '@grafana/schema'; import { measureText } from '@grafana/ui'; -import { timeUnitSize } from '@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder'; -import { StackingGroup, preparePlotData2 } from '@grafana/ui/src/components/uPlot/utils'; +import { timeUnitSize, StackingGroup, preparePlotData2 } from '@grafana/ui/internal'; const intervals = systemDateFormats.interval; diff --git a/public/app/plugins/panel/barchart/module.tsx b/public/app/plugins/panel/barchart/module.tsx index c31c17f5a81..11dfc45e823 100644 --- a/public/app/plugins/panel/barchart/module.tsx +++ b/public/app/plugins/panel/barchart/module.tsx @@ -9,7 +9,7 @@ import { } from '@grafana/data'; import { GraphTransform, GraphThresholdsStyleMode, StackingMode, VisibilityMode } from '@grafana/schema'; import { graphFieldOptions, commonOptionsBuilder } from '@grafana/ui'; -import { optsWithHideZeros } from '@grafana/ui/src/options/builder/tooltip'; +import { optsWithHideZeros } from '@grafana/ui/internal'; import { ThresholdsStyleEditor } from '../timeseries/ThresholdsStyleEditor'; diff --git a/public/app/plugins/panel/barchart/utils.ts b/public/app/plugins/panel/barchart/utils.ts index d6cf592062e..9b25e678f1f 100644 --- a/public/app/plugins/panel/barchart/utils.ts +++ b/public/app/plugins/panel/barchart/utils.ts @@ -33,8 +33,7 @@ import { UPlotConfigBuilder, measureText, } from '@grafana/ui'; -import { AxisProps, UPLOT_AXIS_FONT_SIZE } from '@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder'; -import { getStackingGroups } from '@grafana/ui/src/components/uPlot/utils'; +import { AxisProps, UPLOT_AXIS_FONT_SIZE, getStackingGroups } from '@grafana/ui/internal'; import { setClassicPaletteIdxs } from '../timeseries/utils'; diff --git a/public/app/plugins/panel/bargauge/BarGaugeLegend.tsx b/public/app/plugins/panel/bargauge/BarGaugeLegend.tsx index 8d88eac3ee3..0ddecee36f6 100644 --- a/public/app/plugins/panel/bargauge/BarGaugeLegend.tsx +++ b/public/app/plugins/panel/bargauge/BarGaugeLegend.tsx @@ -4,7 +4,7 @@ import { cacheFieldDisplayNames, DataFrame, FieldType, getFieldSeriesColor } fro import { Field } from '@grafana/data/'; import { AxisPlacement, VizLegendOptions } from '@grafana/schema'; import { useTheme2, VizLayout, VizLayoutLegendProps, VizLegend, VizLegendItem } from '@grafana/ui'; -import { getDisplayValuesForCalcs } from '@grafana/ui/src/components/uPlot/utils'; +import { getDisplayValuesForCalcs } from '@grafana/ui/internal'; interface BarGaugeLegendProps extends VizLegendOptions, Omit { data: DataFrame[]; diff --git a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx index a872b6bd301..0c59c7905c1 100644 --- a/public/app/plugins/panel/bargauge/BarGaugePanel.tsx +++ b/public/app/plugins/panel/bargauge/BarGaugePanel.tsx @@ -14,7 +14,7 @@ import { } from '@grafana/data'; import { BarGaugeSizing } from '@grafana/schema'; import { BarGauge, DataLinksContextMenu, VizLayout, VizRepeater, VizRepeaterRenderValueProps } from '@grafana/ui'; -import { DataLinksContextMenuApi } from '@grafana/ui/src/components/DataLinks/DataLinksContextMenu'; +import { DataLinksContextMenuApi } from '@grafana/ui/internal'; import { config } from 'app/core/config'; import { BarGaugeLegend } from './BarGaugeLegend'; diff --git a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx index 16eeeae3ca6..39d68078b51 100644 --- a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx +++ b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx @@ -15,9 +15,7 @@ import { usePanelContext, useTheme2, } from '@grafana/ui'; -import { AxisProps } from '@grafana/ui/src/components/uPlot/config/UPlotAxisBuilder'; -import { ScaleProps } from '@grafana/ui/src/components/uPlot/config/UPlotScaleBuilder'; -import { TimeRange2, TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2'; +import { AxisProps, ScaleProps, TimeRange2, TooltipHoverMode } from '@grafana/ui/internal'; import { TimeSeries } from 'app/core/components/TimeSeries/TimeSeries'; import { config } from 'app/core/config'; diff --git a/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx b/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx index 6234a4a7693..aa756baa9c8 100644 --- a/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx +++ b/public/app/plugins/panel/canvas/components/CanvasTooltip.tsx @@ -15,11 +15,13 @@ import { } from '@grafana/data/src'; import { ActionModel } from '@grafana/data/src/types/action'; import { Portal, useStyles2, VizTooltipContainer } from '@grafana/ui'; -import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent'; -import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter'; -import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader'; -import { VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types'; -import { CloseButton } from '@grafana/ui/src/components/uPlot/plugins/CloseButton'; +import { + VizTooltipContent, + VizTooltipFooter, + VizTooltipHeader, + VizTooltipItem, + CloseButton, +} from '@grafana/ui/internal'; import { getActions, getActionsDefaultField } from 'app/features/actions/utils'; import { Scene } from 'app/features/canvas/runtime/scene'; diff --git a/public/app/plugins/panel/canvas/editor/LineStyleEditor.tsx b/public/app/plugins/panel/canvas/editor/LineStyleEditor.tsx index 53251621d57..58aac8c148a 100644 --- a/public/app/plugins/panel/canvas/editor/LineStyleEditor.tsx +++ b/public/app/plugins/panel/canvas/editor/LineStyleEditor.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react'; import { SelectableValue, StandardEditorProps } from '@grafana/data'; -import { Field, RadioButtonGroup, Switch } from '@grafana/ui/src'; +import { Field, RadioButtonGroup, Switch } from '@grafana/ui'; import { LineStyle } from '../types'; diff --git a/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx b/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx index 9333b64d60d..acfe2f3b755 100644 --- a/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx +++ b/public/app/plugins/panel/canvas/editor/element/QuickPositioning.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { GrafanaTheme2 } from '@grafana/data/src'; -import { IconButton, useStyles2 } from '@grafana/ui/src'; +import { IconButton, useStyles2 } from '@grafana/ui'; import { ElementState } from 'app/features/canvas/runtime/element'; import { QuickPlacement } from 'app/features/canvas/types'; diff --git a/public/app/plugins/panel/canvas/editor/inline/InlineEditBody.tsx b/public/app/plugins/panel/canvas/editor/inline/InlineEditBody.tsx index 07f71b7b3d5..5b13b982eb8 100644 --- a/public/app/plugins/panel/canvas/editor/inline/InlineEditBody.tsx +++ b/public/app/plugins/panel/canvas/editor/inline/InlineEditBody.tsx @@ -6,7 +6,7 @@ import { useObservable } from 'react-use'; import { DataFrame, GrafanaTheme2, PanelOptionsEditorBuilder, StandardEditorContext } from '@grafana/data'; import { PanelOptionsSupplier } from '@grafana/data/src/panel/PanelPlugin'; import { NestedValueAccess } from '@grafana/data/src/utils/OptionsUIBuilders'; -import { useStyles2 } from '@grafana/ui/src'; +import { useStyles2 } from '@grafana/ui'; import { AddLayerButton } from 'app/core/components/Layers/AddLayerButton'; import { FrameState } from 'app/features/canvas/runtime/frame'; import { OptionsPaneCategory } from 'app/features/dashboard/components/PanelEditor/OptionsPaneCategory'; diff --git a/public/app/plugins/panel/canvas/editor/inline/TabsEditor.tsx b/public/app/plugins/panel/canvas/editor/inline/TabsEditor.tsx index ce6b5da4932..1d4d67f2cac 100644 --- a/public/app/plugins/panel/canvas/editor/inline/TabsEditor.tsx +++ b/public/app/plugins/panel/canvas/editor/inline/TabsEditor.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import { Tab, TabsBar } from '@grafana/ui/src'; +import { Tab, TabsBar } from '@grafana/ui'; import { InlineEditTabs } from '../../types'; diff --git a/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx b/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx index f750c71d4a7..f9629ce7053 100644 --- a/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx +++ b/public/app/plugins/panel/datagrid/components/DatagridContextMenu.tsx @@ -6,7 +6,7 @@ import { DataFrame, FieldType } from '@grafana/data'; import { convertFieldType } from '@grafana/data/src/transformations/transformers/convertFieldType'; import { reportInteraction } from '@grafana/runtime'; import { ContextMenu, MenuGroup, MenuItem } from '@grafana/ui'; -import { MenuDivider } from '@grafana/ui/src/components/Menu/MenuDivider'; +import { MenuDivider } from '@grafana/ui/internal'; import { DatagridAction, DatagridActionType } from '../state'; import { diff --git a/public/app/plugins/panel/gauge/GaugePanel.tsx b/public/app/plugins/panel/gauge/GaugePanel.tsx index cb64ba49844..2d8eb4c9610 100644 --- a/public/app/plugins/panel/gauge/GaugePanel.tsx +++ b/public/app/plugins/panel/gauge/GaugePanel.tsx @@ -3,7 +3,7 @@ import { PureComponent } from 'react'; import { FieldDisplay, getDisplayProcessor, getFieldDisplayValues, PanelProps } from '@grafana/data'; import { BarGaugeSizing, VizOrientation } from '@grafana/schema'; import { DataLinksContextMenu, Gauge, VizRepeater, VizRepeaterRenderValueProps } from '@grafana/ui'; -import { DataLinksContextMenuApi } from '@grafana/ui/src/components/DataLinks/DataLinksContextMenu'; +import { DataLinksContextMenuApi } from '@grafana/ui/internal'; import { config } from 'app/core/config'; import { clearNameForSingleSeries } from '../bargauge/BarGaugePanel'; diff --git a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx index 69f423b8f0d..510a21b7384 100644 --- a/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx +++ b/public/app/plugins/panel/geomap/editor/FrameSelectionEditor.tsx @@ -1,11 +1,7 @@ import { useCallback } from 'react'; import { FrameMatcherID, MatcherConfig, StandardEditorProps } from '@grafana/data'; -import { - RefIDMultiPicker, - RefIDPicker, - stringsToRegexp, -} from '@grafana/ui/src/components/MatchersUI/FieldsByFrameRefIdMatcher'; +import { RefIDMultiPicker, RefIDPicker, stringsToRegexp } from '@grafana/ui/internal'; type Props = StandardEditorProps; diff --git a/public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx b/public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx index 840a91413fc..97d7ebbdc38 100644 --- a/public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx +++ b/public/app/plugins/panel/geomap/editor/StyleRuleEditor.tsx @@ -7,7 +7,7 @@ import { Observable } from 'rxjs'; import { GrafanaTheme2, SelectableValue, StandardEditorProps, StandardEditorsRegistryItem } from '@grafana/data'; import { ComparisonOperation } from '@grafana/schema'; import { Button, InlineField, InlineFieldRow, Select, useStyles2 } from '@grafana/ui'; -import { comparisonOperationOptions } from '@grafana/ui/src/components/MatchersUI/FieldValueMatcher'; +import { comparisonOperationOptions } from '@grafana/ui/internal'; import { NumberInput } from 'app/core/components/OptionsUI/NumberInput'; import { DEFAULT_STYLE_RULE } from '../layers/data/geojsonLayer'; diff --git a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx index 06042a4080e..779c56bd67c 100644 --- a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx +++ b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx @@ -15,7 +15,7 @@ import { VizLayout, EventBusPlugin, } from '@grafana/ui'; -import { TimeRange2, TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2'; +import { TimeRange2, TooltipHoverMode } from '@grafana/ui/internal'; import { ColorScale } from 'app/core/components/ColorScale/ColorScale'; import { readHeatmapRowsCustomMeta } from 'app/features/transformers/calculateHeatmap/heatmap'; diff --git a/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx b/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx index d15b13cd50c..5859e93ac79 100644 --- a/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx +++ b/public/app/plugins/panel/heatmap/HeatmapTooltip.tsx @@ -15,11 +15,15 @@ import { } from '@grafana/data'; import { HeatmapCellLayout } from '@grafana/schema'; import { TooltipDisplayMode, useTheme2 } from '@grafana/ui'; -import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent'; -import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter'; -import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader'; -import { VizTooltipWrapper } from '@grafana/ui/src/components/VizTooltip/VizTooltipWrapper'; -import { ColorIndicator, ColorPlacement, VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types'; +import { + VizTooltipContent, + VizTooltipFooter, + VizTooltipHeader, + VizTooltipWrapper, + VizTooltipItem, + ColorIndicator, + ColorPlacement, +} from '@grafana/ui/internal'; import { ColorScale } from 'app/core/components/ColorScale/ColorScale'; import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv'; import { isHeatmapCellsDense, readHeatmapRowsCustomMeta } from 'app/features/transformers/calculateHeatmap/heatmap'; diff --git a/public/app/plugins/panel/heatmap/module.tsx b/public/app/plugins/panel/heatmap/module.tsx index ff3dfb38214..915f2b947ec 100644 --- a/public/app/plugins/panel/heatmap/module.tsx +++ b/public/app/plugins/panel/heatmap/module.tsx @@ -8,7 +8,7 @@ import { HeatmapCellLayout, } from '@grafana/schema'; import { TooltipDisplayMode } from '@grafana/ui'; -import { addHideFrom, ScaleDistributionEditor } from '@grafana/ui/src/options/builder'; +import { addHideFrom, ScaleDistributionEditor } from '@grafana/ui/internal'; import { ColorScale } from 'app/core/components/ColorScale/ColorScale'; import { addHeatmapCalculationOptions } from 'app/features/transformers/calculateHeatmap/editor/helper'; import { readHeatmapRowsCustomMeta } from 'app/features/transformers/calculateHeatmap/heatmap'; diff --git a/public/app/plugins/panel/histogram/Histogram.tsx b/public/app/plugins/panel/histogram/Histogram.tsx index 794fb6a7212..024d3105a51 100644 --- a/public/app/plugins/panel/histogram/Histogram.tsx +++ b/public/app/plugins/panel/histogram/Histogram.tsx @@ -24,7 +24,7 @@ import { measureText, UPLOT_AXIS_FONT_SIZE, } from '@grafana/ui'; -import { getStackingGroups, preparePlotData2 } from '@grafana/ui/src/components/uPlot/utils'; +import { getStackingGroups, preparePlotData2 } from '@grafana/ui/internal'; import { defaultFieldConfig, FieldConfig, Options } from './panelcfg.gen'; diff --git a/public/app/plugins/panel/histogram/HistogramPanel.tsx b/public/app/plugins/panel/histogram/HistogramPanel.tsx index 517f41187fc..082b0be63c4 100644 --- a/public/app/plugins/panel/histogram/HistogramPanel.tsx +++ b/public/app/plugins/panel/histogram/HistogramPanel.tsx @@ -3,7 +3,7 @@ import { useMemo } from 'react'; import { DataFrameType, PanelProps, buildHistogram, cacheFieldDisplayNames, getHistogramFields } from '@grafana/data'; import { histogramFieldsToFrame, joinHistograms } from '@grafana/data/src/transformations/transformers/histogram'; import { TooltipDisplayMode, TooltipPlugin2, useTheme2 } from '@grafana/ui'; -import { TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2'; +import { TooltipHoverMode } from '@grafana/ui/internal'; import { Histogram, getBucketSize } from './Histogram'; import { HistogramTooltip } from './HistogramTooltip'; diff --git a/public/app/plugins/panel/histogram/HistogramTooltip.tsx b/public/app/plugins/panel/histogram/HistogramTooltip.tsx index 53bfd3bcfc6..e87f55228b8 100644 --- a/public/app/plugins/panel/histogram/HistogramTooltip.tsx +++ b/public/app/plugins/panel/histogram/HistogramTooltip.tsx @@ -2,12 +2,14 @@ import { ReactNode, useMemo } from 'react'; import { DataFrame, formattedValueToString } from '@grafana/data'; import { SortOrder, TooltipDisplayMode } from '@grafana/schema/dist/esm/common/common.gen'; -import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent'; -import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter'; -import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader'; -import { VizTooltipWrapper } from '@grafana/ui/src/components/VizTooltip/VizTooltipWrapper'; -import { VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types'; -import { getContentItems } from '@grafana/ui/src/components/VizTooltip/utils'; +import { + VizTooltipContent, + VizTooltipFooter, + VizTooltipHeader, + VizTooltipWrapper, + getContentItems, + VizTooltipItem, +} from '@grafana/ui/internal'; import { getDataLinks } from '../status-history/utils'; import { isTooltipScrollable } from '../timeseries/utils'; diff --git a/public/app/plugins/panel/histogram/module.tsx b/public/app/plugins/panel/histogram/module.tsx index 3be418ceb87..cf95bbc463d 100644 --- a/public/app/plugins/panel/histogram/module.tsx +++ b/public/app/plugins/panel/histogram/module.tsx @@ -7,7 +7,7 @@ import { } from '@grafana/data'; import { histogramFieldInfo } from '@grafana/data/src/transformations/transformers/histogram'; import { commonOptionsBuilder, graphFieldOptions } from '@grafana/ui'; -import { StackingEditor } from '@grafana/ui/src/options/builder'; +import { StackingEditor } from '@grafana/ui/internal'; import { HistogramPanel } from './HistogramPanel'; import { defaultHistogramConfig } from './config'; diff --git a/public/app/plugins/panel/news/component/News.tsx b/public/app/plugins/panel/news/component/News.tsx index 09cce50f314..f0e31cdf3bf 100644 --- a/public/app/plugins/panel/news/component/News.tsx +++ b/public/app/plugins/panel/news/component/News.tsx @@ -3,7 +3,7 @@ import Skeleton from 'react-loading-skeleton'; import { DataFrameView, GrafanaTheme2, textUtil, dateTimeFormat } from '@grafana/data'; import { useStyles2 } from '@grafana/ui'; -import { attachSkeleton, SkeletonComponent } from '@grafana/ui/src/unstable'; +import { attachSkeleton, SkeletonComponent } from '@grafana/ui/unstable'; import { NewsItem } from '../types'; diff --git a/public/app/plugins/panel/nodeGraph/editor/ArcOptionsEditor.tsx b/public/app/plugins/panel/nodeGraph/editor/ArcOptionsEditor.tsx index aaf8283cb72..b226cedb41e 100644 --- a/public/app/plugins/panel/nodeGraph/editor/ArcOptionsEditor.tsx +++ b/public/app/plugins/panel/nodeGraph/editor/ArcOptionsEditor.tsx @@ -2,7 +2,7 @@ import { css } from '@emotion/css'; import { Field, GrafanaTheme2, StandardEditorProps } from '@grafana/data'; import { Button, ColorPicker, useStyles2 } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; +import { FieldNamePicker } from '@grafana/ui/internal'; import { ArcOption, NodeGraphOptions } from '../types'; diff --git a/public/app/plugins/panel/piechart/PieChart.tsx b/public/app/plugins/panel/piechart/PieChart.tsx index 8f8707a5ffa..f0bcb6d7cc0 100644 --- a/public/app/plugins/panel/piechart/PieChart.tsx +++ b/public/app/plugins/panel/piechart/PieChart.tsx @@ -27,8 +27,7 @@ import { SeriesTable, usePanelContext, } from '@grafana/ui'; -import { getTooltipContainerStyles } from '@grafana/ui/src/themes/mixins'; -import { useComponentInstanceId } from '@grafana/ui/src/utils/useComponetInstanceId'; +import { getTooltipContainerStyles, useComponentInstanceId } from '@grafana/ui/internal'; import { PieChartType, PieChartLabels } from './panelcfg.gen'; import { filterDisplayItems, sumDisplayItemsReducer } from './utils'; diff --git a/public/app/plugins/panel/piechart/module.tsx b/public/app/plugins/panel/piechart/module.tsx index efbdad05270..48989f14444 100644 --- a/public/app/plugins/panel/piechart/module.tsx +++ b/public/app/plugins/panel/piechart/module.tsx @@ -1,6 +1,6 @@ import { FieldColorModeId, FieldConfigProperty, PanelPlugin } from '@grafana/data'; import { commonOptionsBuilder } from '@grafana/ui'; -import { optsWithHideZeros } from '@grafana/ui/src/options/builder/tooltip'; +import { optsWithHideZeros } from '@grafana/ui/internal'; import { addStandardDataReduceOptions } from '../stat/common'; diff --git a/public/app/plugins/panel/stat/StatPanel.tsx b/public/app/plugins/panel/stat/StatPanel.tsx index 0dc6a22124b..2411ab49943 100644 --- a/public/app/plugins/panel/stat/StatPanel.tsx +++ b/public/app/plugins/panel/stat/StatPanel.tsx @@ -13,7 +13,7 @@ import { import { findNumericFieldMinMax } from '@grafana/data/src/field/fieldOverrides'; import { BigValueTextMode, BigValueGraphMode } from '@grafana/schema'; import { BigValue, DataLinksContextMenu, VizRepeater, VizRepeaterRenderValueProps } from '@grafana/ui'; -import { DataLinksContextMenuApi } from '@grafana/ui/src/components/DataLinks/DataLinksContextMenu'; +import { DataLinksContextMenuApi } from '@grafana/ui/internal'; import { config } from 'app/core/config'; import { Options } from './panelcfg.gen'; diff --git a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx index 7a23e4a6898..4f83480e765 100644 --- a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx +++ b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx @@ -9,7 +9,7 @@ import { usePanelContext, useTheme2, } from '@grafana/ui'; -import { TimeRange2, TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2'; +import { TimeRange2, TooltipHoverMode } from '@grafana/ui/internal'; import { TimelineChart } from 'app/core/components/TimelineChart/TimelineChart'; import { prepareTimelineFields, diff --git a/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx b/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx index b400b9e6e73..78e02f42e4c 100644 --- a/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx +++ b/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx @@ -3,12 +3,14 @@ import { ReactNode } from 'react'; import { FieldType, TimeRange } from '@grafana/data'; import { SortOrder } from '@grafana/schema/dist/esm/common/common.gen'; import { TooltipDisplayMode } from '@grafana/ui'; -import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent'; -import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter'; -import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader'; -import { VizTooltipWrapper } from '@grafana/ui/src/components/VizTooltip/VizTooltipWrapper'; -import { VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types'; -import { getContentItems } from '@grafana/ui/src/components/VizTooltip/utils'; +import { + VizTooltipContent, + VizTooltipFooter, + VizTooltipHeader, + VizTooltipWrapper, + getContentItems, + VizTooltipItem, +} from '@grafana/ui/internal'; import { findNextStateIndex, fmtDuration } from 'app/core/components/TimelineChart/utils'; import { getFieldActions } from '../status-history/utils'; diff --git a/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx index 1f410d1578c..d171ba5a634 100644 --- a/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx +++ b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx @@ -9,7 +9,7 @@ import { usePanelContext, useTheme2, } from '@grafana/ui'; -import { TimeRange2, TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2'; +import { TimeRange2, TooltipHoverMode } from '@grafana/ui/internal'; import { TimelineChart } from 'app/core/components/TimelineChart/TimelineChart'; import { prepareTimelineFields, diff --git a/public/app/plugins/panel/table/TablePanel.tsx b/public/app/plugins/panel/table/TablePanel.tsx index 527389c9e90..a5dfbf92c63 100644 --- a/public/app/plugins/panel/table/TablePanel.tsx +++ b/public/app/plugins/panel/table/TablePanel.tsx @@ -13,7 +13,7 @@ import { } from '@grafana/data'; import { config, PanelDataErrorView } from '@grafana/runtime'; import { Select, Table, usePanelContext, useTheme2 } from '@grafana/ui'; -import { TableSortByFieldState } from '@grafana/ui/src/components/Table/types'; +import { TableSortByFieldState } from '@grafana/ui/internal'; import { getActions } from '../../../features/actions/utils'; diff --git a/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx b/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx index 3f9cd082e9b..085be091423 100644 --- a/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx +++ b/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx @@ -4,7 +4,7 @@ import { useMemo } from 'react'; import { createFieldConfigRegistry, SetFieldConfigOptionsArgs } from '@grafana/data'; import { GraphFieldConfig, TableSparklineCellOptions } from '@grafana/schema'; import { VerticalGroup, Field, useStyles2 } from '@grafana/ui'; -import { defaultSparklineCellConfig } from '@grafana/ui/src/components/Table/SparklineCell'; +import { defaultSparklineCellConfig } from '@grafana/ui/internal'; import { getGraphFieldConfig } from '../../timeseries/config'; import { TableCellEditorProps } from '../TableCellOptionEditor'; diff --git a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx index e4124886ce2..c948b75b296 100644 --- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx +++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx @@ -4,7 +4,7 @@ import { PanelProps, DataFrameType, DashboardCursorSync } from '@grafana/data'; import { PanelDataErrorView } from '@grafana/runtime'; import { TooltipDisplayMode, VizOrientation } from '@grafana/schema'; import { EventBusPlugin, KeyboardPlugin, TooltipPlugin2, usePanelContext } from '@grafana/ui'; -import { TimeRange2, TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2'; +import { TimeRange2, TooltipHoverMode } from '@grafana/ui/internal'; import { TimeSeries } from 'app/core/components/TimeSeries/TimeSeries'; import { config } from 'app/core/config'; diff --git a/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx b/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx index 4471ed2e84c..48d7cc1665a 100644 --- a/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx +++ b/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx @@ -2,12 +2,14 @@ import { ReactNode } from 'react'; import { DataFrame, Field, FieldType, formattedValueToString, InterpolateFunction, LinkModel } from '@grafana/data'; import { SortOrder, TooltipDisplayMode } from '@grafana/schema/dist/esm/common/common.gen'; -import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent'; -import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter'; -import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader'; -import { VizTooltipWrapper } from '@grafana/ui/src/components/VizTooltip/VizTooltipWrapper'; -import { VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types'; -import { getContentItems } from '@grafana/ui/src/components/VizTooltip/utils'; +import { + VizTooltipContent, + VizTooltipFooter, + VizTooltipHeader, + VizTooltipWrapper, + getContentItems, + VizTooltipItem, +} from '@grafana/ui/internal'; import { getFieldActions } from '../status-history/utils'; import { fmt } from '../xychart/utils'; diff --git a/public/app/plugins/panel/timeseries/module.tsx b/public/app/plugins/panel/timeseries/module.tsx index 5f4cdbac50d..50ed7800b2e 100644 --- a/public/app/plugins/panel/timeseries/module.tsx +++ b/public/app/plugins/panel/timeseries/module.tsx @@ -1,6 +1,6 @@ import { PanelPlugin } from '@grafana/data'; import { commonOptionsBuilder } from '@grafana/ui'; -import { optsWithHideZeros } from '@grafana/ui/src/options/builder/tooltip'; +import { optsWithHideZeros } from '@grafana/ui/internal'; import { TimeSeriesPanel } from './TimeSeriesPanel'; import { TimezonesEditor } from './TimezonesEditor'; diff --git a/public/app/plugins/panel/timeseries/plugins/ThresholdControlsPlugin.tsx b/public/app/plugins/panel/timeseries/plugins/ThresholdControlsPlugin.tsx index 76ff1c3b3eb..ee50545f9f0 100644 --- a/public/app/plugins/panel/timeseries/plugins/ThresholdControlsPlugin.tsx +++ b/public/app/plugins/panel/timeseries/plugins/ThresholdControlsPlugin.tsx @@ -3,7 +3,7 @@ import uPlot from 'uplot'; import { FieldConfigSource, ThresholdsConfig, getValueFormat, FieldType } from '@grafana/data'; import { UPlotConfigBuilder } from '@grafana/ui'; -import { buildScaleKey } from '@grafana/ui/src/components/uPlot/internal'; +import { buildScaleKey } from '@grafana/ui/internal'; import { ThresholdDragHandle } from './ThresholdDragHandle'; diff --git a/public/app/plugins/panel/timeseries/utils.ts b/public/app/plugins/panel/timeseries/utils.ts index fb5ca669376..02fc7ea3b34 100644 --- a/public/app/plugins/panel/timeseries/utils.ts +++ b/public/app/plugins/panel/timeseries/utils.ts @@ -12,7 +12,7 @@ import { convertFieldType } from '@grafana/data/src/transformations/transformers import { applyNullInsertThreshold } from '@grafana/data/src/transformations/transformers/nulls/nullInsertThreshold'; import { nullToValue } from '@grafana/data/src/transformations/transformers/nulls/nullToValue'; import { GraphFieldConfig, LineInterpolation, TooltipDisplayMode, VizTooltipOptions } from '@grafana/schema'; -import { buildScaleKey } from '@grafana/ui/src/components/uPlot/internal'; +import { buildScaleKey } from '@grafana/ui/internal'; import { HeatmapTooltip } from '../heatmap/panelcfg.gen'; diff --git a/public/app/plugins/panel/trend/TrendPanel.tsx b/public/app/plugins/panel/trend/TrendPanel.tsx index 1fe5ced2a49..f043c113b1f 100644 --- a/public/app/plugins/panel/trend/TrendPanel.tsx +++ b/public/app/plugins/panel/trend/TrendPanel.tsx @@ -4,7 +4,7 @@ import { DataFrame, FieldMatcherID, fieldMatchers, FieldType, PanelProps, TimeRa import { isLikelyAscendingVector } from '@grafana/data/src/transformations/transformers/joinDataFrames'; import { config, PanelDataErrorView } from '@grafana/runtime'; import { KeyboardPlugin, TooltipDisplayMode, usePanelContext, TooltipPlugin2 } from '@grafana/ui'; -import { TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2'; +import { TooltipHoverMode } from '@grafana/ui/internal'; import { XYFieldMatchers } from 'app/core/components/GraphNG/types'; import { preparePlotFrame } from 'app/core/components/GraphNG/utils'; import { TimeSeries } from 'app/core/components/TimeSeries/TimeSeries'; diff --git a/public/app/plugins/panel/trend/module.tsx b/public/app/plugins/panel/trend/module.tsx index 5877167e46c..2d09bed7cec 100644 --- a/public/app/plugins/panel/trend/module.tsx +++ b/public/app/plugins/panel/trend/module.tsx @@ -1,6 +1,6 @@ import { Field, FieldType, PanelPlugin } from '@grafana/data'; import { commonOptionsBuilder } from '@grafana/ui'; -import { optsWithHideZeros } from '@grafana/ui/src/options/builder/tooltip'; +import { optsWithHideZeros } from '@grafana/ui/internal'; import { defaultGraphConfig, getGraphFieldConfig } from '../timeseries/config'; diff --git a/public/app/plugins/panel/xychart/SeriesEditor.tsx b/public/app/plugins/panel/xychart/SeriesEditor.tsx index 4d9e1ebcf51..6b01ba3268d 100644 --- a/public/app/plugins/panel/xychart/SeriesEditor.tsx +++ b/public/app/plugins/panel/xychart/SeriesEditor.tsx @@ -13,7 +13,7 @@ import { GrafanaTheme2, } from '@grafana/data'; import { Button, Field, IconButton, Select, useStyles2 } from '@grafana/ui'; -import { FieldNamePicker } from '@grafana/ui/src/components/MatchersUI/FieldNamePicker'; +import { FieldNamePicker } from '@grafana/ui/internal'; import { LayerName } from 'app/core/components/Layers/LayerName'; import { Options, SeriesMapping, XYSeriesConfig } from './panelcfg.gen'; diff --git a/public/app/plugins/panel/xychart/XYChartPanel.tsx b/public/app/plugins/panel/xychart/XYChartPanel.tsx index 25ef452dc6b..31d4784a7aa 100644 --- a/public/app/plugins/panel/xychart/XYChartPanel.tsx +++ b/public/app/plugins/panel/xychart/XYChartPanel.tsx @@ -14,8 +14,7 @@ import { useStyles2, useTheme2, } from '@grafana/ui'; -import { TooltipHoverMode } from '@grafana/ui/src/components/uPlot/plugins/TooltipPlugin2'; -import { getDisplayValuesForCalcs } from '@grafana/ui/src/components/uPlot/utils'; +import { getDisplayValuesForCalcs, TooltipHoverMode } from '@grafana/ui/internal'; import { getDataLinks } from '../status-history/utils'; diff --git a/public/app/plugins/panel/xychart/XYChartTooltip.tsx b/public/app/plugins/panel/xychart/XYChartTooltip.tsx index 08bd3903bad..f9b0d588d31 100644 --- a/public/app/plugins/panel/xychart/XYChartTooltip.tsx +++ b/public/app/plugins/panel/xychart/XYChartTooltip.tsx @@ -2,11 +2,14 @@ import { ReactNode } from 'react'; import { DataFrame, InterpolateFunction, LinkModel } from '@grafana/data'; import { alpha } from '@grafana/data/src/themes/colorManipulator'; -import { VizTooltipContent } from '@grafana/ui/src/components/VizTooltip/VizTooltipContent'; -import { VizTooltipFooter } from '@grafana/ui/src/components/VizTooltip/VizTooltipFooter'; -import { VizTooltipHeader } from '@grafana/ui/src/components/VizTooltip/VizTooltipHeader'; -import { VizTooltipWrapper } from '@grafana/ui/src/components/VizTooltip/VizTooltipWrapper'; -import { ColorIndicator, VizTooltipItem } from '@grafana/ui/src/components/VizTooltip/types'; +import { + VizTooltipContent, + VizTooltipFooter, + VizTooltipHeader, + VizTooltipWrapper, + ColorIndicator, + VizTooltipItem, +} from '@grafana/ui/internal'; import { getFieldActions } from '../status-history/utils'; diff --git a/public/app/plugins/panel/xychart/scatter.ts b/public/app/plugins/panel/xychart/scatter.ts index 5f741b92323..b2d9156ffbb 100644 --- a/public/app/plugins/panel/xychart/scatter.ts +++ b/public/app/plugins/panel/xychart/scatter.ts @@ -15,7 +15,7 @@ import { import { alpha } from '@grafana/data/src/themes/colorManipulator'; import { AxisPlacement, FieldColorModeId, ScaleDirection, ScaleOrientation, VisibilityMode } from '@grafana/schema'; import { UPlotConfigBuilder } from '@grafana/ui'; -import { FacetedData, FacetSeries } from '@grafana/ui/src/components/uPlot/types'; +import { FacetedData, FacetSeries } from '@grafana/ui/internal'; import { pointWithin, Quadtree, Rect } from '../barchart/quadtree'; import { valuesToFills } from '../heatmap/utils'; diff --git a/scripts/cli/generateSassVariableFiles.ts b/scripts/cli/generateSassVariableFiles.ts index 842ff5794f4..4a91921a1e9 100644 --- a/scripts/cli/generateSassVariableFiles.ts +++ b/scripts/cli/generateSassVariableFiles.ts @@ -2,9 +2,10 @@ import { writeFile } from 'node:fs/promises'; import { resolve } from 'path'; import { createTheme } from '@grafana/data'; -import { darkThemeVarsTemplate } from '@grafana/ui/src/themes/_variables.dark.scss.tmpl'; -import { lightThemeVarsTemplate } from '@grafana/ui/src/themes/_variables.light.scss.tmpl'; -import { commonThemeVarsTemplate } from '@grafana/ui/src/themes/_variables.scss.tmpl'; + +import { darkThemeVarsTemplate } from './themeTemplates/_variables.dark.scss.tmpl'; +import { lightThemeVarsTemplate } from './themeTemplates/_variables.light.scss.tmpl'; +import { commonThemeVarsTemplate } from './themeTemplates/_variables.scss.tmpl'; const darkThemeVariablesPath = resolve(__dirname, 'public', 'sass', '_variables.dark.generated.scss'); const lightThemeVariablesPath = resolve(__dirname, 'public', 'sass', '_variables.light.generated.scss'); diff --git a/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts b/scripts/cli/themeTemplates/_variables.dark.scss.tmpl.ts similarity index 98% rename from packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts rename to scripts/cli/themeTemplates/_variables.dark.scss.tmpl.ts index 82804c8254a..001f8fe20c6 100644 --- a/packages/grafana-ui/src/themes/_variables.dark.scss.tmpl.ts +++ b/scripts/cli/themeTemplates/_variables.dark.scss.tmpl.ts @@ -2,7 +2,7 @@ import { GrafanaTheme2 } from '@grafana/data'; -import { renderGeneratedFileBanner } from '../utils/generatedFileBanner'; +import { renderGeneratedFileBanner } from './generatedFileBanner'; export const darkThemeVarsTemplate = (theme: GrafanaTheme2) => `${renderGeneratedFileBanner('grafana-ui/src/themes/dark.ts', 'grafana-ui/src/themes/_variables.dark.scss.tmpl.ts')} diff --git a/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts b/scripts/cli/themeTemplates/_variables.light.scss.tmpl.ts similarity index 98% rename from packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts rename to scripts/cli/themeTemplates/_variables.light.scss.tmpl.ts index 2ba873ec5fb..bbf0dc220cf 100644 --- a/packages/grafana-ui/src/themes/_variables.light.scss.tmpl.ts +++ b/scripts/cli/themeTemplates/_variables.light.scss.tmpl.ts @@ -2,7 +2,7 @@ import { GrafanaTheme2 } from '@grafana/data'; -import { renderGeneratedFileBanner } from '../utils/generatedFileBanner'; +import { renderGeneratedFileBanner } from './generatedFileBanner'; export const lightThemeVarsTemplate = (theme: GrafanaTheme2) => `${renderGeneratedFileBanner('grafana-ui/src/themes/light.ts', 'grafana-ui/src/themes/_variable.light.scss.tmpl.ts')} diff --git a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts b/scripts/cli/themeTemplates/_variables.scss.tmpl.ts similarity index 98% rename from packages/grafana-ui/src/themes/_variables.scss.tmpl.ts rename to scripts/cli/themeTemplates/_variables.scss.tmpl.ts index 75a8ad0d4af..c4c9255bb0c 100644 --- a/packages/grafana-ui/src/themes/_variables.scss.tmpl.ts +++ b/scripts/cli/themeTemplates/_variables.scss.tmpl.ts @@ -2,7 +2,7 @@ import { GrafanaTheme2 } from '@grafana/data'; -import { renderGeneratedFileBanner } from '../utils/generatedFileBanner'; +import { renderGeneratedFileBanner } from './generatedFileBanner'; export const commonThemeVarsTemplate = (theme: GrafanaTheme2) => `${renderGeneratedFileBanner('grafana-ui/src/themes/default.ts', 'grafana-ui/src/themes/_variables.scss.tmpl.ts')} diff --git a/packages/grafana-ui/src/utils/generatedFileBanner.ts b/scripts/cli/themeTemplates/generatedFileBanner.ts similarity index 100% rename from packages/grafana-ui/src/utils/generatedFileBanner.ts rename to scripts/cli/themeTemplates/generatedFileBanner.ts