From 7ec202cced98424ca7913179b79a837f994fa435 Mon Sep 17 00:00:00 2001 From: Ivan Ortega Date: Wed, 17 Dec 2025 20:26:39 +0100 Subject: [PATCH] Rename serializerVersion --- .../pages/DashboardScenePageStateManager.ts | 2 +- .../dashboard-scene/saving/DashboardPrompt.test.tsx | 4 ++-- .../app/features/dashboard-scene/scene/DashboardScene.tsx | 5 ++--- .../serialization/transformSaveModelToScene.ts | 8 ++++---- .../features/dashboard-scene/sharing/ShareExportTab.tsx | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts index d14bfc989b6..acb3d67d2bf 100644 --- a/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts +++ b/public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts @@ -85,7 +85,7 @@ export interface LoadDashboardOptions { slug?: string; type?: string; urlFolderUid?: string; - serializerVersion?: 'v1' | 'v2'; + targetVersion?: 'v1' | 'v2'; } export type HomeDashboardDTO = DashboardDTO & { diff --git a/public/app/features/dashboard-scene/saving/DashboardPrompt.test.tsx b/public/app/features/dashboard-scene/saving/DashboardPrompt.test.tsx index d86f8309b31..1d839c6d438 100644 --- a/public/app/features/dashboard-scene/saving/DashboardPrompt.test.tsx +++ b/public/app/features/dashboard-scene/saving/DashboardPrompt.test.tsx @@ -420,7 +420,7 @@ describe('DashboardPrompt', () => { }); }); -function buildTestScene(overrides?: Partial, serializerVersion: 'v1' | 'v2' = 'v1') { +function buildTestScene(overrides?: Partial, targetVersion: 'v1' | 'v2' = 'v1') { const defaultPanels = [ new VizPanel({ title: 'Panel A', @@ -445,7 +445,7 @@ function buildTestScene(overrides?: Partial, serializerVers body: DefaultGridLayoutManager.fromVizPanels(defaultPanels), ...overrides, }, - serializerVersion + targetVersion ); return scene; diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.tsx index 82a20dbcd52..d8c88718039 100644 --- a/public/app/features/dashboard-scene/scene/DashboardScene.tsx +++ b/public/app/features/dashboard-scene/scene/DashboardScene.tsx @@ -192,7 +192,7 @@ export class DashboardScene extends SceneObjectBase impleme DashboardJson | DashboardV2Spec >; - public constructor(state: Partial, serializerVersion: 'v1' | 'v2' = 'v1') { + public constructor(state: Partial, targetVersion: 'v1' | 'v2' = 'v1') { super({ title: t('dashboard-scene.dashboard-scene.title.dashboard', 'Dashboard'), meta: {}, @@ -205,8 +205,7 @@ export class DashboardScene extends SceneObjectBase impleme layoutOrchestrator: new DashboardLayoutOrchestrator(), }); - this.serializer = - serializerVersion === 'v2' ? getDashboardSceneSerializer('v2') : getDashboardSceneSerializer('v1'); + this.serializer = targetVersion === 'v2' ? getDashboardSceneSerializer('v2') : getDashboardSceneSerializer('v1'); this._changeTracker = new DashboardSceneChangeTracker(this); diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts index cd60431753c..049827505d4 100644 --- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts +++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts @@ -266,8 +266,8 @@ export function createDashboardSceneFromDashboardModel( let alertStatesLayer: AlertStatesDataLayer | undefined; const uid = oldModel.uid; const isReport = options?.route === DashboardRoutes.Report; - const serializerVersion = - options?.serializerVersion ?? (shouldForceV2API() && !oldModel.meta.isSnapshot && !isReport ? 'v2' : 'v1'); + const targetVersion = + options?.targetVersion ?? (shouldForceV2API() && !oldModel.meta.isSnapshot && !isReport ? 'v2' : 'v1'); if (oldModel.meta.isSnapshot) { variables = createVariablesForSnapshot(oldModel); @@ -355,7 +355,7 @@ export function createDashboardSceneFromDashboardModel( let body: DashboardLayoutManager; - if (serializerVersion === 'v2' && oldModel.panels.some((p) => p.type === 'row')) { + if (targetVersion === 'v2' && oldModel.panels.some((p) => p.type === 'row')) { body = createRowsFromPanels(oldModel.panels); } else { body = new DefaultGridLayoutManager({ @@ -405,7 +405,7 @@ export function createDashboardSceneFromDashboardModel( hideTimeControls: oldModel.timepicker.hidden, }), }, - serializerVersion + targetVersion ); // Enable panel profiling for this dashboard using the composed SceneRenderProfiler diff --git a/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx b/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx index 14ba196aff7..ce50611b754 100644 --- a/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx +++ b/public/app/features/dashboard-scene/sharing/ShareExportTab.tsx @@ -227,7 +227,7 @@ export class ShareExportTab extends SceneObjectBase impleme dashboard: { ...v1SaveModel, title: v1SaveModel.title ?? '', uid: v1SaveModel.uid ?? '' }, meta: scene.state.meta, }, - { uid: scene.state.uid ?? '', route: DashboardRoutes.Normal, serializerVersion: 'v2' } + { uid: scene.state.uid ?? '', route: DashboardRoutes.Normal, targetVersion: 'v2' } ); }