prendre en compte le transporteur étranger (#3782)

MTES-MCT · Dec 3, 2024 · 4759a3f · 4759a3f
2 parents 16c99e9 + 9efb336
commit 4759a3f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 38 deletions.
diff --git a/front/src/Apps/Dashboard/Creation/bsvhu/BsvhuFormSteps.tsx b/front/src/Apps/Dashboard/Creation/bsvhu/BsvhuFormSteps.tsx
@@ -38,14 +38,7 @@ import {
 import OtherActors from "./steps/OtherActors";
 
 const vhuToInput = (vhu: BsvhuInput): BsvhuInput => {
-  return omitDeep(vhu, [
-    "isDraft",
-    "emitter.emission.signature",
-    "transporter.transport.signature",
-    "destination.reception.signature",
-    "destination.operation.signature",
-    "ecoOrganisme.hasEcoOrganisme"
-  ]);
+  return omitDeep(vhu, ["isDraft", "ecoOrganisme.hasEcoOrganisme"]);
 };
 interface Props {
   bsdId?: string;
@@ -122,9 +115,8 @@ const BsvhuFormSteps = ({
   const saveForm = (input: BsvhuInput, draft: boolean): Promise<any> => {
     const cleanedInput = vhuToInput(input);
     if (formState.id!) {
-      const cleanedPayload = cleanPayload(omitDeep(cleanedInput));
       return updateVhuForm({
-        variables: { id: formState.id, input: cleanedPayload }
+        variables: { id: formState.id, input: cleanedInput }
       });
     } else {
       const cleanedPayload = cleanPayload(cleanedInput);

diff --git a/front/src/Apps/Dashboard/Creation/bsvhu/schema.ts b/front/src/Apps/Dashboard/Creation/bsvhu/schema.ts
@@ -18,16 +18,7 @@ const zodEmitter = z.object({
   company: zodCompany,
   agrementNumber: z.string().nullish(),
   irregularSituation: z.boolean(),
-  noSiret: z.boolean(),
-  emission: z.object({
-    signature: z.object({
-      author: z.string().nullish(),
-      date: z.coerce
-        .date()
-        .nullish()
-        .transform(v => v?.toISOString())
-    })
-  })
+  noSiret: z.boolean()
 });
 
 const zodTransporter = z.object({
@@ -52,20 +43,10 @@ const zodDestination = z.object({
   operation: z
     .object({
       code: z.string().nullish(),
-      number: z.string().nullish(),
       date: z.coerce
         .date()
         .nullish()
         .transform(v => v?.toISOString()),
-      signature: z
-        .object({
-          author: z.string().nullish(),
-          takenOverAt: z.coerce
-            .date()
-            .nullish()
-            .transform(v => v?.toISOString())
-        })
-        .nullish(),
       nextDestination: z
         .object({
           company: zodCompany

diff --git a/front/src/Apps/Dashboard/Creation/bsvhu/steps/Transporter.tsx b/front/src/Apps/Dashboard/Creation/bsvhu/steps/Transporter.tsx
@@ -32,14 +32,13 @@ const TransporterBsvhu = ({ errors }) => {
 
   useEffect(() => {
     if (errors?.length) {
-      if (!transporter?.company?.siret) {
-        setFieldError(
-          errors,
-          `${actor}.company.siret`,
-          formState.errors?.[actor]?.["company"]?.siret,
-          setError
-        );
-      }
+      setFieldError(
+        errors,
+        `${actor}.company.siret`,
+        formState.errors?.[actor]?.["company"]?.siret,
+        setError
+      );
+
       if (transporter?.company?.contact) {
         setFieldError(
           errors,