Fix forms

BrunoQuaresma · BrunoQuaresma · commit 7f3260040af5 · 2022-04-15T13:22:51.000Z
diff --git a/site/src/components/Form/index.ts b/site/src/components/Form/index.ts
@@ -1,4 +1,4 @@
-import { FormikContextType, FormikErrors, getIn } from "formik"
+import { FormikContextType, getIn } from "formik"
 import { ChangeEvent, ChangeEventHandler, FocusEventHandler } from "react"
 
 export * from "./FormCloseButton"
@@ -17,17 +17,10 @@ interface FormHelpers {
   helperText?: string
 }
 
-export const getFormHelpers = <T>(
-  form: FormikContextType<T>,
-  name: string,
-  additionalErrors: FormikErrors<T> = {},
-): FormHelpers => {
+export const getFormHelpers = <T>(form: FormikContextType<T>, name: string, error?: string): FormHelpers => {
   // getIn is a util function from Formik that gets at any depth of nesting, and is necessary for the types to work
   const touched = getIn(form.touched, name)
-  const errors = {
-    ...getIn(form.errors, name),
-    ...additionalErrors,
-  }
+  const errors = error ?? getIn(form.errors, name)
   return {
     ...form.getFieldProps(name),
     id: name,
diff --git a/site/src/components/Preferences/AccountForm.tsx b/site/src/components/Preferences/AccountForm.tsx
@@ -55,23 +55,23 @@ export const AccountForm: React.FC<AccountFormProps> = ({
       <form onSubmit={form.handleSubmit}>
         <Stack>
           <TextField
-            {...getFormHelpers<AccountFormValues>(form, "name", formErrors)}
+            {...getFormHelpers<AccountFormValues>(form, "name")}
             autoFocus
             autoComplete="name"
             fullWidth
             label={Language.nameLabel}
             variant="outlined"
           />
           <TextField
-            {...getFormHelpers<AccountFormValues>(form, "email", formErrors)}
+            {...getFormHelpers<AccountFormValues>(form, "email", formErrors.email)}
             onChange={onChangeTrimmed(form)}
             autoComplete="email"
             fullWidth
             label={Language.emailLabel}
             variant="outlined"
           />
           <TextField
-            {...getFormHelpers<AccountFormValues>(form, "username", formErrors)}
+            {...getFormHelpers<AccountFormValues>(form, "username", formErrors.username)}
             onChange={onChangeTrimmed(form)}
             autoComplete="username"
             fullWidth
diff --git a/site/src/pages/preferences/account.test.tsx b/site/src/pages/preferences/account.test.tsx
@@ -36,7 +36,7 @@ describe("PreferencesAccountPage", () => {
   })
 
   describe("when it is a success", () => {
-    it.only("shows the success message", async () => {
+    it("shows the success message", async () => {
       jest.spyOn(API, "updateProfile").mockImplementationOnce((userId, data) =>
         Promise.resolve({
           id: userId,
