public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apiserver/folders: use exact match on GetFolderByTitle in legacy (#106867)

Browse Source 
* apiserver/folders: use exact match on GetFolderByTitle in legacy

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>


---------

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
This commit is contained in:
maicon
2025-06-24 17:42:08 -03:00
committed by GitHub
parent 988d889ba7
commit 8a05378ef3
9 changed files with 150 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/dashboards/database/database_test.go
+39 -10
View File
@@ -888,25 +888,47 @@ func TestIntegrationFindDashboardsByTitle(t *testing.T) {
}
testCases := []struct {
desc string
title string
expectedResult res
typ string
desc string
title string
titleExactMatch bool
expectedResult *res
typ string
}{
{
desc: "find dashboard under general",
title: "dashboard under general",
expectedResult: res{title: "dashboard under general"},
expectedResult: &res{title: "dashboard under general"},
},
{
desc: "find dashboard under f0",
title: "dashboard under f0",
expectedResult: res{title: "dashboard under f0", folderUID: f0.UID, folderTitle: f0.Title},
expectedResult: &res{title: "dashboard under f0", folderUID: f0.UID, folderTitle: f0.Title},
},
{
desc: "find dashboard under subfolder",
title: "dashboard under subfolder",
expectedResult: res{title: "dashboard under subfolder", folderUID: subfolder.UID, folderTitle: subfolder.Title},
expectedResult: &res{title: "dashboard under subfolder", folderUID: subfolder.UID, folderTitle: subfolder.Title},
},
{
desc: "find folder 'sub' using partial match: 1 result found",
title: "sub",
titleExactMatch: false,
typ: "dash-folder",
expectedResult: &res{title: "subfolder", folderUID: f0.UID, folderTitle: f0.Title},
},
{
desc: "find folder 'sub' using exact match: no results",
title: "sub",
titleExactMatch: true,
typ: "dash-folder",
expectedResult: nil,
},
{
desc: "find folder 'subfolder' using exact match: 1 result",
title: "subfolder",
titleExactMatch: true,
typ: "dash-folder",
expectedResult: &res{title: "subfolder", folderUID: f0.UID, folderTitle: f0.Title},
},
}
@@ -915,11 +937,18 @@ func TestIntegrationFindDashboardsByTitle(t *testing.T) {
dashboardStore, err := ProvideDashboardStore(sqlStore, cfg, features, tagimpl.ProvideService(sqlStore))
require.NoError(t, err)
res, err := dashboardStore.FindDashboards(context.Background(), &dashboards.FindPersistedDashboardsQuery{
SignedInUser: user,
Type: tc.typ,
Title: tc.title,
SignedInUser: user,
Type: tc.typ,
Title: tc.title,
TitleExactMatch: tc.titleExactMatch,
})
require.NoError(t, err)
if tc.expectedResult == nil {
require.Equal(t, 0, len(res))
return
}
require.Equal(t, 1, len(res))
r := tc.expectedResult