Fix node and subtree restoration #659
Merged
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
…tion for each nodes in the subtree but a single notification to `insertSubtree` and all its children. fix(): RestoreNode now use the `InsertMode.CHILD` to add a new branch instead of trying to insert a node between the parent and already existing children. It causes unexpected behaviors. Signed-off-by: sBouzols <[email protected]>
SlimaneAmar
approved these changes
Dec 20, 2024
| @@ -590,8 +590,13 @@ public void restoreNode(UUID studyId, List<UUID> nodeIds, UUID anchorNodeId) { | |||
| nodeToRestore.setStashed(false); | |||
| nodeToRestore.setStashDate(null); | |||
| nodesRepository.save(nodeToRestore); | |||
| notificationService.emitNodeInserted(studyId, anchorNodeId, nodeId, InsertMode.AFTER, anchorNodeId); | |||
| restoreNodeChildren(studyId, nodeId); | |||
| boolean hasChildren = nodesRepository.countByParentNodeIdNode(nodeId) > 0; | |||
There was a problem hiding this comment.
Create an private method hasChildren to reuse it for other usages
| @@ -725,15 +725,15 @@ private void stashNode(UUID studyUuid, AbstractNode child, boolean stashChildren | |||
| assertTrue(expectedStash.stream().anyMatch(node -> node.getId().equals(id)))); | |||
| } | |||
|
|
|||
| private void restoreNode(UUID studyUuid, List<UUID> nodeId, UUID anchorNodeId, Set<UUID> expectedIdRestored, String userId) throws Exception { | |||
| private void restoreNode(UUID studyUuid, List<UUID> nodeId, UUID anchorNodeId, String userId) throws Exception { | |||
Signed-off-by: Slimane AMAR <[email protected]>
|
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.
fix(): When restoring a subtree, do not send a
nodeCreatednotifica…tion for each nodes in the subtree but a single notification toinsertSubtreeand all its children.fix(): RestoreNode now use the
InsertMode.CHILDto add a new branch instead of trying to insert a node between the parent and already existing children. It causes unexpected behaviors.