feat(company data): improved white space handling for company data

Move trimming to onBlur and save. Refs: eclipse-tractusx#190
Cofinity-X · Jul 9, 2024 · a34fb0b · a34fb0b
1 parent 2e65e06
commit a34fb0b
Showing 1 changed file with 45 additions and 18 deletions.
diff --git a/src/components/cax-companyData.tsx b/src/components/cax-companyData.tsx
@@ -206,7 +206,7 @@ export const CompanyDataCax = () => {
   }
 
   const onSearchChange = (expr: string) => {
-    if (isBPN(expr)) {
+    if (isBPN(expr?.trim())) {
       fetchData(expr)
         // make sure to catch any error
         .catch((errorCode: number) => {
@@ -222,7 +222,7 @@ export const CompanyDataCax = () => {
   const validateLegalEntity = (value: string) => {
     setLegalEntity(value)
 
-    if (!Patterns.legalEntityPattern.test(value)) {
+    if (!Patterns.legalEntityPattern.test(value?.trim())) {
       setErrors((prevState) => ({
         ...prevState,
         legalEntity: 'legalEntityError',
@@ -236,7 +236,7 @@ export const CompanyDataCax = () => {
   const validateRegisteredName = (value: string) => {
     setRegisteredName(value)
 
-    if (!Patterns.registeredNamePattern.test(value)) {
+    if (!Patterns.registeredNamePattern.test(value?.trim())) {
       setErrors((prevState) => ({
         ...prevState,
         registeredName: 'registerdNameError',
@@ -250,7 +250,7 @@ export const CompanyDataCax = () => {
   const validateStreetHouseNumber = (value: string) => {
     setStreetHouseNumber(value)
 
-    if (!isStreet(value)) {
+    if (!isStreet(value?.trim())) {
       setErrors((prevState) => ({
         ...prevState,
         streetHouseNumber: 'streetHouseNumberError',
@@ -269,7 +269,7 @@ export const CompanyDataCax = () => {
       return
     }
 
-    if (!Patterns.postalCodePattern.test(value)) {
+    if (!Patterns.postalCodePattern.test(value?.trim())) {
       setErrors((prevState) => ({
         ...prevState,
         postalCode: 'postalCodeError',
@@ -283,7 +283,7 @@ export const CompanyDataCax = () => {
   const validateCity = (value: string) => {
     setCity(value)
 
-    if (!isCity(value)) {
+    if (!isCity(value?.trim())) {
       setErrors((prevState) => ({
         ...prevState,
         city: 'cityError',
@@ -297,7 +297,7 @@ export const CompanyDataCax = () => {
   const validateCountry = (value: string) => {
     setChangedCountryValue(true)
     setCountry(value?.toUpperCase())
-    if (!Patterns.countryPattern.test(value)) {
+    if (!Patterns.countryPattern.test(value?.trim())) {
       setShowIdentifiers(false)
       setErrors((prevState) => ({
         ...prevState,
@@ -318,7 +318,7 @@ export const CompanyDataCax = () => {
       setErrors((prevState) => ({ ...prevState, region: '' }))
     }
 
-    if (value && !Patterns.regionPattern.test(value)) {
+    if (value && !Patterns.regionPattern.test(value?.trim())) {
       setErrors((prevState) => ({
         ...prevState,
         region: 'regionError',
@@ -341,7 +341,7 @@ export const CompanyDataCax = () => {
         : 'Worldwide'
     if (
       identifierType &&
-      !Patterns[countryCode][identifierType].test(value)
+      !Patterns[countryCode][identifierType].test(value?.trim())
     ) {
       setErrors((prevState) => ({
         ...prevState,
@@ -367,18 +367,18 @@ export const CompanyDataCax = () => {
 
   const nextClick = () => {
     const companyData = { ...companyDetails }
-    companyData.bpn = bpn
-    companyData.name = legalEntity
-    companyData.shortName = registeredName
-    companyData.streetName = streetHouseNumber
-    companyData.region = region
-    companyData.city = city
-    companyData.zipCode = postalCode
-    companyData.countryAlpha2Code = country
+    companyData.bpn = bpn?.trim()
+    companyData.name = legalEntity?.trim()
+    companyData.shortName = registeredName?.trim()
+    companyData.streetName = streetHouseNumber?.trim()
+    companyData.region = region?.trim()
+    companyData.city = city?.trim()
+    companyData.zipCode = postalCode?.trim()
+    companyData.countryAlpha2Code = country?.trim()
     companyData.uniqueIds = [
       {
         type: identifierType,
-        value: identifierNumber,
+        value: identifierNumber?.trim(),
       },
     ]
     //addCompanyData(companyData)
@@ -420,6 +420,9 @@ export const CompanyDataCax = () => {
                 onChange={(expr) => {
                   onSearchChange(expr)
                 }}
+                onBlur={(e) => {
+                  setBpn(e.target.value.trim())
+                }}
               />
               <label className="error-message">{bpnErrorMsg}</label>
             </div>
@@ -469,6 +472,9 @@ export const CompanyDataCax = () => {
                 onChange={(e) => {
                   validateLegalEntity(e.target.value)
                 }}
+                onBlur={(e) => {
+                  setLegalEntity(e.target.value.trim())
+                }}
               />
               {errors.legalEntity && (
                 <label>{t(`registrationStepOne.${errors.legalEntity}`)}</label>
@@ -489,6 +495,9 @@ export const CompanyDataCax = () => {
                 onChange={(e) => {
                   validateRegisteredName(e.target.value)
                 }}
+                onBlur={(e) => {
+                  setRegisteredName(e.target.value.trim())
+                }}
               />
               {errors.registeredName && (
                 <label>
@@ -516,6 +525,9 @@ export const CompanyDataCax = () => {
                 onChange={(e) => {
                   validateStreetHouseNumber(e.target.value)
                 }}
+                onBlur={(e) => {
+                  setStreetHouseNumber(e.target.value.trim())
+                }}
               />
               {errors.streetHouseNumber && (
                 <label>
@@ -534,6 +546,9 @@ export const CompanyDataCax = () => {
                 onChange={(e) => {
                   validatePostalCode(e.target.value)
                 }}
+                onBlur={(e) => {
+                  setPostalCode(e.target.value.trim())
+                }}
               />
               {errors.postalCode && (
                 <label>{t(`registrationStepOne.${errors.postalCode}`)}</label>
@@ -551,6 +566,9 @@ export const CompanyDataCax = () => {
                 onChange={(e) => {
                   validateCity(e.target.value)
                 }}
+                onBlur={(e) => {
+                  setCity(e.target.value.trim())
+                }}
               />
               {errors.city && (
                 <label>{t(`registrationStepOne.${errors.city}`)}</label>
@@ -595,6 +613,9 @@ export const CompanyDataCax = () => {
                 onChange={(e) => {
                   validateRegion(e.target.value)
                 }}
+                onBlur={(e) => {
+                  setRegion(e.target.value.trim())
+                }}
               />
               {errors.region && (
                 <label>{t(`registrationStepOne.${errors.region}`)}</label>
@@ -624,6 +645,9 @@ export const CompanyDataCax = () => {
                         onChange={() => {
                           handleIdentifierSelect(id.type, id.value)
                         }}
+                        onBlur={(e) => {
+                          setIdentifierNumber(e.target.value.trim())
+                        }}
                         defaultChecked={uniqueIds[0].type === id.type}
                       />
                       <label>
@@ -685,6 +709,9 @@ export const CompanyDataCax = () => {
                       onChange={(e) => {
                         validateIdentifierNumber(e.target.value)
                       }}
+                      onBlur={(e) => {
+                        setIdentifierNumber(e.target.value.trim())
+                      }}
                     />
                     {errors.identifierNumber && (
                       <label>