XWIKI-18998: Replace the Livetable of the System Filters of the Notif…

…ications Administration with a Live Data macro
xwiki · Jan 31, 2024 · c074b81 · c074b81
1 parent 32a24e0
commit c074b81
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -119,9 +119,6 @@
     <oracle.groupId>com.oracle.database.jdbc</oracle.groupId>
     <oracle.artifactId>ojdbc11</oracle.artifactId>
     <oracle.version>21.11.0.0</oracle.version>
-
-    <!-- Vue JS -->
-    <vue.version>2.7.16</vue.version>
   </properties>
   <scm>
     <connection>scm:git:git://github.com/xwiki/xwiki-platform.git</connection>
@@ -1173,7 +1170,7 @@
       <dependency>
         <groupId>org.webjars.npm</groupId>
         <artifactId>vue</artifactId>
-        <version>${vue.version}</version>
+        <version>2.7.16</version>
         <exclusions>
           <!-- Excluded because this dependency is 1) not used at runtime since all out components are pre-compiled 2) 
           not currently deployable on webjars.org (see https://github.com/webjars/webjars/issues/1976)  -->

diff --git a/...rc/main/resources/XWiki/Notifications/Code/NotificationsSystemFiltersPreferencesMacro.xml b/...rc/main/resources/XWiki/Notifications/Code/NotificationsSystemFiltersPreferencesMacro.xml
@@ -598,7 +598,6 @@ path=$services.webjars.url('org.xwiki.platform:xwiki-platform-notifications-webj
   &lt;/div&gt;
 &lt;/div&gt;
 {{/html}}
-#set($properties  = ['name', 'filterType', 'notificationFormats', 'isEnabled'])
 #set ($sourceParameters = {
   'translationPrefix': 'notifications.settings.filters.preferences.system.table.',
   'resultPage': 'XWiki.Notifications.Code.NotificationFilterPreferenceLivetableResults',
@@ -624,11 +623,12 @@ path=$services.webjars.url('org.xwiki.platform:xwiki-platform-notifications-webj
 #set ($description = 
     $services.localization.render('notifications.settings.filters.preferences.system.table.description'))
 #set ($description = $services.rendering.escape($description, 'xwiki/2.1'))
+#set ($sourceParameters = $services.rendering.escape($escapetool.url($sourceParameters), 'xwiki/2.1'))
 {{liveData
   id='notificationSystemFilterPreferencesLiveData'
-  properties="$stringtool.join($properties, ',')"
+  properties="name,filterType,notificationFormats,isEnabled"
   source='liveTable'
-  sourceParameters="$escapetool.url($sourceParameters)"
+  sourceParameters="$sourceParameters"
   limit='10'
   description="$description"
 }}$jsontool.serialize($liveDataConfig){{/liveData}}

diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/pom.xml
@@ -40,7 +40,6 @@
     <dependency>
       <groupId>org.webjars.npm</groupId>
       <artifactId>vue</artifactId>
-<!--      <version>${vue.version}</version>-->
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -96,7 +95,6 @@
               </resources>
             </configuration>
           </execution>
-
         </executions>
       </plugin>
       <!-- Skip jsHint because we use ESLint through the frontend-maven-plugin -->