From dc960d95f398af62f065f74c4ddab3f333f90d39 Mon Sep 17 00:00:00 2001
From: Tore Brede <Tore.Brede@uib.no>
Date: Mon, 22 Nov 2021 12:23:15 +0100
Subject: [PATCH] GREG-113: Setting default value to blank for date of birth
---
frontend/src/routes/guest/register/registerPage.tsx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/frontend/src/routes/guest/register/registerPage.tsx b/frontend/src/routes/guest/register/registerPage.tsx
index 5de260df..5e99ea2b 100644
--- a/frontend/src/routes/guest/register/registerPage.tsx
+++ b/frontend/src/routes/guest/register/registerPage.tsx
@@ -130,6 +130,7 @@ const GuestRegisterStep = forwardRef(
const maxBirthDate = subYears(1)(today)
useEffect(() => {
+ // Take values coming from the server, if present, and insert them into the form
setCountryCode(guestData.countryForCallingCode)
setValue(
'mobilePhoneCountry',
@@ -141,6 +142,7 @@ const GuestRegisterStep = forwardRef(
'mobilePhone',
guestData.mobile_phone ? guestData.mobile_phone : ''
)
+ setValue('dateOfBirth', guestData.dateOfBirth)
}, [guestData])
function doSubmit() {
@@ -225,11 +227,15 @@ const GuestRegisterStep = forwardRef(
<Controller
name="dateOfBirth"
control={control}
+ rules={{
+ required: true,
+ }}
render={({ field }) => (
<DatePicker
mask="____-__-__"
label={t('input.dateOfBirth')}
- value={field.value}
+ // If value is set to undefined the birth date is set to today. Using null makes the field blank
+ value={field.value === undefined ? null : field.value}
minDate={minBirthDate}
maxDate={maxBirthDate}
inputFormat="yyyy-MM-dd"
--
GitLab