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: adapt conflicts to V2 #7533

Merged

SharglutDev merged 1 commit into dev from tmn/adapt-conflict-to-V2

May 30, 2024

Contributor

Akctarus commented May 28, 2024

closes #7487

Akctarus requested a review from a team as a code owner

May 28, 2024 15:18

codecov-commenter commented May 29, 2024 •

edited

Loading

Codecov Report

Attention: Patch coverage is 1.88679% with 156 lines in your changes are missing coverage. Please review.

Project coverage is 29.32%. Comparing base (4bdd9b5) to head (6b45d69).
Report is 19 commits behind head on dev.

Files	Patch %	Lines
...rc/modules/conflict/components/ConflictsListV2.tsx	0.00%	64 Missing and 1 partial ⚠️
...src/modules/conflict/components/ConflictCardV2.tsx	0.00%	48 Missing and 1 partial ⚠️
front/src/modules/conflict/utils.ts	0.00%	19 Missing and 1 partial ⚠️
...ainschedule/components/TimetableV2/TimetableV2.tsx	0.00%	7 Missing ⚠️
...cations/operationalStudies/views/v2/ScenarioV2.tsx	0.00%	5 Missing ⚠️
front/src/utils/date.ts	42.85%	3 Missing and 1 partial ⚠️
...s/ManageTrainSchedule/AddTrainScheduleV2Button.tsx	0.00%	2 Missing ⚠️
...le/components/TimetableV2/TimetableTrainCardV2.tsx	0.00%	2 Missing ⚠️
...ules/trainschedule/components/TimetableV2/hooks.ts	0.00%	2 Missing ⚠️

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

Additional details and impacted files

@@             Coverage Diff              @@
##                dev    #7533      +/-   ##
============================================
- Coverage     29.37%   29.32%   -0.05%     
  Complexity     2014     2014              
============================================
  Files          1200     1203       +3     
  Lines        147411   147532     +121     
  Branches       2893     2897       +4     
============================================
- Hits          43303    43270      -33     
- Misses       102405   102555     +150     
- Partials       1703     1707       +4

Flag	Coverage Δ
core	`75.06% <ø> (-0.02%)`	⬇️
editoast	`72.44% <ø> (-0.09%)`	⬇️
front	`9.73% <1.88%> (-0.03%)`	⬇️
gateway	`2.41% <ø> (ø)`
railjson_generator	`87.49% <ø> (ø)`
tests	`71.85% <ø> (+0.06%)`	⬆️

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.

Akctarus force-pushed the tmn/adapt-conflict-to-V2 branch 4 times, most recently from be0c1e4 to 579ca20 Compare

May 29, 2024 12:56

achrafmohye reviewed

View reviewed changes

front/src/modules/conflict/components/ConflictsListV2.tsx Show resolved Hide resolved

achrafmohye reviewed

View reviewed changes

front/src/modules/conflict/components/ConflictsListV2.tsx Outdated Show resolved Hide resolved

achrafmohye reviewed

View reviewed changes

front/src/modules/conflict/components/ConflictsListV2.tsx Outdated Show resolved Hide resolved

achrafmohye approved these changes

View reviewed changes

Contributor

achrafmohye left a comment

LGTM

SharglutDev requested changes

View reviewed changes

Contributor

SharglutDev left a comment

Thank you for this PR ! Left some comments.

front/src/modules/conflict/components/ConflictsListV2.tsx Outdated Show resolved Hide resolved

front/src/modules/conflict/components/ConflictCardV2.tsx Outdated Show resolved Hide resolved

front/src/modules/conflict/components/ConflictsListV2.tsx Outdated Show resolved Hide resolved

front/src/modules/conflict/components/ConflictCardV2.tsx Outdated Show resolved Hide resolved

.../src/modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainScheduleV2.tsx Outdated Show resolved Hide resolved

front/src/modules/conflict/components/ConflictsListV2.tsx Outdated Show resolved Hide resolved

front/src/modules/conflict/components/ConflictCardV2.tsx Outdated Show resolved Hide resolved

front/src/modules/conflict/components/ConflictCardV2.tsx Outdated Show resolved Hide resolved

front/src/modules/conflict/components/ConflictCardV2.tsx Outdated Show resolved Hide resolved

front/src/utils/date.ts Show resolved Hide resolved

SharglutDev requested changes

View reviewed changes

front/src/modules/conflict/components/ConflictCardV2.tsx Outdated Show resolved Hide resolved

front/src/modules/conflict/components/ConflictsListV2.tsx Outdated Show resolved Hide resolved

front/src/modules/trainschedule/components/TimetableV2/TimetableV2.tsx Outdated Show resolved Hide resolved

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

SharglutDev requested changes

View reviewed changes

front/src/modules/conflict/styles/_conflictList.scss Show resolved Hide resolved

Akctarus force-pushed the tmn/adapt-conflict-to-V2 branch from d0a4677 to a1fd54f Compare

May 30, 2024 09:18


          front: adapt conflicts to V2

6b45d69

Akctarus force-pushed the tmn/adapt-conflict-to-V2 branch from 1e4a21e to 6b45d69 Compare

May 30, 2024 09:57

SharglutDev approved these changes

View reviewed changes

Contributor

SharglutDev left a comment

Lgtm and tested, good job !

SharglutDev enabled auto-merge

May 30, 2024 09:58

SharglutDev added this pull request to the merge queue

Merged via the queue into dev with commit 9417f7a

17 checks passed

SharglutDev deleted the tmn/adapt-conflict-to-V2 branch

May 30, 2024 10:16

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet