[Mission] fix closeSchema

MTES-MCT · Oct 11, 2023 · c59a56a · c59a56a
1 parent b8e5d9c
commit c59a56a
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 18 deletions.
diff --git a/frontend/src/domain/entities/missions.ts b/frontend/src/domain/entities/missions.ts
@@ -284,7 +284,7 @@ export type EnvActionCommonProperties = {
 
 export type EnvActionTheme = {
   protectedSpecies?: string[]
-  subThemes?: string[]
+  subThemes: string[]
   theme: string
 }
 export type NewEnvActionControl = EnvActionCommonProperties & {

diff --git a/...d/src/features/missions/MissionForm/ActionForm/Themes/ThemeSelector/SubThemesSelector.tsx b/...d/src/features/missions/MissionForm/ActionForm/Themes/ThemeSelector/SubThemesSelector.tsx
@@ -14,7 +14,9 @@ export function SubThemesSelector({ actionIndex, label, theme, themeIndex }) {
   const { data: controlThemes, isError, isLoading } = useGetControlThemesQuery()
   const { newWindowContainerRef } = useNewWindow()
   const { setFieldValue } = useFormikContext<Mission>()
-  const [currentSubThemesField] = useField<string[]>(`envActions[${actionIndex}].themes[${themeIndex}].subThemes`)
+  const [currentSubThemesField, currentSubThemesProps] = useField<string[]>(
+    `envActions[${actionIndex}].themes[${themeIndex}].subThemes`
+  )
 
   const availableThemes = useMemo(
     () =>
@@ -41,7 +43,7 @@ export function SubThemesSelector({ actionIndex, label, theme, themeIndex }) {
           baseContainer={newWindowContainerRef.current}
           data-cy="envaction-subtheme-selector"
           disabled={!theme}
-          isErrorMessageHidden
+          error={currentSubThemesProps.error}
           isLight
           label={label}
           name={`${actionIndex}-${themeIndex}`}

diff --git a/frontend/src/features/missions/MissionForm/ActionForm/Themes/ThemeSelector/index.tsx b/frontend/src/features/missions/MissionForm/ActionForm/Themes/ThemeSelector/index.tsx
@@ -13,7 +13,9 @@ import type { Mission } from '../../../../../../domain/entities/missions'
 export function ThemeSelector({ actionIndex, label, themeIndex }) {
   const { data: controlThemes, isError, isLoading } = useGetControlThemesQuery()
   const { newWindowContainerRef } = useNewWindow()
-  const [currentThemeField] = useField<string>(`envActions[${actionIndex}].themes[${themeIndex}].theme`)
+  const [currentThemeField, currentThemeProps] = useField<string>(
+    `envActions[${actionIndex}].themes[${themeIndex}].theme`
+  )
   const { setFieldValue, values } = useFormikContext<Mission>()
 
   const availableThemes = useMemo(
@@ -37,7 +39,7 @@ export function ThemeSelector({ actionIndex, label, themeIndex }) {
           key={`${actionIndex}-${themeIndex}`}
           baseContainer={newWindowContainerRef.current}
           data-cy="envaction-theme-selector"
-          isErrorMessageHidden
+          error={currentThemeProps.error}
           isLight
           label={label}
           name={`${actionIndex}-${themeIndex}`}

diff --git a/frontend/src/features/missions/MissionForm/MissionForm.tsx b/frontend/src/features/missions/MissionForm/MissionForm.tsx
@@ -96,10 +96,9 @@ export function MissionForm({ id, isAlreadyClosed, isNewMission, selectedMission
     validateForm().then(errors => {
       if (_.isEmpty(errors)) {
         handleSubmit()
-
-        return
+      } else {
+        setShouldValidateOnChange(true)
       }
-      setShouldValidateOnChange(true)
     })
   }
 

diff --git a/frontend/src/features/missions/MissionForm/Schemas/Control.ts b/frontend/src/features/missions/MissionForm/Schemas/Control.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash'
 import * as Yup from 'yup'
 
 import { ClosedInfractionSchema, NewInfractionSchema } from './Infraction'
@@ -8,6 +9,12 @@ import { REACT_APP_CYPRESS_TEST } from '../../../../env'
 
 const shouldUseAlternateValidationInTestEnvironment = process.env.NODE_ENV === 'development' || REACT_APP_CYPRESS_TEST
 
+const ControlPointSchema = Yup.object().test({
+  message: 'Veuillez définir un point de contrôle',
+  name: 'has-geom',
+  test: val => val && !_.isEmpty(val?.coordinates)
+})
+
 export const getNewEnvActionControlSchema = (ctx: any): Yup.SchemaOf<EnvActionControl> =>
   Yup.object()
     .shape({
@@ -59,10 +66,10 @@ export const getClosedEnvActionControlSchema = (ctx: any): Yup.SchemaOf<EnvActio
       actionType: Yup.mixed().oneOf([ActionTypeEnum.CONTROL]),
       geom: shouldUseAlternateValidationInTestEnvironment
         ? Yup.object().nullable()
-        : Yup.array().ensure().min(1, 'Requis'),
+        : Yup.array().of(ControlPointSchema).ensure().min(1, 'Veuillez définir un point de contrôle'),
       id: Yup.string().required(),
       infractions: Yup.array().of(ClosedInfractionSchema).ensure().required(),
-      themes: Yup.array().of(ThemeSchema).ensure().required(),
+      themes: Yup.array().of(ThemeSchema).ensure().required().min(1),
       vehicleType: Yup.string().when('actionTargetType', (actionTargetType, schema) => {
         if (!actionTargetType || actionTargetType === TargetTypeEnum.VEHICLE) {
           return schema.nullable().required('Requis')

diff --git a/frontend/src/features/missions/MissionForm/Schemas/Surveillance.ts b/frontend/src/features/missions/MissionForm/Schemas/Surveillance.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash'
 import * as Yup from 'yup'
 
 import { ThemeSchema } from './Theme'
@@ -6,6 +7,12 @@ import { REACT_APP_CYPRESS_TEST } from '../../../../env'
 
 const shouldUseAlternateValidationInTestEnvironment = process.env.NODE_ENV === 'development' || REACT_APP_CYPRESS_TEST
 
+const SurveillanceZoneSchema = Yup.object().test({
+  message: 'Veuillez définir une zone de surveillance',
+  name: 'has-geom',
+  test: val => val && !_.isEmpty(val?.coordinates)
+})
+
 export const getNewEnvActionSurveillanceSchema = (ctx: any): Yup.SchemaOf<EnvActionSurveillance> =>
   Yup.object()
     .shape({
@@ -92,7 +99,8 @@ export const getClosedEnvActionSurveillanceSchema = (ctx: any): Yup.SchemaOf<Env
         otherwise: () =>
           shouldUseAlternateValidationInTestEnvironment
             ? Yup.object().nullable()
-            : Yup.array().ensure().min(1, 'Requis'),
+            : Yup.array().of(SurveillanceZoneSchema).ensure().min(1, 'Veuillez définir une zone de surveillance'),
+
         then: () => Yup.object().nullable()
       }),
 

diff --git a/frontend/src/features/missions/MissionForm/Schemas/Theme.ts b/frontend/src/features/missions/MissionForm/Schemas/Theme.ts
@@ -5,9 +5,9 @@ import type { EnvActionTheme } from '../../../../domain/entities/missions'
 export const ThemeSchema: Yup.SchemaOf<EnvActionTheme> = Yup.object().shape({
   protectedSpecies: Yup.array().of(Yup.string().optional()).nullable().optional(),
   subThemes: Yup.array()
-    .of(Yup.string().required().default(''))
+    .of(Yup.string().required())
     .ensure()
     .required()
     .min(1, 'Sélectionnez au moins une sous thématique'),
-  theme: Yup.string().required('Sélectionnez un thême')
+  theme: Yup.string().nullable().required('Sélectionnez un thème')
 })
diff --git a/frontend/src/features/missions/MissionForm/Schemas/index.ts b/frontend/src/features/missions/MissionForm/Schemas/index.ts
@@ -110,7 +110,9 @@ const NewMissionSchema: Yup.SchemaOf<NewMission> = Yup.object()
     envActions: Yup.array()
       .of(NewEnvActionSchema as any)
       .nullable(),
-    geom: shouldUseAlternateValidationInTestEnvironment ? Yup.object().nullable() : MissionZoneSchema,
+    geom: shouldUseAlternateValidationInTestEnvironment
+      ? Yup.object().nullable()
+      : Yup.array().of(MissionZoneSchema).ensure().min(1, 'Veuillez définir une zone de mission'),
     isClosed: Yup.boolean().oneOf([false]).required(),
     missionTypes: MissionTypesSchema,
     openBy: Yup.string()

diff --git a/frontend/src/features/missions/MissionForm/formikUseCases/updateActionThemes.ts b/frontend/src/features/missions/MissionForm/formikUseCases/updateActionThemes.ts
@@ -9,7 +9,7 @@ export const updateTheme =
     const currentThemeValue = get(mission, themesPath) as EnvActionTheme[]
 
     const newValue = [...currentThemeValue]
-    newValue.splice(themeIndex, 1, { theme: value })
+    newValue.splice(themeIndex, 1, { protectedSpecies: [], subThemes: [], theme: value })
 
     setFieldValue(themesPath, newValue)
   }

diff --git a/frontend/src/features/missions/Missions.helpers.ts b/frontend/src/features/missions/Missions.helpers.ts
@@ -37,7 +37,13 @@ export const actionFactory = ({
         id: uuidv4(),
         infractions: [],
         observations: '',
-        themes: [],
+        themes: [
+          {
+            protectedSpecies: undefined,
+            subThemes: [],
+            theme: ''
+          }
+        ],
         ...action
       }
     case ActionTypeEnum.NOTE:
@@ -56,7 +62,13 @@ export const actionFactory = ({
         durationMatchesMission: true,
         id: uuidv4(),
         observations: '',
-        themes: [],
+        themes: [
+          {
+            protectedSpecies: undefined,
+            subThemes: [],
+            theme: ''
+          }
+        ],
         ...action
       }
   }

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</ErrorMessage>}
+      {!!meta.error && <ErrorMessage>{meta.error}</ErrorMessage>}
 
       <>
         {polygons.map((polygonCoordinates, index) => (