From 5fa9f2b4250bc900bef35e6583f1a569020b865b Mon Sep 17 00:00:00 2001
From: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
Date: Fri, 28 Mar 2025 05:36:47 -0600
Subject: [PATCH] K8s: Folders: Remove unneeded parent calls (#103036)

---
 .../folderimpl/folder_unifiedstorage.go       | 31 ++++--------
 .../folderimpl/folder_unifiedstorage_test.go  | 47 ++++++++-----------
 2 files changed, 27 insertions(+), 51 deletions(-)

diff --git a/pkg/services/folder/folderimpl/folder_unifiedstorage.go b/pkg/services/folder/folderimpl/folder_unifiedstorage.go
index b121415ed0e..1810bf97e3f 100644
--- a/pkg/services/folder/folderimpl/folder_unifiedstorage.go
+++ b/pkg/services/folder/folderimpl/folder_unifiedstorage.go
@@ -216,32 +216,17 @@ func (s *Service) searchFoldersFromApiServer(ctx context.Context, query folder.S
 	}
 
 	hitList := make([]*model.Hit, len(parsedResults.Hits))
-	foldersMap := map[string]*folder.Folder{}
 	for i, item := range parsedResults.Hits {
-		f, ok := foldersMap[item.Folder]
-		if !ok {
-			f, err = s.Get(ctx, &folder.GetFolderQuery{
-				UID:          &item.Folder,
-				OrgID:        query.OrgID,
-				SignedInUser: query.SignedInUser,
-			})
-			if err != nil {
-				return nil, err
-			}
-			foldersMap[item.Folder] = f
-		}
 		slug := slugify.Slugify(item.Title)
 		hitList[i] = &model.Hit{
-			ID:          item.Field.GetNestedInt64(search.DASHBOARD_LEGACY_ID),
-			UID:         item.Name,
-			OrgID:       query.OrgID,
-			Title:       item.Title,
-			URI:         "db/" + slug,
-			URL:         dashboards.GetFolderURL(item.Name, slug),
-			Type:        model.DashHitFolder,
-			FolderUID:   item.Folder,
-			FolderTitle: f.Title,
-			FolderID:    f.ID, // nolint:staticcheck
+			ID:        item.Field.GetNestedInt64(search.DASHBOARD_LEGACY_ID),
+			UID:       item.Name,
+			OrgID:     query.OrgID,
+			Title:     item.Title,
+			URI:       "db/" + slug,
+			URL:       dashboards.GetFolderURL(item.Name, slug),
+			Type:      model.DashHitFolder,
+			FolderUID: item.Folder,
 		}
 	}
 
diff --git a/pkg/services/folder/folderimpl/folder_unifiedstorage_test.go b/pkg/services/folder/folderimpl/folder_unifiedstorage_test.go
index c1667684dc9..d6d2c16700c 100644
--- a/pkg/services/folder/folderimpl/folder_unifiedstorage_test.go
+++ b/pkg/services/folder/folderimpl/folder_unifiedstorage_test.go
@@ -602,9 +602,6 @@ func TestSearchFoldersFromApiServer(t *testing.T) {
 		expectedResult := model.HitList{
 			{
 				UID: "uid1",
-				// no parent folder is returned, so the general folder should be set
-				FolderID:    0,
-				FolderTitle: "General",
 				// orgID should be taken from signed in user
 				OrgID: 1,
 				// the rest should be automatically set when parsing the hit results from search
@@ -614,14 +611,12 @@ func TestSearchFoldersFromApiServer(t *testing.T) {
 				URL:   "/dashboards/f/uid1/folder0",
 			},
 			{
-				UID:         "uid2",
-				FolderID:    0,
-				FolderTitle: "General",
-				OrgID:       1,
-				Type:        model.DashHitFolder,
-				URI:         "db/folder1",
-				Title:       "folder1",
-				URL:         "/dashboards/f/uid2/folder1",
+				UID:   "uid2",
+				OrgID: 1,
+				Type:  model.DashHitFolder,
+				URI:   "db/folder1",
+				Title: "folder1",
+				URL:   "/dashboards/f/uid2/folder1",
 			},
 		}
 		require.Equal(t, expectedResult, result)
@@ -681,14 +676,12 @@ func TestSearchFoldersFromApiServer(t *testing.T) {
 		require.NoError(t, err)
 		expectedResult := model.HitList{
 			{
-				UID:         "foo",
-				FolderID:    0,
-				FolderTitle: "General",
-				OrgID:       1,
-				Type:        model.DashHitFolder,
-				URI:         "db/folder1",
-				Title:       "folder1",
-				URL:         "/dashboards/f/foo/folder1",
+				UID:   "foo",
+				OrgID: 1,
+				Type:  model.DashHitFolder,
+				URI:   "db/folder1",
+				Title: "folder1",
+				URL:   "/dashboards/f/foo/folder1",
 			},
 		}
 		require.Equal(t, expectedResult, result)
@@ -753,15 +746,13 @@ func TestSearchFoldersFromApiServer(t *testing.T) {
 
 		expectedResult := model.HitList{
 			{
-				UID:         "uid",
-				FolderID:    2,
-				FolderTitle: "parent title",
-				FolderUID:   "parent-uid",
-				OrgID:       1,
-				Type:        model.DashHitFolder,
-				URI:         "db/testing-123",
-				Title:       "testing-123",
-				URL:         "/dashboards/f/uid/testing-123",
+				UID:       "uid",
+				FolderUID: "parent-uid",
+				OrgID:     1,
+				Type:      model.DashHitFolder,
+				URI:       "db/testing-123",
+				Title:     "testing-123",
+				URL:       "/dashboards/f/uid/testing-123",
 			},
 		}
 		require.Equal(t, expectedResult, result)