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

PublicDashboards: Return custom meta field (#67538)

Browse Source
This commit is contained in:
Ezequiel Victorero
2023-04-28 15:03:30 -03:00
committed by GitHub
parent 92d47a8d8f
commit b1b6d9e2db
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/publicdashboards/service/query.go
View File

@@ -315,7 +315,6 @@ func sanitizeMetadataFromQueryData(res *backend.QueryDataResponse) {
for i := range frames {
if frames[i].Meta != nil {
frames[i].Meta.ExecutedQueryString = ""
frames[i].Meta.Custom = nil
}
}
}

18
pkg/services/publicdashboards/service/query_test.go
View File

@@ -1564,7 +1564,7 @@ func TestGroupQueriesByDataSource(t *testing.T) {
}
func TestSanitizeMetadataFromQueryData(t *testing.T) {
t.Run("can remove metadata from query", func(t *testing.T) {
t.Run("can remove ExecutedQueryString from metadata", func(t *testing.T) {
fakeResponse := &backend.QueryDataResponse{
Responses: backend.Responses{
"A": backend.DataResponse{
@@ -1595,9 +1595,6 @@ func TestSanitizeMetadataFromQueryData(t *testing.T) {
Name: "3",
Meta: &data.FrameMeta{
ExecutedQueryString: "Test3",
Custom: map[string]string{
"test3": "test3",
},
},
},
},
@@ -1605,13 +1602,12 @@ func TestSanitizeMetadataFromQueryData(t *testing.T) {
},
}
sanitizeMetadataFromQueryData(fakeResponse)
for k := range fakeResponse.Responses {
frames := fakeResponse.Responses[k].Frames
for i := range frames {
require.Empty(t, frames[i].Meta.ExecutedQueryString)
require.Empty(t, frames[i].Meta.Custom)
}
}
assert.Equal(t, fakeResponse.Responses["A"].Frames[0].Meta.ExecutedQueryString, "")
assert.Equal(t, fakeResponse.Responses["A"].Frames[0].Meta.Custom, map[string]string{"test1": "test1"})
assert.Equal(t, fakeResponse.Responses["A"].Frames[1].Meta.ExecutedQueryString, "")
assert.Equal(t, fakeResponse.Responses["A"].Frames[1].Meta.Custom, map[string]string{"test2": "test2"})
assert.Equal(t, fakeResponse.Responses["B"].Frames[0].Meta.ExecutedQueryString, "")
assert.Nil(t, fakeResponse.Responses["B"].Frames[0].Meta.Custom)
})
}