Merge pull request #3573 from webkom/ivarnakken/aba-234-give-user-war…

…ning-when-typing
webkom · Feb 17, 2023 · ca21aa0 · ca21aa0
2 parents 460f9b2 + e3499bc
commit ca21aa0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/app/routes/users/components/UserSettings.tsx b/app/routes/users/components/UserSettings.tsx
@@ -12,7 +12,12 @@ import type { UserEntity } from 'app/reducers/users';
 import DeleteUser from 'app/routes/users/components/DeleteUser';
 import RemovePicture from 'app/routes/users/components/RemovePicture';
 import { spySubmittable } from 'app/utils/formSpyUtils';
-import { createValidator, required, isEmail } from 'app/utils/validation';
+import {
+  createValidator,
+  required,
+  isEmail,
+  isValidAllergy,
+} from 'app/utils/validation';
 import ChangePassword from './ChangePassword';
 import UserImage from './UserImage';
 import styles from './UserSettings.css';
@@ -52,6 +57,7 @@ const validate = createValidator({
   lastName: [required()],
   gender: [required()],
   email: [required(), isEmail()],
+  allergies: [isValidAllergy()],
 });
 
 const UserSettings = (props: Props) => {
@@ -67,7 +73,9 @@ const UserSettings = (props: Props) => {
     updateUser,
   } = props;
   const showAbakusMembership = user.isStudent;
+
   const onSubmit = (values: FormValues) => updateUser(values);
+
   return (
     <div>
       <div className={styles.pictureSection}>
@@ -130,8 +138,10 @@ const UserSettings = (props: Props) => {
                 component={RadioButton.Field}
               />
             </RadioButtonGroup>
+
             <Field
               label="Matallergier/preferanser"
+              parse={(value) => value}
               name="allergies"
               component={TextInput.Field}
             />

diff --git a/app/utils/validation.ts b/app/utils/validation.ts
@@ -53,6 +53,16 @@ export const timeIsAfter = (otherField, message) => (value, context) => {
   return [true];
 };
 
+export const isValidAllergy =
+  (
+    message = 'La feltet stå tomt hvis du ikke har noen allergier/preferanser'
+  ) =>
+  (value: string) => {
+    const notValidAnswers = ['ingen', 'ingenting', 'nei', 'nope', 'nada'];
+
+    return [!notValidAnswers.includes(value.toLowerCase()), message];
+  };
+
 export const ifField = (field, validator) => (value, context) =>
   context[field] ? validator(value, context) : [true];