[Tech] changes after code review

MTES-MCT · Dec 3, 2024 · 392e038 · 392e038
1 parent 5b428e0
commit 392e038
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/frontend/src/features/missions/Layers/missionGeometryHelpers.ts b/frontend/src/features/missions/Layers/missionGeometryHelpers.ts
@@ -116,8 +116,8 @@ const getActionFeature = (
   return feature
 }
 
-const isActionControlOrActionSurveillance = (f): f is ControlOrSurveillance =>
-  f.actionType === ActionTypeEnum.CONTROL || f.actionType === ActionTypeEnum.SURVEILLANCE
+const isActionControlOrActionSurveillance = (feature): feature is ControlOrSurveillance =>
+  feature.actionType === ActionTypeEnum.CONTROL || feature.actionType === ActionTypeEnum.SURVEILLANCE
 
 export const getActionsFeatures = (mission, isEditingSurveillanceZoneOrControlPoint = false) => {
   const { envActions, geom: missionGeom } = mission

diff --git a/frontend/src/features/missions/MissionForm/ActionForm/ControlForm/index.tsx b/frontend/src/features/missions/MissionForm/ActionForm/ControlForm/index.tsx
@@ -121,6 +121,14 @@ export function ControlForm({
   const isGeomSameAsAttachedReportingGeom = useMemo(() => {
     const attachedReporting = attachedReportings?.find(reporting => reporting.id === currentAction?.reportingIds[0])
 
+    if (
+      attachedReporting?.geom?.type &&
+      currentAction?.geom?.type &&
+      attachedReporting?.geom?.type !== currentAction?.geom?.type
+    ) {
+      return false
+    }
+
     return !!(
       attachedReporting?.geom &&
       currentAction?.geom &&