[Mission] fix duplicate action and surveillance

claire2212 · claire2212 · commit fb7523199bfb · 2025-02-19T14:36:46.000+01:00
diff --git a/frontend/cypress/e2e/side_window/mission_form/mission_actions.spec.ts b/frontend/cypress/e2e/side_window/mission_form/mission_actions.spec.ts
@@ -673,4 +673,35 @@ context('Side Window > Mission Form > Mission actions', () => {
       cy.clickButton('Confirmer la suppression')
     })
   })
+
+  it('Should duplicate control and surveillance', () => {
+    cy.getDataCy('edit-mission-34').scrollIntoView().click({ force: true })
+
+    cy.getDataCy('action-card').eq(1).click()
+    cy.get('input[name="isControlAttachedToReporting"]').should('be.checked')
+
+    cy.clickButton('Dupliquer le contrôle')
+    // The duplicate control should be the "active" action and attached reporting should be removed
+    cy.get('input[name="isControlAttachedToReporting"]').should('be.not.checked')
+    cy.clickButton('Supprimer le contrôle')
+
+    // Attach reprting to surveillance
+    cy.wait(250)
+    cy.getDataCy('action-card').eq(0).click()
+    cy.getDataCy('surveillance-form-toggle-reporting').click({ force: true })
+    cy.fill('Signalements', ['6'])
+    cy.wait(250)
+    // duplicate surveillance from timeline
+    cy.clickButton("Dupliquer l'action")
+    cy.wait(500)
+    cy.getDataCy('action-card').eq(0).click()
+    // The duplicate surveillance should be the "active" action and attached reporting should be removed
+    cy.get('input[name="isSurveillanceAttachedToReporting"]').should('be.not.checked')
+    // The duplicate control should be the "active" action and attached reporting should be removed
+    cy.get('input[name="isSurveillanceAttachedToReporting"]').should('be.not.checked')
+    cy.clickButton('Supprimer la surveillance')
+
+    cy.getDataCy('action-card').eq(0).click()
+    cy.getDataCy('surveillance-form-toggle-reporting').click({ force: true })
+  })
 })
diff --git a/frontend/src/features/Mission/components/MissionForm/ActionForm/ControlForm/index.tsx b/frontend/src/features/Mission/components/MissionForm/ActionForm/ControlForm/index.tsx
@@ -1,4 +1,5 @@
 import { actionFactory } from '@features/Mission/Missions.helpers'
+import { useAppDispatch } from '@hooks/useAppDispatch'
 import { useAppSelector } from '@hooks/useAppSelector'
 import { useGetControlPlans } from '@hooks/useGetControlPlans'
 import {
@@ -42,7 +43,7 @@ import { VehicleTypeSelector } from '../../../../../commonComponents/VehicleType
 import { getFormattedReportingId } from '../../../../../Reportings/utils'
 import { HIDDEN_ERROR } from '../../constants'
 import { useMissionAndActionsCompletion } from '../../hooks/useMissionAndActionsCompletion'
-import { getNumberOfInfractionTarget } from '../../slice'
+import { getNumberOfInfractionTarget, missionFormsActions } from '../../slice'
 import { Separator } from '../../style'
 import { MissingFieldsText } from '../MissingFieldsText'
 import {
@@ -67,6 +68,7 @@ export function ControlForm({
   removeControlAction: () => void
 }) {
   const { newWindowContainerRef } = useNewWindow()
+  const dispatch = useAppDispatch()
   const {
     errors,
     setFieldValue,
@@ -195,9 +197,13 @@ export function ControlForm({
     if (!currentAction) {
       return
     }
-    const duplicatedAction = actionFactory(currentAction)
+
+    const newControl = { ...currentAction, reportingIds: [] }
+    const duplicatedAction = actionFactory(newControl)
+
     setFieldValue('envActions', [duplicatedAction, ...(envActions || [])])
-  }, [currentAction, setFieldValue, envActions])
+    dispatch(missionFormsActions.setActiveActionId(duplicatedAction.id))
+  }, [currentAction, setFieldValue, envActions, dispatch])
 
   const updateIsControlAttachedToReporting = (checked: boolean | undefined) => {
     setIsReportingListVisible(checked ?? false)
@@ -339,7 +345,13 @@ export function ControlForm({
           <ActionThemes>{themesAsText}</ActionThemes>
         </TitleWithIcon>
         <HeaderButtons>
-          <Button accent={Accent.SECONDARY} Icon={Icon.Duplicate} onClick={duplicateControl} size={Size.SMALL}>
+          <Button
+            accent={Accent.SECONDARY}
+            Icon={Icon.Duplicate}
+            onClick={duplicateControl}
+            size={Size.SMALL}
+            title="Dupliquer le contrôle"
+          >
             Dupliquer
           </Button>
 
@@ -348,7 +360,7 @@ export function ControlForm({
             Icon={Icon.Delete}
             onClick={handleRemoveAction}
             size={Size.SMALL}
-            title="supprimer"
+            title="Supprimer le contrôle"
           />
         </HeaderButtons>
       </Header>
diff --git a/frontend/src/features/Mission/components/MissionForm/ActionForm/SurveillanceForm/index.tsx b/frontend/src/features/Mission/components/MissionForm/ActionForm/SurveillanceForm/index.tsx
@@ -1,4 +1,5 @@
 import { actionFactory } from '@features/Mission/Missions.helpers'
+import { useAppDispatch } from '@hooks/useAppDispatch'
 import { useGetControlPlans } from '@hooks/useGetControlPlans'
 import { useGetControlPlansByYear } from '@hooks/useGetControlPlansByYear'
 import {
@@ -38,6 +39,7 @@ import { dateDifferenceInHours } from '../../../../../../utils/dateDifferenceInH
 import { getFormattedReportingId } from '../../../../../Reportings/utils'
 import { HIDDEN_ERROR } from '../../constants'
 import { useMissionAndActionsCompletion } from '../../hooks/useMissionAndActionsCompletion'
+import { missionFormsActions } from '../../slice'
 import { Separator } from '../../style'
 import { MissingFieldsText } from '../MissingFieldsText'
 import {
@@ -55,6 +57,8 @@ import { SurveillanceThemes } from '../Themes/SurveillanceThemes'
 export function SurveillanceForm({ currentActionId, remove }) {
   const { newWindowContainerRef } = useNewWindow()
 
+  const dispatch = useAppDispatch()
+
   const {
     errors,
     setFieldValue,
@@ -165,9 +169,13 @@ export function SurveillanceForm({ currentActionId, remove }) {
     if (!currentAction) {
       return
     }
-    const duplicatedAction = actionFactory(currentAction)
+
+    const newSurveillance = { ...currentAction, reportingIds: [] }
+    const duplicatedAction = actionFactory(newSurveillance)
+
     setFieldValue('envActions', [duplicatedAction, ...(envActions || [])])
-  }, [currentAction, setFieldValue, envActions])
+    dispatch(missionFormsActions.setActiveActionId(duplicatedAction.id))
+  }, [currentAction, setFieldValue, envActions, dispatch])
 
   const updateStartDateTime = (date: string | undefined) => {
     const newSurveillanceDateYear = date ? customDayjs(date).year() : undefined
@@ -205,7 +213,13 @@ export function SurveillanceForm({ currentActionId, remove }) {
           <ActionThemes>{themeIds && themeIds?.length > 1 ? themesAsText?.join(', ') : themesAsText}</ActionThemes>
         </TitleWithIcon>
         <HeaderButtons>
-          <Button accent={Accent.SECONDARY} Icon={Icon.Duplicate} onClick={duplicateSurveillance} size={Size.SMALL}>
+          <Button
+            accent={Accent.SECONDARY}
+            Icon={Icon.Duplicate}
+            onClick={duplicateSurveillance}
+            size={Size.SMALL}
+            title="Dupliquer la surveillance"
+          >
             Dupliquer
           </Button>
 
@@ -214,7 +228,7 @@ export function SurveillanceForm({ currentActionId, remove }) {
             Icon={Icon.Delete}
             onClick={handleRemoveAction}
             size={Size.SMALL}
-            title="supprimer"
+            title="Supprimer la surveillance"
           />
         </HeaderButtons>
       </Header>
diff --git a/frontend/src/features/Mission/components/MissionForm/ActionsTimeLine/ActionCard/EnvActions/index.tsx b/frontend/src/features/Mission/components/MissionForm/ActionsTimeLine/ActionCard/EnvActions/index.tsx
@@ -67,15 +67,15 @@ export function EnvActions({
                       accent={Accent.TERTIARY}
                       Icon={Icon.Duplicate}
                       onClick={duplicateAction}
-                      title="dupliquer"
+                      title="Dupliquer l'action"
                     />
                     <IconButton
                       accent={Accent.TERTIARY}
                       color={THEME.color.maximumRed}
                       data-cy={`actioncard-delete-button-${action.id}`}
                       Icon={Icon.Delete}
                       onClick={removeAction}
-                      title="supprimer"
+                      title="Supprimer l'action"
                     />
                   </ActionButtons>
                   {action.actionType === ActionTypeEnum.CONTROL && action.formattedReportingId && (
diff --git a/frontend/src/features/Mission/components/MissionForm/ActionsTimeLine/index.tsx b/frontend/src/features/Mission/components/MissionForm/ActionsTimeLine/index.tsx
@@ -120,14 +120,22 @@ export function ActionsTimeLine({ currentActionId, setCurrentActionId }) {
   )
 
   const handleDuplicateAction = useCallback(
-    id => {
+    (e, id) => {
+      e.stopPropagation()
       const envAction = envActions && envActions.find(action => action.id === id)
 
-      if (envAction) {
-        const duplicatedAction = actionFactory(envAction)
-        setFieldValue('envActions', [duplicatedAction, ...(envActions || [])])
-        setCurrentActionId(undefined)
+      if (!envAction) {
+        return
       }
+
+      let newAction = { ...envAction }
+      if ('reportingIds' in newAction) {
+        newAction = { ...newAction, reportingIds: [] }
+      }
+
+      const duplicatedAction = actionFactory(newAction)
+      setFieldValue('envActions', [duplicatedAction, ...envActions])
+      setCurrentActionId(duplicatedAction.id)
     },
     [envActions, setFieldValue, setCurrentActionId]
   )
@@ -174,7 +182,7 @@ export function ActionsTimeLine({ currentActionId, setCurrentActionId }) {
                 <ActionCard
                   key={action.id}
                   action={action}
-                  duplicateAction={() => handleDuplicateAction(action.id)}
+                  duplicateAction={e => handleDuplicateAction(e, action.id)}
                   hasError={!!envActionsErrors}
                   removeAction={event => handleRemoveAction(action.id, event)}
                   selectAction={() => handleSelectAction(action.id)}
