This is an automated email from the ASF dual-hosted git repository.
yao pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new a8e2977fd9b [SPARK-44510][UI] Update dataTables to 1.13.5 and remove
some unreached png files
a8e2977fd9b is described below
commit a8e2977fd9b6e3224b014e0b0572a4d7b83c1106
Author: Kent Yao <y...@apache.org>
AuthorDate: Sat Jul 22 13:11:04 2023 +0800
[SPARK-44510][UI] Update dataTables to 1.13.5 and remove some unreached png
files
### What changes were proposed in this pull request?
This PR updates datatables from 1.13.2 to 1.13.5, related license files,
and removes some pictures for sorting orientation but unused.
FYI, https://cdn.datatables.net/releases.html
### Why are the changes needed?
updating web resources and cleanup
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
built and tested locally
Closes #42108 from yaooqinn/SPARK-44510.
Authored-by: Kent Yao <y...@apache.org>
Signed-off-by: Kent Yao <y...@apache.org>
(cherry picked from commit 6409284963d6c5edecc374db4027dee7f6f490c1)
Signed-off-by: Kent Yao <y...@apache.org>
---
.../ui/static/dataTables.bootstrap4.1.13.2.min.css | 1 -
.../ui/static/dataTables.bootstrap4.1.13.2.min.js | 4 ----
.../ui/static/dataTables.bootstrap4.1.13.5.min.css | 1 +
.../ui/static/dataTables.bootstrap4.1.13.5.min.js | 4 ++++
.../org/apache/spark/ui/static/images/sort_asc.png | Bin 160 -> 0 bytes
.../spark/ui/static/images/sort_asc_disabled.png | Bin 148 -> 0 bytes
.../apache/spark/ui/static/images/sort_both.png | Bin 201 -> 0 bytes
.../apache/spark/ui/static/images/sort_desc.png | Bin 158 -> 0 bytes
.../spark/ui/static/images/sort_desc_disabled.png | Bin 146 -> 0 bytes
.../ui/static/jquery.dataTables.1.13.2.min.js | 4 ----
.../ui/static/jquery.dataTables.1.13.5.min.js | 4 ++++
.../main/scala/org/apache/spark/ui/UIUtils.scala | 6 ++---
dev/.rat-excludes | 6 ++---
licenses-binary/LICENSE-datatables.txt | 25 +++++++++++++++++----
licenses/LICENSE-datatables.txt | 25 +++++++++++++++++----
15 files changed, 57 insertions(+), 23 deletions(-)
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.2.min.css
b/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.2.min.css
deleted file mode 100644
index b9c16ca78a0..00000000000
---
a/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.2.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}table.dataTable
td.dt-control{text-align:center;cursor:pointer}table.dataTable
td.dt-control:before{height:1em;width:1em;margin-top:-9px;display:inline-block;color:white;border:.15em
solid white;border-radius:1em;box-shadow:0 0 .2em
#444;box-sizing:content-box;text-align:center;text-indent:0
!important;font-family:"Courier
New",Courier,monospace;line-height:1em;content:"+";backgro [...]
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.2.min.js
b/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.2.min.js
deleted file mode 100644
index 2937bc3c90c..00000000000
---
a/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.2.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! DataTables Bootstrap 4 integration
- * ©2011-2017 SpryMedia Ltd - datatables.net/license
- */
-!function(t){"function"==typeof
define&&define.amd?define(["jquery","datatables.net"],function(e){return
t(e,window,document)}):"object"==typeof
exports?module.exports=function(e,a){return
e=e||window,(a=a||("undefined"!=typeof
window?require("jquery"):require("jquery")(e))).fn.dataTable||require("datatables.net")(e,a),t(a,0,e.document)}:t(jQuery,window,document)}(function(x,e,n,r){"use
strict";var s=x.fn.dataTable;return
x.extend(!0,s.defaults,{dom:"<'row'<'col-sm-12 col-md-6'l><'col-sm [...]
\ No newline at end of file
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
new file mode 100644
index 00000000000..6db36f6e75d
--- /dev/null
+++
b/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.5.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.1.13.5.min.js
new file mode 100644
index 00000000000..04de9c97cc5
--- /dev/null
+++
b/core/src/main/resources/org/apache/spark/ui/static/dataTables.bootstrap4.1.13.5.min.js
@@ -0,0 +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
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/images/sort_asc.png
b/core/src/main/resources/org/apache/spark/ui/static/images/sort_asc.png
deleted file mode 100644
index e1ba61a8055..00000000000
Binary files
a/core/src/main/resources/org/apache/spark/ui/static/images/sort_asc.png and
/dev/null differ
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/images/sort_asc_disabled.png
b/core/src/main/resources/org/apache/spark/ui/static/images/sort_asc_disabled.png
deleted file mode 100644
index fb11dfe24a6..00000000000
Binary files
a/core/src/main/resources/org/apache/spark/ui/static/images/sort_asc_disabled.png
and /dev/null differ
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/images/sort_both.png
b/core/src/main/resources/org/apache/spark/ui/static/images/sort_both.png
deleted file mode 100644
index af5bc7c5a10..00000000000
Binary files
a/core/src/main/resources/org/apache/spark/ui/static/images/sort_both.png and
/dev/null differ
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/images/sort_desc.png
b/core/src/main/resources/org/apache/spark/ui/static/images/sort_desc.png
deleted file mode 100644
index 0e156deb5f6..00000000000
Binary files
a/core/src/main/resources/org/apache/spark/ui/static/images/sort_desc.png and
/dev/null differ
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/images/sort_desc_disabled.png
b/core/src/main/resources/org/apache/spark/ui/static/images/sort_desc_disabled.png
deleted file mode 100644
index c9fdd8a1502..00000000000
Binary files
a/core/src/main/resources/org/apache/spark/ui/static/images/sort_desc_disabled.png
and /dev/null differ
diff --git
a/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.1.13.2.min.js
b/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.1.13.2.min.js
deleted file mode 100644
index 6378c6f7736..00000000000
---
a/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.1.13.2.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! DataTables 1.13.2
- * ©2008-2023 SpryMedia Ltd - datatables.net/license
- */
-!function(n){"use strict";"function"==typeof
define&&define.amd?define(["jquery"],function(t){return
n(t,window,document)}):"object"==typeof
exports?module.exports=function(t,e){return
t=t||window,e=e||("undefined"!=typeof
window?require("jquery"):require("jquery")(t)),n(e,t,t.document)}:window.DataTable=n(jQuery,window,document)}(function(P,j,y,N){"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="string"==a;return"num [...]
\ 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
new file mode 100644
index 00000000000..e71f4cd8ec9
--- /dev/null
+++
b/core/src/main/resources/org/apache/spark/ui/static/jquery.dataTables.1.13.5.min.js
@@ -0,0 +1,4 @@
+/*! 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/scala/org/apache/spark/ui/UIUtils.scala
b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
index f0f8cf1310f..2921e5b01e0 100644
--- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
@@ -256,16 +256,16 @@ private[spark] object UIUtils extends Logging {
def dataTablesHeaderNodes(request: HttpServletRequest): Seq[Node] = {
<link rel="stylesheet"
- href={prependBaseUri(request,
"/static/dataTables.bootstrap4.1.13.2.min.css")}
+ href={prependBaseUri(request,
"/static/dataTables.bootstrap4.1.13.5.min.css")}
type="text/css"/>
<link rel="stylesheet"
href={prependBaseUri(request, "/static/jsonFormatter.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.2.min.js")}></script>
+ <script src={prependBaseUri(request,
"/static/jquery.dataTables.1.13.5.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.2.min.js")}></script>
+ <script src={prependBaseUri(request,
"/static/dataTables.bootstrap4.1.13.5.min.js")}></script>
<script src={prependBaseUri(request,
"/static/jsonFormatter.min.js")}></script>
<script src={prependBaseUri(request,
"/static/jquery.mustache.js")}></script>
}
diff --git a/dev/.rat-excludes b/dev/.rat-excludes
index 15ddfddd0e8..4bd41fac11e 100644
--- a/dev/.rat-excludes
+++ b/dev/.rat-excludes
@@ -35,12 +35,12 @@ vis-timeline-graph2d.min.js
vis-timeline-graph2d.min.js.map
vis-timeline-graph2d.min.css
vis-timeline-graph2d.min.css.map
-dataTables.bootstrap4.1.13.2.min.css
-dataTables.bootstrap4.1.13.2.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.1.13.2.min.js
+jquery.dataTables.*.min.js
jquery.mustache.js
jsonFormatter.min.css
jsonFormatter.min.js
diff --git a/licenses-binary/LICENSE-datatables.txt
b/licenses-binary/LICENSE-datatables.txt
index d1fac3bfb14..868a993191a 100644
--- a/licenses-binary/LICENSE-datatables.txt
+++ b/licenses-binary/LICENSE-datatables.txt
@@ -1,7 +1,24 @@
-Copyright (C) 2008-2020, SpryMedia Ltd.
+DataTables | MIT license
+DataTables is available under the MIT license. In short, this means that you
are free to use
+DataTables as you wish, including modifying and redistributing the code, as
long as the original
+copyright notice is retained.
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+MIT license
+Copyright (C) 2008-2023, SpryMedia Ltd.
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and
+associated documentation files (the "Software"), to deal in the Software
without restriction,
+including without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software
is furnished to do
+so, subject to the following conditions:
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/licenses/LICENSE-datatables.txt b/licenses/LICENSE-datatables.txt
index 35b8e139fb0..868a993191a 100644
--- a/licenses/LICENSE-datatables.txt
+++ b/licenses/LICENSE-datatables.txt
@@ -1,7 +1,24 @@
-Copyright (C) 2008-2020, SpryMedia Ltd.
+DataTables | MIT license
+DataTables is available under the MIT license. In short, this means that you
are free to use
+DataTables as you wish, including modifying and redistributing the code, as
long as the original
+copyright notice is retained.
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+MIT license
+Copyright (C) 2008-2023, SpryMedia Ltd.
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and
+associated documentation files (the "Software"), to deal in the Software
without restriction,
+including without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software
is furnished to do
+so, subject to the following conditions:
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
\ No newline at end of file
+The above copyright notice and this permission notice shall be included in all
copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
