XWIKI-14713: Watch UI in Notifications area is not taking into account the event statuses.

* Fix the Watchlist Bridge
* Clean the UI

xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watchlistbridge/src/main/java/org/xwiki/notifications/filters/watchlistbridge/WatchlistBridgeProvider.java

@@ -43,8 +43,8 @@
 import org.xwiki.notifications.filters.NotificationFilterProperty;
 import org.xwiki.notifications.filters.NotificationFilterType;
 import org.xwiki.notifications.filters.internal.DefaultNotificationFilterPreference;
+import org.xwiki.notifications.filters.internal.scope.ScopeNotificationFilter;
 import org.xwiki.notifications.filters.watch.WatchedEntitiesConfiguration;
-import org.xwiki.notifications.filters.watch.internal.WatchedEntitiesNotificationFilter;
 
 import com.google.common.collect.Sets;
 import com.xpn.xwiki.XWiki;
@@ -148,7 +148,7 @@ private DefaultNotificationFilterPreference createDefaultNotificationFilterPrefe
         pref.setEnabled(true);
         pref.setNotificationFormats(Sets.newHashSet(NotificationFormat.values()));
         pref.setProviderHint(PROVIDER_HINT);
-        pref.setFilterName(WatchedEntitiesNotificationFilter.FILTER_NAME);
+        pref.setFilterName(ScopeNotificationFilter.FILTER_NAME);
         pref.setFilterType(NotificationFilterType.INCLUSIVE);
         pref.setPreferenceProperties(new HashMap<>());
         return pref;

xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.xml

@@ -71,7 +71,7 @@
 notifications.filters.preferences.scopeNotificationFilter.space=Page and children
 notifications.filters.preferences.scopeNotificationFilter.wiki=Wiki
 
-notifications.filters.preferences.allEvents=All events (even disabled)
+notifications.filters.preferences.allEvents=-
 
 notifications.filters.preferences.addPreference.filterType.inclusive=Inclusive
 notifications.filters.preferences.addPreference.filterType.exclusive=Exclusive

xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/notification/filters/watchedEntitiesNotificationFilter.vm

-## Renderer for the watchedEntitiesNotificationFilters
-## Parameters :
-## $filter : the filter to render
-## $filterPreference : the preference to use
-#if ($filterPreference.getProperties('USER'))
-  #template('notification/filters/usersNotificationFilter.vm')
-#end
-#if (!$filterPreference.getProperties('PAGE').isEmpty() || !$filterPreference.getProperties('SPACE').isEmpty() || !$filterPreference.getProperties('WIKI').isEmpty())
-  #template('notification/filters/scopeNotificationFilter.vm')
-#end