Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: block settings Save after a failed read instead of writing defaults (#12424)

[._.]/ Adam Eivy77ad631d61e1
diff --git a/client/src/components/brain/tabs/SpotifyTab.jsx b/client/src/components/brain/tabs/SpotifyTab.jsx
index 98a15004c9..5e5b03a2b1 100644
--- a/client/src/components/brain/tabs/SpotifyTab.jsx
+++ b/client/src/components/brain/tabs/SpotifyTab.jsx
@@ -1,4 +1,5 @@
import { useEffect, useMemo, useState } from 'react';
+import SettingsLoadError from '../../ui/SettingsLoadError';
import { useSearchParams } from 'react-router';
import { Save, Loader2, Music, Link2, LogOut, RefreshCw, CheckCircle2, AlertCircle, ExternalLink, Search } from 'lucide-react';
import toast from '../../ui/Toast';
@@ -21,7 +22,7 @@ import {
export function SpotifyTab() {
const [searchParams, setSearchParams] = useSearchParams();
const {
- loading, enabled, setEnabled, intervalMinutes, setIntervalMinutes, saving,
+ loading, loadError, retry, enabled, setEnabled, intervalMinutes, setIntervalMinutes, saving,
status, setStatus, dirty, save,
} = useSyncSourceSettings({ domain: 'spotify', defaultInterval: 25, getStatus: getSpotifyStatus });
@@ -151,6 +152,7 @@ export function SpotifyTab() {
return (
<div className="space-y-6">
+ {loadError && <SettingsLoadError onRetry={retry} />}
<div className="bg-port-card border border-port-border rounded-lg p-4 sm:p-6">
<div className="flex items-center gap-2 mb-2">
<Music size={16} className="text-port-accent" />
@@ -281,7 +283,7 @@ export function SpotifyTab() {
<button
type="button"
onClick={handleSave}
- disabled={!dirty || saving}
+ disabled={!dirty || saving || loadError}
className="inline-flex items-center justify-center gap-2 min-h-[40px] px-4 py-2 bg-port-accent/20 hover:bg-port-accent/30 text-port-accent rounded-lg text-sm transition-colors disabled:opacity-40 disabled:cursor-not-allowed"
>
{saving ? <Loader2 size={14} className="animate-spin" /> : <Save size={14} />}
diff --git a/client/src/components/brain/tabs/YoutubeTab.jsx b/client/src/components/brain/tabs/YoutubeTab.jsx
index c57c22a104..3b5f0a10f3 100644
--- a/client/src/components/brain/tabs/YoutubeTab.jsx
+++ b/client/src/components/brain/tabs/YoutubeTab.jsx
@@ -1,4 +1,5 @@
import { useEffect, useMemo, useState } from 'react';
+import SettingsLoadError from '../../ui/SettingsLoadError';
import { Save, Loader2, MonitorPlay, RefreshCw, CheckCircle2, AlertCircle, ShieldQuestion, Search, ExternalLink, Download, X } from 'lucide-react';
import toast from '../../ui/Toast';
import FormField from '../../ui/FormField';
@@ -21,7 +22,7 @@ import {
// page is the reliable historical path.
export function YoutubeTab() {
const {
- loading, enabled, setEnabled, intervalMinutes, setIntervalMinutes, saving,
+ loading, loadError, retry, enabled, setEnabled, intervalMinutes, setIntervalMinutes, saving,
status, setStatus, dirty, save,
} = useSyncSourceSettings({ domain: 'youtube', defaultInterval: 480, getStatus: getYoutubeStatus });
const [syncing, setSyncing] = useState(false);
@@ -110,6 +111,7 @@ export function YoutubeTab() {
return (
<div className="space-y-6">
+ {loadError && <SettingsLoadError onRetry={retry} />}
<div className="bg-port-card border border-port-border rounded-lg p-4 sm:p-6">
<div className="flex items-center gap-2 mb-2">
<MonitorPlay size={16} className="text-port-accent" />
@@ -188,7 +190,7 @@ export function YoutubeTab() {
<button
type="button"
onClick={handleSave}
- disabled={!dirty || saving}
+ disabled={!dirty || saving || loadError}
className="inline-flex items-center justify-center gap-2 min-h-[40px] px-4 py-2 bg-port-accent/20 hover:bg-port-accent/30 text-port-accent rounded-lg text-sm transition-colors disabled:opacity-40 disabled:cursor-not-allowed"
>
{saving ? <Loader2 size={14} className="animate-spin" /> : <Save size={14} />}
diff --git a/client/src/components/digital-twin/tabs/PersonalityTab.jsx b/client/src/components/digital-twin/tabs/PersonalityTab.jsx
index 967b309ebf..8a2947af0c 100644
--- a/client/src/components/digital-twin/tabs/PersonalityTab.jsx
+++ b/client/src/components/digital-twin/tabs/PersonalityTab.jsx
@@ -21,6 +21,7 @@ import useChartColors from '../../../hooks/useChartColors.js';
import { timeAgo, formatDateShort } from '../../../utils/formatters';
import { filterGenerationModels } from '../../../utils/providers.js';
import ProviderModelSelector from '../../ProviderModelSelector';
+import SettingsLoadError from '../../ui/SettingsLoadError';
// Pure helpers are exported for unit tests (PersonalityTab.test.jsx).
@@ -213,6 +214,8 @@ export default function PersonalityTab() {
const [historyCap, setHistoryCap] = useState(200);
const [defaultAlignment, setDefaultAlignment] = useState(true); // the SAVED default, distinct from this run's toggle
const [savingSettings, setSavingSettings] = useState(false);
+ const [settingsError, setSettingsError] = useState(false);
+ const [historyError, setHistoryError] = useState(false);
useEffect(() => {
loadData();
@@ -224,11 +227,13 @@ export default function PersonalityTab() {
api.getProviders({ silent: true }).catch(() => ({ providers: [] })),
// No limit — fetch the full retained history (server-capped) so every
// kept record is reachable for compare/delete.
- api.getModelPersonalityHistory(undefined, { silent: true }).catch(() => []),
+ api.getModelPersonalityHistory(undefined, { silent: true }).catch(() => null),
api.getModelPersonalitySettings({ silent: true }).catch(() => null)
]);
setProviders((providersData.providers || []).filter((p) => p.enabled));
- setHistory(Array.isArray(historyData) ? historyData : []);
+ setHistoryError(!Array.isArray(historyData));
+ setSettingsError(!settingsData);
+ if (Array.isArray(historyData)) setHistory(historyData);
if (settingsData) {
setIncludeAlignment(settingsData.defaultIncludeAlignment ?? true);
setDefaultAlignment(settingsData.defaultIncludeAlignment ?? true);
@@ -293,6 +298,7 @@ export default function PersonalityTab() {
};
const saveSettings = async () => {
+ if (settingsError) return;
setSavingSettings(true);
const saved = await api
.updateModelPersonalitySettings({
@@ -422,6 +428,7 @@ export default function PersonalityTab() {
{showOptions && (
<div className="bg-port-card rounded-lg border border-port-border p-4 space-y-4">
<h3 className="font-semibold text-white">Options</h3>
+ {settingsError && <SettingsLoadError onRetry={loadData} />}
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
<ProviderModelSelector
label="Alignment scorer provider"
@@ -473,7 +480,7 @@ export default function PersonalityTab() {
</label>
<button
onClick={saveSettings}
- disabled={savingSettings}
+ disabled={savingSettings || settingsError}
className="px-4 py-2 min-h-[40px] text-sm bg-port-accent text-white rounded-lg font-medium hover:bg-port-accent/80 disabled:opacity-50"
>
{savingSettings ? 'Saving...' : 'Save Options'}
@@ -555,6 +562,7 @@ export default function PersonalityTab() {
)}
{/* History */}
+ {historyError && <SettingsLoadError onRetry={loadData}>Failed to load run history. Retry to see past runs.</SettingsLoadError>}
{history.length > 0 && (
<div className="bg-port-card rounded-lg border border-port-border p-4">
<div className="flex items-center justify-between mb-1">
diff --git a/client/src/components/digital-twin/tabs/PersonalityTab.settings.test.jsx b/client/src/components/digital-twin/tabs/PersonalityTab.settings.test.jsx
new file mode 100644
index 0000000000..eb62486bdf
--- /dev/null
+++ b/client/src/components/digital-twin/tabs/PersonalityTab.settings.test.jsx
@@ -0,0 +1,35 @@
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { MemoryRouter } from 'react-router';
+
+const api = vi.hoisted(() => ({
+ getProviders: vi.fn(),
+ getModelPersonalityHistory: vi.fn(),
+ getModelPersonalitySettings: vi.fn(),
+ updateModelPersonalitySettings: vi.fn(),
+}));
+vi.mock('../../../services/api', () => api);
+vi.mock('../../ui/Toast', () => ({ default: { success: vi.fn(), error: vi.fn() } }));
+vi.mock('../../../hooks/useChartColors.js', () => ({ default: () => ({}) }));
+
+import PersonalityTab from './PersonalityTab.jsx';
+
+describe('PersonalityTab settings load failure', () => {
+ it('blocks Save Options after a failed settings read and shows stored values after Retry', async () => {
+ api.getProviders.mockResolvedValue({ providers: [] });
+ api.getModelPersonalityHistory.mockResolvedValue([]);
+ api.getModelPersonalitySettings.mockRejectedValueOnce(new Error('offline'));
+
+ render(<MemoryRouter><PersonalityTab /></MemoryRouter>);
+ fireEvent.click(await screen.findByRole('button', { name: 'Options' }));
+
+ expect(screen.getByRole('button', { name: 'Save Options' })).toBeDisabled();
+ expect(api.updateModelPersonalitySettings).not.toHaveBeenCalled();
+
+ api.getModelPersonalitySettings.mockResolvedValue({ historyCap: 1000, defaultIncludeAlignment: true });
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+
+ await waitFor(() => expect(screen.getByLabelText('History cap')).toHaveValue(1000));
+ expect(screen.getByRole('button', { name: 'Save Options' })).toBeEnabled();
+ });
+});
diff --git a/client/src/components/messages/IMessageSettingsPanel.jsx b/client/src/components/messages/IMessageSettingsPanel.jsx
index 5a5f377be6..68bc10943e 100644
--- a/client/src/components/messages/IMessageSettingsPanel.jsx
+++ b/client/src/components/messages/IMessageSettingsPanel.jsx
@@ -1,4 +1,5 @@
import { useState } from 'react';
+import SettingsLoadError from '../ui/SettingsLoadError';
import { Link } from 'react-router';
import { Save, Loader2, MessageSquare, ShieldCheck, ShieldAlert, RefreshCw } from 'lucide-react';
import toast from '../ui/Toast';
@@ -21,7 +22,7 @@ import {
// page refresh its conversation list after a sync run from in here.
export function IMessageSettingsPanel({ onSynced }) {
const {
- loading, enabled, setEnabled, intervalMinutes, setIntervalMinutes, saving,
+ loading, loadError, retry, enabled, setEnabled, intervalMinutes, setIntervalMinutes, saving,
status, setStatus, dirty, save,
} = useSyncSourceSettings({ domain: 'imessage', defaultInterval: 30, getStatus: getImessageStatus });
const [setup, setSetup] = useState(null);
@@ -62,6 +63,7 @@ export function IMessageSettingsPanel({ onSynced }) {
return (
<div className="space-y-6">
+ {loadError && <SettingsLoadError onRetry={retry} />}
<div className="bg-port-card border border-port-border rounded-lg p-4 sm:p-6">
<div className="flex items-center gap-2 mb-2">
<MessageSquare size={16} className="text-port-accent" />
@@ -109,7 +111,7 @@ export function IMessageSettingsPanel({ onSynced }) {
<button
type="button"
onClick={handleSave}
- disabled={!dirty || saving}
+ disabled={!dirty || saving || loadError}
className="inline-flex items-center justify-center gap-2 min-h-[40px] px-4 py-2 bg-port-accent/20 hover:bg-port-accent/30 text-port-accent rounded-lg text-sm transition-colors disabled:opacity-40 disabled:cursor-not-allowed"
>
{saving ? <Loader2 size={14} className="animate-spin" /> : <Save size={14} />}
diff --git a/client/src/components/messages/SignalTab.jsx b/client/src/components/messages/SignalTab.jsx
index 22553b098e..8786fc8d09 100644
--- a/client/src/components/messages/SignalTab.jsx
+++ b/client/src/components/messages/SignalTab.jsx
@@ -1,4 +1,5 @@
import { useState } from 'react';
+import SettingsLoadError from '../ui/SettingsLoadError';
import { Save, Loader2, Lock, ShieldCheck, ShieldAlert, RefreshCw } from 'lucide-react';
import toast from '../ui/Toast';
import BrailleSpinner from '../BrailleSpinner';
@@ -16,7 +17,7 @@ import {
// Highest-fragility source: everything degrades gracefully to an actionable error.
export function SignalTab() {
const {
- loading, enabled, setEnabled, intervalMinutes, setIntervalMinutes, saving,
+ loading, loadError, retry, enabled, setEnabled, intervalMinutes, setIntervalMinutes, saving,
status, setStatus, dirty, save,
} = useSyncSourceSettings({ domain: 'signal', defaultInterval: 60, getStatus: getSignalStatus });
const [setup, setSetup] = useState(null);
@@ -56,6 +57,7 @@ export function SignalTab() {
return (
<div className="space-y-6">
+ {loadError && <SettingsLoadError onRetry={retry} />}
<div className="bg-port-card border border-port-border rounded-lg p-4 sm:p-6">
<div className="flex items-center gap-2 mb-2">
<Lock size={16} className="text-port-accent" />
@@ -103,7 +105,7 @@ export function SignalTab() {
<button
type="button"
onClick={handleSave}
- disabled={!dirty || saving}
+ disabled={!dirty || saving || loadError}
className="inline-flex items-center justify-center gap-2 min-h-[40px] px-4 py-2 bg-port-accent/20 hover:bg-port-accent/30 text-port-accent rounded-lg text-sm transition-colors disabled:opacity-40 disabled:cursor-not-allowed"
>
{saving ? <Loader2 size={14} className="animate-spin" /> : <Save size={14} />}
diff --git a/client/src/components/settings/MortalLoomTab.jsx b/client/src/components/settings/MortalLoomTab.jsx
index c07381c30c..80139fde70 100644
--- a/client/src/components/settings/MortalLoomTab.jsx
+++ b/client/src/components/settings/MortalLoomTab.jsx
@@ -1,8 +1,9 @@
-import { useState, useEffect, useId } from 'react';
+import { useState, useEffect, useCallback, useId } from 'react';
import { Save, Download, ExternalLink, CheckCircle2, AlertCircle } from 'lucide-react';
import toast from '../ui/Toast';
import BrailleSpinner from '../BrailleSpinner';
import ToggleSwitch from '../ToggleSwitch';
+import SettingsLoadError from '../ui/SettingsLoadError';
import {
getSettings,
updateSettings,
@@ -14,6 +15,7 @@ import { formatBytes, formatDateTime } from '../../utils/formatters';
export function MortalLoomTab() {
const icloudPathId = useId();
const [loading, setLoading] = useState(true);
+ const [loadError, setLoadError] = useState(false);
const [saving, setSaving] = useState(false);
const [importing, setImporting] = useState(false);
const [enabled, setEnabled] = useState(false);
@@ -26,19 +28,25 @@ export function MortalLoomTab() {
if (s) setStatus(s);
};
- useEffect(() => {
- Promise.all([getSettings().catch(() => ({})), getMortalLoomStatus().catch(() => null)])
+ const loadAll = useCallback(() => {
+ setLoading(true);
+ setLoadError(false);
+ return Promise.all([getSettings().catch(() => null), getMortalLoomStatus().catch(() => null)])
.then(([settings, s]) => {
- const ml = settings?.mortalloom || {};
+ if (s) setStatus(s);
+ if (!settings) { setLoadError(true); return; }
+ const ml = settings.mortalloom || {};
setEnabled(Boolean(ml.enabled));
setPath(ml.path || '');
setLastImport(ml.lastImportAt || null);
- if (s) setStatus(s);
})
.finally(() => setLoading(false));
}, []);
+ useEffect(() => { loadAll(); }, [loadAll]);
+
const handleSave = async () => {
+ if (loadError) return;
setSaving(true);
try {
await updateSettings({
@@ -67,6 +75,7 @@ const IMPORT_FAILURE_MESSAGES = {
};
const handleImport = async () => {
+ if (loadError) return;
if (!status?.exists) {
toast.error('MortalLoom.json not found at configured path');
return;
@@ -94,6 +103,7 @@ const IMPORT_FAILURE_MESSAGES = {
return (
<div className="space-y-5">
+ {loadError && <SettingsLoadError onRetry={loadAll} />}
<div className="bg-port-card border border-port-border rounded-xl p-4 sm:p-6 space-y-5">
<div>
<h3 className="text-lg font-semibold text-white mb-1">MortalLoom iCloud Sync</h3>
@@ -143,7 +153,7 @@ const IMPORT_FAILURE_MESSAGES = {
<div className="flex flex-wrap items-center gap-2 sm:gap-3">
<button
onClick={handleSave}
- disabled={saving}
+ disabled={saving || loadError}
className="inline-flex items-center justify-center min-h-[40px] px-4 py-2 bg-port-accent/20 hover:bg-port-accent/30 text-port-accent rounded-lg text-sm transition-colors disabled:opacity-50"
>
<Save size={14} className="inline mr-1" />
@@ -151,7 +161,7 @@ const IMPORT_FAILURE_MESSAGES = {
</button>
<button
onClick={handleImport}
- disabled={importing || !status?.exists || !enabled}
+ disabled={importing || loadError || !status?.exists || !enabled}
className="inline-flex items-center justify-center min-h-[40px] px-4 py-2 bg-port-bg border border-port-border hover:border-port-accent text-white rounded-lg text-sm transition-colors disabled:opacity-50"
title={!enabled ? 'Enable sync first' : !status?.exists ? 'MortalLoom.json not found' : 'Import into PortOS'}
>
diff --git a/client/src/components/settings/MortalLoomTab.test.jsx b/client/src/components/settings/MortalLoomTab.test.jsx
new file mode 100644
index 0000000000..cb62a61c90
--- /dev/null
+++ b/client/src/components/settings/MortalLoomTab.test.jsx
@@ -0,0 +1,36 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+
+const api = vi.hoisted(() => ({
+ getSettings: vi.fn(),
+ updateSettings: vi.fn(),
+ getMortalLoomStatus: vi.fn(),
+ importMortalLoom: vi.fn(),
+}));
+vi.mock('../../services/api', () => api);
+vi.mock('../ui/Toast', () => ({ default: { success: vi.fn(), error: vi.fn() } }));
+
+import MortalLoomTab from './MortalLoomTab.jsx';
+
+beforeEach(() => Object.values(api).forEach((fn) => fn.mockReset()));
+
+describe('MortalLoomTab', () => {
+ it('blocks Save and Import after a failed settings read, then shows stored values on Retry', async () => {
+ api.getSettings.mockRejectedValueOnce(new Error('offline'));
+ api.getMortalLoomStatus.mockResolvedValue({ exists: true, defaultPath: '/default' });
+
+ render(<MortalLoomTab />);
+
+ const retry = await screen.findByRole('button', { name: 'Retry' });
+ expect(screen.getByRole('button', { name: /Save/ })).toBeDisabled();
+ expect(screen.getByRole('button', { name: /Import from MortalLoom/ })).toBeDisabled();
+ expect(api.updateSettings).not.toHaveBeenCalled();
+
+ api.getSettings.mockResolvedValue({ mortalloom: { enabled: true, path: '/custom/ml.json' } });
+ fireEvent.click(retry);
+
+ await waitFor(() => expect(screen.getByLabelText('iCloud file path')).toHaveValue('/custom/ml.json'));
+ expect(screen.queryByRole('button', { name: 'Retry' })).toBeNull();
+ expect(screen.getByRole('button', { name: /Save/ })).toBeEnabled();
+ });
+});
diff --git a/client/src/components/ui/README.md b/client/src/components/ui/README.md
index 9570f4cf4b..1130d5848f 100644
--- a/client/src/components/ui/README.md
+++ b/client/src/components/ui/README.md
@@ -10,6 +10,7 @@ accessibility). Feature-specific components live under their own feature directo
| --- | --- |
| `AutoSizeTextarea` | Controlled `<textarea>` that grows to fit its content — no internal scroll, no hand-resize. |
| `Banner` | Toned alert block (icon + content + actions) for warnings, errors, and info callouts. |
+| `SettingsLoadError` | Inline "failed to load saved settings" banner with Retry; pair with a disabled Save so defaults are never written over stored values. |
| `BeatPulse` | Metronome dot row — one dot per beat of the bar, the current one lit. |
| `CollapsibleListItem` | Successful-delete row collapse with reduced-motion support and focus transfer; set `removing`, then filter local state in `onExited`. Owns row spacing. |
| `CollapsibleSection` | Disclosure section header — chevron, leading icon, collapsed summary, `aria-expanded`/`aria-controls`; `keepMounted` hides the body instead of unmounting it. |
diff --git a/client/src/components/ui/SettingsLoadError.jsx b/client/src/components/ui/SettingsLoadError.jsx
new file mode 100644
index 0000000000..b4fea09072
--- /dev/null
+++ b/client/src/components/ui/SettingsLoadError.jsx
@@ -0,0 +1,23 @@
+import Banner from './Banner';
+
+// Inline load-failure state for settings panels: callers also disable Save so
+// default values shown after a failed read are never written over stored ones.
+export default function SettingsLoadError({ onRetry, children = 'Failed to load saved settings. The values shown are not your saved configuration.' }) {
+ return (
+ <Banner
+ tone="error"
+ size="sm"
+ actions={
+ <button
+ type="button"
+ onClick={onRetry}
+ className="px-2.5 py-1 text-xs font-medium bg-port-error/20 hover:bg-port-error/30 text-port-error rounded transition-colors"
+ >
+ Retry
+ </button>
+ }
+ >
+ {children}
+ </Banner>
+ );
+}
diff --git a/client/src/hooks/useSyncSourceSettings.js b/client/src/hooks/useSyncSourceSettings.js
index 306194fb72..186979af8f 100644
--- a/client/src/hooks/useSyncSourceSettings.js
+++ b/client/src/hooks/useSyncSourceSettings.js
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
import { getSettings, updateSettings } from '../services/api';
const clampInterval = (value, defaultInterval) => Math.max(1, Math.min(1440, Math.floor(Number(value) || defaultInterval)));
@@ -11,15 +11,22 @@ export function useSyncSourceSettings({ domain, defaultInterval, getStatus }) {
const [savedInterval, setSavedInterval] = useState(defaultInterval);
const [saving, setSaving] = useState(false);
const [status, setStatus] = useState(null);
+ const [loadError, setLoadError] = useState(false);
+ const [attempt, setAttempt] = useState(0);
+
+ // Re-runs the load effect; a failed settings read must not seed defaults that Save would persist.
+ const retry = useCallback(() => { setLoading(true); setLoadError(false); setAttempt((n) => n + 1); }, []);
useEffect(() => {
let active = true;
Promise.all([
- getSettings({ silent: true }).catch(() => ({})),
+ getSettings({ silent: true }).catch(() => null),
getStatus({ silent: true }).catch(() => null),
])
.then(([settings, sourceStatus]) => {
if (!active) return;
+ setStatus(sourceStatus);
+ if (!settings) { setLoadError(true); return; }
const config = settings?.[domain] || {};
const nextEnabled = typeof config.enabled === 'boolean' ? config.enabled : false;
const nextInterval = Number.isFinite(config.intervalMinutes) ? config.intervalMinutes : defaultInterval;
@@ -27,15 +34,15 @@ export function useSyncSourceSettings({ domain, defaultInterval, getStatus }) {
setIntervalMinutes(nextInterval);
setSavedEnabled(nextEnabled);
setSavedInterval(nextInterval);
- setStatus(sourceStatus);
})
.finally(() => { if (active) setLoading(false); });
return () => { active = false; };
- }, [defaultInterval, domain, getStatus]);
+ }, [attempt, defaultInterval, domain, getStatus]);
const dirty = enabled !== savedEnabled || Number(intervalMinutes) !== Number(savedInterval);
const save = async () => {
+ if (loading || loadError) return false;
const nextInterval = clampInterval(intervalMinutes, defaultInterval);
setSaving(true);
const settings = await updateSettings({ [domain]: { enabled, intervalMinutes: nextInterval } }).catch(() => null);
@@ -47,5 +54,5 @@ export function useSyncSourceSettings({ domain, defaultInterval, getStatus }) {
return true;
};
- return { loading, enabled, setEnabled, intervalMinutes, setIntervalMinutes, saving, status, setStatus, dirty, save };
+ return { loading, loadError, retry, enabled, setEnabled, intervalMinutes, setIntervalMinutes, saving, status, setStatus, dirty, save };
}
diff --git a/client/src/hooks/useSyncSourceSettings.test.jsx b/client/src/hooks/useSyncSourceSettings.test.jsx
index a7fad4d494..4658ecdba5 100644
--- a/client/src/hooks/useSyncSourceSettings.test.jsx
+++ b/client/src/hooks/useSyncSourceSettings.test.jsx
@@ -36,16 +36,23 @@ describe('useSyncSourceSettings', () => {
expect(getStatus).toHaveBeenCalledWith({ silent: true });
});
- it('fails open when either initial request fails', async () => {
- getSettings.mockRejectedValue(new Error('offline'));
- getStatus.mockRejectedValue(new Error('offline'));
+ it('reports a failed settings read instead of seeding defaults, refuses save, and recovers on retry', async () => {
+ getSettings.mockRejectedValueOnce(new Error('offline'));
+ getStatus.mockResolvedValue(null);
const { result } = renderHook(() => useSyncSourceSettings(options));
await waitFor(() => expect(result.current.loading).toBe(false));
- expect(result.current.enabled).toBe(false);
- expect(result.current.intervalMinutes).toBe(60);
- expect(result.current.status).toBeNull();
+ expect(result.current.loadError).toBe(true);
+ await act(async () => expect(await result.current.save()).toBe(false));
+ expect(updateSettings).not.toHaveBeenCalled();
+
+ getSettings.mockResolvedValue({ signal: { enabled: true, intervalMinutes: 90 } });
+ act(() => result.current.retry());
+ await waitFor(() => expect(result.current.loading).toBe(false));
+ expect(result.current.loadError).toBe(false);
+ expect(result.current.enabled).toBe(true);
+ expect(result.current.intervalMinutes).toBe(90);
});
it('clamps and persists the changed source settings', async () => {