diff --git a/.betterer.results b/.betterer.results index 7adb2e1459c..ae639730cc6 100644 --- a/.betterer.results +++ b/.betterer.results @@ -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"] diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx index fe807ace5b2..c0131b6847d 100644 --- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx +++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx @@ -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'; diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx index 9881cca477e..75abcf9ff84 100644 --- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx +++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx @@ -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'; diff --git a/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.test.tsx b/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.test.tsx index 86859527e1a..09f8c3cd360 100644 --- a/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.test.tsx +++ b/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.test.tsx @@ -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'; diff --git a/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx b/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx index 59e992a91a1..f55641e1da4 100644 --- a/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx +++ b/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx @@ -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, diff --git a/public/app/features/dashboard-scene/scene/row-actions/RowActions.tsx b/public/app/features/dashboard-scene/scene/row-actions/RowActions.tsx index bc77b3d589d..5d5f342dca2 100644 --- a/public/app/features/dashboard-scene/scene/row-actions/RowActions.tsx +++ b/public/app/features/dashboard-scene/scene/row-actions/RowActions.tsx @@ -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'; diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts index a500132569d..b9c1db0b0c5 100644 --- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts +++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts @@ -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'; diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts index d10842bcced..690eef91108 100644 --- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts +++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.test.ts @@ -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'; diff --git a/public/app/features/dashboard-scene/settings/variables/utils.test.ts b/public/app/features/dashboard-scene/settings/variables/utils.test.ts index 2bc591aa0d4..c17d6350acd 100644 --- a/public/app/features/dashboard-scene/settings/variables/utils.test.ts +++ b/public/app/features/dashboard-scene/settings/variables/utils.test.ts @@ -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'; diff --git a/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts b/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts index cd43c5f6975..a4aa7dc8426 100644 --- a/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts +++ b/public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.test.ts @@ -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'; diff --git a/public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx b/public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx index a36703ab642..5e95d3aa502 100644 --- a/public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx +++ b/public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx @@ -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'; diff --git a/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx b/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx index 80cba9c2c77..73d5cc20cfb 100644 --- a/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx +++ b/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx @@ -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'; diff --git a/public/app/features/dashboard/utils/getPanelMenu.ts b/public/app/features/dashboard/utils/getPanelMenu.ts index 8d485825b16..9dce3e38dae 100644 --- a/public/app/features/dashboard/utils/getPanelMenu.ts +++ b/public/app/features/dashboard/utils/getPanelMenu.ts @@ -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'; diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx index c908deb867a..d7604d11670 100644 --- a/public/app/features/query/components/QueryGroup.tsx +++ b/public/app/features/query/components/QueryGroup.tsx @@ -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'; diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts index ffefaf7b4f1..12a4613978c 100644 --- a/public/app/features/query/state/PanelQueryRunner.ts +++ b/public/app/features/query/state/PanelQueryRunner.ts @@ -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'; diff --git a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.test.tsx b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.test.tsx index 790b70a3c31..2a52753b05f 100644 --- a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.test.tsx +++ b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.test.tsx @@ -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'), diff --git a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx index 9c151018d60..1e3c1cc8c78 100644 --- a/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx +++ b/public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx @@ -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); diff --git a/public/app/plugins/datasource/dashboard/constants.ts b/public/app/plugins/datasource/dashboard/constants.ts new file mode 100644 index 00000000000..6cb4bb85016 --- /dev/null +++ b/public/app/plugins/datasource/dashboard/constants.ts @@ -0,0 +1,2 @@ +export const SHARED_DASHBOARD_QUERY = '-- Dashboard --'; +export const DASHBOARD_DATASOURCE_PLUGIN_ID = 'dashboard'; diff --git a/public/app/plugins/datasource/dashboard/index.ts b/public/app/plugins/datasource/dashboard/index.ts deleted file mode 100644 index ff58d0dfe58..00000000000 --- a/public/app/plugins/datasource/dashboard/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export { isSharedDashboardQuery, runSharedRequest } from './runSharedRequest'; -export { DashboardQueryEditor } from './DashboardQueryEditor'; -export { SHARED_DASHBOARD_QUERY } from './types'; diff --git a/public/app/plugins/datasource/dashboard/runSharedRequest.ts b/public/app/plugins/datasource/dashboard/runSharedRequest.ts index e895c839425..17a5bf4660c 100644 --- a/public/app/plugins/datasource/dashboard/runSharedRequest.ts +++ b/public/app/plugins/datasource/dashboard/runSharedRequest.ts @@ -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) { diff --git a/public/app/plugins/datasource/dashboard/types.ts b/public/app/plugins/datasource/dashboard/types.ts index c1d1d7b579c..867605b1d07 100644 --- a/public/app/plugins/datasource/dashboard/types.ts +++ b/public/app/plugins/datasource/dashboard/types.ts @@ -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;