Merge pull request 'feat(runbackup): do-not-close warning + update-running overlay' (#270) from feat/runbackup-dontclose-warning into dev

source/packages/com_mokosuitebackup/language/en-GB/com_mokosuitebackup.ini

@@ -350,6 +350,8 @@ COM_MOKOJOOMBACKUP_RUNBACKUP_BACK_TO_DASHBOARD="Back to dashboard"
 COM_MOKOJOOMBACKUP_RUNBACKUP_VIEW_RECORD="View backup record"
 COM_MOKOJOOMBACKUP_RUNBACKUP_LEAVE_WARNING="A backup is in progress. Leaving now will cancel it."
 COM_MOKOJOOMBACKUP_RUNBACKUP_AUTOCONTINUE="Automatically continue the update when the backup finishes"
+COM_MOKOJOOMBACKUP_RUNBACKUP_DONT_CLOSE="Please do not close this window or switch to another window until the backup finishes."
+COM_MOKOJOOMBACKUP_RUNBACKUP_UPDATE_RUNNING="Backup complete. The update is now running — please wait and do not close this window…"
 COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUE_UPDATE="Continue the update"
 
 COM_MOKOJOOMBACKUP_CONFIG_CLEANUP="Cleanup Defaults"

source/packages/com_mokosuitebackup/language/en-US/com_mokosuitebackup.ini

@@ -72,6 +72,8 @@ COM_MOKOJOOMBACKUP_RUNBACKUP_BACK_TO_DASHBOARD="Back to dashboard"
 COM_MOKOJOOMBACKUP_RUNBACKUP_VIEW_RECORD="View backup record"
 COM_MOKOJOOMBACKUP_RUNBACKUP_LEAVE_WARNING="A backup is in progress. Leaving now will cancel it."
 COM_MOKOJOOMBACKUP_RUNBACKUP_AUTOCONTINUE="Automatically continue the update when the backup finishes"
+COM_MOKOJOOMBACKUP_RUNBACKUP_DONT_CLOSE="Please do not close this window or switch to another window until the backup finishes."
+COM_MOKOJOOMBACKUP_RUNBACKUP_UPDATE_RUNNING="Backup complete. The update is now running — please wait and do not close this window…"
 COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUE_UPDATE="Continue the update"
 
 COM_MOKOJOOMBACKUP_CONFIG_CLEANUP="Cleanup Defaults"

source/packages/com_mokosuitebackup/tmpl/runbackup/default.php

@@ -120,6 +120,11 @@ $this->getDocument()->addStyleSheet(Uri::root(true) . '/media/com_mokosuitebacku
 			<div id="msb-rb-phase" class="fw-bold mb-1"></div>
 			<div id="msb-rb-status" class="mb-0"><?php echo htmlspecialchars(Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING'), ENT_QUOTES, 'UTF-8'); ?></div>
 
+			<div id="msb-rb-warn" class="alert alert-warning fw-bold mt-3 mb-0" role="alert">
+				<span class="icon-warning" aria-hidden="true"></span>
+				<?php echo htmlspecialchars(Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_DONT_CLOSE'), ENT_QUOTES, 'UTF-8'); ?>
+			</div>
+
 			<?php if ($safeReturnUrl !== '') : ?>
 			<!-- Pre-update/uninstall flow: opt in to auto-continue, or get a manual "Continue" button on completion. -->
 			<div class="form-check mt-3" id="msb-rb-autocontinue-wrap">
@@ -159,6 +164,7 @@ $this->getDocument()->addStyleSheet(Uri::root(true) . '/media/com_mokosuitebacku
 		track:     document.querySelector('.msb-rb-progress'),
 		phase:     document.getElementById('msb-rb-phase'),
 		status:    document.getElementById('msb-rb-status'),
+		warn:      document.getElementById('msb-rb-warn'),
 		title:     document.getElementById('msb-rb-title'),
 		actions:   document.getElementById('msb-rb-actions'),
 		retry:     document.getElementById('msb-rb-retry'),
@@ -204,6 +210,7 @@ $this->getDocument()->addStyleSheet(Uri::root(true) . '/media/com_mokosuitebacku
 		el.bar.classList.add('is-success');
 		setBar(100, false);
 		el.title.textContent = L.complete || 'Backup complete';
+		if (el.warn) { el.warn.classList.add('d-none'); }
 
 		/* Set the one-shot skip flag for THIS action so the following
 		   server-side onExtensionBefore(Update|Uninstall) backup is skipped once
@@ -254,6 +261,7 @@ $this->getDocument()->addStyleSheet(Uri::root(true) . '/media/com_mokosuitebacku
 		running = false;
 		el.bar.classList.remove('is-animated');
 		el.bar.classList.add('is-danger');
+		if (el.warn) { el.warn.classList.add('d-none'); }
 		el.title.textContent = L.failed || 'Backup failed';
 		setStatus(message || 'Backup failed');
 		showActions();

source/packages/plg_system_mokosuitebackup/language/en-GB/plg_system_mokosuitebackup.ini

@@ -14,3 +14,4 @@ PLG_SYSTEM_MOKOJOOMBACKUP_BACKING_UP="Backing up…"
 PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_COMPLETE="Backup complete — safe to update."
 PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_FAILED="Backup failed"
 PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_STARTING="Starting backup…"
+PLG_SYSTEM_MOKOSUITEBACKUP_UPDATE_RUNNING="Backup complete. The update is now running — please wait and do not close this window…"

source/packages/plg_system_mokosuitebackup/language/en-US/plg_system_mokosuitebackup.ini

@@ -14,3 +14,4 @@ PLG_SYSTEM_MOKOJOOMBACKUP_BACKING_UP="Backing up…"
 PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_COMPLETE="Backup complete — safe to update."
 PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_FAILED="Backup failed"
 PLG_SYSTEM_MOKOJOOMBACKUP_BACKUP_STARTING="Starting backup…"
+PLG_SYSTEM_MOKOSUITEBACKUP_UPDATE_RUNNING="Backup complete. The update is now running — please wait and do not close this window…"

source/packages/plg_system_mokosuitebackup/media/js/installer-backup.js

@@ -101,6 +101,31 @@
 		window.location.href = target;
 	}, true);
 
+	/* Full-screen "update is running" overlay shown while the re-fired update
+	   POST processes, so the user knows it is working and not to close/switch. */
+	function showUpdateOverlay() {
+		if (document.getElementById('msb-update-overlay')) { return; }
+
+		var o = document.createElement('div');
+		o.id = 'msb-update-overlay';
+		o.setAttribute('role', 'status');
+		o.style.cssText = 'position:fixed;inset:0;z-index:2147483647;background:#000;color:#fff;'
+			+ 'display:flex;flex-direction:column;align-items:center;justify-content:center;'
+			+ 'text-align:center;padding:2rem;font-size:1.15rem;font-weight:600;';
+
+		var spin = document.createElement('span');
+		spin.className = 'spinner-border mb-3';
+		spin.setAttribute('aria-hidden', 'true');
+
+		var msg = document.createElement('div');
+		msg.textContent = (cfg && cfg.updateRunningText)
+			|| 'Backup complete. The update is now running — please wait and do not close this window…';
+
+		o.appendChild(spin);
+		o.appendChild(msg);
+		document.body.appendChild(o);
+	}
+
 	/* On return from the backup screen: restore the selection and re-fire. */
 	function resume() {
 		var params = new URLSearchParams(window.location.search);
@@ -145,6 +170,12 @@
 
 		window.__msbResuming = true;
 
+		/* Show a full-screen "update is running" overlay so the user gets clear
+		   feedback that the update is proceeding while the re-fired POST runs.
+		   It persists until the page navigates away (the update finishes and
+		   redirects), matching the black full-screen backup screen. */
+		showUpdateOverlay();
+
 		/* Re-fire the toolbar action. The `task` attribute is on the OUTER
 		   <joomla-toolbar-button>, but its click handler is bound to the INNER
 		   <button>/<a>, so click that inner element (clicking the wrapper does

source/packages/plg_system_mokosuitebackup/src/Extension/MokoSuiteBackup.php

@@ -15,6 +15,7 @@ defined('_JEXEC') or die;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Document\HtmlDocument;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
@@ -243,6 +244,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
 			'backupBeforeUpdate'    => $view === 'update' && (bool) $beforeUpdate,
 			'backupBeforeUninstall' => $view === 'manage' && (bool) $beforeUninst,
 			'recentBackup'          => false,
+			'updateRunningText'     => Text::_('PLG_SYSTEM_MOKOSUITEBACKUP_UPDATE_RUNNING'),
 		]);
 
 		$doc->addScript(Uri::root(true) . '/media/plg_system_mokosuitebackup/js/installer-backup.js', [], ['defer' => true]);