diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 377408c8d..b41bc504d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "license": "AGPL-3.0", "dependencies": { - "@mtes-mct/monitor-ui": "11.4.0", + "@mtes-mct/monitor-ui": "11.6.0", "@reduxjs/toolkit": "1.9.7", "@rsuite/responsive-nav": "5.0.1", "@sentry/browser": "7.73.0", @@ -3891,9 +3891,9 @@ "integrity": "sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==" }, "node_modules/@mtes-mct/monitor-ui": { - "version": "11.4.0", - "resolved": "https://registry.npmjs.org/@mtes-mct/monitor-ui/-/monitor-ui-11.4.0.tgz", - "integrity": "sha512-IlKufMNEh/qDtGM2zBhnb00A0lL4ji81+JXUjpvo3W0oC8MJW4t99AlYCkWN4YmlmJngsv1AriLqfKizWu48Jg==", + "version": "11.6.0", + "resolved": "https://registry.npmjs.org/@mtes-mct/monitor-ui/-/monitor-ui-11.6.0.tgz", + "integrity": "sha512-pPdFcmYRRuVFHxirbR20q9L96q9JnQX+bcOLigkmOFe14tm08hMfUjM/NVnz3jvXet93XJql33Ns23zlJAQKTQ==", "dependencies": { "@babel/runtime": "7.22.15", "@tanstack/react-table": "8.9.7", @@ -3910,7 +3910,7 @@ "formik": "^2.0.0", "react": "^18.0.0", "react-router-dom": "^6.0.0", - "rsuite": "^5.45.0", + "rsuite": "5.45.0", "styled-components": "^5.0.0 || ^6.0.0" } }, diff --git a/frontend/package.json b/frontend/package.json index bfb3c7413..2ee9435ce 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -28,7 +28,7 @@ "test:unit:watch": "npm run test:unit -- --watch" }, "dependencies": { - "@mtes-mct/monitor-ui": "11.4.0", + "@mtes-mct/monitor-ui": "11.6.0", "@reduxjs/toolkit": "1.9.7", "@rsuite/responsive-nav": "5.0.1", "@sentry/browser": "7.73.0", diff --git a/frontend/src/components/AlertUnsupportedBrowser.tsx b/frontend/src/components/AlertUnsupportedBrowser.tsx index 3de9e2706..83c5f9bf2 100644 --- a/frontend/src/components/AlertUnsupportedBrowser.tsx +++ b/frontend/src/components/AlertUnsupportedBrowser.tsx @@ -1,12 +1,11 @@ +import { Icon } from '@mtes-mct/monitor-ui' import styled from 'styled-components' -import { ReactComponent as AlertSVG } from '../uiMonitor/icons/Alert.svg' - export function AlertUnsupportedBrowser() { return ( - +
diff --git a/frontend/src/features/healthcheck/Healthcheck.tsx b/frontend/src/features/healthcheck/Healthcheck.tsx index 7f89b49b6..d380b7abd 100644 --- a/frontend/src/features/healthcheck/Healthcheck.tsx +++ b/frontend/src/features/healthcheck/Healthcheck.tsx @@ -1,7 +1,7 @@ +import { Icon } from '@mtes-mct/monitor-ui' import styled from 'styled-components' import { useAppSelector } from '../../hooks/useAppSelector' -import { ReactComponent as WarningSVG } from '../../uiMonitor/icons/Alert.svg' export function Healthcheck() { const { healthcheckTextWarning } = useAppSelector(state => state.global) @@ -10,32 +10,21 @@ export function Healthcheck() { <> {healthcheckTextWarning ? ( <HealthcheckWarnings> - <Warning> - <WarningIcon /> - {healthcheckTextWarning} - </Warning> + <Icon.Alert /> + {healthcheckTextWarning} </HealthcheckWarnings> ) : null} </> ) } -const WarningIcon = styled(WarningSVG)` - width: 20px; - vertical-align: sub; - margin-right: 8px; - height: 18px; -` - -const Warning = styled.div` - font: normal normal bold 16px/22px Marianne; -` - const HealthcheckWarnings = styled.div` - background: #f6d012 0% 0% no-repeat padding-box; - width: 100%; - height: 22px; - text-align: center; - padding: 13px; + align-items: center; + background-color: ${p => p.theme.color.goldenPoppy}; border-bottom: 2px solid #e3be05; + display: flex; + font: normal normal bold 16px/22px Marianne; + gap: 8px; + justify-content: center; + padding: 13px; ` diff --git a/frontend/src/features/layersSelector/administrative/AdministrativeLayer.tsx b/frontend/src/features/layersSelector/administrative/AdministrativeLayer.tsx index 69b2dabbd..aa6a6d4c1 100644 --- a/frontend/src/features/layersSelector/administrative/AdministrativeLayer.tsx +++ b/frontend/src/features/layersSelector/administrative/AdministrativeLayer.tsx @@ -1,9 +1,9 @@ +import { Icon, THEME } from '@mtes-mct/monitor-ui' import styled from 'styled-components' import { hideAdministrativeLayer, showAdministrativeLayer } from '../../../domain/shared_slices/Administrative' import { useAppDispatch } from '../../../hooks/useAppDispatch' import { useAppSelector } from '../../../hooks/useAppSelector' -import { ReactComponent as DisplaySVG } from '../../../uiMonitor/icons/Display.svg' export function AdministrativeLayer({ isGrouped, layer }) { const dispatch = useAppDispatch() @@ -22,7 +22,7 @@ export function AdministrativeLayer({ isGrouped, layer }) { return ( <Row $isGrouped={isGrouped} data-cy="administrative-layer-toggle" onClick={toggleLayer}> <LayerName title={layer.name}>{layer.name}</LayerName> - {isLayerVisible ? <DisplaySVG /> : <HideIcon />} + <Icon.Display color={isLayerVisible ? THEME.color.charcoal : THEME.color.lightGray} /> </Row> ) } @@ -57,7 +57,3 @@ const Row = styled.span<{ $isGrouped: boolean }>` margin-top: 4px; } ` - -const HideIcon = styled(DisplaySVG)` - color: ${p => p.theme.color.lightGray}; -` diff --git a/frontend/src/features/layersSelector/regulatory/metadata/index.tsx b/frontend/src/features/layersSelector/regulatory/metadata/index.tsx index e40f6099f..1b1fc86e5 100644 --- a/frontend/src/features/layersSelector/regulatory/metadata/index.tsx +++ b/frontend/src/features/layersSelector/regulatory/metadata/index.tsx @@ -10,7 +10,6 @@ import { getTitle } from '../../../../domain/entities/regulatory' import { closeRegulatoryMetadataPanel } from '../../../../domain/shared_slices/RegulatoryMetadata' import { useAppDispatch } from '../../../../hooks/useAppDispatch' import { useAppSelector } from '../../../../hooks/useAppSelector' -import { ReactComponent as AlertSVG } from '../../../../uiMonitor/icons/Attention_controles.svg' import { RegulatoryLayerLegend } from '../../utils/LayerLegend.style' const FOUR_HOURS = 4 * 60 * 60 * 1000 @@ -47,7 +46,7 @@ export function RegulatoryLayerZoneMetadata() { /> </Header> <Warning> - <WarningIcon /> + <Icon.Warning size={30} /> Travail en cours, bien vérifier dans Légicem la validité de la référence et des infos réglementaires </Warning> <Content> @@ -113,21 +112,16 @@ const Content = styled.div` ` const Warning = styled.div` - font-size: 13px; - color: ${p => p.theme.color.gunMetal}; + align-items: center; background: ${p => p.theme.color.goldenPoppy}; + color: ${p => p.theme.color.gunMetal}; display: flex; - text-align: left; font: normal normal bold 13px/18px Marianne; + gap: 16px; padding: 10px; + text-align: left; ` -const WarningIcon = styled(AlertSVG)` - width: 30px; - flex: 57px; - height: 30px; - margin: 4px 10px 0px 0; -` const CenteredFingerprintSpinner = styled(FingerprintSpinner)` position: initial !important; display: block; diff --git a/frontend/src/features/map/draw/DrawModal.tsx b/frontend/src/features/map/draw/DrawModal.tsx index c4798133f..dde5d6cf2 100644 --- a/frontend/src/features/map/draw/DrawModal.tsx +++ b/frontend/src/features/map/draw/DrawModal.tsx @@ -1,10 +1,9 @@ -import { type Coordinates, CoordinatesInput } from '@mtes-mct/monitor-ui' +import { type Coordinates, CoordinatesInput, IconButton, Icon } from '@mtes-mct/monitor-ui' import Feature from 'ol/Feature' import GeoJSON from 'ol/format/GeoJSON' import Point from 'ol/geom/Point' import { transform } from 'ol/proj' import { useCallback, useEffect, useMemo, useRef } from 'react' -import { IconButton } from 'rsuite' import styled from 'styled-components' import { @@ -26,10 +25,6 @@ import { import { useAppDispatch } from '../../../hooks/useAppDispatch' import { useAppSelector } from '../../../hooks/useAppSelector' import { usePrevious } from '../../../hooks/usePrevious' -import { ReactComponent as CircleSVG } from '../../../uiMonitor/icons/Info.svg' -import { ReactComponent as PolygonSVG } from '../../../uiMonitor/icons/Polygone.svg' -import { ReactComponent as RectangleSVG } from '../../../uiMonitor/icons/Rectangle.svg' -import { ReactComponent as SelectorSVG } from '../../../uiMonitor/icons/Selector.svg' import { getMissionPageRoute } from '../../../utils/routes' import { MapInteraction } from '../../commonComponents/Modals/MapInteraction' import { SideWindowStatus } from '../../SideWindow/slice' @@ -172,31 +167,19 @@ export function DrawModal() { (listener === InteractionListener.MISSION_ZONE || listener === InteractionListener.REPORTING_ZONE) && ( <IconGroup> <IconButton - active={interactionType === InteractionType.POLYGON} - appearance="primary" - icon={<PolygonIcon className="rs-icon" />} + className={interactionType === InteractionType.POLYGON ? '_active' : undefined} + Icon={Icon.SelectPolygon} onClick={handleSelectInteraction(InteractionType.POLYGON)} - size="md" /> <IconButton - active={interactionType === InteractionType.SQUARE} - appearance="primary" - icon={<RectangleIcon className="rs-icon" />} + className={interactionType === InteractionType.SQUARE ? '_active' : undefined} + Icon={Icon.SelectRectangle} onClick={handleSelectInteraction(InteractionType.SQUARE)} - size="md" /> <IconButton - active={interactionType === InteractionType.CIRCLE} - appearance="primary" - icon={<CircleIcon className="rs-icon" />} + className={interactionType === InteractionType.CIRCLE ? '_active' : undefined} + Icon={Icon.SelectCircle} onClick={handleSelectInteraction(InteractionType.CIRCLE)} - size="md" - /> - <IconButton - active={interactionType === InteractionType.SELECTION} - appearance="primary" - icon={<SelectorIcon className="rs-icon" />} - size="md" /> </IconGroup> ) @@ -224,32 +207,14 @@ export function DrawModal() { } const CoordinatesInputWrapper = styled.div` - width: 280px; - margin-right: auto !important; - margin-left: auto; margin-bottom: 8px; + margin-left: auto; + margin-right: auto !important; + width: 280px; ` const IconGroup = styled.div` - display: inline-block; - & > :not(:last-child) { - margin-right: 16px; - } -` - -const PolygonIcon = styled(PolygonSVG)` - width: 16px; - height: 16px; -` -const CircleIcon = styled(CircleSVG)` - width: 16px; - height: 16px; -` -const RectangleIcon = styled(RectangleSVG)` - width: 16px; - height: 16px; -` -const SelectorIcon = styled(SelectorSVG)` - width: 16px; - height: 16px; + display: flex; + flex-direction: row; + gap: 16px; ` diff --git a/frontend/src/features/map/overlays/InterestPointOverlay.tsx b/frontend/src/features/map/overlays/InterestPointOverlay.tsx index 0d87c0070..df09dd604 100644 --- a/frontend/src/features/map/overlays/InterestPointOverlay.tsx +++ b/frontend/src/features/map/overlays/InterestPointOverlay.tsx @@ -1,3 +1,4 @@ +import { Accent, Icon, IconButton, Size, type Coordinates } from '@mtes-mct/monitor-ui' import { noop } from 'lodash/fp' import LineString from 'ol/geom/LineString' import Overlay from 'ol/Overlay' @@ -9,12 +10,8 @@ import { OPENLAYERS_PROJECTION } from '../../../domain/entities/map/constants' import { useAppSelector } from '../../../hooks/useAppSelector' import { useMoveOverlayWhenDragging } from '../../../hooks/useMoveOverlayWhenDragging' import { usePrevious } from '../../../hooks/usePrevious' -import { ReactComponent as DeleteSVG } from '../../../uiMonitor/icons/Delete.svg' -import { ReactComponent as EditSVG } from '../../../uiMonitor/icons/Edit.svg' import { getCoordinates } from '../../../utils/coordinates' -import type { Coordinates } from '@mtes-mct/monitor-ui' - const X = 0 const Y = 1 export const initialOffsetValue = [-90, 10] @@ -154,8 +151,20 @@ export function InterestPointOverlay({ <Name data-cy="interest-point-name" title={name ?? 'Aucun Libellé'}> {name ?? 'Aucun Libellé'} </Name> - <Edit data-cy="interest-point-edit" onClick={() => modifyInterestPoint(uuid)} /> - <Delete data-cy="interest-point-delete" onClick={() => deleteInterestPoint(uuid)} /> + <IconButton + accent={Accent.TERTIARY} + data-cy="interest-point-edit" + Icon={Icon.Edit} + onClick={() => modifyInterestPoint(uuid)} + size={Size.SMALL} + /> + <IconButton + accent={Accent.TERTIARY} + data-cy="interest-point-delete" + Icon={Icon.Delete} + onClick={() => deleteInterestPoint(uuid)} + size={Size.SMALL} + /> </Header> <Body data-cy="interest-point-observations">{observations ?? 'Aucune observation'}</Body> <Footer data-cy="interest-point-coordinates"> @@ -195,26 +204,6 @@ const Header = styled.div` border-top-right-radius: 2px; ` -const Delete = styled(DeleteSVG)` - height: 30px; - width: 22px; - border-left: 1px solid ${p => p.theme.color.lightGray}; - padding-left: 6px; - margin-left: auto; - margin-right: 8px; - cursor: pointer; -` - -const Edit = styled(EditSVG)` - height: 30px; - width: 22px; - border-left: 1px solid ${p => p.theme.color.lightGray}; - padding-left: 6px; - margin-left: auto; - margin-right: 6px; - cursor: pointer; -` - const WrapperToBeKeptForDOMManagement = styled.div` z-index: 300; ` diff --git a/frontend/src/features/map/overlays/MeasurementOverlay.tsx b/frontend/src/features/map/overlays/MeasurementOverlay.tsx index c75673228..e4c21cb23 100644 --- a/frontend/src/features/map/overlays/MeasurementOverlay.tsx +++ b/frontend/src/features/map/overlays/MeasurementOverlay.tsx @@ -1,11 +1,10 @@ -import { pluralize } from '@mtes-mct/monitor-ui' +import { Accent, Icon, IconButton, Size, THEME, pluralize } from '@mtes-mct/monitor-ui' import Overlay from 'ol/Overlay' import { type MutableRefObject, useEffect, useCallback, useRef, useMemo } from 'react' import styled from 'styled-components' import { DistanceUnit, OLGeometryType } from '../../../domain/entities/map/constants' import { useAppSelector } from '../../../hooks/useAppSelector' -import { ReactComponent as CloseIconSVG } from '../../../uiMonitor/icons/Close.svg' type MeasurementOverlayProps = { coordinates: any[] @@ -77,7 +76,14 @@ export function MeasurementOverlay({ <MeasurementOverlayElement ref={overlayCallback}> <ZoneSelected> <ZoneText data-cy="measurement-value">{measurementWithUnitDistance}</ZoneText> - <CloseIcon data-cy="close-measurement" onClick={() => deleteFeature && deleteFeature(id)} /> + <StyledIconButton + accent={Accent.TERTIARY} + color={THEME.color.slateGray} + data-cy="close-measurement" + Icon={Icon.Close} + onClick={() => deleteFeature && deleteFeature(id)} + size={Size.SMALL} + /> </ZoneSelected> <TrianglePointer> <TriangleShadow /> @@ -107,33 +113,23 @@ const TriangleShadow = styled.div` const MeasurementOverlayElement = styled.div`` -const ZoneText = styled.span` - margin-bottom: 5px; - vertical-align: middle; - height: 30px; - display: inline-block; - user-select: none; +const ZoneText = styled.div` + margin: 0px 8px; + color: ${p => p.theme.color.slateGray}; + font-size: 13px; ` const ZoneSelected = styled.div` background: ${p => p.theme.color.gainsboro}; border-radius: 2px; - color: ${p => p.theme.color.slateGray}; - margin-left: 0; - font-size: 13px; - padding: 0px 3px 0px 7px; - vertical-align: top; - height: 30px; - display: inline-block; + display: flex; user-select: none; ` -const CloseIcon = styled(CloseIconSVG)` - width: 13px; - vertical-align: text-bottom; - cursor: pointer; - border-left: 1px solid white; - height: 30px; - margin: 0 6px 0 7px; - padding-left: 7px; +const StyledIconButton = styled(IconButton)` + border-left: 1px solid ${p => p.theme.color.white}; + > div > svg { + height: 13px; + width: 13px; + } ` diff --git a/frontend/src/features/map/tools/interestPoint/EditInterestPoint.tsx b/frontend/src/features/map/tools/interestPoint/EditInterestPoint.tsx index 0866b718d..bebf4816c 100644 --- a/frontend/src/features/map/tools/interestPoint/EditInterestPoint.tsx +++ b/frontend/src/features/map/tools/interestPoint/EditInterestPoint.tsx @@ -1,8 +1,9 @@ +import { Icon } from '@mtes-mct/monitor-ui' import { boundingExtent } from 'ol/extent' import { transform, transformExtent } from 'ol/proj' import { useCallback, useMemo, useState } from 'react' import { Radio, RadioGroup } from 'rsuite' -import styled, { css } from 'styled-components' +import styled from 'styled-components' import { interestPointType } from '../../../../domain/entities/interestPoints' import { CoordinatesFormat, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../../../domain/entities/map/constants' @@ -11,9 +12,6 @@ import { setFitToExtent } from '../../../../domain/shared_slices/Map' import { saveInterestPointFeature } from '../../../../domain/use_cases/interestPoint/saveInterestPointFeature' import { useAppDispatch } from '../../../../hooks/useAppDispatch' import { useAppSelector } from '../../../../hooks/useAppSelector' -import { ReactComponent as ControlSVG } from '../../../../uiMonitor/icons/Control.svg' -import { ReactComponent as VesselSVG } from '../../../../uiMonitor/icons/Label_segment_de_flotte.svg' -import { ReactComponent as OtherSVG } from '../../../../uiMonitor/icons/Point_interet_autre.svg' import { coordinatesAreDistinct, getCoordinates } from '../../../../utils/coordinates' import { SetCoordinates } from '../../../coordinates/SetCoordinates' import { MapToolBox } from '../MapToolBox' @@ -149,15 +147,15 @@ export function EditInterestPoint({ close, healthcheckTextWarning, isOpen }: Edi onChange={updateType} > <Radio value={interestPointType.CONTROL_ENTITY}> - <Control /> + <Icon.ControlUnit size={14} /> Moyen de contrôle </Radio> <Radio value={interestPointType.FISHING_VESSEL}> - <Vessel /> + <Icon.FleetSegment size={14} /> Navire de pêche </Radio> <Radio data-cy="interest-point-type-radio-input" value={interestPointType.OTHER}> - <Other /> + <Icon.Info size={15} /> Autre point </Radio> </RadioGroup> @@ -283,23 +281,10 @@ const Header = styled.div` const Wrapper = styled(MapToolBox)` top: 0px; width: 306px; -` - -const iconStyle = css` - margin-left: 3px; - margin-right: 7px; - vertical-align: sub; - width: 14px; -` - -const Control = styled(ControlSVG)` - ${iconStyle} -` - -const Vessel = styled(VesselSVG)` - ${iconStyle} -` - -const Other = styled(OtherSVG)` - ${iconStyle} + .rs-radio-checker > label { + display: flex; + gap: 4px; + align-items: center; + margin-left: 4px; + } ` diff --git a/frontend/src/features/missions/MissionForm/ActionCards/NoteCard.tsx b/frontend/src/features/missions/MissionForm/ActionCards/NoteCard.tsx index 2a6a1fe1f..771a83612 100644 --- a/frontend/src/features/missions/MissionForm/ActionCards/NoteCard.tsx +++ b/frontend/src/features/missions/MissionForm/ActionCards/NoteCard.tsx @@ -6,7 +6,7 @@ export function NoteCard({ action }) { return ( <> <Icon.Note color={THEME.color.charcoal} size={20} /> - <NoteContent>{action.observations || 'Observation à renseigner'}</NoteContent> + <NoteContent title={action.observations ?? ''}>{action.observations ?? 'Observation à renseigner'}</NoteContent> </> ) } diff --git a/frontend/src/features/missions/MissionForm/ActionForm/ControlForm/ControlForm.tsx b/frontend/src/features/missions/MissionForm/ActionForm/ControlForm/ControlForm.tsx index 6b2db38cc..6c7ea5085 100644 --- a/frontend/src/features/missions/MissionForm/ActionForm/ControlForm/ControlForm.tsx +++ b/frontend/src/features/missions/MissionForm/ActionForm/ControlForm/ControlForm.tsx @@ -7,12 +7,16 @@ import { useNewWindow, type OptionValueType, DatePicker, - FieldError + FieldError, + Accent, + Icon, + Size, + THEME } from '@mtes-mct/monitor-ui' import { FieldArray, useFormikContext, getIn } from 'formik' import _ from 'lodash' import { useMemo, useState } from 'react' -import { Form, IconButton, Toggle } from 'rsuite' +import { Form, Toggle } from 'rsuite' import styled from 'styled-components' import { InfractionsForm } from './InfractionsForm' @@ -21,13 +25,12 @@ import { CONTROL_PLAN_INIT, UNIQ_CONTROL_PLAN_INDEX } from '../../../../../domai import { type Mission, type EnvActionControl, ActionTypeEnum } from '../../../../../domain/entities/missions' import { TargetTypeEnum, TargetTypeLabels } from '../../../../../domain/entities/targetType' import { VehicleTypeEnum } from '../../../../../domain/entities/vehicleType' -import { ReactComponent as ControlIconSVG } from '../../../../../uiMonitor/icons/Control.svg' -import { ReactComponent as DeleteSVG } from '../../../../../uiMonitor/icons/Delete.svg' import { getDateAsLocalizedStringCompact } from '../../../../../utils/getDateAsLocalizedString' import { TargetSelector } from '../../../../commonComponents/TargetSelector' import { VehicleTypeSelector } from '../../../../commonComponents/VehicleTypeSelector' import { getFormattedReportingId } from '../../../../Reportings/utils' import { MultiPointPicker } from '../../../MultiPointPicker' +import { Header, StyledDeleteButton, Title, TitleWithIcon } from '../style' import { ActionTheme } from '../Themes/ActionTheme' export function ControlForm({ @@ -187,22 +190,26 @@ export function ControlForm({ return ( <> <Header> - <ControlIcon /> - <Title>Contrôle{actionNumberOfControls && actionNumberOfControls > 1 ? 's' : ''} - -  ( - {getDateAsLocalizedStringCompact(currentAction?.actionStartDateTimeUtc)}) - - - } + + +
+ Contrôle{actionNumberOfControls && actionNumberOfControls > 1 ? 's' : ''} + +  ( + {getDateAsLocalizedStringCompact(currentAction?.actionStartDateTimeUtc)}) + +
+
+ + Supprimer -
+ @@ -314,21 +321,12 @@ export function ControlForm({ ) } -const Header = styled.div` - margin-bottom: 24px; - display: flex; -` const FormBody = styled.div` display: flex; flex-direction: column; padding-bottom: 48px; ` -const Title = styled.h2` - font-size: 16px; - line-height: 22px; - display: inline-block; - color: ${p => p.theme.color.charcoal}; -` + const ReportingsContainer = styled.div` padding-bottom: 32px; gap: 16px; @@ -367,24 +365,10 @@ const ActionFieldWrapper = styled.div` } ` -const ControlIcon = styled(ControlIconSVG)` - color: ${p => p.theme.color.gunMetal}; - margin-right: 8px; - margin-top: 2px; - width: 24px; -` - const SubTitle = styled.div` font-size: 16px; display: inline-block; ` -const DeleteIcon = styled(DeleteSVG)` - color: ${p => p.theme.color.maximumRed}; -` - -const IconButtonRight = styled(IconButton)` - margin-left: auto; -` const StyledFormikTextareaWithMargin = styled(FormikTextarea)` margin-top: 24px; diff --git a/frontend/src/features/missions/MissionForm/ActionForm/ControlForm/InfractionCard.tsx b/frontend/src/features/missions/MissionForm/ActionForm/ControlForm/InfractionCard.tsx index b1a5e3dd5..fc4b731e4 100644 --- a/frontend/src/features/missions/MissionForm/ActionForm/ControlForm/InfractionCard.tsx +++ b/frontend/src/features/missions/MissionForm/ActionForm/ControlForm/InfractionCard.tsx @@ -1,6 +1,5 @@ -import { Accent, Tag } from '@mtes-mct/monitor-ui' +import { Accent, Button, Icon, IconButton, Tag } from '@mtes-mct/monitor-ui' import { useField } from 'formik' -import { IconButton } from 'rsuite' import styled, { css } from 'styled-components' import { @@ -14,9 +13,7 @@ import { } from '../../../../../domain/entities/missions' import { TargetTypeEnum, TargetTypeLabels } from '../../../../../domain/entities/targetType' import { vehicleTypeLabels, VehicleTypeEnum } from '../../../../../domain/entities/vehicleType' -import { ReactComponent as DeleteSVG } from '../../../../../uiMonitor/icons/Delete.svg' -import { ReactComponent as DuplicateSVG } from '../../../../../uiMonitor/icons/Duplicate.svg' -import { ReactComponent as EditIconSVG } from '../../../../../uiMonitor/icons/Edit.svg' +import { StyledDeleteIconButton } from '../style' export function InfractionCard({ canAddInfraction, @@ -86,20 +83,20 @@ export function InfractionCard({ - } onClick={setCurrentInfractionIndex}> + <> } + Icon={Icon.Duplicate} onClick={duplicateInfraction} title="dupliquer" /> - } onClick={removeInfraction} /> +
@@ -126,7 +123,7 @@ const Summary = styled.div` const ButtonsWrapper = styled.div` display: flex; - flex: 0 0 162px; + gap: 8px; align-items: center; justify-content: space-between; ` @@ -148,9 +145,3 @@ const SummaryDetails = styled.div` const Info = styled(Tag)` margin-right: 8px; ` - -const EditIcon = styled(EditIconSVG)`` - -const DeleteIcon = styled(DeleteSVG)` - color: ${p => p.theme.color.maximumRed}; -` diff --git a/frontend/src/features/missions/MissionForm/ActionForm/NoteForm.tsx b/frontend/src/features/missions/MissionForm/ActionForm/NoteForm.tsx index 68419826e..2ebd254e0 100644 --- a/frontend/src/features/missions/MissionForm/ActionForm/NoteForm.tsx +++ b/frontend/src/features/missions/MissionForm/ActionForm/NoteForm.tsx @@ -1,11 +1,9 @@ -import { FormikTextarea } from '@mtes-mct/monitor-ui' +import { Accent, FormikTextarea, Icon, Size, THEME } from '@mtes-mct/monitor-ui' import { useField } from 'formik' -import { Form, IconButton } from 'rsuite' -import styled from 'styled-components' +import { Form } from 'rsuite' +import { Header, StyledDeleteButton, Title, TitleWithIcon } from './style' import { type EnvAction } from '../../../../domain/entities/missions' -import { ReactComponent as DeleteSVG } from '../../../../uiMonitor/icons/Delete.svg' -import { ReactComponent as NoteSVG } from '../../../../uiMonitor/icons/Note_libre.svg' export function NoteForm({ currentActionIndex, remove, setCurrentActionIndex }) { const [actionsFields] = useField('envActions') @@ -19,17 +17,20 @@ export function NoteForm({ currentActionIndex, remove, setCurrentActionIndex }) return ( <>
- - Note - } + + + Note + + + Supprimer - +
@@ -38,30 +39,3 @@ export function NoteForm({ currentActionIndex, remove, setCurrentActionIndex }) ) } - -const Header = styled.div` - margin-bottom: 24px; - display: flex; -` - -const Title = styled.h2` - font-size: 16px; - line-height: 22px; - display: inline-block; - color: ${p => p.theme.color.charcoal}; -` - -const NoteIcon = styled(NoteSVG)` - color: ${p => p.theme.color.gunMetal}; - margin-right: 8px; - margin-top: 2px; - width: 18px; -` - -const DeleteIcon = styled(DeleteSVG)` - color: ${p => p.theme.color.maximumRed}; -` - -const IconButtonRight = styled(IconButton)` - margin-left: auto; -` diff --git a/frontend/src/features/missions/MissionForm/ActionForm/SurveillanceForm.tsx b/frontend/src/features/missions/MissionForm/ActionForm/SurveillanceForm.tsx index 4f1c21dff..b65deefae 100644 --- a/frontend/src/features/missions/MissionForm/ActionForm/SurveillanceForm.tsx +++ b/frontend/src/features/missions/MissionForm/ActionForm/SurveillanceForm.tsx @@ -7,13 +7,18 @@ import { pluralize, useNewWindow, type OptionValueType, - DatePicker + DatePicker, + Accent, + Icon, + Size, + THEME } from '@mtes-mct/monitor-ui' import { useField, useFormikContext } from 'formik' import { useMemo, useState } from 'react' -import { Form, IconButton, Toggle } from 'rsuite' +import { Form, Toggle } from 'rsuite' import styled from 'styled-components' +import { Header, StyledDeleteButton, Title, TitleWithIcon } from './style' import { SurveillanceThemes } from './Themes/SurveillanceThemes' import { CONTROL_PLAN_INIT } from '../../../../domain/entities/controlPlan' import { InteractionListener } from '../../../../domain/entities/map/constants' @@ -24,8 +29,6 @@ import { type Mission } from '../../../../domain/entities/missions' import { useAppSelector } from '../../../../hooks/useAppSelector' -import { ReactComponent as DeleteSVG } from '../../../../uiMonitor/icons/Delete.svg' -import { ReactComponent as SurveillanceIconSVG } from '../../../../uiMonitor/icons/Observation.svg' import { dateDifferenceInHours } from '../../../../utils/dateDifferenceInHours' import { getFormattedReportingId } from '../../../Reportings/utils' import { MultiZonePicker } from '../../MultiZonePicker' @@ -144,17 +147,19 @@ export function SurveillanceForm({ currentActionIndex, remove, setCurrentActionI return ( <>
- - Surveillance - } + + + Surveillance + + Supprimer - +
@@ -164,7 +169,7 @@ export function SurveillanceForm({ currentActionIndex, remove, setCurrentActionI onChange={updateIsSurveillanceAttachedToReporting} readOnly={areAllReportingsAttachedToAnAction && currentAction?.reportingIds?.length === 0} /> - Le contrôle est rattaché à un signalement + La surveillance est rattachée à un signalement {isReportingListVisible && ( p.theme.color.charcoal}; -` const ReportingsContainer = styled.div` padding-bottom: 32px; gap: 16px; @@ -313,19 +307,6 @@ const StyledDuration = styled.div` margin-left: 8px; ` -const SurveillanceIcon = styled(SurveillanceIconSVG)` - margin-right: 8px; - height: 24px; - color: ${p => p.theme.color.gunMetal}; -` -const DeleteIcon = styled(DeleteSVG)` - color: ${p => p.theme.color.maximumRed}; -` - -const IconButtonRight = styled(IconButton)` - margin-left: auto; -` - const StyledFormikCheckbox = styled(FormikCheckbox)` margin-left: 0px; margin-top: 8px; diff --git a/frontend/src/features/missions/MissionForm/ActionForm/style.ts b/frontend/src/features/missions/MissionForm/ActionForm/style.ts new file mode 100644 index 000000000..3634936a5 --- /dev/null +++ b/frontend/src/features/missions/MissionForm/ActionForm/style.ts @@ -0,0 +1,33 @@ +import { Button, IconButton } from '@mtes-mct/monitor-ui' +import styled from 'styled-components' + +export const Header = styled.div` + align-items: center; + + display: flex; + justify-content: space-between; + margin-bottom: 24px; +` + +export const TitleWithIcon = styled.div` + align-items: end; + display: flex; + gap: 8px; +` +export const Title = styled.h2` + color: ${p => p.theme.color.charcoal}; + display: inline-block; + font-size: 16px; + line-height: 22px; +` + +export const StyledDeleteButton = styled(Button)` + > div > svg { + color: ${p => p.theme.color.maximumRed}; + } +` +export const StyledDeleteIconButton = styled(IconButton)` + > div > svg { + color: ${p => p.theme.color.maximumRed}; + } +` diff --git a/frontend/src/features/missions/MissionsList/Filters/index.tsx b/frontend/src/features/missions/MissionsList/Filters/index.tsx index 50fe2a4d9..83b0710ce 100644 --- a/frontend/src/features/missions/MissionsList/Filters/index.tsx +++ b/frontend/src/features/missions/MissionsList/Filters/index.tsx @@ -7,7 +7,8 @@ import { getOptionsFromIdAndName, CheckPicker, getOptionsFromLabelledEnum, - CustomSearch + CustomSearch, + Icon } from '@mtes-mct/monitor-ui' import { type MutableRefObject, useMemo, useRef, useState } from 'react' import styled from 'styled-components' @@ -23,7 +24,6 @@ import { MissionFiltersEnum, resetMissionFilters, updateFilters } from '../../.. import { useAppDispatch } from '../../../../hooks/useAppDispatch' import { useAppSelector } from '../../../../hooks/useAppSelector' import { useGetControlPlans } from '../../../../hooks/useGetControlPlans' -import { ReactComponent as ReloadSVG } from '../../../../uiMonitor/icons/Reload.svg' import { isNotArchived } from '../../../../utils/isNotArchived' export function MissionsTableFilters() { @@ -310,7 +310,7 @@ export function MissionsTableFilters() { {hasFilters && ( - + Réinitialiser les filtres )} diff --git a/frontend/src/uiMonitor/icons/Activity_feed.svg b/frontend/src/uiMonitor/icons/Activity_feed.svg deleted file mode 100644 index 87aafa83e..000000000 --- a/frontend/src/uiMonitor/icons/Activity_feed.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Alert.svg b/frontend/src/uiMonitor/icons/Alert.svg deleted file mode 100644 index 04732146d..000000000 --- a/frontend/src/uiMonitor/icons/Alert.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Archive.svg b/frontend/src/uiMonitor/icons/Archive.svg deleted file mode 100644 index cec770a61..000000000 --- a/frontend/src/uiMonitor/icons/Archive.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Attention.svg b/frontend/src/uiMonitor/icons/Attention.svg deleted file mode 100644 index 8623fe38a..000000000 --- a/frontend/src/uiMonitor/icons/Attention.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Attention_controles.svg b/frontend/src/uiMonitor/icons/Attention_controles.svg deleted file mode 100644 index 15914158c..000000000 --- a/frontend/src/uiMonitor/icons/Attention_controles.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Avarie_statut_arret_tech.svg b/frontend/src/uiMonitor/icons/Avarie_statut_arret_tech.svg deleted file mode 100644 index 12ae94987..000000000 --- a/frontend/src/uiMonitor/icons/Avarie_statut_arret_tech.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/frontend/src/uiMonitor/icons/Avarie_statut_navire_en_mer.svg b/frontend/src/uiMonitor/icons/Avarie_statut_navire_en_mer.svg deleted file mode 100644 index 2bfa2c475..000000000 --- a/frontend/src/uiMonitor/icons/Avarie_statut_navire_en_mer.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/frontend/src/uiMonitor/icons/Avarie_statut_sans_nouvelles.svg b/frontend/src/uiMonitor/icons/Avarie_statut_sans_nouvelles.svg deleted file mode 100644 index eec00d90e..000000000 --- a/frontend/src/uiMonitor/icons/Avarie_statut_sans_nouvelles.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/frontend/src/uiMonitor/icons/Bouton_afficher_messages_JPE_sur_piste.svg b/frontend/src/uiMonitor/icons/Bouton_afficher_messages_JPE_sur_piste.svg deleted file mode 100644 index 5a5779d20..000000000 --- a/frontend/src/uiMonitor/icons/Bouton_afficher_messages_JPE_sur_piste.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/frontend/src/uiMonitor/icons/Calendar.svg b/frontend/src/uiMonitor/icons/Calendar.svg deleted file mode 100644 index c8332913a..000000000 --- a/frontend/src/uiMonitor/icons/Calendar.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Check.svg b/frontend/src/uiMonitor/icons/Check.svg deleted file mode 100644 index 478559e00..000000000 --- a/frontend/src/uiMonitor/icons/Check.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Chevron.svg b/frontend/src/uiMonitor/icons/Chevron.svg deleted file mode 100644 index 0cec8dc46..000000000 --- a/frontend/src/uiMonitor/icons/Chevron.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Clock.svg b/frontend/src/uiMonitor/icons/Clock.svg deleted file mode 100644 index d9d9d8672..000000000 --- a/frontend/src/uiMonitor/icons/Clock.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Close.svg b/frontend/src/uiMonitor/icons/Close.svg deleted file mode 100644 index eae23a3a5..000000000 --- a/frontend/src/uiMonitor/icons/Close.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Commentaires.svg b/frontend/src/uiMonitor/icons/Commentaires.svg deleted file mode 100644 index cf0e8b773..000000000 --- a/frontend/src/uiMonitor/icons/Commentaires.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Confirm.svg b/frontend/src/uiMonitor/icons/Confirm.svg deleted file mode 100644 index a97797587..000000000 --- a/frontend/src/uiMonitor/icons/Confirm.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Control.svg b/frontend/src/uiMonitor/icons/Control.svg deleted file mode 100644 index 416b71024..000000000 --- a/frontend/src/uiMonitor/icons/Control.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Couches_carto.svg b/frontend/src/uiMonitor/icons/Couches_carto.svg deleted file mode 100644 index 0522c781b..000000000 --- a/frontend/src/uiMonitor/icons/Couches_carto.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Delete.svg b/frontend/src/uiMonitor/icons/Delete.svg deleted file mode 100644 index 08e7e3320..000000000 --- a/frontend/src/uiMonitor/icons/Delete.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Display.svg b/frontend/src/uiMonitor/icons/Display.svg deleted file mode 100644 index bc5967c35..000000000 --- a/frontend/src/uiMonitor/icons/Display.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Double_chevron.svg b/frontend/src/uiMonitor/icons/Double_chevron.svg deleted file mode 100644 index 91cdc1f52..000000000 --- a/frontend/src/uiMonitor/icons/Double_chevron.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Download.svg b/frontend/src/uiMonitor/icons/Download.svg deleted file mode 100644 index 406a6ec39..000000000 --- a/frontend/src/uiMonitor/icons/Download.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Duplicate.svg b/frontend/src/uiMonitor/icons/Duplicate.svg deleted file mode 100644 index 4d6da4d52..000000000 --- a/frontend/src/uiMonitor/icons/Duplicate.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Edit.svg b/frontend/src/uiMonitor/icons/Edit.svg deleted file mode 100644 index a5031036b..000000000 --- a/frontend/src/uiMonitor/icons/Edit.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Enlarge.svg b/frontend/src/uiMonitor/icons/Enlarge.svg deleted file mode 100644 index 398ad9369..000000000 --- a/frontend/src/uiMonitor/icons/Enlarge.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Favorite.svg b/frontend/src/uiMonitor/icons/Favorite.svg deleted file mode 100644 index 893a6cc27..000000000 --- a/frontend/src/uiMonitor/icons/Favorite.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Filled_arrow.svg b/frontend/src/uiMonitor/icons/Filled_arrow.svg deleted file mode 100644 index 03a7d71de..000000000 --- a/frontend/src/uiMonitor/icons/Filled_arrow.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Filtre_zone_rectangle.svg b/frontend/src/uiMonitor/icons/Filtre_zone_rectangle.svg deleted file mode 100644 index f15fb636d..000000000 --- a/frontend/src/uiMonitor/icons/Filtre_zone_rectangle.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - diff --git a/frontend/src/uiMonitor/icons/Filtre_zone_rectangle_selected.svg b/frontend/src/uiMonitor/icons/Filtre_zone_rectangle_selected.svg deleted file mode 100644 index 6f53e871e..000000000 --- a/frontend/src/uiMonitor/icons/Filtre_zone_rectangle_selected.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - diff --git a/frontend/src/uiMonitor/icons/Filtres.svg b/frontend/src/uiMonitor/icons/Filtres.svg deleted file mode 100644 index 8f42e2919..000000000 --- a/frontend/src/uiMonitor/icons/Filtres.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Fishery.svg b/frontend/src/uiMonitor/icons/Fishery.svg deleted file mode 100644 index 2d1f77814..000000000 --- a/frontend/src/uiMonitor/icons/Fishery.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Fishing_engine.svg b/frontend/src/uiMonitor/icons/Fishing_engine.svg deleted file mode 100644 index cee675123..000000000 --- a/frontend/src/uiMonitor/icons/Fishing_engine.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Flag.svg b/frontend/src/uiMonitor/icons/Flag.svg deleted file mode 100644 index 45d0add42..000000000 --- a/frontend/src/uiMonitor/icons/Flag.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Fleche_navigation_marees.svg b/frontend/src/uiMonitor/icons/Fleche_navigation_marees.svg deleted file mode 100755 index 45387036f..000000000 --- a/frontend/src/uiMonitor/icons/Fleche_navigation_marees.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Fleche_navigation_marees_gainsboro.svg b/frontend/src/uiMonitor/icons/Fleche_navigation_marees_gainsboro.svg deleted file mode 100755 index f5a771122..000000000 --- a/frontend/src/uiMonitor/icons/Fleche_navigation_marees_gainsboro.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/frontend/src/uiMonitor/icons/Fleet_segment.svg b/frontend/src/uiMonitor/icons/Fleet_segment.svg deleted file mode 100644 index d8015b798..000000000 --- a/frontend/src/uiMonitor/icons/Fleet_segment.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Focus.svg b/frontend/src/uiMonitor/icons/Focus.svg deleted file mode 100644 index 77d9e3878..000000000 --- a/frontend/src/uiMonitor/icons/Focus.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Focus_vessel.svg b/frontend/src/uiMonitor/icons/Focus_vessel.svg deleted file mode 100644 index 4fc2bfca4..000000000 --- a/frontend/src/uiMonitor/icons/Focus_vessel.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Focus_zones.svg b/frontend/src/uiMonitor/icons/Focus_zones.svg deleted file mode 100644 index 52f201d0c..000000000 --- a/frontend/src/uiMonitor/icons/Focus_zones.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Hide.svg b/frontend/src/uiMonitor/icons/Hide.svg deleted file mode 100644 index bd2a7eb0b..000000000 --- a/frontend/src/uiMonitor/icons/Hide.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Icone_VMS.svg b/frontend/src/uiMonitor/icons/Icone_VMS.svg deleted file mode 100644 index 3ed3a7f86..000000000 --- a/frontend/src/uiMonitor/icons/Icone_VMS.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/frontend/src/uiMonitor/icons/Icone_filtres.svg b/frontend/src/uiMonitor/icons/Icone_filtres.svg deleted file mode 100755 index 37785aa63..000000000 --- a/frontend/src/uiMonitor/icons/Icone_filtres.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/frontend/src/uiMonitor/icons/Icone_filtres_dark.svg b/frontend/src/uiMonitor/icons/Icone_filtres_dark.svg deleted file mode 100755 index b5b2f74eb..000000000 --- a/frontend/src/uiMonitor/icons/Icone_filtres_dark.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Icone_liste_navires.svg b/frontend/src/uiMonitor/icons/Icone_liste_navires.svg deleted file mode 100644 index b66a95cd7..000000000 --- a/frontend/src/uiMonitor/icons/Icone_liste_navires.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - diff --git a/frontend/src/uiMonitor/icons/Info.svg b/frontend/src/uiMonitor/icons/Info.svg deleted file mode 100644 index d14aa47d5..000000000 --- a/frontend/src/uiMonitor/icons/Info.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Information.svg b/frontend/src/uiMonitor/icons/Information.svg deleted file mode 100755 index 9ff086189..000000000 --- a/frontend/src/uiMonitor/icons/Information.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/frontend/src/uiMonitor/icons/Infringement.svg b/frontend/src/uiMonitor/icons/Infringement.svg deleted file mode 100644 index d1eefcb21..000000000 --- a/frontend/src/uiMonitor/icons/Infringement.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Label_engin_de_peche.svg b/frontend/src/uiMonitor/icons/Label_engin_de_peche.svg deleted file mode 100755 index dbffca2ff..000000000 --- a/frontend/src/uiMonitor/icons/Label_engin_de_peche.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Label_poisson.svg b/frontend/src/uiMonitor/icons/Label_poisson.svg deleted file mode 100755 index a22c5666c..000000000 --- a/frontend/src/uiMonitor/icons/Label_poisson.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Label_segment_de_flotte.svg b/frontend/src/uiMonitor/icons/Label_segment_de_flotte.svg deleted file mode 100755 index aa5af3c33..000000000 --- a/frontend/src/uiMonitor/icons/Label_segment_de_flotte.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Label_taille_navire.svg b/frontend/src/uiMonitor/icons/Label_taille_navire.svg deleted file mode 100755 index ef7bfa602..000000000 --- a/frontend/src/uiMonitor/icons/Label_taille_navire.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Label_zone.svg b/frontend/src/uiMonitor/icons/Label_zone.svg deleted file mode 100755 index e0f6b3b5a..000000000 --- a/frontend/src/uiMonitor/icons/Label_zone.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Landmark.svg b/frontend/src/uiMonitor/icons/Landmark.svg deleted file mode 100644 index 2b8075834..000000000 --- a/frontend/src/uiMonitor/icons/Landmark.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/List.svg b/frontend/src/uiMonitor/icons/List.svg deleted file mode 100644 index 6f3b8f406..000000000 --- a/frontend/src/uiMonitor/icons/List.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Measure_angle.svg b/frontend/src/uiMonitor/icons/Measure_angle.svg deleted file mode 100644 index aa89da2bc..000000000 --- a/frontend/src/uiMonitor/icons/Measure_angle.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Measure_line.svg b/frontend/src/uiMonitor/icons/Measure_line.svg deleted file mode 100644 index d423202b1..000000000 --- a/frontend/src/uiMonitor/icons/Measure_line.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Minus.svg b/frontend/src/uiMonitor/icons/Minus.svg deleted file mode 100644 index 25097c716..000000000 --- a/frontend/src/uiMonitor/icons/Minus.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/More.svg b/frontend/src/uiMonitor/icons/More.svg deleted file mode 100644 index 40c360e0b..000000000 --- a/frontend/src/uiMonitor/icons/More.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Moyens.svg b/frontend/src/uiMonitor/icons/Moyens.svg deleted file mode 100644 index 213d7a60f..000000000 --- a/frontend/src/uiMonitor/icons/Moyens.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Navires.svg b/frontend/src/uiMonitor/icons/Navires.svg deleted file mode 100644 index 92755d729..000000000 --- a/frontend/src/uiMonitor/icons/Navires.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Note_libre.svg b/frontend/src/uiMonitor/icons/Note_libre.svg deleted file mode 100644 index 3b173d356..000000000 --- a/frontend/src/uiMonitor/icons/Note_libre.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Observation.svg b/frontend/src/uiMonitor/icons/Observation.svg deleted file mode 100644 index fa81d9c69..000000000 --- a/frontend/src/uiMonitor/icons/Observation.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Operations.svg b/frontend/src/uiMonitor/icons/Operations.svg deleted file mode 100644 index a15c97a88..000000000 --- a/frontend/src/uiMonitor/icons/Operations.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Pastille_position_manuelle.svg b/frontend/src/uiMonitor/icons/Pastille_position_manuelle.svg deleted file mode 100755 index 774ee00e5..000000000 --- a/frontend/src/uiMonitor/icons/Pastille_position_manuelle.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/frontend/src/uiMonitor/icons/Picto_activites_peche.svg b/frontend/src/uiMonitor/icons/Picto_activites_peche.svg deleted file mode 100644 index 8bc4729fc..000000000 --- a/frontend/src/uiMonitor/icons/Picto_activites_peche.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Picto_ciblage.svg b/frontend/src/uiMonitor/icons/Picto_ciblage.svg deleted file mode 100755 index d2b126670..000000000 --- a/frontend/src/uiMonitor/icons/Picto_ciblage.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/frontend/src/uiMonitor/icons/Picto_identite.svg b/frontend/src/uiMonitor/icons/Picto_identite.svg deleted file mode 100755 index 8a41dd7a6..000000000 --- a/frontend/src/uiMonitor/icons/Picto_identite.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/frontend/src/uiMonitor/icons/Picto_observations_ciblage.svg b/frontend/src/uiMonitor/icons/Picto_observations_ciblage.svg deleted file mode 100644 index b749cc761..000000000 --- a/frontend/src/uiMonitor/icons/Picto_observations_ciblage.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Picto_peche.svg b/frontend/src/uiMonitor/icons/Picto_peche.svg deleted file mode 100755 index 9f8b5fb23..000000000 --- a/frontend/src/uiMonitor/icons/Picto_peche.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/frontend/src/uiMonitor/icons/Pin.svg b/frontend/src/uiMonitor/icons/Pin.svg deleted file mode 100644 index 93fb7926f..000000000 --- a/frontend/src/uiMonitor/icons/Pin.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Pin_filled.svg b/frontend/src/uiMonitor/icons/Pin_filled.svg deleted file mode 100644 index 581f6a8c4..000000000 --- a/frontend/src/uiMonitor/icons/Pin_filled.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Pinpoint.svg b/frontend/src/uiMonitor/icons/Pinpoint.svg deleted file mode 100644 index 83bd50ac5..000000000 --- a/frontend/src/uiMonitor/icons/Pinpoint.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Pinpoint_hide.svg b/frontend/src/uiMonitor/icons/Pinpoint_hide.svg deleted file mode 100644 index e80bc9beb..000000000 --- a/frontend/src/uiMonitor/icons/Pinpoint_hide.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Plus.svg b/frontend/src/uiMonitor/icons/Plus.svg deleted file mode 100644 index fd961964e..000000000 --- a/frontend/src/uiMonitor/icons/Plus.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Point_exclamation_info.svg b/frontend/src/uiMonitor/icons/Point_exclamation_info.svg deleted file mode 100755 index 67dc4ef6c..000000000 --- a/frontend/src/uiMonitor/icons/Point_exclamation_info.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - ! - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Point_interet_autre.svg b/frontend/src/uiMonitor/icons/Point_interet_autre.svg deleted file mode 100755 index 88327e5cc..000000000 --- a/frontend/src/uiMonitor/icons/Point_interet_autre.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Polygone.svg b/frontend/src/uiMonitor/icons/Polygone.svg deleted file mode 100644 index 7d3fd8b6e..000000000 --- a/frontend/src/uiMonitor/icons/Polygone.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Positions_estimees.svg b/frontend/src/uiMonitor/icons/Positions_estimees.svg deleted file mode 100644 index 6d55b2e77..000000000 --- a/frontend/src/uiMonitor/icons/Positions_estimees.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/frontend/src/uiMonitor/icons/Rectangle.svg b/frontend/src/uiMonitor/icons/Rectangle.svg deleted file mode 100644 index 14c226eae..000000000 --- a/frontend/src/uiMonitor/icons/Rectangle.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Reject.svg b/frontend/src/uiMonitor/icons/Reject.svg deleted file mode 100644 index c5709b3ef..000000000 --- a/frontend/src/uiMonitor/icons/Reject.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Reload.svg b/frontend/src/uiMonitor/icons/Reload.svg deleted file mode 100644 index 23a067186..000000000 --- a/frontend/src/uiMonitor/icons/Reload.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Save.svg b/frontend/src/uiMonitor/icons/Save.svg deleted file mode 100644 index bb6c3013e..000000000 --- a/frontend/src/uiMonitor/icons/Save.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Search.svg b/frontend/src/uiMonitor/icons/Search.svg deleted file mode 100644 index 93af97172..000000000 --- a/frontend/src/uiMonitor/icons/Search.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Select_polygon.svg b/frontend/src/uiMonitor/icons/Select_polygon.svg deleted file mode 100644 index 5b4c04a41..000000000 --- a/frontend/src/uiMonitor/icons/Select_polygon.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Select_rectangle.svg b/frontend/src/uiMonitor/icons/Select_rectangle.svg deleted file mode 100644 index 82f4f832f..000000000 --- a/frontend/src/uiMonitor/icons/Select_rectangle.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Select_zone.svg b/frontend/src/uiMonitor/icons/Select_zone.svg deleted file mode 100644 index 7d230d437..000000000 --- a/frontend/src/uiMonitor/icons/Select_zone.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Selector.svg b/frontend/src/uiMonitor/icons/Selector.svg deleted file mode 100644 index 24e31d699..000000000 --- a/frontend/src/uiMonitor/icons/Selector.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Show_ERS_messages.svg b/frontend/src/uiMonitor/icons/Show_ERS_messages.svg deleted file mode 100644 index 5395a9f57..000000000 --- a/frontend/src/uiMonitor/icons/Show_ERS_messages.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Show_XML.svg b/frontend/src/uiMonitor/icons/Show_XML.svg deleted file mode 100644 index b77a2d41a..000000000 --- a/frontend/src/uiMonitor/icons/Show_XML.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Sorting_arrows.svg b/frontend/src/uiMonitor/icons/Sorting_arrows.svg deleted file mode 100644 index 52919503f..000000000 --- a/frontend/src/uiMonitor/icons/Sorting_arrows.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Stats.svg b/frontend/src/uiMonitor/icons/Stats.svg deleted file mode 100644 index d98daca0b..000000000 --- a/frontend/src/uiMonitor/icons/Stats.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Summary.svg b/frontend/src/uiMonitor/icons/Summary.svg deleted file mode 100644 index 1fb1dd835..000000000 --- a/frontend/src/uiMonitor/icons/Summary.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Tag.svg b/frontend/src/uiMonitor/icons/Tag.svg deleted file mode 100644 index b34878ba9..000000000 --- a/frontend/src/uiMonitor/icons/Tag.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Target.svg b/frontend/src/uiMonitor/icons/Target.svg deleted file mode 100644 index dd49776d8..000000000 --- a/frontend/src/uiMonitor/icons/Target.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Text.svg b/frontend/src/uiMonitor/icons/Text.svg deleted file mode 100644 index a8e2b00c7..000000000 --- a/frontend/src/uiMonitor/icons/Text.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/Vessel.svg b/frontend/src/uiMonitor/icons/Vessel.svg deleted file mode 100644 index bb2f2d8af..000000000 --- a/frontend/src/uiMonitor/icons/Vessel.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/View_on_map.svg b/frontend/src/uiMonitor/icons/View_on_map.svg deleted file mode 100644 index 481443736..000000000 --- a/frontend/src/uiMonitor/icons/View_on_map.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/uiMonitor/icons/picto_carte_identite_navire.svg b/frontend/src/uiMonitor/icons/picto_carte_identite_navire.svg deleted file mode 100644 index 805c01a79..000000000 --- a/frontend/src/uiMonitor/icons/picto_carte_identite_navire.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/utils/sortCollectionByLocalizedProps.ts b/frontend/src/utils/sortCollectionByLocalizedProps.ts index 722d82409..57e771c2c 100644 --- a/frontend/src/utils/sortCollectionByLocalizedProps.ts +++ b/frontend/src/utils/sortCollectionByLocalizedProps.ts @@ -1,6 +1,6 @@ import { property } from 'lodash/fp' -import type { AnyObject } from '@mtes-mct/monitor-ui/types' +import type { AnyObject } from '@mtes-mct/monitor-ui' export function sortCollectionByLocalizedProps(propPaths: string[], collection: T[]): T[] { return collection.sort((a, b) => {