Skip to content

Commit

Permalink
Add warning message when control unit is engaged
Browse files Browse the repository at this point in the history
  • Loading branch information
louptheron committed Oct 12, 2023
1 parent 844343a commit 27ae05e
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,13 @@ context('Mission', () => {
// Then
cy.get('*[data-cy="delete-mission"]').should('be.disabled')
})

it('A warning should be displayed When a control unit is already engaged in a mission ', () => {
// Given
cy.wait(200)
cy.get('*[data-cy="edit-mission-43"]').click({ force: true })
cy.intercept('PUT', `/bff/v1/missions/43`).as('updateMission')

cy.get('body').contains('Cette unité est actuellement sélectionnée dans une autre mission en cours.')
})
})
8 changes: 4 additions & 4 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@dnd-kit/core": "^4.0.3",
"@dnd-kit/modifiers": "^4.0.0",
"@mtes-mct/monitor-ui": "10.1.1",
"@mtes-mct/monitor-ui": "10.4.0",
"@reduxjs/toolkit": "1.9.5",
"@rsuite/responsive-nav": "5.0.1",
"@sentry/browser": "7.73.0",
Expand Down
13 changes: 13 additions & 0 deletions frontend/src/api/missionsAPI.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'

import { monitorenvPublicApi } from './api'
import { ControlUnit } from '../domain/entities/controlUnit'

import type { Mission } from '../domain/entities/missions'

type MissionsResponse = Mission[]
Expand Down Expand Up @@ -83,10 +86,20 @@ export const missionsAPI = createApi({
tagTypes: ['Missions']
})

export const publicMissionsAPI = monitorenvPublicApi.injectEndpoints({
endpoints: builder => ({
getEngagedControlUnits: builder.query<ControlUnit.ControlUnit[], void>({
query: () => `/v1/missions/engaged_control_units`
})
})
})

export const {
useCreateMissionMutation,
useDeleteMissionMutation,
useGetMissionQuery,
useGetMissionsQuery,
useUpdateMissionMutation
} = missionsAPI

export const { useGetEngagedControlUnitsQuery } = publicMissionsAPI
13 changes: 11 additions & 2 deletions frontend/src/features/missions/MissionForm/ControlUnitSelector.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable react/jsx-props-no-spreading */
import { FieldError, FormikTextInput } from '@mtes-mct/monitor-ui'
import { FormikTextInput, FieldError, Message, Level } from '@mtes-mct/monitor-ui'
import { useField } from 'formik'
import _ from 'lodash'
import { type MutableRefObject, useMemo, useRef } from 'react'
Expand All @@ -13,7 +13,7 @@ import { ReactComponent as DeleteSVG } from '../../../uiMonitor/icons/Delete.svg

import type { ControlUnit } from '../../../domain/entities/controlUnit'

export function ControlUnitSelector({ controlUnitIndex, controlUnitPath, removeControlUnit, ...props }) {
export function ControlUnitSelector({ controlUnitIndex, controlUnitPath, isEngaged, removeControlUnit, ...props }) {
const [administrationField, administrationMeta, administrationHelpers] = useField<string>(
`controlUnits.${controlUnitIndex}.administration`
)
Expand Down Expand Up @@ -138,6 +138,11 @@ export function ControlUnitSelector({ controlUnitIndex, controlUnitPath, removeC
/>
</FormikErrorWrapper>
{unitNameMeta.error && <FieldError>{unitNameMeta.error}</FieldError>}
{isEngaged && (
<StyledMessage level={Level.WARNING}>
Cette unité est actuellement sélectionnée dans une autre mission en cours.
</StyledMessage>
)}
</FormGroupFixed>
<FormGroupFixed>
<RefWrapper ref={resourcesRef} data-cy="unit-tag-picker">
Expand Down Expand Up @@ -169,6 +174,10 @@ export function ControlUnitSelector({ controlUnitIndex, controlUnitPath, removeC
)
}

const StyledMessage = styled(Message)`
margin-top: 8px;
`

const RessourceUnitWrapper = styled.div`
margin-bottom: 14px;
display: flex;
Expand Down
15 changes: 14 additions & 1 deletion frontend/src/features/missions/MissionForm/ControlUnitsForm.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
import { Accent, Button, Icon, Size } from '@mtes-mct/monitor-ui'
import { useMemo } from 'react'

import { ControlUnitSelector } from './ControlUnitSelector'
import { useGetEngagedControlUnitsQuery } from '../../../api/missionsAPI'
import { controlUnitFactory } from '../Missions.helpers'

export function ControlUnitsForm({ form, push, remove }) {
const { data: engagedControlUnitsData } = useGetEngagedControlUnitsQuery(undefined)

const engagedControlUnits = useMemo(() => {
if (!engagedControlUnitsData) {
return []
}

return engagedControlUnitsData
}, [engagedControlUnitsData])

const handleAddControlUnit = () => {
push(controlUnitFactory())
}
Expand All @@ -16,12 +28,13 @@ export function ControlUnitsForm({ form, push, remove }) {
<div>
{form?.values.controlUnits?.length > 0 && (
<>
{form.values.controlUnits.map((_, index) => (
{form.values.controlUnits.map(({ id }, index) => (
<ControlUnitSelector
// eslint-disable-next-line react/no-array-index-key
key={index}
controlUnitIndex={index}
controlUnitPath={`controlUnits[${index}]`}
isEngaged={!!engagedControlUnits.find(engaged => engaged.id === id)}
removeControlUnit={handleRemoveControlUnit(index)}
/>
))}
Expand Down

0 comments on commit 27ae05e

Please sign in to comment.