opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 04:19:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Folders: Fix folder pagination for cloud instances with many folders (#90008)

Browse Source 
* filter the k6 folder out in the SQL queries rather than during post processing to ensure that the correct number of results is always returned

* linting
This commit is contained in:
Ieva
2024-07-05 11:19:03 +01:00
committed by GitHub
parent 4f06568f8a
commit e9ebb6eaa4
7 changed files with 95 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
pkg/services/folder/folderimpl/sqlstore_test.go
View File

@ -14,11 +14,13 @@ import (
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/folder"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/org/orgimpl"
"github.com/grafana/grafana/pkg/services/quota/quotatest"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
@ -731,6 +733,68 @@ func TestIntegrationGetChildren(t *testing.T) {
t.Errorf("Result mismatch (-want +got):\n%s", diff)
}
})
t.Run("should hide k6-app folder for users but not for service accounts", func(t *testing.T) {
_, err = folderStore.Create(context.Background(), folder.CreateFolderCommand{
Title: "k6-app-folder",
OrgID: orgID,
UID: accesscontrol.K6FolderUID,
})
require.NoError(t, err)
children, err := folderStore.GetChildren(context.Background(), folder.GetChildrenQuery{
OrgID: orgID,
SignedInUser: usr,
})
require.NoError(t, err)
require.Equal(t, 1, len(children))
assert.Equal(t, parent.UID, children[0].UID)
// Service account should be able to list k6 folder
children, err = folderStore.GetChildren(context.Background(), folder.GetChildrenQuery{
OrgID: orgID,
SignedInUser: &user.SignedInUser{UserID: 2, OrgID: orgID, IsServiceAccount: true},
})
require.NoError(t, err)
require.Equal(t, 2, len(children))
childrenUIDs := make([]string, 0, len(children))
for _, child := range children {
childrenUIDs = append(childrenUIDs, child.UID)
}
assert.EqualValues(t, []string{parent.UID, accesscontrol.K6FolderUID}, childrenUIDs)
})
t.Run("pagination works if k6-app folder is hidden", func(t *testing.T) {
for i := 0; i < 4; i++ {
_, err = folderStore.Create(context.Background(), folder.CreateFolderCommand{
Title: fmt.Sprintf("root-%d", i),
OrgID: orgID,
UID: fmt.Sprintf("root-%d", i),
})
require.NoError(t, err)
}
// Should skip k6-app folder but get parent folder and two more folders
children, err := folderStore.GetChildren(context.Background(), folder.GetChildrenQuery{
OrgID: orgID,
SignedInUser: usr,
Limit: 3,
})
require.NoError(t, err)
require.Equal(t, 3, len(children))
assert.EqualValues(t, []string{parent.UID, "root-0", "root-1"}, []string{children[0].UID, children[1].UID, children[2].UID})
// Should get the two remaining folders
children, err = folderStore.GetChildren(context.Background(), folder.GetChildrenQuery{
OrgID: orgID,
SignedInUser: usr,
Page: 2,
Limit: 3,
})
require.NoError(t, err)
require.Equal(t, 2, len(children))
assert.EqualValues(t, []string{"root-2", "root-3"}, []string{children[0].UID, children[1].UID})
})
}
func TestIntegrationGetHeight(t *testing.T) {