IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Deprecate folderIDs in FolderFilter (#77590)

Browse Source 
Chore: Deprecate FolderID in FolderFilter
This commit is contained in:
Kat Yang 2023-11-03 10:12:40 -04:00 committed by GitHub
parent 225a69ba02
commit f40de8b613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/services/libraryelements/writers.go
View File

@ -72,9 +72,10 @@ func writeExcludeSQL(query model.SearchLibraryElementsQuery, builder *db.SQLBuil
type FolderFilter struct {
includeGeneralFolder bool
folderIDs []string
folderUIDs []string
parseError error
// Deprecated: use FolderUID instead
folderIDs []string
folderUIDs []string
parseError error
}
func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter {
@ -85,7 +86,7 @@ func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter {
result := FolderFilter{
includeGeneralFolder: true,
folderIDs: folderIDs,
folderIDs: folderIDs, // nolint:staticcheck
folderUIDs: folderUIDs,
parseError: nil,
}
@ -98,6 +99,7 @@ func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter {
if hasFolderFilter {
result.includeGeneralFolder = false
folderIDs = strings.Split(query.FolderFilter, ",")
// nolint:staticcheck
result.folderIDs = folderIDs
for _, filter := range folderIDs {
folderID, err := strconv.ParseInt(filter, 10, 64)
@ -130,6 +132,7 @@ func parseFolderFilter(query model.SearchLibraryElementsQuery) FolderFilter {
func (f *FolderFilter) writeFolderFilterSQL(includeGeneral bool, builder *db.SQLBuilder) error {
var sql bytes.Buffer
params := make([]any, 0)
// nolint:staticcheck
for _, filter := range f.folderIDs {
folderID, err := strconv.ParseInt(filter, 10, 64)
if err != nil {