From 17d089d38a75bf3ccebfdf9df81f1d3287a1106b Mon Sep 17 00:00:00 2001 From: Dominik Prokop Date: Wed, 2 Apr 2025 16:22:24 +0200 Subject: [PATCH] Schema V2: Use App SDK generated types (#103100) * Use App SDK generated types * Move examples * Merge fix * PAth updates --- .../{v2alpha0/examples.ts => v2_examples.ts} | 4 ++-- .../core/components/Select/DashboardPicker.test.tsx | 7 +++++-- .../browse-dashboards/api/browseDashboardsAPI.ts | 2 +- .../conditional-rendering/ConditionalRendering.tsx | 2 +- .../ConditionalRenderingData.tsx | 2 +- .../ConditionalRenderingGroup.tsx | 2 +- .../ConditionalRenderingInterval.tsx | 2 +- .../ConditionalRenderingVariable.tsx | 2 +- .../conditional-rendering/serializers.ts | 2 +- .../pages/DashboardScenePageStateManager.test.ts | 5 ++++- .../pages/DashboardScenePageStateManager.ts | 2 +- .../dashboard-scene/saving/DetectChangesWorker.ts | 2 +- .../dashboard-scene/saving/getDashboardChanges.ts | 4 ++-- .../app/features/dashboard-scene/saving/shared.tsx | 2 +- .../dashboard-scene/saving/useSaveDashboard.ts | 2 +- .../dashboard-scene/scene/DashboardScene.tsx | 2 +- .../layout-default/DefaultGridLayoutManager.tsx | 2 +- .../ResponsiveGridLayoutManager.tsx | 2 +- .../dashboard-scene/scene/layout-rows/RowItem.tsx | 2 +- .../scene/layout-rows/RowsLayoutManager.tsx | 2 +- .../dashboard-scene/scene/layout-tabs/TabItem.tsx | 2 +- .../scene/layout-tabs/TabsLayoutManager.tsx | 2 +- .../dashboard-scene/scene/layouts-shared/paste.ts | 4 ++-- .../scene/types/DashboardLayoutManager.ts | 2 +- .../serialization/DashboardSceneSerializer.test.ts | 6 +++--- .../serialization/DashboardSceneSerializer.ts | 2 +- .../serialization/buildNewDashboardSaveModel.ts | 8 ++++---- .../layoutSerializers/DefaultGridLayoutSerializer.ts | 4 ++-- .../ResponsiveGridLayoutSerializer.ts | 4 ++-- .../layoutSerializers/RowsLayoutSerializer.test.ts | 2 +- .../layoutSerializers/RowsLayoutSerializer.ts | 5 ++++- .../layoutSerializers/TabsLayoutSerializer.test.ts | 2 +- .../layoutSerializers/TabsLayoutSerializer.ts | 5 ++++- .../layoutSerializers/layoutSerializerRegistry.ts | 2 +- .../serialization/layoutSerializers/utils.ts | 12 +++++++++--- .../serialization/sceneVariablesSetToVariables.ts | 2 +- .../transformSaveModelSchemaV2ToScene.test.ts | 6 +++--- .../transformSaveModelSchemaV2ToScene.ts | 4 ++-- .../transformSceneToSaveModelSchemaV2.test.ts | 4 ++-- .../transformSceneToSaveModelSchemaV2.ts | 6 +++--- .../serialization/transformToV1TypesUtils.ts | 2 +- .../serialization/transformToV2TypesUtils.test.ts | 2 +- .../serialization/transformToV2TypesUtils.ts | 4 ++-- .../dashboard-scene/v2schema/test-helpers.ts | 2 +- .../dashboard-scene/v2schema/transformers.test.ts | 4 ++-- .../dashboard/api/ResponseTransformers.test.ts | 6 +++--- .../features/dashboard/api/ResponseTransformers.ts | 6 +++--- .../dashboard/api/UnifiedDashboardAPI.test.ts | 2 +- .../features/dashboard/api/UnifiedDashboardAPI.ts | 2 +- public/app/features/dashboard/api/dashboard_api.ts | 2 +- public/app/features/dashboard/api/utils.ts | 2 +- public/app/features/dashboard/api/v2.test.ts | 5 ++++- public/app/features/dashboard/api/v2.ts | 2 +- .../dashboard/services/DashboardLoaderSrv.ts | 2 +- public/app/features/dashboard/utils/tracking.ts | 2 +- .../manage-dashboards/utils/validation.test.ts | 7 +++++-- 56 files changed, 106 insertions(+), 82 deletions(-) rename packages/grafana-schema/src/schema/dashboard/{v2alpha0/examples.ts => v2_examples.ts} (99%) diff --git a/packages/grafana-schema/src/schema/dashboard/v2alpha0/examples.ts b/packages/grafana-schema/src/schema/dashboard/v2_examples.ts similarity index 99% rename from packages/grafana-schema/src/schema/dashboard/v2alpha0/examples.ts rename to packages/grafana-schema/src/schema/dashboard/v2_examples.ts index fe92defe024..ce7bf8565de 100644 --- a/packages/grafana-schema/src/schema/dashboard/v2alpha0/examples.ts +++ b/packages/grafana-schema/src/schema/dashboard/v2_examples.ts @@ -1,6 +1,6 @@ -import { DashboardV2Spec } from './types.gen'; +import { Spec } from './v2alpha1/types.spec.gen'; -export const handyTestingSchema: DashboardV2Spec = { +export const handyTestingSchema: Spec = { title: 'Default Dashboard', description: 'This is a default dashboard', cursorSync: 'Off', diff --git a/public/app/core/components/Select/DashboardPicker.test.tsx b/public/app/core/components/Select/DashboardPicker.test.tsx index d836257a252..2f662fe586b 100644 --- a/public/app/core/components/Select/DashboardPicker.test.tsx +++ b/public/app/core/components/Select/DashboardPicker.test.tsx @@ -3,7 +3,10 @@ import { Props } from 'react-virtualized-auto-sizer'; import { render, screen, userEvent, waitFor } from 'test/test-utils'; import { defaultDashboard as defaultDashboardData } from '@grafana/schema'; -import { DashboardV2Spec, defaultDashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { + Spec as DashboardV2Spec, + defaultSpec as defaultDashboardV2Spec, +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { backendSrv } from 'app/core/services/backend_srv'; import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types'; import { DashboardSearchItemType } from 'app/features/search/types'; @@ -77,7 +80,7 @@ const mockDashboard: DashboardDTO = { }; const mockDashboardV2: DashboardWithAccessInfo = { - apiVersion: 'v2alpha0', + apiVersion: 'v2alpha1', kind: 'DashboardWithAccessInfo', spec: { ...defaultDashboardV2Spec(), diff --git a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts index df579fcdf62..8974aee86a5 100644 --- a/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts +++ b/public/app/features/browse-dashboards/api/browseDashboardsAPI.ts @@ -3,7 +3,7 @@ import { createApi } from '@reduxjs/toolkit/query/react'; import { AppEvents, isTruthy, locationUtil } from '@grafana/data'; import { config, getBackendSrv, locationService } from '@grafana/runtime'; import { Dashboard } from '@grafana/schema'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { createBaseQuery, handleRequestError } from 'app/api/createBaseQuery'; import appEvents from 'app/core/app_events'; import { contextSrv } from 'app/core/core'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRendering.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRendering.tsx index bc37e726cb3..8b733f815d5 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRendering.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRendering.tsx @@ -1,5 +1,5 @@ import { SceneComponentProps, SceneObjectBase, SceneObjectState } from '@grafana/scenes'; -import { ConditionalRenderingGroupKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { ConditionalRenderingGroupKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { ConditionalRenderingGroup } from './ConditionalRenderingGroup'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingData.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingData.tsx index 0d8b20f4b20..782c63b6101 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingData.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingData.tsx @@ -2,7 +2,7 @@ import { ReactNode, useMemo } from 'react'; import { PanelData, SelectableValue } from '@grafana/data'; import { SceneComponentProps, SceneDataProvider, sceneGraph } from '@grafana/scenes'; -import { ConditionalRenderingDataKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { ConditionalRenderingDataKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { RadioButtonGroup, Stack } from '@grafana/ui'; import { t } from 'app/core/internationalization'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroup.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroup.tsx index 14bf66c40b5..5ef4f175282 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroup.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroup.tsx @@ -3,7 +3,7 @@ import { Fragment, ReactNode, useMemo } from 'react'; import { GrafanaTheme2, SelectableValue } from '@grafana/data'; import { SceneComponentProps } from '@grafana/scenes'; -import { ConditionalRenderingGroupKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { ConditionalRenderingGroupKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { Divider, Dropdown, Field, Menu, RadioButtonGroup, Stack, ToolbarButton, useStyles2 } from '@grafana/ui'; import { t, Trans } from 'app/core/internationalization'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingInterval.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingInterval.tsx index d22ccd3a91e..a4a02c32a76 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingInterval.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingInterval.tsx @@ -2,7 +2,7 @@ import { ReactNode, useState } from 'react'; import { rangeUtil } from '@grafana/data'; import { SceneComponentProps, sceneGraph } from '@grafana/scenes'; -import { ConditionalRenderingTimeIntervalKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { ConditionalRenderingTimeIntervalKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { Field, Input, Stack } from '@grafana/ui'; import { t } from 'app/core/internationalization'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingVariable.tsx b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingVariable.tsx index 7a2b15d296b..4aa50361abe 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingVariable.tsx +++ b/public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingVariable.tsx @@ -3,7 +3,7 @@ import { ReactNode, useMemo } from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { SceneComponentProps, sceneGraph, VariableDependencyConfig } from '@grafana/scenes'; -import { ConditionalRenderingVariableKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { ConditionalRenderingVariableKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { Combobox, ComboboxOption, Field, Input, Stack, useStyles2 } from '@grafana/ui'; import { t } from 'app/core/internationalization'; diff --git a/public/app/features/dashboard-scene/conditional-rendering/serializers.ts b/public/app/features/dashboard-scene/conditional-rendering/serializers.ts index ab421d799d5..4371e601b45 100644 --- a/public/app/features/dashboard-scene/conditional-rendering/serializers.ts +++ b/public/app/features/dashboard-scene/conditional-rendering/serializers.ts @@ -4,7 +4,7 @@ import { ConditionalRenderingVariableKind, ConditionalRenderingDataKind, ConditionalRenderingTimeIntervalKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { ConditionalRenderingData } from './ConditionalRenderingData'; import { ConditionalRenderingGroup } from './ConditionalRenderingGroup'; diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts index c1dcfaa4e68..3fe399aceb3 100644 --- a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts +++ b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts @@ -1,7 +1,10 @@ import { advanceBy } from 'jest-date-mock'; import { BackendSrv, setBackendSrv } from '@grafana/runtime'; -import { DashboardV2Spec, defaultDashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { + Spec as DashboardV2Spec, + defaultSpec as defaultDashboardV2Spec, +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import store from 'app/core/store'; import { getDashboardAPI } from 'app/features/dashboard/api/dashboard_api'; import { DashboardVersionError, DashboardWithAccessInfo } from 'app/features/dashboard/api/types'; diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts index cec79e0b98b..1f90297e0f8 100644 --- a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts +++ b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts @@ -3,7 +3,7 @@ import { isEqual } from 'lodash'; import { locationUtil, UrlQueryMap } from '@grafana/data'; import { config, getBackendSrv, isFetchError, locationService } from '@grafana/runtime'; import { sceneGraph } from '@grafana/scenes'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { StateManagerBase } from 'app/core/services/StateManagerBase'; import { getMessageFromError, getMessageIdFromError, getStatusFromError } from 'app/core/utils/errors'; import { startMeasure, stopMeasure } from 'app/core/utils/metrics'; diff --git a/public/app/features/dashboard-scene/saving/DetectChangesWorker.ts b/public/app/features/dashboard-scene/saving/DetectChangesWorker.ts index cb856ad8758..2ad61da280c 100644 --- a/public/app/features/dashboard-scene/saving/DetectChangesWorker.ts +++ b/public/app/features/dashboard-scene/saving/DetectChangesWorker.ts @@ -1,5 +1,5 @@ import { Dashboard } from '@grafana/schema'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { jsonDiff } from '../settings/version-history/utils'; diff --git a/public/app/features/dashboard-scene/saving/getDashboardChanges.ts b/public/app/features/dashboard-scene/saving/getDashboardChanges.ts index c8fbe6792c0..d23d65197bf 100644 --- a/public/app/features/dashboard-scene/saving/getDashboardChanges.ts +++ b/public/app/features/dashboard-scene/saving/getDashboardChanges.ts @@ -5,9 +5,9 @@ import { Dashboard, Panel, VariableOption } from '@grafana/schema'; import { AdHocFilterWithLabels, AdhocVariableSpec, - DashboardV2Spec, + Spec as DashboardV2Spec, VariableKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { ResponseTransformers } from 'app/features/dashboard/api/ResponseTransformers'; import { isDashboardV2Spec } from 'app/features/dashboard/api/utils'; import { DashboardDataDTO, DashboardDTO } from 'app/types'; diff --git a/public/app/features/dashboard-scene/saving/shared.tsx b/public/app/features/dashboard-scene/saving/shared.tsx index 7c15c4b002d..f1cc7791615 100644 --- a/public/app/features/dashboard-scene/saving/shared.tsx +++ b/public/app/features/dashboard-scene/saving/shared.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import { selectors } from '@grafana/e2e-selectors'; import { config, isFetchError } from '@grafana/runtime'; import { Dashboard } from '@grafana/schema'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { Alert, Box, Button, Stack } from '@grafana/ui'; import { t, Trans } from 'app/core/internationalization'; diff --git a/public/app/features/dashboard-scene/saving/useSaveDashboard.ts b/public/app/features/dashboard-scene/saving/useSaveDashboard.ts index 93056eb6f8f..8977abc2365 100644 --- a/public/app/features/dashboard-scene/saving/useSaveDashboard.ts +++ b/public/app/features/dashboard-scene/saving/useSaveDashboard.ts @@ -3,7 +3,7 @@ import { useAsyncFn } from 'react-use'; import { locationUtil } from '@grafana/data'; import { locationService, reportInteraction } from '@grafana/runtime'; import { Dashboard } from '@grafana/schema'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; 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 b18b882eefe..74553522b0b 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 { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; 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/layout-default/DefaultGridLayoutManager.tsx b/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx index b45ecabe58b..82f13c6ffc7 100644 --- a/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx +++ b/public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx @@ -15,7 +15,7 @@ import { useSceneObjectState, SceneGridLayoutDragStartEvent, } from '@grafana/scenes'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { useStyles2 } from '@grafana/ui'; import { GRID_COLUMN_COUNT } from 'app/core/constants'; import { t } from 'app/core/internationalization'; diff --git a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.tsx b/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.tsx index 5b8ec553396..46459c88cc2 100644 --- a/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.tsx +++ b/public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.tsx @@ -1,5 +1,5 @@ import { SceneComponentProps, SceneObjectBase, SceneObjectState, VizPanel } from '@grafana/scenes'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { GRID_CELL_VMARGIN } from 'app/core/constants'; import { t } from 'app/core/internationalization'; import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor'; 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 610fb8adc8c..4c9f6443a67 100644 --- a/public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx +++ b/public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx @@ -8,7 +8,7 @@ import { VariableDependencyConfig, VizPanel, } from '@grafana/scenes'; -import { RowsLayoutRowKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { RowsLayoutRowKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { LS_ROW_COPY_KEY } from 'app/core/constants'; import { t } from 'app/core/internationalization'; 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 978a30cc013..e3310aa9aef 100644 --- a/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx +++ b/public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx @@ -1,5 +1,5 @@ import { SceneGridItemLike, SceneGridRow, SceneObjectBase, SceneObjectState, VizPanel } from '@grafana/scenes'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { t } from 'app/core/internationalization'; import { 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 cba2188fc76..2a014f48433 100644 --- a/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx +++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx @@ -8,7 +8,7 @@ import { SceneObject, VizPanel, } from '@grafana/scenes'; -import { TabsLayoutTabKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { TabsLayoutTabKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { LS_TAB_COPY_KEY } from 'app/core/constants'; import { t } from 'app/core/internationalization'; 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 f33181fb3b8..fe59bf6411d 100644 --- a/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx +++ b/public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx @@ -5,7 +5,7 @@ import { SceneObjectUrlValues, VizPanel, } from '@grafana/scenes'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { t } from 'app/core/internationalization'; import { diff --git a/public/app/features/dashboard-scene/scene/layouts-shared/paste.ts b/public/app/features/dashboard-scene/scene/layouts-shared/paste.ts index 9c7eadd6aef..57bfdb83e8c 100644 --- a/public/app/features/dashboard-scene/scene/layouts-shared/paste.ts +++ b/public/app/features/dashboard-scene/scene/layouts-shared/paste.ts @@ -1,10 +1,10 @@ import { AutoGridLayoutItemKind, - DashboardV2Spec, + Spec as DashboardV2Spec, GridLayoutItemKind, RowsLayoutRowKind, TabsLayoutTabKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { LS_PANEL_COPY_KEY, LS_ROW_COPY_KEY, LS_TAB_COPY_KEY } from 'app/core/constants'; import store from 'app/core/store'; diff --git a/public/app/features/dashboard-scene/scene/types/DashboardLayoutManager.ts b/public/app/features/dashboard-scene/scene/types/DashboardLayoutManager.ts index 06a8ba01772..680b8530601 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 { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor'; import { LayoutRegistryItem } from './LayoutRegistryItem'; diff --git a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts index a48e8da3870..69484792891 100644 --- a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts +++ b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts @@ -8,13 +8,13 @@ import { } from '@grafana/scenes'; import { Dashboard, VariableModel } from '@grafana/schema'; import { - DashboardV2Spec, - defaultDashboardV2Spec, + Spec as DashboardV2Spec, + defaultSpec as defaultDashboardV2Spec, defaultPanelSpec, defaultTimeSettingsSpec, GridLayoutKind, PanelSpec, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { AnnoKeyDashboardSnapshotOriginalUrl } from 'app/features/apiserver/types'; import { SaveDashboardAsOptions } from 'app/features/dashboard/components/SaveDashboard/types'; import { DASHBOARD_SCHEMA_VERSION } from 'app/features/dashboard/state/DashboardMigrator'; diff --git a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts index ef61766b96d..edf0fa2125c 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 { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { AnnoKeyDashboardSnapshotOriginalUrl } from 'app/features/apiserver/types'; import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types'; import { SaveDashboardAsOptions } from 'app/features/dashboard/components/SaveDashboard/types'; diff --git a/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts b/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts index 2a4121cee5a..8c4c54b4358 100644 --- a/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts +++ b/public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts @@ -2,13 +2,13 @@ import { config } from '@grafana/runtime'; import { VariableModel, defaultDashboard } from '@grafana/schema'; import { AdhocVariableKind, - DashboardV2Spec, defaultAdhocVariableSpec, - defaultDashboardV2Spec, + defaultSpec as defaultDashboardV2Spec, defaultGroupByVariableSpec, defaultTimeSettingsSpec, GroupByVariableKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; + Spec as DashboardV2Spec, +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { AnnoKeyFolder } from 'app/features/apiserver/types'; import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; @@ -108,7 +108,7 @@ export async function buildNewDashboardSaveModelV2( } const data: DashboardWithAccessInfo = { - apiVersion: 'v2alpha0', + apiVersion: 'v2alpha1', kind: 'DashboardWithAccessInfo', spec: { ...defaultDashboardV2Spec(), diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/DefaultGridLayoutSerializer.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/DefaultGridLayoutSerializer.ts index a8e25ba331c..5baba89b4ea 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/DefaultGridLayoutSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/DefaultGridLayoutSerializer.ts @@ -1,6 +1,6 @@ import { SceneGridItemLike, SceneGridLayout, SceneGridRow, SceneObject, VizPanel } from '@grafana/scenes'; import { - DashboardV2Spec, + Spec as DashboardV2Spec, GridLayoutItemKind, GridLayoutKind, GridLayoutRowKind, @@ -9,7 +9,7 @@ import { GridLayoutItemSpec, PanelKind, LibraryPanelKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { contextSrv } from 'app/core/core'; import { DashboardGridItem } from '../../scene/layout-default/DashboardGridItem'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/ResponsiveGridLayoutSerializer.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/ResponsiveGridLayoutSerializer.ts index 9e3892a974f..cacb0554ead 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/ResponsiveGridLayoutSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/ResponsiveGridLayoutSerializer.ts @@ -1,8 +1,8 @@ import { - DashboardV2Spec, + Spec as DashboardV2Spec, defaultAutoGridLayoutSpec, AutoGridLayoutItemKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { AutoGridItem } from '../../scene/layout-responsive-grid/ResponsiveGridItem'; import { AutoGridLayout } from '../../scene/layout-responsive-grid/ResponsiveGridLayout'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.test.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.test.ts index efa61002547..c51b4200361 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.test.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.test.ts @@ -1,5 +1,5 @@ import { SceneGridLayout } from '@grafana/scenes'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DefaultGridLayoutManager } from '../../scene/layout-default/DefaultGridLayoutManager'; import { AutoGridLayout } from '../../scene/layout-responsive-grid/ResponsiveGridLayout'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.ts index d309ab6d029..b6fae840629 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.ts @@ -1,5 +1,8 @@ import { SceneObject } from '@grafana/scenes'; -import { DashboardV2Spec, RowsLayoutRowKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { + Spec as DashboardV2Spec, + RowsLayoutRowKind, +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { RowItem } from '../../scene/layout-rows/RowItem'; import { RowItemRepeaterBehavior } from '../../scene/layout-rows/RowItemRepeaterBehavior'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.test.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.test.ts index 38bb91ce996..87ab1e5bbc7 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.test.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.test.ts @@ -1,4 +1,4 @@ -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DefaultGridLayoutManager } from '../../scene/layout-default/DefaultGridLayoutManager'; import { AutoGridLayoutManager } from '../../scene/layout-responsive-grid/ResponsiveGridLayoutManager'; diff --git a/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts b/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts index 145d55b0ad7..fd76f2a1c74 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts @@ -1,4 +1,7 @@ -import { DashboardV2Spec, TabsLayoutTabKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { + Spec as DashboardV2Spec, + TabsLayoutTabKind, +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; 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 9ef055991a9..fff6a58e81d 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 { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; 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 8c89fdc0334..30a5f12e49b 100644 --- a/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts +++ b/public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts @@ -11,14 +11,14 @@ import { } from '@grafana/scenes'; import { DataSourceRef } from '@grafana/schema/dist/esm/index.gen'; import { - DashboardV2Spec, + Spec as DashboardV2Spec, AutoGridLayoutItemKind, RowsLayoutRowKind, LibraryPanelKind, PanelKind, PanelQueryKind, QueryVariableKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource'; import { ConditionalRendering } from '../../conditional-rendering/ConditionalRendering'; @@ -39,6 +39,7 @@ import { DashboardLayoutManager } from '../../scene/types/DashboardLayoutManager import { getVizPanelKeyForPanelId } from '../../utils/utils'; import { createElements, vizPanelToSchemaV2 } from '../transformSceneToSaveModelSchemaV2'; import { transformMappingsToV1 } from '../transformToV1TypesUtils'; +import { transformDataTopic } from '../transformToV2TypesUtils'; export function buildVizPanel(panel: PanelKind, id?: number): VizPanel { const titleItems: SceneObject[] = []; @@ -171,7 +172,12 @@ export function createPanelDataProvider(panelKind: PanelKind): SceneDataProvider // Wrap inner data provider in a data transformer return new SceneDataTransformer({ $data: dataProvider, - transformations: panel.data.spec.transformations.map((transformation) => transformation.spec), + transformations: panel.data.spec.transformations.map((t) => { + return { + ...t.spec, + topic: transformDataTopic(t.spec.topic), + }; + }), }); } diff --git a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts index c787153fc94..827ea2b9b05 100644 --- a/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts +++ b/public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts @@ -18,7 +18,7 @@ import { GroupByVariableKind, defaultVariableHide, VariableOption, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { getIntervalsQueryFromNewIntervalModel } from '../utils/utils'; diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts index 97e653c6b39..cac23a6c949 100644 --- a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts +++ b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts @@ -16,11 +16,12 @@ import { SceneGridRow, SceneGridItem, } from '@grafana/scenes'; +import { handyTestingSchema } from '@grafana/schema/dist/esm/schema/dashboard/v2_examples'; import { AdhocVariableKind, ConstantVariableKind, CustomVariableKind, - DashboardV2Spec, + Spec as DashboardV2Spec, DatasourceVariableKind, GridLayoutItemSpec, GridLayoutSpec, @@ -28,8 +29,7 @@ import { IntervalVariableKind, QueryVariableKind, TextVariableKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; -import { handyTestingSchema } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0/examples'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types'; import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource'; diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts index 4899d5a067f..6cb7c7462c1 100644 --- a/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts +++ b/public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts @@ -23,7 +23,7 @@ import { AdhocVariableKind, ConstantVariableKind, CustomVariableKind, - DashboardV2Spec, + Spec as DashboardV2Spec, DatasourceVariableKind, defaultAdhocVariableKind, defaultConstantVariableKind, @@ -39,7 +39,7 @@ import { PanelKind, QueryVariableKind, TextVariableKind, -} from '@grafana/schema/src/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { AnnoKeyCreatedBy, AnnoKeyFolder, diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts index 71b495851b0..00347fdf677 100644 --- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts +++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts @@ -26,13 +26,13 @@ import { VariableHide as VariableHideV1, VariableSort as VariableSortV1, } from '@grafana/schema/dist/esm/index.gen'; - import { GridLayoutSpec, AutoGridLayoutSpec, RowsLayoutSpec, TabsLayoutSpec, -} from '../../../../../packages/grafana-schema/src/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; + import { DashboardEditPane } from '../edit-pane/DashboardEditPane'; import { DashboardAnnotationsDataLayer } from '../scene/DashboardAnnotationsDataLayer'; import { DashboardControls } from '../scene/DashboardControls'; diff --git a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts index 7bab825b423..018d71e0775 100644 --- a/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts +++ b/public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts @@ -18,8 +18,8 @@ import { DataSourceRef } from '@grafana/schema'; import { sortedDeepCloneWithoutNulls } from 'app/core/utils/object'; import { - DashboardV2Spec, - defaultDashboardV2Spec, + Spec as DashboardV2Spec, + defaultSpec as defaultDashboardV2Spec, defaultFieldConfigSource, PanelKind, PanelQueryKind, @@ -44,7 +44,7 @@ import { DashboardCursorSync, FieldConfig, FieldColor, -} from '../../../../../packages/grafana-schema/src/schema/dashboard/v2alpha0'; +} from '../../../../../packages/grafana-schema/src/schema/dashboard/v2alpha1/types.spec.gen'; import { DashboardDataLayerSet } from '../scene/DashboardDataLayerSet'; import { DashboardScene, DashboardSceneState } from '../scene/DashboardScene'; import { PanelTimeRange } from '../scene/PanelTimeRange'; diff --git a/public/app/features/dashboard-scene/serialization/transformToV1TypesUtils.ts b/public/app/features/dashboard-scene/serialization/transformToV1TypesUtils.ts index 57ba70aa7d1..86b049d309b 100644 --- a/public/app/features/dashboard-scene/serialization/transformToV1TypesUtils.ts +++ b/public/app/features/dashboard-scene/serialization/transformToV1TypesUtils.ts @@ -16,7 +16,7 @@ import { FieldConfigSource, SpecialValueMatch, ThresholdsMode, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; export function transformVariableRefreshToEnumV1(refresh?: VariableRefresh): VariableRefreshV1 { switch (refresh) { diff --git a/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.test.ts b/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.test.ts index 6b22bcb886d..d085f80da5f 100644 --- a/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.test.ts +++ b/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.test.ts @@ -3,7 +3,7 @@ import { defaultVariableSort, defaultVariableRefresh, defaultDashboardCursorSync, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { transformCursorSynctoEnum, diff --git a/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.ts b/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.ts index 582b6b4cfcf..6c9ea39546f 100644 --- a/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.ts +++ b/public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.ts @@ -9,7 +9,7 @@ import { import { DataTransformerConfig } from '@grafana/schema/dist/esm/raw/dashboard/x/dashboard_types.gen'; import { DashboardCursorSync, - defaultDashboardV2Spec, + defaultSpec as defaultDashboardV2Spec, defaultVariableHide, defaultVariableRefresh, defaultVariableSort, @@ -17,7 +17,7 @@ import { VariableRefresh, VariableSort, FieldColorModeId as FieldColorModeIdV2, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.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/v2schema/test-helpers.ts b/public/app/features/dashboard-scene/v2schema/test-helpers.ts index 9f901bf67e4..815762fdd31 100644 --- a/public/app/features/dashboard-scene/v2schema/test-helpers.ts +++ b/public/app/features/dashboard-scene/v2schema/test-helpers.ts @@ -10,7 +10,7 @@ import { SceneVariableState, VizPanel, } from '@grafana/scenes'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DashboardScene } from '../scene/DashboardScene'; import { LibraryPanelBehavior } from '../scene/LibraryPanelBehavior'; diff --git a/public/app/features/dashboard-scene/v2schema/transformers.test.ts b/public/app/features/dashboard-scene/v2schema/transformers.test.ts index 9612736dabc..cc6b4999746 100644 --- a/public/app/features/dashboard-scene/v2schema/transformers.test.ts +++ b/public/app/features/dashboard-scene/v2schema/transformers.test.ts @@ -1,8 +1,8 @@ import { config } from '@grafana/runtime'; import { CustomVariable, GroupByVariable } from '@grafana/scenes'; import { LibraryPanel } from '@grafana/schema'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; -import { handyTestingSchema } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0/examples'; +import { handyTestingSchema } from '@grafana/schema/dist/esm/schema/dashboard/v2_examples'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types'; import * as libpanels from 'app/features/library-panels/state/api'; diff --git a/public/app/features/dashboard/api/ResponseTransformers.test.ts b/public/app/features/dashboard/api/ResponseTransformers.test.ts index 02c81825be3..90b29fbb4fe 100644 --- a/public/app/features/dashboard/api/ResponseTransformers.test.ts +++ b/public/app/features/dashboard/api/ResponseTransformers.test.ts @@ -1,14 +1,14 @@ import { AnnotationQuery, DataQuery, VariableModel, VariableRefresh, Panel } from '@grafana/schema'; +import { handyTestingSchema } from '@grafana/schema/dist/esm/schema/dashboard/v2_examples'; import { - DashboardV2Spec, + Spec as DashboardV2Spec, GridLayoutItemKind, GridLayoutItemSpec, GridLayoutKind, GridLayoutRowSpec, PanelKind, VariableKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; -import { handyTestingSchema } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0/examples'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { AnnoKeyCreatedBy, AnnoKeyDashboardGnetId, diff --git a/public/app/features/dashboard/api/ResponseTransformers.ts b/public/app/features/dashboard/api/ResponseTransformers.ts index a7dde59ac8d..2727f0ca5ef 100644 --- a/public/app/features/dashboard/api/ResponseTransformers.ts +++ b/public/app/features/dashboard/api/ResponseTransformers.ts @@ -16,10 +16,10 @@ import { } from '@grafana/schema'; import { AnnotationQueryKind, - DashboardV2Spec, + Spec as DashboardV2Spec, DataLink, DatasourceVariableKind, - defaultDashboardV2Spec, + defaultSpec as defaultDashboardV2Spec, defaultFieldConfigSource, defaultTimeSettingsSpec, PanelQueryKind, @@ -39,7 +39,7 @@ import { PanelKind, GridLayoutRowKind, GridLayoutItemKind, -} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DashboardLink, DataTransformerConfig } from '@grafana/schema/src/raw/dashboard/x/dashboard_types.gen'; import { isWeekStart, WeekStart } from '@grafana/ui'; import { diff --git a/public/app/features/dashboard/api/UnifiedDashboardAPI.test.ts b/public/app/features/dashboard/api/UnifiedDashboardAPI.test.ts index ae39d55266b..238d21f74c8 100644 --- a/public/app/features/dashboard/api/UnifiedDashboardAPI.test.ts +++ b/public/app/features/dashboard/api/UnifiedDashboardAPI.test.ts @@ -1,5 +1,5 @@ import { Dashboard } from '@grafana/schema/dist/esm/index'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0/types.gen'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DashboardDTO } from 'app/types'; import { SaveDashboardCommand } from '../components/SaveDashboard/types'; diff --git a/public/app/features/dashboard/api/UnifiedDashboardAPI.ts b/public/app/features/dashboard/api/UnifiedDashboardAPI.ts index 7a0d811bc86..4b1af126dbc 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/dist/esm/index'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DashboardDTO } from 'app/types'; import { SaveDashboardCommand } from '../components/SaveDashboard/types'; diff --git a/public/app/features/dashboard/api/dashboard_api.ts b/public/app/features/dashboard/api/dashboard_api.ts index ec9bb2847b4..fb930516a0e 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 { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DashboardDTO } from 'app/types'; import { UnifiedDashboardAPI } from './UnifiedDashboardAPI'; diff --git a/public/app/features/dashboard/api/utils.ts b/public/app/features/dashboard/api/utils.ts index 67a2e73b089..9c0da73697a 100644 --- a/public/app/features/dashboard/api/utils.ts +++ b/public/app/features/dashboard/api/utils.ts @@ -1,6 +1,6 @@ import { config, locationService } from '@grafana/runtime'; import { Dashboard } from '@grafana/schema/dist/esm/index.gen'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DashboardDataDTO, DashboardDTO } from 'app/types'; import { SaveDashboardCommand } from '../components/SaveDashboard/types'; diff --git a/public/app/features/dashboard/api/v2.test.ts b/public/app/features/dashboard/api/v2.test.ts index 91bbad1b498..97e4b2527a5 100644 --- a/public/app/features/dashboard/api/v2.test.ts +++ b/public/app/features/dashboard/api/v2.test.ts @@ -1,4 +1,7 @@ -import { DashboardV2Spec, defaultDashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { + Spec as DashboardV2Spec, + defaultSpec as defaultDashboardV2Spec, +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { backendSrv } from 'app/core/services/backend_srv'; import { AnnoKeyFolder, diff --git a/public/app/features/dashboard/api/v2.ts b/public/app/features/dashboard/api/v2.ts index d00082914f3..c16a3da9a23 100644 --- a/public/app/features/dashboard/api/v2.ts +++ b/public/app/features/dashboard/api/v2.ts @@ -1,5 +1,5 @@ import { locationUtil } from '@grafana/data'; -import { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { backendSrv } from 'app/core/services/backend_srv'; import { getMessageFromError, getStatusFromError } from 'app/core/utils/errors'; import kbn from 'app/core/utils/kbn'; diff --git a/public/app/features/dashboard/services/DashboardLoaderSrv.ts b/public/app/features/dashboard/services/DashboardLoaderSrv.ts index 6148b42a193..97d47bbd055 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 { DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; 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/tracking.ts b/public/app/features/dashboard/utils/tracking.ts index d6b0d6c6c74..1bd574edb38 100644 --- a/public/app/features/dashboard/utils/tracking.ts +++ b/public/app/features/dashboard/utils/tracking.ts @@ -1,5 +1,5 @@ import { VariableModel } from '@grafana/schema/dist/esm/index'; -import { VariableKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { VariableKind } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { DashboardScene } from 'app/features/dashboard-scene/scene/DashboardScene'; import { DashboardInteractions } from 'app/features/dashboard-scene/utils/interactions'; diff --git a/public/app/features/manage-dashboards/utils/validation.test.ts b/public/app/features/manage-dashboards/utils/validation.test.ts index ca6ac6ad700..6acf9fe4a7f 100644 --- a/public/app/features/manage-dashboards/utils/validation.test.ts +++ b/public/app/features/manage-dashboards/utils/validation.test.ts @@ -1,4 +1,7 @@ -import { DashboardV2Spec, defaultDashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2alpha0'; +import { + Spec as DashboardV2Spec, + defaultSpec as defaultDashboardV2Spec, +} from '@grafana/schema/dist/esm/schema/dashboard/v2alpha1/types.spec.gen'; import { AnnoKeyFolder, AnnoKeyFolderTitle } from 'app/features/apiserver/types'; import { setDashboardAPI } from 'app/features/dashboard/api/dashboard_api'; import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types'; @@ -20,7 +23,7 @@ const legacyDashboard: DashboardDTO = { const v2Dashboard: DashboardWithAccessInfo = { kind: 'DashboardWithAccessInfo', - apiVersion: 'v2alpha0', + apiVersion: 'v2alpha1', metadata: { creationTimestamp: '2021-09-29T14:00:00Z', name: 'dashboard-uid',