[Mission] fix reopen mission

MTES-MCT · Oct 23, 2023 · 73f4f38 · 73f4f38
1 parent bee8c33
commit 73f4f38
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/frontend/cypress/e2e/side_window/mission/close_mission_validation.spec.ts b/frontend/cypress/e2e/side_window/mission/close_mission_validation.spec.ts
@@ -7,7 +7,7 @@ context('Mission', () => {
   it('A new mission with control and surveillance can be closed with all required values', () => {
     // Given
     cy.get('*[data-cy="add-mission"]').click()
-    cy.clickButton(' Enregistrer et clôturer')
+    cy.clickButton('Enregistrer et clôturer')
     cy.wait(100)
 
     cy.get('*[data-cy="mission-errors"]').should('exist')
@@ -24,6 +24,7 @@ context('Mission', () => {
     cy.fill('Type de mission', ['Air'])
     cy.get('*[data-cy="add-control-unit"]').click()
     cy.get('.rs-picker-search-bar-input').type('Cross{enter}')
+    cy.fill("Contact de l'unité 1", 'contact').scrollIntoView()
     cy.fill('Ouvert par', 'PCF').scrollIntoView()
     cy.fill('Clôturé par', 'PCF').scrollIntoView()
 
@@ -32,7 +33,7 @@ context('Mission', () => {
     // we add a control
     cy.clickButton('Ajouter')
     cy.clickButton('Ajouter des contrôles')
-    cy.clickButton(' Enregistrer et clôturer')
+    cy.clickButton('Enregistrer et clôturer')
     cy.wait(100)
 
     cy.get('*[data-cy="mission-errors"]').should('exist')

diff --git a/frontend/src/features/missions/MissionForm/MissionForm.tsx b/frontend/src/features/missions/MissionForm/MissionForm.tsx
@@ -94,27 +94,28 @@ export function MissionForm({ id, isAlreadyClosed, isNewMission, selectedMission
   }
 
   const closeMission = async () => {
-    await setFieldValue('isClosed', true)
-    validateForm().then(async errors => {
+    await setFieldValue('isClosed', false)
+    validateForm({ ...values, isClosed: true }).then(async errors => {
       if (_.isEmpty(errors)) {
-        handleSubmit()
-      } else {
-        await setFieldValue('isClosed', false)
-        setShouldValidateOnChange(true)
+        await setFieldValue('isClosed', true)
+
+        return handleSubmit()
       }
+
+      return setShouldValidateOnChange(true)
     })
   }
 
   const reopenMission = () => {
-    validateForm({ ...values, isClosed: false }).then(errors => {
+    validateForm({ ...values, isClosed: false }).then(async errors => {
       if (_.isEmpty(errors)) {
+        await setFieldValue('isClosed', false)
         if (dirty) {
           return setIsReopenModalOpen(true)
         }
 
         return validateReopenMission()
       }
-      setFieldValue('isClosed', true)
 
       return setShouldValidateOnChange(true)
     })

diff --git a/frontend/src/features/missions/MissionForm/formikUseCases/updateActionThemes.ts b/frontend/src/features/missions/MissionForm/formikUseCases/updateActionThemes.ts
@@ -16,8 +16,11 @@ export const updateTheme =
 export const updateSubThemes =
   (setFieldValue: (field: string, value: any) => void) => (value: string, actionIndex: number, themeIndex: number) => {
     const subThemesPath = `envActions[${actionIndex}].themes.${themeIndex}.subThemes`
-
+    const protectedSpeciesPath = `envActions[${actionIndex}].themes.${themeIndex}.protectedSpecies`
     setFieldValue(subThemesPath, value)
+    if (!value || value?.length === 0) {
+      setFieldValue(protectedSpeciesPath, value)
+    }
   }
 export const updateProtectedSpecies =
   (setFieldValue: (field: string, value: any) => void) => (value: string, actionIndex: number, themeIndex: number) => {