This is an automated email from the ASF dual-hosted git repository.
yao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 04725ee71ca7 [SPARK-49470][UI] Update dataTables stylesheets and
javascripts from 1.13.5 to 1.13.11
04725ee71ca7 is described below
commit 04725ee71ca738da1184d772dba8ac6ff3129b5d
Author: Kent Yao <[email protected]>
AuthorDate: Tue Sep 3 15:32:48 2024 +0800
[SPARK-49470][UI] Update dataTables stylesheets and javascripts from 1.13.5
to 1.13.11
### What changes were proposed in this pull request?
This PR updates datatables from 1.13.5 to 1.13.11
FYI, https://cdn.datatables.net/releases.html
### Why are the changes needed?
Improve UI dependency management
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
Locally Build and Test
### Was this patch authored or co-authored using generative AI tooling?
no
Closes #47938 from yaooqinn/SPARK-49470.
Authored-by: Kent Yao <[email protected]>
Signed-off-by: Kent Yao <[email protected]>
---
.../apache/spark/ui/static/dataTables.bootstrap4.1.13.5.min.css | 1 -
.../org/apache/spark/ui/static/dataTables.bootstrap4.min.css | 1 +
...les.bootstrap4.1.13.5.min.js => dataTables.bootstrap4.min.js} | 2 +-
.../org/apache/spark/ui/static/jquery.dataTables.1.13.5.min.js | 4 ----
.../org/apache/spark/ui/static/jquery.dataTables.min.css | 1 +
.../org/apache/spark/ui/static/jquery.dataTables.min.js | 4 ++++
core/src/main/scala/org/apache/spark/ui/UIUtils.scala | 9 ++++++---
dev/.rat-excludes | 7 ++++---
8 files changed, 17 insertions(+), 12 deletions(-)
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.5.min.css
b/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.5.min.css
deleted file mode 100644
index 6db36f6e75d3..000000000000
---
a/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.5.min.css
+++ /dev/null
@@ -1 +0,0 @@
-:root{--dt-row-selected: 2, 117, 216;--dt-row-selected-text: 255, 255,
255;--dt-row-selected-link: 9, 10, 11;--dt-row-stripe: 0, 0, 0;--dt-row-hover:
0, 0, 0;--dt-column-ordering: 0, 0, 0;--dt-html-background:
white}:root.dark{--dt-html-background: rgb(33, 37, 41)}table.dataTable
td.dt-control{text-align:center;cursor:pointer}table.dataTable
td.dt-control:before{display:inline-block;color:rgba(0, 0, 0,
0.5);content:"►"}table.dataTable tr.dt-hasChild
td.dt-control:before{content:"▼"}html. [...]
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.min.css
b/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.min.css
new file mode 100644
index 000000000000..d344f78a3974
--- /dev/null
+++
b/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.min.css
@@ -0,0 +1 @@
+:root{--dt-row-selected: 2, 117, 216;--dt-row-selected-text: 255, 255,
255;--dt-row-selected-link: 9, 10, 11;--dt-row-stripe: 0, 0, 0;--dt-row-hover:
0, 0, 0;--dt-column-ordering: 0, 0, 0;--dt-html-background:
white}:root.dark{--dt-html-background: rgb(33, 37, 41)}table.dataTable
td.dt-control{text-align:center;cursor:pointer}table.dataTable
td.dt-control:before{display:inline-block;color:rgba(0, 0, 0,
0.5);content:"▶"}table.dataTable tr.dt-hasChild
td.dt-control:before{content:"▼"}html. [...]
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.5.min.js
b/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.min.js
similarity index 83%
rename from
core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.5.min.js
rename to
core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.min.js
index 04de9c97cc51..c99016713ab1 100644
---
a/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.5.min.js
+++
b/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.min.js
@@ -1,4 +1,4 @@
/*! DataTables Bootstrap 4 integration
* ©2011-2017 SpryMedia Ltd - datatables.net/license
*/
-!function(t){var n,o;"function"==typeof
define&&define.amd?define(["jquery","datatables.net"],function(e){return
t(e,window,document)}):"object"==typeof
exports?(n=require("jquery"),o=function(e,a){a.fn.dataTable||require("datatables.net")(e,a)},"undefined"==typeof
window?module.exports=function(e,a){return
e=e||window,a=a||n(e),o(e,a),t(a,0,e.document)}:(o(window,n),module.exports=t(n,window,window.document))):t(jQuery,window,document)}(function(x,e,n,o){"use
strict";var r=x.fn.dataTabl [...]
\ No newline at end of file
+!function(t){var n,o;"function"==typeof
define&&define.amd?define(["jquery","datatables.net"],function(e){return
t(e,window,document)}):"object"==typeof
exports?(n=require("jquery"),o=function(e,a){a.fn.dataTable||require("datatables.net")(e,a)},"undefined"==typeof
window?module.exports=function(e,a){return
e=e||window,a=a||n(e),o(e,a),t(a,0,e.document)}:(o(window,n),module.exports=t(n,window,window.document))):t(jQuery,window,document)}(function(x,e,n,o){"use
strict";var r=x.fn.dataTabl [...]
\ No newline at end of file
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.1.13.5.min.js
b/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.1.13.5.min.js
deleted file mode 100644
index e71f4cd8ec92..000000000000
---
a/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.1.13.5.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! DataTables 1.13.5
- * ©2008-2023 SpryMedia Ltd - datatables.net/license
- */
-!function(n){"use strict";var a;"function"==typeof
define&&define.amd?define(["jquery"],function(t){return
n(t,window,document)}):"object"==typeof
exports?(a=require("jquery"),"undefined"!=typeof
window?module.exports=function(t,e){return
t=t||window,e=e||a(t),n(e,t,t.document)}:n(a,window,window.document)):window.DataTable=n(jQuery,window,document)}(function(P,j,y,H){"use
strict";function d(t){var
e=parseInt(t,10);return!isNaN(e)&&isFinite(t)?e:null}function l(t,e,n){var
a=typeof t,r="s [...]
\ No newline at end of file
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.min.css
b/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.min.css
new file mode 100644
index 000000000000..6d9f1754cd73
--- /dev/null
+++
b/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.min.css
@@ -0,0 +1 @@
+:root{--dt-row-selected: 13, 110, 253;--dt-row-selected-text: 255, 255,
255;--dt-row-selected-link: 9, 10, 11;--dt-row-stripe: 0, 0, 0;--dt-row-hover:
0, 0, 0;--dt-column-ordering: 0, 0, 0;--dt-html-background:
white}:root.dark{--dt-html-background: rgb(33, 37, 41)}table.dataTable
td.dt-control{text-align:center;cursor:pointer}table.dataTable
td.dt-control:before{display:inline-block;color:rgba(0, 0, 0,
0.5);content:"▶"}table.dataTable tr.dt-hasChild
td.dt-control:before{content:"▼"}html [...]
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.min.js
b/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.min.js
new file mode 100644
index 000000000000..b706c55328aa
--- /dev/null
+++
b/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.min.js
@@ -0,0 +1,4 @@
+/*! DataTables 1.13.11
+ * ©2008-2024 SpryMedia Ltd - datatables.net/license
+ */
+!function(n){"use strict";var a;"function"==typeof
define&&define.amd?define(["jquery"],function(t){return
n(t,window,document)}):"object"==typeof
exports?(a=require("jquery"),"undefined"==typeof
window?module.exports=function(t,e){return
t=t||window,e=e||a(t),n(e,t,t.document)}:module.exports=n(a,window,window.document)):window.DataTable=n(jQuery,window,document)}(function(P,j,v,H){"use
strict";function d(t){var
e=parseInt(t,10);return!isNaN(e)&&isFinite(t)?e:null}function l(t,e,n){var
[...]
\ No newline at end of file
diff --git a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
index c7e375849278..c3dc459b0f88 100644
--- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
@@ -236,14 +236,17 @@ private[spark] object UIUtils extends Logging {
def dataTablesHeaderNodes(request: HttpServletRequest): Seq[Node] = {
<link rel="stylesheet"
- href={prependBaseUri(request,
"/static/dataTables.bootstrap4.1.13.5.min.css")}
+ href={prependBaseUri(request,
"/static/dataTables.bootstrap4.min.css")}
+ type="text/css"/>
+ <link rel="stylesheet"
+ href={prependBaseUri(request, "/static/jquery.dataTables.min.css")}
type="text/css"/>
<link rel="stylesheet"
href={prependBaseUri(request, "/static/webui-dataTables.css")}
type="text/css"/>
- <script src={prependBaseUri(request,
"/static/jquery.dataTables.1.13.5.min.js")}></script>
+ <script src={prependBaseUri(request,
"/static/jquery.dataTables.min.js")}></script>
<script src={prependBaseUri(request,
"/static/jquery.cookies.2.2.0.min.js")}></script>
<script src={prependBaseUri(request,
"/static/jquery.blockUI.min.js")}></script>
- <script src={prependBaseUri(request,
"/static/dataTables.bootstrap4.1.13.5.min.js")}></script>
+ <script src={prependBaseUri(request,
"/static/dataTables.bootstrap4.min.js")}></script>
<script src={prependBaseUri(request,
"/static/jquery.mustache.js")}></script>
}
diff --git a/dev/.rat-excludes b/dev/.rat-excludes
index 8bad50951a78..f38fd7e2012a 100644
--- a/dev/.rat-excludes
+++ b/dev/.rat-excludes
@@ -31,12 +31,13 @@ graphlib-dot.min.js
sorttable.js
vis-timeline-graph2d.min.js
vis-timeline-graph2d.min.css
-dataTables.bootstrap4.*.min.css
-dataTables.bootstrap4.*.min.js
+dataTables.bootstrap4.min.css
+dataTables.bootstrap4.min.js
dataTables.rowsGroup.js
jquery.blockUI.min.js
jquery.cookies.2.2.0.min.js
-jquery.dataTables.*.min.js
+jquery.dataTables.min.css
+jquery.dataTables.min.js
jquery.mustache.js
.*\.avsc
.*\.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
