-
Notifications
You must be signed in to change notification settings - Fork 4
Updating with bootstrap 5 #564
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
Conversation
|
MikeNeilson
left a comment
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.
Okay, all of the comments are "brain dump as fast as I can while other work was fresh in brain".
My main concern is the change to the webjars (mostly the npm based one, if we have to use them, sure, but they tend to be oddly packaged.)
You also seem to have some things working that were broken.
However, you have a bunch of needed fixes and tweaks in the js, especially in regards to the datatables and those settings.
So here's my pitch. We either:
- Merge this in, then I rebase the reorg branch and we go from there
- I rebase the reorg branch onto this and then merge from there.
I don't like the versions in the webjar urls (you clearly didn't either but clearly something wasn't working correctly).
I'm also a bit concerned about reverting the datatables version, but I don't mind doing to work to update that if I'm the one pushing the bit reorg.
My inclination is 1 above, clean merge in of something that mostly works.
And then we quickly follow up with the reorg. Accepting we will likely break a few things again (that PR is already somewhat big) and fix those in follow up PRs.
Considering we basically went in the same direction with bootstrap 5 (and bootstrap-icons (which I didn't see a webjar for so a bit surprised they worked at all)) we can either:
- Immediately follow up with the Theme branch changes
- Do the fixes and then the theme branch changes.
As much as that branch was just playing around it will force us to behave in a more constrained way when setting up the various components and provide a well defined target for creating say, an "OpenDCS Theme", we just do a bootstrap theme same as how bootswatch does it.
.... Okay that's way too much pontification in a PR review.
Short version. Since you haven't renamed any files, just moved them, it should fairly easy for me to rebase onto this after it's merged.
I would like the reorg in place before we do too much more though. I'm confident it will make it easier for others to come along and certainly makes my brain feel better as I think about all the login tweaks I'm wanting to make.
opendcs-web-client/src/main/webapp/resources/js/datatables/datatables.js
Show resolved
Hide resolved
opendcs-web-client/src/main/webapp/resources/js/datatables/datatables.js
Show resolved
Hide resolved
opendcs-web-client/src/main/webapp/resources/js/lib/opendcs_utilities.js
Show resolved
Hide resolved
|
I do like the side bar taking up the full height. |
|
I just tested this manually with the docker-compose and it behaves reasonably. There's a few things still broken, but they were before and this isn't the place to fix them. This is a JS/CSS course correction. I say it's ready to merge, and while my reorg will revert/break some of it, I'm pretty sure it's just the things you called out as shims. The datatables version reversion concerns me, but that should also be separate from the reorg PR as that will likely require additional code changes. |
|




Problem Description
Needed to update the web client with a different theme - went with bootstrap 5.
Fixes #.
Look and feel, as well as a bunch of bugs with the UI in the migration.
Describe your solution.
Tested each page. There are still several issues.
Each page was tested, each modal was tested, each datatable was tested.
Where the following done:
(Formerly called regression tests.)