mirror of
https://github.com/grafana/grafana.git
synced 2025-08-01 05:31:49 +08:00
Admin: Fix so Timezone is saved when saving preferences (#41583)
* Configuration: Fix so Timezone is saved when saving preferences * Updating package.json and yarn.lock * Chore: force drone reload * Chore: trying with the git protocol * Chore: revert back to main * Chore: deleted cached pa11y file * Chore: revert * Chore: trying with YARN_CHECKSUM_BEHAVIOR=reset * Chore: YARN_CHECKSUM_BEHAVIOR=reset worked but reverting back waiting for other fix
This commit is contained in:
@ -111,6 +111,7 @@ func (ss *SQLStore) SavePreferences(ctx context.Context, cmd *models.SavePrefere
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
prefs.HomeDashboardId = cmd.HomeDashboardId
|
prefs.HomeDashboardId = cmd.HomeDashboardId
|
||||||
|
prefs.Timezone = cmd.Timezone
|
||||||
prefs.WeekStart = cmd.WeekStart
|
prefs.WeekStart = cmd.WeekStart
|
||||||
prefs.Theme = cmd.Theme
|
prefs.Theme = cmd.Theme
|
||||||
prefs.Updated = time.Now()
|
prefs.Updated = time.Now()
|
||||||
|
@ -7,8 +7,10 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/grafana/grafana/pkg/models"
|
"github.com/google/go-cmp/cmp"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
|
"github.com/grafana/grafana/pkg/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestPreferencesDataAccess(t *testing.T) {
|
func TestPreferencesDataAccess(t *testing.T) {
|
||||||
@ -115,4 +117,26 @@ func TestPreferencesDataAccess(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, int64(1), query.Result.HomeDashboardId)
|
require.Equal(t, int64(1), query.Result.HomeDashboardId)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("SavePreferences for a user should store correct values", func(t *testing.T) {
|
||||||
|
err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{UserId: models.SignedInUser{}.UserId, Theme: "dark", Timezone: "browser", HomeDashboardId: 5, WeekStart: "1"})
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{}}
|
||||||
|
err = ss.GetPreferencesWithDefaults(context.Background(), query)
|
||||||
|
require.NoError(t, err)
|
||||||
|
expected := &models.Preferences{
|
||||||
|
Id: query.Result.Id,
|
||||||
|
Version: query.Result.Version,
|
||||||
|
HomeDashboardId: 5,
|
||||||
|
Timezone: "browser",
|
||||||
|
WeekStart: "1",
|
||||||
|
Theme: "dark",
|
||||||
|
Created: query.Result.Created,
|
||||||
|
Updated: query.Result.Updated,
|
||||||
|
}
|
||||||
|
if diff := cmp.Diff(expected, query.Result); diff != "" {
|
||||||
|
t.Fatalf("Result mismatch (-want +got):\n%s", diff)
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user