Skip to content

Cleanup Changelog Flow in WebUI #427

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
Martinski4GitHub merged 6 commits into from
Mar 23, 2025
Merged

Cleanup Changelog Flow in WebUI #427

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a94d84
Cleanup Changelog Function
ExtremeFiretop Mar 21, 2025
3a2a650
Update MerlinAU.asp
ExtremeFiretop Mar 21, 2025
c31fe52
Revert "Update MerlinAU.asp"
ExtremeFiretop Mar 21, 2025
f887cdc
Update MerlinAU.asp
ExtremeFiretop Mar 21, 2025
1ec7a5b
Update MerlinAU.asp
ExtremeFiretop Mar 21, 2025
a0f7283
Update MerlinAU.asp
ExtremeFiretop Mar 22, 2025
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
132 changes: 76 additions & 56 deletions MerlinAU.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,64 +796,84 @@ const fwUpdateDirPath =
}
};

function ShowLatestChangelog()
{
document.form.action_script.value = 'start_MerlinAUdownloadchangelog';
document.form.action_wait.value = 10;

// Open popup **before** form submission to avoid browser popup blocking //
var changelogWindow = window.open("", "ChangelogPopup", "width=800,height=600,scrollbars=1,resizable=1");
function fetchChangelog(startTime) {
$.ajax({
url: '/ext/MerlinAU/changelog.htm',
dataType: 'text',
timeout: 1500, // each attempt times out after 9 seconds
success: function(data) {
$('#changelogData').html('<pre>' + data + '</pre>');
},
error: function() {
var currentTime = new Date().getTime();
// if less than 10 seconds have elapsed since we started, retry after 500ms
if (currentTime - startTime < 10000) {
setTimeout(function() {
fetchChangelog(startTime);
}, 500);
} else {
$('#changelogData').html('<p>Failed to load the changelog.</p>');
}
}
});
}

if (!changelogWindow)
{
alert("Popup blocked! Please allow popups for this site to view the changelog.");
return;
function ShowLatestChangelog(e) {
if (e) e.preventDefault();

// Define the loading message
var loadingMessage = '<p>Please wait and allow up to 10 seconds for the changelog to load.<br>' +
'Click on "Cancel" button to stop and exit this dialog.</p>';

// If the modal already exists, update its content for a fresh fetch.
if ($('#changelogModal').length) {
$('#changelogData').html(loadingMessage);
$('#closeChangelogModal').text("Cancel");
} else {
// Create modal overlay if it doesn't exist
$('body').append(
'<div id="changelogModal" style="display:none; position:fixed; top:0; left:0; width:100%; height:100%; ' +
'background:rgba(0,0,0,0.8); z-index:10000;">' +
'<div id="changelogContent" style="position:absolute; top:50%; left:50%; transform:translate(-50%,-50%); ' +
'background:#fff; color:#000; padding:20px; max-height:90%; overflow:auto; width:80%; max-width:800px;">' +
'<h2 style="margin-top:0; color:#000;">Latest Changelog</h2>' +
'<button id="closeChangelogModal" style="float:right; font-size:14px; cursor:pointer;">Cancel</button>' +
'<div id="changelogData" style="font-family:monospace; white-space:pre-wrap; margin-top:10px; color:#000;">' +
loadingMessage +
'</div>' +
'</div>' +
'</div>'
);
$('#closeChangelogModal').on('click', function(){
$('#changelogModal').hide();
});
}

changelogWindow.document.open();
changelogWindow.document.write("<html><head><title>Latest Changelog</title></head>");
changelogWindow.document.write("<body style='font-family:monospace; white-space:pre-wrap;'>");
changelogWindow.document.write("<p>Loading latest changelog...</p>");
changelogWindow.document.write("</body></html>");
changelogWindow.document.close();

// Now submit the form (which might trigger a page refresh) //
showLoading();
document.form.submit();

// Delay the AJAX request slightly (but make sure it runs before page refresh) //

// Show the modal overlay
$('#changelogModal').show();

// Trigger the backend shell script via form submission (using AJAX)
var formData = $('form[name="form"]').serializeArray();
formData.push({ name: "action_script", value: "start_MerlinAUdownloadchangelog" });
formData.push({ name: "action_wait", value: "10" });

$.post('start_apply.htm', formData)
.done(function(response) {
console.log("Changelog trigger submitted successfully.");
})
.fail(function() {
console.error("Failed to submit changelog trigger.");
});

// Record the start time and wait 8 seconds before attempting to fetch the changelog
var startTime = new Date().getTime();
setTimeout(function() {
$.ajax({
url: '/ext/MerlinAU/changelog.htm',
dataType: 'text',
timeout: 9000,
success: function(data)
{
// Ensure the popup is still open before modifying it //
if (changelogWindow && !changelogWindow.closed)
{
changelogWindow.document.open();
changelogWindow.document.write("<html><head><title>Latest Changelog</title></head>");
changelogWindow.document.write("<body style='font-family:monospace; white-space:pre-wrap;'>");
changelogWindow.document.write("<pre>" + data + "</pre>");
changelogWindow.document.write("</body></html>");
changelogWindow.document.close();
}
},
error: function()
{
if (changelogWindow && !changelogWindow.closed)
{
changelogWindow.document.open();
changelogWindow.document.write("<html><head><title>Changelog Error</title></head>");
changelogWindow.document.write("<body style='font-family:monospace; white-space:pre-wrap;'>");
changelogWindow.document.write("<p>Failed to load the changelog.</p>");
changelogWindow.document.write("</body></html>");
changelogWindow.document.close();
}
}
});
}, 8000); // Delay slightly to allow form processing, but not too much //
fetchChangelog(startTime);
// Once the changelog has loaded, update the button text to "Close"
$('#closeChangelogModal').text("Close");
}, 8000);

return false;
}

// **Control "Approve/Block Changelog" Checkbox State** //
Expand Down Expand Up @@ -2483,7 +2503,7 @@ function initializeCollapsibleSections()
<div class="formfonttitle" id="headerTitle" style="text-align:center;">MerlinAU</div>
<div style="margin:10px 0 10px 5px;" class="splitLine"></div>
<div class="formfontdesc">This is the MerlinAU add-on integrated into the router WebUI
<span style="margin-left:8px;" id="WikiURL"">[
<span style="margin-left:8px;" id="WikiURL">[
<a style="font-weight:bolder; text-decoration:underline; cursor:pointer;"
href="https://github.com/ExtremeFiretop/MerlinAutoUpdate-Router/wiki"
title="Go to MerlinAU Wiki page" target="_blank">Wiki</a> ]
Expand Down