HBASE-28832 Upgrade from bootstrap 3.4.1 to non vulnerable version 5.3.3 #6524
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Hi @NihalJain, Sorry I was completely off for the holiday season. I'll rebase this branch soon. |
PDavid
force-pushed
the
HBASE-28832-bootstrap-upgrade-5-branch-2
branch
from
1c6f572 to
b3ce128
Compare
|
OK, this branch is rebased. I cherry-picked again the whole Bootstrap upgrade master commit. Unfortunately this is still not a 100% clean cherry-pick. I had to resolve some minor conflicts in Also added the small fix for |
Hey @PDavid No worries, BTW a very Happy New Year. I actually added comment just for reminder, once you are back. |
|
The CI build was aborted after 21 hours. Will rebase this branch to trigger another build. |
PDavid
force-pushed
the
HBASE-28832-bootstrap-upgrade-5-branch-2
branch
from
b3ce128 to
a445f7c
Compare
This comment has been minimized.
This comment has been minimized.
|
I tested with very quickly locally and it looks good to me. The PR build was aborted. Should it be re-triggered maybe? 🤔 |
|
This is a simple backport of master + addendum right? I don't think approval is needed here. We can merge this once we have build results. Let me retrigger, if not already running! |
NihalJain
added
the
backport
Yes, exactly. Thanks! 👍 |
PDavid
force-pushed
the
HBASE-28832-bootstrap-upgrade-5-branch-2
branch
from
a445f7c to
4ffff57
Compare
This comment has been minimized.
This comment has been minimized.
…3.3 (apache#6490) First we upgraded to Bootstrap v4 - this was the majority of the changes - and then I upgraded to Bootstrap 5.3.3 - which is the latest non-vulnerable version according to https://security.snyk.io/package/npm/bootstrap/3.4.1 Changes were based on the migration documentation: - https://getbootstrap.com/docs/4.6/migration/ - https://getbootstrap.com/docs/5.3/migration/ Most of the changes are related to navbar-s, tabs and forms. The new Bootstrap look has a bit bigger font sizes but it is still OK in my opinion. Bootstrap v5 is not requiring JQuery anymore but we have some JQuery plugins (jquery.tablesorter.min.js, tab.js) which still need it so I left JQuery in. - Removed bootstrap-theme.min.css and Glyphicons icon font because these are not present anymore in newer Bootstrap versions. - Upgraded checked in Bootstrap CSS and JS files to v4. - Moved some inline CSS styles to hbase.css file (DRY). - The page-header class was dropped in Bootstrap v4 so added page-header small grey color to hbase.css. - Removed some unused imports in JSP files. - Improved the styling of the Log Level form - Replaced hbase_logo_small.png under thrift module with the hbase-server one. Reason: to make sure that they are the same size (this under thrift was smaller). - Upgraded checked in Bootstrap CSS and JS files to v5. - Migrated navbars for v5: - Navbars now require a container within (to drastically simplify spacing requirements and CSS required). - The .active class can no longer be applied to .nav-items, it must be applied directly on .nav-links. - Migrated data attributes. Data attributes for all Bootstrap JavaScript plugins are now namespaced to help distinguish Bootstrap functionality from third parties and your own code. For example, we use data-bs-toggle instead of data-toggle. - form-inline was dropped in v5, so inline forms had to be styled with grid and utilities instead. - Added the favicon of the HBase website to the web UI pages. Signed-off-by: Nick Dimiduk <ndimiduk@apache.org> Signed-off-by: Nihal Jain <nihaljain.cs@gmail.com> (cherry picked from commit 744ce13)
There were some changes in the Bootstrap upgrade which caused the test to fail because the test expected certain text to appear on the UI page. (cherry picked from commit eba6a85)
PDavid
force-pushed
the
HBASE-28832-bootstrap-upgrade-5-branch-2
branch
from
4ffff57 to
71e1d36
Compare
|
🎊 +1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
Hi @NihalJain, |
petersomogyi
approved these changes
Feb 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the backport of #6490 for
branch-2.