Chore: Remove barrel files (#112803)

* remove AccessControl barrel file * fix richhistory barrel file * fix auth-config barrel file * remove ConnectionsRedirectNotice barrel file * remove ConnectData barrel file * remove CategoryHeader barrel file * remove NoAccessModal barrel file * remove Search barrel file * actually prune it... * remove ConnectData barrel file * remove AddLibraryPanelWidget barrel file * remove DashExportModal barrel file * remove DashNav barrel file * remove DashboardRow barrel file * remove DashboardSettings barrel file * remove TracePageHeader barrel file * remove TimelineHeaderRow barrel file * remove reexport in utils * remove unnecessary barrel file export * remove DraggableManager demo barrel file * remove barrel export in useStateSync * remove GetStartedWithPlugin barrel file * remove pickers barrel file * remove ArgQueryEditor barrel file * remove LogsQueryEditor barrel file * remove the QueryEditor barrel file * remove ResourceField barrel file * remove ResourcePicker barrel file * remove TracesQueryEditor barrel file * remove SQLBuilderEditor barrel file * remove MetricStatEditor barrel file * remove nodeGraph barrel file * Revert "remove barrel export in useStateSync" This reverts commit e3b5dd8891.
2025-10-23 10:31:10 +01:00
parent ad9d8098ef
commit 13c62a47a9
78 changed files with 61 additions and 298 deletions
@@ -1194,11 +1194,6 @@
      "count": 1
    }
  },
-  "public/app/core/components/AccessControl/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/core/components/DynamicImports/SafeDynamicImport.tsx": {
    "@typescript-eslint/no-explicit-any": {
      "count": 1
@@ -1462,11 +1457,6 @@
      "count": 1
    }
  },
-  "public/app/core/utils/richHistory.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 3
-    }
-  },
  "public/app/core/utils/ticks.ts": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 2
@@ -1993,11 +1983,6 @@
      "count": 1
    }
  },
-  "public/app/features/auth-config/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/auth-config/utils/data.ts": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
@@ -2038,21 +2023,6 @@
      "count": 1
    }
  },
-  "public/app/features/connections/components/ConnectionsRedirectNotice/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
-  "public/app/features/connections/tabs/ConnectData/CardGrid/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
-  "public/app/features/connections/tabs/ConnectData/CategoryHeader/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/connections/tabs/ConnectData/ConnectData.tsx": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
@@ -2064,21 +2034,6 @@
      "count": 2
    }
  },
-  "public/app/features/connections/tabs/ConnectData/NoAccessModal/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
-  "public/app/features/connections/tabs/ConnectData/Search/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
-  "public/app/features/connections/tabs/ConnectData/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/correlations/CorrelationsPage.tsx": {
    "no-restricted-syntax": {
      "count": 1
@@ -2425,11 +2380,6 @@
      "count": 3
    }
  },
-  "public/app/features/dashboard/components/AddLibraryPanelWidget/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx": {
    "no-restricted-syntax": {
      "count": 7
@@ -2448,21 +2398,11 @@
      "count": 7
    }
  },
-  "public/app/features/dashboard/components/DashExportModal/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx": {
    "react-prefer-function-component/react-prefer-function-component": {
      "count": 1
    }
  },
-  "public/app/features/dashboard/components/DashNav/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/dashboard/components/DashboardPrompt/DashboardPrompt.test.tsx": {
    "@typescript-eslint/no-explicit-any": {
      "count": 1
@@ -2486,11 +2426,6 @@
      "count": 1
    }
  },
-  "public/app/features/dashboard/components/DashboardRow/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/dashboard/components/DashboardSettings/AutoRefreshIntervals.tsx": {
    "no-restricted-syntax": {
      "count": 1
@@ -2514,11 +2449,6 @@
      "count": 1
    }
  },
-  "public/app/features/dashboard/components/DashboardSettings/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/dashboard/components/HelpWizard/HelpWizard.tsx": {
    "no-restricted-syntax": {
      "count": 3
@@ -3037,11 +2967,6 @@
      "count": 1
    }
  },
-  "public/app/features/explore/TraceView/components/TracePageHeader/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx": {
    "react-prefer-function-component/react-prefer-function-component": {
      "count": 1
@@ -3082,11 +3007,6 @@
      "count": 1
    }
  },
-  "public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx": {
    "react-prefer-function-component/react-prefer-function-component": {
      "count": 1
@@ -3097,11 +3017,6 @@
      "count": 1
    }
  },
-  "public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/explore/TraceView/components/common/SearchBarInput.tsx": {
    "react-prefer-function-component/react-prefer-function-component": {
      "count": 1
@@ -3112,11 +3027,6 @@
      "count": 1
    }
  },
-  "public/app/features/explore/TraceView/components/model/ddg/types.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/explore/TraceView/components/model/link-patterns.tsx": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 2
@@ -3426,11 +3336,6 @@
      "count": 1
    }
  },
-  "public/app/features/plugins/admin/components/GetStartedWithPlugin/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/plugins/admin/components/InstallControls/InstallControlsWarning.tsx": {
    "react/no-unescaped-entities": {
      "count": 1
@@ -3947,11 +3852,6 @@
      "count": 1
    }
  },
-  "public/app/features/variables/pickers/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/features/variables/pickers/shared/VariableInput.tsx": {
    "no-restricted-syntax": {
      "count": 1
@@ -4084,11 +3984,6 @@
      "count": 2
    }
  },
-  "public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/plugins/datasource/azuremonitor/components/ConfigEditor/AppRegistrationCredentials.tsx": {
    "no-restricted-syntax": {
      "count": 5
@@ -4124,41 +4019,16 @@
      "count": 1
    }
  },
-  "public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.tsx": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
    }
  },
-  "public/app/plugins/datasource/azuremonitor/components/QueryEditor/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
-  "public/app/plugins/datasource/azuremonitor/components/ResourceField/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
-  "public/app/plugins/datasource/azuremonitor/components/ResourcePicker/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.tsx": {
    "no-restricted-syntax": {
      "count": 1
    }
  },
-  "public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx": {
    "no-restricted-syntax": {
      "count": 7
@@ -4258,21 +4128,11 @@
      "count": 2
    }
  },
-  "public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupNamesSelection.tsx": {
    "no-restricted-syntax": {
      "count": 1
    }
  },
-  "public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/plugins/datasource/cloudwatch/datasource.ts": {
    "@typescript-eslint/no-explicit-any": {
      "count": 1
@@ -5108,11 +4968,6 @@
      "count": 1
    }
  },
-  "public/app/plugins/panel/nodeGraph/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 1
-    }
-  },
  "public/app/plugins/panel/nodeGraph/layout.ts": {
    "@typescript-eslint/consistent-type-assertions": {
      "count": 1
@@ -1 +0,0 @@
-export * from './Permissions';
@@ -1,7 +1,7 @@
 import { find, isEqual, omit } from 'lodash';

 import { DataQuery, SelectableValue } from '@grafana/data';
-import { RichHistorySearchFilters, RichHistorySettings } from 'app/core/utils/richHistory';
+import { RichHistorySearchFilters, RichHistorySettings } from 'app/core/utils/richHistoryTypes';
 import { RichHistoryQuery } from 'app/types/explore';

 import store from '../store';
@@ -1,5 +1,5 @@
 import { DataQuery } from '@grafana/data';
-import { SortOrder } from 'app/core/utils/richHistory';
+import { SortOrder } from 'app/core/utils/richHistoryTypes';
 import { RichHistoryQuery } from 'app/types/explore';

 import { filterAndSortQueries } from './richHistoryLocalStorageUtils';
@@ -13,8 +13,8 @@ import {
  createQueryHeading,
  deleteAllFromRichHistory,
  deleteQueryInRichHistory,
-  SortOrder,
 } from './richHistory';
+import { SortOrder } from './richHistoryTypes';

 const richHistoryStorageMock: RichHistoryStorage = {} as RichHistoryStorage;

@@ -32,8 +32,6 @@ import {
  SortOrder,
 } from './richHistoryTypes';

-export { type RichHistorySearchFilters, type RichHistorySettings, SortOrder };
-
 /*
 * Add queries to rich history. Save only queries within the retention period, or that are starred.
 * Side-effect: store history in local storage
@@ -2,7 +2,7 @@ import { ComponentProps, useState } from 'react';

 import { Trans, t } from '@grafana/i18n';
 import { Button, Drawer } from '@grafana/ui';
-import { Permissions } from 'app/core/components/AccessControl';
+import { Permissions } from 'app/core/components/AccessControl/Permissions';

 type ButtonProps = { onClick: () => void };

@@ -6,8 +6,6 @@ import { Settings, SettingsSection } from 'app/types/settings';

 import { AuthProviderInfo, GetStatusHook, AuthProviderStatus } from './types';

-export * from './types';
-
 const registeredAuthProviders: AuthProviderInfo[] = [];
 const authProvidersConfigHooks: Record<string, GetStatusHook> = {};

@@ -6,8 +6,8 @@ import { AccessControlAction } from 'app/types/accessControl';
 import { Settings, UpdateSettingsQuery } from 'app/types/settings';
 import { ThunkResult } from 'app/types/store';

-import { getAuthProviderStatus, getRegisteredAuthProviders, SSOProvider } from '..';
-import { AuthProviderStatus, SettingsError } from '../types';
+import { getAuthProviderStatus, getRegisteredAuthProviders } from '..';
+import { AuthProviderStatus, SettingsError, SSOProvider } from '../types';

 import {
  loadingBegin,
@@ -17,7 +17,7 @@ function render(...[ui, options]: Parameters<typeof rtlRender>) {
 }

 // Mock out the Permissions component for now
-jest.mock('app/core/components/AccessControl', () => ({
+jest.mock('app/core/components/AccessControl/Permissions', () => ({
  Permissions: () => <div>Hello!</div>,
 }));

@@ -4,7 +4,7 @@ import { AppEvents } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
 import { locationService, reportInteraction } from '@grafana/runtime';
 import { Button, Drawer, Dropdown, Icon, Menu, MenuItem } from '@grafana/ui';
-import { Permissions } from 'app/core/components/AccessControl';
+import { Permissions } from 'app/core/components/AccessControl/Permissions';
 import { appEvents } from 'app/core/core';
 import { RepoType } from 'app/features/provisioning/Wizard/types';
 import { BulkMoveProvisionedResource } from 'app/features/provisioning/components/BulkActions/BulkMoveProvisionedResource';
@@ -1 +0,0 @@
-export * from './ConnectionsRedirectNotice';
@@ -9,7 +9,7 @@ import UpdateAllButton from 'app/features/plugins/admin/components/UpdateAllButt
 import UpdateAllModal from 'app/features/plugins/admin/components/UpdateAllModal';
 import { useGetUpdatable } from 'app/features/plugins/admin/state/hooks';

-import { AddNewConnection } from '../tabs/ConnectData';
+import { AddNewConnection } from '../tabs/ConnectData/ConnectData';

 const getStyles = (theme: GrafanaTheme2) => ({
  pageContainer: css({
@@ -1 +0,0 @@
-export * from './CardGrid';
@@ -1 +0,0 @@
-export * from './CategoryHeader';
@@ -17,9 +17,9 @@ import { AccessControlAction } from 'app/types/accessControl';

 import { ROUTES } from '../../constants';

-import { CardGrid, type CardGridItem } from './CardGrid';
-import { CategoryHeader } from './CategoryHeader';
-import { NoAccessModal } from './NoAccessModal';
+import { CardGrid, type CardGridItem } from './CardGrid/CardGrid';
+import { CategoryHeader } from './CategoryHeader/CategoryHeader';
+import { NoAccessModal } from './NoAccessModal/NoAccessModal';

 const getStyles = (theme: GrafanaTheme2) => ({
  searchContainer: css({
@@ -4,7 +4,7 @@ import { GrafanaTheme2 } from '@grafana/data';
 import { Trans } from '@grafana/i18n';
 import { useStyles2, Modal, Icon, Button, TextLink } from '@grafana/ui';

-import { type CardGridItem } from '../CardGrid';
+import { type CardGridItem } from '../CardGrid/CardGrid';

 const getStyles = (theme: GrafanaTheme2) => ({
  modal: css({
@@ -1 +0,0 @@
-export * from './NoAccessModal';
@@ -1 +0,0 @@
-export * from './Search';
@@ -1 +0,0 @@
-export * from './ConnectData';
@@ -1,6 +1,6 @@
 import { PageLayoutType } from '@grafana/data';
 import { SceneComponentProps, SceneObjectBase } from '@grafana/scenes';
-import { Permissions } from 'app/core/components/AccessControl';
+import { Permissions } from 'app/core/components/AccessControl/Permissions';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction } from 'app/types/accessControl';
@@ -1 +0,0 @@
-export { AddLibraryPanelWidget } from './AddLibraryPanelWidget';
@@ -1 +0,0 @@
-export { DashboardExporter } from './DashboardExporter';
@@ -1,2 +0,0 @@
-import DashNav from './DashNav';
-export { DashNav };
@@ -1,4 +1,4 @@
-import { Permissions } from 'app/core/components/AccessControl';
+import { Permissions } from 'app/core/components/AccessControl/Permissions';
 import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction } from 'app/types/accessControl';
@@ -1 +0,0 @@
-export { DashboardRow } from './DashboardRow';
@@ -1 +0,0 @@
-export { DashboardSettings } from './DashboardSettings';
@@ -4,7 +4,7 @@ import { PureComponent } from 'react';
 import { Trans, t } from '@grafana/i18n';
 import { Button, Field, Modal, Switch } from '@grafana/ui';
 import { appEvents } from 'app/core/core';
-import { DashboardExporter } from 'app/features/dashboard/components/DashExportModal';
+import { DashboardExporter } from 'app/features/dashboard/components/DashExportModal/DashboardExporter';
 import { makeExportableV1 } from 'app/features/dashboard-scene/scene/export/exporters';
 import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions';
 import { ShowModalReactEvent } from 'app/types/events';
@@ -23,10 +23,10 @@ import { StoreState } from 'app/types/store';

 import { cancelVariables, templateVarsChangedInUrl } from '../../variables/state/actions';
 import { findTemplateVarChanges } from '../../variables/utils';
-import { DashNav } from '../components/DashNav';
+import DashNav from '../components/DashNav/DashNav';
 import { DashboardLoading } from '../components/DashboardLoading/DashboardLoading';
 import { DashboardPrompt } from '../components/DashboardPrompt/DashboardPrompt';
-import { DashboardSettings } from '../components/DashboardSettings';
+import { DashboardSettings } from '../components/DashboardSettings/DashboardSettings';
 import { PanelInspector } from '../components/Inspector/PanelInspector';
 import { PanelEditor } from '../components/PanelEditor/PanelEditor';
 import { ShareModal } from '../components/ShareModal/ShareModal';
@@ -11,8 +11,8 @@ import { contextSrv } from 'app/core/services/context_srv';
 import { VariablesChanged } from 'app/features/variables/types';
 import { DashboardPanelsChangedEvent } from 'app/types/events';

-import { AddLibraryPanelWidget } from '../components/AddLibraryPanelWidget';
-import { DashboardRow } from '../components/DashboardRow';
+import { AddLibraryPanelWidget } from '../components/AddLibraryPanelWidget/AddLibraryPanelWidget';
+import { DashboardRow } from '../components/DashboardRow/DashboardRow';
 import { DashboardModel } from '../state/DashboardModel';
 import { GridPos, PanelModel } from '../state/PanelModel';

@@ -10,7 +10,7 @@ import { useStyles2, useTheme2, PanelChrome } from '@grafana/ui';
 import { layeredLayoutThreshold } from 'app/plugins/panel/nodeGraph/NodeGraph';
 import { StoreState } from 'app/types/store';

-import { NodeGraph } from '../../../plugins/panel/nodeGraph';
+import { NodeGraph } from '../../../plugins/panel/nodeGraph/NodeGraph';
 import { LayoutAlgorithm } from '../../../plugins/panel/nodeGraph/panelcfg.gen';
 import { useCategorizeFrames } from '../../../plugins/panel/nodeGraph/useCategorizeFrames';
 import { useLinks } from '../utils/links';
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { TestProvider } from 'test/helpers/TestProvider';

-import { SortOrder } from 'app/core/utils/richHistory';
+import { SortOrder } from 'app/core/utils/richHistoryTypes';

 import { Tabs } from '../QueriesDrawer/QueriesDrawerContext';

@@ -5,12 +5,8 @@ import { SelectableValue } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
 import { TabbedContainer, TabConfig } from '@grafana/ui';
-import {
-  SortOrder,
-  RichHistorySearchFilters,
-  RichHistorySettings,
-  createDatasourcesList,
-} from 'app/core/utils/richHistory';
+import { createDatasourcesList } from 'app/core/utils/richHistory';
+import { SortOrder, RichHistorySearchFilters, RichHistorySettings } from 'app/core/utils/richHistoryTypes';
 import { RichHistoryQuery } from 'app/types/explore';
 import { useSelector } from 'app/types/store';

@@ -1,7 +1,7 @@
 import { render } from '@testing-library/react';
 import { TestProvider } from 'test/helpers/TestProvider';

-import { SortOrder } from 'app/core/utils/richHistory';
+import { SortOrder } from 'app/core/utils/richHistoryTypes';

 import { RichHistoryContainer, Props } from './RichHistoryContainer';

@@ -6,13 +6,8 @@ import { DataSourceApi, GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
 import { config, getDataSourceSrv } from '@grafana/runtime';
 import { Button, FilterInput, MultiSelect, RangeSlider, Select, useStyles2 } from '@grafana/ui';
-import {
-  mapNumbertoTimeInSlider,
-  mapQueriesToHeadings,
-  SortOrder,
-  RichHistorySearchFilters,
-  RichHistorySettings,
-} from 'app/core/utils/richHistory';
+import { mapNumbertoTimeInSlider, mapQueriesToHeadings } from 'app/core/utils/richHistory';
+import { SortOrder, RichHistorySearchFilters, RichHistorySettings } from 'app/core/utils/richHistoryTypes';
 import { RichHistoryQuery } from 'app/types/explore';

 import { getSortOrderOptions } from './RichHistory';
@@ -1,7 +1,7 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import { TestProvider } from 'test/helpers/TestProvider';

-import { SortOrder } from 'app/core/utils/richHistory';
+import { SortOrder } from 'app/core/utils/richHistoryTypes';

 import { RichHistoryStarredTab, RichHistoryStarredTabProps } from './RichHistoryStarredTab';

@@ -6,12 +6,8 @@ import { DataSourceApi, GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
 import { config, getDataSourceSrv } from '@grafana/runtime';
 import { useStyles2, Select, MultiSelect, FilterInput, Button } from '@grafana/ui';
-import {
-  createDatasourcesList,
-  SortOrder,
-  RichHistorySearchFilters,
-  RichHistorySettings,
-} from 'app/core/utils/richHistory';
+import { createDatasourcesList } from 'app/core/utils/richHistory';
+import { SortOrder, RichHistorySearchFilters, RichHistorySettings } from 'app/core/utils/richHistoryTypes';
 import { RichHistoryQuery } from 'app/types/explore';
 import { useSelector } from 'app/types/store';

@@ -30,8 +30,8 @@ import { useDispatch, useSelector } from 'app/types/store';
 import { changePanelState } from '../state/explorePane';

 import memoizedTraceCriticalPath from './components/CriticalPath';
-import { TracePageHeader } from './components/TracePageHeader';
 import SpanGraph from './components/TracePageHeader/SpanGraph';
+import { TracePageHeader } from './components/TracePageHeader/TracePageHeader';
 import TraceTimelineViewer from './components/TraceTimelineViewer';
 import { TraceFlameGraphs } from './components/TraceTimelineViewer/SpanDetail';
 import { SpanBarOptionsData } from './components/settings/SpanBarSettings';
@@ -1,15 +0,0 @@
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-export { TracePageHeader } from './TracePageHeader';
@@ -25,13 +25,14 @@ import { SpanBarOptions } from '../settings/SpanBarSettings';
 import TNil from '../types/TNil';
 import { SpanLinkFunc } from '../types/links';
 import { TraceSpan, CriticalPathSection } from '../types/trace';
+import { formatDuration } from '../utils/date';

 import SpanBar from './SpanBar';
 import { SpanLinksMenu } from './SpanLinks';
 import SpanTreeOffset from './SpanTreeOffset';
 import Ticks from './Ticks';
 import TimelineRow from './TimelineRow';
-import { formatDuration, ViewedBoundsFunctionType } from './utils';
+import { ViewedBoundsFunctionType } from './utils';

 const spanBarClassName = 'spanBar';
 const spanBarLabelClassName = 'spanBarLabel';
@@ -21,7 +21,7 @@ import { Trans } from '@grafana/i18n';
 import { Counter, Icon, useStyles2 } from '@grafana/ui';

 import { autoColor } from '../../Theme';
-import { formatDuration } from '../utils';
+import { formatDuration } from '../../utils/date';

 import AccordianKeyValues from './AccordianKeyValues';

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-jest.mock('../utils');
+jest.mock('../../utils/date');

 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
@@ -25,7 +25,7 @@ import { pyroscopeProfileIdTagKey } from '../../../createSpanLink';
 import traceGenerator from '../../demo/trace-generators';
 import transformTraceData from '../../model/transform-trace-data';
 import { TraceSpanReference } from '../../types/trace';
-import { formatDuration } from '../utils';
+import { formatDuration } from '../../utils/date';

 import DetailState from './DetailState';

@@ -41,7 +41,7 @@ import LabeledList from '../../common/LabeledList';
 import { KIND, LIBRARY_NAME, LIBRARY_VERSION, STATUS, STATUS_MESSAGE, TRACE_STATE } from '../../constants/span';
 import { SpanLinkFunc } from '../../types/links';
 import { TraceProcess, TraceSpan, TraceSpanReference } from '../../types/trace';
-import { formatDuration } from '../utils';
+import { formatDuration } from '../../utils/date';

 import AccordianKeyValues from './AccordianKeyValues';
 import AccordianLogs from './AccordianLogs';
@@ -21,8 +21,7 @@ import { useStyles2 } from '@grafana/ui';

 import { autoColor } from '../Theme';
 import TNil from '../types/TNil';
-
-import { formatDuration } from './utils';
+import { formatDuration } from '../utils/date';

 const getStyles = (theme: GrafanaTheme2) => ({
  Ticks: css({
@@ -1,15 +0,0 @@
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-export { default } from './TimelineHeaderRow';
@@ -29,7 +29,7 @@ import { SpanLinkFunc } from '../types/links';
 import { TraceSpan, Trace, TraceSpanReference, CriticalPathSection } from '../types/trace';

 import { TraceFlameGraphs } from './SpanDetail';
-import TimelineHeaderRow from './TimelineHeaderRow';
+import TimelineHeaderRow from './TimelineHeaderRow/TimelineHeaderRow';
 import VirtualizedTraceView from './VirtualizedTraceView';
 import { TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate } from './types';

@@ -122,5 +122,3 @@ export const isKindClient = (span: TraceSpan): Boolean => {
  }
  return span.tags.some(({ key, value }) => key === 'span.kind' && value === 'client');
 };
-
-export { formatDuration } from '../utils/date';
@@ -14,8 +14,6 @@

 import PathElem from './PathElem';

-export { default as PathElem } from './PathElem';
-
 export type TDdgService = {
  name: string;
  operations: Map<string, TDdgOperation>;
@@ -1,15 +0,0 @@
-// Copyright (c) 2017 Uber Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-export { default } from './DraggableManagerDemo';
@@ -1 +0,0 @@
-export { GetStartedWithPlugin } from './GetStartedWithPlugin';
@@ -5,7 +5,7 @@ import { GrafanaTheme2, PluginErrorCode } from '@grafana/data';
 import { Trans } from '@grafana/i18n';
 import { Icon, Stack, useStyles2 } from '@grafana/ui';

-import { GetStartedWithPlugin } from '../components/GetStartedWithPlugin';
+import { GetStartedWithPlugin } from '../components/GetStartedWithPlugin/GetStartedWithPlugin';
 import { InstallControlsButton } from '../components/InstallControls/InstallControlsButton';
 import {
  getLatestCompatibleVersion,
@@ -1,4 +1,4 @@
-import { Permissions } from 'app/core/components/AccessControl';
+import { Permissions } from 'app/core/components/AccessControl/Permissions';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AccessControlAction } from 'app/types/accessControl';
 import { ServiceAccountDTO } from 'app/types/serviceaccount';
@@ -1,4 +1,4 @@
-import { Permissions } from 'app/core/components/AccessControl';
+import { Permissions } from 'app/core/components/AccessControl/Permissions';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AccessControlAction } from 'app/types/accessControl';
 import { Team } from 'app/types/teams';
@@ -4,7 +4,7 @@ import { ConstantVariableModel } from '@grafana/data';

 import { dispatch } from '../../../store/store';
 import { VariableAdapter } from '../adapters';
-import { optionPickerFactory } from '../pickers';
+import { optionPickerFactory } from '../pickers/OptionsPicker/OptionsPicker';
 import { setOptionAsCurrent, setOptionFromUrl } from '../state/actions';
 import { toKeyedVariableIdentifier } from '../utils';

@@ -6,7 +6,7 @@ import { t } from '@grafana/i18n';
 import { dispatch } from '../../../store/store';
 import { VariableAdapter } from '../adapters';
 import { ALL_VARIABLE_TEXT } from '../constants';
-import { optionPickerFactory } from '../pickers';
+import { optionPickerFactory } from '../pickers/OptionsPicker/OptionsPicker';
 import { setOptionAsCurrent, setOptionFromUrl } from '../state/actions';
 import { containsVariable, isAllVariable, toKeyedVariableIdentifier } from '../utils';

@@ -5,7 +5,7 @@ import { DataSourceVariableModel } from '@grafana/data';
 import { dispatch } from '../../../store/store';
 import { VariableAdapter } from '../adapters';
 import { ALL_VARIABLE_TEXT } from '../constants';
-import { optionPickerFactory } from '../pickers';
+import { optionPickerFactory } from '../pickers/OptionsPicker/OptionsPicker';
 import { setOptionAsCurrent, setOptionFromUrl } from '../state/actions';
 import { containsVariable, isAllVariable, toKeyedVariableIdentifier } from '../utils';

@@ -5,7 +5,7 @@ import { t } from '@grafana/i18n';

 import { dispatch } from '../../../store/store';
 import { VariableAdapter } from '../adapters';
-import { optionPickerFactory } from '../pickers';
+import { optionPickerFactory } from '../pickers/OptionsPicker/OptionsPicker';
 import { setOptionAsCurrent, setOptionFromUrl } from '../state/actions';
 import { toKeyedVariableIdentifier } from '../utils';

@@ -1 +0,0 @@
-export { optionPickerFactory } from './OptionsPicker/OptionsPicker';
@@ -6,7 +6,7 @@ import { t } from '@grafana/i18n';
 import { dispatch } from '../../../store/store';
 import { VariableAdapter } from '../adapters';
 import { ALL_VARIABLE_TEXT } from '../constants';
-import { optionPickerFactory } from '../pickers';
+import { optionPickerFactory } from '../pickers/OptionsPicker/OptionsPicker';
 import { setOptionAsCurrent, setOptionFromUrl } from '../state/actions';
 import { containsVariable, isAllVariable, toKeyedVariableIdentifier } from '../utils';

@@ -1 +0,0 @@
-export { default } from './ArgQueryEditor';
@@ -13,7 +13,7 @@ import { AzureLogAnalyticsMetadataTable } from '../../types/logAnalyticsMetadata
 import { AzureMonitorQuery, ResultFormat } from '../../types/query';
 import { AzureMonitorErrorish, AzureMonitorOption, EngineSchema } from '../../types/types';
 import { LogsQueryBuilder } from '../LogsQueryBuilder/LogsQueryBuilder';
-import ResourceField from '../ResourceField';
+import ResourceField from '../ResourceField/ResourceField';
 import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';
 import { parseResourceDetails } from '../ResourcePicker/utils';
 import FormatAsField from '../shared/FormatAsField';
@@ -1 +0,0 @@
-export { default } from './LogsQueryEditor';
@@ -6,7 +6,7 @@ import type Datasource from '../../datasource';
 import { selectors } from '../../e2e/selectors';
 import { AzureMonitorQuery, AzureMonitorResource } from '../../types/query';
 import { AzureMonitorOption, AzureMonitorErrorish } from '../../types/types';
-import ResourceField from '../ResourceField';
+import ResourceField from '../ResourceField/ResourceField';
 import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';
 import { parseResourceDetails } from '../ResourcePicker/utils';

@@ -12,11 +12,11 @@ import { selectors } from '../../e2e/selectors';
 import { AzureMonitorQuery, AzureQueryType } from '../../types/query';
 import { AzureMonitorDataSourceJsonData, AzureMonitorErrorish, AzureMonitorOption } from '../../types/types';
 import useLastError from '../../utils/useLastError';
-import ArgQueryEditor from '../ArgQueryEditor';
-import LogsQueryEditor from '../LogsQueryEditor';
+import ArgQueryEditor from '../ArgQueryEditor/ArgQueryEditor';
 import { AzureCheatSheetModal } from '../LogsQueryEditor/AzureCheatSheetModal';
+import LogsQueryEditor from '../LogsQueryEditor/LogsQueryEditor';
 import NewMetricsQueryEditor from '../MetricsQueryEditor/MetricsQueryEditor';
-import TracesQueryEditor from '../TracesQueryEditor';
+import TracesQueryEditor from '../TracesQueryEditor/TracesQueryEditor';

 import { QueryHeader } from './QueryHeader';
 import usePreparedQuery from './usePreparedQuery';
@@ -1 +0,0 @@
-export { default } from './QueryEditor';
@@ -10,7 +10,7 @@ import { selectors } from '../../e2e/selectors';
 import { ResourcePickerQueryType } from '../../resourcePicker/resourcePickerData';
 import { AzureMonitorResource } from '../../types/query';
 import { AzureQueryEditorFieldProps } from '../../types/types';
-import ResourcePicker from '../ResourcePicker';
+import ResourcePicker from '../ResourcePicker/ResourcePicker';
 import getStyles from '../ResourcePicker/styles';
 import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';
 import { parseMultipleResourceDetails, setResources } from '../ResourcePicker/utils';
@@ -1 +0,0 @@
-export { default } from './ResourceField';
@@ -18,11 +18,9 @@ import {
 import { DeepPartial } from '../../mocks/utils';
 import ResourcePickerData, { ResourcePickerQueryType } from '../../resourcePicker/resourcePickerData';

-import { RECENT_RESOURCES_KEY } from './ResourcePicker';
+import ResourcePicker, { RECENT_RESOURCES_KEY } from './ResourcePicker';
 import { ResourceRowGroup, ResourceRowType } from './types';

-import ResourcePicker from '.';
-
 jest.mock('@grafana/runtime', () => ({
  ...jest.requireActual('@grafana/runtime'),
  getTemplateSrv: () => ({
@@ -1 +0,0 @@
-export { default } from './ResourcePicker';
@@ -12,7 +12,7 @@ import { selectors } from '../../e2e/selectors';
 import { AzureMonitorQuery, AzureQueryType, ResultFormat } from '../../types/query';
 import { AzureMonitorErrorish, AzureMonitorOption } from '../../types/types';
 import AdvancedResourcePicker from '../LogsQueryEditor/AdvancedResourcePicker';
-import ResourceField from '../ResourceField';
+import ResourceField from '../ResourceField/ResourceField';
 import { ResourceRow, ResourceRowGroup, ResourceRowType } from '../ResourcePicker/types';
 import { parseResourceDetails } from '../ResourcePicker/utils';
 import { Field } from '../shared/Field';
@@ -1 +0,0 @@
-export { default } from './TracesQueryEditor';
@@ -14,8 +14,8 @@ import { migrateQuery } from '../../grafanaTemplateVariableFns';
 import { AzureMonitorQuery, AzureQueryType } from '../../types/query';
 import { AzureMonitorOption } from '../../types/types';
 import useLastError from '../../utils/useLastError';
-import ArgQueryEditor from '../ArgQueryEditor';
-import LogsQueryEditor from '../LogsQueryEditor';
+import ArgQueryEditor from '../ArgQueryEditor/ArgQueryEditor';
+import LogsQueryEditor from '../LogsQueryEditor/LogsQueryEditor';
 import { parseResourceURI } from '../ResourcePicker/utils';

 import GrafanaTemplateVariableFnInput from './GrafanaTemplateVariableFn';
@@ -3,7 +3,7 @@ import { initPluginTranslations } from '@grafana/i18n';
 import { getAppEvents } from '@grafana/runtime';

 import { ConfigEditor } from './components/ConfigEditor/ConfigEditor';
-import AzureMonitorQueryEditor from './components/QueryEditor';
+import AzureMonitorQueryEditor from './components/QueryEditor/QueryEditor';
 import Datasource from './datasource';
 import pluginJson from './plugin.json';
 import { trackAzureMonitorDashboardLoaded } from './tracking';
@@ -17,11 +17,11 @@ import {
  MetricQueryType,
  MetricStat,
 } from '../../../types';
-import { MetricStatEditor } from '../../shared/MetricStatEditor';
+import { MetricStatEditor } from '../../shared/MetricStatEditor/MetricStatEditor';

 import { DynamicLabelsField } from './DynamicLabelsField';
 import { MathExpressionQueryField } from './MathExpressionQueryField';
-import { SQLBuilderEditor } from './SQLBuilderEditor';
+import { SQLBuilderEditor } from './SQLBuilderEditor/SQLBuilderEditor';
 import { SQLCodeEditor } from './SQLCodeEditor';

 export interface Props extends QueryEditorProps<CloudWatchDatasource, CloudWatchQuery, CloudWatchJsonData> {
@@ -1 +0,0 @@
-export { SQLBuilderEditor } from './SQLBuilderEditor';
@@ -1 +0,0 @@
-export { MetricStatEditor } from './MetricStatEditor';
@@ -1 +0,0 @@
-export { NodeGraph } from './NodeGraph';
@@ -9,7 +9,7 @@ import { contextSrv } from 'app/core/services/context_srv';
 import LdapPage from 'app/features/admin/ldap/LdapPage';
 import { getAlertingRoutes } from 'app/features/alerting/routes';
 import { isAdmin, isLocalDevEnv, isOpenSourceEdition } from 'app/features/alerting/unified/utils/misc';
-import { ConnectionsRedirectNotice } from 'app/features/connections/components/ConnectionsRedirectNotice';
+import { ConnectionsRedirectNotice } from 'app/features/connections/components/ConnectionsRedirectNotice/ConnectionsRedirectNotice';
 import { ROUTES as CONNECTIONS_ROUTES } from 'app/features/connections/constants';
 import { getRoutes as getDataConnectionsRoutes } from 'app/features/connections/routes';
 import { DASHBOARD_LIBRARY_ROUTES } from 'app/features/dashboard/dashgrid/types';
				`@@ -1 +0,0 @@`
				`export * from './ConnectionsRedirectNotice';`
				`@@ -1 +0,0 @@`
				`export { AddLibraryPanelWidget } from './AddLibraryPanelWidget';`
				`@@ -1 +0,0 @@`
				`export { DashboardExporter } from './DashboardExporter';`
				`@@ -1 +0,0 @@`
				`export { DashboardRow } from './DashboardRow';`
				`@@ -1 +0,0 @@`
				`export { DashboardSettings } from './DashboardSettings';`
				`@@ -1 +0,0 @@`
				`export { GetStartedWithPlugin } from './GetStartedWithPlugin';`
				`@@ -1 +0,0 @@`
				`export { optionPickerFactory } from './OptionsPicker/OptionsPicker';`
				`@@ -1 +0,0 @@`
				`export { default } from './ArgQueryEditor';`
				`@@ -1 +0,0 @@`
				`export { default } from './LogsQueryEditor';`
				`@@ -1 +0,0 @@`
				`export { default } from './ResourcePicker';`