Skip to content

Make sure Management UI JavaScript files are forced to reload after an upgrade #12683

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

Closed
wants to merge 5 commits into from
Closed

Make sure Management UI JavaScript files are forced to reload after an upgrade #12683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e739807
Remove MSIE8 specific code
mkuratczyk Nov 6, 2024
2a72460
Version main.css
mkuratczyk Nov 6, 2024
3b9439c
Full page reload in some situations
mkuratczyk Nov 6, 2024
ee726ad
Do not cache JS/CSS between versions
mkuratczyk Nov 7, 2024
e0f3f76
Cosmetics
michaelklishin Nov 14, 2024
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
2 changes: 2 additions & 0 deletions deps/rabbitmq_management/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ list-dist-deps::
prepare-dist::
$(verbose) sed 's/%%VSN%%/$(PROJECT_VERSION)/' bin/rabbitmqadmin \
> $(EZ_DIR)/priv/www/cli/rabbitmqadmin
$(verbose) sed "s/%%VSN%%/$(PROJECT_VERSION)/" priv/www/index.html \
> $(EZ_DIR)/priv/www/index.html
1 change: 0 additions & 1 deletion deps/rabbitmq_management/app.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ def all_srcs(name = "all_srcs"):
"priv/www/api/index.html",
"priv/www/cli/index.html",
"priv/www/cli/rabbitmqadmin",
"priv/www/css/evil.css",
"priv/www/css/main.css",
"priv/www/favicon.ico",
"priv/www/img/bg-binary.png",
Expand Down
1 change: 0 additions & 1 deletion deps/rabbitmq_management/priv/www/css/evil.css
View file
Open in desktop

This file was deleted.

36 changes: 20 additions & 16 deletions deps/rabbitmq_management/priv/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,30 @@
<script src="js/sammy-0.7.6.min.js" type="text/javascript"></script>
<script src="js/json2-2016.10.28.js" type="text/javascript"></script>
<script src="js/base64.js" type="text/javascript"></script>
<script src="js/global.js" type="text/javascript"></script>
<script src="js/main.js" type="text/javascript"></script>
<script src="js/prefs.js" type="text/javascript"></script>
<script src="js/formatters.js" type="text/javascript"></script>
<script src="js/charts.js" type="text/javascript"></script>

<script type="text/javascript">
management_version = "%%VSN%%";
const scripts = ["global.js", "main.js", "prefs.js", "formatters.js", "charts.js"];
scripts.forEach((script) => {
tag = document.createElement('script');
tag.src = 'js/' + script + '?v=' + management_version;
document.head.appendChild(tag);
});

tag = document.createElement('link');
tag.rel = 'stylesheet';
tag.type = 'text/css';
tag.href = 'css/main.css?v=' + management_version;
document.head.appendChild(tag);
</script>

<script src="js/oidc-oauth/bootstrap.js" type="module"></script>

<link href="css/main.css" rel="stylesheet" type="text/css"/>
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon"/>


<link href="favicon.ico" rel="shortcut icon" type="image/x-icon"/>

<script type="module">
window.oauth = oauth_initialize_if_required();

</script>


<!--[if lte IE 8]>
<script src="js/excanvas.min.js" type="text/javascript"></script>
<link href="css/evil.css" rel="stylesheet" type="text/css"/>
<![endif]-->
</head>

<body>
Expand Down
3 changes: 3 additions & 0 deletions deps/rabbitmq_management/priv/www/js/global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,9 @@ var timer_interval;
// When did we last connect successfully (for the "could not connect" error)
var last_successful_connect;

// we want a full page refresh after we were disconnected or if the RabbitMQ version changed
var needs_full_refresh = false;

// Every 200 updates without user interaction we do a full refresh, to
// work around memory leaks in browser DOM implementations.
// TODO: maybe we don't need this any more?
Expand Down
7 changes: 6 additions & 1 deletion deps/rabbitmq_management/priv/www/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,11 @@ function maybe_format_extra_queue_content(queue, extraContent) {

function update_status(status) {
var text;
if (status == 'ok')
if (status == 'ok' && needs_full_refresh) {
// connection was restored, get the latest CSS/JS
needs_full_refresh = false;
full_refresh();
} else if (status == 'ok')
text = "Refreshed " + fmt_date(new Date());
else if (status == 'error') {
var next_try = new Date(new Date().getTime() + timer_interval);
Expand Down Expand Up @@ -1496,6 +1500,7 @@ function check_bad_response(req, full_page_404) {
clearInterval(timer);
}

needs_full_refresh = true;
return false;
}

Expand Down
7 changes: 7 additions & 0 deletions deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<%
if(management_version != undefined && management_version != '%%VSN%%' && management_version != overview.management_version) {
// RabbitMQ was upgraded
// full reload to get the latest CSS and JavaScript files
needs_full_refresh = true;
}
%>
<% if(disable_stats) { %>
<h1>Overview: Management only mode</h1>
<% } else { %>
Expand Down
Loading