Compare commits

...
2 Commits
2 changed files with 19 additions and 13 deletions
+1 -1
View File
@@ -371,7 +371,7 @@ def background_gitea_check():
except Exception as e: except Exception as e:
logger.error(f"Errore controllo Gitea in background: {e}") logger.error(f"Errore controllo Gitea in background: {e}")
@api_bp.route('/api/server_update/status', methods=['GET']) @api_bp.route('/api/server_update/check', methods=['GET'])
def get_server_update_status(): def get_server_update_status():
global LAST_GITEA_CHECK_TIME global LAST_GITEA_CHECK_TIME
auth = get_auth() auth = get_auth()
+18 -12
View File
@@ -789,7 +789,22 @@ async function refreshStates() {
cardDiv.dataset.status = isOnline ? 'online' : 'offline'; cardDiv.dataset.status = isOnline ? 'online' : 'offline';
renderSeen(c, data, isOnline); renderSeen(c, data, isOnline);
const warns = (data.warnings && data.warnings[c.id.toLowerCase()]) || []; let warns = (data.warnings && data.warnings[c.id.toLowerCase()]) ? [...data.warnings[c.id.toLowerCase()]] : [];
let hasOfflineService = false;
if (healthObj && healthObj.processes) {
for (const [svcName, svcStatus] of Object.entries(healthObj.processes)) {
let s = svcStatus.toLowerCase();
if (s !== 'online' && s !== 'standby') {
hasOfflineService = true;
warns.push(`SVC KO: ${svcName.toUpperCase()}`);
}
}
}
if (!latestStatesData.warnings) latestStatesData.warnings = {};
latestStatesData.warnings[c.id.toLowerCase()] = warns;
cardDiv.dataset.hasWarn = (warns.length > 0) ? 'true' : 'false'; cardDiv.dataset.hasWarn = (warns.length > 0) ? 'true' : 'false';
const diagDiv = document.getElementById(`diag-warn-${c.id}`); const diagDiv = document.getElementById(`diag-warn-${c.id}`);
if (diagDiv) { if (diagDiv) {
@@ -936,16 +951,7 @@ async function refreshStates() {
if (healthContainer) healthContainer.style.display = 'none'; if (healthContainer) healthContainer.style.display = 'none';
} }
// Logica tollerante per i Gateway in standby (spenti dalla UI) // Logica tollerante per i Gateway in standby (hasOfflineService calcolato in alto)
let hasOfflineService = false;
if (healthObj && healthObj.processes) {
for (const [svcName, svcStatus] of Object.entries(healthObj.processes)) {
let s = svcStatus.toLowerCase();
if (s !== 'online' && s !== 'standby') {
hasOfflineService = true; break;
}
}
}
const warnBadge = document.getElementById(`svc-warn-${c.id}`); const btnSvc = document.getElementById(`btn-svc-${c.id}`); const warnBadge = document.getElementById(`svc-warn-${c.id}`); const btnSvc = document.getElementById(`btn-svc-${c.id}`);
if (warnBadge) warnBadge.style.display = hasOfflineService ? 'block' : 'none'; if (warnBadge) warnBadge.style.display = hasOfflineService ? 'block' : 'none';
if (btnSvc) { if (hasOfflineService) { btnSvc.style.borderColor = 'var(--danger)'; btnSvc.style.color = 'var(--danger)'; } else { btnSvc.style.borderColor = 'var(--text-main)'; btnSvc.style.color = 'var(--text-main)'; } } if (btnSvc) { if (hasOfflineService) { btnSvc.style.borderColor = 'var(--danger)'; btnSvc.style.color = 'var(--danger)'; } else { btnSvc.style.borderColor = 'var(--text-main)'; btnSvc.style.color = 'var(--text-main)'; } }
@@ -1372,7 +1378,7 @@ function urlB64ToUint8Array(base64String) { const padding = '='.repeat((4 - base
async function checkServerUpdate() { async function checkServerUpdate() {
if (!isAuthenticated || me.role !== 'admin') return; if (!isAuthenticated || me.role !== 'admin') return;
try { const res = await fetch('/api/server_update/check'); const data = await res.json(); const btn = document.getElementById('server-update-btn'); if (btn) { btn.style.display = data.update_available ? 'inline-block' : 'none'; } } catch (e) { console.error(e); } try { const res = await fetch('/api/server_update/check'); if (!res.ok) return; const data = await res.json(); const btn = document.getElementById('server-update-btn'); if (btn) { btn.style.display = data.update_available ? 'inline-block' : 'none'; } } catch (e) { console.error(e); }
} }
function confirmServerUpdate() { function confirmServerUpdate() {