From 2bce8c5e29506bd5742c04f51f44d4c38125c7f0 Mon Sep 17 00:00:00 2001 From: "Arati R." <33031346+suntala@users.noreply.github.com> Date: Fri, 17 Jan 2025 16:04:11 +0100 Subject: [PATCH] Folders: Use folder UID instead of folder ID in query for getting library elements (#99028) --- pkg/services/libraryelements/database.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/services/libraryelements/database.go b/pkg/services/libraryelements/database.go index c56432f912f..046fbe2291d 100644 --- a/pkg/services/libraryelements/database.go +++ b/pkg/services/libraryelements/database.go @@ -725,10 +725,7 @@ func (l *LibraryElementService) getElementsForDashboardID(c context.Context, das err := l.SQLStore.WithDbSession(c, func(session *db.Session) error { var libraryElements []model.LibraryElementWithMeta sql := selectLibraryElementDTOWithMeta + - ", coalesce(dashboard.title, 'General') AS folder_name" + - ", coalesce(dashboard.uid, '') AS folder_uid" + getFromLibraryElementDTOWithMeta(l.SQLStore.GetDialect()) + - " LEFT JOIN dashboard AS dashboard ON dashboard.id = le.folder_id" + " INNER JOIN " + model.LibraryElementConnectionTableName + " AS lce ON lce.element_id = le.id AND lce.kind=1 AND lce.connection_id=?" sess := session.SQL(sql, dashboardID) err := sess.Find(&libraryElements) @@ -738,6 +735,13 @@ func (l *LibraryElementService) getElementsForDashboardID(c context.Context, das metrics.MFolderIDsServiceCount.WithLabelValues(metrics.LibraryElements).Inc() for _, element := range libraryElements { + if element.FolderName == "" { + element.FolderName = dashboards.RootFolderName + } + if element.FolderUID == "" { + element.FolderUID = ac.GeneralFolderUID + } + libraryElementMap[element.UID] = model.LibraryElementDTO{ ID: element.ID, OrgID: element.OrgID,