Skip to content

Commit 473dd56

Browse files
authored
[Map] N'afficher aucune pop-up sur la carte lorsqu'on est en édition de point de contrôle ou de zone de mission /surveillance (#576)
- Resolve #457 (troisième point)
2 parents 6c0a9cf + a1db6e7 commit 473dd56

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

frontend/src/domain/use_cases/missions/addZone.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ const openDrawLayerModal = dispatch => {
4343
displayMissionMenuButton: false,
4444
displayMissionsLayer: false,
4545
displayMissionsOverlay: false,
46-
displaySelectedMissionLayer: false
46+
displaySearchSemaphoreButton: false,
47+
displaySelectedMissionLayer: false,
48+
displaySemaphoreOverlay: false,
49+
displaySemaphoresLayer: false
4750
})
4851
)
4952
}
@@ -59,7 +62,10 @@ export const closeDrawLayerModal = dispatch => {
5962
displayMissionMenuButton: true,
6063
displayMissionsLayer: true,
6164
displayMissionsOverlay: true,
62-
displaySelectedMissionLayer: true
65+
displaySearchSemaphoreButton: true,
66+
displaySelectedMissionLayer: true,
67+
displaySemaphoreOverlay: true,
68+
displaySemaphoresLayer: true
6369
})
6470
)
6571
}

frontend/src/features/map/overlays/actions/ControlCard.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { getLocalizedDayjs } from '@mtes-mct/monitor-ui'
22
import styled from 'styled-components'
33

44
import { COLORS } from '../../../../constants/constants'
5-
import { InteractionListener } from '../../../../domain/entities/map/constants'
65
import { actionTargetTypeLabels } from '../../../../domain/entities/missions'
76
import { useAppSelector } from '../../../../hooks/useAppSelector'
87
import { ControlInfractionsTags } from '../../../../ui/ControlInfractionsTags'
@@ -16,7 +15,7 @@ export function ControlCard({ feature }: { feature: any }) {
1615
const parsedActionStartDateTimeUtc = new Date(actionStartDateTimeUtc)
1716
const actionDate = getLocalizedDayjs(parsedActionStartDateTimeUtc).format('DD MMM à HH:mm')
1817

19-
if (listener === InteractionListener.CONTROL_POINT) {
18+
if (listener) {
2019
return null
2120
}
2221

frontend/src/features/map/overlays/actions/SurveillanceCard.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import dayjs from 'dayjs'
33
import styled from 'styled-components'
44

55
import { COLORS } from '../../../../constants/constants'
6-
import { InteractionListener } from '../../../../domain/entities/map/constants'
76
import { useAppSelector } from '../../../../hooks/useAppSelector'
87
import { dateDifferenceInHours } from '../../../../utils/dateDifferenceInHours'
98
import { extractThemesAsText } from '../../../../utils/extractThemesAsText'
@@ -20,7 +19,7 @@ export function SurveillanceCard({ feature }) {
2019

2120
const simpleDate = startDate?.isValid() && startDate?.format('DD MMMM YYYY')
2221

23-
if (listener === InteractionListener.SURVEILLANCE_ZONE) {
22+
if (listener) {
2423
return null
2524
}
2625

frontend/src/features/map/overlays/semaphores/SemaphoreCard.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ const hoverTooltip = (text, className) => <StyledTooltip className={className}>{
4040
export function SemaphoreCard({ feature, selected = false }: { feature: any; selected?: boolean }) {
4141
const dispatch = useDispatch()
4242
const { displaySemaphoresLayer } = useAppSelector(state => state.global)
43+
4344
const { email, name, phoneNumber, unit } = feature.getProperties()
4445
const [tooltipPhoneState, setTooltipPhoneState] = useState(PHONE_TOOLTIP_STATE.hover)
4546

0 commit comments

Comments
 (0)