Branch: refs/heads/XWIKI-21949 Home: https://github.com/xwiki/xwiki-platform Commit: 22b740a56970dbf2d667d8ccc26edde9a1e84d55 https://github.com/xwiki/xwiki-platform/commit/22b740a56970dbf2d667d8ccc26e… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: A xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/MultiUserTestUtilsParameterResolver.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/UITestTestConfigurationResolver.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/browser/BrowserContainerExecutor.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/servletengine/ServletContainerExecutor.java A xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/junit5/MultiUserTestUtils.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/junit5/TestConfiguration.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/junit5/UITest.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/TestUtils.java Log Message: ----------- XWIKI-22272: Add support for testing with multiple users/browsers * Add new UITest configuration, named 'servletEngineNetworkAliases', to specify additional aliases that can be used to access the servlet engine running XWiki * Add a helper MultiUserTestUtils that can be injected in test methods allowing to: ** create new browser tabs and associate them with a given XWiki alias (you can log in different users in each of these tabs) ** switch between the created tabs, taking care of restoring the proper form token and base URL ** close the created tabs (except the first one) ** access the handle of the first (main) tab Commit: d4b3a322da390d0060227058837c6dc94e6de679 https://github.com/xwiki/xwiki-platform/commit/d4b3a322da390d0060227058837c… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml Log Message: ----------- XWIKI-22308: The inplace editor locks the original translation when creating a new translation * reload the edit mode when switching the edited translation * change the document locale before locking it (taking care to restore the original translation if the edit fails for the new translation) * when reloading the document JSON, fallback on the orignal translation if the requested translation doesn't exist * when rendering the document, fallback on the original translation if the edited translation is new (so that we initialize the content of the new translation with the values from the original translation) Commit: 801694d8b4c5f6974d811ffb7efd96526a715fe4 https://github.com/xwiki/xwiki-platform/commit/801694d8b4c5f6974d811ffb7efd… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-localization/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-office/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-resource/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-source/plugin.js Log Message: ----------- XWIKI-22308: The inplace editor locks the original translation when creating a new translation * Also make sure the CKEditor requests that affect the edited content use the content locale and not the current UI locale because they can differ (e.g. when there's no document translation matching the current UI locale). Commit: 01542b3c7b3e8f08d85766f6e43f5c2677dcc495 https://github.com/xwiki/xwiki-platform/commit/01542b3c7b3e8f08d85766f6e43f… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/XWikiRequest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/web/EffectiveAuthorSetterListener.java Log Message: ----------- XWIKI-22222: Add the concept of "request effective author" * Update since version Commit: fa1c0fb1a859c14d8112ad07f1ec9d9fe973283f https://github.com/xwiki/xwiki-platform/commit/fa1c0fb1a859c14d8112ad07f1ec… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/EntityChannelStore.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EffectiveAuthorSetterListener.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChange.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorBot.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorTracker.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/internal/EffectiveAuthorSetterListenerTest.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorTrackerTest.java Log Message: ----------- XWIKI-21949: Restrict the execution of script macros during a realtime WYSIWYG editing session * Fix a bug in EntityChannelScriptAuthorTracker which didn't lower / update the script level when the target entity reference had initially a low script level (e.g. when two users edit a page whose last author didn't have script right, one of them could use the rights of the other to execute scripts) * Assume that a request can submit data associated with multiple documents (or document translations) so don't try to determine the entity that is targeted by the request; simply compute the effective author by taking the most recent author with the least script rights * Update since versions Commit: 7bbd0904a136833144712ead0ddcbfb6af848793 https://github.com/xwiki/xwiki-platform/commit/7bbd0904a136833144712ead0ddc… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js Log Message: ----------- XWIKI-21949: Restrict the execution of script macros during a realtime WYSIWYG editing session * Stop submitting the Netflux channel after we disconnect from the realtime session (do proper cleanup). Commit: 8ed990542aaa481d20fda72b7dcbed7f312aa338 https://github.com/xwiki/xwiki-platform/commit/8ed990542aaa481d20fda72b7dcb… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/document.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js Log Message: ----------- XWIKI-22309: When creating a new document translation from realtime inplace editor, the content is synchronized with the original translation * Detect when the current document locale changes without a page reload and update the realtime document locale (that is going to be used to fetch the Netflux channels). * When creating a new realtime editor, check if the "all users" channel (that is shared) matches the current realtime document locale, and if it does not then disconnect and connect to the new channel. Commit: 49030bf17bd6f2a01ff58fa5ea05669bee09bf48 https://github.com/xwiki/xwiki-platform/commit/49030bf17bd6f2a01ff58fa5ea05… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/MacroDialogEditModal.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/AbstractRealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/AllIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGMultiUserIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeCKEditorToolBar.java Log Message: ----------- XWIKI-21949: Restrict the execution of script macros during a realtime WYSIWYG editing session * Add functional tests for limiting script right and for editing translations * Move "multi users" tests to RealtimeWYSIWYGEditorIT and use the new multi user test "framework" * Add page objects to interact with the macro content field on the Macro Edit modal Compare: https://github.com/xwiki/xwiki-platform/compare/02a9e3db8abc...49030bf17bd6 To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications