[Map] fix close side window

MTES-MCT · Feb 3, 2025 · a3fae72 · a3fae72
1 parent 0ee9179
commit a3fae72
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 51 deletions.
diff --git a/frontend/src/domain/shared_slices/Global.ts b/frontend/src/domain/shared_slices/Global.ts
@@ -83,57 +83,68 @@ type GlobalStateType = {
     reportingFormVisibility: ReportingFormVisibilityProps
   }
 }
+
+const initialMenuState = {
+  displayAccountButton: true,
+  displayDashboard: true,
+  displayDrawModal: false,
+  displayInterestPoint: true,
+  displayLayersSidebar: true,
+  displayLocateOnMap: true,
+  displayMeasurement: true,
+  displayMissionMenuButton: true,
+  displayReportingsButton: true,
+  displayRightMenuControlUnitListButton: true,
+  displaySearchSemaphoreButton: true
+}
+
+const initialLayers = {
+  displayDashboardLayer: false,
+  displayInterestPointLayer: true,
+  displayMissionEditingLayer: true,
+  displayMissionSelectedLayer: true,
+  displayMissionsLayer: true,
+  displayMissionToAttachLayer: true,
+  displayReportingEditingLayer: true,
+  displayReportingSelectedLayer: true,
+
+  displayReportingsLayer: true,
+  displayReportingsOverlay: true,
+  displayReportingToAttachLayer: true,
+  displaySemaphoresLayer: true,
+
+  displayStationLayer: false,
+  displayVigilanceAreaLayer: true,
+  isLayersSidebarVisible: true
+}
+
+const initialVisibility = {
+  isAccountDialogVisible: false,
+  isControlUnitDialogVisible: false,
+  isControlUnitListDialogVisible: false,
+  isDashboardDialogVisible: false,
+  isLayersSidebarVisible: false,
+  isSearchMissionsVisible: false,
+  isSearchReportingsVisible: false,
+  isSearchSemaphoreVisible: false,
+  reportingFormVisibility: {
+    context: ReportingContext.MAP,
+    visibility: VisibilityState.NONE
+  }
+}
+
 const initialState: GlobalStateType = {
-  layers: {
-    displayDashboardLayer: false,
-    displayInterestPointLayer: true,
-    displayMissionEditingLayer: true,
-    displayMissionSelectedLayer: true,
-    displayMissionsLayer: true,
-    displayMissionToAttachLayer: true,
-    displayReportingEditingLayer: true,
-    displayReportingSelectedLayer: true,
-
-    displayReportingsLayer: true,
-    displayReportingsOverlay: true,
-    displayReportingToAttachLayer: true,
-    displaySemaphoresLayer: true,
-
-    displayStationLayer: false,
-    displayVigilanceAreaLayer: true,
-    isLayersSidebarVisible: true
-  },
-  menus: {
-    displayAccountButton: true,
-    displayDashboard: true,
-    displayDrawModal: false,
-    displayInterestPoint: true,
-    displayLayersSidebar: true,
-    displayLocateOnMap: true,
-    displayMeasurement: true,
-    displayMissionMenuButton: true,
-    displayReportingsButton: true,
-    displayRightMenuControlUnitListButton: true,
-    displaySearchSemaphoreButton: true
-  },
+  layers: initialLayers,
+  menus: initialMenuState,
   overlayCoordinates: [],
 
-  previousDisplayedItems: {},
+  previousDisplayedItems: {
+    layers: initialLayers,
+    menus: initialMenuState,
+    visibility: initialVisibility
+  },
 
-  visibility: {
-    isAccountDialogVisible: false,
-    isControlUnitDialogVisible: false,
-    isControlUnitListDialogVisible: false,
-    isDashboardDialogVisible: false,
-    isLayersSidebarVisible: false,
-    isSearchMissionsVisible: false,
-    isSearchReportingsVisible: false,
-    isSearchSemaphoreVisible: false,
-    reportingFormVisibility: {
-      context: ReportingContext.MAP,
-      visibility: VisibilityState.NONE
-    }
-  }
+  visibility: initialVisibility
 }
 
 const globalSlice = createSlice({

diff --git a/frontend/src/features/Dashboard/components/Layers/ActiveDashboardLayer.tsx b/frontend/src/features/Dashboard/components/Layers/ActiveDashboardLayer.tsx
@@ -60,7 +60,7 @@ export function ActiveDashboardLayer({ map }: BaseMapChildrenProps) {
       renderBuffer: 7,
       renderOrder: (a, b) => b.get('area') - a.get('area'),
       source: layersVectorSourceRef.current,
-      style: feature => getDashboardStyle(feature),
+      style: getDashboardStyle,
       zIndex: Layers.DASHBOARD.zIndex
     })
   ) as React.MutableRefObject<VectorLayerWithName>
@@ -175,13 +175,15 @@ export function ActiveDashboardLayer({ map }: BaseMapChildrenProps) {
         if (!dashboardAreaFeature) {
           return
         }
+        dashboardAreaFeature.setId(`${Layers.DASHBOARDS.code}:${activeDashboardId}`)
         dashboardAreaFeature?.setStyle([measurementStyle, measurementStyleWithCenter, dashboardIcon()])
 
         layersVectorSourceRef.current.addFeature(dashboardAreaFeature)
       }
     }
   }, [
     activeDashboard,
+    activeDashboardId,
     ampLayers?.entities,
     activeDashboard?.ampIds,
     activeDashboard?.regulatoryAreaIds,

diff --git a/frontend/src/features/Reportings/useCases/reduceOrCollapseReportingForm.ts b/frontend/src/features/Reportings/useCases/reduceOrCollapseReportingForm.ts
@@ -3,7 +3,7 @@ import { setReportingFormVisibility, ReportingContext, VisibilityState } from 'd
 import { mainWindowActions } from '../../MainWindow/slice'
 
 export const reduceOrCollapseReportingForm = (reportingContext: ReportingContext) => (dispatch, getState) => {
-  const { reportingFormVisibility } = getState().global
+  const { reportingFormVisibility } = getState().global.visibility
   const newVisibility =
     reportingFormVisibility.visibility === VisibilityState.VISIBLE ? VisibilityState.REDUCED : VisibilityState.VISIBLE
   dispatch(

diff --git a/frontend/src/features/SideWindow/SideWindowLauncher.tsx b/frontend/src/features/SideWindow/SideWindowLauncher.tsx
@@ -1,4 +1,5 @@
 import { dashboardActions } from '@features/Dashboard/slice'
+import { missionActions } from '@features/Mission/slice'
 import { reportingActions } from '@features/Reportings/slice'
 import { useForceUpdate, NewWindow } from '@mtes-mct/monitor-ui'
 import {
@@ -20,6 +21,8 @@ export function SideWindowLauncher() {
   const { forceUpdate } = useForceUpdate()
 
   const missions = useAppSelector(state => state.missionForms.missions)
+  const activeMissionId = useAppSelector(state => state.missionForms.activeMissionId)
+  const selectedMissionIdOnMap = useAppSelector(state => state.mission.selectedMissionIdOnMap)
   const reportings = useAppSelector(state => state.reporting.reportings)
   const dashboards = useAppSelector(state => state.dashboard.dashboards)
   const sideWindow = useAppSelector(state => state.sideWindow)
@@ -60,7 +63,11 @@ export function SideWindowLauncher() {
     dispatch(sideWindowActions.close())
     dispatch(mainWindowActions.setHasFullHeightRightDialogOpen(false))
     dispatch(reportingActions.resetReportingsOnSideWindow(reportingsOpenOnSideWindow))
+    if (activeMissionId === selectedMissionIdOnMap) {
+      dispatch(missionActions.resetSelectedMissionIdOnMap())
+    }
     dispatch(missionFormsActions.resetMissions())
+
     dispatch(dashboardActions.resetDashboards())
 
     dispatch(updateMapInteractionListeners(MapInteractionListenerEnum.NONE))

diff --git a/frontend/src/features/SideWindow/index.tsx b/frontend/src/features/SideWindow/index.tsx
@@ -81,8 +81,6 @@ export function SideWindow() {
     const isCurrentPathIsMissionPage = isMissionPage(currentPath)
     if (!isCurrentPathIsMissionPage) {
       dispatch(missionFormsActions.resetActiveMissionId())
-
-      return
     }
 
     const isCurrentPathDashboard = isDashboardPage(currentPath)