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

PublicDashboards: add timeSettingsEnabled on saving a public dashboard (#61701)

Browse Source
This commit is contained in:
Ezequiel Victorero
2023-01-18 16:03:41 +00:00
committed by GitHub
parent 4b634fadcf
commit 5fb4a7f3b6
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/publicdashboards/service/service.go
+10 -9
View File
@@ -165,15 +165,16 @@ func (pd *PublicDashboardServiceImpl) Create(ctx context.Context, u *user.Signed
cmd := SavePublicDashboardCommand{ cmd := SavePublicDashboardCommand{
PublicDashboard: PublicDashboard{ PublicDashboard: PublicDashboard{
Uid: uid, Uid: uid,
DashboardUid: dto.DashboardUid, DashboardUid: dto.DashboardUid,
OrgId: dto.OrgId, OrgId: dto.OrgId,
IsEnabled: dto.PublicDashboard.IsEnabled, IsEnabled: dto.PublicDashboard.IsEnabled,
AnnotationsEnabled: dto.PublicDashboard.AnnotationsEnabled, AnnotationsEnabled: dto.PublicDashboard.AnnotationsEnabled,
TimeSettings: dto.PublicDashboard.TimeSettings, TimeSelectionEnabled: dto.PublicDashboard.TimeSelectionEnabled,
CreatedBy: dto.UserId, TimeSettings: dto.PublicDashboard.TimeSettings,
CreatedAt: time.Now(), CreatedBy: dto.UserId,
AccessToken: accessToken, CreatedAt: time.Now(),
AccessToken: accessToken,
}, },
} }
pkg/services/publicdashboards/service/service_test.go
+17 -12
View File
@@ -141,11 +141,12 @@ func TestCreatePublicDashboard(t *testing.T) {
OrgId: dashboard.OrgID, OrgId: dashboard.OrgID,
UserId: 7, UserId: 7,
PublicDashboard: &PublicDashboard{ PublicDashboard: &PublicDashboard{
IsEnabled: true, IsEnabled: true,
AnnotationsEnabled: false, AnnotationsEnabled: false,
DashboardUid: "NOTTHESAME", TimeSelectionEnabled: true,
OrgId: 9999999, DashboardUid: "NOTTHESAME",
TimeSettings: timeSettings, OrgId: 9999999,
TimeSettings: timeSettings,
}, },
} }
@@ -160,6 +161,7 @@ func TestCreatePublicDashboard(t *testing.T) {
assert.Equal(t, dashboard.OrgID, pubdash.OrgId) assert.Equal(t, dashboard.OrgID, pubdash.OrgId)
assert.Equal(t, dto.UserId, pubdash.CreatedBy) assert.Equal(t, dto.UserId, pubdash.CreatedBy)
assert.Equal(t, dto.PublicDashboard.AnnotationsEnabled, pubdash.AnnotationsEnabled) assert.Equal(t, dto.PublicDashboard.AnnotationsEnabled, pubdash.AnnotationsEnabled)
assert.Equal(t, dto.PublicDashboard.TimeSelectionEnabled, pubdash.TimeSelectionEnabled)
// ExistsEnabledByDashboardUid set by parameters // ExistsEnabledByDashboardUid set by parameters
assert.Equal(t, dto.PublicDashboard.IsEnabled, pubdash.IsEnabled) assert.Equal(t, dto.PublicDashboard.IsEnabled, pubdash.IsEnabled)
// CreatedAt set to non-zero time // CreatedAt set to non-zero time
@@ -339,9 +341,10 @@ func TestUpdatePublicDashboard(t *testing.T) {
OrgId: dashboard.OrgID, OrgId: dashboard.OrgID,
UserId: 7, UserId: 7,
PublicDashboard: &PublicDashboard{ PublicDashboard: &PublicDashboard{
AnnotationsEnabled: false, AnnotationsEnabled: false,
IsEnabled: true, IsEnabled: true,
TimeSettings: timeSettings, TimeSelectionEnabled: false,
TimeSettings: timeSettings,
}, },
} }
@@ -361,10 +364,11 @@ func TestUpdatePublicDashboard(t *testing.T) {
CreatedBy: 9, CreatedBy: 9,
CreatedAt: time.Time{}, CreatedAt: time.Time{},
IsEnabled: true, IsEnabled: true,
AnnotationsEnabled: true, AnnotationsEnabled: true,
TimeSettings: timeSettings, TimeSelectionEnabled: true,
AccessToken: "NOTAREALUUID", TimeSettings: timeSettings,
AccessToken: "NOTAREALUUID",
}, },
} }
updatedPubdash, err := service.Update(context.Background(), SignedInUser, dto) updatedPubdash, err := service.Update(context.Background(), SignedInUser, dto)
@@ -380,6 +384,7 @@ func TestUpdatePublicDashboard(t *testing.T) {
// gets updated // gets updated
assert.Equal(t, dto.PublicDashboard.IsEnabled, updatedPubdash.IsEnabled) assert.Equal(t, dto.PublicDashboard.IsEnabled, updatedPubdash.IsEnabled)
assert.Equal(t, dto.PublicDashboard.AnnotationsEnabled, updatedPubdash.AnnotationsEnabled) assert.Equal(t, dto.PublicDashboard.AnnotationsEnabled, updatedPubdash.AnnotationsEnabled)
assert.Equal(t, dto.PublicDashboard.TimeSelectionEnabled, updatedPubdash.TimeSelectionEnabled)
assert.Equal(t, dto.PublicDashboard.TimeSettings, updatedPubdash.TimeSettings) assert.Equal(t, dto.PublicDashboard.TimeSettings, updatedPubdash.TimeSettings)
assert.Equal(t, dto.UserId, updatedPubdash.UpdatedBy) assert.Equal(t, dto.UserId, updatedPubdash.UpdatedBy)
assert.NotEqual(t, &time.Time{}, updatedPubdash.UpdatedAt) assert.NotEqual(t, &time.Time{}, updatedPubdash.UpdatedAt)