opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 20:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Schema V2: Use App SDK generated types (#103100)

Browse Source 
* Use App SDK generated types

* Move examples

* Merge fix

* PAth updates
This commit is contained in:
Dominik Prokop
2025-04-02 16:22:24 +02:00
committed by GitHub
parent 3b73ebb210
commit 17d089d38a
56 changed files with 106 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/grafana-schema/src/schema/dashboard/v2alpha0/examples.ts → packages/grafana-schema/src/schema/dashboard/v2_examples.ts
View File

@ -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',

7
public/app/core/components/Select/DashboardPicker.test.tsx
View File

@ -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<DashboardV2Spec> = {
apiVersion: 'v2alpha0',
apiVersion: 'v2alpha1',
kind: 'DashboardWithAccessInfo',
spec: {
...defaultDashboardV2Spec(),

2
public/app/features/browse-dashboards/api/browseDashboardsAPI.ts
View File

@ -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';

2
public/app/features/dashboard-scene/conditional-rendering/ConditionalRendering.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingData.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingGroup.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingInterval.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/conditional-rendering/ConditionalRenderingVariable.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/conditional-rendering/serializers.ts
View File

@ -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';

5
public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts
View File

@ -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';

2
public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts
View File

@ -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';

2
public/app/features/dashboard-scene/saving/DetectChangesWorker.ts
View File

@ -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';

4
public/app/features/dashboard-scene/saving/getDashboardChanges.ts
View File

@ -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';

2
public/app/features/dashboard-scene/saving/shared.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/saving/useSaveDashboard.ts
View File

@ -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';

2
public/app/features/dashboard-scene/scene/DashboardScene.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/scene/layout-responsive-grid/ResponsiveGridLayoutManager.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx
View File

@ -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 {

2
public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx
View File

@ -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';

2
public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx
View File

@ -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 {

4
public/app/features/dashboard-scene/scene/layouts-shared/paste.ts
View File

@ -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';

2
public/app/features/dashboard-scene/scene/types/DashboardLayoutManager.ts
View File

@ -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';

6
public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts
View File

@ -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';

2
public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts
View File

@ -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';

8
public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts
View File

@ -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<DashboardV2Spec> = {
apiVersion: 'v2alpha0',
apiVersion: 'v2alpha1',
kind: 'DashboardWithAccessInfo',
spec: {
...defaultDashboardV2Spec(),

4
public/app/features/dashboard-scene/serialization/layoutSerializers/DefaultGridLayoutSerializer.ts
View File

@ -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';

4
public/app/features/dashboard-scene/serialization/layoutSerializers/ResponsiveGridLayoutSerializer.ts
View File

@ -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';

2
public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.test.ts
View File

@ -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';

5
public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.ts
View File

@ -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';

2
public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.test.ts
View File

@ -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';

5
public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts
View File

@ -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';

2
public/app/features/dashboard-scene/serialization/layoutSerializers/layoutSerializerRegistry.ts
View File

@ -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';

12
public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts
View File

@ -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),
};
}),
});
}

2
public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts
View File

@ -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';

6
public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts
View File

@ -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';

4
public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.ts
View File

@ -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,

4
public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.test.ts
View File

@ -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';

6
public/app/features/dashboard-scene/serialization/transformSceneToSaveModelSchemaV2.ts
View File

@ -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';

2
public/app/features/dashboard-scene/serialization/transformToV1TypesUtils.ts
View File

@ -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) {

2
public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.test.ts
View File

@ -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,

4
public/app/features/dashboard-scene/serialization/transformToV2TypesUtils.ts
View File

@ -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';

2
public/app/features/dashboard-scene/v2schema/test-helpers.ts
View File

@ -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';

4
public/app/features/dashboard-scene/v2schema/transformers.test.ts
View File

@ -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';

6
public/app/features/dashboard/api/ResponseTransformers.test.ts
View File

@ -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,

6
public/app/features/dashboard/api/ResponseTransformers.ts
View File

@ -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 {

2
public/app/features/dashboard/api/UnifiedDashboardAPI.test.ts
View File

@ -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';

2
public/app/features/dashboard/api/UnifiedDashboardAPI.ts
View File

@ -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';

2
public/app/features/dashboard/api/dashboard_api.ts
View File

@ -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';

2
public/app/features/dashboard/api/utils.ts
View File

@ -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';

5
public/app/features/dashboard/api/v2.test.ts
View File

@ -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,

2
public/app/features/dashboard/api/v2.ts
View File

@ -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';

2
public/app/features/dashboard/services/DashboardLoaderSrv.ts
View File

@ -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';

2
public/app/features/dashboard/utils/tracking.ts
View File

@ -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';

7
public/app/features/manage-dashboards/utils/validation.test.ts
View File

@ -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<DashboardV2Spec> = {
kind: 'DashboardWithAccessInfo',
apiVersion: 'v2alpha0',
apiVersion: 'v2alpha1',
metadata: {
creationTimestamp: '2021-09-29T14:00:00Z',
name: 'dashboard-uid',