+
@@ -645,9 +649,34 @@ function goStep(n) {
});
currentStep = n;
+ // Persist breadcrumb so reload picks up where the user left off (P2).
+ if (n > 1) post('progress_set', { step: n - 1 }).catch(() => {});
window.scrollTo(0, 0);
}
+// ── Resume on boot (P2): if .progress.json exists, jump to last+1 step ──
+async function maybeResumeFromProgress() {
+ try {
+ const r = await post('progress_get', {});
+ if (r.success && r.progress && r.progress.last_step) {
+ const last = parseInt(r.progress.last_step, 10);
+ if (last >= 1 && last < 6) {
+ const ok = confirm(
+ 'Previous installation in progress (step ' + last + ' completed at ' +
+ (r.progress.steps[last] || 'unknown') + ').\n\nResume from step ' +
+ (last + 1) + '? (Cancel = start over)'
+ );
+ if (ok) {
+ goStep(last + 1);
+ return true;
+ }
+ await post('progress_clear', {});
+ }
+ }
+ } catch (e) { /* progress endpoint optional */ }
+ return false;
+}
+
// ── AJAX Helper ──────────────────────────────────────
async function post(action, data = {}) {
const body = new URLSearchParams({ action, ...data });
@@ -845,6 +874,14 @@ function renderChecks(containerId, checks) {
if (!r.success && r.status === 'error') {
hadError = true;
+ // Append inline Retry / Skip buttons next to the error row
+ const errRow = log.lastChild;
+ const btnBar = document.createElement('div');
+ btnBar.style.cssText = 'margin:6px 0 12px 22px;display:flex;gap:8px;';
+ btnBar.innerHTML =
+ `` +
+ ``;
+ errRow.appendChild(btnBar);
// Stop loop on first hard error so user can read it.
break;
}
@@ -855,12 +892,70 @@ function renderChecks(containerId, checks) {
$('migStatus').style.color = 'var(--success)';
$('migNext').classList.remove('hidden');
} else {
- $('migStatus').textContent = 'Installation failed';
+ $('migStatus').textContent = 'Installation failed — click Retry or Skip on the failed step';
$('migStatus').style.color = 'var(--danger)';
$('migBack').disabled = false;
}
}
+// ── P2: Per-migration retry/skip ─────────────────────
+async function retryMigration(file, version, btn) {
+ btn.disabled = true;
+ btn.textContent = 'Retrying...';
+ const r = await post('install_db_step', { ...dbCredentials, file, version });
+ btn.disabled = false;
+ btn.textContent = 'Retry';
+ const log = document.getElementById('migLog');
+ const cls = r.status === 'ok' ? 'ok' : r.status === 'skipped' ? 'skip' : 'err';
+ const icon = r.status === 'ok' ? '✓' : r.status === 'skipped' ? '→' : '✗';
+ log.innerHTML += `
${icon} ${file} (retry): ${r.message || ''}
`;
+ log.scrollTop = log.scrollHeight;
+ if (r.success && r.status !== 'error') {
+ // Resume forward by reloading the migration list and continuing.
+ runMigrations();
+ }
+}
+
+async function skipMigration(file, version, errorMsg, btn) {
+ if (!confirm(`Skip migration "${file}"?\n\nThe failed step will be marked applied so the rest can run, but you may end up in a broken state. Only do this if you know the failure is benign (e.g. the table already exists from a prior install).`)) {
+ return;
+ }
+ btn.disabled = true;
+ btn.textContent = 'Skipping...';
+ const r = await post('migration_skip', { ...dbCredentials, file, version, error: errorMsg });
+ btn.disabled = false;
+ btn.textContent = 'Skip';
+ const log = document.getElementById('migLog');
+ if (r.success) {
+ log.innerHTML += `