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

Nested folders: Fix API response ordering when fetching subfolders (#67258)

Browse Source 
* Nested folders: Fix ordering when getting subfolders

* Update endpoint swagger description

* Modify test
This commit is contained in:
Sofia Papagiannaki
2023-04-27 17:24:47 +03:00
committed by GitHub
parent 7c5210a915
commit 893bf08dcf
5 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/folder/folderimpl/sqlstore.go
+2 -2
View File
@@ -239,10 +239,10 @@ func (ss *sqlStore) GetChildren(ctx context.Context, q folder.GetChildrenQuery)
sql := strings.Builder{}
args := make([]interface{}, 0, 2)
if q.UID == "" {
sql.Write([]byte("SELECT * FROM folder WHERE parent_uid IS NULL AND org_id=?"))
sql.Write([]byte("SELECT * FROM folder WHERE parent_uid IS NULL AND org_id=? ORDER BY title ASC"))
args = append(args, q.OrgID)
} else {
sql.Write([]byte("SELECT * FROM folder WHERE parent_uid=? AND org_id=?"))
sql.Write([]byte("SELECT * FROM folder WHERE parent_uid=? AND org_id=? ORDER BY title ASC"))
args = append(args, q.UID, q.OrgID)
}