PR Checks / Frontend Typecheck + Tests (pull_request) Successful in 1m12s
PR Checks / Backend Smoke (pull_request) Successful in 9s
PR Checks / Build Backend (no push) (pull_request) Successful in 32s
PR Checks / Build Frontend (no push) (pull_request) Successful in 1m9s
PR Checks / Build Pipeline (no push) (pull_request) Successful in 1m15s
PR Checks / AI Code Review (Claude) (pull_request) Successful in 2m26s
Review findings on #140. Drafts were reachable. Posts granted unconditional public read and the _status filter lived only in the pages that query the collection — which is a convenience, not a control. Payload's documentation is explicit: "The `draft` argument alone does not restrict documents with _status: 'draft' from being returned by the API." A direct GET /cms-api/posts would have handed every unpublished draft to any visitor. Read access now returns a query constraint for anonymous callers, which is the documented mechanism. The --drop claim was asserted across four files while the spec still listed it as an open question. Now verified rather than assumed: run_full_migration drops exactly ["school_results", "schools"] by name, there is no drop_all() or DROP SCHEMA anywhere in backend/, the only other drop is schema-qualified to marts, and nothing sets search_path. The guarantee is stronger than schema isolation alone — those two table names do not exist in Payload — so the claim stands, but it now rests on cited code. The spec records the evidence and closes the open item. findPost is wrapped in React's cache(): Next calls generateMetadata and the page separately for one request, so every post view ran the same query against Postgres twice. The bare .lede rule was dead — .prose p scores (0,1,1) and outranks it — so only .prose .lede ever applied. Removed, with the specificity noted so the surviving selector is not "simplified" back into a silent regression. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017YmbBhr8s7GusjDE12hrZM
172 lines
5.2 KiB
TypeScript
172 lines
5.2 KiB
TypeScript
import { cache } from 'react';
|
|
import type { Metadata } from 'next';
|
|
import Link from 'next/link';
|
|
import { notFound } from 'next/navigation';
|
|
import { RichText } from '@payloadcms/richtext-lexical/react';
|
|
import type { JSXConvertersFunction } from '@payloadcms/richtext-lexical/react';
|
|
import { getCachedPayload } from '@/lib/payload';
|
|
import { absoluteUrl } from '@/lib/site';
|
|
import {
|
|
blogPostingJsonLd,
|
|
breadcrumbJsonLd,
|
|
personJsonLd,
|
|
organizationJsonLd,
|
|
} from '@/lib/jsonld';
|
|
import { CalloutBlock } from '@/components/blog/CalloutBlock';
|
|
import styles from './Post.module.css';
|
|
|
|
/*
|
|
* ISR. Unlike the index, this route has a dynamic param and no
|
|
* generateStaticParams, so there is nothing for the build to prerender: each
|
|
* post is generated on first request and cached until the collection's
|
|
* afterChange hook revalidates it. That hook is what makes an edit to an
|
|
* already-published post appear immediately.
|
|
*/
|
|
export const revalidate = 3600;
|
|
|
|
interface HeroImage {
|
|
url?: string | null;
|
|
alt?: string | null;
|
|
width?: number | null;
|
|
height?: number | null;
|
|
}
|
|
|
|
/**
|
|
* Spreads the default converters and adds the one custom block.
|
|
*
|
|
* Without the spread, every default node type — paragraphs, headings, links —
|
|
* loses its renderer and the post body comes out empty.
|
|
*/
|
|
const calloutConverters: JSXConvertersFunction = ({ defaultConverters }) => ({
|
|
...defaultConverters,
|
|
blocks: {
|
|
// Annotated because the generic block converter cannot infer a custom
|
|
// block's field shape; String() guards the values regardless.
|
|
callout: ({ node }: { node: { fields: Record<string, unknown> } }) => (
|
|
<CalloutBlock
|
|
tone={String(node.fields.tone ?? 'caveat')}
|
|
body={String(node.fields.body ?? '')}
|
|
/>
|
|
),
|
|
},
|
|
});
|
|
|
|
/**
|
|
* Wrapped in React's cache() because Next calls generateMetadata and the page
|
|
* component separately for the same request — without it, every post view runs
|
|
* this query against Postgres twice. cache() dedupes within a single request
|
|
* only, so it never serves one visitor's request from another's.
|
|
*/
|
|
const findPost = cache(async (slug: string) => {
|
|
const payload = await getCachedPayload();
|
|
const { docs } = await payload.find({
|
|
collection: 'posts',
|
|
where: { slug: { equals: slug }, _status: { equals: 'published' } },
|
|
limit: 1,
|
|
depth: 1,
|
|
});
|
|
return docs[0] ?? null;
|
|
});
|
|
|
|
function summarise(post: Record<string, unknown>) {
|
|
return {
|
|
title: String(post.title),
|
|
slug: String(post.slug),
|
|
excerpt: String(post.excerpt),
|
|
publishedAt: String(post.publishedAt),
|
|
};
|
|
}
|
|
|
|
export async function generateMetadata(
|
|
{ params }: { params: Promise<{ slug: string }> },
|
|
): Promise<Metadata> {
|
|
const { slug } = await params;
|
|
const post = await findPost(slug);
|
|
if (!post) return { title: 'Not found' };
|
|
|
|
const hero = post.heroImage as HeroImage | null | undefined;
|
|
|
|
return {
|
|
title: String(post.title),
|
|
description: String(post.excerpt),
|
|
alternates: { canonical: absoluteUrl(`/blog/${post.slug}`) },
|
|
openGraph: {
|
|
type: 'article',
|
|
title: String(post.title),
|
|
description: String(post.excerpt),
|
|
url: absoluteUrl(`/blog/${post.slug}`),
|
|
publishedTime: String(post.publishedAt),
|
|
// A post with a hero image shares that; one without falls through to the
|
|
// generated share card at app/opengraph-image.tsx.
|
|
...(hero?.url ? { images: [{ url: hero.url }] } : {}),
|
|
},
|
|
};
|
|
}
|
|
|
|
export default async function PostPage(
|
|
{ params }: { params: Promise<{ slug: string }> },
|
|
) {
|
|
const { slug } = await params;
|
|
const post = await findPost(slug);
|
|
if (!post) notFound();
|
|
|
|
const summary = summarise(post as Record<string, unknown>);
|
|
const hero = post.heroImage as HeroImage | null | undefined;
|
|
|
|
const jsonLd = {
|
|
'@context': 'https://schema.org',
|
|
'@graph': [
|
|
blogPostingJsonLd(summary),
|
|
breadcrumbJsonLd(summary),
|
|
personJsonLd(),
|
|
organizationJsonLd(),
|
|
],
|
|
};
|
|
|
|
return (
|
|
<article className={styles.page}>
|
|
<script
|
|
type="application/ld+json"
|
|
dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
|
|
/>
|
|
|
|
<nav className={styles.crumb}>
|
|
<Link href="/blog" className={styles.link}>Blog</Link>
|
|
</nav>
|
|
|
|
<h1 className={styles.heading}>{summary.title}</h1>
|
|
|
|
<p className={styles.byline}>
|
|
By <Link href="/about" className={styles.link}>Tudor</Link>
|
|
{' · '}
|
|
<time dateTime={summary.publishedAt}>
|
|
{new Date(summary.publishedAt).toLocaleDateString('en-GB', {
|
|
day: 'numeric',
|
|
month: 'long',
|
|
year: 'numeric',
|
|
})}
|
|
</time>
|
|
</p>
|
|
|
|
{/*
|
|
A plain <img>, not next/image: Payload already generated the sized
|
|
derivatives on upload (Media's imageSizes), so routing it through the
|
|
optimizer would resize an image that is already the right size.
|
|
*/}
|
|
{hero?.url && (
|
|
<img
|
|
className={styles.hero}
|
|
src={hero.url}
|
|
alt={hero.alt ?? ''}
|
|
width={hero.width ?? undefined}
|
|
height={hero.height ?? undefined}
|
|
/>
|
|
)}
|
|
|
|
<div className={styles.prose}>
|
|
<RichText data={post.content as never} converters={calloutConverters} />
|
|
</div>
|
|
</article>
|
|
);
|
|
}
|