Skip to content
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

opengrok web project code smell fixes #4457

Merged
merged 4 commits into from
Oct 26, 2023
Merged

Conversation

ginoaugustine
Copy link
Member

No description provided.

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Oct 25, 2023
@ginoaugustine ginoaugustine marked this pull request as ready for review October 25, 2023 17:42
@ginoaugustine ginoaugustine requested a review from vladak October 25, 2023 17:42
Signed-off-by: Gino Augustine <[email protected]>
Copy link
Member

@vladak vladak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the JS changes, it would be good to rename+bump version and do the appropriate change in

static {
// Due to the behavior of the webjar scanner, it is necessary for the paths to contain a version.
// Otherwise, with multiple versions of the webapp deployed within the same application server,
// an exception will be thrown and the deployment will fail.
putFromWebJar("jquery", "3.6.4/jquery.min.js", 10);
putjs("jquery-ui", "js/jquery-ui-1.12.1-custom", 11);
putFromWebJar("jquery-tablesorter", "2.31.3/dist/js/jquery.tablesorter.min.js", 12);
putjs("tablesorter-parsers", "js/tablesorter-parsers-0.0.3", 13, true);
putjs("searchable-option-list", "js/searchable-option-list-2.0.15", 14, true);
putjs("utils", "js/utils-0.0.46", 15, true);
putjs("repos", "js/repos-0.0.3", 20, true);
putjs("diff", "js/diff-0.0.5", 20, true);
putjs("jquery-caret", "js/jquery.caret-1.5.2", 25);
}

Signed-off-by: Gino Augustine <[email protected]>
@ginoaugustine
Copy link
Member Author

For the JS changes, it would be good to rename+bump version and do the appropriate change in

static {
// Due to the behavior of the webjar scanner, it is necessary for the paths to contain a version.
// Otherwise, with multiple versions of the webapp deployed within the same application server,
// an exception will be thrown and the deployment will fail.
putFromWebJar("jquery", "3.6.4/jquery.min.js", 10);
putjs("jquery-ui", "js/jquery-ui-1.12.1-custom", 11);
putFromWebJar("jquery-tablesorter", "2.31.3/dist/js/jquery.tablesorter.min.js", 12);
putjs("tablesorter-parsers", "js/tablesorter-parsers-0.0.3", 13, true);
putjs("searchable-option-list", "js/searchable-option-list-2.0.15", 14, true);
putjs("utils", "js/utils-0.0.46", 15, true);
putjs("repos", "js/repos-0.0.3", 20, true);
putjs("diff", "js/diff-0.0.5", 20, true);
putjs("jquery-caret", "js/jquery.caret-1.5.2", 25);
}

Done

@vladak
Copy link
Member

vladak commented Oct 26, 2023

Can you do some casual testing of the UI ? Specifically for the JS libraries that changed.

@ginoaugustine
Copy link
Member Author

Can you do some casual testing of the UI ? Specifically for the JS libraries that changed.

Tested loading of projects in home page and disable of any messages based upon the tag.
Tested table sorting based upon date.
File Type search

@vladak vladak merged commit 2f0c0f8 into oracle:master Oct 26, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants