Skip to content

Use package manager for 3rd party JS in Storm-UI #8427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reiabreu merged 4 commits into from
Mar 18, 2026
+7,662 −1,717
Merged

Use package manager for 3rd party JS in Storm-UI #8427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cf1952
#7815 - Use package manager for 3rd party JS in Storm-UI
rzo1 Mar 16, 2026
9ba7304
#7815 - Use package manager for 3rd party JS in Storm-UI
rzo1 Mar 16, 2026
31e24df
#7815 - Upgrade Storm UI npm dependencies to latest versions
rzo1 Mar 16, 2026
b2f772e
Apply some fixes in Cypress and Viz, so topology is rendering correctly
rzo1 Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,8 @@ hs_err_pid*

m2
install.txt
install-shade.txt
install-shade.txt

# Frontend build (storm-webapp)
node_modules/
storm-webapp/node/
84 changes: 22 additions & 62 deletions LICENSE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@

-----------------------------------------------------------------------

For jQuery 3.5.1 (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery-3.5.1.min.js)
For jQuery 4.0.0 (bundled via npm package "jquery" into storm-webapp webpack output)

MIT license selected:

Expand All @@ -230,7 +230,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-----------------------------------------------------------------------

For jQuery Cookies 2.2.0 (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.cookies.2.2.0.min.js)
For js-cookie (bundled via npm package "js-cookie" into storm-webapp webpack output;
replaces the former jQuery Cookies 2.2.0 plugin)

Copyright (c) 2005 - 2010, James Auldridge

Expand All @@ -255,7 +256,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-----------------------------------------------------------------------

For typeahead jquery 0.10.5 (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/typeahead.jquery.min.js)
For typeahead.js 0.11.1 (bundled via npm package "typeahead.js" into storm-webapp webpack output)

Copyright (c) 2013-2014 Twitter, Inc

Expand All @@ -279,7 +280,7 @@ THE SOFTWARE.

-----------------------------------------------------------------------

For js-yaml.min.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/js-yaml.min.js)
For js-yaml 4.1.1 (bundled via npm package "js-yaml" into storm-webapp webpack output)

(The MIT License)

Expand All @@ -305,7 +306,7 @@ THE SOFTWARE.

-----------------------------------------------------------------------

For dagre.min.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/dagre.min.js)
For dagre 0.8.5 (bundled via npm package "dagre" into storm-webapp webpack output)

Copyright (c) 2012-2014 Chris Pettitt

Expand All @@ -329,7 +330,8 @@ THE SOFTWARE.

-----------------------------------------------------------------------

For cytoscape.min.js and cytoscape-dagre.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/cytoscape.min.js and storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/cytoscape-dagre.js)
For cytoscape 3.33.1 and cytoscape-dagre 2.5.0 (bundled via npm packages "cytoscape"
and "cytoscape-dagre" into storm-webapp webpack output)

Copyright (c) 2016 The Cytoscape Consortium

Expand All @@ -353,7 +355,7 @@ SOFTWARE.

-----------------------------------------------------------------------

For esprima.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/esprima.min.js)
For esprima 4.0.1 (bundled via npm package "esprima" into storm-webapp webpack output)

Copyright JS Foundation and other contributors, https://js.foundation/

Expand All @@ -379,7 +381,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-----------------------------------------------------------------------

For mustache.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.mustache.js)
For mustache.js 4.2.0 (bundled via npm package "mustache" into storm-webapp webpack output)

The MIT License

Expand All @@ -406,7 +408,7 @@ THE SOFTWARE.

-----------------------------------------------------------------------

For moment.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/moment.min.js)
For moment.js 2.30.1 (bundled via npm package "moment" into storm-webapp webpack output)

Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors

Expand Down Expand Up @@ -434,18 +436,17 @@ OTHER DEALINGS IN THE SOFTWARE.

-----------------------------------------------------------------------

For Jquery url plugin (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/url.min.js)
For domurl 2.3.4 (bundled via npm package "domurl" into storm-webapp webpack output;
replaces the former jQuery URL plugin v1.8.6)

Jquery Url (A Jquery plugin for URL parser) v1.8.6
Source repository: https://github.com/websanova/js-url
Licensed under an MIT-style license. Seehttps://github.com/websanova/js-url#license for details.
Source repository: https://github.com/Mikhus/domurl
Licensed under an MIT-style license. See https://github.com/Mikhus/domurl/blob/master/LICENSE for details.

-----------------------------------------------------------------------


For jquery.blockUI.min.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.blockUI.min.js)
For jQuery BlockUI 2.7.0 (bundled via npm package "jquery-blockui" into storm-webapp webpack output)

jQuery BlockUI; v20131009
http://jquery.malsup.com/block/
Copyright (c) 2013 M. Alsup; Dual licensed: MIT/GPL

Expand All @@ -468,12 +469,8 @@ use the BlockUI plugin in commercial projects as long as the copyright header is

-----------------------------------------------------------------------

For jquery dataTables v1.10.4

(storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.dataTables.1.10.4.min.js
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/jquery.dataTables.1.10.4.min.css
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/images/{{back, forward}_{disabled, enabled, enabled_hover}}.png
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/images/{sort_{asc, asc_disabled, both, desc, desc_disabled}}.png)
For DataTables 2.3.7 (bundled via npm packages "datatables.net" and "datatables.net-dt"
into storm-webapp webpack output)

Copyright (c) 2008-2013 SpryMedia Limited
http://datatables.net
Expand All @@ -498,15 +495,11 @@ THE SOFTWARE.

-----------------------------------------------------------------------

For jquery dataTables bootstrap integration

(storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.dataTables.1.10.4.min.js
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/dataTables.bootstrap.min.js
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/dataTables.bootstrap.css)
For DataTables Bootstrap 3 integration 2.3.7 (bundled via npm package "datatables.net-bs"
into storm-webapp webpack output)

Copyright (c) 2013-2014 SpryMedia Limited
http://datatables.net/license
https://github.com/DataTables/Plugins/tree/master/integration/bootstrap/3

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -529,45 +522,14 @@ THE SOFTWARE.

-----------------------------------------------------------------------

For bootstrap v3.3.1
(storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/bootstrap-3.3.1.min.js
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/bootstrap-3.3.1.min.css)
For Bootstrap 3.3.1 (bundled via npm package "bootstrap" into storm-webapp webpack output)

Bootstrap v3.3.1 (http://getbootstrap.com)
Copyright 2011-2014 Twitter, Inc.
Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

-----------------------------------------------------------------------

For jQuery JSONFormatter 1.0.1 2015-02-28
(storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jsonFormatter.min.js
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/jsonFormatter.min.css)
http://www.jqueryscript.net/other/jQuery-Plugin-For-Pretty-JSON-Formatting-jsonFormatter.htmlA

The MIT License (MIT)

Copyright (c) 2015 Matthew Heironimus

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 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.

-----------------------------------------------------------------------

For statistic image

storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/images/statistic.png
Expand Down Expand Up @@ -607,9 +569,7 @@ This product bundles PMML Sample Files, which are available under a

-----------------------------------------------------------------------

For vis.js 4.16.1 2016-04-18
(storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/vis.min.js
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/vis.min.css)
For vis.js 4.21.0 (bundled via npm package "vis" into storm-webapp webpack output)

vis.js
https://github.com/almende/vis
Expand Down
65 changes: 5 additions & 60 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,68 +263,13 @@
<!-- Used as part of GitHub action build -->
<exclude>install.txt</exclude>
<exclude>storm-shaded-deps/install-shade.txt</exclude>
<!-- the following are in the LICENSE file -->
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.dataTables.1.10.4.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/jquery.dataTables.1.10.4.min.css
</exclude>
<!-- storm-webapp static assets and frontend build artifacts -->
<exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/images/*
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/bootstrap-3.3.1.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/bootstrap-3.3.1.min.css
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/dataTables.bootstrap.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/dataTables.bootstrap.css
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jsonFormatter.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/jsonFormatter.min.css
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery-3.5.1.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.cookies.2.2.0.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/moment.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.blockUI.min.js
</exclude>
<exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/url.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.mustache.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/typeahead.jquery.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/cytoscape-dagre.js
</exclude>
<exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/dagre.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/esprima.min.js
</exclude>
<exclude>
**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/js-yaml.min.js
</exclude>
<exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/vis.min.js
</exclude>
<exclude>**/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/vis.min.css
</exclude>
<!-- npm / webpack artifacts -->
<exclude>**/node_modules/**</exclude>
<exclude>**/package-lock.json</exclude>
<exclude>**/storm-webapp/node/**</exclude>
<exclude>**/src/main/resources/Audit.50.csv</exclude>
<exclude>
**/src/main/resources/KNIME_PMML_4.1_Examples_single_audit_logreg.xml
Expand Down
7 changes: 3 additions & 4 deletions storm-dist/binary/final-package/src/main/assembly/binary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<fileMode>0755</fileMode>
</fileSet>
<!--
Allow for variable substitution for cache busting in HTML files and script.js
Allow for variable substitution for cache busting in HTML files.
See storm-dist/binary/pom.xml for custom variables that will be substituted in.
The source files should have a ${variable to be replaced} wherever
maven assembly plugin should inject a value.
Expand All @@ -72,13 +72,13 @@
<outputDirectory>public</outputDirectory>
<includes>
<include>*.html</include>
<include>js/script.js</include>
</includes>
<excludes/>
<filtered>true</filtered>
</fileSet>
<!--
Include rest of public/ directory, without any filtering
Include rest of public/ directory (webpack bundles, images, templates)
without any filtering.
-->
<fileSet>
<directory>${project.basedir}/../../../storm-webapp/target/classes/WEB-INF/</directory>
Expand All @@ -88,7 +88,6 @@
</includes>
<excludes>
<exclude>*.html</exclude>
<exclude>js/script.js</exclude>
</excludes>
</fileSet>
<!-- EXAMPLES -->
Expand Down
28 changes: 28 additions & 0 deletions storm-webapp/cypress.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

const { defineConfig } = require('cypress');

module.exports = defineConfig({
e2e: {
baseUrl: 'http://localhost:3088',
supportFile: 'cypress/support/e2e.js',
specPattern: 'cypress/e2e/**/*.cy.js',
video: false,
screenshotOnRunFailure: false
}
});
42 changes: 42 additions & 0 deletions storm-webapp/cypress/e2e/component-page.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

describe('Storm UI - Component Detail Page', () => {
beforeEach(() => {
cy.visit(
'/component.html?id=split&topology_id=word-count-1-1234567890'
);
});

it('loads the main bundle', () => {
cy.get('script[src*="main.bundle.js"]').should('exist');
});

it('renders the component name', () => {
cy.contains('split').should('exist');
});

it('renders executor stats', () => {
cy.contains('Executors').should('exist');
});

it('has moment.js loaded for error time formatting', () => {
cy.window().then((win) => {
expect(win.moment).to.exist;
});
});
});
Loading