From 9e8aebb535df7de62725fccb46c39821fb63e043 Mon Sep 17 00:00:00 2001 From: shubhamv-ss Date: Tue, 17 Dec 2024 17:21:29 +0530 Subject: [PATCH] fix: worked on the PR feedback --- CHANGELOG.md | 1 - src/components/CompanyData/AddressForm.tsx | 3 +-- .../CompanyData/CompanyDataForm.tsx | 10 +++----- src/components/CompanyData/Identiifier.tsx | 4 +--- src/helpers/constants.ts | 4 +--- src/helpers/validation.ts | 24 +++++++++---------- src/locales/de/translations.json | 2 +- src/locales/en/translations.json | 2 ++ 8 files changed, 20 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e0e471..109db03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ ### Bugfix -- refactor, optimise and reorganise the code in cax-companyData.tsx file [#317](https://github.com/eclipse-tractusx/portal-frontend-registration/pull/317) - created a new component for form header to avoid duplication of code in each step [#310](https://github.com/eclipse-tractusx/portal-frontend-registration/pull/310) ## 2.1.0 diff --git a/src/components/CompanyData/AddressForm.tsx b/src/components/CompanyData/AddressForm.tsx index a163c4d..07c3ac2 100644 --- a/src/components/CompanyData/AddressForm.tsx +++ b/src/components/CompanyData/AddressForm.tsx @@ -1,6 +1,5 @@ /******************************************************************************** - * Copyright (c) 2022 Microsoft and BMW Group AG - * Copyright (c) 2022 Contributors to the Eclipse Foundation + * Copyright (c) 2024 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. diff --git a/src/components/CompanyData/CompanyDataForm.tsx b/src/components/CompanyData/CompanyDataForm.tsx index c04a0ce..09a60f3 100644 --- a/src/components/CompanyData/CompanyDataForm.tsx +++ b/src/components/CompanyData/CompanyDataForm.tsx @@ -1,6 +1,5 @@ /******************************************************************************** - * Copyright (c) 2022 Microsoft and BMW Group AG - * Copyright (c) 2022 Contributors to the Eclipse Foundation + * Copyright (c) 2024 Contributors to the Eclipse Foundation * * See the NOTICE file(s) distributed with this work for additional * information regarding copyright ownership. @@ -70,7 +69,6 @@ const CompanyDataForm: React.FC = ({ if (isBPN(expr?.trim())) { fetchData(expr).catch((errorCode: number) => { setFields(null) - console.log('errorCode', errorCode) setBpnErrorMessage(t('registrationStepOne.bpnNotExistError')) }) setBpnErrorMessage('') @@ -109,8 +107,7 @@ const CompanyDataForm: React.FC = ({ {t('registrationStepOne.bpn')}{' '} @@ -128,8 +125,7 @@ const CompanyDataForm: React.FC = ({ * {' '} { + setLegalEntity: (value: string) => void, + setErrors: (errors) => void +): void => { setLegalEntity(value) validate(value, Patterns.legalEntityPattern, 'legalEntityError', (error) => { setErrors((prevState) => ({ @@ -44,8 +42,8 @@ export const validateLegalEntity = ( export const validateRegisteredName = ( value: string, - setRegisteredName: any, - setErrors: any + setRegisteredName: (value: string) => void, + setErrors: (errors) => void ) => { setRegisteredName(value) validate( @@ -63,8 +61,8 @@ export const validateRegisteredName = ( export const validatePostalCode = ( value: string, - setPostalCode: any, - setErrors: any + setPostalCode: (value: string) => void, + setErrors: (errors) => void ) => { setPostalCode(value) validate(value, Patterns.postalCodePattern, 'postalCodeError', (error) => { @@ -75,7 +73,7 @@ export const validatePostalCode = ( }) } -export const validateCity = (value: string, setCity: any, setErrors: any) => { +export const validateCity = (value: string, setCity: (value: string) => void, setErrors: (errors)=>void) => { setCity(value) validate(value, Patterns.CITY, 'cityError', (error) => { setErrors((prevState) => ({ @@ -87,8 +85,8 @@ export const validateCity = (value: string, setCity: any, setErrors: any) => { export const validateStreetHouseNumber = ( value: string, - setStreetHouseNumber: any, - setErrors: any + setStreetHouseNumber: (value: string) => void, + setErrors: (errors) => void ) => { setStreetHouseNumber(value) validate(value, Patterns.STREET, 'streetHouseNumberError', (error) => { diff --git a/src/locales/de/translations.json b/src/locales/de/translations.json index 449c342..cc722c8 100644 --- a/src/locales/de/translations.json +++ b/src/locales/de/translations.json @@ -64,7 +64,7 @@ "bpnInvalidError": "The BPN is invalid, please enter a valid BPN or use the manual flow below. Hint: A BPN has 16-digits.", "bpnNotExistError": "This BPN doesn't exist, please enter a valid BPN or use the manual flow below.", "legalEntityError": "Bitte geben Sie einen gültigen Wert für die juristische Person ein.", - "registerdNameError": "Bitte geben Sie einen gültigen registrierten Namen ein.", + "registeredNameError": "Bitte geben Sie einen gültigen registrierten Namen ein.", "streetHouseNumberError": "Bitte geben Sie eine gültige Straße und Hausnummer ein.", "regionError": "Bitte geben Sie einen gültigen Region.", "postalCodeError": "Bitte geben Sie eine gültige Postleitzahl ein.", diff --git a/src/locales/en/translations.json b/src/locales/en/translations.json index b4862b6..4191c57 100644 --- a/src/locales/en/translations.json +++ b/src/locales/en/translations.json @@ -42,7 +42,9 @@ "seachDatabase": "Search for your company data by BPN to autofill the relevant data fields", "enterManualText": "or enter your data manually:", "bpn": "Business Partner Number", + "bpnTooltip": "Displays the bpn and can't get eddited.", "legalEntity": "Legal Entity Name", + "legalEntityTooltip": "Legal Company Name", "helperText": "In case you enter your data manually, this field fill be locked.", "registeredName": "Registered Name", "organizationAdd": "Organization Address",