Skip to content

Commit a1db6e7

Browse files
committed
[DrawModal] hide semaphores overlays layers and button
1 parent 79ebaea commit a1db6e7

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
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/missions/MissionCard.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { COLORS } from '../../../../constants/constants'
1010
import { sideWindowPaths } from '../../../../domain/entities/sideWindow'
1111
import { clearSelectedMissionOnMap } from '../../../../domain/use_cases/missions/selectMissionOnMap'
1212
import { onNavigateBetweenMapAndSideWindow } from '../../../../domain/use_cases/navigation/onNavigateBetweenMapAndSideWindow'
13-
import { useAppSelector } from '../../../../hooks/useAppSelector'
1413
import { MissionSourceTag } from '../../../../ui/MissionSourceTag'
1514
import { MissionStatusLabel } from '../../../../ui/MissionStatusLabel'
1615
import { missionTypesToString } from '../../../../utils/missionTypes'
@@ -35,8 +34,6 @@ export function MissionCard({ feature, selected = false }: { feature: any; selec
3534
const startDate = dayjs(startDateTimeUtc)
3635
const endDate = dayjs(endDateTimeUtc)
3736

38-
const listener = useAppSelector(state => state.draw.listener)
39-
4037
const isMissionDuringOneDay = !endDateTimeUtc || (endDateTimeUtc && endDate.diff(startDate, 'day') === 0)
4138

4239
const formattedStartDate = startDate.isValid() && startDate.format('D MMM YYYY')
@@ -53,10 +50,6 @@ export function MissionCard({ feature, selected = false }: { feature: any; selec
5350
dispatch(clearSelectedMissionOnMap())
5451
}, [dispatch])
5552

56-
if (listener) {
57-
return null
58-
}
59-
6053
return (
6154
<Wrapper data-cy="mission-overlay">
6255
<Header>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ 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-
const listener = useAppSelector(state => state.draw.listener)
4443

4544
const { email, name, phoneNumber, unit } = feature.getProperties()
4645
const [tooltipPhoneState, setTooltipPhoneState] = useState(PHONE_TOOLTIP_STATE.hover)
@@ -65,7 +64,7 @@ export function SemaphoreCard({ feature, selected = false }: { feature: any; sel
6564
setTooltipPhoneState(PHONE_TOOLTIP_STATE.hover)
6665
}
6766

68-
if (!displaySemaphoresLayer || listener) {
67+
if (!displaySemaphoresLayer) {
6968
return null
7069
}
7170

0 commit comments

Comments
 (0)