diff --git a/front/src/Apps/Companies/AccountCompanyAdd/AccountCompanyAdd.tsx b/front/src/Apps/Companies/AccountCompanyAdd/AccountCompanyAdd.tsx index 330947a0fa..a342e6b35d 100644 --- a/front/src/Apps/Companies/AccountCompanyAdd/AccountCompanyAdd.tsx +++ b/front/src/Apps/Companies/AccountCompanyAdd/AccountCompanyAdd.tsx @@ -434,22 +434,6 @@ export default function AccountCompanyAdd() { !values.brokerReceipt?.validityLimit || !values.brokerReceipt?.receiptNumber); - const missingVhuBroyeurAgrementField = - isVhuBroyeur( - values.companyTypes, - values.wasteVehiclesTypes - ) && - (!values.vhuAgrementBroyeur?.agrementNumber || - !values.vhuAgrementBroyeur?.department); - - const missingVhuDemolisseurAgrementField = - isVhuDemolisseur( - values.companyTypes, - values.wasteVehiclesTypes - ) && - (!values.vhuAgrementDemolisseur?.agrementNumber || - !values.vhuAgrementDemolisseur?.department); - const missingCertification = isWorker(values.companyTypes) && values.workerCertification?.hasSubSectionThree && @@ -552,32 +536,6 @@ export default function AccountCompanyAdd() { } } : {}), - ...(missingVhuBroyeurAgrementField - ? { - vhuAgrementBroyeur: { - agrementNumber: !values.vhuAgrementBroyeur - ?.agrementNumber - ? "Champ requis" - : undefined, - department: !values.vhuAgrementBroyeur?.department - ? "Champ requis" - : undefined - } - } - : {}), - ...(missingVhuDemolisseurAgrementField - ? { - vhuAgrementDemolisseur: { - agrementNumber: !values.vhuAgrementDemolisseur - ?.agrementNumber - ? "Champ requis" - : undefined, - department: !values.vhuAgrementDemolisseur?.department - ? "Champ requis" - : undefined - } - } - : {}), ...(hasEcoOrganismeAgreementsErrors ? { ecoOrganismeAgreements: ecoOrganismeAgreementsErrors } : {}), diff --git a/front/src/Apps/Companies/CompanyInfo/CompanyProfileForm.tsx b/front/src/Apps/Companies/CompanyInfo/CompanyProfileForm.tsx index f46d88701a..cca000961d 100644 --- a/front/src/Apps/Companies/CompanyInfo/CompanyProfileForm.tsx +++ b/front/src/Apps/Companies/CompanyInfo/CompanyProfileForm.tsx @@ -521,8 +521,6 @@ const CompanyProfileForm = ({ company }: CompanyProfileFormProps) => { vhuAgrementBroyeurId = newAgrementData.createVhuAgrement.id; } } - } else { - // do nothing, la validation ne le permet pas normalement } } } else if (company.vhuAgrementBroyeur) { diff --git a/front/src/Apps/Companies/common/Components/CompanyTypeForm/CertificationForm.tsx b/front/src/Apps/Companies/common/Components/CompanyTypeForm/CertificationForm.tsx index 6c1647dfeb..058cfb00d3 100644 --- a/front/src/Apps/Companies/common/Components/CompanyTypeForm/CertificationForm.tsx +++ b/front/src/Apps/Companies/common/Components/CompanyTypeForm/CertificationForm.tsx @@ -90,7 +90,6 @@ const CertificationForm = ({ ); @@ -99,7 +98,6 @@ const CertificationForm = ({ ); } else { diff --git a/front/src/Apps/Companies/common/Components/CompanyTypeForm/CompanyTypeForm.tsx b/front/src/Apps/Companies/common/Components/CompanyTypeForm/CompanyTypeForm.tsx index 24a9c323ca..dd9ae4988f 100644 --- a/front/src/Apps/Companies/common/Components/CompanyTypeForm/CompanyTypeForm.tsx +++ b/front/src/Apps/Companies/common/Components/CompanyTypeForm/CompanyTypeForm.tsx @@ -73,14 +73,6 @@ export type CompanyTypeInputErrors = { validityLimit?: string; department?: string; }; - vhuAgrementBroyeur?: { - agrementNumber?: string; - department?: string; - }; - vhuAgrementDemolisseur?: { - agrementNumber?: string; - department?: string; - }; workerCertification?: { certificationNumber?: string; validityLimit?: string; diff --git a/front/src/Apps/Companies/common/Components/CompanyTypeForm/FormikCompanyTypeForm.tsx b/front/src/Apps/Companies/common/Components/CompanyTypeForm/FormikCompanyTypeForm.tsx index de995d0c82..2959ab2866 100644 --- a/front/src/Apps/Companies/common/Components/CompanyTypeForm/FormikCompanyTypeForm.tsx +++ b/front/src/Apps/Companies/common/Components/CompanyTypeForm/FormikCompanyTypeForm.tsx @@ -282,26 +282,6 @@ const FormikCompanyTypeForm = ({ ? (errors?.traderReceipt as any)?.department : null }, - vhuAgrementDemolisseur: { - agrementNumber: - isSubmitted && touched?.vhuAgrementDemolisseur - ? (errors?.vhuAgrementDemolisseur as any)?.agrementNumber - : null, - department: - isSubmitted && touched?.vhuAgrementDemolisseur - ? (errors?.vhuAgrementDemolisseur as any)?.department - : null - }, - vhuAgrementBroyeur: { - agrementNumber: - isSubmitted && touched?.vhuAgrementBroyeur - ? (errors?.vhuAgrementBroyeur as any)?.agrementNumber - : null, - department: - isSubmitted && touched?.vhuAgrementBroyeur - ? (errors?.vhuAgrementBroyeur as any)?.department - : null - }, workerCertification: { certificationNumber: isSubmitted && touched?.workerCertification diff --git a/front/src/Apps/Companies/common/Components/CompanyTypeForm/RhfCompanyTypeForm.tsx b/front/src/Apps/Companies/common/Components/CompanyTypeForm/RhfCompanyTypeForm.tsx index 16bb5ccf43..928ae1d4a3 100644 --- a/front/src/Apps/Companies/common/Components/CompanyTypeForm/RhfCompanyTypeForm.tsx +++ b/front/src/Apps/Companies/common/Components/CompanyTypeForm/RhfCompanyTypeForm.tsx @@ -305,32 +305,12 @@ const RhfCompanyTypeForm = ({ }) }, vhuAgrementBroyeur: { - agrementNumber: register("vhuAgrementBroyeur.agrementNumber", { - validate: requiredWhenCompanyType( - CompanyType.WasteVehicles, - WasteVehiclesType.Broyeur - ) - }), - department: register("vhuAgrementBroyeur.department", { - validate: requiredWhenCompanyType( - CompanyType.WasteVehicles, - WasteVehiclesType.Broyeur - ) - }) + agrementNumber: register("vhuAgrementBroyeur.agrementNumber"), + department: register("vhuAgrementBroyeur.department") }, vhuAgrementDemolisseur: { - agrementNumber: register("vhuAgrementDemolisseur.agrementNumber", { - validate: requiredWhenCompanyType( - CompanyType.WasteVehicles, - WasteVehiclesType.Demolisseur - ) - }), - department: register("vhuAgrementDemolisseur.department", { - validate: requiredWhenCompanyType( - CompanyType.WasteVehicles, - WasteVehiclesType.Demolisseur - ) - }) + agrementNumber: register("vhuAgrementDemolisseur.agrementNumber"), + department: register("vhuAgrementDemolisseur.department") }, workerCertification: { hasSubSectionThree: register( @@ -389,15 +369,6 @@ const RhfCompanyTypeForm = ({ validityLimit: errors?.traderReceipt?.validityLimit?.message, department: errors?.traderReceipt?.department?.message }, - vhuAgrementBroyeur: { - agrementNumber: errors?.vhuAgrementBroyeur?.agrementNumber?.message, - department: errors?.vhuAgrementBroyeur?.department?.message - }, - vhuAgrementDemolisseur: { - agrementNumber: - errors?.vhuAgrementDemolisseur?.agrementNumber?.message, - department: errors?.vhuAgrementDemolisseur?.department?.message - }, workerCertification: { certificationNumber: errors.workerCertification?.certificationNumber?.message, diff --git a/front/src/Apps/Companies/common/Components/CompanyTypeForm/VhuAgrementForm.tsx b/front/src/Apps/Companies/common/Components/CompanyTypeForm/VhuAgrementForm.tsx index c47e19e84c..f2edce823e 100644 --- a/front/src/Apps/Companies/common/Components/CompanyTypeForm/VhuAgrementForm.tsx +++ b/front/src/Apps/Companies/common/Components/CompanyTypeForm/VhuAgrementForm.tsx @@ -7,10 +7,6 @@ type VhuAgrementFormProps = { agrementNumber?: InputProps["nativeInputProps"]; department?: InputProps["nativeInputProps"]; }; - inputErrors?: { - agrementNumber?: string; - department?: string; - }; }; const titleStyle: CSSProperties = { @@ -19,8 +15,7 @@ const titleStyle: CSSProperties = { const VhuAgrementForm = ({ title, - inputProps, - inputErrors + inputProps }: VhuAgrementFormProps): React.JSX.Element => { return (
@@ -34,8 +29,6 @@ const VhuAgrementForm = ({ nativeInputProps={{ ...inputProps?.agrementNumber }} - state={inputErrors?.agrementNumber ? "error" : "default"} - stateRelatedMessage={inputErrors?.agrementNumber} >
@@ -45,8 +38,6 @@ const VhuAgrementForm = ({ placeholder: "75", ...inputProps?.department }} - state={inputErrors?.department ? "error" : "default"} - stateRelatedMessage={inputErrors?.department} >