public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Remove Dashboard datasource barrel file (#98040)

Browse Source 
* chore(dsahboard-datasource): delete barrel file

* refactor(dashboards): update paths for dashboard ds imports

* chore(betterer): update file

* style(dashboard-datasource): fix linting errors
This commit is contained in:
Jack Westbrook
2024-12-18 13:18:55 +01:00
committed by GitHub
parent 6df7d1fbc0
commit b88ce9df38
21 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.betterer.results
-5
View File
@@ -6433,11 +6433,6 @@ exports[`better eslint`] = {
"public/app/plugins/datasource/dashboard/datasource.ts:5381": [
[0, 0, 0, "Do not use any type assertions.", "0"]
],
"public/app/plugins/datasource/dashboard/index.ts:5381": [
[0, 0, 0, "Do not re-export imported variable (\`./runSharedRequest\`)", "0"],
[0, 0, 0, "Do not re-export imported variable (\`./DashboardQueryEditor\`)", "1"],
[0, 0, 0, "Do not re-export imported variable (\`./types\`)", "2"]
],
"public/app/plugins/datasource/dashboard/runSharedRequest.ts:5381": [
[0, 0, 0, "Do not use any type assertions.", "0"],
[0, 0, 0, "Do not use any type assertions.", "1"]
public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx
+1 -2
View File
@@ -20,8 +20,7 @@ import { selectors } from '@grafana/e2e-selectors';
import { config, locationService, setPluginExtensionsHook } from '@grafana/runtime';
import { PANEL_EDIT_LAST_USED_DATASOURCE } from 'app/features/dashboard/utils/dashboard';
import { InspectTab } from 'app/features/inspector/types';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
import { DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/types';
import { SHARED_DASHBOARD_QUERY, DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/constants';
import { DashboardDataDTO } from 'app/types';
import { PanelTimeRange, PanelTimeRangeState } from '../../scene/PanelTimeRange';
public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
+1 -1
View File
@@ -21,7 +21,7 @@ import { GroupActionComponents } from 'app/features/query/components/QueryAction
import { QueryEditorRows } from 'app/features/query/components/QueryEditorRows';
import { QueryGroupTopSection } from 'app/features/query/components/QueryGroup';
import { updateQueries } from 'app/features/query/state/updateQueries';
import { isSharedDashboardQuery } from 'app/plugins/datasource/dashboard';
import { isSharedDashboardQuery } from 'app/plugins/datasource/dashboard/runSharedRequest';
import { QueryGroupOptions } from 'app/types';
import { PanelTimeRange } from '../../scene/PanelTimeRange';
public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.test.tsx
+1 -2
View File
@@ -12,8 +12,7 @@ import {
import { getPanelPlugin } from '@grafana/data/test/__mocks__/pluginMocks';
import { setPluginImportUtils } from '@grafana/runtime';
import { SceneDataTransformer, SceneFlexLayout, SceneQueryRunner, VizPanel } from '@grafana/scenes';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
import { DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/types';
import { SHARED_DASHBOARD_QUERY, DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/constants';
import { activateFullSceneTree } from '../utils/test-utils';
public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { Unsubscribable } from 'rxjs';
import { SceneObjectBase, SceneObjectState, SceneQueryRunner, VizPanel } from '@grafana/scenes';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/constants';
import {
findVizPanelByKey,
public/app/features/dashboard-scene/scene/row-actions/RowActions.tsx
+1 -1
View File
@@ -11,7 +11,7 @@ import {
} from '@grafana/scenes';
import { Icon, TextLink, useStyles2 } from '@grafana/ui';
import appEvents from 'app/core/app_events';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/constants';
import { ShowConfirmModalEvent } from 'app/types/events';
import { getDashboardSceneFor, getQueryRunnerFor } from '../../utils/utils';
public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
+1 -2
View File
@@ -23,8 +23,7 @@ import {
import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
import { PanelModel } from 'app/features/dashboard/state/PanelModel';
import { createPanelSaveModel } from 'app/features/dashboard/state/__fixtures__/dashboardFixtures';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
import { DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/types';
import { SHARED_DASHBOARD_QUERY, DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/constants';
import { DashboardDataDTO } from 'app/types';
import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts
+1 -1
View File
@@ -20,7 +20,7 @@ import { Dashboard, LoadingState, Panel, RowPanel, VariableRefresh } from '@graf
import { PanelModel } from 'app/features/dashboard/state/PanelModel';
import { getTimeRange } from 'app/features/dashboard/utils/timeRange';
import { reduceTransformRegistryItem } from 'app/features/transformers/editors/ReduceTransformerEditor';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/constants';
import { DashboardDataDTO } from 'app/types';
import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet';
public/app/features/dashboard-scene/settings/variables/utils.test.ts
+1 -2
View File
@@ -12,8 +12,7 @@ import {
SceneVariableSet,
} from '@grafana/scenes';
import { DataQuery, DataSourceJsonData, VariableHide, VariableType } from '@grafana/schema';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
import { DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/types';
import { SHARED_DASHBOARD_QUERY, DASHBOARD_DATASOURCE_PLUGIN_ID } from 'app/plugins/datasource/dashboard/constants';
import { AdHocFiltersVariableEditor } from './editors/AdHocFiltersVariableEditor';
import { ConstantVariableEditor } from './editors/ConstantVariableEditor';
public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import { TimeRangeUpdatedEvent } from '@grafana/runtime';
import { behaviors, SceneQueryRunner, SceneTimeRange, VizPanel, SceneDataTransformer } from '@grafana/scenes';
import { DashboardCursorSync } from '@grafana/schema';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/constants';
import { AlertStatesDataLayer } from '../scene/AlertStatesDataLayer';
import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer';
public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
import { createTheme } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/types';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/constants';
import { PanelModel } from '../../state/PanelModel';
public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
+1 -1
View File
@@ -8,7 +8,7 @@ import { selectors } from '@grafana/e2e-selectors';
import { getTemplateSrv, RefreshEvent } from '@grafana/runtime';
import { Icon, TextLink, Themeable2, withTheme2 } from '@grafana/ui';
import appEvents from 'app/core/app_events';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/types';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/constants';
import { ShowConfirmModalEvent } from '../../../../types/events';
import { DashboardModel } from '../../state/DashboardModel';
public/app/features/dashboard/utils/getPanelMenu.ts
+1 -1
View File
@@ -24,7 +24,7 @@ import {
import { InspectTab } from 'app/features/inspector/types';
import { isPanelModelLibraryPanel } from 'app/features/library-panels/guard';
import { createExtensionSubMenu } from 'app/features/plugins/extensions/utils';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/constants';
import { dispatch, store } from 'app/store/store';
import { getCreateAlertInMenuAvailability } from '../../alerting/unified/utils/access-control';
public/app/features/query/components/QueryGroup.tsx
+1 -1
View File
@@ -25,7 +25,7 @@ import { DataSourceModal } from 'app/features/datasources/components/picker/Data
import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
import { dataSource as expressionDatasource } from 'app/features/expressions/ExpressionDatasource';
import { AngularDeprecationPluginNotice } from 'app/features/plugins/angularDeprecation/AngularDeprecationPluginNotice';
import { isSharedDashboardQuery } from 'app/plugins/datasource/dashboard';
import { isSharedDashboardQuery } from 'app/plugins/datasource/dashboard/runSharedRequest';
import { GrafanaQuery } from 'app/plugins/datasource/grafana/types';
import { QueryGroupOptions } from 'app/types';
public/app/features/query/state/PanelQueryRunner.ts
+1 -1
View File
@@ -36,7 +36,7 @@ import { isStreamingDataFrame } from 'app/features/live/data/utils';
import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
import { getTemplateSrv } from 'app/features/templating/template_srv';
import { isSharedDashboardQuery, runSharedRequest } from '../../../plugins/datasource/dashboard';
import { isSharedDashboardQuery, runSharedRequest } from '../../../plugins/datasource/dashboard/runSharedRequest';
import { PanelModel } from '../../dashboard/state/PanelModel';
import { getDashboardQueryRunner } from './DashboardQueryRunner/DashboardQueryRunner';
public/app/plugins/datasource/dashboard/DashboardQueryEditor.test.tsx
+1 -1
View File
@@ -13,8 +13,8 @@ import {
} from '../../../features/dashboard/state/__fixtures__/dashboardFixtures';
import { DashboardQueryEditor } from './DashboardQueryEditor';
import { SHARED_DASHBOARD_QUERY } from './constants';
import { DashboardDatasource } from './datasource';
import { SHARED_DASHBOARD_QUERY } from './types';
jest.mock('app/core/config', () => ({
...jest.requireActual('app/core/config'),
public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx
+2 -1
View File
@@ -14,8 +14,9 @@ import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScen
import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
import { filterPanelDataToQuery } from 'app/features/query/components/QueryEditorRow';
import { SHARED_DASHBOARD_QUERY } from './constants';
import { DashboardDatasource } from './datasource';
import { DashboardQuery, ResultInfo, SHARED_DASHBOARD_QUERY } from './types';
import { DashboardQuery, ResultInfo } from './types';
function getQueryDisplayText(query: DataQuery): string {
return JSON.stringify(query);
public/app/plugins/datasource/dashboard/constants.ts
+2
View File
@@ -0,0 +1,2 @@
export const SHARED_DASHBOARD_QUERY = '-- Dashboard --';
export const DASHBOARD_DATASOURCE_PLUGIN_ID = 'dashboard';
public/app/plugins/datasource/dashboard/index.ts
-3
View File
@@ -1,3 +0,0 @@
export { isSharedDashboardQuery, runSharedRequest } from './runSharedRequest';
export { DashboardQueryEditor } from './DashboardQueryEditor';
export { SHARED_DASHBOARD_QUERY } from './types';
public/app/plugins/datasource/dashboard/runSharedRequest.ts
+2 -1
View File
@@ -14,7 +14,8 @@ import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
import { PanelModel } from 'app/features/dashboard/state/PanelModel';
import { QueryRunnerOptions } from 'app/features/query/state/PanelQueryRunner';
import { DashboardQuery, SHARED_DASHBOARD_QUERY } from './types';
import { SHARED_DASHBOARD_QUERY } from './constants';
import { DashboardQuery } from './types';
export function isSharedDashboardQuery(datasource: string | DataSourceRef | DataSourceApi | null) {
if (!datasource) {
public/app/plugins/datasource/dashboard/types.ts
-3
View File
@@ -1,8 +1,5 @@
import { DataFrame, DataQuery, DataQueryError, DataTopic } from '@grafana/data';
export const SHARED_DASHBOARD_QUERY = '-- Dashboard --';
export const DASHBOARD_DATASOURCE_PLUGIN_ID = 'dashboard';
export interface DashboardQuery extends DataQuery {
panelId?: number;
withTransforms?: boolean;