[Reporting] fix bug to attach multiple reportings to a mission

MTES-MCT · Jan 4, 2024 · d373ee3 · d373ee3
1 parent 9af76b6
commit d373ee3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/frontend/src/domain/use_cases/reporting/unattachMissionFromReporting.ts b/frontend/src/domain/use_cases/reporting/unattachMissionFromReporting.ts
@@ -2,17 +2,29 @@ import omit from 'lodash/omit'
 
 import { reportingsAPI } from '../../../api/reportingsAPI'
 import { attachMissionToReportingSliceActions } from '../../../features/Reportings/slice'
+import { isNewReporting } from '../../../features/Reportings/utils'
 import { setToast, ReportingContext } from '../../shared_slices/Global'
 import { reportingActions } from '../../shared_slices/reporting'
 import { MapInteractionListenerEnum, updateMapInteractionListeners } from '../map/updateMapInteractionListeners'
 
 import type { Reporting } from '../../entities/reporting'
 
 export const unattachMissionFromReporting =
-  (values: Reporting | Partial<Reporting>, reportingContext: ReportingContext) => async dispatch => {
+  (values: Reporting | Partial<Reporting>, reportingContext: ReportingContext) => async (dispatch, getState) => {
     const newOrNextReportingData = omit(values, ['attachedMission'])
     const endpoint = reportingsAPI.endpoints.updateReporting
 
+    const { initialAttachedMission } = getState().attachMissionToReporting
+
+    const reportingIsNew = isNewReporting(values.id)
+
+    if (reportingIsNew) {
+      await dispatch(updateMapInteractionListeners(MapInteractionListenerEnum.NONE))
+      await dispatch(attachMissionToReportingSliceActions.setAttachedMission(initialAttachedMission))
+
+      return
+    }
+
     try {
       const response = await dispatch(endpoint.initiate(newOrNextReportingData))
       if ('data' in response) {

diff --git a/frontend/src/features/Reportings/ReportingForm/AttachMission/index.tsx b/frontend/src/features/Reportings/ReportingForm/AttachMission/index.tsx
@@ -56,7 +56,7 @@ export function AttachMission({ onAttachMission }) {
   // the form listens to the redux store to update the attached mission
   // because of the map interaction to attach mission
   useEffect(() => {
-    if (missionId && missionId !== values.missionId) {
+    if ((missionId && missionId !== values.missionId) || (!missionId && values.missionId)) {
       setFieldValue('missionId', missionId)
       setFieldValue('attachedMission', attachedMission)
       setFieldValue('attachedToMissionAtUtc', new Date().toISOString())

diff --git a/frontend/src/features/map/layers/Reportings/index.tsx b/frontend/src/features/map/layers/Reportings/index.tsx
@@ -107,7 +107,7 @@ export function ReportingsLayer({ map, mapClickEvent }: BaseMapChildrenProps) {
   const isLayerVisible = useMemo(
     () =>
       (displayReportingsLayer && !hasMapListener) ||
-      !!(attachedReportingsToActiveMission && attachedReportingsToActiveMission?.length > 0),
+      !!(attachedReportingsToActiveMission && attachedReportingsToActiveMission?.length > 0 && !hasMapListener),
     [displayReportingsLayer, hasMapListener, attachedReportingsToActiveMission]
   )