Merge pull request #9214 from ohcnetwork/staging

ohcnetwork · Nov 26, 2024 · 61033e5 · 61033e5
2 parents 2a8a4a2 + a8985fc
commit 61033e5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/public/locale/en.json b/public/locale/en.json
@@ -869,6 +869,7 @@
   "middleware_hostname": "Middleware Hostname",
   "middleware_hostname_example": "e.g. example.ohc.network",
   "middleware_hostname_sourced_from": "Middleware hostname sourced from {{ source }}",
+  "min_char_length_error": "Must be at least {{ min_length }} characters",
   "min_password_len_8": "Minimum password length 8",
   "min_time_bw_doses": "Min. time b/w doses",
   "minimize": "Minimize",

diff --git a/src/common/validation.tsx b/src/common/validation.tsx
@@ -38,8 +38,7 @@ export const getRandomNumbers = (min: number, max: number) => {
 };
 
 export const validateName = (name: string) => {
-  const pattern = /^([a-zA-Z]*( [a-zA-Z])?)+$/;
-  return pattern.test(name);
+  return name.length >= 3;
 };
 
 export const validateUsername = (username: string) => {

diff --git a/src/components/Patient/PatientRegister.tsx b/src/components/Patient/PatientRegister.tsx
@@ -421,12 +421,16 @@ export const PatientRegister = (props: PatientRegisterProps) => {
     Object.keys(form).forEach((field) => {
       let phoneNumber, emergency_phone_number;
       switch (field) {
-        case "address":
-        case "name":
-          if (!validateName(form[field])) {
-            errors[field] = "Please enter valid name";
+        case "name": {
+          const requiredError = RequiredFieldValidator()(form[field]);
+          if (requiredError) {
+            errors[field] = requiredError;
+          } else if (!validateName(form[field])) {
+            errors[field] = t("min_char_length_error", { min_length: 3 });
           }
           return;
+        }
+        case "address":
         case "gender":
           errors[field] = RequiredFieldValidator()(form[field]);
           return;

diff --git a/src/components/Users/UserAdd.tsx b/src/components/Users/UserAdd.tsx
@@ -415,7 +415,7 @@ export const UserAdd = (props: UserProps) => {
               .join(" ")} is required`;
             invalidForm = true;
           } else if (!validateName(state.form[field])) {
-            errors[field] = "Please enter a valid name";
+            errors[field] = t("min_char_length_error", { min_length: 3 });
             invalidForm = true;
           }
           return;