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: Add context dashboard version (#41672)

Browse Source 
* Add context dashboard version

* Fix codeql
This commit is contained in:
idafurjes
2021-11-17 10:57:37 +01:00
committed by GitHub
parent bc60ae3c66
commit bb01f8c4cf
6 changed files with 74 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/components/dashdiffs/compare.go
View File

@@ -1,6 +1,7 @@
package dashdiffs
import (
"context"
"encoding/json"
"errors"
@@ -57,14 +58,14 @@ func ParseDiffType(diff string) DiffType {
// CompareDashboardVersionsCommand computes the JSON diff of two versions,
// assigning the delta of the diff to the `Delta` field.
func CalculateDiff(options *Options) (*Result, error) {
func CalculateDiff(ctx context.Context, options *Options) (*Result, error) {
baseVersionQuery := models.GetDashboardVersionQuery{
DashboardId: options.Base.DashboardId,
Version: options.Base.Version,
OrgId: options.OrgId,
}
if err := bus.Dispatch(&baseVersionQuery); err != nil {
if err := bus.DispatchCtx(ctx, &baseVersionQuery); err != nil {
return nil, err
}
@@ -74,7 +75,7 @@ func CalculateDiff(options *Options) (*Result, error) {
OrgId: options.OrgId,
}
if err := bus.Dispatch(&newVersionQuery); err != nil {
if err := bus.DispatchCtx(ctx, &newVersionQuery); err != nil {
return nil, err
}