Skip to content

Commit ac74e97

Browse files
SarahBellahaSarahBellaha
committed
front: stdcm: drop stdcm v1
Signed-off-by: SarahBellaha <[email protected]>
1 parent ad5dc37 commit ac74e97

File tree

87 files changed

+261
-1430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+261
-1430
lines changed

‎front/public/locales/en/home/navbar.json

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
},
2323
"safeWord": "Safety keyword",
2424
"safeWordHelp": "The \"security keyword\" allows you to transparently filter the list of projects with the word you enter, used as a label. Choose a complicated word so that no-one uses it inadvertently. Add it as a label to a project; it will be automatically added when the project is created if the word is entered here.",
25-
"stdcmToggle": "STDCM New interface",
2625
"userSettings": "User settings",
2726
"yourSafeWord": "Type in your word"
2827
}

‎front/public/locales/en/operationalStudies/manageTrainSchedule.json

-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
7979
"launchPathFinding": "Launch pathfinding",
8080
"launchSimulation": "Start",
8181
"manageVias": "Steps management",
82-
"maximumRunTime": "Maximum running time",
83-
"maximumRunTimeError": "Travel time must not exceed 12h",
8482
"noPlaceChosen": "No stop/waypoint defined",
8583
"noOriginChosen": "Departure undefined",
8684
"noDestinationChosen": "Arrival undefined",

‎front/public/locales/en/stdcm-simulation-report-sheet.json

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"startStop": "start",
2727
"stdcm": "ST DCM",
2828
"stdcmCreation": "short term path creation",
29-
"stdcmSimulationSheet": "Simulation report sheet",
3029
"stopType": "motif",
3130
"towedMaterial": "towed material",
3231
"track": "track",

‎front/public/locales/fr/home/navbar.json

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
},
2323
"safeWord": "Mot clé de sécurité",
2424
"safeWordHelp": "Le « mot-clé de sécurité » permet de filtrer de manière transparente la liste des projets avec le mot renseigné, utilisé comme une étiquette. Préférez un mot compliqué dans l'idée que personne ne l'utilise par inadvertance. Ajoutez-le comme une étiquette à un projet ; il sera automatiquement ajouté à la création de projet si le mot est renseigné ici.",
25-
"stdcmToggle": "STDCM Nouvelle interface",
2625
"userSettings": "Paramètres utilisateur",
2726
"yourSafeWord": "Tapez votre mot"
2827
}

‎front/public/locales/fr/operationalStudies/manageTrainSchedule.json

-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
7979
"launchPathFinding": "Lancer la recherche d'itinéraire",
8080
"launchSimulation": "Démarrer",
8181
"manageVias": "Gestion des étapes",
82-
"maximumRunTime": "Temps de parcours maximum",
83-
"maximumRunTimeError": "Le temps de parcours ne doit pas excéder 12h",
8482
"noPlaceChosen": "Aucun point de passage/arrêt défini",
8583
"noOriginChosen": "Départ non défini",
8684
"noDestinationChosen": "Arrivée non définie",

‎front/public/locales/fr/stdcm-simulation-report-sheet.json

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"startStop": "départ",
2727
"stdcm": "ST DCM",
2828
"stdcmCreation": "Création de sillon de dernière minute",
29-
"stdcmSimulationSheet": "Fiche Simulation",
3029
"stopType": "motif",
3130
"towedMaterial": "matériel remorqué",
3231
"track": "voie",

‎front/src/applications/stdcm/Home.tsx

-11
This file was deleted.

‎front/src/applications/stdcm/components/RunningTime.tsx

-57
This file was deleted.

‎front/src/applications/stdcmV2/components/StdcmEmptyConfigError.tsx ‎front/src/applications/stdcm/components/StdcmEmptyConfigError.tsx

File renamed without changes.

‎front/src/applications/stdcmV2/components/StdcmCard.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmCard.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ const StdcmCard = ({
1717
children,
1818
className = '',
1919
}: StdcmCardProps) => (
20-
<div className={cx('stdcm-v2-card', { 'has-tip': hasTip, disabled })}>
20+
<div className={cx('stdcm-card', { 'has-tip': hasTip, disabled })}>
2121
{name && (
2222
<div
2323
className={cx(
24-
'stdcm-v2-card__header',
24+
'stdcm-card__header',
2525
'd-flex',
2626
'justify-content-between',
2727
'align-items-center'
@@ -31,7 +31,7 @@ const StdcmCard = ({
3131
{title}
3232
</div>
3333
)}
34-
<div className={cx('stdcm-v2-card__body', `${className}`)}>{children}</div>
34+
<div className={cx('stdcm-card__body', `${className}`)}>{children}</div>
3535
</div>
3636
);
3737

‎front/src/applications/stdcmV2/components/StdcmConfig.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx

+13-14
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import { useAppDispatch } from 'store';
1515
import StdcmConsist from './StdcmConsist';
1616
import StdcmDestination from './StdcmDestination';
1717
import StdcmOrigin from './StdcmOrigin';
18-
import StdcmSimulationParams from './StdcmSimulationParams';
18+
import useStaticPathfinding from '../../hooks/useStaticPathfinding';
19+
import type { StdcmConfigErrors } from '../../types';
20+
import StdcmSimulationParams from '../StdcmSimulationParams';
1921
import StdcmVias from './StdcmVias';
20-
import StdcmWarningBox from './StdcmWarningBox';
21-
import useStaticPathfinding from '../hooks/useStaticPathfinding';
22-
import { ArrivalTimeTypes, StdcmConfigErrorTypes } from '../types';
23-
import type { StdcmConfigErrors } from '../types';
24-
import checkStdcmConfigErrors from '../utils/checkStdcmConfigErrors';
22+
import { ArrivalTimeTypes, StdcmConfigErrorTypes } from '../../types';
23+
import checkStdcmConfigErrors from '../../utils/checkStdcmConfigErrors';
24+
import StdcmWarningBox from '../StdcmWarningBox';
2525

2626
/**
2727
* Inputs in different cards inside the StdcmConfig component come from the stdcm redux store.
@@ -106,7 +106,6 @@ const StdcmConfig = ({
106106
setFormErrors(formErrorsStatus);
107107
}, [origin, destination, pathfinding]);
108108

109-
// TODO: DROP STDCMV1: set those values by default in the store when <StdcmAllowances/> is not used anymore.
110109
useEffect(() => {
111110
if (!isDebugMode) {
112111
dispatch(updateGridMarginAfter(35));
@@ -124,28 +123,28 @@ const StdcmConfig = ({
124123
}, [infra]);
125124

126125
return (
127-
<div className="stdcm-v2__body">
126+
<div className="stdcm__body">
128127
{isDebugMode && (
129128
<div className="stdcm-simulation-parameters">
130129
<StdcmSimulationParams {...{ disabled, projectID, studyID, scenarioID }} />
131130
</div>
132131
)}
133132

134133
<div className="d-flex">
135-
<div className="stdcm-v2-simulation-inputs">
136-
<div className="stdcm-v2-consist-container">
134+
<div className="stdcm-simulation-inputs">
135+
<div className="stdcm-consist-container">
137136
<StdcmConsist disabled={disabled} />
138137
</div>
139-
<div className="stdcm-v2__separator" />
140-
<div className="stdcm-v2-simulation-itinerary">
138+
<div className="stdcm__separator" />
139+
<div className="stdcm-simulation-itinerary">
141140
{/* //TODO: use them when we implement this feature #403 */}
142141
{/* <StdcmDefaultCard text="Indiquer le sillon antérieur" Icon={<ArrowUp size="lg" />} /> */}
143142
<StdcmOrigin disabled={disabled} origin={origin} />
144143
<StdcmVias disabled={disabled} />
145144
<StdcmDestination disabled={disabled} destination={destination} />
146145
{/* <StdcmDefaultCard text="Indiquer le sillon postérieur" Icon={<ArrowDown size="lg" />} /> */}
147146
<div
148-
className={cx('stdcm-v2-launch-request', {
147+
className={cx('stdcm-launch-request', {
149148
'wizz-effect': pathfinding?.status !== 'success' || formErrors,
150149
})}
151150
>
@@ -163,7 +162,7 @@ const StdcmConfig = ({
163162
</div>
164163
</div>
165164

166-
<div className="osrd-config-item-container osrd-config-item-container-map stdcm-v2-map">
165+
<div className="osrd-config-item-container osrd-config-item-container-map stdcm-map">
167166
<Map
168167
hideAttribution
169168
hideItinerary

‎front/src/applications/stdcmV2/components/StdcmConsist.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmConsist.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import useFilterRollingStock from 'modules/rollingStock/hooks/useFilterRollingSt
1313
import { type StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
1414
import { useAppDispatch } from 'store';
1515

16-
import type { StdcmConfigCardProps } from '../types';
1716
import StdcmCard from './StdcmCard';
18-
import useStdcmConsist from '../hooks/useStdcmConsist';
17+
import useStdcmConsist from '../../hooks/useStdcmConsist';
18+
import type { StdcmConfigCardProps } from '../../types';
1919

2020
const ConsistCardTitle = ({
2121
rollingStock,
@@ -25,7 +25,7 @@ const ConsistCardTitle = ({
2525
if (!rollingStock) return null;
2626

2727
return (
28-
<div className="stdcm-v2-consist-img w-75 d-flex justify-content-end align-self-end">
28+
<div className="stdcm-consist-img w-75 d-flex justify-content-end align-self-end">
2929
<RollingStock2Img rollingStock={rollingStock} />
3030
</div>
3131
);
@@ -118,7 +118,7 @@ const StdcmConsist = ({ disabled = false }: StdcmConfigCardProps) => {
118118
onSelectSuggestion={onSelectSuggestion}
119119
/>
120120
</div>
121-
<div className="stdcm-v2-consist__properties">
121+
<div className="stdcm-consist__properties">
122122
<Input
123123
id="tonnage"
124124
label={t('consist.tonnage')}
@@ -138,7 +138,7 @@ const StdcmConsist = ({ disabled = false }: StdcmConfigCardProps) => {
138138
onChange={onTotalLengthChange}
139139
/>
140140
</div>
141-
<div className="stdcm-v2-consist__properties">
141+
<div className="stdcm-consist__properties">
142142
<SpeedLimitByTagSelector
143143
disabled={disabled}
144144
selectedSpeedLimitByTag={speedLimitByTag}

‎front/src/applications/stdcmV2/components/StdcmDefaultCard.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmDefaultCard.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ const StdcmDefaultCard = ({
1616
}: StdcmCardProps) => (
1717
<StdcmCard hasTip={hasTip} disabled={disabled} className="add-via">
1818
<button type="button" onClick={onClick}>
19-
<span className="stdcm-v2-default-card-icon">{Icon}</span>
20-
<span className="stdcm-v2-default-card-button">{text}</span>
19+
<span className="stdcm-default-card-icon">{Icon}</span>
20+
<span className="stdcm-default-card-button">{text}</span>
2121
</button>
2222
</StdcmCard>
2323
);

‎front/src/applications/stdcmV2/components/StdcmDestination.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useMemo, useState } from 'react';
22

33
import { useTranslation } from 'react-i18next';
44

5-
import DestinationIcon from 'assets/pictures/stdcmV2/destination.svg';
5+
import DestinationIcon from 'assets/pictures/stdcm/destination.svg';
66
import { useOsrdConfActions } from 'common/osrdContext';
77
import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
88
import type { PathStep } from 'reducers/osrdconf/types';
@@ -12,8 +12,8 @@ import { extractDateAndTimefromISO, generateISODateFromDateTime } from 'utils/da
1212
import StdcmCard from './StdcmCard';
1313
import StdcmOperationalPoint from './StdcmOperationalPoint';
1414
import StdcmOpSchedule from './StdcmOpSchedule';
15-
import DEFAULT_TOLERANCE from '../consts';
16-
import { ArrivalTimeTypes, type ScheduleConstraint, type StdcmConfigCardProps } from '../types';
15+
import { DEFAULT_TOLERANCE } from '../../consts';
16+
import { ArrivalTimeTypes, type ScheduleConstraint, type StdcmConfigCardProps } from '../../types';
1717

1818
const StdcmDestination = ({
1919
disabled = false,
@@ -87,7 +87,7 @@ const StdcmDestination = ({
8787
disabled={disabled}
8888
className="extremity"
8989
>
90-
<div className="stdcm-v2-destination">
90+
<div className="stdcm-destination">
9191
<StdcmOperationalPoint
9292
updatePoint={updateDestinationPoint}
9393
point={destination}

‎front/src/applications/stdcmV2/components/StdcmInputVia.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmInputVia.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
77
import type { PathStep } from 'reducers/osrdconf/types';
88
import { ISO8601Duration2sec, secToMin } from 'utils/timeManipulation';
99

10-
import { StdcmStopTypes } from '../types';
10+
import { StdcmStopTypes } from '../../types';
1111

1212
type StdcmInputViaProps = {
1313
stopType: StdcmStopTypes;
@@ -47,7 +47,7 @@ const StdcmInputVia = ({ stopType, stopDuration, updatePathStepStopTime }: Stdcm
4747
stopType !== StdcmStopTypes.PASSAGE_TIME && (
4848
<div className="stdcm-v2-via-stop-for stop-time">
4949
<Input
50-
id="stdcm-v2-via-stop-time"
50+
id="stdcm-via-stop-time"
5151
type="text"
5252
label={t('trainPath.stopFor')}
5353
onChange={(e) => {

‎front/src/applications/stdcmV2/components/StdcmOpSchedule.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { useOsrdConfSelectors } from 'common/osrdContext';
88
import { formatDateString, isArrivalDateInSearchTimeWindow } from 'utils/date';
99
import { createStringSelectOptions } from 'utils/uiCoreHelpers';
1010

11-
import type { ArrivalTimeTypes, ScheduleConstraint } from '../types';
11+
import type { ArrivalTimeTypes, ScheduleConstraint } from '../../types';
1212

1313
type StdcmOpScheduleProps = {
1414
disabled: boolean;

‎front/src/applications/stdcmV2/components/StdcmOperationalPoint.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmOperationalPoint.tsx

File renamed without changes.

‎front/src/applications/stdcmV2/components/StdcmOrigin.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useMemo, useState } from 'react';
22

33
import { useTranslation } from 'react-i18next';
44

5-
import OriginIcon from 'assets/pictures/stdcmV2/start.svg';
5+
import OriginIcon from 'assets/pictures/stdcm/start.svg';
66
import { useOsrdConfActions } from 'common/osrdContext';
77
import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
88
import type { PathStep } from 'reducers/osrdconf/types';
@@ -12,8 +12,8 @@ import { extractDateAndTimefromISO, generateISODateFromDateTime } from 'utils/da
1212
import StdcmCard from './StdcmCard';
1313
import StdcmOperationalPoint from './StdcmOperationalPoint';
1414
import StdcmOpSchedule from './StdcmOpSchedule';
15-
import DEFAULT_TOLERANCE from '../consts';
16-
import { ArrivalTimeTypes, type ScheduleConstraint, type StdcmConfigCardProps } from '../types';
15+
import { DEFAULT_TOLERANCE } from '../../consts';
16+
import { ArrivalTimeTypes, type ScheduleConstraint, type StdcmConfigCardProps } from '../../types';
1717

1818
const StdcmOrigin = ({
1919
disabled = false,

‎front/src/applications/stdcmV2/components/StdcmStopType.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmStopType.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Select } from '@osrd-project/ui-core';
22
import { useTranslation } from 'react-i18next';
33

4-
import type { StdcmStopTypes } from '../types';
4+
import type { StdcmStopTypes } from '../../types';
55

66
type StdcmStopTypeProps = {
77
stopTypes: StdcmStopTypes;

‎front/src/applications/stdcmV2/components/StdcmVias.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmVias.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
66
import nextId from 'react-id-generator';
77
import { useSelector } from 'react-redux';
88

9-
import IntermediatePointIcon from 'assets/pictures/stdcmV2/intermediate-point.svg';
9+
import IntermediatePointIcon from 'assets/pictures/stdcm/intermediate-point.svg';
1010
import { useOsrdConfSelectors, useOsrdConfActions } from 'common/osrdContext';
1111
import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
1212
import type { PathStep } from 'reducers/osrdconf/types';
@@ -19,8 +19,8 @@ import StdcmDefaultCard from './StdcmDefaultCard';
1919
import StdcmInputVia from './StdcmInputVia';
2020
import StdcmOperationalPoint from './StdcmOperationalPoint';
2121
import StdcmStopType from './StdcmStopType';
22-
import { StdcmStopTypes } from '../types';
23-
import type { StdcmConfigCardProps } from '../types';
22+
import { StdcmStopTypes } from '../../types';
23+
import type { StdcmConfigCardProps } from '../../types';
2424

2525
const generateUniqueId = (idsList: string[]): string => {
2626
let id;
@@ -114,12 +114,12 @@ const StdcmVias = ({ disabled = false }: StdcmConfigCardProps) => {
114114
}, [stopTypes, pathSteps]);
115115

116116
return (
117-
<div className="stdcm-v2-vias-list">
117+
<div className="stdcm-vias-list">
118118
{intermediatePoints.length > 0 &&
119119
compact(intermediatePoints).map((pathStep, index) => {
120120
const pathStepIndex = index + 1;
121121
return (
122-
<div className="stdcm-v2-vias-bundle" key={pathStep.id}>
122+
<div className="stdcm-vias-bundle" key={pathStep.id}>
123123
<StdcmDefaultCard
124124
hasTip
125125
text={t('trainPath.addVia')}
@@ -130,7 +130,7 @@ const StdcmVias = ({ disabled = false }: StdcmConfigCardProps) => {
130130
<StdcmCard
131131
name={t('trainPath.vias')}
132132
title={
133-
<div className="stdcm-v2-via-icons">
133+
<div className="stdcm-via-icons">
134134
<div className="icon-bundle mt-1">
135135
<img src={IntermediatePointIcon} alt="intermediate-point" />
136136
<span className="icon-index">{pathStepIndex}</span>

0 commit comments

Comments
 (0)