Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tra-15262]Rendre optionnel les agréments à l'inscription d'un centre VHU (broyeur et/ou casse auto) #3972

Merged
merged 1 commit into from
Feb 17, 2025
+5 −117
Merged

[tra-15262]Rendre optionnel les agréments à l'inscription d'un centre VHU (broyeur et/ou casse auto) #3972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions front/src/Apps/Companies/AccountCompanyAdd/AccountCompanyAdd.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down Expand Up @@ -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 }
: {}),
Expand Down
2 changes: 0 additions & 2 deletions front/src/Apps/Companies/CompanyInfo/CompanyProfileForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 0 additions & 2 deletions front/src/Apps/Companies/common/Components/CompanyTypeForm/CertificationForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ const CertificationForm = ({
<VhuAgrementForm
title="Agrément broyeur"
inputProps={inputProps?.vhuAgrementBroyeur}
inputErrors={inputErrors?.vhuAgrementBroyeur}
/>
</div>
);
Expand All @@ -99,7 +98,6 @@ const CertificationForm = ({
<VhuAgrementForm
title="Agrément démolisseur / casse automobile"
inputProps={inputProps?.vhuAgrementDemolisseur}
inputErrors={inputErrors?.vhuAgrementDemolisseur}
/>
);
} else {
Expand Down
8 changes: 0 additions & 8 deletions front/src/Apps/Companies/common/Components/CompanyTypeForm/CompanyTypeForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 0 additions & 20 deletions front/src/Apps/Companies/common/Components/CompanyTypeForm/FormikCompanyTypeForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 4 additions & 33 deletions front/src/Apps/Companies/common/Components/CompanyTypeForm/RhfCompanyTypeForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
Expand Down
11 changes: 1 addition & 10 deletions front/src/Apps/Companies/common/Components/CompanyTypeForm/VhuAgrementForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ type VhuAgrementFormProps = {
agrementNumber?: InputProps["nativeInputProps"];
department?: InputProps["nativeInputProps"];
};
inputErrors?: {
agrementNumber?: string;
department?: string;
};
};

const titleStyle: CSSProperties = {
Expand All @@ -19,8 +15,7 @@ const titleStyle: CSSProperties = {

const VhuAgrementForm = ({
title,
inputProps,
inputErrors
inputProps
}: VhuAgrementFormProps): React.JSX.Element => {
return (
<div>
Expand All @@ -34,8 +29,6 @@ const VhuAgrementForm = ({
nativeInputProps={{
...inputProps?.agrementNumber
}}
state={inputErrors?.agrementNumber ? "error" : "default"}
stateRelatedMessage={inputErrors?.agrementNumber}
></Input>
</div>
<div className="fr-col-3">
Expand All @@ -45,8 +38,6 @@ const VhuAgrementForm = ({
placeholder: "75",
...inputProps?.department
}}
state={inputErrors?.department ? "error" : "default"}
stateRelatedMessage={inputErrors?.department}
></Input>
</div>
</div>
Expand Down