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(client): migrate system and admin pages to useListResource (#12171)

Adam Eivy0720c0bd405a
diff --git a/client/src/asyncEffectDisposalConventions.test.js b/client/src/asyncEffectDisposalConventions.test.js
index aa5caac03a..ba7ad8e9ab 100644
--- a/client/src/asyncEffectDisposalConventions.test.js
+++ b/client/src/asyncEffectDisposalConventions.test.js
@@ -101,8 +101,6 @@ const ALLOWED = {
'deps are [enabled, navigate] — a session toggle, not a record identity',
'src/hooks/useImageGenPageRuntime.js':
'the active-job read is adopted through useMediaJobSse.start, whose run owner drops it when superseded or unmounted (ifIdle makes a re-run a no-op)',
- 'src/pages/AIProviders.jsx':
- 'deps are [fleetSetupOpen] only — a modal preload with no record identity to switch',
'src/pages/Browser.jsx':
'deps are [showConfig, config] — a panel toggle re-reading its own config',
};
diff --git a/client/src/components/providers/FleetProviderSetup.jsx b/client/src/components/providers/FleetProviderSetup.jsx
index baae56af3e..1e2d9d0f20 100644
--- a/client/src/components/providers/FleetProviderSetup.jsx
+++ b/client/src/components/providers/FleetProviderSetup.jsx
@@ -6,6 +6,7 @@ import FleetHostSetup from './FleetHostSetup';
import useDrawerTab from '../../hooks/useDrawerTab';
import { FormField } from '../ui/FormField';
import Banner from '../ui/Banner';
+import ListLoadError from '../ui/ListLoadError';
import { commandBasename, isApiProvider, isLocalEndpoint, isPrivateNetworkEndpoint, isTuiProvider, mergeProviderUpdate } from '../../utils/providers';
import { getFleetLlmHost, revealFleetLlmHostKey, revealFleetPeerHostKey } from '../../services/apiProviders';
import { PORTS } from '../../lib/ports.js';
@@ -82,7 +83,17 @@ export const buildFleetProvider = ({ name, endpoint, apiKey, model, harness }) =
};
};
-export default function FleetProviderSetup({ peers = [], providers = [], onClose, onCreate, onUpdate, onConfigured }) {
+export default function FleetProviderSetup({
+ peers = [],
+ peersState = 'ready',
+ peersError = null,
+ onRetryPeers = null,
+ providers = [],
+ onClose,
+ onCreate,
+ onUpdate,
+ onConfigured
+}) {
const [searchParams] = useSearchParams();
const initialPeerId = searchParams.get('peerId') || '';
// `?selfHost=1` is how the host's own status card (FleetHostSetup) links
@@ -319,7 +330,15 @@ export default function FleetProviderSetup({ peers = [], providers = [], onClose
</FormField>
)}
- {availablePeers.length > 0 && !selfHost && (
+ {peersState === 'error' && !selfHost && (
+ <ListLoadError
+ what="fleet peers"
+ error={peersError}
+ onRetry={onRetryPeers}
+ />
+ )}
+
+ {peersState === 'ready' && availablePeers.length > 0 && !selfHost && (
<FormField label="Known PortOS peer">
<select
value={selectedPeerId}
@@ -336,6 +355,10 @@ export default function FleetProviderSetup({ peers = [], providers = [], onClose
</FormField>
)}
+ {peersState === 'ready' && availablePeers.length === 0 && !selfHost && (
+ <p className="text-xs text-gray-500">No known PortOS peers discovered on your network.</p>
+ )}
+
<FormField label="GPU host endpoint" hint={`Use the runtime endpoint, not the PortOS :${PORTS.API} address.`}>
<input
type="text"
diff --git a/client/src/components/providers/FleetProviderSetup.test.jsx b/client/src/components/providers/FleetProviderSetup.test.jsx
index c0750d9d9b..cef490b483 100644
--- a/client/src/components/providers/FleetProviderSetup.test.jsx
+++ b/client/src/components/providers/FleetProviderSetup.test.jsx
@@ -239,4 +239,57 @@ describe('FleetProviderSetup', () => {
expect(screen.getByDisplayValue('Fleet GPU · OpenCode TUI')).toBeInTheDocument();
expect(screen.getByDisplayValue('qwen3.8-27b')).toBeInTheDocument();
});
+
+ it('renders ListLoadError when peers fail to load and recovers on retry', async () => {
+ const onRetryPeers = vi.fn();
+ const { rerender } = render(
+ <MemoryRouter initialEntries={['/ai/fleet?fleetStep=client']}>
+ <FleetProviderSetup
+ peers={[]}
+ peersState="error"
+ peersError={new Error('fleet offline')}
+ onRetryPeers={onRetryPeers}
+ onClose={() => {}}
+ onCreate={vi.fn()}
+ />
+ </MemoryRouter>
+ );
+
+ const alert = await screen.findByRole('alert');
+ expect(alert).toHaveTextContent('Could not load fleet peers — fleet offline');
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(onRetryPeers).toHaveBeenCalled();
+
+ rerender(
+ <MemoryRouter initialEntries={['/ai/fleet?fleetStep=client']}>
+ <FleetProviderSetup
+ peers={peers}
+ peersState="ready"
+ peersError={null}
+ onRetryPeers={onRetryPeers}
+ onClose={() => {}}
+ onCreate={vi.fn()}
+ />
+ </MemoryRouter>
+ );
+
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ expect(screen.getByLabelText('Known PortOS peer')).toBeInTheDocument();
+ });
+
+ it('renders empty copy when peers list is ready but empty', async () => {
+ render(
+ <MemoryRouter initialEntries={['/ai/fleet?fleetStep=client']}>
+ <FleetProviderSetup
+ peers={[]}
+ peersState="ready"
+ onClose={() => {}}
+ onCreate={vi.fn()}
+ />
+ </MemoryRouter>
+ );
+
+ expect(await screen.findByText('No known PortOS peers discovered on your network.')).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
});
diff --git a/client/src/listFetchConventions.test.js b/client/src/listFetchConventions.test.js
index 2191172b74..91c52c87c2 100644
--- a/client/src/listFetchConventions.test.js
+++ b/client/src/listFetchConventions.test.js
@@ -50,14 +50,7 @@ export const LIST_COLLAPSE = /\.catch\(\s*\(\s*\)\s*=>\s*(?:\[\]|\{?\s*set[A-Z]\
* Pages still carrying a collapse, with how many. Lower or remove a row when a
* site is migrated to `useListResource`; never raise one.
*/
-const KNOWN = Object.freeze({
- 'src/pages/AIProviders.jsx': 2,
- 'src/pages/HistoryPage.jsx': 1,
- 'src/pages/Privacy.jsx': 1,
- 'src/pages/ProcessesPage.jsx': 1,
- 'src/pages/RunnerPage.jsx': 2,
- 'src/pages/Templates.jsx': 1,
-});
+const KNOWN = Object.freeze({});
const countIn = (source) => (source.match(LIST_COLLAPSE) || []).length;
diff --git a/client/src/pages/AIProviders.jsx b/client/src/pages/AIProviders.jsx
index a825ebb3a5..1d714a695e 100644
--- a/client/src/pages/AIProviders.jsx
+++ b/client/src/pages/AIProviders.jsx
@@ -13,6 +13,8 @@ import { formatCount } from '../utils/formatters';
import { isHttpsUrl } from '../utils/urlNormalize';
import useLocalModels from '../hooks/useLocalModels';
import useMounted from '../hooks/useMounted.js';
+import useListResource from '../hooks/useListResource.js';
+import ListLoadError from '../components/ui/ListLoadError';
import { useSocketResource } from '../hooks/useSocketResource';
import EmptyState from '../components/EmptyState';
import Banner from '../components/ui/Banner';
@@ -105,14 +107,18 @@ export default function AIProviders() {
const [selectedWorkspace, setSelectedWorkspace] = useState('');
const [orchestrationProfiles, setOrchestrationProfiles] = useState([]);
const [selectedProfileId, setSelectedProfileId] = useState('');
- const [apps, setApps] = useState([]);
+ const loadApps = useCallback(async () => {
+ const list = await api.getApps({ silent: true });
+ return Array.isArray(list) ? list : [];
+ }, []);
+ const appsResource = useListResource(loadApps);
+ const { items: apps, state: appsState, error: appsError, retry: retryApps } = appsResource;
const [activeRun, setActiveRun] = useState(null);
const [runOutput, setRunOutput] = useState('');
const [showSamples, setShowSamples] = useState(false);
const [sampleProviders, setSampleProviders] = useState([]);
const [loadingSamples, setLoadingSamples] = useState(false);
const [addingSample, setAddingSample] = useState({});
- const [fleetPeers, setFleetPeers] = useState([]);
// Samples this machine could actually run. One the server marked
// hardware-`unavailable` has no path to becoming usable here, so it is not
// listed at all rather than listed with a dead "Unavailable" button.
@@ -240,12 +246,13 @@ export default function AIProviders() {
useEffect(() => { loadRuntimes(); }, [loadRuntimes]);
- useEffect(() => {
- if (!fleetSetupOpen || typeof api.getInstances !== 'function') return;
- api.getInstances({ silent: true })
- ?.then((data) => setFleetPeers(Array.isArray(data?.peers) ? data.peers : []))
- ?.catch(() => setFleetPeers([]));
- }, [fleetSetupOpen]);
+ const loadFleetPeers = useCallback(async () => {
+ if (typeof api.getInstances !== 'function') return [];
+ const data = await api.getInstances({ silent: true });
+ return Array.isArray(data?.peers) ? data.peers : [];
+ }, []);
+ const fleetPeersResource = useListResource(loadFleetPeers, { enabled: fleetSetupOpen });
+ const { items: fleetPeers, state: fleetPeersState, error: fleetPeersError, retry: retryFleetPeers } = fleetPeersResource;
useEffect(() => {
if (!activeRun) return;
@@ -281,12 +288,11 @@ export default function AIProviders() {
setLoadError(false);
let providersFailed = false;
const statusRevision = ++observationRevision.current.status;
- const [providersData, appsData, statusData, orchestrationProfilesData] = await Promise.all([
+ const [providersData, statusData, orchestrationProfilesData] = await Promise.all([
api.getProviders({ fresh: true }).catch(() => {
providersFailed = true;
return null;
}),
- api.getApps().catch(() => []),
api.getProviderStatuses().catch(() => ({ providers: {} })),
api.getOrchestrationProfiles?.({ silent: true }).catch(() => ({ profiles: [] })),
]);
@@ -304,7 +310,6 @@ export default function AIProviders() {
? providersData.runnerAllowedCommands
: null);
}
- setApps(appsData);
if (statusRevision === observationRevision.current.status) setStatuses(statusData.providers || {});
const profList = Array.isArray(orchestrationProfilesData)
? orchestrationProfilesData
@@ -1039,17 +1044,22 @@ export default function AIProviders() {
))}
</select>
- <select
- aria-label="Workspace"
- value={selectedWorkspace}
- onChange={(e) => setSelectedWorkspace(e.target.value)}
- className="px-3 py-2 bg-port-bg border border-port-border rounded-lg text-white w-full sm:w-auto"
- >
- <option value="">No workspace</option>
- {apps.map(app => (
- <option key={app.id} value={app.id}>{app.name}</option>
- ))}
- </select>
+ {appsState === 'error' && (
+ <ListLoadError what="workspaces" error={appsError} onRetry={retryApps} />
+ )}
+ {appsState !== 'error' && (
+ <select
+ aria-label="Workspace"
+ value={selectedWorkspace}
+ onChange={(e) => setSelectedWorkspace(e.target.value)}
+ className="px-3 py-2 bg-port-bg border border-port-border rounded-lg text-white w-full sm:w-auto"
+ >
+ <option value="">{appsState === 'ready' && apps.length === 0 ? 'No workspaces found' : 'No workspace'}</option>
+ {apps.map(app => (
+ <option key={app.id} value={app.id}>{app.name}</option>
+ ))}
+ </select>
+ )}
</div>
{(() => {
@@ -1270,6 +1280,9 @@ export default function AIProviders() {
{fleetSetupOpen && (
<FleetProviderSetup
peers={fleetPeers}
+ peersState={fleetPeersState}
+ peersError={fleetPeersError}
+ onRetryPeers={retryFleetPeers}
providers={providers}
onClose={closeForm}
onCreate={handleCreateFleetProvider}
diff --git a/client/src/pages/AIProviders.test.jsx b/client/src/pages/AIProviders.test.jsx
index e7c3f2ea40..e0e046c802 100644
--- a/client/src/pages/AIProviders.test.jsx
+++ b/client/src/pages/AIProviders.test.jsx
@@ -2411,3 +2411,66 @@ it('shares readiness subscriptions and reconciles events, reconnect and tab show
vi.useRealTimers();
}
});
+
+describe('AIProviders list resources (#12171)', () => {
+ it('shows error row with Retry when workspaces fail to load, and recovers on retry', async () => {
+ vi.clearAllMocks();
+ api.getProviders.mockResolvedValue({ providers: [{ id: 'p1', name: 'P1', type: 'api', enabled: true }], activeProvider: 'p1' });
+ api.getApps.mockRejectedValueOnce(new Error('apps offline'));
+ api.getProviderStatuses.mockResolvedValue({ providers: {} });
+ api.getProviderRuntimes.mockResolvedValue({ runtimes: {} });
+ api.getProviderReadiness.mockResolvedValue({ readiness: {} });
+
+ await renderPage();
+ fireEvent.click(await screen.findByRole('button', { name: 'Run Prompt' }));
+
+ const alert = await screen.findByRole('alert');
+ expect(alert).toHaveTextContent('Could not load workspaces — apps offline');
+
+ api.getApps.mockResolvedValueOnce([{ id: 'app-1', name: 'App 1', repoPath: '/path' }]);
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+
+ const workspaceSelect = await screen.findByLabelText('Workspace');
+ expect(workspaceSelect).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+
+ it('shows empty option when workspaces list is empty', async () => {
+ vi.clearAllMocks();
+ api.getProviders.mockResolvedValue({ providers: [{ id: 'p1', name: 'P1', type: 'api', enabled: true }], activeProvider: 'p1' });
+ api.getApps.mockResolvedValue([]);
+ api.getProviderStatuses.mockResolvedValue({ providers: {} });
+ api.getProviderRuntimes.mockResolvedValue({ runtimes: {} });
+ api.getProviderReadiness.mockResolvedValue({ readiness: {} });
+
+ await renderPage();
+ fireEvent.click(await screen.findByRole('button', { name: 'Run Prompt' }));
+
+ const workspaceSelect = await screen.findByLabelText('Workspace');
+ expect(within(workspaceSelect).getByRole('option', { name: 'No workspaces found' })).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+
+ it('shows error row with Retry when fleet peers fail to load in fleet setup', async () => {
+ vi.clearAllMocks();
+ api.getProviders.mockResolvedValue({ providers: [], activeProvider: null });
+ api.getApps.mockResolvedValue([]);
+ api.getProviderStatuses.mockResolvedValue({ providers: {} });
+ api.getProviderRuntimes.mockResolvedValue({ runtimes: {} });
+ api.getProviderReadiness.mockResolvedValue({ readiness: {} });
+ api.getInstances.mockRejectedValueOnce(new Error('tailnet unreachable'));
+
+ mountPage('/ai/fleet?fleetStep=client');
+
+ const alert = await screen.findByRole('alert');
+ expect(alert).toHaveTextContent('Could not load fleet peers — tailnet unreachable');
+
+ api.getInstances.mockResolvedValueOnce({ peers: [{ id: 'peer-1', name: 'Peer 1', host: 'host.ts.net', enabled: true }] });
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+
+ await waitFor(() => {
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+ expect(await screen.findByLabelText('Known PortOS peer')).toBeInTheDocument();
+ });
+});
diff --git a/client/src/pages/HistoryPage.jsx b/client/src/pages/HistoryPage.jsx
index 585ff98cf6..e863911d9b 100644
--- a/client/src/pages/HistoryPage.jsx
+++ b/client/src/pages/HistoryPage.jsx
@@ -5,6 +5,8 @@ import { formatTime, formatRuntime, formatDateTime } from '../utils/formatters';
import PageSkeleton from '../components/ui/PageSkeleton';
import LoadFailedState from '../components/ui/LoadFailedState';
import Banner from '../components/ui/Banner';
+import ListLoadError from '../components/ui/ListLoadError';
+import useListResource from '../hooks/useListResource.js';
import { clickableProps, onActivateKeyDown } from '../lib/a11yKeyboard.js';
export function HistoryPage() {
@@ -13,25 +15,29 @@ export function HistoryPage() {
const [loading, setLoading] = useState(true);
const [historyFailed, setHistoryFailed] = useState(false);
const [filter, setFilter] = useState({ action: '', success: '' });
- const [actions, setActions] = useState([]);
const [confirmingClear, setConfirmingClear] = useState(false);
const [expandedId, setExpandedId] = useState(null);
+ const fetchActions = useCallback(async () => {
+ const list = await api.getHistoryActions({ silent: true });
+ return Array.isArray(list) ? list : [];
+ }, []);
+ const actionsResource = useListResource(fetchActions);
+ const { items: actions, state: actionsState, error: actionsError, retry: retryActions } = actionsResource;
+
const loadData = useCallback(async () => {
setLoading(true);
- const [historyData, statsData, actionsData] = await Promise.all([
+ const [historyData, statsData] = await Promise.all([
api.getHistory({
limit: 100,
action: filter.action || undefined,
success: filter.success !== '' ? filter.success === 'true' : undefined
}).catch(() => null),
api.getHistoryStats().catch(() => null),
- api.getHistoryActions().catch(() => [])
]);
setHistoryFailed(historyData === null);
if (historyData) setHistory(historyData.entries || []);
setStats(statsData);
- setActions(actionsData);
setLoading(false);
}, [filter]);
@@ -110,19 +116,23 @@ export function HistoryPage() {
)}
{/* Filters */}
- <div className="flex flex-col sm:flex-row gap-3 sm:gap-4 sm:items-center">
- <div className="flex flex-wrap gap-2 sm:gap-4">
- <select
- value={filter.action}
- onChange={(e) => setFilter(prev => ({ ...prev, action: e.target.value }))}
- className="px-3 py-2 bg-port-bg border border-port-border rounded-lg text-white focus:outline-hidden focus:ring-2 focus:ring-port-accent"
- aria-label="Filter by action type"
- >
- <option value="">All Actions</option>
- {actions.map(action => (
- <option key={action} value={action}>{action}</option>
- ))}
- </select>
+ <div className="space-y-2">
+ {actionsState === 'error' && (
+ <ListLoadError what="history actions" error={actionsError} onRetry={retryActions} />
+ )}
+ <div className="flex flex-col sm:flex-row gap-3 sm:gap-4 sm:items-center">
+ <div className="flex flex-wrap gap-2 sm:gap-4">
+ <select
+ value={filter.action}
+ onChange={(e) => setFilter(prev => ({ ...prev, action: e.target.value }))}
+ className="px-3 py-2 bg-port-bg border border-port-border rounded-lg text-white focus:outline-hidden focus:ring-2 focus:ring-port-accent"
+ aria-label="Filter by action type"
+ >
+ <option value="">{actionsState === 'ready' && actions.length === 0 ? 'No actions available' : 'All Actions'}</option>
+ {actions.map(action => (
+ <option key={action} value={action}>{action}</option>
+ ))}
+ </select>
<select
value={filter.success}
@@ -162,6 +172,7 @@ export function HistoryPage() {
Clear History
</button>
)}
+ </div>
</div>
{/* History List */}
diff --git a/client/src/pages/HistoryPage.test.jsx b/client/src/pages/HistoryPage.test.jsx
new file mode 100644
index 0000000000..fecf66abd7
--- /dev/null
+++ b/client/src/pages/HistoryPage.test.jsx
@@ -0,0 +1,52 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen, fireEvent, waitFor, within } from '@testing-library/react';
+
+const api = vi.hoisted(() => ({
+ getHistory: vi.fn(),
+ getHistoryStats: vi.fn(),
+ getHistoryActions: vi.fn(),
+ clearHistory: vi.fn(),
+ deleteHistoryEntry: vi.fn(),
+}));
+
+vi.mock('../services/api', () => api);
+
+import { HistoryPage } from './HistoryPage';
+
+describe('HistoryPage list resources (#12171)', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ api.getHistory.mockResolvedValue({ entries: [] });
+ api.getHistoryStats.mockResolvedValue({ total: 0, successRate: 100, last24h: 0, byAction: {} });
+ });
+
+ it('shows error row with Retry when history actions fail to load, and recovers on retry', async () => {
+ api.getHistoryActions.mockRejectedValueOnce(new Error('actions backend offline'));
+
+ render(<HistoryPage />);
+
+ const alert = await screen.findByRole('alert');
+ expect(alert).toHaveTextContent('Could not load history actions — actions backend offline');
+
+ api.getHistoryActions.mockResolvedValueOnce(['start', 'stop', 'restart']);
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+
+ await waitFor(() => {
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+
+ const select = screen.getByLabelText('Filter by action type');
+ expect(within(select).getByRole('option', { name: 'start' })).toBeInTheDocument();
+ expect(within(select).getByRole('option', { name: 'stop' })).toBeInTheDocument();
+ });
+
+ it('shows empty option when history actions list is empty', async () => {
+ api.getHistoryActions.mockResolvedValue([]);
+
+ render(<HistoryPage />);
+
+ const select = await screen.findByLabelText('Filter by action type');
+ expect(within(select).getByRole('option', { name: 'No actions available' })).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+});
diff --git a/client/src/pages/Privacy.jsx b/client/src/pages/Privacy.jsx
index 201a6931f6..1c574487d7 100644
--- a/client/src/pages/Privacy.jsx
+++ b/client/src/pages/Privacy.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useCallback } from 'react';
import { useNavigate } from 'react-router';
import { Shield, LayoutDashboard, KeyRound, Building2, Repeat, ShieldOff } from 'lucide-react';
import { useValidTab } from '../hooks/useValidTab';
@@ -13,6 +13,8 @@ import PrivacyChangesTab from '../components/privacy/PrivacyChangesTab';
import PrivacyBrokersTab from '../components/privacy/PrivacyBrokersTab';
import SubjectSwitcher from '../components/privacy/SubjectSwitcher';
import SubjectsDrawer from '../components/privacy/SubjectsDrawer';
+import ListLoadError from '../components/ui/ListLoadError';
+import useListResource from '../hooks/useListResource.js';
import { SELF_SUBJECT_ID, privacyTabPath } from '../components/privacy/constants';
import { getPageNavTabs } from '../../../server/lib/navManifest.js';
import { buildPageNavTabs } from '../lib/pageNavTabs.js';
@@ -35,7 +37,6 @@ export default function Privacy() {
const navigate = useNavigate();
const activeTab = useValidTab(TABS, 'overview');
const [searchParams, updateParams] = useUrlParams();
- const [subjects, setSubjects] = useState([]);
const [drawerOpen, setDrawerOpen] = useState(false);
// Which household subject is in scope lives in the URL (#3658), so a view of
@@ -43,11 +44,18 @@ export default function Privacy() {
// other selection. An absent param means `self`, matching the server default.
const subjectId = searchParams.get('subject') || SELF_SUBJECT_ID;
- useEffect(() => {
- getPrivacySubjects({ silent: true })
- .then((rows) => setSubjects(rows || []))
- .catch(() => setSubjects([]));
+ const fetchSubjects = useCallback(async () => {
+ const rows = await getPrivacySubjects({ silent: true });
+ return Array.isArray(rows) ? rows : [];
}, []);
+ const subjectsResource = useListResource(fetchSubjects);
+ const {
+ items: subjects,
+ state: subjectsState,
+ error: subjectsError,
+ retry: retrySubjects,
+ setItems: setSubjects,
+ } = subjectsResource;
// `self` is the default scope, so it stays out of the URL entirely — a null
// patch value is `useUrlParams`'s delete signal.
@@ -123,7 +131,10 @@ export default function Privacy() {
mobileCompact
ariaLabel="Privacy Center sections"
/>
- <div className="flex-1 min-h-0 overflow-auto p-4 md:p-6">
+ <div className="flex-1 min-h-0 overflow-auto p-4 md:p-6 space-y-4">
+ {subjectsState === 'error' && (
+ <ListLoadError what="household subjects" error={subjectsError} onRetry={retrySubjects} />
+ )}
<div>
<SubjectSwitcher
subjects={subjects}
@@ -132,6 +143,9 @@ export default function Privacy() {
onManage={() => setDrawerOpen(true)}
/>
</div>
+ {subjectsState === 'ready' && subjects.length === 0 && (
+ <p className="text-xs text-gray-500">No household subjects on record.</p>
+ )}
{/* Keying on the subject remounts the tab when the scope changes, so ALL
of its local state resets at once — revealed plaintext, open drawers,
expanded rows, filters. Clearing those by hand inside each tab's
diff --git a/client/src/pages/Privacy.test.jsx b/client/src/pages/Privacy.test.jsx
index d0214a868e..5091aec33c 100644
--- a/client/src/pages/Privacy.test.jsx
+++ b/client/src/pages/Privacy.test.jsx
@@ -2,19 +2,21 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
import { render, screen, waitFor, fireEvent, act } from '@testing-library/react';
import { MemoryRouter, Routes, Route } from 'react-router';
+const SUBJECTS = vi.hoisted(() => [
+ {
+ id: '00000000-0000-4000-8000-000000000001', displayName: 'Me', relationship: 'self',
+ isSelf: true, consentCount: 1, recordCount: 2, activeScopes: ['pii_vault'],
+ },
+ {
+ id: 'sub-2', displayName: 'Alex', relationship: 'partner',
+ isSelf: false, consentCount: 1, recordCount: 1, activeScopes: ['pii_vault'],
+ },
+]);
+
// ── Mock the API surface ─────────────────────────────────────────────────────
vi.mock('../services/api', () => ({
// Household subjects (#3658) — `self` plus one consenting partner.
- getPrivacySubjects: vi.fn().mockResolvedValue([
- {
- id: '00000000-0000-4000-8000-000000000001', displayName: 'Me', relationship: 'self',
- isSelf: true, consentCount: 1, recordCount: 2, activeScopes: ['pii_vault'],
- },
- {
- id: 'sub-2', displayName: 'Alex', relationship: 'partner',
- isSelf: false, consentCount: 1, recordCount: 1, activeScopes: ['pii_vault'],
- },
- ]),
+ getPrivacySubjects: vi.fn().mockResolvedValue(SUBJECTS),
createPrivacySubject: vi.fn(),
deletePrivacySubject: vi.fn(),
getPrivacySubjectConsents: vi.fn().mockResolvedValue([]),
@@ -106,7 +108,10 @@ function renderAt(path) {
}
describe('Privacy Center', () => {
- beforeEach(() => { vi.clearAllMocks(); });
+ beforeEach(() => {
+ vi.clearAllMocks();
+ getPrivacySubjects.mockResolvedValue(SUBJECTS);
+ });
it('renders the Overview tab with encryption status and counts', async () => {
renderAt('/privacy/overview');
@@ -226,5 +231,29 @@ describe('Privacy Center', () => {
await waitFor(() => expect(select).toHaveValue('deleted-subject'));
expect(screen.getByRole('option', { name: 'Unknown subject' })).toBeInTheDocument();
});
+
+ it('shows error row with Retry when subjects fail to load, and recovers on retry', async () => {
+ getPrivacySubjects.mockRejectedValueOnce(new Error('db connection error'));
+ renderAt('/privacy/vault');
+
+ const alert = await screen.findByRole('alert');
+ expect(alert).toHaveTextContent('Could not load household subjects — db connection error');
+
+ getPrivacySubjects.mockResolvedValueOnce(SUBJECTS);
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+
+ await waitFor(() => {
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+ expect(screen.getByLabelText('Subject')).toBeInTheDocument();
+ });
+
+ it('shows empty copy when subjects list is empty and ready', async () => {
+ getPrivacySubjects.mockResolvedValue([]);
+ renderAt('/privacy/vault');
+
+ expect(await screen.findByText('No household subjects on record.')).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
});
});
diff --git a/client/src/pages/ProcessesPage.jsx b/client/src/pages/ProcessesPage.jsx
index 00ad918b9c..92b9637b00 100644
--- a/client/src/pages/ProcessesPage.jsx
+++ b/client/src/pages/ProcessesPage.jsx
@@ -1,30 +1,34 @@
-import { useState, useEffect } from 'react';
+import { useState, useMemo, useCallback } from 'react';
import { Save } from 'lucide-react';
import ProcessesTab from '../components/apps/tabs/ProcessesTab';
import toast from '../components/ui/Toast';
import * as api from '../services/api';
import { executeCommand } from '../services/api';
+import useListResource from '../hooks/useListResource.js';
+import ListLoadError from '../components/ui/ListLoadError';
export function ProcessesPage() {
- const [managedProcessNames, setManagedProcessNames] = useState(new Set());
const [saving, setSaving] = useState(false);
- useEffect(() => {
- const loadManagedProcessNames = async () => {
- const apps = await api.getApps().catch(() => []);
- const names = new Set();
- apps.forEach(app => {
- (app.pm2ProcessNames || []).forEach(name => names.add(name));
- });
- setManagedProcessNames(names);
- };
- loadManagedProcessNames();
+ const fetchApps = useCallback(async () => {
+ const list = await api.getApps({ silent: true });
+ return Array.isArray(list) ? list : [];
}, []);
+ const appsResource = useListResource(fetchApps);
+ const { items: apps, state: appsState, error: appsError, retry: retryApps } = appsResource;
- const isPortOSManaged = (procName) => {
+ const managedProcessNames = useMemo(() => {
+ const names = new Set();
+ apps.forEach(app => {
+ (app.pm2ProcessNames || []).forEach(name => names.add(name));
+ });
+ return names;
+ }, [apps]);
+
+ const isPortOSManaged = useCallback((procName) => {
if (procName.startsWith('portos-')) return true;
return managedProcessNames.has(procName);
- };
+ }, [managedProcessNames]);
const handlePm2Save = async () => {
setSaving(true);
@@ -55,6 +59,13 @@ export function ProcessesPage() {
</button>
</div>
+ {appsState === 'error' && (
+ <ListLoadError what="managed apps" error={appsError} onRetry={retryApps} />
+ )}
+ {appsState === 'ready' && apps.length === 0 && (
+ <p className="text-xs text-gray-500">No managed apps configured.</p>
+ )}
+
<ProcessesTab filterFn={isPortOSManaged} />
</div>
);
diff --git a/client/src/pages/ProcessesPage.test.jsx b/client/src/pages/ProcessesPage.test.jsx
new file mode 100644
index 0000000000..7853488ee2
--- /dev/null
+++ b/client/src/pages/ProcessesPage.test.jsx
@@ -0,0 +1,50 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+
+const api = vi.hoisted(() => ({
+ getApps: vi.fn(),
+ executeCommand: vi.fn(),
+}));
+
+vi.mock('../services/api', () => api);
+vi.mock('../components/apps/tabs/ProcessesTab', () => ({
+ default: () => <div data-testid="processes-tab">Processes Tab</div>,
+}));
+vi.mock('../components/ui/Toast', () => ({
+ default: { success: vi.fn(), error: vi.fn() },
+}));
+
+import { ProcessesPage } from './ProcessesPage';
+
+describe('ProcessesPage list resources (#12171)', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
+ it('shows error row with Retry when managed apps fail to load, and recovers on retry', async () => {
+ api.getApps.mockRejectedValueOnce(new Error('pm2 offline'));
+
+ render(<ProcessesPage />);
+
+ const alert = await screen.findByRole('alert');
+ expect(alert).toHaveTextContent('Could not load managed apps — pm2 offline');
+
+ api.getApps.mockResolvedValueOnce([{ id: 'app-1', name: 'App 1', pm2ProcessNames: ['portos-app-1'] }]);
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+
+ await waitFor(() => {
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+ expect(screen.getByTestId('processes-tab')).toBeInTheDocument();
+ });
+
+ it('shows empty copy when managed apps list is empty', async () => {
+ api.getApps.mockResolvedValue([]);
+
+ render(<ProcessesPage />);
+
+ expect(await screen.findByText('No managed apps configured.')).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ expect(screen.getByTestId('processes-tab')).toBeInTheDocument();
+ });
+});
diff --git a/client/src/pages/RunnerPage.jsx b/client/src/pages/RunnerPage.jsx
index 05334eb533..7203ebf426 100644
--- a/client/src/pages/RunnerPage.jsx
+++ b/client/src/pages/RunnerPage.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef, useCallback } from 'react';
import { useLocation, useNavigate } from 'react-router';
import { Clock, Image, X, Info, Code2 } from 'lucide-react';
import toast from '../components/ui/Toast';
@@ -10,6 +10,8 @@ import { processScreenshotUploads } from '../services/apiMedia';
import { filterSelectableModels } from '../utils/providers';
import ProviderModelSelector from '../components/ProviderModelSelector';
import PageHeader from '../components/PageHeader';
+import useListResource from '../hooks/useListResource.js';
+import ListLoadError from '../components/ui/ListLoadError';
export function RunnerPage() {
const location = useLocation();
@@ -22,17 +24,34 @@ export function RunnerPage() {
const [running, setRunning] = useState(false);
const [runId, setRunId] = useState(null);
const [commandId, setCommandId] = useState(null);
- const [apps, setApps] = useState([]);
const [providers, setProviders] = useState([]);
const [selectedProvider, setSelectedProvider] = useState('');
const [selectedModel, setSelectedModel] = useState('');
const [timeoutMinutes, setTimeoutMinutes] = useState(30);
- const [allowedCommands, setAllowedCommands] = useState([]);
const [screenshots, setScreenshots] = useState([]);
const [continueContext, setContinueContext] = useState(null);
const outputRef = useRef(null);
const continueWorkspaceRef = useRef(location.state?.continueFrom?.workspacePath ?? null);
+ const fetchApps = useCallback(async () => {
+ const list = await api.getApps({ silent: true });
+ return (Array.isArray(list) ? list : []).filter(a => a.id !== 'portos-autofixer');
+ }, []);
+ const appsResource = useListResource(fetchApps);
+ const { items: apps, state: appsState, error: appsError, retry: retryApps } = appsResource;
+
+ const fetchAllowedCommands = useCallback(async () => {
+ const list = await api.getAllowedCommands({ silent: true });
+ return Array.isArray(list) ? list : [];
+ }, []);
+ const allowedCommandsResource = useListResource(fetchAllowedCommands);
+ const {
+ items: allowedCommands,
+ state: allowedCommandsState,
+ error: allowedCommandsError,
+ retry: retryAllowedCommands,
+ } = allowedCommandsResource;
+
// Get the selected app's repoPath
const selectedApp = apps.find(a => a.id === selectedAppId);
const workspacePath = selectedApp?.repoPath || '';
@@ -55,36 +74,34 @@ export function RunnerPage() {
}, [location.state, navigate]);
useEffect(() => {
- Promise.all([
- api.getApps().catch(() => []),
- api.getProviders().catch(() => ({ providers: [] })),
- api.getAllowedCommands().catch(() => [])
- ]).then(([appsData, providersRes, cmds]) => {
- // Filter out PortOS Autofixer (it's part of PortOS project)
- const filteredApps = appsData.filter(a => a.id !== 'portos-autofixer');
- setApps(filteredApps);
- // Set workspace: prefer continuation context (stored in ref), then PortOS, then first app
- setSelectedAppId(prev => {
- if (prev) return prev;
- if (continueWorkspaceRef.current) {
- const continueApp = filteredApps.find(a => a.repoPath === continueWorkspaceRef.current);
- if (continueApp) return continueApp.id;
+ api.getProviders({ silent: true })
+ .then((providersRes) => {
+ const allProviders = providersRes?.providers || [];
+ const enabledProviders = allProviders.filter(p => p.enabled);
+ setProviders(enabledProviders);
+ if (enabledProviders.length > 0) {
+ const active = enabledProviders.find(p => p.id === providersRes.activeProvider) || enabledProviders[0];
+ setSelectedProvider(prev => prev || active.id);
+ setSelectedModel(prev => prev || active.defaultModel || '');
}
- const portosApp = filteredApps.find(a => a.name === 'PortOS');
- if (portosApp) return portosApp.id;
- return filteredApps.length > 0 ? filteredApps[0].id : prev;
- });
- const allProviders = providersRes.providers || [];
- const enabledProviders = allProviders.filter(p => p.enabled);
- setProviders(enabledProviders);
- if (enabledProviders.length > 0) {
- const active = enabledProviders.find(p => p.id === providersRes.activeProvider) || enabledProviders[0];
- setSelectedProvider(prev => prev || active.id);
- setSelectedModel(prev => prev || active.defaultModel || '');
+ })
+ .catch((_err) => {});
+ }, []);
+
+ useEffect(() => {
+ if (appsState !== 'ready') return;
+ // Set workspace: prefer continuation context (stored in ref), then PortOS, then first app
+ setSelectedAppId(prev => {
+ if (prev) return prev;
+ if (continueWorkspaceRef.current) {
+ const continueApp = apps.find(a => a.repoPath === continueWorkspaceRef.current);
+ if (continueApp) return continueApp.id;
}
- setAllowedCommands(cmds);
+ const portosApp = apps.find(a => a.name === 'PortOS');
+ if (portosApp) return portosApp.id;
+ return apps.length > 0 ? apps[0].id : prev;
});
- }, []);
+ }, [apps, appsState]);
// Subscribe to run output
useEffect(() => {
@@ -350,16 +367,24 @@ ${prompt.trim()}`;
{/* Configuration Row */}
<div className="flex flex-wrap gap-3">
{/* Workspace */}
- <select
- aria-label="Workspace"
- value={selectedAppId}
- onChange={(e) => setSelectedAppId(e.target.value)}
- className="px-3 py-2 bg-port-bg border border-port-border rounded-lg text-white text-sm"
- >
- {apps.map(app => (
- <option key={app.id} value={app.id}>{app.name}</option>
- ))}
- </select>
+ {appsState === 'error' && (
+ <ListLoadError what="workspaces" error={appsError} onRetry={retryApps} />
+ )}
+ {appsState !== 'error' && (
+ <select
+ aria-label="Workspace"
+ value={selectedAppId}
+ onChange={(e) => setSelectedAppId(e.target.value)}
+ className="px-3 py-2 bg-port-bg border border-port-border rounded-lg text-white text-sm"
+ >
+ {appsState === 'ready' && apps.length === 0 && (
+ <option value="">No workspaces found</option>
+ )}
+ {apps.map(app => (
+ <option key={app.id} value={app.id}>{app.name}</option>
+ ))}
+ </select>
+ )}
{mode === 'ai' && (
<>
@@ -491,9 +516,16 @@ ${prompt.trim()}`;
</button>
)}
</div>
- <div className="text-xs text-gray-500 break-words">
- Allowed: {allowedCommands.slice(0, 10).join(', ')}{allowedCommands.length > 10 ? `, +${allowedCommands.length - 10} more` : ''}
- </div>
+ {allowedCommandsState === 'error' && (
+ <ListLoadError what="allowed commands" error={allowedCommandsError} onRetry={retryAllowedCommands} />
+ )}
+ {allowedCommandsState === 'ready' && (
+ <div className="text-xs text-gray-500 break-words">
+ {allowedCommands.length === 0
+ ? 'No allowed commands configured'
+ : `Allowed: ${allowedCommands.slice(0, 10).join(', ')}${allowedCommands.length > 10 ? `, +${allowedCommands.length - 10} more` : ''}`}
+ </div>
+ )}
</>
)}
diff --git a/client/src/pages/RunnerPage.test.jsx b/client/src/pages/RunnerPage.test.jsx
new file mode 100644
index 0000000000..9f53091648
--- /dev/null
+++ b/client/src/pages/RunnerPage.test.jsx
@@ -0,0 +1,110 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen, fireEvent, waitFor, within } from '@testing-library/react';
+import { MemoryRouter } from 'react-router';
+
+const api = vi.hoisted(() => ({
+ getApps: vi.fn(),
+ getProviders: vi.fn().mockResolvedValue({ providers: [], activeProvider: null }),
+ getAllowedCommands: vi.fn(),
+ createRun: vi.fn(),
+ stopRun: vi.fn(),
+ executeCommand: vi.fn(),
+ stopCommand: vi.fn(),
+}));
+
+vi.mock('../services/api', () => api);
+vi.mock('../services/socket', () => ({
+ default: { on: vi.fn(), off: vi.fn(), emit: vi.fn() },
+}));
+vi.mock('../hooks/useSocketSubscription', () => ({
+ useSocketSubscription: vi.fn(),
+}));
+vi.mock('../components/ui/Toast', () => ({
+ default: { success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() },
+}));
+
+import { RunnerPage } from './RunnerPage';
+
+describe('RunnerPage list resources (#12171)', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ api.getProviders.mockResolvedValue({ providers: [], activeProvider: null });
+ });
+
+ it('shows error row with Retry when workspaces fail to load, and recovers on retry', async () => {
+ api.getApps.mockRejectedValueOnce(new Error('apps offline'));
+ api.getAllowedCommands.mockResolvedValue(['git status']);
+
+ render(
+ <MemoryRouter>
+ <RunnerPage />
+ </MemoryRouter>
+ );
+
+ const alert = await screen.findByRole('alert');
+ expect(alert).toHaveTextContent('Could not load workspaces — apps offline');
+
+ api.getApps.mockResolvedValueOnce([{ id: 'app-1', name: 'My App', repoPath: '/test' }]);
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+
+ const select = await screen.findByLabelText('Workspace');
+ expect(select).toBeInTheDocument();
+ expect(screen.getByRole('option', { name: 'My App' })).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+
+ it('shows empty option when workspaces list is empty', async () => {
+ api.getApps.mockResolvedValue([]);
+ api.getAllowedCommands.mockResolvedValue(['git status']);
+
+ render(
+ <MemoryRouter>
+ <RunnerPage />
+ </MemoryRouter>
+ );
+
+ const select = await screen.findByLabelText('Workspace');
+ expect(within(select).getByRole('option', { name: 'No workspaces found' })).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+
+ it('shows error row with Retry when allowed commands fail to load, and recovers on retry', async () => {
+ api.getApps.mockResolvedValue([{ id: 'app-1', name: 'My App', repoPath: '/test' }]);
+ api.getAllowedCommands.mockRejectedValueOnce(new Error('commands offline'));
+
+ render(
+ <MemoryRouter>
+ <RunnerPage />
+ </MemoryRouter>
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Shell Command' }));
+
+ const alert = await screen.findByRole('alert');
+ expect(alert).toHaveTextContent('Could not load allowed commands — commands offline');
+
+ api.getAllowedCommands.mockResolvedValueOnce(['npm test', 'git status']);
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+
+ await waitFor(() => {
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+ expect(screen.getByText(/Allowed: npm test, git status/)).toBeInTheDocument();
+ });
+
+ it('shows empty copy when allowed commands list is empty', async () => {
+ api.getApps.mockResolvedValue([{ id: 'app-1', name: 'My App', repoPath: '/test' }]);
+ api.getAllowedCommands.mockResolvedValue([]);
+
+ render(
+ <MemoryRouter>
+ <RunnerPage />
+ </MemoryRouter>
+ );
+
+ fireEvent.click(screen.getByRole('button', { name: 'Shell Command' }));
+
+ expect(await screen.findByText('No allowed commands configured')).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+});
diff --git a/client/src/pages/Templates.jsx b/client/src/pages/Templates.jsx
index 4a58370849..6ae6d33232 100644
--- a/client/src/pages/Templates.jsx
+++ b/client/src/pages/Templates.jsx
@@ -1,10 +1,12 @@
-import { useState, useEffect } from 'react';
+import { useState, useCallback } from 'react';
import { useNavigate } from 'react-router';
import { Layers, Code, Server, Globe, Smartphone, MonitorSmartphone, Plus } from 'lucide-react';
import * as api from '../services/api';
import FolderPicker from '../components/FolderPicker';
import { FormField } from '../components/ui/FormField';
import PageSkeleton from '../components/ui/PageSkeleton';
+import useListResource from '../hooks/useListResource.js';
+import ListLoadError from '../components/ui/ListLoadError';
const ICONS = {
layers: Layers,
@@ -17,8 +19,6 @@ const ICONS = {
export default function Templates() {
const navigate = useNavigate();
- const [templates, setTemplates] = useState([]);
- const [loading, setLoading] = useState(true);
const [selectedTemplate, setSelectedTemplate] = useState(null);
const [createMode, setCreateMode] = useState(false);
const [appName, setAppName] = useState('');
@@ -26,15 +26,12 @@ export default function Templates() {
const [creating, setCreating] = useState(false);
const [error, setError] = useState(null);
- useEffect(() => {
- loadTemplates();
+ const fetchTemplates = useCallback(async () => {
+ const serverTemplates = await api.getTemplates({ silent: true });
+ return Array.isArray(serverTemplates) ? serverTemplates : [];
}, []);
-
- const loadTemplates = async () => {
- const serverTemplates = await api.getTemplates().catch(() => []);
- setTemplates(serverTemplates);
- setLoading(false);
- };
+ const templatesResource = useListResource(fetchTemplates);
+ const { items: templates, state: templatesState, error: templatesError, retry: retryTemplates } = templatesResource;
const handleSelectTemplate = (template) => {
setSelectedTemplate(template);
@@ -67,7 +64,7 @@ export default function Templates() {
navigate('/apps');
};
- if (loading) {
+ if (templatesState === 'loading') {
return (
<PageSkeleton
label="Loading app templates"
@@ -165,7 +162,14 @@ export default function Templates() {
</form>
</div>
) : (
- <div className="grid gap-4 grid-cols-1 md:grid-cols-2 xl:grid-cols-3">
+ <>
+ {templatesState === 'error' && (
+ <ListLoadError className="mb-4" what="app templates" error={templatesError} onRetry={retryTemplates} />
+ )}
+ {templatesState === 'ready' && templates.length === 0 && (
+ <p className="text-sm text-gray-500 mb-4">No app templates available.</p>
+ )}
+ <div className="grid gap-4 grid-cols-1 md:grid-cols-2 xl:grid-cols-3">
{templates.map(template => {
const Icon = ICONS[template.icon] || Layers;
return (
@@ -219,6 +223,7 @@ export default function Templates() {
<span>Add Custom Template</span>
</button>
</div>
+ </>
)}
{/* Info */}
diff --git a/client/src/pages/Templates.test.jsx b/client/src/pages/Templates.test.jsx
new file mode 100644
index 0000000000..11776a8bef
--- /dev/null
+++ b/client/src/pages/Templates.test.jsx
@@ -0,0 +1,58 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { MemoryRouter } from 'react-router';
+
+const api = vi.hoisted(() => ({
+ getTemplates: vi.fn(),
+ createFromTemplate: vi.fn(),
+}));
+
+vi.mock('../services/api', () => api);
+vi.mock('../components/FolderPicker', () => ({
+ default: () => <div data-testid="folder-picker" />,
+}));
+
+import Templates from './Templates';
+
+describe('Templates list resources (#12171)', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
+ it('shows error row with Retry when templates fail to load, and recovers on retry', async () => {
+ api.getTemplates.mockRejectedValueOnce(new Error('templates service down'));
+
+ render(
+ <MemoryRouter>
+ <Templates />
+ </MemoryRouter>
+ );
+
+ const alert = await screen.findByRole('alert');
+ expect(alert).toHaveTextContent('Could not load app templates — templates service down');
+
+ api.getTemplates.mockResolvedValueOnce([
+ { id: 'tpl-1', name: 'React App', description: 'Standard React template', icon: 'code', builtIn: true }
+ ]);
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+
+ await waitFor(() => {
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
+ expect(screen.getByText('React App')).toBeInTheDocument();
+ });
+
+ it('shows empty copy when templates list is empty', async () => {
+ api.getTemplates.mockResolvedValue([]);
+
+ render(
+ <MemoryRouter>
+ <Templates />
+ </MemoryRouter>
+ );
+
+ expect(await screen.findByText('No app templates available.')).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ expect(screen.getByText('Add Custom Template')).toBeInTheDocument();
+ });
+});
diff --git a/client/src/services/apiCommands.js b/client/src/services/apiCommands.js
index b8eab08e36..2552d97412 100644
--- a/client/src/services/apiCommands.js
+++ b/client/src/services/apiCommands.js
@@ -7,7 +7,7 @@ export const executeCommand = (command, workspacePath, options = {}) => request(
...options
});
export const stopCommand = (id) => request(`/commands/${id}/stop`, { method: 'POST' });
-export const getAllowedCommands = () => request('/commands/allowed');
+export const getAllowedCommands = (options = {}) => request('/commands/allowed', options);
export const getProcessesList = ({ appId, ...options } = {}) => request(
`/commands/processes${appId ? `?appId=${encodeURIComponent(appId)}` : ''}`, options
);
diff --git a/client/src/services/apiHistory.js b/client/src/services/apiHistory.js
index 2b3b579c2b..d600fb7e38 100644
--- a/client/src/services/apiHistory.js
+++ b/client/src/services/apiHistory.js
@@ -10,7 +10,7 @@ export const getHistory = (options = {}) => {
return request(`/history?${params}`);
};
export const getHistoryStats = () => request('/history/stats');
-export const getHistoryActions = () => request('/history/actions');
+export const getHistoryActions = (options = {}) => request('/history/actions', options);
export const clearHistory = (olderThanDays) => request(
olderThanDays ? `/history?olderThanDays=${olderThanDays}` : '/history',
{ method: 'DELETE' }
diff --git a/client/src/services/apiScaffold.js b/client/src/services/apiScaffold.js
index b799e86737..892ede55b4 100644
--- a/client/src/services/apiScaffold.js
+++ b/client/src/services/apiScaffold.js
@@ -1,7 +1,7 @@
import { request } from './apiCore.js';
// Templates & Scaffold
-export const getTemplates = () => request('/scaffold/templates');
+export const getTemplates = (options = {}) => request('/scaffold/templates', options);
export const getDirectories = (path = null, { includeFiles = false } = {}) => {
const params = new URLSearchParams();