TRA-14096: Permettre de modifier les intermédiaires jusqu'à la signature de la réception par la destination (BSDD) - ÉTAPE 2

back/src/forms/__tests__/edition.integration.ts

@@ -522,7 +522,7 @@ describe("checkEditionRules", () => {
     expect(checked).toEqual(true);
   });
 
-  it("should not be possible to change intermediaries when the form is signed by emitter", async () => {
+  it("should be possible to change intermediaries when the form is signed by emitter (before RECEIVED)", async () => {
     const destination = await userWithCompanyFactory("MEMBER");
     const intermediary1 = await userWithCompanyFactory("MEMBER");
     const intermediary2 = await userWithCompanyFactory("MEMBER");
@@ -538,12 +538,11 @@ describe("checkEditionRules", () => {
     const fullForm = await getFullForm(form);
     const input: UpdateFormInput = {
       id: form.id,
-      intermediaries: [toIntermediaryCompany(intermediary2.company)] // try changing the intermediary
+      intermediaries: [toIntermediaryCompany(intermediary2.company)]
     };
     const checkFn = () => checkEditionRules(fullForm, input, destination.user);
-    await expect(checkFn).rejects.toThrow(
-      "Des champs ont été verrouillés via signature et ne peuvent plus être modifiés : intermediaries"
-    );
+
+    await expect(checkFn()).resolves.toBe(true);
   });
 
   it("should be possible to resend same intermediaries info when the form is is signed by emitter", async () => {

back/src/forms/edition.ts

@@ -159,7 +159,7 @@ export const editionRules: {
   grouping: "EMISSION",
   transporters: "RECEPTION",
   forwardedIn: "EMISSION",
-  intermediaries: "EMISSION"
+  intermediaries: "RECEPTION"
 };
 
 export async function checkEditionRules(

back/src/forms/resolvers/mutations/__tests__/markAsAccepted.integration.ts

@@ -479,14 +479,14 @@ describe("Test Form reception", () => {
       expect.objectContaining({
         subject:
           "Le déchet de l’entreprise company_1 a été partiellement refusé à réception",
-        to: [
+        to: expect.arrayContaining([
           { email: emitter.email, name: emitter.name },
           { email: emitter2.email, name: emitter2.name }
-        ],
-        cc: [
+        ]),
+        cc: expect.arrayContaining([
           { email: recipient.email, name: recipient.name },
           { email: recipient2.email, name: recipient2.name }
-        ]
+        ])
       })
     );
   });

back/src/forms/resolvers/mutations/__tests__/updateForm.integration.ts

@@ -293,7 +293,7 @@ describe("Mutation.updateForm", () => {
     expect(errors).toBeUndefined();
   });
 
-  it("should not be possible to update intermediaries when emitter has signed", async () => {
+  it("should not be possible to update intermediaries when form is RECEIVED", async () => {
     const emitter = await userWithCompanyFactory("ADMIN");
     const destination = await userWithCompanyFactory("ADMIN", {
       companyTypes: [CompanyType.WASTEPROCESSOR],
@@ -304,10 +304,11 @@ describe("Mutation.updateForm", () => {
     const form = await formFactory({
       ownerId: emitter.user.id,
       opt: {
-        status: "SIGNED_BY_PRODUCER",
+        status: "RECEIVED",
         emitterCompanySiret: emitter.company.siret,
         recipientCompanySiret: destination.company.siret,
         emittedAt: new Date(),
+        receivedAt: new Date(),
         intermediaries: { create: toIntermediaryCompany(intermediary1) }
       }
     });

front/src/Apps/Forms/Components/CompanyContactInfo/CompanyContactInfo.tsx

@@ -26,7 +26,8 @@ interface CompanyContactInfoProps {
  *
  */
 export default function CompanyContactInfo({
-  fieldName
+  fieldName,
+  disabled
 }: CompanyContactInfoProps) {
   const [, { error: contactError, touched: contactTouched }] = useField({
     name: `${fieldName}.contact`
@@ -48,6 +49,7 @@ export default function CompanyContactInfo({
             {({ field }) => (
               <Input
                 label="Personne à contacter"
+                disabled={disabled}
                 state={contactError && contactTouched ? "error" : "default"}
                 stateRelatedMessage={contactError}
                 nativeInputProps={field}
@@ -62,6 +64,7 @@ export default function CompanyContactInfo({
             {({ field }) => (
               <Input
                 label="Téléphone"
+                disabled={disabled}
                 state={phoneError && phoneTouched ? "error" : "default"}
                 stateRelatedMessage={phoneError}
                 nativeInputProps={field}
@@ -74,6 +77,7 @@ export default function CompanyContactInfo({
             {({ field }) => (
               <Input
                 label="Courriel"
+                disabled={disabled}
                 state={mailError && mailTouched ? "error" : "default"}
                 stateRelatedMessage={mailError}
                 nativeInputProps={{ ...field, type: "email" }}

front/src/Apps/Forms/Components/IntermediaryList/FormikIntermediaryList.tsx

@@ -79,10 +79,14 @@ function FormikIntermediaryList({
                       }
                     }}
                   />
-                  <CompanyContactInfo fieldName={`intermediaries.${idx}`} />
+                  <CompanyContactInfo
+                    disabled={disabled}
+                    fieldName={`intermediaries.${idx}`}
+                  />
                   {values.intermediaries.length > 1 && (
                     <button
                       type="button"
+                      disabled={disabled}
                       className="fr-btn fr-btn--tertiary fr-mb-2w"
                       onClick={() => remove(idx)}
                     >
@@ -97,6 +101,7 @@ function FormikIntermediaryList({
                 <div className="fr-grid-row fr-grid-row--right fr-mb-4w">
                   <button
                     type="button"
+                    disabled={disabled}
                     className="fr-btn fr-btn--secondary"
                     onClick={() => {
                       push(getInitialCompany());

front/src/form/bsdd/FormContainer.tsx

@@ -26,6 +26,7 @@ export default function FormContainer() {
                 (!!form.emittedAt && !isEmitter));
 
             const disabledAfterTransport = !!form && !!form.takenOverAt;
+            const intermediariesDisabled = !!form?.receivedAt;
 
             return (
               <>
@@ -41,7 +42,12 @@ export default function FormContainer() {
                   disabled={disabledAfterEmission}
                 />
                 <StepContainer
-                  component={Recipient}
+                  component={props => (
+                    <Recipient
+                      {...props}
+                      intermediariesDisabled={intermediariesDisabled}
+                    />
+                  )}
                   title="Destination du déchet"
                   disabled={disabledAfterEmission}
                 />

front/src/form/bsdd/Recipient.tsx

@@ -16,7 +16,7 @@ import FormikBroker from "../../Apps/Forms/Components/Broker/FormikBroker";
 import FormikTrader from "../../Apps/Forms/Components/Trader/FormikTrader";
 import FormikIntermediaryList from "../../Apps/Forms/Components/IntermediaryList/FormikIntermediaryList";
 
-export default function Recipient({ disabled }) {
+export default function Recipient({ disabled, intermediariesDisabled }) {
   const { siret } = useParams<{ siret: string }>();
 
   const { values, setFieldValue } = useFormikContext<Form>();
@@ -143,7 +143,10 @@ Il est important car il qualifie les conditions de gestion et de traitement du d
           siret={siret}
           disabled={disabled}
         />
-        <FormikIntermediaryList siret={siret} disabled={disabled} />
+        <FormikIntermediaryList
+          siret={siret}
+          disabled={intermediariesDisabled}
+        />
       </div>
     </>
   );