Merge pull request #65 from AplinkosMinisterija/60-telefono-numeriu-t…

…varkymai trim phone number value on change, update validation
AplinkosMinisterija · May 8, 2024 · 9a6efb4 · 9a6efb4
2 parents b06d0a9 + d272cf3
commit 9a6efb4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/components/forms/Registration.tsx b/src/components/forms/Registration.tsx
@@ -320,7 +320,7 @@ const RegistrationForm = ({
                         error={errors.assignedTo}
                         onChange={(value: any) => {
                           setFieldValue('assignedTo', value);
-                          setFieldValue('phone', value?.phone || '');
+                          setFieldValue('phone', value?.phone?.trim() || '');
                         }}
                         options={users}
                         disabled={isCustomer}
@@ -334,7 +334,7 @@ const RegistrationForm = ({
                         error={errors.phone}
                         onChange={(e: any) => {
                           if (/^\+?[0-9\s]{0,11}$/.test(e)) {
-                            setFieldValue('phone', e);
+                            setFieldValue('phone', e.trim());
                           }
                         }}
                         disabled={isCustomer}

diff --git a/src/pages/MyProfile.tsx b/src/pages/MyProfile.tsx
@@ -95,7 +95,7 @@ const MyProfile = () => {
                   label={inputLabels.phone}
                   name="phone"
                   placeholder="864222222"
-                  onChange={(value) => setFieldValue('phone', value)}
+                  onChange={(value) => setFieldValue('phone', value?.trim())}
                   disabled={disabled}
                   error={errors.phone}
                 />

diff --git a/src/pages/TenantUsers.tsx b/src/pages/TenantUsers.tsx
@@ -255,7 +255,7 @@ const NariaiPage = () => {
                       label={inputLabels.phone}
                       name="phone"
                       placeholder="864222222"
-                      onChange={(value) => setFieldValue('phone', value)}
+                      onChange={(value) => setFieldValue('phone', value?.trim())}
                       disabled={disabled}
                       error={errors.phone}
                     />

diff --git a/src/utils/validations.ts b/src/utils/validations.ts
@@ -5,6 +5,8 @@ import { validationTexts } from './texts';
 import { FishBatch, FishType } from './types';
 import { checkIfDateIsAfter } from './functions';
 
+const lithuanianPhoneNumberFormat = /^(06|86|\+3706)\d{7}$/;
+
 export const loginSchema = Yup.object().shape({
   email: Yup.string().required(validationTexts.requireText).email(validationTexts.badEmailFormat),
   password: Yup.string().required(validationTexts.requireText),
@@ -28,8 +30,7 @@ export const validateNewTenantUser = Yup.object().shape({
     }),
   phone: Yup.string()
     .required(validationTexts.requireText)
-    .trim()
-    .matches(/^(86|\+3706)\d{7}$/, validationTexts.badPhoneFormat),
+    .matches(lithuanianPhoneNumberFormat, validationTexts.badPhoneFormat),
   personalCode: Yup.string()
     .required(validationTexts.requireText)
     .trim()
@@ -44,8 +45,7 @@ export const validateMyProfile = Yup.object().shape({
   email: Yup.string().required(validationTexts.requireText).email(validationTexts.badEmailFormat),
   phone: Yup.string()
     .required(validationTexts.requireText)
-    .trim()
-    .matches(/^(86|\+3706)\d{7}$/, validationTexts.badPhoneFormat),
+    .matches(lithuanianPhoneNumberFormat, validationTexts.badPhoneFormat),
 });
 
 export const validateFishStocking = (minTime: number) =>
@@ -59,8 +59,7 @@ export const validateFishStocking = (minTime: number) =>
     assignedTo: Yup.object().required(validationTexts.requireText).nullable(),
     phone: Yup.string()
       .required(validationTexts.requireText)
-      .trim()
-      .matches(/^(86|\+3706)\d{7}$/, validationTexts.badPhoneFormat),
+      .matches(lithuanianPhoneNumberFormat, validationTexts.badPhoneFormat),
     batches: Yup.array().of(
       Yup.object().shape({
         fishType: Yup.object()