public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PublicDashboards: remove publicDashboardUID from insights event request (#60649)

Browse Source
This commit is contained in:
Ezequiel Victorero
2023-01-11 18:25:18 -03:00
committed by GitHub
parent b3272fe62c
commit 34a865ebf0
7 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/publicdashboards/api/query.go
-1
View File
@@ -42,7 +42,6 @@ func (api *Api) ViewPublicDashboard(c *models.ReqContext) response.Response {
IsFolder: false,
FolderId: dash.FolderId,
PublicDashboardAccessToken: pubdash.AccessToken,
PublicDashboardUID: pubdash.Uid,
}
dash.Data.Get("timepicker").Set("hidden", !pubdash.TimeSelectionEnabled)
pkg/services/publicdashboards/api/query_test.go
+4 -1
View File
@@ -84,7 +84,7 @@ func TestAPIViewPublicDashboard(t *testing.T) {
t.Run(test.Name, func(t *testing.T) {
service := publicdashboards.NewFakePublicDashboardService(t)
service.On("FindPublicDashboardAndDashboardByAccessToken", mock.Anything, mock.AnythingOfType("string")).
Return(&PublicDashboard{}, test.DashboardResult, test.Err).Maybe()
Return(&PublicDashboard{Uid: "pubdashuid"}, test.DashboardResult, test.Err).Maybe()
cfg := setting.NewCfg()
cfg.RBACEnabled = false
@@ -115,6 +115,9 @@ func TestAPIViewPublicDashboard(t *testing.T) {
assert.Equal(t, false, dashResp.Meta.CanEdit)
assert.Equal(t, false, dashResp.Meta.CanDelete)
assert.Equal(t, false, dashResp.Meta.CanSave)
// publicDashboardUID should be always empty
assert.Equal(t, "", dashResp.Meta.PublicDashboardUID)
} else if test.FixedErrorResponse != "" {
require.Equal(t, test.ExpectedHttpResponse, response.Code)
require.JSONEq(t, "{\"message\":\"Invalid access token\", \"messageId\":\"publicdashboards.invalidAccessToken\", \"statusCode\":400, \"traceID\":\"\"}", response.Body.String())