From 8f8a608a25f212f5eec5ca33011a0e9fd839b71f Mon Sep 17 00:00:00 2001 From: Paul Filimon <113104137+SharglutDev@users.noreply.github.com> Date: Tue, 25 Apr 2023 16:50:35 +0200 Subject: [PATCH] Pfn/front/electrification error handler (#3935) close #3835 This PR adds an error message when selecting a power restriction code than cannot be applied by the rolling stock given the electrification on the chosen path. --- .../manageTrainSchedule.json | 2 + .../DisplayItinerary/Destination.tsx | 7 +- .../Itinerary/DisplayItinerary/Origin.tsx | 2 + .../PowerRestrictionSelector.tsx | 135 +++++++++++++----- .../RollingStockCardButtons.jsx | 2 + front/src/reducers/osrdconf/index.ts | 2 +- 6 files changed, 108 insertions(+), 42 deletions(-) diff --git a/front/public/locales/fr/operationalStudies/manageTrainSchedule.json b/front/public/locales/fr/operationalStudies/manageTrainSchedule.json index 82fb12385f6..6e7d5e2651b 100644 --- a/front/public/locales/fr/operationalStudies/manageTrainSchedule.json +++ b/front/public/locales/fr/operationalStudies/manageTrainSchedule.json @@ -12,6 +12,7 @@ "deleteVias": "Supprimer les étapes", "destination": "Destination", "errorMessages": { + "error": "Une erreur est survenue", "mandatoryField": "Champ obligatoire", "noDelta": "L'intervalle ente deux trains doit être d'au moins une minute", "noDeltaInput": "Doit être > 0", @@ -26,6 +27,7 @@ "noTrainCountInput": "Doit être > 0", "noTrainStep": "Le pas d'incrément du nom du train doit être supérieur à zéro", "noTrainStepInput": "Doit être > 0", + "powerRestrictionInvalidCombination": "Code {{powerRestrictionCode}} incompatible avec l'électrification à {{electrification}} V de l'itinéraire", "stdcmError": "Erreur de calcul Sillon de dernière minute", "The requested train couldn't reach its destination": "Le train ne peut pas atteindre sa destination", "trainScheduleTitle": "Une erreur est survenue", diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Destination.tsx b/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Destination.tsx index e6dac8400af..99801e4f03b 100644 --- a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Destination.tsx +++ b/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Destination.tsx @@ -15,12 +15,12 @@ import { updateDestination, updateDestinationDate, updateDestinationTime, + updatePathfindingID, updateStdcmMode, } from 'reducers/osrdconf'; import { makeEnumBooleans } from 'utils/constants'; import InputSNCF from 'common/BootstrapSNCF/InputSNCF'; -import { store } from 'Store'; import { MODES, STDCM_MODES } from 'applications/operationalStudies/consts'; interface DestinationProps { @@ -61,7 +61,10 @@ function Destination(props: DestinationProps) {