PublicDashboards: add time picker enabled column (#59324)

pkg/services/publicdashboards/database/database.go

@@ -233,9 +233,10 @@ func (d *PublicDashboardStoreImpl) Update(ctx context.Context, cmd SavePublicDas
 			return err
 		}
 
-		sqlResult, err := sess.Exec("UPDATE dashboard_public SET is_enabled = ?, annotations_enabled = ?, time_settings = ?, updated_by = ?, updated_at = ? WHERE uid = ?",
+		sqlResult, err := sess.Exec("UPDATE dashboard_public SET is_enabled = ?, annotations_enabled = ?, time_selection_enabled = ?, time_settings = ?, updated_by = ?, updated_at = ? WHERE uid = ?",
 			cmd.PublicDashboard.IsEnabled,
 			cmd.PublicDashboard.AnnotationsEnabled,
+			cmd.PublicDashboard.TimeSelectionEnabled,
 			string(timeSettingsJSON),
 			cmd.PublicDashboard.UpdatedBy,
 			cmd.PublicDashboard.UpdatedAt.UTC().Format("2006-01-02 15:04:05"),

pkg/services/publicdashboards/database/database_test.go

@@ -402,6 +402,7 @@ func TestIntegrationCreatePublicDashboard(t *testing.T) {
 			PublicDashboard: PublicDashboard{
 				IsEnabled:            true,
 				AnnotationsEnabled:   true,
+				TimeSelectionEnabled: true,
 				Uid:                  "pubdash-uid",
 				DashboardUid:         savedDashboard.Uid,
 				OrgId:                savedDashboard.OrgId,
@@ -418,6 +419,9 @@ func TestIntegrationCreatePublicDashboard(t *testing.T) {
 		pubdash, err := publicdashboardStore.FindByDashboardUid(context.Background(), savedDashboard.OrgId, savedDashboard.Uid)
 		require.NoError(t, err)
 		assert.Equal(t, pubdash.AccessToken, "NOTAREALUUID")
+		assert.True(t, pubdash.IsEnabled)
+		assert.True(t, pubdash.AnnotationsEnabled)
+		assert.True(t, pubdash.TimeSelectionEnabled)
 
 		// verify we didn't update all dashboards
 		pubdash2, err := publicdashboardStore.FindByDashboardUid(context.Background(), savedDashboard2.OrgId, savedDashboard2.Uid)
@@ -479,6 +483,7 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 				OrgId:                savedDashboard.OrgId,
 				IsEnabled:            false,
 				AnnotationsEnabled:   true,
+				TimeSelectionEnabled: true,
 				CreatedAt:            DefaultTime,
 				CreatedBy:            7,
 				AccessToken:          "NOTAREALUUID",
@@ -497,6 +502,7 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 				OrgId:                anotherSavedDashboard.OrgId,
 				IsEnabled:            true,
 				AnnotationsEnabled:   false,
+				TimeSelectionEnabled: false,
 				CreatedAt:            DefaultTime,
 				CreatedBy:            7,
 				AccessToken:          "fakeaccesstoken",
@@ -513,6 +519,7 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 			OrgId:                savedDashboard.OrgId,
 			IsEnabled:            false,
 			AnnotationsEnabled:   true,
+			TimeSelectionEnabled: true,
 			TimeSettings:         &TimeSettings{From: "now-8", To: "now"},
 			UpdatedAt:            time.Now().UTC().Round(time.Second),
 			UpdatedBy:            8,
@@ -533,6 +540,7 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 		// UseBool with xorm
 		assert.Equal(t, updatedPublicDashboard.IsEnabled, pdRetrieved.IsEnabled)
 		assert.Equal(t, updatedPublicDashboard.AnnotationsEnabled, pdRetrieved.AnnotationsEnabled)
+		assert.Equal(t, updatedPublicDashboard.TimeSelectionEnabled, pdRetrieved.TimeSelectionEnabled)
 
 		// not updated dashboard shouldn't have changed
 		pdNotUpdatedRetrieved, err := publicdashboardStore.FindByDashboardUid(context.Background(), anotherSavedDashboard.OrgId, anotherSavedDashboard.Uid)

pkg/services/publicdashboards/models/models.go

@@ -38,6 +38,7 @@ type PublicDashboard struct {
 	IsEnabled            bool          `json:"isEnabled" xorm:"is_enabled"`
 	AccessToken          string        `json:"accessToken" xorm:"access_token"`
 	AnnotationsEnabled   bool          `json:"annotationsEnabled" xorm:"annotations_enabled"`
+	TimeSelectionEnabled bool          `json:"timeSelectionEnabled" xorm:"time_selection_enabled"`
 
 	CreatedBy int64 `json:"createdBy" xorm:"created_by"`
 	UpdatedBy int64 `json:"updatedBy" xorm:"updated_by"`

pkg/services/publicdashboards/service/service.go

@@ -221,6 +221,7 @@ func (pd *PublicDashboardServiceImpl) Update(ctx context.Context, u *user.Signed
 			Uid:                  existingPubdash.Uid,
 			IsEnabled:            dto.PublicDashboard.IsEnabled,
 			AnnotationsEnabled:   dto.PublicDashboard.AnnotationsEnabled,
+			TimeSelectionEnabled: dto.PublicDashboard.TimeSelectionEnabled,
 			TimeSettings:         dto.PublicDashboard.TimeSettings,
 			UpdatedBy:            dto.UserId,
 			UpdatedAt:            time.Now(),

pkg/services/sqlstore/migrations/dashboard_public_mig.go

@@ -75,6 +75,13 @@ func addPublicDashboardMigration(mg *Migrator) {
 		Default:  "0",
 	}))
 
+	mg.AddMigration("add time_selection_enabled column", NewAddColumnMigration(dashboardPublicCfgV2, &Column{
+		Name:     "time_selection_enabled",
+		Type:     DB_Bool,
+		Nullable: false,
+		Default:  "0",
+	}))
+
 	mg.AddMigration("delete orphaned public dashboards", NewRawSQLMigration(
 		"DELETE FROM dashboard_public WHERE dashboard_uid NOT IN (SELECT uid FROM dashboard)"))
 }