Allow to link page to next element independently of hierarchy level #6255
Conversation
This file contains 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
BartChris
approved these changes
Nov 8, 2024
There was a problem hiding this comment.
Works as expected and code looks very solid to me! Thanks a lot.
As suggested in #5457 (comment), we can inspect the effects of dragging linked nodes around at a later point in time.
BartChris
reviewed
Nov 8, 2024
Comment on lines
+1807
to
+1848
| private TreeNode findNextLogicalNodeForViewAssignmentRecursive(TreeNode node) { | ||
| TreeNode current = node; | ||
|
|
||
| while (Objects.nonNull(current)) { | ||
| if (Objects.isNull(getTreeNodeStructuralElement(current))) { | ||
| // node is not a logical node | ||
| return null; | ||
| } | ||
|
|
||
| // check whether next sibling is a logical node as well | ||
| List<TreeNode> currentSiblings = current.getParent().getChildren(); | ||
| int currentIndex = currentSiblings.indexOf(current); | ||
|
|
||
| if (currentSiblings.size() > currentIndex + 1) { | ||
| TreeNode nextSibling = currentSiblings.get(currentIndex + 1); | ||
| if (Objects.isNull(getTreeNodeStructuralElement(nextSibling))) { | ||
| // next sibling is not a logical node | ||
| return null; | ||
| } | ||
|
|
||
| // next sibling is a logical node and potential valid result, unless there are children | ||
| TreeNode nextLogical = nextSibling; | ||
|
|
||
| // check sibling has children (with first child being another logical node) | ||
| while (!nextLogical.getChildren().isEmpty()) { | ||
| TreeNode firstChild = nextLogical.getChildren().get(0); | ||
| if (Objects.isNull(getTreeNodeStructuralElement(firstChild))) { | ||
| // first child is not a logical node | ||
| return nextLogical; | ||
| } | ||
| // iterate to child node | ||
| nextLogical = firstChild; | ||
| } | ||
| return nextLogical; | ||
| } | ||
|
|
||
| // node is last amongst siblings | ||
| // iterate to parent node | ||
| current = current.getParent(); | ||
| } | ||
| return null; | ||
| } |
There was a problem hiding this comment.
Method is very long and could probably be refactored in smaller methods, but as the logic is quite complex it is also good to have it in one place. So i think this is all good to go!
This was referenced Nov 13, 2024
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.
Fixes #5457
This pull request allows to add a new link (context menu entry "Assign to next element") for the currently selected page to the following folder independently of its hierarchy level. The selection logic works as follows:
This pull request also checks if a link has already been added before such that users cannot accidentally add the same link twice (the menu entry "Assign to next element" disappears).
Demo
2024-10-08.14-56-08.mp4