From f0dfd69da70ab40babe2fdb5f5501c9903d39f4f Mon Sep 17 00:00:00 2001 From: Nicolas Wurtz Date: Fri, 18 Aug 2023 17:17:59 +0200 Subject: [PATCH 1/2] front: import opendata: correct data format --- .../operationalStudies/importTrainSchedule.json | 1 + .../operationalStudies/importTrainSchedule.json | 1 + .../ImportTrainScheduleConfig.tsx | 17 +++++------------ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/front/public/locales/en/operationalStudies/importTrainSchedule.json b/front/public/locales/en/operationalStudies/importTrainSchedule.json index 53c01458370..d11b2e3458f 100644 --- a/front/public/locales/en/operationalStudies/importTrainSchedule.json +++ b/front/public/locales/en/operationalStudies/importTrainSchedule.json @@ -10,6 +10,7 @@ "errorNoFrom": "You must fill in an origin.", "errorNoTo": "You must fill in a destination.", "errorSameFromTo": "Origin and destination must be different", + "errorImport": "Data conversion failed", "unableToRetrievePathfinding": "Impossible to create a path", "unableToRetrieveTrainSchedule": "Impossible to compute running time" }, diff --git a/front/public/locales/fr/operationalStudies/importTrainSchedule.json b/front/public/locales/fr/operationalStudies/importTrainSchedule.json index cb0d20b389c..8958eb4616d 100644 --- a/front/public/locales/fr/operationalStudies/importTrainSchedule.json +++ b/front/public/locales/fr/operationalStudies/importTrainSchedule.json @@ -6,6 +6,7 @@ "endTime": "FIN", "errorMessages": { "error": "Une erreur est survenue", + "errorImport": "Impossible de convertir les données en TrainSchedule", "errorNoDate": "Vous devez renseigner une date.", "errorNoFrom": "Vous devez renseigner une origine.", "errorNoTo": "Vous devez renseigner une destination.", diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx b/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx index 7386a024a8f..10bcc34081e 100644 --- a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx +++ b/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx @@ -91,16 +91,9 @@ export default function ImportTrainScheduleConfig({ return true; } const hasInvalidteps = trainSchedule.steps.some((step) => - [ - 'arrivalTime', - 'departureTime', - 'uic', - 'yard', - 'name', - 'trigram', - 'latitude', - 'longitude', - ].some((key) => !(key in step)) + ['arrivalTime', 'departureTime', 'uic', 'name', 'trigram', 'latitude', 'longitude'].some( + (key) => !(key in step) + ) ); return hasInvalidteps; }); @@ -108,11 +101,11 @@ export default function ImportTrainScheduleConfig({ dispatch( setFailure({ name: t('errorMessages.error'), - message: 'Impossible de convertir les données en TrainSchedule', + message: t('errorMessage.errorImport'), }) ); console.error( - 'Invalid data format: can not convert response into TrainSchedules. Expected format : { trainNumber: string; rollingStock: string; departureTime: string; arrivalTime: string; departure: string; steps: ({uic: number; yard: string; name: string; trigram: string; latitude: number; longitude: number; arrivalTime: string; departureTime: string; })[]; transilienName?: string; }' + 'Invalid data format: can not convert response into TrainSchedules. Expected format : { trainNumber: string; rollingStock: string; departureTime: string; arrivalTime: string; departure: string; steps: ({uic: number; yard?: string; name: string; trigram: string; latitude: number; longitude: number; arrivalTime: string; departureTime: string; })[]; transilienName?: string; }' ); return null; } From 8d28123ac861875387a72d6075bf1489602900a7 Mon Sep 17 00:00:00 2001 From: Nicolas Wurtz Date: Tue, 22 Aug 2023 09:46:34 +0200 Subject: [PATCH 2/2] front: fix const typo & order locales json --- .../locales/en/operationalStudies/importTrainSchedule.json | 2 +- .../ImportTrainSchedule/ImportTrainScheduleConfig.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/front/public/locales/en/operationalStudies/importTrainSchedule.json b/front/public/locales/en/operationalStudies/importTrainSchedule.json index d11b2e3458f..b7876f2024e 100644 --- a/front/public/locales/en/operationalStudies/importTrainSchedule.json +++ b/front/public/locales/en/operationalStudies/importTrainSchedule.json @@ -6,11 +6,11 @@ "endTime": "END", "errorMessages": { "error": "An error has occurred", + "errorImport": "Data conversion failed", "errorNoDate": "You must enter a date.", "errorNoFrom": "You must fill in an origin.", "errorNoTo": "You must fill in a destination.", "errorSameFromTo": "Origin and destination must be different", - "errorImport": "Data conversion failed", "unableToRetrievePathfinding": "Impossible to create a path", "unableToRetrieveTrainSchedule": "Impossible to compute running time" }, diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx b/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx index 10bcc34081e..e8363764374 100644 --- a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx +++ b/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx @@ -90,12 +90,12 @@ export default function ImportTrainScheduleConfig({ ) { return true; } - const hasInvalidteps = trainSchedule.steps.some((step) => + const hasInvalidSteps = trainSchedule.steps.some((step) => ['arrivalTime', 'departureTime', 'uic', 'name', 'trigram', 'latitude', 'longitude'].some( (key) => !(key in step) ) ); - return hasInvalidteps; + return hasInvalidSteps; }); if (isInvalidTrainSchedules) { dispatch(