Branch: refs/heads/master Home: https://github.com/xwiki/xwiki-platform Commit: 5f90563c041ef79f9c5b599f6cb6562e1da6ae31 https://github.com/xwiki/xwiki-platform/commit/5f90563c041ef79f9c5b599f6cb65... Author: Simon Urli <[email protected]> Date: 2024-06-12 (Wed, 12 Jun 2024) Changed paths: M xwiki-platform-core/pom.xml M xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/pom.xml M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/scope/ScopeNotificationFilter.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/scope/ScopeNotificationFilterLocationStateComputer.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/scope/WatchedLocationState.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/test/java/org/xwiki/notifications/filters/internal/scope/WatchedLocationStateTest.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/main/java/org/xwiki/notifications/filters/watch/WatchedEntitiesManager.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/main/java/org/xwiki/notifications/filters/watch/WatchedEntityFactory.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/main/java/org/xwiki/notifications/filters/watch/WatchedEntityReference.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/main/java/org/xwiki/notifications/filters/watch/WatchedLocationReference.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/main/java/org/xwiki/notifications/filters/watch/WatchedUserReference.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/main/java/org/xwiki/notifications/filters/watch/internal/DefaultWatchedEntitiesManager.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/main/java/org/xwiki/notifications/filters/watch/internal/DefaultWatchedEntityFactory.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/main/java/org/xwiki/notifications/filters/watch/script/NotificationWatchScriptService.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/test/java/org/xwiki/notifications/filters/watch/WatchedLocationReferenceTest.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/test/java/org/xwiki/notifications/filters/watch/internal/DefaultWatchedEntitiesManagerTest.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/pom.xml A xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/src/main/java/org/xwiki/notifications/rest/NotificationsWatchResource.java A xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/src/main/java/org/xwiki/notifications/rest/internal/DefaultNotificationsWatchResource.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/src/main/resources/META-INF/components.txt A xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/src/test/java/org/xwiki/notifications/rest/internal/DefaultNotificationsWatchResourceTest.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsEmailsIT.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsIT.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java A xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/NotificationWatchButtonElement.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/NotificationsTrayPage.java A xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/NotificationsWatchModal.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsDisplayerUIX.xml A xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsWatchUIX.xml M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.xml Log Message: ----------- XWIKI-19751: Move the "watch" button for a page to the page content menu (#3059) Goal of this change is to simplify usage of the watch page feature. It comes with important changes: - the watch location switches in the bell menu area have been removed - a new button with a logo and a status has been introduced next to edit button - a new modal has been introduced when clicking on the button providing various choices - the watch page API have been modified to not just provide boolean value watch / not watched, but to provide a larger panel of possible statuses - a REST resource have been provided to allow watching / blocking / removing a filter on a location * Start providing REST API for watch pages to simplify operations * Distinguish more cases for watched / ignored pages to improve UI * Provide implementation for REST API for watching pages * Improve WatchEntitiesManager API to support more operations * Improve WatchedEntityReference API to use UserReference * Provide a dedicated page to handle watch settings * Start writing javascript code to handle choices * Fix issue in WatchedEntitiesManager * Start providing doc / fixing checkstyle * Handle a bit more actions in UI * Fix a bug in state computer related to the fact that the scoe filter hierarchy is not really a hierarchy * Provide a new API to allow computing the reference of the immediate ancestor of a page for which a filter exists * Improve UI to base possible actions on multiple criteria: current watch status, presence or not of a filter on an ancestor, and check if the page is terminal or not * Encode all options for the watch settings modal * Change the URL scheme for the REST API * Minor improvments * Provide test for notification rest module * Fix checkstyle * Put revapi ignores * Start fixing since * Provide translations and improve UIX code * Provide page object and fix integration tests * Ensure to not display the watch status for guest * Fix a few since and some problems in UIX * Fix API of WatchedUserReference * Fix bad escaping * Better exception handling for creating references * Various improvments in translations (active voice + use of ignore) * Improve a bit the UI * Improve UI when a page is ignored/followed by an ancestor and check proper rights * Review available options and improve javascript to allow chaining operations: following space when the page is followed implies to first unfollow the page to not keep unnecessary filters and mess up the UI * Improve translations * Clean up some unnecessary code * Make the UI a bit more clear * Fix some stuff after rebsae * Slightly improve UX * Fix missing unstable * Fix bad deprecated API call To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications