diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.tsx index d4ac35e827b..3b986d7d85e 100644 --- a/public/app/features/dashboard-scene/scene/DashboardScene.tsx +++ b/public/app/features/dashboard-scene/scene/DashboardScene.tsx @@ -858,7 +858,3 @@ export class DashboardVariableDependency implements SceneVariableDependencyConfi } } } - -export function isV2Dashboard(model: Dashboard | DashboardV2Spec): model is DashboardV2Spec { - return 'elements' in model; -} diff --git a/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx b/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx index bb72b9612fb..1d868125aa1 100644 --- a/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx +++ b/public/app/features/dashboard-scene/settings/JsonModelEditView.tsx @@ -10,6 +10,7 @@ import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboa 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'; +import { isDashboardV2Spec } from 'app/features/dashboard/api/utils'; import { getPrettyJSON } from 'app/features/inspector/utils/utils'; import { DashboardDataDTO, SaveDashboardResponseDTO } from 'app/types'; @@ -20,7 +21,7 @@ import { isVersionMismatchError, } from '../saving/shared'; import { useSaveDashboard } from '../saving/useSaveDashboard'; -import { DashboardScene, isV2Dashboard } from '../scene/DashboardScene'; +import { DashboardScene } from '../scene/DashboardScene'; import { NavToolbarActions } from '../scene/NavToolbarActions'; import { transformSaveModelSchemaV2ToScene } from '../serialization/transformSaveModelSchemaV2ToScene'; import { transformSaveModelToScene } from '../serialization/transformSaveModelToScene'; @@ -66,7 +67,7 @@ export class JsonModelEditView extends SceneObjectBase i const jsonModel: DashboardDataDTO | DashboardV2Spec = JSON.parse(this.state.jsonText); const dashboard = this.getDashboard(); - const isV2 = isV2Dashboard(jsonModel); + const isV2 = isDashboardV2Spec(jsonModel); let newDashboardScene: DashboardScene; if (isV2) {