Fix empty national id

island-is · Dec 5, 2024 · 15d5e0e · 15d5e0e
1 parent 40991f3
commit 15d5e0e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 38 deletions.
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Advocates/SelectDefender.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Advocates/SelectDefender.tsx
@@ -43,16 +43,16 @@ const SelectDefender: FC<Props> = ({ defendant }) => {
         caseId,
         defendantId: defendant.id,
         defenderNationalId: defendantWaivesRightToCounsel
-          ? ''
-          : defendant.defenderNationalId,
+          ? null
+          : defendant.defenderNationalId || null,
         defenderName: defendantWaivesRightToCounsel
-          ? ''
+          ? null
           : defendant.defenderName,
         defenderEmail: defendantWaivesRightToCounsel
-          ? ''
+          ? null
           : defendant.defenderEmail,
         defenderPhoneNumber: defendantWaivesRightToCounsel
-          ? ''
+          ? null
           : defendant.defenderPhoneNumber,
         defenderChoice:
           defendantWaivesRightToCounsel === true

diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/Defendant.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Defendant/Defendant.tsx
@@ -370,7 +370,6 @@ const Defendant = () => {
           router.push(`${destination}/${createdCase.id}`)
         } else {
           toast.error(formatMessage(errors.createCase))
-          return
         }
       } else {
         router.push(`${destination}/${workingCase.id}`)
@@ -416,14 +415,7 @@ const Defendant = () => {
 
   const handleCreateDefendantClick = async () => {
     if (workingCase.id) {
-      const defendantId = await createDefendant({
-        caseId: workingCase.id,
-        gender: undefined,
-        name: '',
-        address: '',
-        nationalId: null,
-        citizenship: '',
-      })
+      const defendantId = await createDefendant({ caseId: workingCase.id })
 
       createEmptyDefendant(defendantId)
     } else {
@@ -438,14 +430,7 @@ const Defendant = () => {
       ...prevWorkingCase,
       defendants: prevWorkingCase.defendants && [
         ...prevWorkingCase.defendants,
-        {
-          id: defendantId || uuid(),
-          gender: undefined,
-          name: '',
-          nationalId: null,
-          address: '',
-          citizenship: '',
-        } as TDefendant,
+        { id: defendantId || uuid() },
       ],
     }))
   }

diff --git a/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/Defendant/Defendant.tsx b/apps/judicial-system/web/src/routes/Prosecutor/InvestigationCase/Defendant/Defendant.tsx
@@ -192,14 +192,7 @@ const Defendant = () => {
 
   const handleCreateDefendantClick = async () => {
     if (workingCase.id) {
-      const defendantId = await createDefendant({
-        caseId: workingCase.id,
-        gender: undefined,
-        name: '',
-        address: '',
-        nationalId: '',
-        citizenship: '',
-      })
+      const defendantId = await createDefendant({ caseId: workingCase.id })
 
       createEmptyDefendant(defendantId)
     } else {
@@ -214,14 +207,7 @@ const Defendant = () => {
       ...prevWorkingCase,
       defendants: prevWorkingCase.defendants && [
         ...prevWorkingCase.defendants,
-        {
-          id: defendantId || uuid(),
-          gender: undefined,
-          name: '',
-          nationalId: '',
-          address: '',
-          citizenship: '',
-        } as TDefendant,
+        { id: defendantId || uuid() },
       ],
     }))
   }