K8s: Folders: Remove unneeded parent calls (#103036)

pull/103049/head
Stephanie Hingtgen 2 months ago committed by GitHub
parent ac30bd432a
commit 5fa9f2b425
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 15
      pkg/services/folder/folderimpl/folder_unifiedstorage.go
  2. 9
      pkg/services/folder/folderimpl/folder_unifiedstorage_test.go

@ -216,20 +216,7 @@ 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),
@ -240,8 +227,6 @@ func (s *Service) searchFoldersFromApiServer(ctx context.Context, query folder.S
URL: dashboards.GetFolderURL(item.Name, slug),
Type: model.DashHitFolder,
FolderUID: item.Folder,
FolderTitle: f.Title,
FolderID: f.ID, // nolint:staticcheck
}
}

@ -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
@ -615,8 +612,6 @@ func TestSearchFoldersFromApiServer(t *testing.T) {
},
{
UID: "uid2",
FolderID: 0,
FolderTitle: "General",
OrgID: 1,
Type: model.DashHitFolder,
URI: "db/folder1",
@ -682,8 +677,6 @@ func TestSearchFoldersFromApiServer(t *testing.T) {
expectedResult := model.HitList{
{
UID: "foo",
FolderID: 0,
FolderTitle: "General",
OrgID: 1,
Type: model.DashHitFolder,
URI: "db/folder1",
@ -754,8 +747,6 @@ func TestSearchFoldersFromApiServer(t *testing.T) {
expectedResult := model.HitList{
{
UID: "uid",
FolderID: 2,
FolderTitle: "parent title",
FolderUID: "parent-uid",
OrgID: 1,
Type: model.DashHitFolder,

Loading…
Cancel
Save