fix(Wrong validation for email in contact #448): fixed email validation error

Author: valeriocomo

go.work.sum

@@ -22,10 +22,12 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=

src/app/components/EditorContacts.tsx

@@ -9,11 +9,12 @@ import { get } from "lodash";
 import { useController, useFieldArray, useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import PublicCode from "../contents/publiccode";
 import { useRef } from "react";
+import PublicCode from "../contents/publiccode";
 
 const fieldName = "maintenance.contacts";
 const subfields = ["name", "email", "phone", "affiliation"] as const;
+const setValueAsUndefinedFields = new Set(["email", "phone", "affiliation"]);
 
 export default function EditorContacts(): JSX.Element {
   const { control, register } = useFormContext<PublicCode, typeof fieldName>();
@@ -80,7 +81,10 @@ export default function EditorContacts(): JSX.Element {
                   <th scope="row">{index + 1}</th>
                   {subfields.map((subfield) => {
                     const { ref, ...reg } = register(
-                      `${fieldName}.${index}.${subfield}`
+                      `${fieldName}.${index}.${subfield}`,
+                      {
+                        setValueAs: value => setValueAsUndefinedFields.has(subfield) && value === "" ? undefined : value
+                      }
                     );
 
                     return (

src/app/components/EditorContractors.tsx

@@ -7,6 +7,7 @@ import PublicCode from "../contents/publiccode";
 
 const fieldName = "maintenance.contractors";
 const subfields = ["name", "until", "email", "website"] as const;
+const setValueAsUndefinedFields = new Set(["email", "website"]);
 
 export default function EditorContractors(): JSX.Element {
   const { control, register } = useFormContext<PublicCode, typeof fieldName>();
@@ -60,7 +61,10 @@ export default function EditorContractors(): JSX.Element {
                   <th scope="row">{index + 1}</th>
                   {subfields.map((subfield) => {
                     const { ref, ...reg } = register(
-                      `${fieldName}.${index}.${subfield}`
+                      `${fieldName}.${index}.${subfield}`,
+                      {
+                        setValueAs: (value: string | Date) => setValueAsUndefinedFields.has(subfield) && value === "" ? undefined : value
+                      }
                     );
 
                     return (