feat(i18n): wire page translation editor and locale rendering
This commit is contained in:
3
TODO.md
3
TODO.md
@@ -171,7 +171,7 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
- [ ] [P1] Media entity rendering with enrichment data
|
- [ ] [P1] Media entity rendering with enrichment data
|
||||||
- [ ] [P1] Portfolio views (gallery/album/category/tag) for artworks with filter and sort controls
|
- [ ] [P1] Portfolio views (gallery/album/category/tag) for artworks with filter and sort controls
|
||||||
- [ ] [P1] Rendition-aware media delivery (thumbnail/card/full) per template slot
|
- [ ] [P1] Rendition-aware media delivery (thumbnail/card/full) per template slot
|
||||||
- [ ] [P1] Translation-ready content model for public entities (pages/news/navigation labels)
|
- [~] [P1] Translation-ready content model for public entities (pages/news/navigation labels)
|
||||||
- [ ] [P2] Artwork views and listing filters
|
- [ ] [P2] Artwork views and listing filters
|
||||||
- [ ] [P1] Commission request submission flow
|
- [ ] [P1] Commission request submission flow
|
||||||
- [x] [P1] Header banner render logic and fallbacks
|
- [x] [P1] Header banner render logic and fallbacks
|
||||||
@@ -322,6 +322,7 @@ This file is the single source of truth for roadmap and delivery progress.
|
|||||||
- [2026-02-12] Added code handover documentation baseline: architecture map, critical invariants, request lifecycles, and onboarding playbook under `docs/product-engineering/`.
|
- [2026-02-12] Added code handover documentation baseline: architecture map, critical invariants, request lifecycles, and onboarding playbook under `docs/product-engineering/`.
|
||||||
- [2026-02-12] Completed admin form component coverage for pages/navigation/media using isolated form components and tests.
|
- [2026-02-12] Completed admin form component coverage for pages/navigation/media using isolated form components and tests.
|
||||||
- [2026-02-12] Added page translation CRUD baseline (`PageTranslation`) with locale validation (`de/en/es/fr`) and integration coverage for localized read + fallback behavior.
|
- [2026-02-12] Added page translation CRUD baseline (`PageTranslation`) with locale validation (`de/en/es/fr`) and integration coverage for localized read + fallback behavior.
|
||||||
|
- [2026-02-12] Page editor now supports locale translations in `/pages/:id`; public page rendering uses locale-aware page lookup with base-content fallback.
|
||||||
|
|
||||||
## How We Use This File
|
## How We Use This File
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,10 @@
|
|||||||
import { deletePage, getPageById, updatePage } from "@cms/db"
|
import {
|
||||||
|
deletePage,
|
||||||
|
getPageById,
|
||||||
|
listPageTranslations,
|
||||||
|
updatePage,
|
||||||
|
upsertPageTranslation,
|
||||||
|
} from "@cms/db"
|
||||||
import { Button } from "@cms/ui/button"
|
import { Button } from "@cms/ui/button"
|
||||||
import Link from "next/link"
|
import Link from "next/link"
|
||||||
import { redirect } from "next/navigation"
|
import { redirect } from "next/navigation"
|
||||||
@@ -9,6 +15,8 @@ import { requirePermissionForRoute } from "@/lib/route-guards"
|
|||||||
export const dynamic = "force-dynamic"
|
export const dynamic = "force-dynamic"
|
||||||
|
|
||||||
type SearchParamsInput = Record<string, string | string[] | undefined>
|
type SearchParamsInput = Record<string, string | string[] | undefined>
|
||||||
|
const SUPPORTED_LOCALES = ["de", "en", "es", "fr"] as const
|
||||||
|
type SupportedLocale = (typeof SUPPORTED_LOCALES)[number]
|
||||||
|
|
||||||
type PageProps = {
|
type PageProps = {
|
||||||
params: Promise<{ id: string }>
|
params: Promise<{ id: string }>
|
||||||
@@ -48,6 +56,14 @@ function redirectWithState(pageId: string, params: { notice?: string; error?: st
|
|||||||
redirect(value ? `/pages/${pageId}?${value}` : `/pages/${pageId}`)
|
redirect(value ? `/pages/${pageId}?${value}` : `/pages/${pageId}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function normalizeLocale(input: string | null): SupportedLocale {
|
||||||
|
if (input && SUPPORTED_LOCALES.includes(input as SupportedLocale)) {
|
||||||
|
return input as SupportedLocale
|
||||||
|
}
|
||||||
|
|
||||||
|
return "en"
|
||||||
|
}
|
||||||
|
|
||||||
export default async function PageEditorPage({ params, searchParams }: PageProps) {
|
export default async function PageEditorPage({ params, searchParams }: PageProps) {
|
||||||
const role = await requirePermissionForRoute({
|
const role = await requirePermissionForRoute({
|
||||||
nextPath: "/pages",
|
nextPath: "/pages",
|
||||||
@@ -57,7 +73,11 @@ export default async function PageEditorPage({ params, searchParams }: PageProps
|
|||||||
const resolvedParams = await params
|
const resolvedParams = await params
|
||||||
const pageId = resolvedParams.id
|
const pageId = resolvedParams.id
|
||||||
|
|
||||||
const [resolvedSearchParams, pageRecord] = await Promise.all([searchParams, getPageById(pageId)])
|
const [resolvedSearchParams, pageRecord, translations] = await Promise.all([
|
||||||
|
searchParams,
|
||||||
|
getPageById(pageId),
|
||||||
|
listPageTranslations(pageId),
|
||||||
|
])
|
||||||
|
|
||||||
if (!pageRecord) {
|
if (!pageRecord) {
|
||||||
redirect("/pages?error=Page+not+found")
|
redirect("/pages?error=Page+not+found")
|
||||||
@@ -66,6 +86,8 @@ export default async function PageEditorPage({ params, searchParams }: PageProps
|
|||||||
const page = pageRecord
|
const page = pageRecord
|
||||||
const notice = readFirstValue(resolvedSearchParams.notice)
|
const notice = readFirstValue(resolvedSearchParams.notice)
|
||||||
const error = readFirstValue(resolvedSearchParams.error)
|
const error = readFirstValue(resolvedSearchParams.error)
|
||||||
|
const selectedLocale = normalizeLocale(readFirstValue(resolvedSearchParams.locale))
|
||||||
|
const selectedTranslation = translations.find((entry) => entry.locale === selectedLocale)
|
||||||
|
|
||||||
async function updatePageAction(formData: FormData) {
|
async function updatePageAction(formData: FormData) {
|
||||||
"use server"
|
"use server"
|
||||||
@@ -118,6 +140,34 @@ export default async function PageEditorPage({ params, searchParams }: PageProps
|
|||||||
redirect("/pages?notice=Page+deleted")
|
redirect("/pages?notice=Page+deleted")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function upsertPageTranslationAction(formData: FormData) {
|
||||||
|
"use server"
|
||||||
|
|
||||||
|
await requirePermissionForRoute({
|
||||||
|
nextPath: "/pages",
|
||||||
|
permission: "pages:write",
|
||||||
|
scope: "team",
|
||||||
|
})
|
||||||
|
|
||||||
|
const locale = normalizeLocale(readInputString(formData, "locale"))
|
||||||
|
|
||||||
|
try {
|
||||||
|
await upsertPageTranslation({
|
||||||
|
pageId,
|
||||||
|
locale,
|
||||||
|
title: readInputString(formData, "title"),
|
||||||
|
summary: readNullableString(formData, "summary"),
|
||||||
|
content: readInputString(formData, "content"),
|
||||||
|
seoTitle: readNullableString(formData, "seoTitle"),
|
||||||
|
seoDescription: readNullableString(formData, "seoDescription"),
|
||||||
|
})
|
||||||
|
} catch {
|
||||||
|
redirect(`/pages/${pageId}?error=Failed+to+save+translation.&locale=${locale}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
redirect(`/pages/${pageId}?notice=Translation+saved.&locale=${locale}`)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AdminShell
|
<AdminShell
|
||||||
role={role}
|
role={role}
|
||||||
@@ -226,6 +276,132 @@ export default async function PageEditorPage({ params, searchParams }: PageProps
|
|||||||
</form>
|
</form>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section className="rounded-xl border border-neutral-200 p-6">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<h3 className="text-xl font-medium">Translations</h3>
|
||||||
|
<p className="text-sm text-neutral-600">
|
||||||
|
Add locale-specific page content. Missing locales fall back to base page fields.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="mt-4 flex flex-wrap gap-2">
|
||||||
|
{SUPPORTED_LOCALES.map((locale) => {
|
||||||
|
const isActive = locale === selectedLocale
|
||||||
|
const hasTranslation = translations.some((entry) => entry.locale === locale)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Link
|
||||||
|
key={locale}
|
||||||
|
href={`/pages/${pageId}?locale=${locale}`}
|
||||||
|
className={`inline-flex items-center gap-2 rounded border px-3 py-1.5 text-xs ${
|
||||||
|
isActive
|
||||||
|
? "border-neutral-800 bg-neutral-900 text-white"
|
||||||
|
: "border-neutral-300 text-neutral-700"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<span>{locale.toUpperCase()}</span>
|
||||||
|
<span className={isActive ? "text-neutral-200" : "text-neutral-500"}>
|
||||||
|
{hasTranslation ? "saved" : "missing"}
|
||||||
|
</span>
|
||||||
|
</Link>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{translations.length > 0 ? (
|
||||||
|
<div className="mt-4 rounded border border-neutral-200">
|
||||||
|
<table className="min-w-full text-left text-sm">
|
||||||
|
<thead className="text-xs uppercase tracking-wide text-neutral-500">
|
||||||
|
<tr>
|
||||||
|
<th className="px-3 py-2">Locale</th>
|
||||||
|
<th className="px-3 py-2">Title</th>
|
||||||
|
<th className="px-3 py-2">Updated</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{translations.map((translation) => (
|
||||||
|
<tr key={translation.id} className="border-t border-neutral-200">
|
||||||
|
<td className="px-3 py-2">{translation.locale.toUpperCase()}</td>
|
||||||
|
<td className="px-3 py-2">{translation.title}</td>
|
||||||
|
<td className="px-3 py-2 text-neutral-600">
|
||||||
|
{translation.updatedAt.toLocaleDateString("en-US")}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
|
||||||
|
<form action={upsertPageTranslationAction} className="mt-6 space-y-3">
|
||||||
|
<label className="space-y-1">
|
||||||
|
<span className="text-xs text-neutral-600">Locale</span>
|
||||||
|
<select
|
||||||
|
name="locale"
|
||||||
|
defaultValue={selectedLocale}
|
||||||
|
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||||
|
>
|
||||||
|
{SUPPORTED_LOCALES.map((locale) => (
|
||||||
|
<option key={locale} value={locale}>
|
||||||
|
{locale.toUpperCase()}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label className="space-y-1">
|
||||||
|
<span className="text-xs text-neutral-600">Title</span>
|
||||||
|
<input
|
||||||
|
name="title"
|
||||||
|
defaultValue={selectedTranslation?.title ?? page.title}
|
||||||
|
required
|
||||||
|
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label className="space-y-1">
|
||||||
|
<span className="text-xs text-neutral-600">Summary</span>
|
||||||
|
<input
|
||||||
|
name="summary"
|
||||||
|
defaultValue={selectedTranslation?.summary ?? page.summary ?? ""}
|
||||||
|
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label className="space-y-1">
|
||||||
|
<span className="text-xs text-neutral-600">Content</span>
|
||||||
|
<textarea
|
||||||
|
name="content"
|
||||||
|
rows={8}
|
||||||
|
defaultValue={selectedTranslation?.content ?? page.content}
|
||||||
|
required
|
||||||
|
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div className="grid gap-3 md:grid-cols-2">
|
||||||
|
<label className="space-y-1">
|
||||||
|
<span className="text-xs text-neutral-600">SEO title</span>
|
||||||
|
<input
|
||||||
|
name="seoTitle"
|
||||||
|
defaultValue={selectedTranslation?.seoTitle ?? page.seoTitle ?? ""}
|
||||||
|
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
<label className="space-y-1">
|
||||||
|
<span className="text-xs text-neutral-600">SEO description</span>
|
||||||
|
<input
|
||||||
|
name="seoDescription"
|
||||||
|
defaultValue={selectedTranslation?.seoDescription ?? page.seoDescription ?? ""}
|
||||||
|
className="w-full rounded border border-neutral-300 px-3 py-2 text-sm"
|
||||||
|
/>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Button type="submit">Save translation</Button>
|
||||||
|
</form>
|
||||||
|
</section>
|
||||||
|
|
||||||
<section className="rounded-xl border border-red-300 bg-red-50 p-6">
|
<section className="rounded-xl border border-red-300 bg-red-50 p-6">
|
||||||
<h3 className="text-lg font-medium text-red-800">Danger Zone</h3>
|
<h3 className="text-lg font-medium text-red-800">Danger Zone</h3>
|
||||||
<p className="mt-1 text-sm text-red-700">
|
<p className="mt-1 text-sm text-red-700">
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { getPublishedPageBySlug } from "@cms/db"
|
import { getPublishedPageBySlugForLocale } from "@cms/db"
|
||||||
import { notFound } from "next/navigation"
|
import { notFound } from "next/navigation"
|
||||||
|
|
||||||
import { PublicPageView } from "@/components/public-page-view"
|
import { PublicPageView } from "@/components/public-page-view"
|
||||||
@@ -6,12 +6,12 @@ import { PublicPageView } from "@/components/public-page-view"
|
|||||||
export const dynamic = "force-dynamic"
|
export const dynamic = "force-dynamic"
|
||||||
|
|
||||||
type PageProps = {
|
type PageProps = {
|
||||||
params: Promise<{ slug: string }>
|
params: Promise<{ locale: string; slug: string }>
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function CmsPageRoute({ params }: PageProps) {
|
export default async function CmsPageRoute({ params }: PageProps) {
|
||||||
const { slug } = await params
|
const { locale, slug } = await params
|
||||||
const page = await getPublishedPageBySlug(slug)
|
const page = await getPublishedPageBySlugForLocale(slug, locale)
|
||||||
|
|
||||||
if (!page) {
|
if (!page) {
|
||||||
notFound()
|
notFound()
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { getPublishedPageBySlug, listPosts } from "@cms/db"
|
import { getPublishedPageBySlugForLocale, listPosts } from "@cms/db"
|
||||||
import { Button } from "@cms/ui/button"
|
import { Button } from "@cms/ui/button"
|
||||||
import { getTranslations } from "next-intl/server"
|
import { getTranslations } from "next-intl/server"
|
||||||
import { PublicAnnouncements } from "@/components/public-announcements"
|
import { PublicAnnouncements } from "@/components/public-announcements"
|
||||||
@@ -6,9 +6,15 @@ import { PublicPageView } from "@/components/public-page-view"
|
|||||||
|
|
||||||
export const dynamic = "force-dynamic"
|
export const dynamic = "force-dynamic"
|
||||||
|
|
||||||
export default async function HomePage() {
|
type HomePageProps = {
|
||||||
|
params: Promise<{ locale: string }>
|
||||||
|
}
|
||||||
|
|
||||||
|
export default async function HomePage({ params }: HomePageProps) {
|
||||||
|
const { locale } = await params
|
||||||
|
|
||||||
const [homePage, posts, t] = await Promise.all([
|
const [homePage, posts, t] = await Promise.all([
|
||||||
getPublishedPageBySlug("home"),
|
getPublishedPageBySlugForLocale("home", locale),
|
||||||
listPosts(),
|
listPosts(),
|
||||||
getTranslations("Home"),
|
getTranslations("Home"),
|
||||||
])
|
])
|
||||||
|
|||||||
Reference in New Issue
Block a user