Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

front: handle duplicate switch nodes errors #6351

Merged
merged 1 commit into from
Jan 22, 2024
Merged

front: handle duplicate switch nodes errors #6351

merged 1 commit into from
Jan 22, 2024

Conversation

Wadjetz
Copy link
Member

@Wadjetz Wadjetz commented Jan 15, 2024

close #6078

Capture d’écran 2024-01-15 à 17 28 31 Capture d’écran 2024-01-15 à 17 28 37

@Wadjetz Wadjetz self-assigned this Jan 15, 2024
@Wadjetz Wadjetz added kind:bug Something isn't working area:front Work on Standard OSRD Interface modules labels Jan 15, 2024
@Wadjetz Wadjetz force-pushed the ebe/ports-switch-duplicate-errors branch from d8ff06a to 65ed4bb Compare January 15, 2024 16:35
@codecov Codecov
Copy link

codecov bot commented Jan 15, 2024 •
edited
Loading

Codecov Report

Attention: 41 lines in your changes are missing coverage. Please review.

Comparison is base (7ac9bc7) 27.72% compared to head (f4f6883) 27.71%.

Files Patch % Lines
...dition/components/TrackSectionEndpointSelector.tsx 0.00% 25 Missing and 1 partial ⚠️
...c/applications/editor/tools/switchEdition/tool.tsx 0.00% 14 Missing ⚠️
...ications/editor/tools/switchEdition/components.tsx 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##                dev    #6351      +/-   ##
============================================
- Coverage     27.72%   27.71%   -0.02%     
  Complexity     2165     2165              
============================================
  Files          1003     1003              
  Lines        126573   126611      +38     
  Branches       2580     2580              
============================================
- Hits          35097    35092       -5     
- Misses        89986    90029      +43     
  Partials       1490     1490
Flag Coverage Δ
core 78.58% <ø> (ø)
editoast 75.45% <ø> (-0.03%) ⬇️
front 8.36% <0.00%> (-0.01%) ⬇️
gateway 2.50% <ø> (ø)
railjson_generator 87.44% <ø> (ø)
tests 81.95% <ø> (ø)

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.

@Wadjetz Wadjetz force-pushed the ebe/ports-switch-duplicate-errors branch from 65ed4bb to f1ee613 Compare January 16, 2024 08:50
@Wadjetz Wadjetz marked this pull request as ready for review January 16, 2024 08:56
@Wadjetz Wadjetz requested a review from a team as a code owner January 16, 2024 08:56
@Wadjetz Wadjetz force-pushed the ebe/ports-switch-duplicate-errors branch from f1ee613 to 847a84e Compare January 16, 2024 09:10
flomonster
flomonster approved these changes Jan 16, 2024
View reviewed changes
Copy link
Contributor

@flomonster flomonster left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (Tested)

Tguisnet
Tguisnet approved these changes Jan 16, 2024
View reviewed changes
Copy link
Contributor

@Tguisnet Tguisnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only tested, it seems good !

Akctarus
Akctarus reviewed Jan 16, 2024
View reviewed changes
Copy link
Contributor

@Akctarus Akctarus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, just left 2 comments

front/public/locales/fr/translation.json Outdated Show resolved Hide resolved
front/src/applications/editor/tools/switchEdition/components.tsx Outdated Show resolved Hide resolved
Akctarus
Akctarus approved these changes Jan 18, 2024
View reviewed changes
Copy link
Contributor

@Akctarus Akctarus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !

@Wadjetz Wadjetz requested a review from clarani January 18, 2024 08:44
@Wadjetz Wadjetz force-pushed the ebe/ports-switch-duplicate-errors branch from 7c59cab to 35c1bfd Compare January 18, 2024 13:26
@bloussou
Copy link
Contributor

@nicolaswurtz @Math-R @SharglutDev can you review this ?

SharglutDev
SharglutDev requested changes Jan 18, 2024
View reviewed changes
Copy link
Contributor

@SharglutDev SharglutDev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the PR, left some comments

front/src/applications/editor/tools/switchEdition/components/TrackSectionEndpointSelector.tsx Outdated Show resolved Hide resolved
front/public/locales/en/translation.json Outdated Show resolved Hide resolved
front/public/locales/fr/translation.json Outdated Show resolved Hide resolved
front/src/applications/editor/tools/switchEdition/components/TrackSectionEndpointSelector.tsx Outdated Show resolved Hide resolved
front/src/applications/editor/tools/switchEdition/components.tsx Outdated Show resolved Hide resolved
@Wadjetz Wadjetz force-pushed the ebe/ports-switch-duplicate-errors branch from d30fe50 to bd78f84 Compare January 19, 2024 08:32
@Wadjetz Wadjetz force-pushed the ebe/ports-switch-duplicate-errors branch 3 times, most recently from dc038fe to 63a1114 Compare January 19, 2024 15:44
@Wadjetz Wadjetz force-pushed the ebe/ports-switch-duplicate-errors branch from 63a1114 to 2b09f41 Compare January 19, 2024 16:00
anisometropie
anisometropie approved these changes Jan 22, 2024
View reviewed changes
Copy link
Contributor

@anisometropie anisometropie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only reviewed code, looking good 👍

@Wadjetz Wadjetz force-pushed the ebe/ports-switch-duplicate-errors branch from 2b09f41 to 0ebbc19 Compare January 22, 2024 13:26
@Wadjetz Wadjetz force-pushed the ebe/ports-switch-duplicate-errors branch from 0ebbc19 to f4f6883 Compare January 22, 2024 14:47
SharglutDev
SharglutDev approved these changes Jan 22, 2024
View reviewed changes
Copy link
Contributor

@SharglutDev SharglutDev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm and tested, good job :)

@Wadjetz Wadjetz added this pull request to the merge queue Jan 22, 2024
Merged via the queue into dev with commit 37aac79 Jan 22, 2024
20 checks passed
@Wadjetz Wadjetz deleted the ebe/ports-switch-duplicate-errors branch January 22, 2024 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flomonster flomonster flomonster approved these changes

@bloussou bloussou bloussou left review comments

@anisometropie anisometropie anisometropie approved these changes

@Tguisnet Tguisnet Tguisnet approved these changes

@Akctarus Akctarus Akctarus approved these changes

@SharglutDev SharglutDev SharglutDev approved these changes

@clarani clarani Awaiting requested review from clarani

Assignees

@Wadjetz Wadjetz

Labels
area:front Work on Standard OSRD Interface modules kind:bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Forbid selection of same track endpoint in multi ports switch
7 participants
@Wadjetz @bloussou @flomonster @anisometropie @Tguisnet @Akctarus @SharglutDev