[Tech] fix sonarCloud issues

MTES-MCT · Nov 29, 2024 · 1c9cad4 · 1c9cad4
1 parent b62e345
commit 1c9cad4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/frontend/src/domain/entities/missions.ts b/frontend/src/domain/entities/missions.ts
@@ -292,7 +292,7 @@ export type Awareness = {
   themeId?: number
 }
 
-export type ControlOrSurveillance = EnvActionControl | EnvActionSurveillance
+export type ControlOrSurveillance = EnvActionControl | NewEnvActionControl | EnvActionSurveillance
 
 export type EnvActionNote = EnvActionCommonProperties & {
   actionType: ActionTypeEnum.NOTE

diff --git a/frontend/src/features/missions/Layers/EditingMissionLayer.ts b/frontend/src/features/missions/Layers/EditingMissionLayer.ts
@@ -54,7 +54,7 @@ export function EditingMissionLayer({ currentFeatureOver, map }: BaseMapChildren
       zIndex: Layers.MISSION_SELECTED.zIndex
     })
   ) as MutableRefObject<VectorLayerWithName>
-  ;(editingMissionVectorLayerRef.current as VectorLayerWithName).name = Layers.MISSION_SELECTED.code
+  editingMissionVectorLayerRef.current.name = Layers.MISSION_SELECTED.code
 
   const editingMissionActionsVectorSourceRef = useRef(new VectorSource()) as MutableRefObject<
     VectorSource<Feature<Geometry>>
@@ -66,7 +66,7 @@ export function EditingMissionLayer({ currentFeatureOver, map }: BaseMapChildren
       zIndex: Layers.ACTIONS.zIndex
     })
   ) as MutableRefObject<VectorLayerWithName>
-  ;(editingMissionActionsVectorLayerRef.current as VectorLayerWithName).name = Layers.ACTIONS.code
+  editingMissionActionsVectorLayerRef.current.name = Layers.ACTIONS.code
 
   const feature = editingMissionVectorSourceRef.current.getFeatureById(
     `${Layers.MISSION_SELECTED.code}:${activeMissionId}`

diff --git a/frontend/src/features/missions/Layers/HoveredMissionLayer.ts b/frontend/src/features/missions/Layers/HoveredMissionLayer.ts
@@ -21,7 +21,7 @@ export function HoveredMissionLayer({ currentFeatureOver, map }: BaseMapChildren
       zIndex: Layers.HOVERED_MISSION.zIndex
     })
   ) as MutableRefObject<VectorLayerWithName>
-  ;(hoveredMissionVectorLayerRef.current as VectorLayerWithName).name = Layers.HOVERED_MISSION.code
+  hoveredMissionVectorLayerRef.current.name = Layers.HOVERED_MISSION.code
 
   useEffect(() => {
     if (map) {
@@ -39,7 +39,7 @@ export function HoveredMissionLayer({ currentFeatureOver, map }: BaseMapChildren
   useEffect(() => {
     hoveredMissionVectorSourceRef.current?.clear(true)
     const feature = convertToFeature(currentFeatureOver)
-    if (feature && feature.getId()?.toString()?.includes(Layers.MISSIONS.code)) {
+    if (feature?.getId()?.toString()?.includes(Layers.MISSIONS.code)) {
       hoveredMissionVectorSourceRef.current?.addFeature(feature)
     }
   }, [currentFeatureOver])

diff --git a/frontend/src/features/missions/Layers/SelectedMissionLayer.ts b/frontend/src/features/missions/Layers/SelectedMissionLayer.ts
@@ -53,7 +53,7 @@ export function SelectedMissionLayer({ currentFeatureOver, map }: BaseMapChildre
       zIndex: Layers.MISSION_SELECTED.zIndex
     })
   ) as MutableRefObject<VectorLayerWithName>
-  ;(selectedMissionVectorLayerRef.current as VectorLayerWithName).name = Layers.MISSION_SELECTED.code
+  selectedMissionVectorLayerRef.current.name = Layers.MISSION_SELECTED.code
 
   const selectedMissionActionsVectorSourceRef = useRef(new VectorSource()) as MutableRefObject<
     VectorSource<Feature<Geometry>>
@@ -66,7 +66,7 @@ export function SelectedMissionLayer({ currentFeatureOver, map }: BaseMapChildre
     })
   ) as MutableRefObject<VectorLayerWithName>
 
-  ;(selectedMissionActionsVectorLayerRef.current as VectorLayerWithName).name = Layers.ACTIONS.code
+  selectedMissionActionsVectorLayerRef.current.name = Layers.ACTIONS.code
 
   const overlayCoordinates = useAppSelector(state =>
     getOverlayCoordinates(state.global, `${Layers.MISSIONS.code}:${selectedMissionIdOnMap}`)

diff --git a/frontend/src/features/missions/Layers/index.tsx b/frontend/src/features/missions/Layers/index.tsx
@@ -100,7 +100,7 @@ export function MissionsLayer({ map, mapClickEvent }: BaseMapChildrenProps) {
       zIndex: Layers.MISSIONS.zIndex
     })
   ) as MutableRefObject<VectorLayerWithName>
-  ;(missionVectorLayerRef.current as VectorLayerWithName).name = Layers.MISSIONS.code
+  missionVectorLayerRef.current.name = Layers.MISSIONS.code
 
   useEffect(() => {
     if (map) {

diff --git a/frontend/src/features/missions/Layers/missionGeometryHelpers.ts b/frontend/src/features/missions/Layers/missionGeometryHelpers.ts
@@ -12,7 +12,8 @@ import {
   getMissionStatus,
   type Mission,
   type NewMission,
-  type NewEnvActionControl
+  type NewEnvActionControl,
+  type ControlOrSurveillance
 } from '../../../domain/entities/missions'
 import { getTotalOfControls, getTotalOfSurveillances } from '../utils'
 
@@ -73,7 +74,7 @@ const getActionSurveillanceProperties = (action: EnvActionSurveillance) => {
   }
 }
 
-const getActionProperties = (action: EnvActionControl | EnvActionSurveillance | NewEnvActionControl) => {
+const getActionProperties = (action: ControlOrSurveillance) => {
   switch (action.actionType) {
     case ActionTypeEnum.CONTROL:
       return getActionControlProperties(action)
@@ -84,7 +85,7 @@ const getActionProperties = (action: EnvActionControl | EnvActionSurveillance |
 }
 
 const getActionFeature = (
-  action: EnvActionControl | EnvActionSurveillance | NewEnvActionControl,
+  action: ControlOrSurveillance,
   missionGeom: Geometry,
   isEditingSurveillanceZoneOrControlPoint: boolean
 ) => {
@@ -115,7 +116,7 @@ const getActionFeature = (
   return feature
 }
 
-const isActionControlOrActionSurveillance = (f): f is EnvActionControl | EnvActionSurveillance | NewEnvActionControl =>
+const isActionControlOrActionSurveillance = (f): f is ControlOrSurveillance =>
   f.actionType === ActionTypeEnum.CONTROL || f.actionType === ActionTypeEnum.SURVEILLANCE
 
 export const getActionsFeatures = (mission, isEditingSurveillanceZoneOrControlPoint = false) => {