From e33aed1a37cdc848d792ab1139d2bf184f80ee72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2026 07:20:47 +0000 Subject: [PATCH 1/2] build(deps): bump datatables.net-bs5 in /storm-webapp Bumps [datatables.net-bs5](https://github.com/DataTables/DataTablesSrc) from 2.3.8 to 3.0.0. - [Release notes](https://github.com/DataTables/DataTablesSrc/releases) - [Commits](https://github.com/DataTables/DataTablesSrc/compare/2.3.8...3.0.0) --- updated-dependencies: - dependency-name: datatables.net-bs5 dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- storm-webapp/package-lock.json | 20 +++++--------------- storm-webapp/package.json | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/storm-webapp/package-lock.json b/storm-webapp/package-lock.json index 412b4937e0..bb006e6390 100644 --- a/storm-webapp/package-lock.json +++ b/storm-webapp/package-lock.json @@ -13,7 +13,7 @@ "cytoscape-dagre": "4.0.0", "dagre": "0.8.5", "datatables.net": "3.0.0", - "datatables.net-bs5": "2.3.8", + "datatables.net-bs5": "3.0.0", "datatables.net-dt": "3.0.0", "domurl": "2.3.4", "esprima": "4.0.1", @@ -1819,22 +1819,12 @@ "license": "MIT" }, "node_modules/datatables.net-bs5": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-2.3.8.tgz", - "integrity": "sha512-TbFH99QSWm93Kn3teHLFKeyOqYbaiddlHvRFdXUwAvh/fjTMhACWmHG+I43ss8d23OEFHV0WIbN4lpPusZm5zw==", - "license": "MIT", - "dependencies": { - "datatables.net": "2.3.8", - "jquery": ">=1.7" - } - }, - "node_modules/datatables.net-bs5/node_modules/datatables.net": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.3.8.tgz", - "integrity": "sha512-uhViowhlDlheAuo5a8TrkQqADsjrtGeOyvrigvr4t0+K3MyAWqClORXWAYIcN9VLX6iIX0C8O9gwJNd01hITRg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-3.0.0.tgz", + "integrity": "sha512-GkvSGsYfhO4lmaM1uyDOCNK5UY1VTr93km5Z6+t0iGM1l1PU4DGrjxFdFB+N5eTKRgGWvRsNng92sdIUfmkTsw==", "license": "MIT", "dependencies": { - "jquery": ">=1.7" + "datatables.net": "3.0.0" } }, "node_modules/datatables.net-dt": { diff --git a/storm-webapp/package.json b/storm-webapp/package.json index d13d514992..eff3a5fff1 100644 --- a/storm-webapp/package.json +++ b/storm-webapp/package.json @@ -18,7 +18,7 @@ "dagre": "0.8.5", "datatables.net": "3.0.0", "datatables.net-dt": "3.0.0", - "datatables.net-bs5": "2.3.8", + "datatables.net-bs5": "3.0.0", "domurl": "2.3.4", "esprima": "4.0.1", "jquery": "4.0.0", From 4a48cb33994fbc3b01114fbae1a87598f324c986 Mon Sep 17 00:00:00 2001 From: Rui Abreu Date: Tue, 4 Aug 2026 22:44:23 +0100 Subject: [PATCH 2/2] fix(ui): use tableId in DataTables 3.0 state callbacks DataTables 3.0.0 renamed the settings property sTableId to tableId, so the state save/load callbacks in topology.html and component.html were reading .concat on undefined and crashing table rendering. --- .../java/org/apache/storm/daemon/ui/WEB-INF/component.html | 4 ++-- .../java/org/apache/storm/daemon/ui/WEB-INF/topology.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/component.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/component.html index 1a3b95ddb7..7bd80e224f 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/component.html +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/component.html @@ -145,10 +145,10 @@ $.extend( $.fn.dataTable.defaults, { stateSave: true, stateSaveCallback: function (oSettings, oData) { - sessionStorage.setItem( oSettings.sTableId.concat(tableStateKey), JSON.stringify(oData) ); + sessionStorage.setItem( oSettings.tableId.concat(tableStateKey), JSON.stringify(oData) ); }, stateLoadCallback: function (oSettings) { - return JSON.parse( sessionStorage.getItem(oSettings.sTableId.concat(tableStateKey)) ); + return JSON.parse( sessionStorage.getItem(oSettings.tableId.concat(tableStateKey)) ); }, lengthMenu: [[20,40,60,100,-1], [20, 40, 60, 100, "All"]], pageLength: response["ui.pagination"] diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/topology.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/topology.html index 3dfb2c32ad..08ef788974 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/topology.html +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/topology.html @@ -266,10 +266,10 @@

Topology resources

$.extend( $.fn.dataTable.defaults, { stateSave: true, stateSaveCallback: function (oSettings, oData) { - sessionStorage.setItem( oSettings.sTableId.concat(tableStateKey), JSON.stringify(oData) ); + sessionStorage.setItem( oSettings.tableId.concat(tableStateKey), JSON.stringify(oData) ); }, stateLoadCallback: function (oSettings) { - return JSON.parse( sessionStorage.getItem(oSettings.sTableId.concat(tableStateKey)) ); + return JSON.parse( sessionStorage.getItem(oSettings.tableId.concat(tableStateKey)) ); }, lengthMenu: [[20,40,60,100,-1], [20, 40, 60, 100, "All"]], pageLength: response["ui.pagination"]