Merge commit 'bf04e0cb8b4732cbaa9e49fefc04b0bda19e3ad2'

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/missions/InfractionEntity.kt

@@ -7,7 +7,7 @@ data class InfractionEntity(
   val registrationNumber: String? = null,
   val companyName: String? = null,
   val relevantCourt: String? = null,
-  val infractionType: Boolean? = null,
+  val infractionType: InfractionTypeEnum,
   val formalNotice: FormalNoticeEnum,
   val toProcess: Boolean,
   val controlledPersonIdentity: String? = null,

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/domain/entities/missions/InfractionTypeEnum.kt

@@ -0,0 +1,6 @@
+package fr.gouv.cacem.monitorenv.domain.entities.missions
+
+enum class InfractionTypeEnum {
+  WITH_REPORT,
+  WITHOUT_REPORT
+}

backend/src/test/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/JpaMissionRepositoryITests.kt

@@ -94,7 +94,7 @@ class JpaMissionRepositoryITests : AbstractDBTests() {
       registrationNumber = "REGISTRATION NUM",
       companyName = "ACME inc.",
       relevantCourt = "MARITIME_COURT",
-      infractionType = false,
+      infractionType = InfractionTypeEnum.WITHOUT_REPORT,
       formalNotice = FormalNoticeEnum.NO,
       toProcess = false,
       controlledPersonIdentity = "Dick Hoover",

frontend/src/features/layersSelector/regulatory/metadata/RegulatoryLayerZoneMetadata.js

@@ -16,13 +16,14 @@ import { CloseIcon } from '../../../commonStyles/icons/CloseIcon.style'
 
 import { COLORS } from '../../../../constants/constants'
 
+const FOUR_HOURS = 4 * 60 * 60 * 1000
 const RegulatoryLayerZoneMetadata = () => {
   const dispatch = useDispatch()
   const {
     regulatoryMetadataPanelIsOpen,
     regulatoryMetadataLayerId
   } = useSelector(state => state.regulatoryMetadata)
-  const { currentData } = useGetRegulatoryLayerQuery({id: regulatoryMetadataLayerId})
+  const { currentData } = useGetRegulatoryLayerQuery({id: regulatoryMetadataLayerId}, {pollingInterval: FOUR_HOURS})
   const regulatoryMetadata = currentData?.properties
 
   const onCloseIconClicked = useCallback(() => {

frontend/src/features/map/layers/MissionsLayer.js

@@ -11,11 +11,11 @@ import Layers from '../../../domain/entities/layers'
 import { getMissionZoneFeature } from './missionGeometryHelpers'
 import { missionWithCentroidStyleFn } from './styles/missions.style'
 
-
+const TWO_MINUTES = 2 * 60 * 1000
 export const MissionsLayer = ({ map, mapClickEvent }) => {
   const dispatch = useDispatch()
   const { displayMissionsLayer } = useSelector(state => state.global)
-  const { data } = useGetMissionsQuery()
+  const { data } = useGetMissionsQuery(undefined, {pollingInterval: TWO_MINUTES})
 
   const missionsMultiPolygons = useMemo(()=>{
     return data?.filter(f=>!!f.geom).map(f => getMissionZoneFeature(f, Layers.MISSIONS.code))

frontend/src/features/missions/MissionDetails/InfractionFormHeaderVehicle.js

@@ -10,7 +10,6 @@ import { vehicleTypeEnum } from '../../../domain/entities/missions'
 
 export const InfractionFormHeaderVehicle = ({currentActionIndex, infractionPath}) => {
   const [vehicleTypeField] = useField(`envActions.${currentActionIndex}.vehicleType`)
-  console.log(vehicleTypeField?.value)
   return (
     <FormGroup>
       <FormColumn>

frontend/src/features/missions/MissionDetails/NatinfSelector.js

@@ -21,7 +21,7 @@ export const NatinfSelector = ({ infractionPath, ...props }) => {
   return (
     <SelectorWrapper ref={selectorRef}>
         <Form.ControlLabel htmlFor="natinf">NATINF</Form.ControlLabel>
-        <TagPicker
+        <FixedWidthTagPicker
           virtualized
           block
           searchable
@@ -50,3 +50,7 @@ const SelectorWrapper = styled.div`
   .rs-picker-menu {
   }
 `
+
+const FixedWidthTagPicker = styled(TagPicker)`
+  max-width: 450px;
+`

frontend/src/features/missions/Missions.js

@@ -13,9 +13,10 @@ import { MissionsTableFilters } from './MissionsList/MissionsTableFilters';
 import { PlusIcon } from '../commonStyles/icons/PlusIcon';
 import { COLORS } from '../../constants/constants';
 
+const TWO_MINUTES = 2 * 60 * 1000
 export const Missions = () => {
   const dispatch = useDispatch()
-  const { data, isError, isLoading } = useGetMissionsQuery()
+  const { data, isError, isLoading } = useGetMissionsQuery(undefined, {pollingInterval: TWO_MINUTES})
 
 
   const {missionStatusFilter, missionNatureFilter, missionTypeFilter } = useSelector(state => state.missionFilters)