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 DashboardMeta (#77626)

Browse Source 
* Chore: Deprecate FolderId in DashboardMeta

* chore: regen specs
This commit is contained in:
Kat Yang
2023-11-06 11:31:44 -05:00
committed by GitHub
parent 911ffed45b
commit 6ed09de47d
6 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/publicdashboards/service/service.go
View File

@@ -83,7 +83,7 @@ func (pd *PublicDashboardServiceImpl) GetPublicDashboardForView(ctx context.Cont
Updated: dash.Updated,
Version: dash.Version,
IsFolder: false,
FolderId: dash.FolderID,
FolderId: dash.FolderID, // nolint:staticcheck
PublicDashboardEnabled: pubdash.IsEnabled,
}
dash.Data.Get("timepicker").Set("hidden", !pubdash.TimeSelectionEnabled)

5
pkg/services/publicdashboards/service/service_test.go
View File

@@ -344,7 +344,7 @@ func TestGetPublicDashboardForView(t *testing.T) {
Updated: d.Updated,
Version: d.Version,
IsFolder: false,
FolderId: d.FolderID,
FolderId: d.FolderID, // nolint:staticcheck
PublicDashboardEnabled: true,
},
},
@@ -372,7 +372,7 @@ func TestGetPublicDashboardForView(t *testing.T) {
Updated: d.Updated,
Version: d.Version,
IsFolder: false,
FolderId: d.FolderID,
FolderId: d.FolderID, // nolint:staticcheck
PublicDashboardEnabled: true,
},
},
@@ -411,6 +411,7 @@ func TestGetPublicDashboardForView(t *testing.T) {
assert.Equal(t, test.DashResp.Meta.Updated, dashboardFullWithMeta.Meta.Updated)
assert.Equal(t, test.DashResp.Meta.Version, dashboardFullWithMeta.Meta.Version)
assert.Equal(t, false, dashboardFullWithMeta.Meta.IsFolder)
// nolint:staticcheck
assert.Equal(t, test.DashResp.Meta.FolderId, dashboardFullWithMeta.Meta.FolderId)
assert.Equal(t, test.DashResp.Meta.PublicDashboardEnabled, dashboardFullWithMeta.Meta.PublicDashboardEnabled)