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 FolderID in LibraryElementWithMeta (#77406)

Browse Source
This commit is contained in:
Kat Yang 2023-10-31 11:50:02 -04:00 committed by GitHub
parent 87717849da
commit f7ce6f8b41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/services/libraryelements/database.go
View File

@ -227,6 +227,7 @@ func (l *LibraryElementService) deleteLibraryElement(c context.Context, signedIn
if err != nil { if err != nil {
return err return err
} }
// nolint:staticcheck
if err := l.requireEditPermissionsOnFolder(c, signedInUser, element.FolderID); err != nil { if err := l.requireEditPermissionsOnFolder(c, signedInUser, element.FolderID); err != nil {
return err return err
} }
@ -314,7 +315,7 @@ func (l *LibraryElementService) getLibraryElements(c context.Context, store db.D
leDtos[i] = model.LibraryElementDTO{ leDtos[i] = model.LibraryElementDTO{
ID: libraryElement.ID, ID: libraryElement.ID,
OrgID: libraryElement.OrgID, OrgID: libraryElement.OrgID,
FolderID: libraryElement.FolderID, FolderID: libraryElement.FolderID, // nolint:staticcheck
FolderUID: libraryElement.FolderUID, FolderUID: libraryElement.FolderUID,
UID: libraryElement.UID, UID: libraryElement.UID,
Name: libraryElement.Name, Name: libraryElement.Name,
@ -436,7 +437,7 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
retDTOs = append(retDTOs, model.LibraryElementDTO{ retDTOs = append(retDTOs, model.LibraryElementDTO{
ID: element.ID, ID: element.ID,
OrgID: element.OrgID, OrgID: element.OrgID,
FolderID: element.FolderID, FolderID: element.FolderID, // nolint:staticcheck
FolderUID: element.FolderUID, FolderUID: element.FolderUID,
UID: element.UID, UID: element.UID,
Name: element.Name, Name: element.Name,
@ -593,6 +594,7 @@ func (l *LibraryElementService) patchLibraryElement(c context.Context, signedInU
if cmd.Model == nil { if cmd.Model == nil {
libraryElement.Model = elementInDB.Model libraryElement.Model = elementInDB.Model
} }
// nolint:staticcheck
if err := l.handleFolderIDPatches(c, &libraryElement, elementInDB.FolderID, cmd.FolderID, signedInUser); err != nil { if err := l.handleFolderIDPatches(c, &libraryElement, elementInDB.FolderID, cmd.FolderID, signedInUser); err != nil {
return err return err
} }
@ -711,7 +713,7 @@ func (l *LibraryElementService) getElementsForDashboardID(c context.Context, das
libraryElementMap[element.UID] = model.LibraryElementDTO{ libraryElementMap[element.UID] = model.LibraryElementDTO{
ID: element.ID, ID: element.ID,
OrgID: element.OrgID, OrgID: element.OrgID,
FolderID: element.FolderID, FolderID: element.FolderID, // nolint:staticcheck
UID: element.UID, UID: element.UID,
Name: element.Name, Name: element.Name,
Kind: element.Kind, Kind: element.Kind,
@ -757,6 +759,7 @@ func (l *LibraryElementService) connectElementsToDashboardID(c context.Context,
if err != nil { if err != nil {
return err return err
} }
// nolint:staticcheck
if err := l.requireViewPermissionsOnFolder(c, signedInUser, element.FolderID); err != nil { if err := l.requireViewPermissionsOnFolder(c, signedInUser, element.FolderID); err != nil {
return err return err
} }

5
pkg/services/libraryelements/model/model.go
View File

@ -40,8 +40,9 @@ type LibraryElement struct {
// LibraryElementWithMeta is the model used to retrieve entities with additional meta information. // LibraryElementWithMeta is the model used to retrieve entities with additional meta information.
type LibraryElementWithMeta struct { type LibraryElementWithMeta struct {
ID int64 `xorm:"pk autoincr 'id'"` ID int64 `xorm:"pk autoincr 'id'"`
OrgID int64 `xorm:"org_id"` OrgID int64 `xorm:"org_id"`
// Deprecated: use FolderUID instead
FolderID int64 `xorm:"folder_id"` FolderID int64 `xorm:"folder_id"`
UID string `xorm:"uid"` UID string `xorm:"uid"`
Name string Name string