4 Commits

4 changed files with 24 additions and 8 deletions

View File

@@ -107,8 +107,8 @@ export async function initDiagUI({ elements, toast }) {
const entries = await syncState();
render(entries);
toast?.("Diagnostics refreshed (after retry)", "success");
} catch {
// swallow
} catch (err2) {
toast?.(err2.error || "Diagnostics still failing", "error");
}
} finally {
setBusy(false);
@@ -126,6 +126,8 @@ export async function initDiagUI({ elements, toast }) {
} catch (e) {
toast?.(e.error || "Failed to save diagnostics setting", "error");
enableToggle.checked = !enableToggle.checked;
setBusy(false);
return;
} finally {
setBusy(false);
}

View File

@@ -6,7 +6,7 @@ import { initServiceControls, renderServices } from "./services.js";
import { initSettings } from "./settings.js";
import { initUpdateSettings, isUpdatesDirty } from "./update-settings.js";
import { initReleaseUI } from "./releases.js?v=20251213h";
import { initDiagUI, logUi } from "./diaglog.js?v=20251213i";
import { initDiagUI, logUi } from "./diaglog.js?v=20251213j";
const servicesGrid = document.getElementById("servicesGrid");
const heroStats = document.getElementById("heroStats");
@@ -133,6 +133,7 @@ let toastDurationMs = 5000;
let toastSpeedMs = 300;
let fontChoice = "redhat";
let releaseUI = null;
let lastStatusData = null;
function applyToastSettings() {
if (!toastContainer) return;
@@ -318,6 +319,7 @@ function setUpdatesUI(enabled) {
async function loadStatus() {
try {
const data = await getStatus();
lastStatusData = data;
renderStats(heroStats, data);
renderServices(servicesGrid, data.services, { openAddService });
const updatesEnabled =
@@ -358,7 +360,11 @@ async function loadStatus() {
releaseUI?.refreshStatus();
} catch (e) {
console.error(e);
renderStats(heroStats, placeholderStatus);
logUi(`Status refresh failed: ${e?.message || e}`, "error");
if (!lastStatusData) {
renderStats(heroStats, placeholderStatus);
}
setTimeout(loadStatus, 2000);
}
}

View File

@@ -64,6 +64,9 @@ export function initReleaseUI({ showToast, showBusy, hideBusy, confirmAction, lo
releaseLog.textContent = releaseLogLines.join("\n");
releaseLog.scrollTop = 0; // keep most recent in view
}
// Mirror into global diagnostics log (frontend side)
const lvl = msg.toLowerCase().startsWith("error") ? "error" : "info";
logUi(`Update: ${msg}`, lvl);
}
function setReleaseChip(state) {
@@ -174,12 +177,17 @@ export function initReleaseUI({ showToast, showBusy, hideBusy, confirmAction, lo
showBusy("Working on update…", progress || "This can take up to a minute.");
pollReleaseStatus();
}
} catch (e) {
} catch (e) {
// During an update/rollback the API may restart; retry quietly.
if (releaseBusyActive) {
setTimeout(() => loadReleaseStatus(true), 1000);
return;
}
console.error("Failed to load release status", e);
setReleaseChip({ status: "error", message: "Failed to load" });
// surface via toast/log only; avoid inline red flashes
showToast("Failed to load release status", "error");
// surface via toast/log only once
logRelease("Error: failed to load release status");
showToast("Failed to load release status", "error");
}
}

View File

@@ -777,7 +777,7 @@
</div>
</div>
<script type="module" src="assets/main.js?v=20251213i"></script>
<script type="module" src="assets/main.js?v=20251213j"></script>
<div id="toastContainer" class="toast-container"></div>
</body>
</html>