jpmschweitzer/odysseus
1
0
Fork 0
mirror of https://github.com/pewdiepie-archdaemon/odysseus.git synced 2026-11-01 18:52:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(settings): reconcile admin toggle on partial cleanup failure and report errors

Browse Source 
- In imagePreferences.js, distinguish pre-persistence failures from post-save cleanup failures using err.globalSaved and err.phase.

- In imagePreferences.js, notify listeners of global policy updates on partial success before propagating cleanup failure.

- In imageModels.js, retain the persisted target state on admin toggle when global persistence succeeds but cleanup fails.

- In imageModels.js, reconcile admin toggle with authoritative server state via readImagePreferences() after ambiguous or partial failures.

- In imageModels.js, report partial success accurately without suppressing preference cleanup error messages.

- Add regression coverage in test_settings_save_response_ok_js.py for cleanup HTTP 500, cleanup network rejection, successful cleanup, and failed global POST.
This commit is contained in:
Alexandre Teixeira
2026-11-01 02:41:40 +00:00
parent cee26bc522
commit 3c8b196ba4
3 changed files with 264 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/js/settings/imageModels.js
+33 -7
View File
@@ -96,8 +96,13 @@ export async function initImageSettings() {
if (!res.ok) throw new Error(await res.text().catch(() => `HTTP ${res.status}`));
msg.textContent = 'Saved'; msg.style.color = 'var(--fg)'; setTimeout(() => { msg.textContent = ''; }, 2000);
} catch (e) {
msg.textContent = e.status === 403 ? 'Admin access is required to change these settings.' : 'Failed to save';
msg.style.color = 'var(--red)';
if (e.globalSaved) {
msg.textContent = 'Policy saved, but failed to clear preferences: ' + (e.message || 'cleanup error');
msg.style.color = 'var(--red)';
} else {
msg.textContent = e.status === 403 ? 'Admin access is required to change these settings.' : 'Failed to save';
msg.style.color = 'var(--red)';
}
}
}
@@ -109,16 +114,37 @@ export async function initImageSettings() {
msg.style.color = 'var(--red)';
return;
}
const targetState = enabledToggle ? enabledToggle.checked : false;
try {
const res = await _postSettings({ image_gen_enabled: enabledToggle ? enabledToggle.checked : false });
const res = await _postSettings({ image_gen_enabled: targetState });
if (!res.ok) throw new Error(await res.text().catch(() => `HTTP ${res.status}`));
if (enabledToggle) currentEnabled = enabledToggle.checked;
msg.textContent = 'Saved'; msg.style.color = 'var(--fg)'; setTimeout(() => { msg.textContent = ''; }, 2000);
} catch (e) {
if (enabledToggle) enabledToggle.checked = currentEnabled;
syncImgDisabled();
msg.textContent = e.status === 403 ? 'Admin access is required to change these settings.' : 'Failed to save';
msg.style.color = 'var(--red)';
if (e.globalSaved) {
currentEnabled = targetState;
try {
const authSettings = await readImagePreferences();
if (typeof authSettings.image_gen_enabled === 'boolean') {
currentEnabled = authSettings.image_gen_enabled;
}
} catch (_) {}
if (enabledToggle) enabledToggle.checked = currentEnabled;
syncImgDisabled();
msg.textContent = 'Policy saved, but failed to clear preferences: ' + (e.message || 'cleanup error');
msg.style.color = 'var(--red)';
} else {
try {
const authSettings = await readImagePreferences();
if (typeof authSettings.image_gen_enabled === 'boolean') {
currentEnabled = authSettings.image_gen_enabled;
}
} catch (_) {}
if (enabledToggle) enabledToggle.checked = currentEnabled;
syncImgDisabled();
msg.textContent = e.status === 403 ? 'Admin access is required to change these settings.' : 'Failed to save';
msg.style.color = 'var(--red)';
}
}
}