[Reporting] update reporting on map when archived and attached to a m…

…ission
MTES-MCT · Oct 13, 2023 · ffdd911 · ffdd911
1 parent 8128055
commit ffdd911
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/frontend/public/archived_reporting_with_mission_attached.svg b/frontend/public/archived_reporting_with_mission_attached.svg
diff --git a/frontend/src/features/Reportings/ReportingForm/AttachMission/AttachedMissionCard.tsx b/frontend/src/features/Reportings/ReportingForm/AttachMission/AttachedMissionCard.tsx
@@ -61,7 +61,9 @@ export function AttachedMissionCard({
 
       <Body>
         <Details>
-          Mission {missionTypesToString(missionTypes)} – {missionDurationText}
+          <div>
+            Mission {missionTypesToString(missionTypes)} – {missionDurationText}
+          </div>
           <MissionStatusLabel missionStatus={missionStatus} />
         </Details>
         <div>
@@ -97,7 +99,9 @@ const NoContact = styled.div`
 `
 const Details = styled.div`
   color: ${p => p.theme.color.slateGray};
-  white-space: nowrap;
+  display: flex;
+  flex: 2;
+  flex-direction: column;
 `
 
 const Title = styled.div`

diff --git a/frontend/src/features/Reportings/ReportingForm/AttachMission/index.tsx b/frontend/src/features/Reportings/ReportingForm/AttachMission/index.tsx
@@ -33,8 +33,8 @@ export function AttachMission({ setIsAttachNewMission }) {
   }
 
   const unattachMission = () => {
-    setFieldValue('attachedMissionId', undefined)
-    setFieldValue('attachedMission', undefined)
+    dispatch(attachMissionToReportingSliceActions.setAttachedMissionId(undefined))
+    dispatch(attachMissionToReportingSliceActions.setAttachedMission(undefined))
   }
 
   const createMission = async () => {

diff --git a/frontend/src/features/map/layers/Reportings/style.ts b/frontend/src/features/map/layers/Reportings/style.ts
@@ -165,7 +165,7 @@ export const reportingPinStyleFn = feature => {
 
   if (feature.get('attachedMissionId')) {
     if (status === ReportingStatusEnum.ARCHIVED) {
-      return reportingStyleFactory(THEME.color.mediumSeaGreen, 'archived_reporting_observation.svg')
+      return reportingStyleFactory(THEME.color.white, 'archived_reporting_with_mission_attached.svg')
     }
 
     return reportingStyleFactory(THEME.color.mediumSeaGreen)

diff --git a/frontend/src/features/missions/MissionForm/ActionCards/ReportingCard.tsx b/frontend/src/features/missions/MissionForm/ActionCards/ReportingCard.tsx
@@ -27,7 +27,7 @@ export function ReportingCard({
       ...(action.theme && {
         themes: [
           {
-            subThemes: action.subThemes,
+            subThemes: action.subThemes || [],
             theme: action.theme
           }
         ]