Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions coderd/apidoc/docs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions coderd/apidoc/swagger.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions coderd/database/dbauthz/dbauthz.go
Original file line number Diff line number Diff line change
Expand Up @@ -9072,6 +9072,17 @@ func (q *querier) UpdateUserTerminalFont(ctx context.Context, arg database.Updat
return q.db.UpdateUserTerminalFont(ctx, arg)
}

func (q *querier) UpdateUserTerminalFontSize(ctx context.Context, arg database.UpdateUserTerminalFontSizeParams) (database.UserConfig, error) {
u, err := q.db.GetUserByID(ctx, arg.UserID)
if err != nil {
return database.UserConfig{}, err
}
if err := q.authorizeContext(ctx, policy.ActionUpdatePersonal, u); err != nil {
return database.UserConfig{}, err
}
return q.db.UpdateUserTerminalFontSize(ctx, arg)
}

func (q *querier) UpdateUserThemeDark(ctx context.Context, arg database.UpdateUserThemeDarkParams) (database.UserConfig, error) {
u, err := q.db.GetUserByID(ctx, arg.UserID)
if err != nil {
Expand Down
8 changes: 8 additions & 0 deletions coderd/database/dbauthz/dbauthz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3505,6 +3505,14 @@ func (s *MethodTestSuite) TestUser() {
dbm.EXPECT().UpdateUserTerminalFont(gomock.Any(), arg).Return(uc, nil).AnyTimes()
check.Args(arg).Asserts(u, policy.ActionUpdatePersonal).Returns(uc)
}))
s.Run("UpdateUserTerminalFontSize", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
u := testutil.Fake(s.T(), faker, database.User{})
uc := database.UserConfig{UserID: u.ID, Key: "terminal_font_size", Value: "18"}
arg := database.UpdateUserTerminalFontSizeParams{UserID: u.ID, TerminalFontSize: 18}
dbm.EXPECT().GetUserByID(gomock.Any(), u.ID).Return(u, nil).AnyTimes()
dbm.EXPECT().UpdateUserTerminalFontSize(gomock.Any(), arg).Return(uc, nil).AnyTimes()
check.Args(arg).Asserts(u, policy.ActionUpdatePersonal).Returns(uc)
}))
s.Run("UpdateUserThemeMode", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
u := testutil.Fake(s.T(), faker, database.User{})
uc := database.UserConfig{UserID: u.ID, Key: "theme_mode", Value: "sync"}
Expand Down
8 changes: 8 additions & 0 deletions coderd/database/dbmetrics/querymetrics.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions coderd/database/dbmock/dbmock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions coderd/database/querier.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 38 additions & 7 deletions coderd/database/queries.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 18 additions & 2 deletions coderd/database/queries/users.sql
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ SELECT
COALESCE(MAX(value) FILTER (WHERE key = 'theme_mode'), '')::text AS theme_mode,
COALESCE(MAX(value) FILTER (WHERE key = 'theme_light'), '')::text AS theme_light,
COALESCE(MAX(value) FILTER (WHERE key = 'theme_dark'), '')::text AS theme_dark,
COALESCE(MAX(value) FILTER (WHERE key = 'terminal_font'), '')::text AS terminal_font
COALESCE(MAX(value) FILTER (WHERE key = 'terminal_font'), '')::text AS terminal_font,
COALESCE(MAX(value) FILTER (WHERE key = 'terminal_font_size'), '0')::int AS terminal_font_size
FROM
user_configs
WHERE
Expand All @@ -145,7 +146,8 @@ WHERE
'theme_mode',
'theme_light',
'theme_dark',
'terminal_font'
'terminal_font',
'terminal_font_size'
);

-- name: UpdateUserThemePreference :one
Expand Down Expand Up @@ -176,6 +178,20 @@ WHERE user_configs.user_id = @user_id
AND user_configs.key = 'terminal_font'
RETURNING *;

-- name: UpdateUserTerminalFontSize :one
INSERT INTO
user_configs (user_id, key, value)
VALUES
(@user_id, 'terminal_font_size', (@terminal_font_size::int)::text)
ON CONFLICT
ON CONSTRAINT user_configs_pkey
DO UPDATE
SET
value = (@terminal_font_size::int)::text
WHERE user_configs.user_id = @user_id
AND user_configs.key = 'terminal_font_size'
RETURNING *;

-- name: UpdateUserThemeMode :one
INSERT INTO
user_configs (user_id, key, value)
Expand Down
21 changes: 16 additions & 5 deletions coderd/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -1263,11 +1263,12 @@ func (api *API) userAppearanceSettings(rw http.ResponseWriter, r *http.Request)

func userAppearanceSettingsFromRow(settings database.GetUserAppearanceSettingsRow) codersdk.UserAppearanceSettings {
return codersdk.UserAppearanceSettings{
ThemePreference: settings.ThemePreference,
ThemeMode: codersdk.ThemeMode(settings.ThemeMode),
ThemeLight: settings.ThemeLight,
ThemeDark: settings.ThemeDark,
TerminalFont: codersdk.TerminalFontName(settings.TerminalFont),
ThemePreference: settings.ThemePreference,
ThemeMode: codersdk.ThemeMode(settings.ThemeMode),
ThemeLight: settings.ThemeLight,
ThemeDark: settings.ThemeDark,
TerminalFont: codersdk.TerminalFontName(settings.TerminalFont),
TerminalFontSize: settings.TerminalFontSize,
}
}

Expand Down Expand Up @@ -1382,6 +1383,16 @@ func (api *API) putUserAppearanceSettings(rw http.ResponseWriter, r *http.Reques
return xerrors.Errorf("update user terminal font: %w", err)
}

if params.TerminalFontSize != 0 {
_, err = tx.UpdateUserTerminalFontSize(ctx, database.UpdateUserTerminalFontSizeParams{
UserID: user.ID,
TerminalFontSize: params.TerminalFontSize,
})
if err != nil {
return xerrors.Errorf("update user terminal font size: %w", err)
}
}

updatedSettings, err = tx.GetUserAppearanceSettings(ctx, user.ID)
if err != nil {
return xerrors.Errorf("get updated user appearance settings: %w", err)
Expand Down
70 changes: 70 additions & 0 deletions coderd/users_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2281,6 +2281,76 @@ func TestUserTerminalFont(t *testing.T) {
})
}

func TestUserTerminalFontSize(t *testing.T) {
t.Parallel()

adminClient := coderdtest.New(t, nil)
firstUser := coderdtest.CreateFirstUser(t, adminClient)

t.Run("valid size", func(t *testing.T) {
t.Parallel()

client, _ := coderdtest.CreateAnotherUser(t, adminClient, firstUser.OrganizationID)

ctx := testutil.Context(t, testutil.WaitShort)

initial, err := client.GetUserAppearanceSettings(ctx, codersdk.Me)
require.NoError(t, err)
require.Zero(t, initial.TerminalFontSize)

updated, err := client.UpdateUserAppearanceSettings(ctx, codersdk.Me, codersdk.UpdateUserAppearanceSettingsRequest{
ThemePreference: "light",
TerminalFont: codersdk.TerminalFontGeistMono,
TerminalFontSize: 18,
})
require.NoError(t, err)
require.Equal(t, int32(18), updated.TerminalFontSize)

fetched, err := client.GetUserAppearanceSettings(ctx, codersdk.Me)
require.NoError(t, err)
require.Equal(t, int32(18), fetched.TerminalFontSize)
})

t.Run("omitted size preserves previous value", func(t *testing.T) {
t.Parallel()

client, _ := coderdtest.CreateAnotherUser(t, adminClient, firstUser.OrganizationID)

ctx := testutil.Context(t, testutil.WaitShort)

_, err := client.UpdateUserAppearanceSettings(ctx, codersdk.Me, codersdk.UpdateUserAppearanceSettingsRequest{
ThemePreference: "light",
TerminalFont: codersdk.TerminalFontGeistMono,
TerminalFontSize: 14,
})
require.NoError(t, err)

updated, err := client.UpdateUserAppearanceSettings(ctx, codersdk.Me, codersdk.UpdateUserAppearanceSettingsRequest{
ThemePreference: "dark",
TerminalFont: codersdk.TerminalFontFiraCode,
})
require.NoError(t, err)
require.Equal(t, int32(14), updated.TerminalFontSize)
})

t.Run("out of range size", func(t *testing.T) {
t.Parallel()

client, _ := coderdtest.CreateAnotherUser(t, adminClient, firstUser.OrganizationID)

ctx := testutil.Context(t, testutil.WaitShort)

for _, size := range []int32{-1, 7, 33} {
_, err := client.UpdateUserAppearanceSettings(ctx, codersdk.Me, codersdk.UpdateUserAppearanceSettingsRequest{
ThemePreference: "light",
TerminalFont: codersdk.TerminalFontGeistMono,
TerminalFontSize: size,
})
require.Error(t, err, "size %d", size)
}
})
}

func TestUserThemeMode(t *testing.T) {
t.Parallel()

Expand Down
6 changes: 6 additions & 0 deletions codersdk/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,9 @@ type UserAppearanceSettings struct {
// Ignored when ThemeMode is "single"
ThemeDark string `json:"theme_dark"`
TerminalFont TerminalFontName `json:"terminal_font"`
// TerminalFontSize is the web terminal font size in pixels. Zero means
// the user has not chosen a size, and the web terminal will use the default.
Comment thread
aslilac marked this conversation as resolved.
Resolved
TerminalFontSize int32 `json:"terminal_font_size"`
}

type UpdateUserAppearanceSettingsRequest struct {
Expand All @@ -277,6 +280,9 @@ type UpdateUserAppearanceSettingsRequest struct {
// one slot keep the other intact.
ThemeDark string `json:"theme_dark" validate:"required_if=ThemeMode sync,omitempty,oneof=light light-protan-deuter light-tritan dark dark-protan-deuter dark-tritan"`
TerminalFont TerminalFontName `json:"terminal_font" validate:"required"`
// TerminalFontSize is optional for backward compatibility. When zero,
// the server leaves the persisted terminal font size unchanged.
TerminalFontSize int32 `json:"terminal_font_size,omitempty" validate:"omitempty,min=8,max=32"`
}

type UserPreferenceSettings struct {
Expand Down
Loading
Loading