Chore: Drop search service dependency from folder service (#61789)

* Chore: Drop search service dependency from folder service

pkg/services/folder/folderimpl/folder.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/services/org"
-	"github.com/grafana/grafana/pkg/services/search"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -34,7 +33,6 @@ type Service struct {
 	cfg                  *setting.Cfg
 	dashboardStore       dashboards.Store
 	dashboardFolderStore dashboards.FolderStore
-	searchService        *search.SearchService
 	features             featuremgmt.FeatureToggles
 	permissions          accesscontrol.FolderPermissionsService
 	accessControl        accesscontrol.AccessControl
@@ -52,7 +50,6 @@ func ProvideService(
 	db db.DB, // DB for the (new) nested folder store
 	features featuremgmt.FeatureToggles,
 	folderPermissionsService accesscontrol.FolderPermissionsService,
-	searchService *search.SearchService,
 ) folder.Service {
 	ac.RegisterScopeAttributeResolver(dashboards.NewFolderNameScopeResolver(dashboardStore, folderStore))
 	ac.RegisterScopeAttributeResolver(dashboards.NewFolderIDScopeResolver(dashboardStore, folderStore))
@@ -63,7 +60,6 @@ func ProvideService(
 		dashboardStore:       dashboardStore,
 		dashboardFolderStore: folderStore,
 		store:                store,
-		searchService:        searchService,
 		features:             features,
 		permissions:          folderPermissionsService,
 		accessControl:        ac,
@@ -160,62 +156,33 @@ func (s *Service) GetChildren(ctx context.Context, cmd *folder.GetChildrenQuery)
 		return nil, folder.ErrBadRequest.Errorf("missing signed in user")
 	}
 
-	if s.features.IsEnabled(featuremgmt.FlagNestedFolders) {
-		children, err := s.store.GetChildren(ctx, *cmd)
-		if err != nil {
-			return nil, err
-		}
-
-		filtered := make([]*folder.Folder, 0, len(children))
-		for _, f := range children {
-			// fetch folder from dashboard store
-			dashFolder, err := s.dashboardFolderStore.GetFolderByUID(ctx, f.OrgID, f.UID)
-			if err != nil {
-				s.log.Error("failed to fetch folder by UID: %s from dashboard store", f.UID, err)
-				continue
-			}
-
-			g, err := guardian.New(ctx, f.ID, f.OrgID, cmd.SignedInUser)
-			if err != nil {
-				return nil, err
-			}
-			canView, err := g.CanView()
-			if err != nil || canView {
-				// always expose the dashboard store sequential ID
-				f.ID = dashFolder.ID
-				filtered = append(filtered, f)
-			}
-		}
-
-		return filtered, nil
-	}
-
-	searchQuery := search.Query{
-		SignedInUser: cmd.SignedInUser,
-		DashboardIds: make([]int64, 0),
-		FolderIds:    make([]int64, 0),
-		Limit:        cmd.Limit,
-		OrgId:        cmd.OrgID,
-		Type:         "dash-folder",
-		Permission:   models.PERMISSION_VIEW,
-		Page:         cmd.Page,
-	}
-
-	if err := s.searchService.SearchHandler(ctx, &searchQuery); err != nil {
+	children, err := s.store.GetChildren(ctx, *cmd)
+	if err != nil {
 		return nil, err
 	}
 
-	folders := make([]*folder.Folder, 0)
+	filtered := make([]*folder.Folder, 0, len(children))
+	for _, f := range children {
+		// fetch folder from dashboard store
+		dashFolder, err := s.dashboardFolderStore.GetFolderByUID(ctx, f.OrgID, f.UID)
+		if err != nil {
+			s.log.Error("failed to fetch folder by UID: %s from dashboard store", f.UID, err)
+			continue
+		}
 
-	for _, hit := range searchQuery.Result {
-		folders = append(folders, &folder.Folder{
-			ID:    hit.ID,
-			UID:   hit.UID,
-			Title: hit.Title,
-		})
+		g, err := guardian.New(ctx, f.ID, f.OrgID, cmd.SignedInUser)
+		if err != nil {
+			return nil, err
+		}
+		canView, err := g.CanView()
+		if err != nil || canView {
+			// always expose the dashboard store sequential ID
+			f.ID = dashFolder.ID
+			filtered = append(filtered, f)
+		}
 	}
 
-	return folders, nil
+	return filtered, nil
 }
 
 func (s *Service) getFolderByID(ctx context.Context, user *user.SignedInUser, id int64, orgID int64) (*folder.Folder, error) {

pkg/services/folder/folderimpl/folder_test.go

@@ -38,7 +38,7 @@ func TestIntegrationProvideFolderService(t *testing.T) {
 	t.Run("should register scope resolvers", func(t *testing.T) {
 		cfg := setting.NewCfg()
 		ac := acmock.New()
-		ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, nil, nil, nil, &featuremgmt.FeatureManager{}, nil, nil)
+		ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, nil, nil, nil, &featuremgmt.FeatureManager{}, nil)
 
 		require.Len(t, ac.Calls.RegisterAttributeScopeResolver, 2)
 	})
@@ -66,7 +66,6 @@ func TestIntegrationFolderService(t *testing.T) {
 			dashboardStore:       dashStore,
 			dashboardFolderStore: folderStore,
 			store:                nestedFolderStore,
-			searchService:        nil,
 			features:             features,
 			permissions:          folderPermissions,
 			bus:                  bus.ProvideBus(tracing.InitializeTracerForTest()),