XWIKI-19180: In case of merge conflict choosing "Reload editors" won't refresh the content #2622
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
manuelleduc
reviewed
Nov 17, 2023
...re/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
Outdated
Show resolved
Hide resolved
michitux
reviewed
Nov 17, 2023
...re/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
Outdated
Show resolved
Hide resolved
mflorea
requested changes
Nov 23, 2023
...re/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
Outdated
Show resolved
Hide resolved
...re/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
Outdated
Show resolved
Hide resolved
...wyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
Show resolved
Hide resolved
...iwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
Show resolved
Hide resolved
...orm-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
Outdated
Show resolved
Hide resolved
...orm-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
Outdated
Show resolved
Hide resolved
...orm-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
Outdated
Show resolved
Hide resolved
...orm-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
Outdated
Show resolved
Hide resolved
…t refresh the content XWIKI-19181: The autosave doesn't behave nicely when a merge conflict occurs
mflorea
approved these changes
Jan 23, 2024
...latform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
Outdated
Show resolved
Hide resolved
...iwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
Outdated
Show resolved
Hide resolved
...iwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
Outdated
Show resolved
Hide resolved
...iwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
Outdated
Show resolved
Hide resolved
…ltime-webjar/src/main/webjar/saver.js Fix typo.
…ltime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java Update test order.
…ltime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java Remove extra empty line.
…ltime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java Update test order.
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.
Jira: https://jira.xwiki.org/browse/XWIKI-19180
Jira: https://jira.xwiki.org/browse/XWIKI-19181
This PR fixes a bug where, when editing in realtime wysiwyg editor, when the user clicks on save and a conflict occurs, the "Reload editor" option would have no effect.
In order to fix this bug, we removed the custom conflict handeling which is now unnecessary. Removing this custom conflict handeling also happens to fix https://jira.xwiki.org/browse/XWIKI-19181 where merge conflicts would cause error messages to be displayed.
This PR also adds a functional test for the conflict handeling and merges.
This PR however does not add a functional test for conflicts happening when an auto-save is triggered.
Thanks.