TudorandClaude Opus 5
7b41218e6e
The home page caught every fetch failure and rendered its empty state, so a backend outage looked like a site with no schools in it. School pages turned any error into notFound(), which told visitors — and crawlers — that a real school had ceased to exist. Place fetches did the same by returning [] and null. Failures now reach a retryable error boundary; only a genuine 404 still calls notFound(). "Load more" and the map fetch resolved against whatever state existed when they returned, so results from an abandoned search appended themselves to the new ones. Each fetch now carries an AbortController and checks that its search scope is still current before touching state. The map only records its cache key on success, so a failed load retries instead of pinning the stale marker set. Jest ignored .next/, whose build output otherwise shadowed real suites. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
88 lines
2.8 KiB
TypeScript
88 lines
2.8 KiB
TypeScript
import { APIFetchError } from './api';
|
|
|
|
/**
|
|
* Client for the places API.
|
|
*
|
|
* Two namespaces, matching the backend: towns and localities share
|
|
* /schools/[place]; authorities take /schools/authority/[la]. 67 town names
|
|
* collide with an authority name and neither set contains the other, so one
|
|
* namespace would publish near-duplicate pages.
|
|
*/
|
|
import type { School } from '@/lib/types';
|
|
|
|
export interface PlaceSummary {
|
|
kind: string;
|
|
slug: string;
|
|
name: string;
|
|
count: number;
|
|
/** Phases that clear the threshold on their own, so the page links
|
|
* variants that exist rather than 404s. Absent on the registry listing. */
|
|
phases?: string[];
|
|
}
|
|
|
|
export interface PlaceAuthority {
|
|
name: string;
|
|
/** null when that authority has no page of its own — two English
|
|
* authorities hold fewer schools than the threshold. */
|
|
slug: string | null;
|
|
count: number;
|
|
}
|
|
|
|
export interface PlaceDetail {
|
|
place: PlaceSummary & {
|
|
parent_authority: string | null;
|
|
/** Every authority the place meaningfully sits in, largest first. SW19 is
|
|
* mostly Merton but partly Wandsworth. */
|
|
authorities?: PlaceAuthority[];
|
|
};
|
|
schools: School[];
|
|
averages: {
|
|
rwm_expected_pct: number | null;
|
|
attainment_8_score: number | null;
|
|
};
|
|
}
|
|
|
|
export function placeUrl(kind: string, slug: string, phase?: string): string {
|
|
const base =
|
|
kind === 'authority' ? `/schools/authority/${slug}`
|
|
: kind === 'outcode' ? `/schools/near/${slug}`
|
|
: `/schools/${slug}`;
|
|
return phase ? `${base}/${phase}` : base;
|
|
}
|
|
|
|
/**
|
|
* An authority name as it appears in a URL.
|
|
*
|
|
* Only a fallback: the API sends the slug it built, and that is what should
|
|
* be used. This mirrors `_slugify` in backend/app.py, collapsed runs and
|
|
* trimmed hyphens included, so the two cannot disagree about a name like
|
|
* "Bristol, City of".
|
|
*/
|
|
export function authoritySlug(name: string): string {
|
|
return name.toLowerCase().trim()
|
|
.replace(/[^\w\s-]/g, '')
|
|
.replace(/\s+/g, '-')
|
|
.replace(/-+/g, '-')
|
|
.replace(/^-|-$/g, '');
|
|
}
|
|
|
|
const API = process.env.FASTAPI_URL || process.env.NEXT_PUBLIC_API_URL
|
|
|| 'http://localhost:8000/api';
|
|
|
|
export async function fetchPlaces(): Promise<PlaceSummary[]> {
|
|
const res = await fetch(`${API}/places`, { next: { revalidate: 604800 } });
|
|
if (!res.ok) throw new APIFetchError("Unable to load places", res.status);
|
|
return (await res.json()).places ?? [];
|
|
}
|
|
|
|
export async function fetchPlace(
|
|
kind: string, slug: string, phase?: string,
|
|
): Promise<PlaceDetail | null> {
|
|
const q = phase ? `?phase=${encodeURIComponent(phase)}` : '';
|
|
const res = await fetch(`${API}/places/${kind}/${slug}${q}`,
|
|
{ next: { revalidate: 604800 } });
|
|
if (res.status === 404) return null;
|
|
if (!res.ok) throw new APIFetchError("Unable to load place", res.status);
|
|
return res.json();
|
|
}
|