mirror of
https://github.com/grafana/grafana.git
synced 2025-08-02 14:32:12 +08:00

* Add global week start option to shared preferences * Add default_week_start to configuration docs * Add week start option to dashboards * Add week start argument to tsdb time range parser * Fix strict check issues * Add tests for week start * Change wording on default_week_start documentation Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update week_start column to be a nullable field Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Update configuration to include browser option * Update WeekStartPicker container selector Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> * Add menuShouldPortal to WeekStartPicker to remove deprecation warning Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Add inputId to WeekStartPicker * Use e2e selector on WeekStartPicker aria-label * Simplify WeekStartPicker onChange condition * Specify value type on WeekStartPicker weekStarts * Remove setWeekStart side effect from reducer * Fix updateLocale failing to reset week start * Store week start as string to handle empty values Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
120 lines
3.0 KiB
Go
120 lines
3.0 KiB
Go
package sqlstore
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/grafana/grafana/pkg/bus"
|
|
"github.com/grafana/grafana/pkg/models"
|
|
)
|
|
|
|
func (ss *SQLStore) addPreferencesQueryAndCommandHandlers() {
|
|
bus.AddHandler("sql", GetPreferences)
|
|
bus.AddHandlerCtx("sql", ss.GetPreferencesWithDefaults)
|
|
bus.AddHandler("sql", SavePreferences)
|
|
}
|
|
|
|
func (ss *SQLStore) GetPreferencesWithDefaults(ctx context.Context, query *models.GetPreferencesWithDefaultsQuery) error {
|
|
return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
|
|
params := make([]interface{}, 0)
|
|
filter := ""
|
|
|
|
if len(query.User.Teams) > 0 {
|
|
filter = "(org_id=? AND team_id IN (?" + strings.Repeat(",?", len(query.User.Teams)-1) + ")) OR "
|
|
params = append(params, query.User.OrgId)
|
|
for _, v := range query.User.Teams {
|
|
params = append(params, v)
|
|
}
|
|
}
|
|
|
|
filter += "(org_id=? AND user_id=? AND team_id=0) OR (org_id=? AND team_id=0 AND user_id=0)"
|
|
params = append(params, query.User.OrgId)
|
|
params = append(params, query.User.UserId)
|
|
params = append(params, query.User.OrgId)
|
|
prefs := make([]*models.Preferences, 0)
|
|
err := dbSession.Where(filter, params...).
|
|
OrderBy("user_id ASC, team_id ASC").
|
|
Find(&prefs)
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
res := &models.Preferences{
|
|
Theme: ss.Cfg.DefaultTheme,
|
|
Timezone: ss.Cfg.DateFormats.DefaultTimezone,
|
|
WeekStart: ss.Cfg.DateFormats.DefaultWeekStart,
|
|
HomeDashboardId: 0,
|
|
}
|
|
|
|
for _, p := range prefs {
|
|
if p.Theme != "" {
|
|
res.Theme = p.Theme
|
|
}
|
|
if p.Timezone != "" {
|
|
res.Timezone = p.Timezone
|
|
}
|
|
if p.WeekStart != "" {
|
|
res.WeekStart = p.WeekStart
|
|
}
|
|
if p.HomeDashboardId != 0 {
|
|
res.HomeDashboardId = p.HomeDashboardId
|
|
}
|
|
}
|
|
|
|
query.Result = res
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func GetPreferences(query *models.GetPreferencesQuery) error {
|
|
var prefs models.Preferences
|
|
exists, err := x.Where("org_id=? AND user_id=? AND team_id=?", query.OrgId, query.UserId, query.TeamId).Get(&prefs)
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if exists {
|
|
query.Result = &prefs
|
|
} else {
|
|
query.Result = new(models.Preferences)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func SavePreferences(cmd *models.SavePreferencesCommand) error {
|
|
return inTransaction(func(sess *DBSession) error {
|
|
var prefs models.Preferences
|
|
exists, err := sess.Where("org_id=? AND user_id=? AND team_id=?", cmd.OrgId, cmd.UserId, cmd.TeamId).Get(&prefs)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if !exists {
|
|
prefs = models.Preferences{
|
|
UserId: cmd.UserId,
|
|
OrgId: cmd.OrgId,
|
|
TeamId: cmd.TeamId,
|
|
HomeDashboardId: cmd.HomeDashboardId,
|
|
Timezone: cmd.Timezone,
|
|
WeekStart: cmd.WeekStart,
|
|
Theme: cmd.Theme,
|
|
Created: time.Now(),
|
|
Updated: time.Now(),
|
|
}
|
|
_, err = sess.Insert(&prefs)
|
|
return err
|
|
}
|
|
prefs.HomeDashboardId = cmd.HomeDashboardId
|
|
prefs.WeekStart = cmd.WeekStart
|
|
prefs.Theme = cmd.Theme
|
|
prefs.Updated = time.Now()
|
|
prefs.Version += 1
|
|
_, err = sess.ID(prefs.Id).AllCols().Update(&prefs)
|
|
return err
|
|
})
|
|
}
|