From dcba7779741d329207c1f91c34ec596c3972766e Mon Sep 17 00:00:00 2001
From: Lasse Fredheim <lass@uio.no>
Date: Tue, 21 Feb 2023 16:55:27 +0100
Subject: [PATCH] Make role-end null by default
---
frontend/src/routes/sponsor/guest/newGuestRole/index.tsx | 3 ---
frontend/src/routes/sponsor/register/formData.ts | 2 +-
frontend/src/routes/sponsor/register/stepPersonForm.tsx | 2 +-
frontend/src/routes/sponsor/register/stepRegistration.tsx | 4 ++--
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/frontend/src/routes/sponsor/guest/newGuestRole/index.tsx b/frontend/src/routes/sponsor/guest/newGuestRole/index.tsx
index 9f736f30..7b158bd0 100644
--- a/frontend/src/routes/sponsor/guest/newGuestRole/index.tsx
+++ b/frontend/src/routes/sponsor/guest/newGuestRole/index.tsx
@@ -305,9 +305,6 @@ function NewGuestRole({ guest, reloadGuestInfo }: NewGuestRoleProps) {
control={control}
rules={{
required: true,
- validate: () =>
- Number(getValues('start_date')) <=
- Number(getValues('end_date')),
}}
render={({ field }) => (
<DatePicker
diff --git a/frontend/src/routes/sponsor/register/formData.ts b/frontend/src/routes/sponsor/register/formData.ts
index b0ccade7..af92bb90 100644
--- a/frontend/src/routes/sponsor/register/formData.ts
+++ b/frontend/src/routes/sponsor/register/formData.ts
@@ -3,7 +3,7 @@ export type RegisterFormData = {
last_name?: string
role_type?: number
role_start: Date
- role_end: Date
+ role_end: Date | null
contact_person_unit?: string
comment?: string
ou_id?: number
diff --git a/frontend/src/routes/sponsor/register/stepPersonForm.tsx b/frontend/src/routes/sponsor/register/stepPersonForm.tsx
index 0fa8a49f..2a212fa3 100644
--- a/frontend/src/routes/sponsor/register/stepPersonForm.tsx
+++ b/frontend/src/routes/sponsor/register/stepPersonForm.tsx
@@ -337,7 +337,7 @@ const StepPersonForm = forwardRef(
/>
)}
/>
- {!!errors.role_end && errors.role_end.type === 'required' && (
+ {!!errors.role_end && (
<Box sx={{ typography: 'caption', color: 'red' }}>
{t('validation.roleEndRequired')}
</Box>
diff --git a/frontend/src/routes/sponsor/register/stepRegistration.tsx b/frontend/src/routes/sponsor/register/stepRegistration.tsx
index 23e6034a..4fe22457 100644
--- a/frontend/src/routes/sponsor/register/stepRegistration.tsx
+++ b/frontend/src/routes/sponsor/register/stepRegistration.tsx
@@ -38,9 +38,9 @@ export default function StepRegistration() {
first_name: undefined,
last_name: undefined,
role_type: undefined,
- // Having role_start and role_end to be nullable caused problems when specifying a default value, so instead having them as non-null and use today as the default date here
+ // Having role_start to be nullable caused problems when specifying a default value, so instead having them as non-null and use today as the default date here
role_start: new Date(),
- role_end: new Date(),
+ role_end: null,
comment: undefined,
ou_id: undefined,
email: undefined,
--
GitLab