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

Nested folders: Fix move (#65526)

Browse Source 
* Nested Folders: Fix move response

Fix JSON tags to be consistent with the GET endpoint

* Add API test for moving to root folder

* Allow move to root folder

* Fix failure message

* Update OpenAPI specification
This commit is contained in:
Sofia Papagiannaki
2023-03-30 11:46:11 +03:00
committed by GitHub
parent fc16fb0407
commit c65cd5833a
6 changed files with 506 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/folder/folderimpl/sqlstore.go
+3
View File
@@ -182,6 +182,9 @@ func (ss *sqlStore) Get(ctx context.Context, q folder.GetFolderQuery) (*folder.F
}
func (ss *sqlStore) GetParents(ctx context.Context, q folder.GetParentsQuery) ([]*folder.Folder, error) {
if q.UID == "" {
return []*folder.Folder{}, nil
}
var folders []*folder.Folder
recQuery := `
pkg/services/folder/folderimpl/sqlstore_test.go
+4 -3
View File
@@ -390,9 +390,10 @@ func TestIntegrationGetParents(t *testing.T) {
require.NoError(t, err)
})
t.Run("get parents of unknown folder should return an error", func(t *testing.T) {
_, err := folderStore.GetParents(context.Background(), folder.GetParentsQuery{})
require.ErrorIs(t, err, folder.ErrFolderNotFound)
t.Run("get parents of root folder should should be empty", func(t *testing.T) {
parents, err := folderStore.GetParents(context.Background(), folder.GetParentsQuery{})
require.NoError(t, err)
require.Empty(t, parents)
})
t.Run("get parents of 1-st level folder should be empty", func(t *testing.T) {