change trainid format #10679

SharglutDev · 2025-02-04T19:02:28Z

codecov-commenter · 2025-02-04T19:10:23Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 99.35380% with 4 lines in your changes missing coverage. Please review.

Project coverage is 81.93%. Comparing base (397e4db) to head (d11307f).
Report is 6 commits behind head on dev.

Files with missing lines	Patch %	Lines
...alStudies/hooks/useSetupItineraryForTrainUpdate.ts	33.33%	4 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##              dev   #10679      +/-   ##
==========================================
+ Coverage   81.86%   81.93%   +0.06%     
==========================================
  Files        1082     1083       +1     
  Lines      107123   107551     +428     
  Branches      721      741      +20     
==========================================
+ Hits        87698    88121     +423     
- Misses      19384    19389       +5     
  Partials       41       41

Flag	Coverage Δ
editoast	`74.32% <ø> (-0.01%)`	⬇️
front	`89.46% <99.35%> (+0.06%)`	⬆️
gateway	`2.18% <ø> (ø)`
osrdyne	`3.28% <ø> (ø)`
railjson_generator	`87.50% <ø> (ø)`
tests	`87.87% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

front/src/utils/trainId.ts

front/src/utils/__tests__/trainId.spec.ts

front/src/applications/operationalStudies/components/MacroEditor/ngeToOsrd.ts

front/src/applications/operationalStudies/hooks/useAutoUpdateProjection.ts

front/src/applications/operationalStudies/hooks/useScenarioData.ts

...ules/simulationResult/components/ManchetteWithSpaceTimeChart/ManchetteWithSpaceTimeChart.tsx

front/src/utils/trainId.ts

front/src/modules/simulationResult/components/SpaceTimeChart/useLazyProjectTrains.ts

front/src/applications/operationalStudies/hooks/usePathProjection.ts

front/src/utils/trainId.ts

theocrsb

lgtm, I didn't see any problem after testing

front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts

front/src/applications/operationalStudies/components/MacroEditor/ngeToOsrd.ts

front/src/applications/operationalStudies/hooks/useAutoUpdateProjection.ts

front/src/applications/operationalStudies/hooks/useScenarioData.ts

front/src/applications/operationalStudies/__tests__/sampleData.ts

Instead of using the mapped nge train ids / osrd train ids when creating a train on nge side, share it on both side. This will later help to deal with paced trains. Signed-off-by: SharglutDev <[email protected]>

This will help differentiate paced train ids (and their occurrences) and train schedule ids. Signed-off-by: SharglutDev <[email protected]>

Train id with type number will be used as "editoastTrainId". Train id with type TrainScheduleID will be used as "formattedTrainId". Signed-off-by: SharglutDev <[email protected]>

clarani

LGTM, tested ✅

SharglutDev force-pushed the pfn/front/change-trainid-format branch from 2b70e01 to 9ed6b7f Compare February 4, 2025 19:07

github-actions bot added the area:front Work on Standard OSRD Interface modules label Feb 4, 2025

SharglutDev force-pushed the pfn/front/change-trainid-format branch 13 times, most recently from fb3d65b to 797955e Compare February 7, 2025 16:15

SharglutDev marked this pull request as ready for review February 10, 2025 08:44

SharglutDev requested a review from a team as a code owner February 10, 2025 08:44

SharglutDev requested review from Math-R, clarani, Uriel-Sautron and theocrsb February 10, 2025 08:45

SharglutDev force-pushed the pfn/front/change-trainid-format branch from 797955e to 72f2c2b Compare February 10, 2025 14:02

clarani reviewed Feb 10, 2025

View reviewed changes

front/src/utils/trainId.ts Outdated Show resolved Hide resolved

front/src/utils/trainId.ts Outdated Show resolved Hide resolved

front/src/utils/__tests__/trainId.spec.ts Outdated Show resolved Hide resolved

front/src/utils/__tests__/trainId.spec.ts Outdated Show resolved Hide resolved

clarani reviewed Feb 11, 2025

View reviewed changes

emersion reviewed Feb 11, 2025

View reviewed changes

front/src/utils/trainId.ts Outdated Show resolved Hide resolved

emersion reviewed Feb 11, 2025

View reviewed changes

front/src/utils/trainId.ts Outdated Show resolved Hide resolved

emersion reviewed Feb 11, 2025

View reviewed changes

front/src/utils/trainId.ts Outdated Show resolved Hide resolved

SharglutDev force-pushed the pfn/front/change-trainid-format branch from 70c8a62 to eb84e9f Compare February 11, 2025 14:02

theocrsb approved these changes Feb 11, 2025

View reviewed changes

SharglutDev force-pushed the pfn/front/change-trainid-format branch from c9b3dc2 to 3a5861b Compare February 12, 2025 09:00

clarani reviewed Feb 13, 2025

View reviewed changes

SharglutDev force-pushed the pfn/front/change-trainid-format branch from 965425a to a558811 Compare February 13, 2025 10:49

clarani reviewed Feb 13, 2025

View reviewed changes

front/src/applications/operationalStudies/__tests__/sampleData.ts Outdated Show resolved Hide resolved

front: update nge state

a412228

Instead of using the mapped nge train ids / osrd train ids when creating a train on nge side, share it on both side. This will later help to deal with paced trains. Signed-off-by: SharglutDev <[email protected]>

SharglutDev force-pushed the pfn/front/change-trainid-format branch from 5ceff1f to c47c05e Compare February 13, 2025 15:00

SharglutDev added 2 commits February 13, 2025 16:02

front: add new train id types and helpers to format them

321f1e4

This will help differentiate paced train ids (and their occurrences) and train schedule ids. Signed-off-by: SharglutDev <[email protected]>

front: replace number train ids with the new types

d11307f

Train id with type number will be used as "editoastTrainId". Train id with type TrainScheduleID will be used as "formattedTrainId". Signed-off-by: SharglutDev <[email protected]>

SharglutDev force-pushed the pfn/front/change-trainid-format branch from c47c05e to d11307f Compare February 13, 2025 15:05

SharglutDev enabled auto-merge February 13, 2025 15:20

clarani approved these changes Feb 13, 2025

View reviewed changes

SharglutDev added this pull request to the merge queue Feb 13, 2025

Merged via the queue into dev with commit 80a92a4 Feb 13, 2025
27 checks passed

SharglutDev deleted the pfn/front/change-trainid-format branch February 13, 2025 17:11

emersion mentioned this pull request Feb 14, 2025

front: use Map instead of Record for train summaries/projections #10808

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

change trainid format #10679

change trainid format #10679

SharglutDev commented Feb 4, 2025

codecov-commenter commented Feb 4, 2025 •

edited

Loading

theocrsb left a comment

clarani left a comment

change trainid format #10679

change trainid format #10679

Conversation

SharglutDev commented Feb 4, 2025

codecov-commenter commented Feb 4, 2025 • edited Loading

Codecov Report

theocrsb left a comment

Choose a reason for hiding this comment

clarani left a comment

Choose a reason for hiding this comment

codecov-commenter commented Feb 4, 2025 •

edited

Loading