fix: remove name regex

non-profit-dev · Nov 13, 2024 · dc44ede · dc44ede
1 parent 9e99d78
commit dc44ede
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 30 deletions.
diff --git a/packages/frontend/app/templates/Contact/components/Form/Form.jsx b/packages/frontend/app/templates/Contact/components/Form/Form.jsx
@@ -10,7 +10,7 @@ import Textarea from "design-system/components/textarea"
 import Button from "design-system/components/button"
 import Checkbox from "design-system/components/checkbox"
 
-import { firstNameRegex, emailRegex } from "shared/regex"
+import { emailRegex } from "shared/regex"
 
 import * as Styled from "./Form.styled"
 
@@ -61,10 +61,6 @@ const Form = ({ handleSubmit, submitting }) => {
                 value: 20,
                 message: "Maksymalna ilość znaków to 20",
               },
-              pattern: {
-                value: firstNameRegex,
-                message: "Wpisz poprawne imię (tylko litery)",
-              },
             })}
             message={errors.firstName ? errors.firstName.message : ""}
           />

diff --git a/.../templates/VirtualAdoption/components/PaymentConfirmationForm/PaymentConfirmationForm.jsx b/.../templates/VirtualAdoption/components/PaymentConfirmationForm/PaymentConfirmationForm.jsx
@@ -10,7 +10,7 @@ import Checkbox from "design-system/components/checkbox"
 import Select from "design-system/components/select"
 import Illustration from "design-system/components/illustration/Illustration"
 
-import { firstNameRegex, lastNameRegex, emailRegex } from "shared/regex"
+import { emailRegex } from "shared/regex"
 
 import * as Styled from "./PaymentConfirmationForm.styled"
 
@@ -110,10 +110,6 @@ const PaymentConfirmationForm = ({ data }) => {
                   value: 30,
                   message: "Maksymalna ilość znaków to 30",
                 },
-                pattern: {
-                  value: firstNameRegex,
-                  message: "Wpisz poprawne imię (tylko litery)",
-                },
               })}
               message={errors.firstName ? errors.firstName.message : ""}
             />
@@ -124,23 +120,13 @@ const PaymentConfirmationForm = ({ data }) => {
               state={determineInputState("lastName")}
               {...register("lastName", {
                 required: "To pole jest wymagane",
-                validate: {
-                  customLength: (value) => {
-                    const includesDash = value.includes("-")
-                    if (includesDash && value.length < 5) {
-                      return "Każda część nazwiska musi mieć min. 2 znaki"
-                    }
-                    if (!includesDash && value.length < 2) {
-                      return "Minimalna ilość znaków to 2"
-                    }
-                    if (value.length > 70) {
-                      return "Maksymalna ilość znaków to 70"
-                    }
-                    if (lastNameRegex.test(value)) {
-                      return "Wpisz poprawne nazwisko"
-                    }
-                    return true
-                  },
+                minLength: {
+                  value: 2,
+                  message: "Minimalna ilość znaków to 2",
+                },
+                maxLength: {
+                  value: 30,
+                  message: "Maksymalna ilość znaków to 30",
                 },
               })}
               message={errors.lastName ? errors.lastName.message : ""}

diff --git a/packages/shared/regex/index.js b/packages/shared/regex/index.js
@@ -1,5 +1,3 @@
-const firstNameRegex = /^[A-Za-z]+$/i
-const lastNameRegex = !/^[A-Za-z]{2,}(-[A-Za-z]{2,})?$/i
 const emailRegex = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/i
 
-export { firstNameRegex, lastNameRegex, emailRegex }
+export { emailRegex }