Skip to content

Commit

Permalink
[Mission] rename missions feature in Mission
Browse files Browse the repository at this point in the history
  • Loading branch information
claire2212 committed May 9, 2024
1 parent 7ee1ed4 commit bf10600
Show file tree
Hide file tree
Showing 129 changed files with 65 additions and 60 deletions.
@@ -1,4 +1,4 @@
import { attachReportingToMissionSliceActions } from '@features/missions/MissionForm/AttachReporting/slice'
import { attachReportingToMissionSliceActions } from '@features/Mission/MissionForm/AttachReporting/slice'
import { setGeometry } from 'domain/shared_slices/Draw'

import type { GeoJSON } from 'domain/types/GeoJSON'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/domain/entities/missions.ts
Expand Up @@ -4,7 +4,7 @@ import type { ControlPlansData } from './controlPlan'
import type { LegacyControlUnit } from './legacyControlUnit'
import type { DetachedReportingForTimeline, ReportingDetailed, ReportingForTimeline } from './reporting'
import type { SeaFrontEnum } from './seaFrontType'
import type { FishMissionAction } from '@features/missions/fishActions.types'
import type { FishMissionAction } from '@features/Mission/fishActions.types'
import type { GeoJSON } from 'domain/types/GeoJSON'

export const CIRCULAR_ZONE_RADIUS = 1500
Expand Down
@@ -1,4 +1,5 @@
import { attachReportingToMissionSliceActions } from '../../../features/missions/MissionForm/AttachReporting/slice'
import { attachReportingToMissionSliceActions } from '@features/Mission/MissionForm/AttachReporting/slice'

import { attachMissionToReportingSliceActions } from '../../../features/Reportings/slice'
import { resetInteraction } from '../../shared_slices/Draw'
import { setDisplayedItems, resetLayoutToDefault } from '../../shared_slices/Global'
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/domain/use_cases/missions/addMission.ts
@@ -1,10 +1,10 @@
import { attachReportingToMissionSliceActions } from '@features/Mission/MissionForm/AttachReporting/slice'
import { missionFormsActions } from '@features/Mission/MissionForm/slice'
import { missionFactory } from '@features/Mission/Missions.helpers'
import { type ControlUnit } from '@mtes-mct/monitor-ui'
import { chain } from 'lodash'
import { generatePath } from 'react-router'

import { attachReportingToMissionSliceActions } from '../../../features/missions/MissionForm/AttachReporting/slice'
import { missionFormsActions } from '../../../features/missions/MissionForm/slice'
import { missionFactory } from '../../../features/missions/Missions.helpers'
import { sideWindowActions } from '../../../features/SideWindow/slice'
import { isNewMission } from '../../../utils/isNewMission'
import { sideWindowPaths } from '../../entities/sideWindow'
Expand Down
@@ -1,5 +1,6 @@
import { attachReportingToMissionSliceActions } from '@features/Mission/MissionForm/AttachReporting/slice'

import { reportingsAPI } from '../../../api/reportingsAPI'
import { attachReportingToMissionSliceActions } from '../../../features/missions/MissionForm/AttachReporting/slice'
import { setToast } from '../../shared_slices/Global'

export const attachReportingFromMap = (reportingId: number) => async (dispatch, getState) => {
Expand Down
@@ -1,8 +1,8 @@
import { missionFormsActions } from '@features/Mission/MissionForm/slice'
import { customDayjs } from '@mtes-mct/monitor-ui'
import { generatePath } from 'react-router'

import { deleteTab } from './deleteTab'
import { missionFormsActions } from '../../../features/missions/MissionForm/slice'
import { DateRangeEnum } from '../../entities/dateRange'
import { MissionStatusEnum } from '../../entities/missions'
import { sideWindowPaths } from '../../entities/sideWindow'
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/domain/use_cases/missions/deleteMission.ts
@@ -1,5 +1,6 @@
import { missionFormsActions } from '@features/Mission/MissionForm/slice'

import { missionsAPI } from '../../../api/missionsAPI'
import { missionFormsActions } from '../../../features/missions/MissionForm/slice'
import { sideWindowActions } from '../../../features/SideWindow/slice'
import { sideWindowPaths } from '../../entities/sideWindow'
import { setToast } from '../../shared_slices/Global'
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/domain/use_cases/missions/deleteTab.ts
@@ -1,8 +1,8 @@
import { attachReportingToMissionSliceActions } from '@features/Mission/MissionForm/AttachReporting/slice'
import { missionFormsActions, type MissionInStateType } from '@features/Mission/MissionForm/slice'
import { missionActions } from '@features/Mission/slice'
import { generatePath } from 'react-router'

import { attachReportingToMissionSliceActions } from '../../../features/missions/MissionForm/AttachReporting/slice'
import { missionFormsActions, type MissionInStateType } from '../../../features/missions/MissionForm/slice'
import { missionActions } from '../../../features/missions/slice'
import { sideWindowActions } from '../../../features/SideWindow/slice'
import { getIdTyped } from '../../../utils/getIdTyped'
import { getMissionPageRoute } from '../../../utils/routes'
Expand Down
@@ -1,11 +1,11 @@
import { missionsAPI } from '@api/missionsAPI'
import { attachReportingToMissionSliceActions } from '@features/Mission/MissionForm/AttachReporting/slice'
import { missionFormsActions } from '@features/Mission/MissionForm/slice'
import { missionActions } from '@features/Mission/slice'
import { ErrorType } from 'domain/entities/errors'
import { setToast } from 'domain/shared_slices/Global'
import { generatePath } from 'react-router'

import { attachReportingToMissionSliceActions } from '../../../features/missions/MissionForm/AttachReporting/slice'
import { missionFormsActions } from '../../../features/missions/MissionForm/slice'
import { missionActions } from '../../../features/missions/slice'
import { sideWindowActions } from '../../../features/SideWindow/slice'
import { sideWindowPaths } from '../../entities/sideWindow'

Expand Down
@@ -1,4 +1,4 @@
import { getMissionCompletionStatus } from '@features/missions/utils'
import { getMissionCompletionStatus } from '@features/Mission/utils'

import { FrontCompletionStatus, type Mission } from '../../../entities/missions'

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/domain/use_cases/missions/saveMission.ts
@@ -1,10 +1,10 @@
import { missionFormsActions } from '@features/Mission/MissionForm/slice'
import { missionActions } from '@features/Mission/slice'
import omit from 'lodash/omit'
import { generatePath } from 'react-router'

import { missionsAPI } from '../../../api/missionsAPI'
import { ApiErrorCode } from '../../../api/types'
import { missionFormsActions } from '../../../features/missions/MissionForm/slice'
import { missionActions } from '../../../features/missions/slice'
import { sideWindowActions } from '../../../features/SideWindow/slice'
import { isNewMission } from '../../../utils/isNewMission'
import { getMissionPageRoute } from '../../../utils/routes'
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/domain/use_cases/missions/switchTab.ts
@@ -1,6 +1,7 @@
import { attachReportingToMissionSliceActions } from '../../../features/missions/MissionForm/AttachReporting/slice'
import { missionFormsActions } from '../../../features/missions/MissionForm/slice'
import { missionActions } from '../../../features/missions/slice'
import { attachReportingToMissionSliceActions } from '@features/Mission/MissionForm/AttachReporting/slice'
import { missionFormsActions } from '@features/Mission/MissionForm/slice'
import { missionActions } from '@features/Mission/slice'

import { sideWindowActions } from '../../../features/SideWindow/slice'
import { getIdTyped } from '../../../utils/getIdTyped'
import { getMissionPageRoute } from '../../../utils/routes'
Expand Down
@@ -1,4 +1,4 @@
import { actionFactory } from '@features/missions/Missions.helpers'
import { actionFactory } from '@features/Mission/Missions.helpers'
import { useGetControlPlans } from '@hooks/useGetControlPlans'
import {
customDayjs,
Expand Down
@@ -1,4 +1,4 @@
import { getIsMissionEnded } from '@features/missions/utils'
import { getIsMissionEnded } from '@features/Mission/utils'
import { Icon, pluralize, THEME } from '@mtes-mct/monitor-ui'
import styled from 'styled-components'

Expand Down
@@ -1,4 +1,4 @@
import { actionFactory } from '@features/missions/Missions.helpers'
import { actionFactory } from '@features/Mission/Missions.helpers'
import { Accent, Button, FormikTextarea, Icon, Size, THEME } from '@mtes-mct/monitor-ui'
import { useField, useFormikContext } from 'formik'
import { useCallback } from 'react'
Expand Down
@@ -1,4 +1,4 @@
import { actionFactory } from '@features/missions/Missions.helpers'
import { actionFactory } from '@features/Mission/Missions.helpers'
import { useGetControlPlans } from '@hooks/useGetControlPlans'
import {
customDayjs,
Expand Down
Expand Up @@ -16,7 +16,7 @@ import {
TagsContainer
} from '../style'

import type { FishMissionAction } from '@features/missions/fishActions.types'
import type { FishMissionAction } from '@features/Mission/fishActions.types'
import type { DetachedReportingForTimeline, ReportingForTimeline } from 'domain/entities/reporting'
import type { MouseEventHandler } from 'react'

Expand Down
@@ -1,4 +1,4 @@
import { getVesselName } from '@features/missions/utils'
import { getVesselName } from '@features/Mission/utils'
import { Icon, THEME } from '@mtes-mct/monitor-ui'

import { Accented, SummaryContent, Title } from '../style'
Expand Down
@@ -1,4 +1,4 @@
import { getVesselName } from '@features/missions/utils'
import { getVesselName } from '@features/Mission/utils'
import { Icon, THEME } from '@mtes-mct/monitor-ui'

import { Accented, SummaryContent, Title } from '../style'
Expand Down
@@ -1,4 +1,4 @@
import { getVesselName } from '@features/missions/utils'
import { getVesselName } from '@features/Mission/utils'
import { Icon, THEME } from '@mtes-mct/monitor-ui'

import { Accented, SummaryContent, Title } from '../style'
Expand Down
@@ -1,5 +1,5 @@
import { Italic } from '@components/style'
import { FishMissionAction } from '@features/missions/fishActions.types'
import { FishMissionAction } from '@features/Mission/fishActions.types'
import styled from 'styled-components'

import { AirControlCard } from './AirControlCard'
Expand Down
@@ -1,4 +1,4 @@
import { FishMissionAction } from '@features/missions/fishActions.types'
import { FishMissionAction } from '@features/Mission/fishActions.types'

import { EnvActions } from './EnvActions'
import { FishActions } from './FishActions'
Expand Down
@@ -1,4 +1,4 @@
import { getIsMissionEnded } from '@features/missions/utils'
import { getIsMissionEnded } from '@features/Mission/utils'
import { Icon, THEME } from '@mtes-mct/monitor-ui'
import { ActionTypeEnum, type Mission, type NewMission } from 'domain/entities/missions'
import { useFormikContext } from 'formik'
Expand Down
@@ -1,4 +1,4 @@
import { CompletionStatusTag } from '@features/missions/components/CompletionStatusTag'
import { CompletionStatusTag } from '@features/Mission/components/CompletionStatusTag'
import {
customDayjs,
DatePicker,
Expand Down
@@ -1,4 +1,4 @@
import { getIsMissionEnded } from '@features/missions/utils'
import { getIsMissionEnded } from '@features/Mission/utils'
import { type ControlUnit } from '@mtes-mct/monitor-ui'
import * as Yup from 'yup'

Expand Down
@@ -1,4 +1,4 @@
import { getMissionCompletionFrontStatus, hasAtLeastOnUncompletedEnvAction } from '@features/missions/utils'
import { getMissionCompletionFrontStatus, hasAtLeastOnUncompletedEnvAction } from '@features/Mission/utils'
import {
ActionTypeEnum,
CompletionStatus,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@
import { CompletionStatusTag } from '@features/missions/components/CompletionStatusTag'
import { MissionStatusTag } from '@features/missions/components/MissionStatusTag'
import { getMissionCompletionStatus } from '@features/missions/utils'
import { CompletionStatusTag } from '@features/Mission/components/CompletionStatusTag'
import { MissionStatusTag } from '@features/Mission/components/MissionStatusTag'
import { getMissionCompletionStatus } from '@features/Mission/utils'
import { useAppDispatch } from '@hooks/useAppDispatch'
import { customDayjs as dayjs, pluralize } from '@mtes-mct/monitor-ui'
import { editMissionInLocalStore } from 'domain/use_cases/missions/editMissionInLocalStore'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/SideWindow/SideWindowLauncher.tsx
@@ -1,3 +1,4 @@
import { missionFormsActions } from '@features/Mission/MissionForm/slice'
import { useForceUpdate, NewWindow } from '@mtes-mct/monitor-ui'
import { useCallback, useEffect, useMemo } from 'react'

Expand All @@ -8,7 +9,6 @@ import { reportingActions } from '../../domain/shared_slices/reporting'
import { useAppDispatch } from '../../hooks/useAppDispatch'
import { useAppSelector } from '../../hooks/useAppSelector'
import { mainWindowActions } from '../MainWindow/slice'
import { missionFormsActions } from '../missions/MissionForm/slice'

export function SideWindowLauncher() {
const dispatch = useAppDispatch()
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/features/SideWindow/index.tsx
@@ -1,3 +1,9 @@
import { MissionFormWrapper } from '@features/Mission/MissionForm'
import { MISSION_EVENT_UNSYNCHRONIZED_PROPERTIES } from '@features/Mission/MissionForm/constants'
import { useListenMissionEventUpdates } from '@features/Mission/MissionForm/hooks/useListenMissionEventUpdates'
import { missionFormsActions } from '@features/Mission/MissionForm/slice'
import { Missions } from '@features/Mission/MissionsList'
import { MissionsNavBar } from '@features/Mission/MissionsNavBar'
import { Icon, SideMenu, type NewWindowContextValue, NewWindowContext } from '@mtes-mct/monitor-ui'
import { omit } from 'lodash'
import { useEffect, useMemo, useState, useRef, type MutableRefObject } from 'react'
Expand All @@ -15,12 +21,6 @@ import { switchTab } from '../../domain/use_cases/missions/switchTab'
import { useAppDispatch } from '../../hooks/useAppDispatch'
import { useAppSelector } from '../../hooks/useAppSelector'
import { isMissionOrMissionsPage, isMissionPage, isReportingsPage } from '../../utils/routes'
import { MissionFormWrapper } from '../missions/MissionForm'
import { MISSION_EVENT_UNSYNCHRONIZED_PROPERTIES } from '../missions/MissionForm/constants'
import { useListenMissionEventUpdates } from '../missions/MissionForm/hooks/useListenMissionEventUpdates'
import { missionFormsActions } from '../missions/MissionForm/slice'
import { Missions } from '../missions/MissionsList'
import { MissionsNavBar } from '../missions/MissionsNavBar'
import { Reportings } from '../Reportings'
import { ReportingsList } from '../Reportings/ReportingsList'

Expand Down
6 changes: 3 additions & 3 deletions frontend/src/features/map/index.tsx
@@ -1,5 +1,8 @@
import { LayersOverlay } from '@features/layersSelector/overlays'
import { LayerEvents } from '@features/layersSelector/overlays/LayerEvents'
import { ReportingToAttachLayer } from '@features/Mission/Layers/ReportingToAttach'
import { HoveredReportingToAttachLayer } from '@features/Mission/Layers/ReportingToAttach/HoveredReportingToAttachLayer'
import { ReportingToAttachOverlays } from '@features/Mission/Overlays/ReportingToAttach'

import { BaseMap } from './BaseMap'
import { MapAttributionsBox } from './controls/MapAttributionsBox'
Expand Down Expand Up @@ -29,9 +32,6 @@ import { MissionOverlays } from './overlays/missions'
import { ReportingOverlay } from './overlays/reportings'
import { SemaphoreOverlay } from './overlays/semaphores'
import { ZoomListener } from './ZoomListener'
import { ReportingToAttachLayer } from '../missions/Layers/ReportingToAttach'
import { HoveredReportingToAttachLayer } from '../missions/Layers/ReportingToAttach/HoveredReportingToAttachLayer'
import { ReportingToAttachOverlays } from '../missions/Overlays/ReportingToAttach'
import { MissionToAttachLayer } from '../Reportings/Layers/MissionToAttach'
import { HoveredMissionToAttachLayer } from '../Reportings/Layers/MissionToAttach/HoveredMissionToAttachLayer'
import { SelectedMissionToAttachLayer } from '../Reportings/Layers/MissionToAttach/SelectedMissionToAttachLayer'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/map/layers/Missions/index.tsx
@@ -1,3 +1,4 @@
import { missionActions } from '@features/Mission/slice'
import { removeOverlayCoordinatesByName } from 'domain/shared_slices/Global'
import { convertToFeature } from 'domain/types/map'
import VectorLayer from 'ol/layer/Vector'
Expand All @@ -11,7 +12,6 @@ import { useAppDispatch } from '../../../../hooks/useAppDispatch'
import { useAppSelector } from '../../../../hooks/useAppSelector'
import { useGetFilteredMissionsQuery } from '../../../../hooks/useGetFilteredMissionsQuery'
import { useHasMapInteraction } from '../../../../hooks/useHasMapInteraction'
import { missionActions } from '../../../missions/slice'

import type { BaseMapChildrenProps } from '../../BaseMap'
import type { VectorLayerWithName } from 'domain/types/layer'
Expand Down
@@ -1,3 +1,4 @@
import { getTotalOfControls, getTotalOfSurveillances } from '@features/Mission/utils'
import { type Coordinates } from '@mtes-mct/monitor-ui'
import Feature from 'ol/Feature'
import GeoJSON from 'ol/format/GeoJSON'
Expand All @@ -17,7 +18,6 @@ import {
type NewEnvActionControl,
CIRCULAR_ZONE_RADIUS
} from '../../../../domain/entities/missions'
import { getTotalOfControls, getTotalOfSurveillances } from '../../../missions/utils'

export const getMissionZoneFeature = (mission: Partial<Mission | NewMission>, layername: string) => {
const geoJSON = new GeoJSON()
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/map/overlays/actions/ControlCard.tsx
@@ -1,4 +1,4 @@
import { ControlInfractionsTags } from '@features/missions/components/ControlInfractionsTags'
import { ControlInfractionsTags } from '@features/Mission/components/ControlInfractionsTags'
import { THEME, getLocalizedDayjs, pluralize } from '@mtes-mct/monitor-ui'
import styled from 'styled-components'

Expand Down
8 changes: 4 additions & 4 deletions frontend/src/features/map/overlays/missions/MissionCard.tsx
@@ -1,7 +1,8 @@
import { Bold } from '@components/style'
import { CompletionStatusTag } from '@features/missions/components/CompletionStatusTag'
import { MissionStatusTag } from '@features/missions/components/MissionStatusTag'
import { getMissionCompletionStatus } from '@features/missions/utils'
import { CompletionStatusTag } from '@features/Mission/components/CompletionStatusTag'
import { MissionStatusTag } from '@features/Mission/components/MissionStatusTag'
import { missionActions } from '@features/Mission/slice'
import { getMissionCompletionStatus } from '@features/Mission/utils'
import { Accent, Button, Icon, IconButton, Size, customDayjs as dayjs, pluralize } from '@mtes-mct/monitor-ui'
import { Layers } from 'domain/entities/layers/constants'
import { removeOverlayCoordinatesByName } from 'domain/shared_slices/Global'
Expand All @@ -12,7 +13,6 @@ import { editMissionInLocalStore } from '../../../../domain/use_cases/missions/e
import { useAppDispatch } from '../../../../hooks/useAppDispatch'
import { useAppSelector } from '../../../../hooks/useAppSelector'
import { humanizeMissionTypes } from '../../../../utils/humanizeMissionTypes'
import { missionActions } from '../../../missions/slice'

type MissionCardProps = {
feature: any
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/HomePage.tsx
@@ -1,4 +1,6 @@
import { BannerStack } from '@features/MainWindow/components/BannerStack'
import { AttachReportingToMissionModal } from '@features/Mission/MissionForm/AttachReporting/AttachReportingToMissionModal'
import { MissionsMenu } from '@features/Mission/MissionsButton'
import { useCallback, useMemo } from 'react'
import { useBeforeUnload } from 'react-router-dom'
import { ToastContainer } from 'react-toastify'
Expand All @@ -15,8 +17,6 @@ import { DrawModal } from '../features/map/draw/DrawModal'
import { RightMenuOnHoverArea } from '../features/map/shared/RightMenuOnHoverArea'
import { InterestPointMapButton } from '../features/map/tools/interestPoint/InterestPointMapButton'
import { MeasurementMapButton } from '../features/map/tools/measurements/MeasurementMapButton'
import { AttachReportingToMissionModal } from '../features/missions/MissionForm/AttachReporting/AttachReportingToMissionModal'
import { MissionsMenu } from '../features/missions/MissionsButton'
import { Reportings } from '../features/Reportings'
import { AttachMissionToReportingModal } from '../features/Reportings/ReportingForm/AttachMission/AttachMissionToReportingModal'
import { ReportingsButton } from '../features/Reportings/ReportingsButton'
Expand Down

0 comments on commit bf10600

Please sign in to comment.