From aa945c8e2acd415bf90160775ad15555af9af1c5 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Thu, 18 Dec 2025 09:23:41 +0300 Subject: [PATCH] always return a value --- pkg/services/dashboards/service/search/search.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/services/dashboards/service/search/search.go b/pkg/services/dashboards/service/search/search.go index e1ce9e9132d..839455d5a8a 100644 --- a/pkg/services/dashboards/service/search/search.go +++ b/pkg/services/dashboards/service/search/search.go @@ -8,6 +8,7 @@ import ( "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1" common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" "github.com/grafana/grafana/pkg/apimachinery/utils" + "github.com/grafana/grafana/pkg/services/folder" "github.com/grafana/grafana/pkg/storage/unified/resource" "github.com/grafana/grafana/pkg/storage/unified/resourcepb" ) @@ -151,6 +152,11 @@ func ParseResults(result *resourcepb.ResourceSearchResponse, offset int64) (v0al _, _ = binary.Decode(row.Cells[scoreIDX], binary.BigEndian, &hit.Score) } + // Ensure that dashboards+folders always have a folder property returned + if hit.Folder == "" { + hit.Folder = folder.GeneralFolderUID + } + sr.Hits[i] = *hit }