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: Remove Result from dashboard models (#61997)

Browse Source 
* Chore: Remove Result from dashboard models

* Fix lint tests

* Fix dashboard service tests

* Fix API tests

* Remove commented out code

* Chore: Merge main - cleanup
This commit is contained in:
idafurjes
2023-01-25 10:36:26 +01:00
committed by GitHub
parent 8c3e4487ba
commit b54b80f473
49 changed files with 625 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/services/guardian/accesscontrol_guardian.go
View File

@@ -37,13 +37,14 @@ func NewAccessControlDashboardGuardian(
OrgID: user.OrgID,
}
if err := dashboardService.GetDashboard(ctx, q); err != nil {
qResult, err := dashboardService.GetDashboard(ctx, q)
if err != nil {
if errors.Is(err, dashboards.ErrDashboardNotFound) {
return nil, ErrGuardianDashboardNotFound.Errorf("failed to get dashboard by UID: %w", err)
}
return nil, ErrGuardianGetDashboardFailure.Errorf("failed to get dashboard by UID: %w", err)
}
dashboard = q.Result
dashboard = qResult
}
return &AccessControlDashboardGuardian{
@@ -74,13 +75,14 @@ func NewAccessControlDashboardGuardianByUID(
OrgID: user.OrgID,
}
if err := dashboardService.GetDashboard(ctx, q); err != nil {
qResult, err := dashboardService.GetDashboard(ctx, q)
if err != nil {
if errors.Is(err, dashboards.ErrDashboardNotFound) {
return nil, ErrGuardianDashboardNotFound.Errorf("failed to get dashboard by UID: %w", err)
}
return nil, ErrGuardianGetDashboardFailure.Errorf("failed to get dashboard by UID: %w", err)
}
dashboard = q.Result
dashboard = qResult
}
return &AccessControlDashboardGuardian{
@@ -337,8 +339,9 @@ func (a *AccessControlDashboardGuardian) loadParentFolder(folderID int64) (*dash
return &dashboards.Dashboard{UID: accesscontrol.GeneralFolderUID}, nil
}
folderQuery := &dashboards.GetDashboardQuery{ID: folderID, OrgID: a.user.OrgID}
if err := a.dashboardService.GetDashboard(a.ctx, folderQuery); err != nil {
folderQueryResult, err := a.dashboardService.GetDashboard(a.ctx, folderQuery)
if err != nil {
return nil, err
}
return folderQuery.Result, nil
return folderQueryResult, nil
}