Review fixes

coder · mtojek · Apr 7, 2025 · Apr 4, 2025 · Apr 4, 2025 · Apr 4, 2025
commit 2a68eebf9fa0d0e0029d563e60c051afa6c0a864
diff --git a/cli/testdata/TestProvisioners_Golden/list.golden b/cli/testdata/TestProvisioners_Golden/list.golden
@@ -1,4 +1,4 @@
-ID                                    CREATED AT            LAST SEEN AT          NAME                 VERSION       TAGS                                    KEY NAME  STATUS   CURRENT JOB ID                        CURRENT JOB STATUS  PREVIOUS JOB ID                       PREVIOUS JOB STATUS  ORGANIZATION  
+ID                                    CREATED AT            LAST SEEN AT               NAME                 VERSION       TAGS                                    KEY NAME  STATUS   CURRENT JOB ID                        CURRENT JOB STATUS  PREVIOUS JOB ID                       PREVIOUS JOB STATUS  ORGANIZATION  
 00000000-0000-0000-aaaa-000000000000  ====[timestamp]=====  ====[timestamp]=====  default-provisioner  v0.0.0-devel  map[owner: scope:organization]          built-in  idle     <nil>                                 <nil>               00000000-0000-0000-bbbb-000000000001  succeeded            Coder         
 00000000-0000-0000-aaaa-000000000001  ====[timestamp]=====  ====[timestamp]=====  provisioner-1        v0.0.0        map[foo:bar owner: scope:organization]  built-in  busy     00000000-0000-0000-bbbb-000000000002  running             <nil>                                 <nil>                Coder         
 00000000-0000-0000-aaaa-000000000002  ====[timestamp]=====  ====[timestamp]=====  provisioner-2        v0.0.0        map[owner: scope:organization]          built-in  offline  <nil>                                 <nil>               00000000-0000-0000-bbbb-000000000003  succeeded            Coder         

diff --git a/cli/testdata/coder_provisioner_list.golden b/cli/testdata/coder_provisioner_list.golden
@@ -1,2 +1,2 @@
-CREATED AT            LAST SEEN AT          KEY NAME  NAME  VERSION       STATUS  TAGS                            
+CREATED AT            LAST SEEN AT               KEY NAME  NAME  VERSION       STATUS  TAGS                            
 ====[timestamp]=====  ====[timestamp]=====  built-in  test  v0.0.0-devel  idle    map[owner: scope:organization]  
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/users.go b/coderd/users.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"slices"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
@@ -1067,12 +1068,7 @@ func (api *API) putUserAppearanceSettings(rw http.ResponseWriter, r *http.Reques
 }
 
 func isValidFontName(font codersdk.TerminalFontName) bool {
-	switch font {
-	case codersdk.TerminalFontIbmPlexMono, codersdk.TerminalFontFiraCode, "":
-		return true
-	default:
-		return false
-	}
+	return slices.Contains(codersdk.TerminalFontNames, font)
 }
 
 // @Summary Update user password

diff --git a/codersdk/users.go b/codersdk/users.go
@@ -192,20 +192,22 @@ type ValidateUserPasswordResponse struct {
 // TerminalFontName is the name of supported terminal font
 type TerminalFontName string
 
+var TerminalFontNames = []TerminalFontName{TerminalFontUnknown, TerminalFontIBMPlexMono, TerminalFontFiraCode}
+
 const (
 	TerminalFontUnknown     TerminalFontName = ""
-	TerminalFontIbmPlexMono TerminalFontName = "ibm-plex-mono"
+	TerminalFontIBMPlexMono TerminalFontName = "ibm-plex-mono"
 	TerminalFontFiraCode    TerminalFontName = "fira-code"
 )
 
 type UserAppearanceSettings struct {
 	ThemePreference string           `json:"theme_preference"`
-	TerminalFont    TerminalFontName `json:"terminal_font" enums:"ibm-plex-mono,fira-code"`
+	TerminalFont    TerminalFontName `json:"terminal_font"`
 }
 
 type UpdateUserAppearanceSettingsRequest struct {
 	ThemePreference string           `json:"theme_preference" validate:"required"`
-	TerminalFont    TerminalFontName `json:"terminal_font" validate:"required" enums:"ibm-plex-mono,fira-code"`
+	TerminalFont    TerminalFontName `json:"terminal_font" validate:"required"`
 }
 
 type UpdateUserPasswordRequest struct {

diff --git a/docs/reference/api/schemas.md b/docs/reference/api/schemas.md
diff --git a/docs/reference/api/users.md b/docs/reference/api/users.md
diff --git a/provisioner/terraform/testdata/resources/version.txt b/provisioner/terraform/testdata/resources/version.txt
@@ -1 +1 @@
-1.11.2
+1.11.1
diff --git a/site/src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx b/site/src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx
@@ -18,6 +18,7 @@ import type { FC } from "react";
 import themes, {
 	DEFAULT_TERMINAL_FONT,
 	DEFAULT_THEME,
+	fontLabels,
 	type Theme,
 } from "theme";
 import { Section } from "../Section";
@@ -112,18 +113,18 @@ export const AppearanceForm: FC<AppearanceFormProps> = ({
 							onChangeTerminalFont(toTerminalFontName(value))
 						}
 					>
-						<FormControlLabel
-							value="ibm-plex-mono"
-							control={<Radio />}
-							label={
-								<div css={{ fontFamily: "IBM Plex Mono" }}>IBM Plex Mono</div>
-							}
-						/>
-						<FormControlLabel
-							value="fira-code"
-							control={<Radio />}
-							label={<div css={{ fontFamily: "Fira Code" }}>Fira Code</div>}
-						/>
+						{TerminalFontNames.filter((name) => name !== "").map((name) => (
+							<FormControlLabel
+								key={name}
+								value={name}
+								control={<Radio />}
+								label={
+									<div css={{ fontFamily: fontLabels[name] }}>
+										IBM Plex Mono
+									</div>
+								}
+							/>
+						))}
 					</RadioGroup>
 				</FormControl>
 			</Section>

diff --git a/site/src/theme/index.ts b/site/src/theme/index.ts
@@ -1,7 +1,10 @@
 // biome-ignore lint/nursery/noRestrictedImports: We still use `Theme` as a basis for our actual theme, for now.
 import type { Theme as MuiTheme } from "@mui/material/styles";
+import type { TerminalFontName } from "api/typesGenerated";
 import type * as monaco from "monaco-editor";
+import { of } from "rxjs";
 import type { Branding } from "./branding";
+import { terminalFonts } from "./constants";
 import dark from "./dark";
 import type { NewTheme } from "./experimental";
 import type { ExternalImageModeStyles } from "./externalImages";
@@ -37,4 +40,10 @@ const theme = {
 
 export default theme;
 
+export const fontLabels: Record<TerminalFontName, string> = {
+	"fira-code": "Fira Code",
+	"ibm-plex-mono": "IBM Plex Mono",
+	"": "", // needed for enum completeness, otherwise fails the build
+};
+
 export const DEFAULT_TERMINAL_FONT = "ibm-plex-mono";