Compare commits

...

1 Commits

Author SHA1 Message Date
a2bea6326e feat(web): complete portfolio public filter and sort integration 2026-02-12 23:08:25 +01:00
7 changed files with 169 additions and 18 deletions

17
TODO.md
View File

@@ -120,7 +120,7 @@ This file is the single source of truth for roadmap and delivery progress.
commission request intake + admin CRUD + kanban + customer entity/linking commission request intake + admin CRUD + kanban + customer entity/linking
- [x] [P1] `todo/mvp1-announcements-news`: - [x] [P1] `todo/mvp1-announcements-news`:
announcement management/rendering + news/blog CRUD and public rendering announcement management/rendering + news/blog CRUD and public rendering
- [~] [P1] `todo/mvp1-public-rendering-integration`: - [x] [P1] `todo/mvp1-public-rendering-integration`:
public rendering for pages/navigation/media/portfolio/announcements and commissioning entrypoints public rendering for pages/navigation/media/portfolio/announcements and commissioning entrypoints
- [~] [P1] `todo/mvp1-e2e-happy-paths`: - [~] [P1] `todo/mvp1-e2e-happy-paths`:
end-to-end scenarios for page publish, media flow, announcement display, commission flow end-to-end scenarios for page publish, media flow, announcement display, commission flow
@@ -158,14 +158,14 @@ This file is the single source of truth for roadmap and delivery progress.
### Public App ### Public App
- [~] [P1] Dynamic page rendering from CMS page entities - [x] [P1] Dynamic page rendering from CMS page entities
- [~] [P1] Navigation rendering from managed menu structure - [x] [P1] Navigation rendering from managed menu structure
- [~] [P1] Media entity rendering with enrichment data - [x] [P1] Media entity rendering with enrichment data
- [~] [P1] Portfolio views (gallery/album/category/tag) for artworks with filter and sort controls - [x] [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 - [x] [P1] Rendition-aware media delivery (thumbnail/card/full) per template slot
- [~] [P1] Translation-ready content model for public entities (pages/news/navigation labels) - [x] [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 - [x] [P1] Commission request submission flow
- [x] [P1] Header banner render logic and fallbacks - [x] [P1] Header banner render logic and fallbacks
- [x] [P1] Announcement render slots (homepage + optional global/top banner position) - [x] [P1] Announcement render slots (homepage + optional global/top banner position)
@@ -370,6 +370,7 @@ This file is the single source of truth for roadmap and delivery progress.
- [2026-02-12] Users management baseline completed: admin `/users` now supports managed user creation, role changes (`admin/editor/manager`), status changes (ban/unban), and protected/system guardrails for role-change/delete/ban actions. - [2026-02-12] Users management baseline completed: admin `/users` now supports managed user creation, role changes (`admin/editor/manager`), status changes (ban/unban), and protected/system guardrails for role-change/delete/ban actions.
- [2026-02-12] Commissions management completed: admin kanban cards now include inline detail editing (assignee/customer/budget/due date/notes), linked-artwork references via `linkedArtworkIds`, and creation/edit flows use assignable users instead of raw ID entry. - [2026-02-12] Commissions management completed: admin kanban cards now include inline detail editing (assignee/customer/budget/due date/notes), linked-artwork references via `linkedArtworkIds`, and creation/edit flows use assignable users instead of raw ID entry.
- [2026-02-12] Announcements/news completed: announcements now support locale audience targeting (`targetLocales`) with public locale-aware rendering, and homepage news list now uses locale-aware published posts only. - [2026-02-12] Announcements/news completed: announcements now support locale audience targeting (`targetLocales`) with public locale-aware rendering, and homepage news list now uses locale-aware published posts only.
- [2026-02-12] Public rendering integration completed: portfolio now supports locale-aware tag filters and explicit sort controls, while db/service sorting and rendition selection align public listing/detail media delivery.
- [2026-02-12] Public UX pass: commission request flow now reports explicit invalid budget range errors, and header navigation now falls back to localized defaults (`home`, `portfolio`, `news`, `commissions`) when no CMS menu exists; seed data now creates those default menu entries. - [2026-02-12] Public UX pass: commission request flow now reports explicit invalid budget range errors, and header navigation now falls back to localized defaults (`home`, `portfolio`, `news`, `commissions`) when no CMS menu exists; seed data now creates those default menu entries.
- [2026-02-12] Added `e2e/public-rendering.pw.ts` web coverage for fallback navigation visibility, portfolio routes, and commission submission validation (invalid budget range + successful submission path). - [2026-02-12] Added `e2e/public-rendering.pw.ts` web coverage for fallback navigation visibility, portfolio routes, and commission submission validation (invalid budget range + successful submission path).
- [2026-02-12] Testing execution is temporarily paused for delivery velocity: root test scripts are stubbed and CI test steps are disabled; all testing backlog is consolidated under `MVP 3: Testing and Quality`. - [2026-02-12] Testing execution is temporarily paused for delivery velocity: root test scripts are stubbed and CI test steps are disabled; all testing backlog is consolidated under `MVP 3: Testing and Quality`.

View File

@@ -44,6 +44,33 @@ function resolveGroupFilter(searchParams: SearchParamsInput) {
return null return null
} }
function resolveSort(searchParams: SearchParamsInput): "latest" | "title_asc" | "title_desc" {
const sort = readFirstValue(searchParams.sort)
if (sort === "title_asc" || sort === "title_desc") {
return sort
}
return "latest"
}
function buildPortfolioQuery(
filter: ReturnType<typeof resolveGroupFilter>,
sort: ReturnType<typeof resolveSort>,
) {
const query: Record<string, string> = {}
if (filter) {
query[filter.groupType] = filter.groupSlug
}
if (sort !== "latest") {
query.sort = sort
}
return query
}
function findPreviewAsset( function findPreviewAsset(
renditions: Array<{ renditions: Array<{
slot: string slot: string
@@ -67,6 +94,7 @@ function findPreviewAsset(
export default async function PortfolioPage({ searchParams }: PortfolioPageProps) { export default async function PortfolioPage({ searchParams }: PortfolioPageProps) {
const [resolvedSearchParams, t] = await Promise.all([searchParams, getTranslations("Portfolio")]) const [resolvedSearchParams, t] = await Promise.all([searchParams, getTranslations("Portfolio")])
const activeFilter = resolveGroupFilter(resolvedSearchParams) const activeFilter = resolveGroupFilter(resolvedSearchParams)
const activeSort = resolveSort(resolvedSearchParams)
const [groups, artworks] = await Promise.all([ const [groups, artworks] = await Promise.all([
listPublishedPortfolioGroups(), listPublishedPortfolioGroups(),
@@ -75,8 +103,11 @@ export default async function PortfolioPage({ searchParams }: PortfolioPageProps
? { ? {
groupType: activeFilter.groupType, groupType: activeFilter.groupType,
groupSlug: activeFilter.groupSlug, groupSlug: activeFilter.groupSlug,
sort: activeSort,
} }
: undefined, : {
sort: activeSort,
},
), ),
]) ])
@@ -91,7 +122,10 @@ export default async function PortfolioPage({ searchParams }: PortfolioPageProps
<section className="rounded-xl border border-neutral-200 p-4"> <section className="rounded-xl border border-neutral-200 p-4">
<div className="flex flex-wrap items-center gap-2"> <div className="flex flex-wrap items-center gap-2">
<Link <Link
href="/portfolio" href={{
pathname: "/portfolio",
query: activeSort === "latest" ? undefined : { sort: activeSort },
}}
className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100" className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100"
> >
{t("filters.clear")} {t("filters.clear")}
@@ -100,7 +134,16 @@ export default async function PortfolioPage({ searchParams }: PortfolioPageProps
{groups.galleries.map((group) => ( {groups.galleries.map((group) => (
<Link <Link
key={`gallery-${group.id}`} key={`gallery-${group.id}`}
href={{ pathname: "/portfolio", query: { gallery: group.slug } }} href={{
pathname: "/portfolio",
query: {
...buildPortfolioQuery(activeFilter, activeSort),
gallery: group.slug,
album: undefined,
category: undefined,
tag: undefined,
},
}}
className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100" className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100"
> >
{t("filters.gallery")}: {group.name} {t("filters.gallery")}: {group.name}
@@ -110,7 +153,16 @@ export default async function PortfolioPage({ searchParams }: PortfolioPageProps
{groups.albums.map((group) => ( {groups.albums.map((group) => (
<Link <Link
key={`album-${group.id}`} key={`album-${group.id}`}
href={{ pathname: "/portfolio", query: { album: group.slug } }} href={{
pathname: "/portfolio",
query: {
...buildPortfolioQuery(activeFilter, activeSort),
gallery: undefined,
album: group.slug,
category: undefined,
tag: undefined,
},
}}
className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100" className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100"
> >
{t("filters.album")}: {group.name} {t("filters.album")}: {group.name}
@@ -120,12 +172,73 @@ export default async function PortfolioPage({ searchParams }: PortfolioPageProps
{groups.categories.map((group) => ( {groups.categories.map((group) => (
<Link <Link
key={`category-${group.id}`} key={`category-${group.id}`}
href={{ pathname: "/portfolio", query: { category: group.slug } }} href={{
pathname: "/portfolio",
query: {
...buildPortfolioQuery(activeFilter, activeSort),
gallery: undefined,
album: undefined,
category: group.slug,
tag: undefined,
},
}}
className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100" className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100"
> >
{t("filters.category")}: {group.name} {t("filters.category")}: {group.name}
</Link> </Link>
))} ))}
{groups.tags.map((group) => (
<Link
key={`tag-${group.id}`}
href={{
pathname: "/portfolio",
query: {
...buildPortfolioQuery(activeFilter, activeSort),
gallery: undefined,
album: undefined,
category: undefined,
tag: group.slug,
},
}}
className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100"
>
{t("filters.tag")}: {group.name}
</Link>
))}
</div>
<div className="mt-3 flex flex-wrap items-center gap-2">
<span className="text-xs uppercase tracking-wide text-neutral-500">
{t("sort.label")}:
</span>
<Link
href={{
pathname: "/portfolio",
query: buildPortfolioQuery(activeFilter, "latest"),
}}
className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100"
>
{t("sort.latest")}
</Link>
<Link
href={{
pathname: "/portfolio",
query: buildPortfolioQuery(activeFilter, "title_asc"),
}}
className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100"
>
{t("sort.titleAsc")}
</Link>
<Link
href={{
pathname: "/portfolio",
query: buildPortfolioQuery(activeFilter, "title_desc"),
}}
className="rounded-md border border-neutral-300 px-3 py-1.5 text-sm text-neutral-700 hover:bg-neutral-100"
>
{t("sort.titleDesc")}
</Link>
</div> </div>
</section> </section>

View File

@@ -77,7 +77,14 @@
"clear": "Filter zurücksetzen", "clear": "Filter zurücksetzen",
"gallery": "Galerie", "gallery": "Galerie",
"album": "Album", "album": "Album",
"category": "Kategorie" "category": "Kategorie",
"tag": "Tag"
},
"sort": {
"label": "Sortierung",
"latest": "Neueste",
"titleAsc": "Titel A-Z",
"titleDesc": "Titel Z-A"
}, },
"fields": { "fields": {
"medium": "Medium", "medium": "Medium",

View File

@@ -77,7 +77,14 @@
"clear": "Clear filters", "clear": "Clear filters",
"gallery": "Gallery", "gallery": "Gallery",
"album": "Album", "album": "Album",
"category": "Category" "category": "Category",
"tag": "Tag"
},
"sort": {
"label": "Sort",
"latest": "Latest",
"titleAsc": "Title A-Z",
"titleDesc": "Title Z-A"
}, },
"fields": { "fields": {
"medium": "Medium", "medium": "Medium",

View File

@@ -77,7 +77,14 @@
"clear": "Limpiar filtros", "clear": "Limpiar filtros",
"gallery": "Galería", "gallery": "Galería",
"album": "Álbum", "album": "Álbum",
"category": "Categoría" "category": "Categoría",
"tag": "Etiqueta"
},
"sort": {
"label": "Orden",
"latest": "Más recientes",
"titleAsc": "Título A-Z",
"titleDesc": "Título Z-A"
}, },
"fields": { "fields": {
"medium": "Técnica", "medium": "Técnica",

View File

@@ -77,7 +77,14 @@
"clear": "Réinitialiser les filtres", "clear": "Réinitialiser les filtres",
"gallery": "Galerie", "gallery": "Galerie",
"album": "Album", "album": "Album",
"category": "Catégorie" "category": "Catégorie",
"tag": "Tag"
},
"sort": {
"label": "Tri",
"latest": "Plus récents",
"titleAsc": "Titre A-Z",
"titleDesc": "Titre Z-A"
}, },
"fields": { "fields": {
"medium": "Médium", "medium": "Médium",

View File

@@ -9,15 +9,18 @@ import {
updateGroupingInputSchema, updateGroupingInputSchema,
updateMediaAssetInputSchema, updateMediaAssetInputSchema,
} from "@cms/content" } from "@cms/content"
import type { Prisma } from "@prisma/client"
import { db } from "./client" import { db } from "./client"
type PublicArtworkGroupType = "gallery" | "album" | "category" | "tag" type PublicArtworkGroupType = "gallery" | "album" | "category" | "tag"
type PublicArtworkSort = "latest" | "title_asc" | "title_desc"
type ListPublishedArtworksInput = { type ListPublishedArtworksInput = {
groupType?: PublicArtworkGroupType groupType?: PublicArtworkGroupType
groupSlug?: string groupSlug?: string
limit?: number limit?: number
sort?: PublicArtworkSort
} }
export async function listMediaAssets(limit = 24) { export async function listMediaAssets(limit = 24) {
@@ -431,6 +434,12 @@ export async function listPublishedArtworks(input: ListPublishedArtworksInput =
const where: Record<string, unknown> = { const where: Record<string, unknown> = {
isPublished: true, isPublished: true,
} }
const orderBy: Prisma.ArtworkOrderByWithRelationInput[] =
input.sort === "title_asc"
? [{ title: "asc" }, { updatedAt: "desc" }]
: input.sort === "title_desc"
? [{ title: "desc" }, { updatedAt: "desc" }]
: [{ updatedAt: "desc" }]
if (input.groupType && input.groupSlug) { if (input.groupType && input.groupSlug) {
if (input.groupType === "gallery") { if (input.groupType === "gallery") {
@@ -474,7 +483,7 @@ export async function listPublishedArtworks(input: ListPublishedArtworksInput =
return db.artwork.findMany({ return db.artwork.findMany({
where, where,
orderBy: [{ updatedAt: "desc" }], orderBy,
take, take,
include: { include: {
renditions: { renditions: {