From ef7693432d6de0c6239575ae50a87c9d101119cc Mon Sep 17 00:00:00 2001 From: idastambuk Date: Wed, 31 Dec 2025 09:59:55 +0100 Subject: [PATCH] Check that variable isnt null when initializing ds reference --- .../serialization/DashboardSceneSerializer.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts index 130c5450bf0..4531f718ed2 100644 --- a/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts +++ b/public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts @@ -345,10 +345,12 @@ export class V2DashboardSerializer // initialize autossigned variable ds references map if (saveModel?.variables) { for (const variable of saveModel.variables) { - // for query variables that dont have a ds defined add them to the list - if (variable.kind === 'QueryVariable' && !variable.spec.query.datasource?.name) { - const datasourceType = variable.spec.query.group || undefined; - this.defaultDsReferencesMap.variables.set(variable.spec.name, datasourceType); + if (variable) { + // for query variables that dont have a ds defined add them to the list + if (variable.kind === 'QueryVariable' && !variable.spec.query.datasource?.name) { + const datasourceType = variable.spec.query.group || undefined; + this.defaultDsReferencesMap.variables.set(variable.spec.name, datasourceType); + } } } }