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

XWIKI-20616: Update jstree files and remove reference to throbber.gif #2913

Merged
merged 2 commits into from
Jul 26, 2024

Conversation

amottier
Copy link
Contributor

Jira URL

https://jira.xwiki.org/browse/XWIKI-20616

Changes

Description

  • Update files provided by jstree to use the ones provided in version 3.3.16 (version of jstree referenced in the pom.xml).
  • Comment out the reference to throbber.gif in jstree mixins.less file as the gif file is no part of xwiki-platform-tree-webjar and rule is override in tree.less to use spinner.gif.

Clarifications

Executed Tests

./mvnw -Psnapshot,dev clean install -f xwiki-platform-core/xwiki-platform-tree/pom.xml (with Java 17 and Maven 3.9.6)

`jstree` less files included in `xwiki-platform-tree-webjar` were coming from version `3.3.5` (or earlier) whereas the version declared in `pom.xml` is `3.3.16`.
This commit resynchronize files originated from `jstree` to match the ones provided in version `3.3.16`.

This commit also comment out the reference to `throbber.gif` in `jstree` `mixins.less` file as the gif file is no part of `xwiki-platform-tree-webjar` and rule is override in `tree.less` to use `spinner.gif`.
@surli
Copy link
Member

surli commented Feb 20, 2024

By looking at files such as xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/less/jstree/mixins.less it appears they were part of version 3.3.5 or earlier (see for example this diff of src/themes/mixins.less file between version 3.3.5 and 3.3.6). As pom.xml specifies version 3.3.16 this commit update files included in xwiki-platform-tree-webjar that are coming from jstree project.

@mflorea apparently you performed the upgrade from jstree 3.3.5 to 3.3.7 in ced2f2c did you forgot to update those files back then? Maybe we need some specific instructions for upgrading these?

@amottier
Copy link
Contributor Author

@surli @mflorea is there anything I can do on my side to help the merge of this PR? Don't hesitate to reach out if I can assist. Thanks.

@mflorea
Copy link
Member

mflorea commented Jul 24, 2024

@mflorea apparently you performed the upgrade from jstree 3.3.5 to 3.3.7 in ced2f2c did you forgot to update those files back then? Maybe we need some specific instructions for upgrading these?

@surli I did upgrade jstree from 3.3.5 to 3.3.7 but in my commit ced2f2c I updated the jstree less files (base.less and responsive.less). The problem is with the following upgrades:

which have updated only the version in the POM. So @amottier I think the best approach is to:

  • make a diff between our less files after the upgrade to 3.3.7 and the original jstree 3.3.7
  • apply those changes on top of the jstree 3.3.16 less files, because our jstree less files have customizations.

Copy link
Member

@mflorea mflorea left a comment

Choose a reason for hiding this comment

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

You're removing customizations that we did on top of jstree. Unfortunately they are not marked so it's not easy to spot them unless you make a diff between our version of the jstree less files and the original jstree less files.

Restore XWiki customization accidentally remove in the first attempt to update jsTree file to jsTree version `3.3.16`.
@amottier
Copy link
Contributor Author

@mflorea hopefully I restored all customization that I accidentally removed. This pull request is again ready for review. Thanks for your help 👍

Copy link
Member

@mflorea mflorea left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks a lot for your contribution and for your patience.

@mflorea mflorea merged commit f568555 into xwiki:master Jul 26, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants