Medium/Small: many changes are obvious, there's essentially no logic
Problem
I merged main into 346 and now the styling is a bit whacked up, because there have been recent changes to color vars, custom modal props, etc. This deals with merge issues and refactors conversion branch to work with current styling approaches.
Note: there is a bug/issue where the converted file is not recognized upon load and so it does not display a title and the Download and Share buttons remain disabled despite a file being loaded. The changes for that bug are in process pending discussion of changes to Octopus and TrajectoryInfo typing. I think its acceptable to proceed with this PR (and merge to main) with that resolution pending, as this will not go to production until Octopus is live.
Solution
This PR fixes the handful of erroneous merge artifacts, and brings the ConversionForm, ConversionOverlay, and various conversion modals into alignment with the recent changes to CustomModal, color variable naming, etc. etc.
Most of the changes to the modals are just using the new props for CustomModal and a couple style tweaks.
To review styling on on modals and processing overlay, outside of just looking at screenshots I suggest just pasting the following code blocks into the ConversionForm render function outside of the usual conditional rendering:
You can upload an invalid file type to test the file type error, but triggering the server error and getting it to hang out on the processing overlay is a little more fussy.
Bug fix (non-breaking change which fixes an issue)
Steps to Verify:
Convert a file and confirm everything still works after merging main.
Check out the conversion form, overlay and modals and see that they look like the current light-theme guidance.
Time estimate or Size
Medium/Small: many changes are obvious, there's essentially no logic
Problem
I merged main into 346 and now the styling is a bit whacked up, because there have been recent changes to color vars, custom modal props, etc. This deals with merge issues and refactors conversion branch to work with current styling approaches.
Note: there is a bug/issue where the converted file is not recognized upon load and so it does not display a title and the Download and Share buttons remain disabled despite a file being loaded. The changes for that bug are in process pending discussion of changes to Octopus and TrajectoryInfo typing. I think its acceptable to proceed with this PR (and merge to main) with that resolution pending, as this will not go to production until Octopus is live.
Solution
This PR fixes the handful of erroneous merge artifacts, and brings the
ConversionForm
,ConversionOverlay
, and various conversion modals into alignment with the recent changes toCustomModal
, color variable naming, etc. etc.Most of the changes to the modals are just using the new props for
CustomModal
and a couple style tweaks.To review styling on on modals and processing overlay, outside of just looking at screenshots I suggest just pasting the following code blocks into the
ConversionForm
render function outside of the usual conditional rendering:You can upload an invalid file type to test the file type error, but triggering the server error and getting it to hang out on the processing overlay is a little more fussy.
Steps to Verify:
Screenshots (optional):