Reduce round trip on SET_BANNER

ammario · ammario · commit 35b41e78e855 · 2022-12-03T21:56:05.000Z
diff --git a/enterprise/coderd/servicebanner.go b/enterprise/coderd/servicebanner.go
@@ -105,7 +105,5 @@ func (api *API) putServiceBanner(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.Response{
-		Message: "ok",
-	})
+	httpapi.Write(r.Context(), rw, http.StatusOK, serviceBanner)
 }
diff --git a/site/src/components/ServiceBanner/ServiceBannerView.tsx b/site/src/components/ServiceBanner/ServiceBannerView.tsx
@@ -70,6 +70,9 @@ const useStyles = makeStyles((theme) => ({
     marginRight: "auto",
     marginLeft: "auto",
     fontWeight: 400,
+    "& a": {
+      color: "inherit",
+    },
   },
 }))
 
diff --git a/site/src/pages/DeploySettingsPage/ServiceBannerSettingsPage.tsx b/site/src/pages/DeploySettingsPage/ServiceBannerSettingsPage.tsx
@@ -34,7 +34,7 @@ export const Language = {
 export interface ServiceBannerFormValues {
   message?: string
   backgroundColor?: string
-  enabled?: boolean
+  enabled: boolean
 }
 
 // TODO:
@@ -63,7 +63,7 @@ const ServiceBannerSettingsPage: React.FC = () => {
   const setBanner = (values: ServiceBannerFormValues, preview: boolean) => {
     const newBanner = {
       message: values.message,
-      enabled: true,
+      enabled: values.enabled,
       background_color: values.backgroundColor,
     }
     if (preview) {
@@ -118,8 +118,22 @@ const ServiceBannerSettingsPage: React.FC = () => {
       <form className={styles.form} onSubmit={form.handleSubmit}>
         <Stack>
           <FormControlLabel
-            value="enabled"
-            control={<Switch {...getFieldHelpers("enabled")} color="primary" />}
+            control={
+              <Switch
+                {...getFieldHelpers("enabled")}
+                color="primary"
+                checked={form.values.enabled}
+                onChange={() => {
+                  const newState = !form.values.enabled
+                  const newBanner = {
+                    ...form.values,
+                    enabled: newState,
+                  }
+                  setBanner(newBanner, false)
+                  form.setFieldValue("enabled", newState)
+                }}
+              />
+            }
             label="Enabled"
           />
           <Stack spacing={0}>
diff --git a/site/src/xServices/serviceBanner/serviceBannerXService.ts b/site/src/xServices/serviceBanner/serviceBannerXService.ts
@@ -86,7 +86,8 @@ export const serviceBannerMachine = createMachine(
           id: "setBanner",
           src: "setBanner",
           onDone: {
-            target: "gettingBanner",
+            target: "idle",
+            actions: ["assignBanner"],
           },
           onError: {
             target: "idle",

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,5 @@ func (api API) putServiceBanner(rw http.ResponseWriter, r http.Request) {`
`105`	`105`	`return`
`106`	`106`	`}`
`107`	`107`
`108`		`- httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.Response{`
`109`		`- Message: "ok",`
`110`		`- })`
	`108`	`+ httpapi.Write(r.Context(), rw, http.StatusOK, serviceBanner)`
`111`	`109`	`}`