From 759e3ec4fa6e0271fe4dc2e4e0539aa33c0e2485 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Mon, 13 Jun 2022 16:43:42 +0100 Subject: [PATCH] Never set gridPos to null (#50400) --- pkg/services/librarypanels/librarypanels.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkg/services/librarypanels/librarypanels.go b/pkg/services/librarypanels/librarypanels.go index 95ec44e4b1d..65572164016 100644 --- a/pkg/services/librarypanels/librarypanels.go +++ b/pkg/services/librarypanels/librarypanels.go @@ -82,7 +82,12 @@ func loadLibraryPanelsRecursively(elements map[string]libraryelements.LibraryEle elementInDB, ok := elements[UID] if !ok { elem := parent.Get("panels").GetIndex(i) - elem.Set("gridPos", panelAsJSON.Get("gridPos").MustMap()) + gridPos := panelAsJSON.Get("gridPos").MustMap() + if gridPos == nil { + elem.Del("gridPos") + } else { + elem.Set("gridPos", gridPos) + } elem.Set("id", panelAsJSON.Get("id").MustInt64()) elem.Set("type", fmt.Sprintf("Library panel with UID: \"%s\"", UID)) elem.Set("libraryPanel", map[string]interface{}{ @@ -111,7 +116,12 @@ func loadLibraryPanelsRecursively(elements map[string]libraryelements.LibraryEle // set dashboard specific props elem := parent.Get("panels").GetIndex(i) - elem.Set("gridPos", panelAsJSON.Get("gridPos").MustMap()) + gridPos := panelAsJSON.Get("gridPos").MustMap() + if gridPos == nil { + elem.Del("gridPos") + } else { + elem.Set("gridPos", gridPos) + } elem.Set("id", panelAsJSON.Get("id").MustInt64()) elem.Set("libraryPanel", map[string]interface{}{ "uid": elementInDB.UID,