diff --git a/packages/grafana-schema/src/schema/dashboard/v2beta1/index.ts b/packages/grafana-schema/src/schema/dashboard/v2beta1/index.ts new file mode 100644 index 00000000000..1120792327c --- /dev/null +++ b/packages/grafana-schema/src/schema/dashboard/v2beta1/index.ts @@ -0,0 +1,4 @@ +// Re-export all types and values from types.spec.gen and types.status.gen for sub-path imports +// This allows imports like: import { Spec, Status } from '@grafana/schema/dashboard/v2beta1' +export * from './types.spec.gen'; +export * from './types.status.gen'; diff --git a/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx b/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx index 1bb6e42bd28..2310d1e5113 100644 --- a/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx +++ b/public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx @@ -7,7 +7,7 @@ import { FixedSizeList } from 'react-window'; import { GrafanaTheme2 } from '@grafana/data'; import { Trans, t } from '@grafana/i18n'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { Alert, Button, diff --git a/public/app/features/alerting/unified/components/rule-editor/useDashboardQuery.ts b/public/app/features/alerting/unified/components/rule-editor/useDashboardQuery.ts index 22c95aa797f..ac38ea1c8a1 100644 --- a/public/app/features/alerting/unified/components/rule-editor/useDashboardQuery.ts +++ b/public/app/features/alerting/unified/components/rule-editor/useDashboardQuery.ts @@ -1,7 +1,7 @@ import memoizeOne from 'memoize-one'; import { useEffect, useState } from 'react'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { getDashboardAPI } from 'app/features/dashboard/api/dashboard_api'; import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types'; import { isDashboardV2Resource } from 'app/features/dashboard/api/utils'; diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts index 90d255cead9..bcfabc5ee45 100644 --- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts +++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts @@ -7,7 +7,7 @@ import { AppEvents, locationUtil } from '@grafana/data'; import { t } from '@grafana/i18n'; import { config, getBackendSrv, isFetchError, locationService } from '@grafana/runtime'; import { Dashboard } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { isProvisionedFolderCheck } from 'app/api/clients/folder/v1beta1/utils'; import { appEvents } from 'app/core/app_events'; import { setStarred } from 'app/core/reducers/navBarTree'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingData.tsx b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingData.tsx index a7941569a0a..2d6e689dbc5 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingData.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingData.tsx @@ -11,7 +11,7 @@ import { SceneObjectState, VizPanel, } from '@grafana/scenes'; -import { ConditionalRenderingDataKind } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { ConditionalRenderingDataKind } from '@grafana/schema/dashboard/v2beta1'; import { Combobox, ComboboxOption } from '@grafana/ui'; import { dashboardEditActions } from '../../edit-pane/shared'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingTimeRangeSize.tsx b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingTimeRangeSize.tsx index d22ad02b8f9..a605620f00e 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingTimeRangeSize.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingTimeRangeSize.tsx @@ -3,7 +3,7 @@ import { ReactElement, useCallback, useEffect, useMemo, useState } from 'react'; import { rangeUtil, SelectableValue } from '@grafana/data'; import { t } from '@grafana/i18n'; import { SceneComponentProps, sceneGraph, SceneObjectBase, SceneObjectState } from '@grafana/scenes'; -import { ConditionalRenderingTimeRangeSizeKind } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { ConditionalRenderingTimeRangeSizeKind } from '@grafana/schema/dashboard/v2beta1'; import { Field, Select } from '@grafana/ui'; import { dashboardEditActions } from '../../edit-pane/shared'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingVariable.tsx b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingVariable.tsx index 827f7d9ca39..acb1096150c 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingVariable.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingVariable.tsx @@ -8,10 +8,10 @@ import { SceneObjectState, VariableDependencyConfig, } from '@grafana/scenes'; -import { +import type { ConditionalRenderingVariableKind, ConditionalRenderingVariableSpec, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; import { Box, Combobox, ComboboxOption, Field, Input, Stack } from '@grafana/ui'; import { dashboardEditActions } from '../../edit-pane/shared'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/conditions/serializers.ts b/public/app/features/dashboard-scene/conditional-rendering/conditions/serializers.ts index 12e72dd7ba2..95c4bff877f 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/conditions/serializers.ts +++ b/public/app/features/dashboard-scene/conditional-rendering/conditions/serializers.ts @@ -1,9 +1,9 @@ import { Registry, RegistryItem } from '@grafana/data'; -import { +import type { ConditionalRenderingDataKind, ConditionalRenderingTimeRangeSizeKind, ConditionalRenderingVariableKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; import { ConditionalRenderingData } from './ConditionalRenderingData'; import { ConditionalRenderingTimeRangeSize } from './ConditionalRenderingTimeRangeSize'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/group/ConditionalRenderingGroup.tsx b/public/app/features/dashboard-scene/conditional-rendering/group/ConditionalRenderingGroup.tsx index 8343bd1914c..1bf815208b3 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/group/ConditionalRenderingGroup.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/group/ConditionalRenderingGroup.tsx @@ -10,7 +10,7 @@ import { SceneObjectRef, SceneObjectState, } from '@grafana/scenes'; -import { ConditionalRenderingGroupKind } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { ConditionalRenderingGroupKind } from '@grafana/schema/dashboard/v2beta1'; import { Stack } from '@grafana/ui'; import { ConditionalRenderingChangedEvent, dashboardEditActions } from '../../edit-pane/shared'; diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts index 3a1841e6b32..601410671d8 100644 --- a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts +++ b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts @@ -2,7 +2,7 @@ import { locationUtil, UrlQueryMap } from '@grafana/data'; import { t } from '@grafana/i18n'; import { config, getBackendSrv, getDataSourceSrv, isFetchError, locationService } from '@grafana/runtime'; import { sceneGraph } from '@grafana/scenes'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { GetRepositoryFilesWithPathApiResponse, provisioningAPIv0alpha1 } from 'app/api/clients/provisioning/v0alpha1'; import { StateManagerBase } from 'app/core/services/StateManagerBase'; import { contextSrv } from 'app/core/services/context_srv'; diff --git a/public/app/features/dashboard-scene/saving/DashboardPrompt.tsx b/public/app/features/dashboard-scene/saving/DashboardPrompt.tsx index fb44176788f..9bb303f3205 100644 --- a/public/app/features/dashboard-scene/saving/DashboardPrompt.tsx +++ b/public/app/features/dashboard-scene/saving/DashboardPrompt.tsx @@ -5,7 +5,7 @@ import { memo, useContext, useEffect, useMemo } from 'react'; import { Trans, t } from '@grafana/i18n'; import { locationService } from '@grafana/runtime'; import { Dashboard } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { ModalsContext, Modal, Button, useStyles2 } from '@grafana/ui'; import { Prompt } from 'app/core/components/FormPrompt/Prompt'; import { contextSrv } from 'app/core/services/context_srv'; diff --git a/public/app/features/dashboard-scene/saving/getDashboardChanges.ts b/public/app/features/dashboard-scene/saving/getDashboardChanges.ts index 1a1617029fd..be5e0b2516e 100644 --- a/public/app/features/dashboard-scene/saving/getDashboardChanges.ts +++ b/public/app/features/dashboard-scene/saving/getDashboardChanges.ts @@ -2,13 +2,13 @@ import type { AdHocVariableModel, TextBoxVariableModel, TypedVariableModel } from '@grafana/data'; import { Dashboard, Panel, VariableOption } from '@grafana/schema'; -import { +import type { AdHocFilterWithLabels, AdhocVariableSpec, Spec as DashboardV2Spec, TextVariableSpec, VariableKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; import { ResponseTransformers } from 'app/features/dashboard/api/ResponseTransformers'; import { isDashboardV2Spec } from 'app/features/dashboard/api/utils'; import { DashboardDataDTO, DashboardDTO } from 'app/types/dashboard'; diff --git a/public/app/features/dashboard-scene/saving/shared.tsx b/public/app/features/dashboard-scene/saving/shared.tsx index 0eb70a1fe3b..7a26c11eb0f 100644 --- a/public/app/features/dashboard-scene/saving/shared.tsx +++ b/public/app/features/dashboard-scene/saving/shared.tsx @@ -4,7 +4,7 @@ import { selectors } from '@grafana/e2e-selectors'; import { Trans, t } from '@grafana/i18n'; import { config, isFetchError } from '@grafana/runtime'; import { Dashboard } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { Alert, Box, Button, Stack } from '@grafana/ui'; import { Diffs } from '../settings/version-history/utils'; diff --git a/public/app/features/dashboard-scene/saving/useSaveDashboard.ts b/public/app/features/dashboard-scene/saving/useSaveDashboard.ts index 1cb3527cd5b..1164b123813 100644 --- a/public/app/features/dashboard-scene/saving/useSaveDashboard.ts +++ b/public/app/features/dashboard-scene/saving/useSaveDashboard.ts @@ -4,7 +4,7 @@ import { locationUtil } from '@grafana/data'; import { t } from '@grafana/i18n'; import { locationService } from '@grafana/runtime'; import { Dashboard } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { appEvents } from 'app/core/app_events'; import { useAppNotification } from 'app/core/copy/appNotification'; import { updateDashboardName } from 'app/core/reducers/navBarTree'; diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.tsx index 4e3fa954a51..e597ed6b217 100644 --- a/public/app/features/dashboard-scene/scene/DashboardScene.tsx +++ b/public/app/features/dashboard-scene/scene/DashboardScene.tsx @@ -16,7 +16,7 @@ import { VizPanel, } from '@grafana/scenes'; import { Dashboard, DashboardLink, LibraryPanel } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { appEvents } from 'app/core/app_events'; import { ScrollRefElement } from 'app/core/components/NativeScrollbar'; import { LS_PANEL_COPY_KEY } from 'app/core/constants'; diff --git a/public/app/features/dashboard-scene/scene/export/exporters.ts b/public/app/features/dashboard-scene/scene/export/exporters.ts index 96492361e8d..d12128e47a6 100644 --- a/public/app/features/dashboard-scene/scene/export/exporters.ts +++ b/public/app/features/dashboard-scene/scene/export/exporters.ts @@ -3,15 +3,15 @@ import { defaults, each, sortBy } from 'lodash'; import { DataSourceRef, PanelPluginMeta, VariableOption, VariableRefresh } from '@grafana/data'; import { getDataSourceSrv } from '@grafana/runtime'; import { Panel } from '@grafana/schema'; -import { - Spec as DashboardV2Spec, +import type { PanelKind, PanelQueryKind, AnnotationQueryKind, QueryVariableKind, LibraryPanelRef, LibraryPanelKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; + Spec as DashboardV2Spec, +} from '@grafana/schema/dashboard/v2beta1'; import { notifyApp } from 'app/core/actions'; import config from 'app/core/config'; import { createErrorNotification } from 'app/core/copy/appNotification'; diff --git a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.tsx b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.tsx index 74ce363a970..770b00f7625 100644 --- a/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.tsx +++ b/public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.tsx @@ -8,7 +8,7 @@ import { VizPanel, SceneGridItemLike, } from '@grafana/scenes'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { GRID_CELL_VMARGIN } from 'app/core/constants'; import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor'; diff --git a/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx b/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx index 44a69b8fb23..32ca3fce5cf 100644 --- a/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx +++ b/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx @@ -17,7 +17,7 @@ import { SceneGridLayoutDragStartEvent, SceneObject, } from '@grafana/scenes'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { useStyles2 } from '@grafana/ui'; import { GRID_COLUMN_COUNT } from 'app/core/constants'; import DashboardEmpty from 'app/features/dashboard/dashgrid/DashboardEmpty/DashboardEmpty'; diff --git a/public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx b/public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx index 154ebf7875a..4946c53288f 100644 --- a/public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx +++ b/public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx @@ -11,7 +11,7 @@ import { SceneGridItemLike, SceneGridLayout, } from '@grafana/scenes'; -import { RowsLayoutRowKind } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { RowsLayoutRowKind } from '@grafana/schema/dashboard/v2beta1'; import { appEvents } from 'app/core/app_events'; import { LS_ROW_COPY_KEY } from 'app/core/constants'; import store from 'app/core/store'; diff --git a/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx b/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx index 778aad91757..57c5c734a2e 100644 --- a/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx +++ b/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx @@ -8,7 +8,7 @@ import { SceneObjectState, VizPanel, } from '@grafana/scenes'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { dashboardEditActions, ObjectsReorderedOnCanvasEvent } from '../../edit-pane/shared'; import { serializeRowsLayout } from '../../serialization/layoutSerializers/RowsLayoutSerializer'; diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx index a20301dd904..41029fb86ab 100644 --- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx +++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx @@ -11,7 +11,7 @@ import { SceneGridItemLike, SceneGridLayout, } from '@grafana/scenes'; -import { TabsLayoutTabKind } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { TabsLayoutTabKind } from '@grafana/schema/dashboard/v2beta1'; import { appEvents } from 'app/core/app_events'; import { LS_TAB_COPY_KEY } from 'app/core/constants'; import store from 'app/core/store'; diff --git a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx index 4e08b56e54f..25560db627e 100644 --- a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx +++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx @@ -8,7 +8,7 @@ import { SceneObjectUrlValues, VizPanel, } from '@grafana/scenes'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { dashboardEditActions, ObjectsReorderedOnCanvasEvent } from '../../edit-pane/shared'; import { serializeTabsLayout } from '../../serialization/layoutSerializers/TabsLayoutSerializer'; diff --git a/public/app/features/dashboard-scene/scene/types/DashboardLayoutManager.ts b/public/app/features/dashboard-scene/scene/types/DashboardLayoutManager.ts index 73a9d7329e0..843d1810bb1 100644 --- a/public/app/features/dashboard-scene/scene/types/DashboardLayoutManager.ts +++ b/public/app/features/dashboard-scene/scene/types/DashboardLayoutManager.ts @@ -1,5 +1,5 @@ import { SceneObject, VizPanel } from '@grafana/scenes'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor'; import { LayoutRegistryItem } from './LayoutRegistryItem'; diff --git a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts index cede8f605a5..9798e58c3ba 100644 --- a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts @@ -1,5 +1,5 @@ import { Dashboard } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { AnnoKeyDashboardSnapshotOriginalUrl, ObjectMeta } from 'app/features/apiserver/types'; import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types'; import { isDashboardV2Spec } from 'app/features/dashboard/api/utils'; diff --git a/public/app/features/dashboard-scene/serialization/annotations.ts b/public/app/features/dashboard-scene/serialization/annotations.ts index c4c57cf1d8c..2ab936825e3 100644 --- a/public/app/features/dashboard-scene/serialization/annotations.ts +++ b/public/app/features/dashboard-scene/serialization/annotations.ts @@ -1,9 +1,9 @@ import { AnnotationQuery } from '@grafana/data'; import { - AnnotationQueryKind, + type AnnotationQueryKind, defaultAnnotationQuerySpec, defaultDataQueryKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; import { getRuntimePanelDataSource } from './layoutSerializers/utils'; diff --git a/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts b/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts index 0a1791ca0a7..663630c2e42 100644 --- a/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts +++ b/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts @@ -2,14 +2,14 @@ import { t } from '@grafana/i18n'; import { config } from '@grafana/runtime'; import { VariableModel, defaultDashboard } from '@grafana/schema'; import { - AdhocVariableKind, + type AdhocVariableKind, + type GroupByVariableKind, + type Spec as DashboardV2Spec, defaultAdhocVariableSpec, defaultSpec as defaultDashboardV2Spec, defaultGroupByVariableSpec, defaultTimeSettingsSpec, - GroupByVariableKind, - Spec as DashboardV2Spec, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; import { AnnoKeyFolder } from 'app/features/apiserver/types'; import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/AutoGridLayoutSerializer.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/AutoGridLayoutSerializer.ts index f095e54f962..6670e53f46a 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/AutoGridLayoutSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/AutoGridLayoutSerializer.ts @@ -1,8 +1,8 @@ import { - Spec as DashboardV2Spec, + type AutoGridLayoutItemKind, + type Spec as DashboardV2Spec, defaultAutoGridLayoutSpec, - AutoGridLayoutItemKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; import { AutoGridItem } from '../../scene/layout-auto-grid/AutoGridItem'; import { AutoGridLayout } from '../../scene/layout-auto-grid/AutoGridLayout'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/DefaultGridLayoutSerializer.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/DefaultGridLayoutSerializer.ts index e19059547b7..efdfbf28ae1 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/DefaultGridLayoutSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/DefaultGridLayoutSerializer.ts @@ -1,6 +1,5 @@ import { SceneGridItemLike, SceneGridLayout, VizPanel } from '@grafana/scenes'; -import { - Spec as DashboardV2Spec, +import type { GridLayoutItemKind, GridLayoutKind, RepeatOptions, @@ -8,7 +7,8 @@ import { GridLayoutItemSpec, PanelKind, LibraryPanelKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; + Spec as DashboardV2Spec, +} from '@grafana/schema/dashboard/v2beta1'; import { DashboardGridItem } from '../../scene/layout-default/DashboardGridItem'; import { DefaultGridLayoutManager } from '../../scene/layout-default/DefaultGridLayoutManager'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.ts index fb5f906d243..3ae363047f0 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.ts @@ -1,4 +1,4 @@ -import { Spec as DashboardV2Spec, RowsLayoutRowKind } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { RowsLayoutRowKind, Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { RowItem } from '../../scene/layout-rows/RowItem'; import { RowsLayoutManager } from '../../scene/layout-rows/RowsLayoutManager'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts index 52d378d98c3..e35a75a5eed 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts @@ -1,4 +1,4 @@ -import { Spec as DashboardV2Spec, TabsLayoutTabKind } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { TabsLayoutTabKind, Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { TabItem } from '../../scene/layout-tabs/TabItem'; import { TabsLayoutManager } from '../../scene/layout-tabs/TabsLayoutManager'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/layoutSerializerRegistry.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/layoutSerializerRegistry.ts index d8e20de967d..99f441ff939 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/layoutSerializerRegistry.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/layoutSerializerRegistry.ts @@ -1,5 +1,5 @@ import { Registry, RegistryItem } from '@grafana/data'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { DashboardLayoutManager } from '../../scene/types/DashboardLayoutManager'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts index fc634339607..800d28ac6fc 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts @@ -9,19 +9,19 @@ import { VizPanelMenu, VizPanelState, } from '@grafana/scenes'; -import { DataSourceRef } from '@grafana/schema/dist/esm/index.gen'; import { - Spec as DashboardV2Spec, - AutoGridLayoutItemKind, - RowsLayoutRowKind, - LibraryPanelKind, - PanelKind, - PanelQueryKind, - QueryVariableKind, - TabsLayoutTabKind, - DataQueryKind, + type Spec as DashboardV2Spec, + type AutoGridLayoutItemKind, + type RowsLayoutRowKind, + type LibraryPanelKind, + type PanelKind, + type PanelQueryKind, + type QueryVariableKind, + type TabsLayoutTabKind, + type DataQueryKind, defaultPanelQueryKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; +import { DataSourceRef } from '@grafana/schema/dist/esm/index.gen'; import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource'; import { ConditionalRenderingGroup } from '../../conditional-rendering/group/ConditionalRenderingGroup'; diff --git a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts index 4fad1e3b317..14cdd4aafb5 100644 --- a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts +++ b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts @@ -13,22 +13,22 @@ import { VariableSort as OldVariableSort, } from '@grafana/schema'; import { - AdhocVariableKind, - ConstantVariableKind, - CustomVariableKind, - DataQueryKind, - DatasourceVariableKind, - IntervalVariableKind, - QueryVariableKind, - TextVariableKind, - GroupByVariableKind, + type AdhocVariableKind, + type ConstantVariableKind, + type CustomVariableKind, + type DataQueryKind, + type DatasourceVariableKind, + type IntervalVariableKind, + type QueryVariableKind, + type TextVariableKind, + type GroupByVariableKind, + type VariableOption, + type AdHocFilterWithLabels, + type SwitchVariableKind, defaultVariableHide, - VariableOption, defaultDataQueryKind, - AdHocFilterWithLabels, - SwitchVariableKind, defaultIntervalVariableSpec, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; import { getDefaultDatasource } from 'app/features/dashboard/api/ResponseTransformers'; import { getIntervalsQueryFromNewIntervalModel } from '../utils/utils'; diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts index 96781fe9fc2..f2fa9f44e83 100644 --- a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts +++ b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts @@ -20,11 +20,19 @@ import { TextBoxVariable, } from '@grafana/scenes'; import { - AdhocVariableKind, - ConstantVariableKind, - CustomVariableKind, - Spec as DashboardV2Spec, - DatasourceVariableKind, + type AdhocVariableKind, + type ConstantVariableKind, + type CustomVariableKind, + type Spec as DashboardV2Spec, + type DatasourceVariableKind, + type GroupByVariableKind, + type IntervalVariableKind, + type LibraryPanelKind, + type PanelKind, + type QueryVariableKind, + type SwitchVariableKind, + type TextVariableKind, + type AnnotationQueryKind, defaultAdhocVariableKind, defaultConstantVariableKind, defaultCustomVariableKind, @@ -35,16 +43,8 @@ import { defaultTextVariableKind, defaultSwitchVariableKind, defaultTimeSettingsSpec, - GroupByVariableKind, - IntervalVariableKind, - LibraryPanelKind, - PanelKind, - QueryVariableKind, - SwitchVariableKind, - TextVariableKind, defaultDataQueryKind, - AnnotationQueryKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; import { DEFAULT_ANNOTATION_COLOR } from '@grafana/ui'; import { AnnoKeyCreatedBy, diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts index 4a63c62af93..07cd0e32113 100644 --- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts +++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts @@ -14,41 +14,41 @@ import { VizPanel, } from '@grafana/scenes'; import { DataSourceRef, VariableRefresh } from '@grafana/schema'; -import { sortedDeepCloneWithoutNulls } from 'app/core/utils/object'; - import { - Spec as DashboardV2Spec, + type Spec as DashboardV2Spec, + type PanelKind, + type PanelQueryKind, + type TransformationKind, + type FieldConfigSource, + type DataTransformerConfig, + type PanelQuerySpec, + type DataQueryKind, + type QueryOptionsSpec, + type QueryVariableKind, + type TextVariableKind, + type IntervalVariableKind, + type DatasourceVariableKind, + type CustomVariableKind, + type ConstantVariableKind, + type GroupByVariableKind, + type AdhocVariableKind, + type AnnotationQueryKind, + type DataLink, + type LibraryPanelKind, + type Element, + type DashboardCursorSync, + type FieldColor, + type SwitchVariableKind, defaultSpec as defaultDashboardV2Spec, defaultFieldConfigSource, - PanelKind, - PanelQueryKind, - TransformationKind, - FieldConfigSource, - DataTransformerConfig, - PanelQuerySpec, - DataQueryKind, - QueryOptionsSpec, - QueryVariableKind, - TextVariableKind, - IntervalVariableKind, - DatasourceVariableKind, - CustomVariableKind, - ConstantVariableKind, - GroupByVariableKind, - AdhocVariableKind, - AnnotationQueryKind, - DataLink, - LibraryPanelKind, - Element, - DashboardCursorSync, - FieldColor, defaultFieldConfig, defaultDataQueryKind, - SwitchVariableKind, defaultTimeSettingsSpec, defaultDashboardLinkType, defaultDashboardLink, -} from '../../../../../packages/grafana-schema/src/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; +import { sortedDeepCloneWithoutNulls } from 'app/core/utils/object'; + import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet'; import { DashboardScene, DashboardSceneState } from '../scene/DashboardScene'; import { PanelTimeRange } from '../scene/panel-timerange/PanelTimeRange'; diff --git a/public/app/features/dashboard-scene/serialization/transformToV1TypesUtils.ts b/public/app/features/dashboard-scene/serialization/transformToV1TypesUtils.ts index db73de8b889..bebeebb0cb1 100644 --- a/public/app/features/dashboard-scene/serialization/transformToV1TypesUtils.ts +++ b/public/app/features/dashboard-scene/serialization/transformToV1TypesUtils.ts @@ -7,7 +7,7 @@ import { MappingType as MappingTypeV1, ThresholdsMode as ThresholdsModeV1, } from '@grafana/schema'; -import { +import type { DashboardCursorSync, VariableHide, VariableRefresh, @@ -15,7 +15,7 @@ import { FieldConfigSource, SpecialValueMatch, ThresholdsMode, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; export function transformVariableRefreshToEnumV1(refresh?: VariableRefresh): VariableRefreshV1 { switch (refresh) { diff --git a/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.ts b/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.ts index 8b17ab8ff89..7ea8e4da3e7 100644 --- a/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.ts +++ b/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.ts @@ -6,18 +6,18 @@ import { FieldColorModeId as FieldColorModeIdV1, DataTopic, } from '@grafana/schema'; -import { DataTransformerConfig } from '@grafana/schema/dist/esm/raw/dashboard/x/dashboard_types.gen'; import { - DashboardCursorSync, + type DashboardCursorSync, + type VariableHide, + type VariableRefresh, + type VariableSort, + type FieldColorModeId as FieldColorModeIdV2, defaultSpec as defaultDashboardV2Spec, defaultVariableHide, defaultVariableRefresh, defaultVariableSort, - VariableHide, - VariableRefresh, - VariableSort, - FieldColorModeId as FieldColorModeIdV2, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; +import { DataTransformerConfig } from '@grafana/schema/dist/esm/raw/dashboard/x/dashboard_types.gen'; // used for QueryVariableKind's query prop - in schema V2 we've deprecated string type and support only DataQuery export const LEGACY_STRING_VALUE_KEY = '__legacyStringValue'; diff --git a/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx b/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx index 30979075d2a..1c945da2492 100644 --- a/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx +++ b/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx @@ -5,7 +5,7 @@ import { GrafanaTheme2, PageLayoutType } from '@grafana/data'; import { Trans, t } from '@grafana/i18n'; import { SceneComponentProps, SceneObjectBase, sceneUtils } from '@grafana/scenes'; import { Dashboard } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { Alert, Box, Button, CodeEditor, Stack, useStyles2 } from '@grafana/ui'; import { Page } from 'app/core/components/Page/Page'; import { getDashboardAPI } from 'app/features/dashboard/api/dashboard_api'; diff --git a/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsEdit.tsx b/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsEdit.tsx index 03ed262c210..ad6a0d3c122 100644 --- a/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsEdit.tsx +++ b/public/app/features/dashboard-scene/settings/annotations/AnnotationSettingsEdit.tsx @@ -14,7 +14,7 @@ import { selectors } from '@grafana/e2e-selectors'; import { Trans, t } from '@grafana/i18n'; import { config, getDataSourceSrv } from '@grafana/runtime'; import { VizPanel } from '@grafana/scenes'; -import { AnnotationPanelFilter } from '@grafana/schema/src/raw/dashboard/x/dashboard_types.gen'; +import { AnnotationPanelFilter } from '@grafana/schema/dashboard/v0'; import { Button, Checkbox, diff --git a/public/app/features/dashboard-scene/sharing/ExportButton/ResourceExport.tsx b/public/app/features/dashboard-scene/sharing/ExportButton/ResourceExport.tsx index b58bf8377af..5b1cae962d8 100644 --- a/public/app/features/dashboard-scene/sharing/ExportButton/ResourceExport.tsx +++ b/public/app/features/dashboard-scene/sharing/ExportButton/ResourceExport.tsx @@ -3,7 +3,7 @@ import { AsyncState } from 'react-use/lib/useAsync'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors'; import { Trans, t } from '@grafana/i18n'; import { Dashboard } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { Alert, Label, RadioButtonGroup, Stack, Switch } from '@grafana/ui'; import { DashboardJson } from 'app/features/manage-dashboards/types'; diff --git a/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx b/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx index 0e9d6ad49c5..059fab7d11a 100644 --- a/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx +++ b/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx @@ -8,7 +8,7 @@ import { Trans, t } from '@grafana/i18n'; import { config } from '@grafana/runtime'; import { SceneComponentProps, SceneObjectBase } from '@grafana/scenes'; import { Dashboard } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { Button, ClipboardButton, CodeEditor, Field, Modal, Stack, Switch } from '@grafana/ui'; import { ObjectMeta } from 'app/features/apiserver/types'; import { transformDashboardV2SpecToV1 } from 'app/features/dashboard/api/ResponseTransformers'; diff --git a/public/app/features/dashboard-scene/sharing/ShareSnapshotTab.tsx b/public/app/features/dashboard-scene/sharing/ShareSnapshotTab.tsx index 9c4abbc3a6d..0ab7d454835 100644 --- a/public/app/features/dashboard-scene/sharing/ShareSnapshotTab.tsx +++ b/public/app/features/dashboard-scene/sharing/ShareSnapshotTab.tsx @@ -5,6 +5,7 @@ import { selectors as e2eSelectors } from '@grafana/e2e-selectors'; import { Trans, t } from '@grafana/i18n'; import { SceneComponentProps, sceneGraph, SceneObjectBase, SceneObjectRef, VizPanel } from '@grafana/scenes'; import { Dashboard } from '@grafana/schema'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { Button, ClipboardButton, Field, Input, Modal, RadioButtonGroup, Stack } from '@grafana/ui'; import { notifyApp } from 'app/core/actions'; import { createSuccessNotification } from 'app/core/copy/appNotification'; @@ -12,7 +13,6 @@ import { getTrackingSource, shareDashboardType } from 'app/features/dashboard/co import { getDashboardSnapshotSrv, SnapshotSharingOptions } from 'app/features/dashboard/services/SnapshotSrv'; import { dispatch } from 'app/store/store'; -import { Spec as DashboardV2Spec } from '../../../../../packages/grafana-schema/src/schema/dashboard/v2'; import { DashboardScene } from '../scene/DashboardScene'; import { transformSceneToSaveModel, trimDashboardForSnapshot } from '../serialization/transformSceneToSaveModel'; import { diff --git a/public/app/features/dashboard-scene/v2schema/ImportDashboardOverviewV2.tsx b/public/app/features/dashboard-scene/v2schema/ImportDashboardOverviewV2.tsx index e71b419b8e4..315572e7a07 100644 --- a/public/app/features/dashboard-scene/v2schema/ImportDashboardOverviewV2.tsx +++ b/public/app/features/dashboard-scene/v2schema/ImportDashboardOverviewV2.tsx @@ -1,10 +1,6 @@ import { locationUtil } from '@grafana/data'; import { locationService, reportInteraction } from '@grafana/runtime'; -import { - AnnotationQueryKind, - Spec as DashboardV2Spec, - defaultDataQueryKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import { AnnotationQueryKind, Spec as DashboardV2Spec, defaultDataQueryKind } from '@grafana/schema/dashboard/v2beta1'; import { Form } from 'app/core/components/Form/Form'; import { getDashboardAPI } from 'app/features/dashboard/api/dashboard_api'; import { SaveDashboardCommand } from 'app/features/dashboard/components/SaveDashboard/types'; diff --git a/public/app/features/dashboard-scene/v2schema/validation.test.ts b/public/app/features/dashboard-scene/v2schema/validation.test.ts index 6afb42eeb94..69881257c0e 100644 --- a/public/app/features/dashboard-scene/v2schema/validation.test.ts +++ b/public/app/features/dashboard-scene/v2schema/validation.test.ts @@ -3,7 +3,7 @@ import { defaultQueryGroupKind, defaultPanelQueryKind, defaultVizConfigKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; import { isPanelKindV2 } from './validation'; diff --git a/public/app/features/dashboard-scene/v2schema/validation.ts b/public/app/features/dashboard-scene/v2schema/validation.ts index b256f9b1a43..24868521c32 100644 --- a/public/app/features/dashboard-scene/v2schema/validation.ts +++ b/public/app/features/dashboard-scene/v2schema/validation.ts @@ -1,10 +1,10 @@ -import { +import type { PanelKind, QueryGroupKind, VizConfigKind, PanelQueryKind, TransformationKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; function isObject(value: unknown): value is Record { return typeof value === 'object' && value !== null && !Array.isArray(value); diff --git a/public/app/features/dashboard/api/ResponseTransformers.ts b/public/app/features/dashboard/api/ResponseTransformers.ts index d2640991b1e..5eaf0af9ec5 100644 --- a/public/app/features/dashboard/api/ResponseTransformers.ts +++ b/public/app/features/dashboard/api/ResponseTransformers.ts @@ -13,13 +13,11 @@ import { MappingType as MappingTypeV1, SpecialValueMatch as SpecialValueMatchV1, } from '@grafana/schema'; +import { DashboardLink, DataTransformerConfig } from '@grafana/schema/dashboard/v0'; import { AnnotationQueryKind, - Spec as DashboardV2Spec, DataLink, DatasourceVariableKind, - defaultSpec as defaultDashboardV2Spec, - defaultTimeSettingsSpec, PanelQueryKind, QueryVariableKind, TransformationKind, @@ -37,15 +35,17 @@ import { LibraryPanelKind, PanelKind, GridLayoutItemKind, - defaultDataQueryKind, RowsLayoutRowKind, GridLayoutKind, + Spec as DashboardV2Spec, + defaultSpec as defaultDashboardV2Spec, + defaultTimeSettingsSpec, + defaultDataQueryKind, defaultDashboardLinkType, defaultDashboardLink, defaultFieldConfigSource, defaultPanelQueryKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; -import { DashboardLink, DataTransformerConfig } from '@grafana/schema/src/raw/dashboard/x/dashboard_types.gen'; +} from '@grafana/schema/dashboard/v2beta1'; import { isWeekStart, WeekStart } from '@grafana/ui'; import { AnnoKeyCreatedBy, diff --git a/public/app/features/dashboard/api/UnifiedDashboardAPI.ts b/public/app/features/dashboard/api/UnifiedDashboardAPI.ts index 5e63cedb0f5..216352de828 100644 --- a/public/app/features/dashboard/api/UnifiedDashboardAPI.ts +++ b/public/app/features/dashboard/api/UnifiedDashboardAPI.ts @@ -1,5 +1,5 @@ import { Dashboard } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { isResource } from 'app/features/apiserver/guards'; import { Resource, ResourceList } from 'app/features/apiserver/types'; import { DashboardDataDTO, DashboardDTO } from 'app/types/dashboard'; diff --git a/public/app/features/dashboard/api/dashboard_api.ts b/public/app/features/dashboard/api/dashboard_api.ts index 966de322f62..249f2e249b8 100644 --- a/public/app/features/dashboard/api/dashboard_api.ts +++ b/public/app/features/dashboard/api/dashboard_api.ts @@ -1,5 +1,5 @@ import { Dashboard } from '@grafana/schema'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { DashboardDTO } from 'app/types/dashboard'; import { UnifiedDashboardAPI } from './UnifiedDashboardAPI'; diff --git a/public/app/features/dashboard/api/types.ts b/public/app/features/dashboard/api/types.ts index 950ace6061c..3851f414645 100644 --- a/public/app/features/dashboard/api/types.ts +++ b/public/app/features/dashboard/api/types.ts @@ -1,5 +1,5 @@ import { UrlQueryMap } from '@grafana/data'; -import { Status } from '@grafana/schema/src/schema/dashboard/v2'; +import type { Status } from '@grafana/schema/dashboard/v2beta1'; import { ListOptions, Resource, ResourceList } from 'app/features/apiserver/types'; import { DeleteDashboardResponse } from 'app/features/manage-dashboards/types'; import { AnnotationsPermissions, SaveDashboardResponseDTO } from 'app/types/dashboard'; diff --git a/public/app/features/dashboard/api/utils.ts b/public/app/features/dashboard/api/utils.ts index ab3e995fc34..02483fbd9e8 100644 --- a/public/app/features/dashboard/api/utils.ts +++ b/public/app/features/dashboard/api/utils.ts @@ -1,7 +1,6 @@ import { config, locationService } from '@grafana/runtime'; -import { Dashboard } from '@grafana/schema/dist/esm/index.gen'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; -import { Status } from '@grafana/schema/src/schema/dashboard/v2'; +import { Dashboard } from '@grafana/schema'; +import type { Spec as DashboardV2Spec, Status } from '@grafana/schema/dashboard/v2beta1'; import { Resource } from 'app/features/apiserver/types'; import { DashboardDataDTO, DashboardDTO } from 'app/types/dashboard'; diff --git a/public/app/features/dashboard/api/v1.ts b/public/app/features/dashboard/api/v1.ts index e43b8944079..57e42ff279d 100644 --- a/public/app/features/dashboard/api/v1.ts +++ b/public/app/features/dashboard/api/v1.ts @@ -1,7 +1,7 @@ import { locationUtil, UrlQueryMap } from '@grafana/data'; import { t } from '@grafana/i18n'; import { Dashboard } from '@grafana/schema'; -import { Status } from '@grafana/schema/src/schema/dashboard/v2'; +import type { Status } from '@grafana/schema/dashboard/v2beta1'; import { getFolderByUidFacade } from 'app/api/clients/folder/v1beta1/hooks'; import { getMessageFromError, getStatusFromError } from 'app/core/utils/errors'; import { ScopedResourceClient } from 'app/features/apiserver/client'; diff --git a/public/app/features/dashboard/api/v2.ts b/public/app/features/dashboard/api/v2.ts index e182543ce9c..16b909ac9e2 100644 --- a/public/app/features/dashboard/api/v2.ts +++ b/public/app/features/dashboard/api/v2.ts @@ -1,7 +1,6 @@ import { locationUtil } from '@grafana/data'; import { t } from '@grafana/i18n'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; -import { Status } from '@grafana/schema/src/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec, Status } from '@grafana/schema/dashboard/v2beta1'; import { getFolderByUidFacade } from 'app/api/clients/folder/v1beta1/hooks'; import { getMessageFromError, getStatusFromError } from 'app/core/utils/errors'; import { ScopedResourceClient } from 'app/features/apiserver/client'; diff --git a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx index d95d479c0c5..84f3fcf45d2 100644 --- a/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx +++ b/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx @@ -13,7 +13,7 @@ import { import { selectors } from '@grafana/e2e-selectors'; import { Trans, t } from '@grafana/i18n'; import { getDataSourceSrv, locationService } from '@grafana/runtime'; -import { AnnotationPanelFilter } from '@grafana/schema/src/raw/dashboard/x/dashboard_types.gen'; +import { AnnotationPanelFilter } from '@grafana/schema/dashboard/v0'; import { Button, Checkbox, Field, FieldSet, Input, MultiSelect, Select, useStyles2, Stack, Alert } from '@grafana/ui'; import { ColorValueEditor } from 'app/core/components/OptionsUI/color'; import config from 'app/core/config'; diff --git a/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx b/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx index 4500526802a..1a141f7c0c9 100644 --- a/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx +++ b/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx @@ -6,7 +6,7 @@ import { Props as AutoSizerProps } from 'react-virtualized-auto-sizer'; import { render } from 'test/test-utils'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; -import { Dashboard, DashboardCursorSync, FieldConfigSource, Panel, ThresholdsMode } from '@grafana/schema/src'; +import { Dashboard, DashboardCursorSync, FieldConfigSource, Panel, ThresholdsMode } from '@grafana/schema'; import { getRouteComponentProps } from 'app/core/navigation/mocks/routeProps'; import { DashboardInitPhase, DashboardMeta, DashboardRoutes } from 'app/types/dashboard'; import { StoreState } from 'app/types/store'; diff --git a/public/app/features/dashboard/services/DashboardLoaderSrv.ts b/public/app/features/dashboard/services/DashboardLoaderSrv.ts index ce333424e0a..bf079093995 100644 --- a/public/app/features/dashboard/services/DashboardLoaderSrv.ts +++ b/public/app/features/dashboard/services/DashboardLoaderSrv.ts @@ -4,7 +4,7 @@ import moment from 'moment'; // eslint-disable-line no-restricted-imports import { AppEvents, dateMath, UrlQueryMap, UrlQueryValue } from '@grafana/data'; import { getBackendSrv, isFetchError, locationService } from '@grafana/runtime'; -import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2'; +import type { Spec as DashboardV2Spec } from '@grafana/schema/dashboard/v2beta1'; import { backendSrv } from 'app/core/services/backend_srv'; import impressionSrv from 'app/core/services/impression_srv'; import kbn from 'app/core/utils/kbn'; diff --git a/public/app/features/dashboard/utils/panelMerge.test.ts b/public/app/features/dashboard/utils/panelMerge.test.ts index 51536b2d426..41a4c5f1d71 100644 --- a/public/app/features/dashboard/utils/panelMerge.test.ts +++ b/public/app/features/dashboard/utils/panelMerge.test.ts @@ -1,5 +1,5 @@ import { PanelModel } from '@grafana/data'; -import { FieldColorModeId, ThresholdsMode } from '@grafana/schema/src'; +import { FieldColorModeId, ThresholdsMode } from '@grafana/schema/dashboard/v0'; import { DashboardModel } from '../state/DashboardModel'; import { createDashboardModelFixture, createPanelSaveModel } from '../state/__fixtures__/dashboardFixtures'; diff --git a/public/app/features/dashboard/utils/tracking.ts b/public/app/features/dashboard/utils/tracking.ts index cffc7999fff..6a1de79aeca 100644 --- a/public/app/features/dashboard/utils/tracking.ts +++ b/public/app/features/dashboard/utils/tracking.ts @@ -1,10 +1,10 @@ -import { VariableModel } from '@grafana/schema/dist/esm/index'; -import { +import type { AdhocVariableKind, DatasourceVariableKind, QueryVariableKind, VariableKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; +} from '@grafana/schema/dashboard/v2beta1'; +import { VariableModel } from '@grafana/schema/dist/esm/index'; import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions'; import { DashboardModel } from '../state/DashboardModel'; diff --git a/public/app/features/manage-dashboards/state/actions.ts b/public/app/features/manage-dashboards/state/actions.ts index f897c23cfb9..b1c222d7a61 100644 --- a/public/app/features/manage-dashboards/state/actions.ts +++ b/public/app/features/manage-dashboards/state/actions.ts @@ -1,11 +1,11 @@ import { DataSourceInstanceSettings } from '@grafana/data'; import { getBackendSrv, getDataSourceSrv, isFetchError } from '@grafana/runtime'; -import { - Spec as DashboardV2Spec, +import type { QueryVariableKind, PanelQueryKind, AnnotationQueryKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2'; + Spec as DashboardV2Spec, +} from '@grafana/schema/dashboard/v2beta1'; import { notifyApp } from 'app/core/actions'; import { createErrorNotification } from 'app/core/copy/appNotification'; import { browseDashboardsAPI, ImportInputs } from 'app/features/browse-dashboards/api/browseDashboardsAPI'; diff --git a/public/app/features/manage-dashboards/types.ts b/public/app/features/manage-dashboards/types.ts index fc73951ec36..3bed9ec4208 100644 --- a/public/app/features/manage-dashboards/types.ts +++ b/public/app/features/manage-dashboards/types.ts @@ -1,4 +1,4 @@ -import { Dashboard } from '@grafana/schema/src/veneer/dashboard.types'; +import { Dashboard } from '@grafana/schema'; import { ExternalDashboard } from '../dashboard/components/DashExportModal/DashboardExporter';