[Mission] Zone de surveillance obligatoire en cas de clôture de missi…

…on (#826) - Resolve #784
MTES-MCT · Sep 19, 2023 · a88ff14 · a88ff14
2 parents 67a0acd + a7cef04
commit a88ff14
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/frontend/src/features/missions/MissionForm/Schemas/Surveillance.ts b/frontend/src/features/missions/MissionForm/Schemas/Surveillance.ts
@@ -2,6 +2,9 @@ import * as Yup from 'yup'
 
 import { ThemeSchema } from './Theme'
 import { ActionTypeEnum, EnvActionSurveillance } from '../../../../domain/entities/missions'
+import { REACT_APP_CYPRESS_TEST } from '../../../../env'
+
+const shouldUseAlternateValidationInTestEnvironment = process.env.NODE_ENV === 'development' || REACT_APP_CYPRESS_TEST
 
 export const getNewEnvActionSurveillanceSchema = (ctx: any): Yup.SchemaOf<EnvActionSurveillance> =>
   Yup.object()
@@ -84,7 +87,15 @@ export const getClosedEnvActionSurveillanceSchema = (ctx: any): Yup.SchemaOf<Env
           }
         }),
       actionType: Yup.mixed().oneOf([ActionTypeEnum.SURVEILLANCE]),
-      geom: Yup.array().ensure(),
+      geom: Yup.object().when('coverMissionZone', {
+        is: true,
+        otherwise: () =>
+          shouldUseAlternateValidationInTestEnvironment
+            ? Yup.object().nullable()
+            : Yup.array().ensure().min(1, 'Requis'),
+        then: () => Yup.object().nullable()
+      }),
+
       id: Yup.string().required(),
       themes: Yup.array().of(ThemeSchema).ensure().required()
     })

diff --git a/frontend/src/features/missions/MultiZonePicker.tsx b/frontend/src/features/missions/MultiZonePicker.tsx
@@ -98,7 +98,7 @@ export function MultiZonePicker({
         {addButtonLabel}
       </Button>
 
-      {!!meta.error && <ErrorMessage>Veuillez définir une zone de mission</ErrorMessage>}
+      {!!meta.error && <ErrorMessage>Veuillez définir une zone</ErrorMessage>}
 
       <>
         {polygons.map((polygonCoordinates, index) => (