Merge pull request #439 from MTES-MCT/fix-rescue-jeanne-barret

fix: fix validation for ActionRescueEntity
MTES-MCT · Nov 19, 2024 · 5608e8a · 5608e8a
2 parents d690b9e + b88adff
commit 5608e8a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 22 deletions.
diff --git a/...kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/action/ActionRescueEntity.kt b/...kotlin/fr/gouv/dgampa/rapportnav/domain/entities/mission/nav/action/ActionRescueEntity.kt
@@ -20,6 +20,7 @@ data class ActionRescueEntity(
 
     @MandatoryForStats
     override val startDateTimeUtc: Instant,
+    @MandatoryForStats
     override val endDateTimeUtc: Instant? = null,
 
     @MandatoryForStats

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/features/common/components/elements/patchable-monitor-daterange.tsx b/frontend/src/features/common/components/elements/patchable-monitor-daterange.tsx
@@ -1,7 +1,6 @@
 import { FC } from 'react'
 import DateRangePicker from '@common/components/elements/dates/daterange-picker.tsx'
 import { DateRange } from '@mtes-mct/monitor-ui/types/definitions'
-import useMissionDates from '@features/pam/mission/hooks/use-mission-dates.tsx'
 import { useParams } from 'react-router-dom'
 
 type PatchableMonitorDateRangeProps = {
@@ -17,11 +16,9 @@ const PatchableMonitorDateRange: FC<PatchableMonitorDateRangeProps> = ({
   startDateTimeUtc,
   endDateTimeUtc,
   label,
-  isLight,
-  dateValidation
+  isLight
 }) => {
   const { missionId } = useParams()
-  const missionDates = useMissionDates(missionId)
 
   const onChangeDates = (value?: DateRange) => {
     if (value) {
@@ -34,7 +31,6 @@ const PatchableMonitorDateRange: FC<PatchableMonitorDateRangeProps> = ({
   return (
     <DateRangePicker
       selectedRange={[startDateTimeUtc, endDateTimeUtc]}
-      allowedRange={dateValidation ? missionDates : undefined}
       label={label}
       withTime={true}
       isCompact={true}

diff --git a/frontend/src/features/pam/mission/components/elements/actions/action-control-nav.tsx b/frontend/src/features/pam/mission/components/elements/actions/action-control-nav.tsx
@@ -25,15 +25,13 @@ import ControlSecurityForm from '../controls/control-security-form.tsx'
 import ActionHeader from './action-header.tsx'
 import { ActionDetailsProps } from './action-mapping.ts'
 import { DateRange } from '@mtes-mct/monitor-ui/types/definitions'
-import useMissionDates from '@features/pam/mission/hooks/use-mission-dates.tsx'
 
 type ActionControlNavProps = ActionDetailsProps
 
 const ActionControlNav: React.FC<ActionControlNavProps> = ({ action }) => {
   const navigate = useNavigate()
   const { missionId, actionId } = useParams()
   const isMissionFinished = useIsMissionFinished(missionId)
-  const missionDates = useMissionDates(missionId)
   const [observationsValue, setObservationsValue] = useState<string | undefined>(undefined)
   const [identityControlledPersonValue, setIdentityControlledPersonValue] = useState<string | undefined>(undefined)
   const [vesselIdentifierValue, setVesselIdentifierValue] = useState<string | undefined>(undefined)

diff --git a/frontend/src/features/pam/mission/components/elements/actions/action-status-form.tsx b/frontend/src/features/pam/mission/components/elements/actions/action-status-form.tsx
@@ -13,14 +13,12 @@ import { ActionDetailsProps } from './action-mapping.ts'
 import ActionHeader from './action-header.tsx'
 import useIsMissionFinished from '../../../hooks/use-is-mission-finished.tsx'
 import DatePicker from '@common/components/elements/dates/date-picker.tsx'
-import useMissionDates from '@features/pam/mission/hooks/use-mission-dates.tsx'
 
 type ActionStatusFormProps = ActionDetailsProps
 
 const ActionStatusForm: React.FC<ActionStatusFormProps> = ({ action }) => {
   const navigate = useNavigate()
   const { missionId, actionId } = useParams()
-  const missionDates = useMissionDates(missionId)
   const isMissionFinished = useIsMissionFinished(missionId)
 
   const { data: navAction, loading, error } = useActionById(actionId, missionId, action.source, action.type)
@@ -110,7 +108,6 @@ const ActionStatusForm: React.FC<ActionStatusFormProps> = ({ action }) => {
                   onChange={async (nextUtcDate: Date) => {
                     await onChange(nextUtcDate)('startDateTimeUtc')
                   }}
-                  allowedRange={missionDates}
                 />
               </Stack.Item>
               <Stack.Item grow={3}>