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: surface story and pipeline list read errors (#12169)

Adam Eivyfffb6be64ccb
diff --git a/client/src/listFetchConventions.test.js b/client/src/listFetchConventions.test.js
index d17121682d..b7df8b1f53 100644
--- a/client/src/listFetchConventions.test.js
+++ b/client/src/listFetchConventions.test.js
@@ -52,29 +52,18 @@ export const LIST_COLLAPSE = /\.catch\(\s*\(\s*\)\s*=>\s*(?:\[\]|\{?\s*set[A-Z]\
*/
const KNOWN = Object.freeze({
'src/pages/AIProviders.jsx': 2,
- 'src/pages/Catalog.jsx': 2,
- 'src/pages/DeckDetail.jsx': 1,
- 'src/pages/Decks.jsx': 1,
- 'src/pages/FableLoom.jsx': 1,
'src/pages/Game.jsx': 1,
'src/pages/HistoryPage.jsx': 1,
- 'src/pages/Importer.jsx': 2,
'src/pages/LoraTraining.jsx': 1,
'src/pages/MediaCollectionDetail.jsx': 1,
'src/pages/MusicVideo.jsx': 1,
- 'src/pages/Pipeline.jsx': 2,
- 'src/pages/PipelineEditorialChecks.jsx': 1,
- 'src/pages/PipelineSeries.jsx': 1,
'src/pages/Privacy.jsx': 1,
'src/pages/ProcessesPage.jsx': 1,
'src/pages/RunnerPage.jsx': 2,
'src/pages/Sprites.jsx': 3,
- 'src/pages/StoryBuilder.jsx': 1,
'src/pages/Templates.jsx': 1,
- 'src/pages/Universes.jsx': 2,
'src/pages/VideoDownloaderPage.jsx': 1,
'src/pages/VideoTimeline.jsx': 2,
- 'src/pages/WritersRoom.jsx': 1,
});
const countIn = (source) => (source.match(LIST_COLLAPSE) || []).length;
diff --git a/client/src/pages/Catalog.jsx b/client/src/pages/Catalog.jsx
index 19a77e7aac..1b9639dd75 100644
--- a/client/src/pages/Catalog.jsx
+++ b/client/src/pages/Catalog.jsx
@@ -33,6 +33,8 @@ import {
} from '../services/apiCatalog';
import { listUniverseNames } from '../services/apiUniverseBuilder';
import { listPipelineSeriesNames } from '../services/apiPipeline';
+import useListResource from '../hooks/useListResource';
+import ListLoadError from '../components/ui/ListLoadError';
import CatalogCard from '../components/catalog/CatalogCard';
import CatalogAlbum from '../components/catalog/CatalogAlbum';
import { CatalogTypesTab } from '../components/settings/CatalogTypesTab';
@@ -122,6 +124,15 @@ export default function Catalog() {
const [selectedItems, setSelectedItems] = useState(() => new Map());
const [remixMenuOpen, setRemixMenuOpen] = useState(false);
const [addMenuOpen, setAddMenuOpen] = useState(false);
+ const fetchPlaceUniverses = useCallback(() => listUniverseNames({ silent: true }), []);
+ const placeUniversesResource = useListResource(fetchPlaceUniverses, { enabled: addMenuOpen });
+ const fetchPlaceSeries = useCallback(() => listPipelineSeriesNames({ silent: true }), []);
+ const placeSeriesResource = useListResource(fetchPlaceSeries, { enabled: addMenuOpen });
+ const placeTargets = useMemo(() => ({
+ universes: placeUniversesResource.items.map((u) => ({ refKind: 'universe', refId: u.id, label: u.name || '(untitled universe)' })),
+ series: placeSeriesResource.items.map((s) => ({ refKind: 'series', refId: s.id, label: s.name || '(untitled series)' })),
+ }), [placeUniversesResource.items, placeSeriesResource.items]);
+ const placeTargetsLoading = addMenuOpen && (placeUniversesResource.state === 'loading' || placeSeriesResource.state === 'loading');
// Inline create form.
const [showForm, setShowForm] = useState(false);
@@ -493,34 +504,14 @@ export default function Catalog() {
// Bulk-place targets are the FULL set of live universes/series — NOT the
// facet arrays, which only list refs that already have catalog links. A
- // freshly-created (still empty) universe/series must be a valid destination so
- // the user can seed it. Lazy-loaded the first time the menu opens to keep
- // mount cheap; `null` = not yet fetched.
- const [placeTargets, setPlaceTargets] = useState(null);
- const [placeTargetsLoading, setPlaceTargetsLoading] = useState(false);
- const loadPlaceTargets = useCallback(() => {
- setPlaceTargetsLoading(true);
- Promise.all([
- listUniverseNames({ silent: true }).catch(() => []),
- listPipelineSeriesNames({ silent: true }).catch(() => []),
- ]).then(([universes, series]) => {
- setPlaceTargets({
- universes: (Array.isArray(universes) ? universes : []).map((u) => ({ refKind: 'universe', refId: u.id, label: u.name || '(untitled universe)' })),
- series: (Array.isArray(series) ? series : []).map((s) => ({ refKind: 'series', refId: s.id, label: s.name || '(untitled series)' })),
- });
- setPlaceTargetsLoading(false);
- });
- }, []);
-
+ // freshly-created (still empty) universe/series must be a valid destination.
+ // The resources enable while the menu is open and retain independent retries.
const openAddMenu = () => {
setRemixMenuOpen(false);
- setAddMenuOpen((o) => {
- const next = !o;
- if (next && placeTargets === null && !placeTargetsLoading) loadPlaceTargets();
- return next;
- });
+ setAddMenuOpen((o) => !o);
};
- const hasPlaceTargets = !!placeTargets && (placeTargets.universes.length > 0 || placeTargets.series.length > 0);
+ const noPlaceTargets = placeUniversesResource.state === 'ready' && placeSeriesResource.state === 'ready'
+ && placeTargets.universes.length === 0 && placeTargets.series.length === 0;
// Stable so the grid's per-card render (up to PAGE_SIZE cards) doesn't
// allocate a fresh arrow per card every render.
@@ -964,12 +955,27 @@ export default function Catalog() {
aria-label="Add to universe or series"
className="absolute bottom-full mb-2 left-0 right-0 sm:left-auto sm:min-w-[220px] max-h-[60vh] sm:max-h-72 overflow-y-auto bg-port-card border border-port-border rounded-lg shadow-lg"
>
- {placeTargetsLoading || placeTargets === null ? (
+ {placeTargetsLoading && placeTargets.universes.length === 0 && placeTargets.series.length === 0 ? (
<p className="px-3 py-2 text-sm"><BrailleSpinner text="Loading…" /></p>
- ) : !hasPlaceTargets ? (
+ ) : noPlaceTargets ? (
<p className="px-3 py-2 text-sm text-gray-500">No universes or series yet.</p>
) : (
<>
+ {placeUniversesResource.state === 'error' ? (
+ <ListLoadError what="universes" error={placeUniversesResource.error} onRetry={placeUniversesResource.retry} className="m-2" />
+ ) : null}
+ {placeSeriesResource.state === 'error' ? (
+ <ListLoadError what="series" error={placeSeriesResource.error} onRetry={placeSeriesResource.retry} className="m-2" />
+ ) : null}
+ {placeUniversesResource.state === 'loading' && placeTargets.universes.length === 0 ? (
+ <p className="px-3 py-2 text-sm text-gray-500">Loading universes…</p>
+ ) : null}
+ {placeSeriesResource.state === 'loading' && placeTargets.series.length === 0 ? (
+ <p className="px-3 py-2 text-sm text-gray-500">Loading series…</p>
+ ) : null}
+ {placeUniversesResource.state === 'ready' && placeTargets.universes.length === 0 ? (
+ <p className="px-3 py-2 text-sm text-gray-500">No universes yet.</p>
+ ) : null}
{placeTargets.universes.length > 0 && (
<>
<p className="px-3 pt-2 pb-1 text-[10px] uppercase tracking-wider text-gray-500">Universes</p>
@@ -1000,6 +1006,9 @@ export default function Catalog() {
))}
</>
)}
+ {placeSeriesResource.state === 'ready' && placeTargets.series.length === 0 ? (
+ <p className="px-3 py-2 text-sm text-gray-500">No series yet.</p>
+ ) : null}
</>
)}
</div>
diff --git a/client/src/pages/Catalog.test.jsx b/client/src/pages/Catalog.test.jsx
index 4ce1b3ed33..b977e2c6fe 100644
--- a/client/src/pages/Catalog.test.jsx
+++ b/client/src/pages/Catalog.test.jsx
@@ -1,5 +1,5 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { render, screen, fireEvent, waitFor, act } from '@testing-library/react';
+import { render, screen, fireEvent, waitFor, act, within } from '@testing-library/react';
import { MemoryRouter, useLocation } from 'react-router';
// Spy on navigation so the "Remix into…" handoff can assert the target route +
@@ -491,6 +491,23 @@ describe('Catalog page', () => {
expect(toast.success).toHaveBeenCalledWith(expect.stringMatching(/Added 2 ingredients to Echo Saints/i));
});
+ it('shows and retries universe and series target read errors in the add menu', async () => {
+ listUniverseNames.mockRejectedValueOnce(new Error('universe offline')).mockResolvedValueOnce([]);
+ listPipelineSeriesNames.mockRejectedValueOnce(new Error('series offline')).mockResolvedValueOnce([]);
+ renderCatalog();
+ await waitFor(() => expect(screen.getByText('Echo Saint')).toBeTruthy());
+ fireEvent.click(screen.getByLabelText('Select Echo Saint'));
+ fireEvent.click(screen.getByRole('button', { name: /Add to universe\/series/i }));
+
+ await waitFor(() => expect(screen.getAllByRole('alert')).toHaveLength(2));
+ expect(screen.queryByText('No universes or series yet.')).toBeNull();
+ fireEvent.click(within(screen.getByText(/Could not load universes/).closest('[role="alert"]')).getByRole('button', { name: 'Retry' }));
+ await waitFor(() => expect(screen.queryByText(/Could not load universes/)).toBeNull());
+ fireEvent.click(within(screen.getByText(/Could not load series/).closest('[role="alert"]')).getByRole('button', { name: 'Retry' }));
+ await waitFor(() => expect(screen.queryByRole('alert')).toBeNull());
+ expect(await screen.findByText('No universes or series yet.')).toBeInTheDocument();
+ });
+
it('scopes the Albums view to a single album when a universe is selected', async () => {
renderCatalog();
await waitFor(() => expect(screen.getByText('Echo Saint')).toBeTruthy());
diff --git a/client/src/pages/DeckDetail.jsx b/client/src/pages/DeckDetail.jsx
index d78d60d94d..e702c8c8ea 100644
--- a/client/src/pages/DeckDetail.jsx
+++ b/client/src/pages/DeckDetail.jsx
@@ -23,6 +23,7 @@ import ProgressBar from '../components/ui/ProgressBar';
import TabPills from '../components/ui/TabPills';
import Pill from '../components/ui/Pill';
import InlineConfirmRow from '../components/ui/InlineConfirmRow';
+import ListLoadError from '../components/ui/ListLoadError';
import EmptyState from '../components/EmptyState';
import toast from '../components/ui/Toast';
import MediaPreview from '../components/media/MediaPreview';
@@ -36,6 +37,7 @@ import useMounted from '../hooks/useMounted';
import useUrlParams from '../hooks/useUrlParams';
import useHydratedPreviewRoute from '../hooks/useHydratedPreviewRoute';
import useFieldDraft from '../hooks/useFieldDraft';
+import useListResource from '../hooks/useListResource';
import { useSseProgress } from '../hooks/useSseProgress';
import { DECK_KIND_LABELS, cardInFlightJobId, composeCardRenderPrompt, deckCompletion } from '../lib/decks';
import {
@@ -60,7 +62,9 @@ function DeckEditor({ id }) {
const cardParam = params.get('card');
const [deck, setDeck] = useState(null);
- const [universes, setUniverses] = useState([]);
+ const fetchUniverses = useCallback(() => listUniverseSummaries({ silent: true }), []);
+ const universesResource = useListResource(fetchUniverses);
+ const { items: universes } = universesResource;
const [loading, setLoading] = useState(true);
const [confirmingDelete, setConfirmingDelete] = useState(false);
const [generating, setGenerating] = useState(false);
@@ -82,13 +86,9 @@ function DeckEditor({ id }) {
const load = useCallback(async () => {
const seq = ++loadSeqRef.current;
setLoading(true);
- const [data, worlds] = await Promise.all([
- getDeck(id, { silent: true }).catch(() => null),
- listUniverseSummaries({ silent: true }).catch(() => []),
- ]);
+ const data = await getDeck(id, { silent: true }).catch(() => null);
if (!mountedRef.current || seq !== loadSeqRef.current) return;
setDeck(data);
- setUniverses(Array.isArray(worlds) ? worlds : []);
if (!data) toast.error('Deck not found');
setLoading(false);
}, [id, mountedRef]);
@@ -370,6 +370,9 @@ function DeckEditor({ id }) {
<Trash2 className="w-4 h-4" aria-hidden="true" />
</button>
</div>
+ {universesResource.state === 'error' ? (
+ <ListLoadError what="universes" error={universesResource.error} onRetry={universesResource.retry} />
+ ) : null}
{confirmingDelete ? (
<InlineConfirmRow
question={`Delete "${deck.name}"? Its cards and prompts are removed; rendered images stay in the gallery.`}
diff --git a/client/src/pages/DeckDetail.listErrors.test.jsx b/client/src/pages/DeckDetail.listErrors.test.jsx
new file mode 100644
index 0000000000..914ab81a1d
--- /dev/null
+++ b/client/src/pages/DeckDetail.listErrors.test.jsx
@@ -0,0 +1,36 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { MemoryRouter, Route, Routes } from 'react-router';
+
+const api = vi.hoisted(() => ({
+ deleteDeck: vi.fn(), generateDeckPrompts: vi.fn(), getDeck: vi.fn(), listUniverseSummaries: vi.fn(),
+ removeDeckSample: vi.fn(), renderDeckCard: vi.fn(), renderDeckCards: vi.fn(), updateDeck: vi.fn(),
+ updateDeckCard: vi.fn(), deckPromptsProgressUrl: vi.fn(() => ''),
+}));
+vi.mock('../services/api', () => api);
+vi.mock('../hooks/useDeckRenderTarget', () => ({ default: () => ({}) }));
+vi.mock('../hooks/useHydratedPreviewRoute', () => ({ default: () => [null, vi.fn()] }));
+vi.mock('../hooks/useSseProgress', () => ({ useSseProgress: () => ({ frames: [] }) }));
+vi.mock('../components/decks/DeckRenderControls', () => ({ default: () => null }));
+vi.mock('../components/decks/DeckCardGrid', () => ({ default: () => null }));
+vi.mock('../components/decks/DeckStylePanel', () => ({ default: () => null }));
+vi.mock('../components/decks/DeckCardDrawer', () => ({ default: () => null }));
+vi.mock('../components/ui/Toast', () => ({ default: { success: vi.fn(), error: vi.fn() } }));
+
+import DeckDetail from './DeckDetail';
+
+describe('Deck detail universe link', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ api.getDeck.mockResolvedValue({ id: 'd1', name: 'Test Deck', kind: 'tarot', cards: [], universeId: 'u1' });
+ api.listUniverseSummaries.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce([]);
+ });
+
+ it('shows a retry row when the universe summary read fails', async () => {
+ render(<MemoryRouter initialEntries={['/decks/d1']}><Routes><Route path="/decks/:id" element={<DeckDetail />} /></Routes></MemoryRouter>);
+ expect(await screen.findByRole('heading', { name: 'Test Deck' })).toBeInTheDocument();
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load universes');
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ await waitFor(() => expect(screen.queryByRole('alert')).not.toBeInTheDocument());
+ });
+});
diff --git a/client/src/pages/Decks.jsx b/client/src/pages/Decks.jsx
index 85c72b21ff..395e273452 100644
--- a/client/src/pages/Decks.jsx
+++ b/client/src/pages/Decks.jsx
@@ -15,9 +15,11 @@ import PageSkeleton from '../components/ui/PageSkeleton';
import ProgressBar from '../components/ui/ProgressBar';
import toast from '../components/ui/Toast';
import InlineConfirmRow from '../components/ui/InlineConfirmRow';
+import ListLoadError from '../components/ui/ListLoadError';
import EmptyState from '../components/EmptyState';
import { timeAgo } from '../utils/formatters';
import { DECK_KIND, DECK_KINDS, DECK_KIND_LABELS } from '../lib/decks';
+import useListResource from '../hooks/useListResource';
import Pill from '../components/ui/Pill';
import { createDeck, deleteDeck, listDecks, listUniverseSummaries } from '../services/api';
@@ -26,7 +28,9 @@ const INPUT_CLASS = 'w-full bg-port-bg border border-port-border rounded-lg px-3
export default function Decks() {
const navigate = useNavigate();
const [decks, setDecks] = useState([]);
- const [universes, setUniverses] = useState([]);
+ const fetchUniverses = useCallback(() => listUniverseSummaries({ silent: true }), []);
+ const universesResource = useListResource(fetchUniverses);
+ const { items: universes } = universesResource;
const [loading, setLoading] = useState(true);
const [creating, setCreating] = useState(false);
const [confirmingId, setConfirmingId] = useState(null);
@@ -37,13 +41,9 @@ export default function Decks() {
const load = useCallback(async () => {
setLoading(true);
- const [rows, worlds] = await Promise.all([
- listDecks({ silent: true }).catch(() => null),
- listUniverseSummaries({ silent: true }).catch(() => []),
- ]);
+ const rows = await listDecks({ silent: true }).catch(() => null);
if (rows) setDecks(Array.isArray(rows) ? rows : []);
else toast.error('Failed to load decks');
- setUniverses(Array.isArray(worlds) ? worlds : []);
setLoading(false);
}, []);
@@ -99,6 +99,9 @@ export default function Decks() {
<option value="">— none —</option>
{universes.map((u) => <option key={u.id} value={u.id}>{u.name}</option>)}
</select>
+ {universesResource.state === 'error' ? (
+ <ListLoadError what="universes" error={universesResource.error} onRetry={universesResource.retry} className="mt-2" />
+ ) : null}
{universeId ? (
<label htmlFor="deck-new-seed" className="mt-1.5 flex items-center gap-2 text-xs text-gray-400">
<input id="deck-new-seed" type="checkbox" checked={seedStyle} onChange={(e) => setSeedStyle(e.target.checked)} />
diff --git a/client/src/pages/Decks.listErrors.test.jsx b/client/src/pages/Decks.listErrors.test.jsx
new file mode 100644
index 0000000000..6cc53ab3df
--- /dev/null
+++ b/client/src/pages/Decks.listErrors.test.jsx
@@ -0,0 +1,28 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { MemoryRouter } from 'react-router';
+
+const api = vi.hoisted(() => ({
+ createDeck: vi.fn(), deleteDeck: vi.fn(), listDecks: vi.fn(), listUniverseSummaries: vi.fn(),
+}));
+vi.mock('../services/api', () => api);
+vi.mock('../components/ui/Toast', () => ({ default: { success: vi.fn(), error: vi.fn() } }));
+
+import Decks from './Decks';
+
+describe('Decks universe picker list', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ api.listDecks.mockResolvedValue([]);
+ api.listUniverseSummaries.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce([]);
+ });
+
+ it('shows a retry row when universe summaries fail and clears it after a successful empty read', async () => {
+ render(<MemoryRouter><Decks /></MemoryRouter>);
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load universes');
+ expect(api.listUniverseSummaries).toHaveBeenCalledWith({ silent: true });
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ await waitFor(() => expect(screen.queryByRole('alert')).not.toBeInTheDocument());
+ expect(api.listUniverseSummaries).toHaveBeenCalledTimes(2);
+ });
+});
diff --git a/client/src/pages/FableLoom.jsx b/client/src/pages/FableLoom.jsx
index 2bb2ebb74d..41e0531746 100644
--- a/client/src/pages/FableLoom.jsx
+++ b/client/src/pages/FableLoom.jsx
@@ -7,7 +7,7 @@
* visual editor lives at /fableloom/:loomId/:episodeId.
*/
-import { useEffect, useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
import { useNavigate } from 'react-router';
import { Plus, Sparkles, Trash2, Waypoints } from 'lucide-react';
import PageHeader from '../components/PageHeader';
@@ -16,8 +16,10 @@ import ConfirmButtonPair from '../components/ui/ConfirmButtonPair';
import SyncToPeerButton from '../components/sharing/SyncToPeerButton';
import { FormField } from '../components/ui/FormField.jsx';
import PageSkeleton from '../components/ui/PageSkeleton';
+import ListLoadError from '../components/ui/ListLoadError';
import Pill from '../components/ui/Pill';
import { useAsyncAction } from '../hooks/useAsyncAction';
+import useListResource from '../hooks/useListResource';
import { useConfirmDelete } from '../hooks/useConfirmDelete';
import useProviderModels from '../hooks/useProviderModels';
import toast from '../components/ui/Toast';
@@ -37,9 +39,15 @@ const emptyForm = () => ({
export default function FableLoom() {
const navigate = useNavigate();
- const [looms, setLooms] = useState(null);
- const [universes, setUniverses] = useState([]);
- const [series, setSeries] = useState([]);
+ const fetchLooms = useCallback(() => listLooms({ silent: true }), []);
+ const loomsResource = useListResource(fetchLooms);
+ const { items: looms, setItems: setLooms } = loomsResource;
+ const fetchUniverses = useCallback(() => listUniverseNames({ silent: true }), []);
+ const universesResource = useListResource(fetchUniverses);
+ const fetchSeries = useCallback(() => listPipelineSeriesNames({ silent: true }), []);
+ const seriesResource = useListResource(fetchSeries);
+ const universes = universesResource.items;
+ const series = seriesResource.items;
const [showForm, setShowForm] = useState(false);
const [form, setForm] = useState(emptyForm());
const [planRoute, setPlanRoute] = useState({ providerId: '', model: '', effort: '' });
@@ -48,12 +56,6 @@ export default function FableLoom() {
});
const del = useConfirmDelete();
- useEffect(() => {
- listLooms().then(setLooms).catch(() => setLooms([]));
- listUniverseNames({ silent: true }).then(setUniverses).catch(() => {});
- listPipelineSeriesNames({ silent: true }).then(setSeries).catch(() => {});
- }, []);
-
const universeNames = useMemo(() => new Map(universes.map((u) => [u.id, u.name])), [universes]);
const seriesNames = useMemo(() => new Map(series.map((s) => [s.id, s.name])), [series]);
@@ -179,6 +181,9 @@ export default function FableLoom() {
<option value="">No universe</option>
{universes.map((u) => <option key={u.id} value={u.id}>{u.name}</option>)}
</select>
+ {universesResource.state === 'error' && (
+ <ListLoadError what="universes" error={universesResource.error} onRetry={universesResource.retry} className="mt-2" />
+ )}
</FormField>
<FormField label="Part of series (optional)" labelClassName={labelClass}>
<select
@@ -189,6 +194,9 @@ export default function FableLoom() {
<option value="">Standalone</option>
{series.map((s) => <option key={s.id} value={s.id}>{s.name}</option>)}
</select>
+ {seriesResource.state === 'error' && (
+ <ListLoadError what="series" error={seriesResource.error} onRetry={seriesResource.retry} className="mt-2" />
+ )}
</FormField>
</div>
<FormField label="Premise" labelClassName={labelClass}>
@@ -263,8 +271,10 @@ export default function FableLoom() {
</form>
)}
- {looms === null ? (
+ {loomsResource.state === 'loading' ? (
<PageSkeleton header="none" label="Loading branching narratives" cards={4} sidebar={false} layout="grid" />
+ ) : loomsResource.state === 'error' ? (
+ <ListLoadError what="branching narratives" error={loomsResource.error} onRetry={loomsResource.retry} />
) : looms.length === 0 ? (
<div className="text-center py-16 border border-dashed border-port-border rounded-lg">
<Waypoints size={32} className="mx-auto text-port-text-muted mb-3" />
diff --git a/client/src/pages/FableLoom.test.jsx b/client/src/pages/FableLoom.test.jsx
index eb5909d456..2a24344fc6 100644
--- a/client/src/pages/FableLoom.test.jsx
+++ b/client/src/pages/FableLoom.test.jsx
@@ -1,5 +1,5 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { act, render, screen, waitFor } from '@testing-library/react';
+import { act, render, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { MemoryRouter } from 'react-router';
@@ -79,6 +79,38 @@ describe('FableLoom index', () => {
await waitFor(() => expect(screen.getByText(/No branching narratives yet/)).toBeInTheDocument());
});
+ it('shows a retriable error instead of the empty copy when looms fail to load', async () => {
+ api.listLooms.mockRejectedValueOnce(new Error('offline')).mockResolvedValue([]);
+ await renderPage();
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load branching narratives');
+ expect(screen.queryByText(/No branching narratives yet/)).not.toBeInTheDocument();
+ await userEvent.setup().click(screen.getByRole('button', { name: 'Retry' }));
+ expect(await screen.findByText(/No branching narratives yet/)).toBeInTheDocument();
+ });
+
+ it('shows independent retry rows when universe or series picker options fail', async () => {
+ api.listUniverseNames.mockRejectedValueOnce(new Error('offline')).mockResolvedValue([{ id: 'uni-1', name: 'Aria Verse' }]);
+ api.listPipelineSeriesNames.mockRejectedValueOnce(new Error('offline')).mockResolvedValue([{ id: 'series-1', name: 'The Crown' }]);
+ const user = userEvent.setup();
+ await renderPage();
+ await user.click(screen.getByRole('button', { name: /New loom/ }));
+
+ await screen.findByText(/Could not load universes/);
+ expect(screen.getByText(/Could not load universes/)).toBeInTheDocument();
+ expect(screen.getByText(/Could not load series/)).toBeInTheDocument();
+ const alerts = screen.getAllByRole('alert');
+ await user.click(within(alerts.find((alert) => alert.textContent.includes('universes'))).getByRole('button', { name: 'Retry' }));
+ await user.click(within(alerts.find((alert) => alert.textContent.includes('series'))).getByRole('button', { name: 'Retry' }));
+ await waitFor(() => {
+ expect(api.listUniverseNames).toHaveBeenCalledTimes(2);
+ expect(api.listPipelineSeriesNames).toHaveBeenCalledTimes(2);
+ });
+ expect(screen.queryByText(/Could not load universes/)).not.toBeInTheDocument();
+ expect(screen.queryByText(/Could not load series/)).not.toBeInTheDocument();
+ expect(screen.getByRole('option', { name: 'Aria Verse' })).toBeInTheDocument();
+ expect(screen.getByRole('option', { name: 'The Crown' })).toBeInTheDocument();
+ });
+
it('opens the creation form from the empty-state action', async () => {
api.listLooms.mockResolvedValue([]);
const user = userEvent.setup();
diff --git a/client/src/pages/Importer.jsx b/client/src/pages/Importer.jsx
index 9cda113a59..8536195d54 100644
--- a/client/src/pages/Importer.jsx
+++ b/client/src/pages/Importer.jsx
@@ -1,4 +1,4 @@
-import { memo, useEffect, useMemo, useRef, useState } from 'react';
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useNavigate, useSearchParams } from 'react-router';
import { FileInput, Loader2, ArrowLeft, CheckCircle2, AlertTriangle, ChevronDown, ChevronRight, Wand2, Sparkles } from 'lucide-react';
import PageHeader from '../components/PageHeader';
@@ -24,6 +24,8 @@ import {
CLASSIFY_SOURCE_HEAD_CHARS,
} from '../services/apiImporter';
import { formatCount } from '../utils/formatters';
+import useListResource from '../hooks/useListResource';
+import ListLoadError from '../components/ui/ListLoadError';
const CONTENT_TYPE_LABELS = {
'short-story': 'Short Story',
@@ -120,22 +122,13 @@ export default function Importer() {
// spelling. `listsLoaded` distinguishes "still fetching" from "fetched and
// legitimately empty" so the deep-link resolver doesn't wait forever on an
// install with no universes yet.
- const [universes, setUniverses] = useState([]);
- const [allSeries, setAllSeries] = useState([]);
- const [listsLoaded, setListsLoaded] = useState(false);
- useEffect(() => {
- let canceled = false;
- Promise.all([
- listUniverseSummaries({ silent: true }).catch(() => []),
- listPipelineSeriesSummaries({ silent: true }).catch(() => []),
- ]).then(([u, s]) => {
- if (canceled) return;
- setUniverses(Array.isArray(u) ? u : []);
- setAllSeries(Array.isArray(s) ? s : []);
- setListsLoaded(true);
- });
- return () => { canceled = true; };
- }, []);
+ const fetchUniverses = useCallback(() => listUniverseSummaries({ silent: true }), []);
+ const universesResource = useListResource(fetchUniverses);
+ const fetchSeries = useCallback(() => listPipelineSeriesSummaries({ silent: true }), []);
+ const seriesResource = useListResource(fetchSeries);
+ const { items: universes } = universesResource;
+ const { items: allSeries } = seriesResource;
+ const listsLoaded = universesResource.state !== 'loading' && seriesResource.state !== 'loading';
// Apply a `?universeId=…&seriesId=…` (or name-param) deep-link exactly once,
// after the lists load so ids can resolve to names. Guarded by a ref so a
@@ -496,8 +489,14 @@ export default function Importer() {
setIntake={setIntake}
universeItems={universeItems}
universeSelectedId={universeMatch?.id || null}
+ universeListState={universesResource.state}
+ universeListError={universesResource.error}
+ retryUniverses={universesResource.retry}
seriesItems={seriesItems}
seriesSelectedId={seriesMatch?.id || null}
+ seriesListState={seriesResource.state}
+ seriesListError={seriesResource.error}
+ retrySeries={seriesResource.retry}
sourceCharLimit={config.sourceCharLimit}
analyzing={analyzing}
analyzeStages={analyzeStages}
@@ -554,6 +553,8 @@ export default function Importer() {
export function IntakeForm({
intake, setIntake,
universeItems, universeSelectedId, seriesItems, seriesSelectedId,
+ universeListState = 'ready', universeListError = null, retryUniverses,
+ seriesListState = 'ready', seriesListError = null, retrySeries,
sourceCharLimit, analyzing, analyzeStages, onAnalyze, classifying, onClassify, classifyHint,
providers, llmProvider, llmModel, llmModels, onProviderChange, onModelChange,
}) {
@@ -597,6 +598,9 @@ export function IntakeForm({
createPrefix="New universe"
className="w-full"
/>
+ {universeListState === 'error' ? (
+ <ListLoadError what="universes" error={universeListError} onRetry={retryUniverses} className="mt-2" />
+ ) : null}
<p className="text-xs text-port-text-muted mt-1">
{universeSelectedId
? 'Matched an existing universe — the import is added to it.'
@@ -618,11 +622,18 @@ export function IntakeForm({
noun="series"
placeholder="Search this universe's series or type a new name… e.g. The Choir Awakens"
createPrefix="New series"
- emptyNoItems={intake.universeName.trim()
- ? 'No series in this universe yet — type a name.'
- : 'Pick a universe above to list its series, or type a new name.'}
+ emptyNoItems={seriesListState === 'error'
+ ? 'Series could not be loaded — use Retry below or type a new name.'
+ : seriesListState === 'loading'
+ ? 'Loading series…'
+ : intake.universeName.trim()
+ ? 'No series in this universe yet — type a name.'
+ : 'Pick a universe above to list its series, or type a new name.'}
className="w-full"
/>
+ {seriesListState === 'error' ? (
+ <ListLoadError what="series" error={seriesListError} onRetry={retrySeries} className="mt-2" />
+ ) : null}
<p className="text-xs text-port-text-muted mt-1">
{seriesSelectedId
? 'Matched an existing series — the import extends it.'
diff --git a/client/src/pages/Importer.listErrors.test.jsx b/client/src/pages/Importer.listErrors.test.jsx
new file mode 100644
index 0000000000..d7b60f4696
--- /dev/null
+++ b/client/src/pages/Importer.listErrors.test.jsx
@@ -0,0 +1,48 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { MemoryRouter } from 'react-router';
+
+const api = vi.hoisted(() => ({
+ listUniverseSummaries: vi.fn(),
+ listPipelineSeriesSummaries: vi.fn(),
+}));
+vi.mock('../services/api', () => api);
+
+const importerApi = vi.hoisted(() => ({
+ analyzeImport: vi.fn(), classifyImport: vi.fn(), commitImport: vi.fn(), retryImporterIssues: vi.fn(),
+ getImporterConfig: vi.fn(), IMPORTER_CONTENT_TYPES: ['short-story', 'novel', 'screenplay', 'comic-script'],
+ IMPORTER_SOURCE_CHAR_LIMIT_FALLBACK: 100_000, CLASSIFY_SOURCE_HEAD_CHARS: 10_000,
+}));
+vi.mock('../services/apiImporter', () => importerApi);
+vi.mock('../hooks/useProviderModels', () => ({
+ default: () => ({ providers: [], selectedProviderId: '', selectedModel: '', availableModels: [], setSelectedProviderId: vi.fn(), setSelectedModel: vi.fn() }),
+}));
+vi.mock('../hooks/useImporterProgress', () => ({
+ useImporterProgress: () => ({ stages: null, reset: vi.fn() }),
+ stageStatusIcon: () => null,
+}));
+vi.mock('../components/ui/Toast', () => ({ default: { success: vi.fn(), error: vi.fn(), warning: vi.fn() } }));
+
+import Importer from './Importer';
+
+describe('Importer list reads', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ api.listUniverseSummaries.mockRejectedValueOnce(new Error('universe offline')).mockResolvedValueOnce([]);
+ api.listPipelineSeriesSummaries.mockRejectedValueOnce(new Error('series offline')).mockResolvedValueOnce([]);
+ importerApi.getImporterConfig.mockResolvedValue({ sourceCharLimit: 100_000, arcRoles: [], arcShapeIds: null });
+ });
+
+ it('shows a retry row for both failed picker lists and retries each independently', async () => {
+ render(<MemoryRouter><Importer /></MemoryRouter>);
+ expect(await screen.findByText(/Could not load universes/)).toBeInTheDocument();
+ expect(screen.getByText(/Could not load series/)).toBeInTheDocument();
+
+ fireEvent.click(screen.getByText(/Could not load universes/).closest('[role="alert"]').querySelector('button'));
+ await waitFor(() => expect(screen.queryByText(/Could not load universes/)).toBeNull());
+ fireEvent.click(screen.getByText(/Could not load series/).closest('[role="alert"]').querySelector('button'));
+ await waitFor(() => expect(screen.queryByRole('alert')).toBeNull());
+ expect(api.listUniverseSummaries).toHaveBeenCalledTimes(2);
+ expect(api.listPipelineSeriesSummaries).toHaveBeenCalledTimes(2);
+ });
+});
diff --git a/client/src/pages/Pipeline.jsx b/client/src/pages/Pipeline.jsx
index cd5de4ad29..600699405a 100644
--- a/client/src/pages/Pipeline.jsx
+++ b/client/src/pages/Pipeline.jsx
@@ -7,13 +7,15 @@
* drills into its detail page where issues are created and managed.
*/
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState, useCallback } from 'react';
import { useConfirmDelete } from '../hooks/useConfirmDelete';
+import useListResource from '../hooks/useListResource';
import { Link, useNavigate, useSearchParams } from 'react-router';
import { Plus, Workflow as WorkflowIcon, Trash2, Loader2, Globe2, FileInput, Sparkles, BookOpen, Waypoints } from 'lucide-react';
import PageHeader from '../components/PageHeader';
import toast from '../components/ui/Toast';
import ConfirmButtonPair from '../components/ui/ConfirmButtonPair';
+import ListLoadError from '../components/ui/ListLoadError';
import ImageThumb from '../components/ui/ImageThumb';
import ShareToButton from '../components/sharing/ShareToButton';
import SyncToPeerButton from '../components/sharing/SyncToPeerButton';
@@ -64,12 +66,16 @@ const emptyForm = () => ({
export default function Pipeline() {
const navigate = useNavigate();
- const [series, setSeries] = useState([]);
+ const fetchSeries = useCallback(() => listPipelineSeriesSummaries({ silent: true }), []);
+ const seriesResource = useListResource(fetchSeries);
+ const { items: series, setItems: setSeries } = seriesResource;
const [universes, setWorlds] = useState([]);
- // seriesId -> number of FableLoom looms soft-linked to it (#4785). A failed
- // fetch degrades to "no badges", never to a broken series list.
- const [loomCounts, setLoomCounts] = useState(() => new Map());
- const [loading, setLoading] = useState(true);
+ // Series badges are optional; a failed loom read leaves the series list
+ // usable and exposes its own retry row below.
+ const fetchLooms = useCallback(() => listLooms({ silent: true }), []);
+ const loomsResource = useListResource(fetchLooms);
+ const { items: looms } = loomsResource;
+ const loomCounts = useMemo(() => countLoomsBySeries(looms), [looms]);
const sync = useSyncIntegrity('series');
const [creating, setCreating] = useState(false);
@@ -94,22 +100,8 @@ export default function Pipeline() {
useEffect(() => { universeIdRef.current = form.universeId; }, [form.universeId]);
useEffect(() => {
- Promise.all([
- listPipelineSeriesSummaries({ silent: true }).catch(() => []),
- // Universes are optional — failing the fetch should still let the user
- // create a series without one. Surface the error as a quiet toast.
- listUniverseNames({ silent: true }).catch((err) => {
- toast.error(err.message || 'Failed to load universes');
- return [];
- }),
- // Loom summaries are a side quest for the row badge — a failure here must
- // not toast over the series list or block it.
- listLooms({ silent: true }).catch(() => []),
- ]).then(([s, w, looms]) => {
- setSeries(Array.isArray(s) ? s : []);
- setWorlds(Array.isArray(w) ? w : []);
- setLoomCounts(countLoomsBySeries(looms));
- setLoading(false);
+ listUniverseNames({ silent: true }).then(setWorlds).catch((err) => {
+ toast.error(err.message || 'Failed to load universes');
});
}, []);
@@ -533,8 +525,10 @@ export default function Pipeline() {
</form>
)}
- {loading ? (
+ {seriesResource.state === 'loading' ? (
<div className="text-gray-500 text-sm">Loading series…</div>
+ ) : seriesResource.state === 'error' ? (
+ <ListLoadError what="series" error={seriesResource.error} onRetry={seriesResource.retry} />
) : series.length === 0 ? (
<div className="text-gray-500 text-sm">No series yet. Click <span className="text-port-accent">New Series</span> to start.</div>
) : (
@@ -613,6 +607,9 @@ export default function Pipeline() {
})}
</ul>
)}
+ {loomsResource.state === 'error' ? (
+ <ListLoadError what="branching narrative badges" error={loomsResource.error} onRetry={loomsResource.retry} className="mt-3" />
+ ) : null}
</div>
</div>
);
diff --git a/client/src/pages/Pipeline.loomBadge.test.jsx b/client/src/pages/Pipeline.loomBadge.test.jsx
index 320ab4312a..3681a66c33 100644
--- a/client/src/pages/Pipeline.loomBadge.test.jsx
+++ b/client/src/pages/Pipeline.loomBadge.test.jsx
@@ -1,5 +1,5 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { act, render, screen, waitFor } from '@testing-library/react';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
import { MemoryRouter } from 'react-router';
import Pipeline from './Pipeline';
@@ -68,10 +68,22 @@ describe('Pipeline series list — branching-narrative badge', () => {
});
it('renders the list without badges when the loom fetch fails', async () => {
- listLooms.mockRejectedValue(new Error('offline'));
+ listLooms.mockRejectedValueOnce(new Error('offline')).mockResolvedValue([]);
await renderPage();
await screen.findByText('Example Series');
await waitFor(() => expect(screen.getByText('Second Series')).toBeInTheDocument());
+ expect(screen.getByRole('alert')).toHaveTextContent('Could not load branching narrative badges');
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ await waitFor(() => expect(screen.queryByRole('alert')).toBeNull());
expect(screen.queryByText(/branching/)).toBeNull();
});
+
+ it('keeps a failed series read distinct from the empty list and retries it', async () => {
+ listPipelineSeriesSummaries.mockRejectedValueOnce(new Error('offline')).mockResolvedValue([]);
+ await renderPage();
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load series');
+ expect(screen.queryByText(/No series yet/)).toBeNull();
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(await screen.findByText(/No series yet/)).toBeInTheDocument();
+ });
});
diff --git a/client/src/pages/PipelineEditorialChecks.jsx b/client/src/pages/PipelineEditorialChecks.jsx
index 8f985ef2f3..7647faa9a3 100644
--- a/client/src/pages/PipelineEditorialChecks.jsx
+++ b/client/src/pages/PipelineEditorialChecks.jsx
@@ -23,7 +23,9 @@ import SeriesSeverityConfig from '../components/pipeline/editorial/SeriesSeverit
import ProviderModelSelector from '../components/ProviderModelSelector';
import PageHeader from '../components/PageHeader';
import TabPills from '../components/ui/TabPills';
+import ListLoadError from '../components/ui/ListLoadError';
import { groupChecksByScope, groupFindingsByCheck, normCategory, canonEntitiesFromUniverse } from '../lib/editorialChecks';
+import useListResource from '../hooks/useListResource';
import { usePipelineProgress } from '../hooks/usePipelineProgress';
import useProviderModels from '../hooks/useProviderModels';
import {
@@ -62,7 +64,9 @@ export default function PipelineEditorialChecks() {
// presentation toggle that doesn't exist on desktop.
const [mobileTab, setMobileTab] = useState('findings');
- const [series, setSeries] = useState([]);
+ const fetchSeries = useCallback(() => listPipelineSeries({ silent: true }), []);
+ const seriesResource = useListResource(fetchSeries);
+ const { items: series, setItems: setSeries } = seriesResource;
// Per-series editorial-check config overrides (#1591) are saved through the
// series PATCH; track in-flight saves per checkId so the run buttons gate on the
// override landing (the runner reads the persisted series record).
@@ -160,13 +164,9 @@ export default function PipelineEditorialChecks() {
// ---- Load the global catalog + series list once. ----
useEffect(() => {
let canceled = false;
- Promise.all([
- getEditorialChecks().catch(() => ({ checks: [] })),
- listPipelineSeries().catch(() => []),
- ]).then(([catalog, list]) => {
+ getEditorialChecks().catch(() => ({ checks: [] })).then((catalog) => {
if (canceled) return;
setChecks(Array.isArray(catalog?.checks) ? catalog.checks : []);
- setSeries(Array.isArray(list) ? list : []);
setLoadingCatalog(false);
});
return () => { canceled = true; };
@@ -683,6 +683,9 @@ export default function PipelineEditorialChecks() {
</>
)}
/>
+ {seriesResource.state === 'error' ? (
+ <div className="px-4 pt-3"><ListLoadError what="series" error={seriesResource.error} onRetry={seriesResource.retry} /></div>
+ ) : null}
<div className="flex-1 min-h-0 overflow-auto p-4">
<div className="mx-auto max-w-6xl space-y-4">
{/* AI provider/model override for the editorial pass. Empty = use the
diff --git a/client/src/pages/PipelineEditorialChecks.responsive.test.jsx b/client/src/pages/PipelineEditorialChecks.responsive.test.jsx
index 10fd9a670c..6ff7923fdd 100644
--- a/client/src/pages/PipelineEditorialChecks.responsive.test.jsx
+++ b/client/src/pages/PipelineEditorialChecks.responsive.test.jsx
@@ -101,4 +101,12 @@ describe('PipelineEditorialChecks responsive switch (#1611)', () => {
expect(catalogSection).not.toHaveClass('hidden');
expect(findingsSection).toHaveClass('hidden');
});
+
+ it('shows a retriable error when the series list fails to load', async () => {
+ listPipelineSeries.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce([]);
+ renderPage();
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load series');
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ await waitFor(() => expect(screen.queryByRole('alert')).not.toBeInTheDocument());
+ });
});
diff --git a/client/src/pages/PipelineSeries.jsx b/client/src/pages/PipelineSeries.jsx
index ef8182658a..84b1ea906c 100644
--- a/client/src/pages/PipelineSeries.jsx
+++ b/client/src/pages/PipelineSeries.jsx
@@ -11,7 +11,7 @@ import { compareIssuesInSeries } from '../../../server/lib/pipelineIssueOrder.js
* Mobile (< lg): single column, sidebar reflows above canvas.
*/
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
import { Link, useParams, useNavigate } from 'react-router';
import {
ArrowLeft, Save, Loader2, Workflow as WorkflowIcon, Globe, NotebookPen,
@@ -20,6 +20,8 @@ import {
} from 'lucide-react';
import toast from '../components/ui/Toast';
import PageSkeleton from '../components/ui/PageSkeleton';
+import ListLoadError from '../components/ui/ListLoadError';
+import useListResource from '../hooks/useListResource';
import ArcCanvas from '../components/pipeline/ArcCanvas';
import AutopilotPanel from '../components/pipeline/AutopilotPanel';
import SeriesReviewPanel from '../components/pipeline/SeriesReviewPanel';
@@ -125,7 +127,9 @@ export default function PipelineSeries() {
const [editorTab, setEditorTab] = useDrawerTab('view', 'issues', EDITOR_TABS.map((tab) => tab.id));
const [series, setSeries] = useState(null);
const [issues, setIssues] = useState([]);
- const [universes, setWorlds] = useState([]);
+ const fetchUniverses = useCallback(() => listUniverses({ silent: true }), []);
+ const universesResource = useListResource(fetchUniverses);
+ const { items: universes } = universesResource;
const [loading, setLoading] = useState(true);
const [saving, setSaving] = useState(false);
const [sidebarCollapsed, setSidebarCollapsed] = useLocalStorageBool(
@@ -139,13 +143,11 @@ export default function PipelineSeries() {
Promise.all([
getPipelineSeries(seriesId, { silent: true }),
listPipelineIssues(seriesId, { silent: true }),
- listUniverses().catch(() => []),
])
- .then(([s, is, ws]) => {
+ .then(([s, is]) => {
if (canceled) return;
setSeries(s);
setIssues(Array.isArray(is) ? is : []);
- setWorlds(Array.isArray(ws) ? ws : []);
})
.catch((err) => {
if (canceled) return;
@@ -361,6 +363,8 @@ export default function PipelineSeries() {
<BibleSidebar
series={series}
universes={universes}
+ universesError={universesResource.error}
+ universesRetry={universesResource.retry}
patchSeries={patchSeries}
onSeriesUpdate={updateSeriesFromServer}
onFlushPending={flushPending}
@@ -374,7 +378,7 @@ export default function PipelineSeries() {
);
}
-function BibleSidebar({ series, universes, patchSeries, onSeriesUpdate, onFlushPending, onCollapse }) {
+function BibleSidebar({ series, universes, universesError, universesRetry, patchSeries, onSeriesUpdate, onFlushPending, onCollapse }) {
const [generatingLogo, setGeneratingLogo] = useState(false);
const handleGenerateLogo = async () => {
// Server reads from disk — flush dirty edits so the LLM sees fresh fields.
@@ -559,6 +563,9 @@ function BibleSidebar({ series, universes, patchSeries, onSeriesUpdate, onFlushP
<Globe size={12} /> Open
</Link>
</div>
+ {universesError ? (
+ <ListLoadError what="universes" error={universesError} onRetry={universesRetry} className="mt-2" />
+ ) : null}
</Field>
<Field compact label="Universe style override (this series only)">
diff --git a/client/src/pages/PipelineSeries.responsive.test.jsx b/client/src/pages/PipelineSeries.responsive.test.jsx
index 710e985c5d..48f724f94a 100644
--- a/client/src/pages/PipelineSeries.responsive.test.jsx
+++ b/client/src/pages/PipelineSeries.responsive.test.jsx
@@ -1,5 +1,5 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { act, render, screen, fireEvent } from '@testing-library/react';
+import { act, render, screen, fireEvent, waitFor } from '@testing-library/react';
import { createMemoryRouter, RouterProvider } from 'react-router';
import PipelineSeries from './PipelineSeries';
import { LOGLINE_MAX, PREMISE_MAX, STYLE_NOTES_MAX } from '../../../server/lib/universeBibleLimits.js';
@@ -86,6 +86,15 @@ describe('Pipeline series detail — mobile layout', () => {
expect(screen.getByPlaceholderText(/moebius linework/)).toHaveAttribute('maxlength', String(STYLE_NOTES_MAX));
expect(document.querySelector(`[maxlength="${LOGLINE_MAX}"]`)).not.toBeNull();
});
+
+ it('shows a retriable universe read error in the linked-universe picker', async () => {
+ listUniverses.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce([]);
+ renderPage();
+ expect(await screen.findByRole('heading', { name: 'Example Series' })).toBeInTheDocument();
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load universes');
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ await waitFor(() => expect(screen.queryByRole('alert')).not.toBeInTheDocument());
+ });
});
describe('Pipeline series detail — unsaved bible edits (#8423)', () => {
diff --git a/client/src/pages/StoryBuilder.jsx b/client/src/pages/StoryBuilder.jsx
index db851c3f7a..81e4ebb144 100644
--- a/client/src/pages/StoryBuilder.jsx
+++ b/client/src/pages/StoryBuilder.jsx
@@ -1,4 +1,6 @@
import { useState, useEffect, useCallback, useId, useMemo, useRef } from 'react';
+import useListResource from '../hooks/useListResource';
+import ListLoadError from '../components/ui/ListLoadError';
import { useParams, useNavigate, useSearchParams, useLocation, Link } from 'react-router';
import PageHeader from '../components/PageHeader';
import PageSkeleton from '../components/ui/PageSkeleton';
@@ -627,7 +629,7 @@ function RefineBox({ onRefine, disabled, busy, running, phase }) {
);
}
-function StepPanel({ session, universe, series, issues, stepId, locked, onChanged, onSeriesUpdate, onIssuesUpdate, onFlushPending, onRegisterDraftFlush, onUniverseCharRef }) {
+function StepPanel({ session, universe, series, issues, issuesState, issuesError, retryIssues, stepId, locked, onChanged, onSeriesUpdate, onIssuesUpdate, onFlushPending, onRegisterDraftFlush, onUniverseCharRef }) {
const { start, busy, phase, op } = useStoryStepRun(stepId);
const arc = series?.arc || {};
const isRunning = (which) => busy && op === which;
@@ -794,7 +796,7 @@ function StepPanel({ session, universe, series, issues, stepId, locked, onChange
return <StepCharacters session={session} universe={universe} locked={locked} onChanged={onChanged} onUniverseCharRef={onUniverseCharRef} />;
}
if (stepId === 'issues') {
- return <IssuesPanel session={session} series={series} issues={issues} onChanged={onChanged} />;
+ return <IssuesPanel session={session} series={series} issues={issues} issuesState={issuesState} issuesError={issuesError} retryIssues={retryIssues} onChanged={onChanged} />;
}
if (stepId === 'production') {
const locks = session.steps?.issues?.issueLocks || {};
@@ -922,7 +924,7 @@ function StepCharacters({ session, universe, locked, onChanged, onUniverseCharRe
);
}
-function IssuesPanel({ session, series, issues, onChanged }) {
+function IssuesPanel({ session, series, issues, issuesState, issuesError, retryIssues, onChanged }) {
const locks = session.steps?.issues?.issueLocks || {};
const [busyId, setBusyId] = useState(null);
const [generating, setGenerating] = useState(false);
@@ -993,7 +995,10 @@ function IssuesPanel({ session, series, issues, onChanged }) {
)}
</div>
</div>
- {(!issues || issues.length === 0) && (
+ {issuesState === 'error' ? (
+ <ListLoadError what="pipeline issues" error={issuesError} onRetry={retryIssues} />
+ ) : null}
+ {issuesState === 'ready' && issues.length === 0 && (
<p className="text-gray-600 italic text-sm">
{hasSeasons
? 'No issues yet — “Generate issues from arc” seeds one issue per episode for each season, or plan them in the Pipeline.'
@@ -1059,7 +1064,16 @@ function StoryBuilderDetail({ storyId, stepParam }) {
const [syncDrift, setSyncDrift] = useState(false);
const [universe, setUniverse] = useState(null);
const [series, setSeries] = useState(null);
- const [issues, setIssues] = useState([]);
+ const fetchIssues = useCallback(
+ async () => {
+ if (!session?.seriesId) return [];
+ const list = await listPipelineIssues(session.seriesId, { silent: true });
+ return Array.isArray(list) ? list : (list?.items || []);
+ },
+ [session?.seriesId],
+ );
+ const issuesResource = useListResource(fetchIssues, { enabled: !!session?.seriesId });
+ const { items: issues, setItems: setIssues } = issuesResource;
const [loading, setLoading] = useState(true);
const [syncBusy, setSyncBusy] = useState(false);
@@ -1070,6 +1084,7 @@ function StoryBuilderDetail({ storyId, stepParam }) {
// records fetched before the newer completion landed.
const reloadGenRef = useRef(0);
const manifestGenRef = useRef(0);
+ const loadedSeriesIdRef = useRef(null);
// Runs this view did not start itself (a reload, a second tab, or the holder of
// a refused kickoff) are discovered on the session read and adopted by the
@@ -1118,6 +1133,11 @@ function StoryBuilderDetail({ storyId, stepParam }) {
const { activeSteps, ...record } = s;
adoptActive(storyId, activeSteps);
setSession(record);
+ const previousSeriesId = loadedSeriesIdRef.current;
+ loadedSeriesIdRef.current = s.seriesId || null;
+ // A same-series session refresh must also refresh the independently owned
+ // issue list. A changed series id triggers the hook's fetcher effect instead.
+ if (s.seriesId && previousSeriesId === s.seriesId) issuesResource.retry();
setStaleSteps(s.staleSteps || []);
setSyncDrift(s.syncDrift === true);
// These GETs own their fallback (.catch → null/[]), so silence the helper's
@@ -1129,14 +1149,10 @@ function StoryBuilderDetail({ storyId, stepParam }) {
if (!isCurrent()) return;
setUniverse(u);
setSeries(ser);
- if (s.seriesId) {
- const iss = await listPipelineIssues(s.seriesId, { silent: true }).catch(() => []);
- if (!isCurrent()) return;
- setIssues(Array.isArray(iss) ? iss : (iss?.items || []));
- }
+ if (!s.seriesId) setIssues([]);
setReadBusy(false);
setLoading(false);
- }, [storyId, adoptActive]);
+ }, [storyId, adoptActive, issuesResource.retry]);
reloadRef.current = reload;
// Optimistically mirror a completed character render onto the loaded
@@ -1536,6 +1552,7 @@ function StoryBuilderDetail({ storyId, stepParam }) {
</details>
<StepPanel
session={session} universe={universe} series={series} issues={issues}
+ issuesState={session?.seriesId ? issuesResource.state : 'ready'} issuesError={issuesResource.error} retryIssues={issuesResource.retry}
stepId={activeStepId} locked={stepState.locked} onChanged={reload}
onSeriesUpdate={updateSeriesFromServer}
onIssuesUpdate={handleIssuesUpdate}
diff --git a/client/src/pages/StoryBuilder.test.jsx b/client/src/pages/StoryBuilder.test.jsx
index e0a300076f..595e13759e 100644
--- a/client/src/pages/StoryBuilder.test.jsx
+++ b/client/src/pages/StoryBuilder.test.jsx
@@ -1,5 +1,6 @@
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { act, cleanup, render, screen, waitFor } from '@testing-library/react';
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
import { MemoryRouter, Routes, Route, Link } from 'react-router';
import { MockEventSource, lastEventSource } from '../test/mockEventSource';
@@ -32,6 +33,7 @@ const api = vi.hoisted(() => ({
reconcileStorySession: vi.fn(),
storyStepProgressSseUrl: vi.fn((id, stepId) => `/api/story-builder/${id}/steps/${stepId}/progress`),
setStoryIssueLock: vi.fn(),
+ generateStoryIssues: vi.fn(),
getUniverse: vi.fn(),
getPipelineSeries: vi.fn(),
listPipelineIssues: vi.fn(),
@@ -141,6 +143,7 @@ beforeEach(() => {
api.generateStoryStep.mockResolvedValue({ result: {} });
api.refineStoryStep.mockResolvedValue({ result: {}, changes: [] });
api.setStoryIssueLock.mockResolvedValue({});
+ api.generateStoryIssues.mockResolvedValue({ createdIssues: [], seasons: [] });
// The sync/reconcile routes return the recomputed view (staleSteps + syncDrift),
// not just the record — toggling sync or reconciling can shift staleness.
api.setStorySessionSync.mockImplementation(async (_id, sync) => ({ id: 'stb-1', sync, staleSteps: [], syncDrift: false }));
@@ -517,6 +520,38 @@ describe('StoryBuilder — index', () => {
});
describe('StoryBuilder — detail stepper', () => {
+ it('keeps a failed pipeline-issue read distinct from an empty issue list', async () => {
+ api.getStorySession.mockResolvedValue({
+ id: 'stb-1', title: 'Example story', currentStep: 'issues', steps: mkSteps(), seriesId: 's1',
+ });
+ api.listPipelineIssues.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce([]);
+ renderAt('/story-builder/stb-1/issues');
+
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load pipeline issues');
+ expect(screen.queryByText(/No issues yet/)).not.toBeInTheDocument();
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(await screen.findByText(/No issues yet/)).toBeInTheDocument();
+ });
+
+ it('refreshes the issue list after generating issues without leaving the step', async () => {
+ api.getStorySession.mockResolvedValue({
+ id: 'stb-1', title: 'Example story', currentStep: 'issues', steps: mkSteps(), seriesId: 's1',
+ });
+ api.getPipelineSeries.mockResolvedValue({
+ id: 's1', seasons: [{ id: 'season-1' }], arc: { logline: 'AL', summary: 'AS' },
+ });
+ api.listPipelineIssues.mockResolvedValueOnce([]).mockResolvedValue([
+ { id: 'issue-1', number: 1, title: 'Generated issue', status: 'open' },
+ ]);
+ api.generateStoryIssues.mockResolvedValue({ createdIssues: [{ id: 'issue-1' }], seasons: [] });
+ const user = userEvent.setup();
+ renderAt('/story-builder/stb-1/issues');
+
+ await user.click(await screen.findByRole('button', { name: 'Generate issues from arc' }));
+ expect(await screen.findByText(/#1 Generated issue/)).toBeInTheDocument();
+ expect(api.listPipelineIssues).toHaveBeenCalledTimes(2);
+ });
+
it.each([
['a server failure', Object.assign(new Error('Service unavailable'), { status: 503 })],
['a network failure', new Error('Network is down')],
diff --git a/client/src/pages/Universes.jsx b/client/src/pages/Universes.jsx
index 4842d98d17..196857c0d5 100644
--- a/client/src/pages/Universes.jsx
+++ b/client/src/pages/Universes.jsx
@@ -20,12 +20,14 @@ import SyncToPeerButton from '../components/sharing/SyncToPeerButton';
import OriginBadge from '../components/sharing/OriginBadge';
import SyncBadge from '../components/sync/SyncBadge';
import DuplicateGroup from '../components/sharing/DuplicateGroup';
+import ListLoadError from '../components/ui/ListLoadError';
import MergeModal from '../components/sharing/MergeModal';
import { timeAgo } from '../utils/formatters';
import { listUniverseSummaries, deleteUniverse, listPipelineSeriesSummaries, listMediaCollections, listUniverseDuplicates } from '../services/api';
import { useSyncIntegrity, syncBadgeStatus } from '../hooks/useSyncIntegrity';
import { useRecordMerge } from '../hooks/useRecordMerge';
import { useConfirmDelete } from '../hooks/useConfirmDelete';
+import useListResource from '../hooks/useListResource';
// Chip on a universe whose `factual` flag is set (#7616): its people and
// places are real, so captured text is extracted as lived record rather than
@@ -101,10 +103,18 @@ function DeleteButton({ universe, confirming, onRequest, onConfirm, onCancel })
export default function Universes() {
const navigate = useNavigate();
- const [universes, setUniverses] = useState([]);
- const [series, setSeries] = useState([]);
- const [latestImageByUniverse, setLatestImageByUniverse] = useState(() => new Map());
- const [loading, setLoading] = useState(true);
+ const fetchUniverses = useCallback(() => listUniverseSummaries({ silent: true }), []);
+ const universesResource = useListResource(fetchUniverses);
+ const { items: universes, setItems: setUniverses } = universesResource;
+ const fetchSeries = useCallback(() => listPipelineSeriesSummaries({ silent: true }), []);
+ const seriesResource = useListResource(fetchSeries);
+ const { items: series } = seriesResource;
+ const fetchCollections = useCallback(() => listMediaCollections({ silent: true }), []);
+ const collectionsResource = useListResource(fetchCollections);
+ const latestImageByUniverse = useMemo(
+ () => buildLatestImageByUniverse(collectionsResource.items),
+ [collectionsResource.items],
+ );
// Same-named-but-different-id universes (e.g. cross-install sync produced two
// "Clandestiny"s). Surfaced as a banner so the user can merge them here even
// when it wasn't caught at sync time. Mirrors Sharing → Duplicates, scoped to
@@ -122,45 +132,9 @@ export default function Universes() {
);
useEffect(() => {
- // Guard setState against a navigate-away before the fetch resolves —
- // mirrors the editor's load effect (UniverseBuilder.jsx).
- let cancelled = false;
- // Universes drive the page; resolve `loading` as soon as they land so a
- // slow/hung series fetch can't keep the list stuck on "Loading…".
- // silent: the custom catch below owns the error toast (AGENTS.md).
- listUniverseSummaries({ silent: true })
- .catch((err) => {
- toast.error(err.message || 'Failed to load universes');
- return [];
- })
- .then((u) => {
- if (cancelled) return;
- setUniverses(Array.isArray(u) ? u : []);
- setLoading(false);
- });
- // Series counts are a nice-to-have join, fetched independently — a failed
- // or slow request should never block the universe list (counts just show
- // 0). silent: swallowed to [] with no toast, so suppress request()'s.
- listPipelineSeriesSummaries({ silent: true })
- .catch(() => [])
- .then((s) => {
- if (cancelled) return;
- setSeries(Array.isArray(s) ? s : []);
- });
- // Latest-image thumbnails come from each universe's auto-managed media
- // collection (bucket links via `collection.universeId`). Independent fetch
- // so a slow/failed media-collections endpoint never blocks the list —
- // rows just render without a thumbnail.
- listMediaCollections({ silent: true })
- .catch(() => [])
- .then((cols) => {
- if (cancelled) return;
- setLatestImageByUniverse(buildLatestImageByUniverse(cols));
- });
// Duplicate detection is on-demand (computed server-side from the live
// universe set), independent of the list/joins above.
loadDuplicates();
- return () => { cancelled = true; };
}, [loadDuplicates]);
// Re-fetch after a merge or rename: the loser is tombstoned (so it drops from
@@ -168,17 +142,11 @@ export default function Universes() {
// media folds into the survivor (thumbnails shift). Re-scan duplicates last so
// a folded group disappears from the banner.
const refresh = useCallback(() => {
- listUniverseSummaries({ silent: true })
- .then((u) => setUniverses(Array.isArray(u) ? u : []))
- .catch((err) => toast.error(err.message || 'Failed to reload universes'));
- listPipelineSeriesSummaries({ silent: true })
- .then((s) => setSeries(Array.isArray(s) ? s : []))
- .catch(() => {});
- listMediaCollections({ silent: true })
- .then((cols) => setLatestImageByUniverse(buildLatestImageByUniverse(cols)))
- .catch(() => {});
+ universesResource.retry();
+ seriesResource.retry();
+ collectionsResource.retry();
return loadDuplicates();
- }, [loadDuplicates]);
+ }, [loadDuplicates, universesResource.retry, seriesResource.retry, collectionsResource.retry]);
const { merge, setMerge, openMerge, runPreview, executeMerge, runAIMerge, updateOverride } = useRecordMerge({ onMerged: refresh });
@@ -255,8 +223,17 @@ export default function Universes() {
</div>
)}
- {loading ? (
+ {seriesResource.state === 'error' ? (
+ <ListLoadError what="series counts" error={seriesResource.error} onRetry={seriesResource.retry} className="mb-3" />
+ ) : null}
+ {collectionsResource.state === 'error' ? (
+ <ListLoadError what="universe thumbnails" error={collectionsResource.error} onRetry={collectionsResource.retry} className="mb-3" />
+ ) : null}
+
+ {universesResource.state === 'loading' ? (
<div className="text-gray-500 text-sm">Loading universes…</div>
+ ) : universesResource.state === 'error' ? (
+ <ListLoadError what="universes" error={universesResource.error} onRetry={universesResource.retry} />
) : universes.length === 0 ? (
<div className="text-gray-500 text-sm">
No universes yet. Click <span className="text-port-accent">New Universe</span> to start.
@@ -300,7 +277,7 @@ export default function Universes() {
</div>
</td>
<td className="px-4 py-3 text-right whitespace-nowrap text-sm text-gray-300 font-mono">{u.canonCount || 0}</td>
- <td className="px-4 py-3 text-right whitespace-nowrap text-sm text-gray-300 font-mono">{seriesCountByUniverse[u.id] || 0}</td>
+ <td className="px-4 py-3 text-right whitespace-nowrap text-sm text-gray-300 font-mono">{seriesResource.state === 'ready' ? (seriesCountByUniverse[u.id] || 0) : '—'}</td>
<td className="px-4 py-3 whitespace-nowrap text-xs text-gray-500">{timeAgo(u.updatedAt || u.createdAt)}</td>
<td className="px-4 py-3">
<div className="flex items-center justify-end gap-1">
@@ -333,7 +310,7 @@ export default function Universes() {
) : null}
<div className="flex items-center gap-3 mt-2 text-xs text-gray-500">
<span className="inline-flex items-center gap-1"><Users size={12} /> {u.canonCount || 0} canon</span>
- <span className="inline-flex items-center gap-1"><WorkflowIcon size={12} /> {seriesCountByUniverse[u.id] || 0} series</span>
+ <span className="inline-flex items-center gap-1"><WorkflowIcon size={12} /> {seriesResource.state === 'ready' ? (seriesCountByUniverse[u.id] || 0) : '—'} series</span>
<span>{timeAgo(u.updatedAt || u.createdAt)}</span>
</div>
</div>
diff --git a/client/src/pages/Universes.test.jsx b/client/src/pages/Universes.test.jsx
index 66baac1ccc..22ccb430a8 100644
--- a/client/src/pages/Universes.test.jsx
+++ b/client/src/pages/Universes.test.jsx
@@ -56,6 +56,36 @@ beforeEach(() => {
});
describe('Universes page — duplicate detection', () => {
+ it('shows the universe list error and retries without rendering the empty copy', async () => {
+ api.listUniverseSummaries.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce([]);
+ const user = userEvent.setup();
+ await renderPage();
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load universes');
+ expect(screen.queryByText(/No universes yet/)).not.toBeInTheDocument();
+ await user.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(await screen.findByText(/No universes yet/)).toBeInTheDocument();
+ });
+
+ it('shows and retries a failed series-count read independently', async () => {
+ api.listPipelineSeriesSummaries.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce([]);
+ const user = userEvent.setup();
+ await renderPage();
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load series counts');
+ expect(screen.getAllByText('—').length).toBeGreaterThan(0);
+ await user.click(screen.getByRole('button', { name: 'Retry' }));
+ await waitFor(() => expect(screen.queryByRole('alert')).not.toBeInTheDocument());
+ });
+
+ it('shows and retries a failed thumbnail collection read without blocking universes', async () => {
+ api.listMediaCollections.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce([]);
+ const user = userEvent.setup();
+ await renderPage();
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load universe thumbnails');
+ expect(screen.getAllByText('Clandestiny').length).toBeGreaterThan(0);
+ await user.click(screen.getByRole('button', { name: 'Retry' }));
+ await waitFor(() => expect(screen.queryByRole('alert')).not.toBeInTheDocument());
+ });
+
it('shows a banner when duplicate-named universes are detected', async () => {
await renderPage();
await waitFor(() => expect(screen.getByText(/1 duplicate-named universe detected/)).toBeInTheDocument());
diff --git a/client/src/pages/WritersRoom.jsx b/client/src/pages/WritersRoom.jsx
index 097ba64f01..c8655b6729 100644
--- a/client/src/pages/WritersRoom.jsx
+++ b/client/src/pages/WritersRoom.jsx
@@ -14,14 +14,18 @@ import {
} from '../services/apiWritersRoom';
import { useLocalStorageBool } from '../hooks/useLocalStorageBool';
import { usePagedCollection } from '../hooks/usePagedCollection';
+import useListResource from '../hooks/useListResource';
import useMounted from '../hooks/useMounted';
+import ListLoadError from '../components/ui/ListLoadError';
const LIBRARY_COLLAPSED_KEY = 'wr.libraryCollapsed';
export default function WritersRoom() {
const { workId } = useParams();
const navigate = useNavigate();
- const [folders, setFolders] = useState([]);
+ const fetchFolders = useCallback(() => listWritersRoomFolders({ silent: true }), []);
+ const foldersResource = useListResource(fetchFolders);
+ const { items: folders, setItems: setFolders } = foldersResource;
const fetchWorks = useCallback(({ cursor, signal }) =>
listWritersRoomWorks({ limit: 50, cursor }, { signal, silent: true }), []);
const worksPage = usePagedCollection(fetchWorks);
@@ -43,13 +47,7 @@ export default function WritersRoom() {
// page unmounts (rapid nav across pages).
const mountedRef = useMounted();
- const refreshLibrary = useCallback(async () => {
- const foldersList = await listWritersRoomFolders().catch(() => []);
- if (!mountedRef.current) return;
- setFolders(foldersList);
- }, []);
-
- useEffect(() => { refreshLibrary(); }, [refreshLibrary]);
+ const refreshLibrary = useCallback(() => foldersResource.retry(), [foldersResource.retry]);
// Load the active work when the URL changes
useEffect(() => {
@@ -179,6 +177,9 @@ export default function WritersRoom() {
<div className="hidden md:block overflow-hidden min-w-0" />
) : (
<aside className="border-b md:border-b-0 md:border-r border-port-border bg-port-card/40 px-3 py-3 overflow-y-auto max-h-64 md:max-h-none">
+ {foldersResource.state === 'error' ? (
+ <ListLoadError what="folders" error={foldersResource.error} onRetry={foldersResource.retry} className="mb-3" />
+ ) : null}
<LibraryPane
folders={folders}
works={works}
diff --git a/client/src/pages/WritersRoom.test.jsx b/client/src/pages/WritersRoom.test.jsx
index f64e65d6a8..74140bd3f6 100644
--- a/client/src/pages/WritersRoom.test.jsx
+++ b/client/src/pages/WritersRoom.test.jsx
@@ -1,5 +1,5 @@
import { describe, expect, it, vi } from 'vitest';
-import { fireEvent, render, screen, within } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';
import { MemoryRouter, Route, Routes } from 'react-router';
vi.mock('../services/apiWritersRoom', async (importOriginal) => ({
@@ -11,9 +11,17 @@ vi.mock('../services/apiWritersRoom', async (importOriginal) => ({
}));
import WritersRoom from './WritersRoom';
-import { listWritersRoomWorks } from '../services/apiWritersRoom';
+import { listWritersRoomFolders, listWritersRoomWorks } from '../services/apiWritersRoom';
describe('WritersRoom empty state', () => {
+ it('shows a retriable error when the folder list fails to load', async () => {
+ listWritersRoomFolders.mockRejectedValueOnce(new Error('offline')).mockResolvedValueOnce([]);
+ render(<MemoryRouter><WritersRoom /></MemoryRouter>);
+ expect(await screen.findByRole('alert')).toHaveTextContent('Could not load folders');
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ await waitFor(() => expect(screen.queryByRole('alert')).toBeNull());
+ });
+
it('opens the existing New work form from the unselected work pane', async () => {
render(
<MemoryRouter initialEntries={['/writers-room']}>
diff --git a/client/src/services/apiWritersRoom.js b/client/src/services/apiWritersRoom.js
index 8491090cb3..6832a8cce4 100644
--- a/client/src/services/apiWritersRoom.js
+++ b/client/src/services/apiWritersRoom.js
@@ -3,7 +3,7 @@ import { request } from './apiCore.js';
const enc = encodeURIComponent;
// Folders
-export const listWritersRoomFolders = () => request('/writers-room/folders');
+export const listWritersRoomFolders = (options = {}) => request('/writers-room/folders', options);
export const createWritersRoomFolder = (data, options = {}) => request('/writers-room/folders', {
method: 'POST',
body: JSON.stringify(data),