Merge pull request #424 from jenkinsci/dependabot/npm_and_yarn/datata…

…bles.net-2.0.0 Bump datatables.net from 1.13.8 to 2.0.0
jenkinsci · Mar 6, 2024 · 31b3743 · 31b3743
2 parents 6b9a3c0 + c500df1
commit 31b3743
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -1,21 +1,21 @@
 {
   "name": "data-tables-api",
-  "version": "1.13.8",
+  "version": "2.0.1",
   "description": "JQuery DataTables Jenkins Plugin",
   "directories": {
     "doc": "doc"
   },
   "dependencies": {
-    "datatables.net": "1.13.8",
-    "datatables.net-bs5": "1.13.8",
-    "datatables.net-buttons": "2.4.3",
-    "datatables.net-buttons-bs5": "2.4.3",
-    "datatables.net-colreorder": "1.7.2",
-    "datatables.net-colreorder-bs5": "1.7.2",
-    "datatables.net-responsive": "2.5.1",
-    "datatables.net-responsive-bs5": "2.5.1",
-    "datatables.net-select": "1.7.1",
-    "datatables.net-select-bs5": "1.7.1",
+    "datatables.net": "2.0.1",
+    "datatables.net-bs5": "2.0.1",
+    "datatables.net-buttons": "3.0.0",
+    "datatables.net-buttons-bs5": "3.0.0",
+    "datatables.net-colreorder": "2.0.0",
+    "datatables.net-colreorder-bs5": "2.0.0",
+    "datatables.net-responsive": "3.0.0",
+    "datatables.net-responsive-bs5": "3.0.0",
+    "datatables.net-select": "2.0.0",
+    "datatables.net-select-bs5": "2.0.0",
     "datatables.mark.js": "2.1.0",
     "mark.js": "8.11.1",
     "luxon": "3.4.4"

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
   <url>https://github.com/jenkinsci/data-tables-api-plugin</url>
 
   <properties>
-    <revision>1.13.8-5</revision>
+    <revision>2.0.1-1</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <module.name>${project.groupId}.datatables</module.name>
@@ -135,42 +135,72 @@
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net/js</directory>
                   <filtering>false</filtering>
+                  <excludes>
+                    <exclude>*mjs*</exclude>
+                  </excludes>
                 </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net-bs5/js</directory>
                   <filtering>false</filtering>
+                  <excludes>
+                    <exclude>*mjs*</exclude>
+                  </excludes>
                 </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net-buttons/js</directory>
                   <filtering>false</filtering>
+                  <excludes>
+                    <exclude>*mjs*</exclude>
+                  </excludes>
                 </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net-buttons-bs5/js</directory>
                   <filtering>false</filtering>
+                  <excludes>
+                    <exclude>*mjs*</exclude>
+                  </excludes>
                 </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net-colreorder/js</directory>
                   <filtering>false</filtering>
+                  <excludes>
+                    <exclude>*mjs*</exclude>
+                  </excludes>
                 </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net-colreorder-bs5/js</directory>
                   <filtering>false</filtering>
+                  <excludes>
+                    <exclude>*mjs*</exclude>
+                  </excludes>
                 </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net-responsive/js</directory>
                   <filtering>false</filtering>
+                  <excludes>
+                    <exclude>*mjs*</exclude>
+                  </excludes>
                 </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net-responsive-bs5/js</directory>
                   <filtering>false</filtering>
+                  <excludes>
+                    <exclude>*mjs*</exclude>
+                  </excludes>
                 </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net-select/js</directory>
                   <filtering>false</filtering>
+                  <excludes>
+                    <exclude>*mjs*</exclude>
+                  </excludes>
                 </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net-select-bs5/js</directory>
                   <filtering>false</filtering>
+                  <excludes>
+                    <exclude>*mjs*</exclude>
+                  </excludes>
                 </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.mark.js/dist</directory>

diff --git a/src/main/resources/data-tables/table.jelly b/src/main/resources/data-tables/table.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define">
   <st:documentation>
     Renders a JQuery DataTables instance. The table data is loaded asynchronously from the associated view using
     an Ajax call. In order to correctly connect the jelly view with the Jenkins ModelObject via a Stapler proxy
@@ -36,8 +36,9 @@
     <j:if test="${model.tableConfiguration.useButtons}">
       <div class="table-buttons-container clearfix"/>
     </j:if>
-    <table class="table table-hover table-striped data-table dt-responsive nowrap ${class}"
-           data-columns-definition="${model.columnsDefinition}" id="${model.id}"
+    <table class="table table-hover data-table dt-responsive nowrap ${class}"
+           data-columns-definition="${model.columnsDefinition}"
+           id="${model.id}"
            data-table-configuration="${model.tableConfigurationDefinition}"
            style="width: 100%;">
       <thead>
@@ -48,6 +49,9 @@
         </tr>
       </thead>
     </table>
+    <div id="toolbar-${model.id}" class="table-toolbar">
+      <d:invokeBody />
+    </div>
   </div>
 
   <st:bind var="tableDataProxy" value="${it}" />

diff --git a/src/main/resources/io/jenkins/plugins/data-tables.jelly b/src/main/resources/io/jenkins/plugins/data-tables.jelly
@@ -13,7 +13,7 @@ Use it like <st:adjunct includes="io.jenkins.plugins.data-tables"/>
   <link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/dataTables.bootstrap5.min.css"/>
   <link type="text/css" rel="stylesheet" href="${resURL}/plugin/data-tables-api/css/jenkins-style.css"/>
 
-  <script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/jquery.dataTables.min.js"/>
+  <script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/dataTables.min.js"/>
   <script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/dataTables.bootstrap5.min.js"/>
   <script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/datatables.mark.min.js"/>
   <script type="text/javascript" src="${resURL}/plugin/data-tables-api/js/jquery.mark.min.js"/>

diff --git a/src/main/webapp/css/jenkins-style.css b/src/main/webapp/css/jenkins-style.css
@@ -1,3 +1,29 @@
+table {
+    border-collapse:collapse;
+}
+
+tr {
+    border-bottom: 1pt solid var(--bs-table-border-color);
+}
+
+tr.dt-hasChild {
+    border-bottom: 0;
+}
+
+tr:last-child {
+    border-bottom: .5pt solid var(--medium-grey);
+}
+
+/* Add rounded border for table header hover */
+table.dataTable thead > tr > th.dt-orderable-asc:hover,
+table.dataTable thead > tr > th.dt-orderable-desc:hover,
+table.dataTable thead > tr > td.dt-orderable-asc:hover,
+table.dataTable thead > tr > td.dt-orderable-desc:hover {
+    outline: 1.5px solid var(--bs-table-border-color);
+    outline-offset: -5px;
+    border-radius: 10px;
+}
+
 th.sorting, th.no-sort, th.nosort {
     color: var(--text-color);
     background: var(--background);

diff --git a/src/main/webapp/js/table.js b/src/main/webapp/js/table.js
@@ -8,7 +8,24 @@ jQuery3(document).ready(function () {
          * Creates the data table instance for the specified table element.
          */
         function createDataTable(table) {
+            const toolbar = $(table).next();
+            let toolbarContent;
+            let bottom;
+            if (toolbar.length && toolbar.children().length > 0) {
+                toolbarContent = toolbar;
+                bottom = ['pageLength', 'info'];
+            }
+            else {
+                toolbarContent = 'pageLength';
+                bottom = 'info';
+            }
             const defaultConfiguration = {
+                layout: {
+                    topStart: toolbarContent,
+                    topEnd: 'search',
+                    bottomStart: bottom,
+                    bottomEnd: 'paging'
+                },
                 stateSave: true,
                 language: {
                     emptyTable: 'Loading - please wait ...'