From bfc55cff53d8ac46e5be6366702267f2025286ad Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 6 Mar 2024 22:53:41 +0100
Subject: [PATCH] Restyle the tables and inline the new files filter.

With DataTables 2.x it is much easier to style the table toolbar.
The new files toggle is now moved to the tables controls.
---
 plugin/pom.xml                                |  1 +
 .../resources/coverage/coverage-table.jelly   | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/plugin/pom.xml b/plugin/pom.xml
index 5be57c9d..9c1895c7 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -142,6 +142,7 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>data-tables-api</artifactId>
+      <version>2.0.1-1</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
diff --git a/plugin/src/main/resources/coverage/coverage-table.jelly b/plugin/src/main/resources/coverage/coverage-table.jelly
index 6f5ea195..1d458a61 100644
--- a/plugin/src/main/resources/coverage/coverage-table.jelly
+++ b/plugin/src/main/resources/coverage/coverage-table.jelly
@@ -24,18 +24,20 @@
       <j:when test="${it.hasSourceCode()}">
         <div class="col-12 d-xxl-none">
           <bs:card title="${title}" symbol="${symbol}" class="flex-fill h-100" >
-            <j:if test="${showChangedToggle}">
-              <f:toggleSwitch id="changed-${id + '-table'}" title="${%changed.files}" />
-            </j:if>
-            <dt:table model="${it.getTableModel(id + '-table')}"/>
+            <dt:table model="${it.getTableModel(id + '-table')}">
+              <j:if test="${showChangedToggle}">
+                <f:toggleSwitch id="changed-${id + '-table'}" title="${%changed.files}" />
+              </j:if>
+            </dt:table>
           </bs:card>
         </div>
         <div class="col-xxl-6 d-none d-xxl-block">
           <bs:card title="${title}" symbol="${symbol}" class="flex-fill h-100">
-            <j:if test="${showChangedToggle}">
-              <f:toggleSwitch id="changed-${id + '-table-inline'}" title="${%changed.files}" />
-            </j:if>
-            <dt:table model="${it.getTableModel(id + '-table-inline')}"/>
+            <dt:table model="${it.getTableModel(id + '-table-inline')}">
+              <j:if test="${showChangedToggle}">
+                <f:toggleSwitch id="changed-${id + '-table-inline'}" title="${%changed.files}" />
+              </j:if>
+            </dt:table>
           </bs:card>
         </div>
         <div class="col-xxl-6 d-none d-xxl-block">
@@ -66,11 +68,12 @@
       </j:when>
       <j:otherwise>
         <div class="col-12">
-          <j:if test="${showChangedToggle}">
-            <f:toggleSwitch id="changed-${id + '-table'}" title="${%changed.files}" />
-          </j:if>
           <bs:card title="${title}" symbol="${symbol}" class="flex-fill h-100">
-            <dt:table model="${it.getTableModel(id + '-table')}"/>
+            <dt:table model="${it.getTableModel(id + '-table')}">
+              <j:if test="${showChangedToggle}">
+                <f:toggleSwitch id="changed-${id + '-table'}" title="${%changed.files}"/>
+              </j:if>
+            </dt:table>
           </bs:card>
         </div>