gsadmin/pulse
1
0
Fork 0
mirror of https://github.com/rcourtman/Pulse.git synced 2026-09-22 03:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feat(main): Improve loading overlay behavior for data and socket states

Browse Source
This commit is contained in:
courtmanr@gmail.com
2025-05-08 11:22:03 +01:00
parent e5f2d6c598
commit 9b58b3e6c2
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/public/js/main.js
+27 -11
View File
@@ -15,25 +15,41 @@ document.addEventListener('DOMContentLoaded', function() {
PulseApp.ui.pbs?.updatePbsInfo(pbsDataArray);
PulseApp.ui.backups?.updateBackupsTab();
const loadingOverlay = document.getElementById('loading-overlay');
if (loadingOverlay && loadingOverlay.style.display !== 'none') {
if (PulseApp.socketHandler?.isConnected()) {
console.log('[UI Update] First data received, hiding loading overlay.');
loadingOverlay.style.display = 'none';
} else {
console.log('[UI Update] Data received, but socket disconnected. Keeping loading overlay.');
}
}
updateLoadingOverlayVisibility(); // Call the helper function
PulseApp.thresholds?.logging?.checkThresholdViolations();
}
function updateLoadingOverlayVisibility() {
const loadingOverlay = document.getElementById('loading-overlay');
if (!loadingOverlay) return;
const isConnected = PulseApp.socketHandler?.isConnected();
const initialDataReceived = PulseApp.state?.get('initialDataReceived');
if (loadingOverlay.style.display !== 'none') { // Only act if currently visible
if (isConnected && initialDataReceived) {
console.log('[UI Update] Data received and socket connected, hiding loading overlay.');
loadingOverlay.style.display = 'none';
} else if (!isConnected) {
console.log('[UI Update] Socket disconnected. Keeping loading overlay visible.');
}
// If initialDataReceived is false, or socket is connected but no data yet, overlay remains.
} else if (!isConnected && loadingOverlay.style.display === 'none') {
// If overlay is hidden but socket disconnects, re-show it.
console.log('[UI Update] Socket disconnected and overlay was hidden. Re-showing loading overlay.');
loadingOverlay.style.display = 'flex'; // Or 'block', or its original display type
}
}
function initializeModules() {
PulseApp.state?.init?.();
PulseApp.config?.init?.();
PulseApp.utils?.init?.();
PulseApp.theme?.init?.();
PulseApp.socketHandler?.init?.(updateAllUITables);
// Ensure socketHandler.init receives both callbacks if it's designed to accept them
// If socketHandler.init only expects one, this might need adjustment in socketHandler.js
PulseApp.socketHandler?.init?.(updateAllUITables, updateLoadingOverlayVisibility);
PulseApp.tooltips?.init?.();
PulseApp.ui = PulseApp.ui || {};
@@ -94,4 +110,4 @@ document.addEventListener('DOMContentLoaded', function() {
initializeModules();
fetchVersion();
});
});