-
Notifications
You must be signed in to change notification settings - Fork 44
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.
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
Add tabs for NGE integration #8006
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM and tested
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm (tested)
front/src/applications/operationalStudies/components/MacroEditor/NGE.tsx
Outdated
Show resolved
Hide resolved
front/src/applications/operationalStudies/components/MacroEditor/NGE.tsx
Outdated
Show resolved
Hide resolved
This needs a rebase against the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 💪 tested
front/src/styles/scss/applications/operationalStudies/_simulationresults.scss
Outdated
Show resolved
Hide resolved
Codecov ReportAttention: Patch coverage is
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## dev #8006 +/- ##
============================================
- Coverage 28.16% 28.12% -0.04%
Complexity 2120 2120
============================================
Files 1300 1302 +2
Lines 158791 158914 +123
Branches 3177 3179 +2
============================================
- Hits 44718 44702 -16
- Misses 112169 112306 +137
- Partials 1904 1906 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Discussed out-of-band with @clarani, we'll probably want to fix the ESLint complaints about the .js imports by sprinkling a few eslint-ignore comments (ESLint is getting confused by
|
The linter is unhappy, can be fixed by running
|
front/src/styles/scss/applications/operationalStudies/_scenario.scss
Outdated
Show resolved
Hide resolved
9c3b915
to
05e536d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Discussed with Louis and Thibaut, this PR can not be merged like this otherwise the manageTrainSchedule and SimulationResults screens are very small, which may not be a good thing for the operational studies.
front/src/applications/operationalStudies/components/MacroEditor/NGE.tsx
Outdated
Show resolved
Hide resolved
front/src/applications/operationalStudies/components/MacroEditor/NGE.tsx
Outdated
Show resolved
Hide resolved
f6680e4
to
f3ef3d3
Compare
front/src/applications/operationalStudies/components/MacroEditor/NGE.tsx
Outdated
Show resolved
Hide resolved
front/src/styles/scss/applications/operationalStudies/_nge.scss
Outdated
Show resolved
Hide resolved
front/src/styles/scss/applications/operationalStudies/_scenario.scss
Outdated
Show resolved
Hide resolved
49314aa
to
2a8502f
Compare
TBH not sure this matters a lot and is worth fixing, we'll redesign the whole page soon enough… (e.g. we could just hide the arrow button in macro mode - maybe need to check with Thibault) |
front/src/styles/scss/applications/operationalStudies/_scenario.scss
Outdated
Show resolved
Hide resolved
front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx
Outdated
Show resolved
Hide resolved
Optional opinionated nits in terms of naming:
|
2a8502f
to
150d2d7
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! (but note that I wrote part of the NGE
component)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thank you very much despite all the last-minute changes
Don't merge now we are waiting for the PO's decision |
Can be merged, users will be informed of that specific feature |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM (tested)
front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx
Outdated
Show resolved
Hide resolved
front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx
Outdated
Show resolved
Hide resolved
front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM & tested ✅ I just left 2 extra suggestions, you can fix and resolve the conversations on your own :) Don't forget to squash your commits
front/src/applications/operationalStudies/components/MicroMacroSwitch.tsx
Outdated
Show resolved
Hide resolved
front/src/applications/operationalStudies/components/MicroMacroSwitch.tsx
Outdated
Show resolved
Hide resolved
front: create NGE component - fix css for display nge integration - change function nge to arrow function - remove tabs componant and create buttons to switch between micro and macro components - remove flex-grow in scenario-timetable class, add class nge-iframe, remove classname in tabs component - create file for micro macro switch
9d79c6a
to
7e3745e
Compare
closes #7537