@anthusai/papyrus 1.0.0-next.9 → 1.1.0

package/app/[year]/[month]/[day]/section/[sectionKey]/page.tsx

@@ -2,8 +2,13 @@ import { notFound, redirect } from "next/navigation";
 import { EditionRoutePage } from "../../edition-route-page";
 import { createSectionKey } from "../../../../../../lib/edition-sections";
 import { parseEditionSectionRoute } from "../../../../../../lib/edition-routes";
+import { generateEditionSectionStaticParams } from "../../../../../../lib/reader-static-params";
 // Keep in sync with READER_REVALIDATE_SECONDS in lib/reader-route-config.ts
-export const revalidate = 3600;
+export const revalidate = 60;
+
+export async function generateStaticParams() {
+  return generateEditionSectionStaticParams();
+}
 
 type EditionSectionRouteProps = {
   params: Promise<{

package/app/api/archive/editions/route.ts

@@ -3,7 +3,7 @@ import { loadArchiveEditionPreviews, clampArchiveLimit } from "../../../../lib/a
 import { ARCHIVE_BATCH_SIZE } from "../../../../lib/archive-types";
 
 // Keep in sync with READER_REVALIDATE_SECONDS in lib/reader-route-config.ts
-export const revalidate = 3600;
+export const revalidate = 60;
 
 export async function GET(request: Request) {
   const url = new URL(request.url);

package/app/api/auth/prospectus/callback/route.ts

@@ -0,0 +1,9 @@
+import type { NextRequest } from "next/server";
+import { handleProspectusSignInCallback } from "../../../../../lib/prospectus-sign-in-routes";
+
+export const dynamic = "force-dynamic";
+export const runtime = "nodejs";
+
+export function GET(request: NextRequest) {
+  return handleProspectusSignInCallback(request);
+}

package/app/api/auth/prospectus/selection/route.ts

@@ -0,0 +1,9 @@
+import type { NextRequest } from "next/server";
+import { handleProspectusAccountSelection } from "../../../../../lib/prospectus-sign-in-routes";
+
+export const dynamic = "force-dynamic";
+export const runtime = "nodejs";
+
+export function POST(request: NextRequest) {
+  return handleProspectusAccountSelection(request);
+}

package/app/api/auth/prospectus/session/route.ts

@@ -0,0 +1,9 @@
+import type { NextRequest } from "next/server";
+import { handleProspectusSessionRead } from "../../../../../lib/prospectus-sign-in-routes";
+
+export const dynamic = "force-dynamic";
+export const runtime = "nodejs";
+
+export function GET(request: NextRequest) {
+  return handleProspectusSessionRead(request);
+}

package/app/api/auth/prospectus/sign-in/route.ts

@@ -0,0 +1,9 @@
+import type { NextRequest } from "next/server";
+import { handleProspectusSignInStart } from "../../../../../lib/prospectus-sign-in-routes";
+
+export const dynamic = "force-dynamic";
+export const runtime = "nodejs";
+
+export function GET(request: NextRequest) {
+  return handleProspectusSignInStart(request);
+}

package/app/api/auth/prospectus/sign-out/route.ts

@@ -0,0 +1,9 @@
+import type { NextRequest } from "next/server";
+import { handleProspectusSignOut } from "../../../../../lib/prospectus-sign-in-routes";
+
+export const dynamic = "force-dynamic";
+export const runtime = "nodejs";
+
+export function POST(request: NextRequest) {
+  return handleProspectusSignOut(request);
+}

package/app/api/cyclotron/priming-proof/route.ts

@@ -0,0 +1,11 @@
+import { NextResponse } from "next/server";
+import { approvedPrimingProofReport } from "../../../../lib/priming-proof-report";
+import { SITE_BRAND } from "../../../../lib/site-brand";
+
+export function GET() {
+  const report = approvedPrimingProofReport(SITE_BRAND.id);
+  if (report === null) {
+    return NextResponse.json({ error: "No approved priming proof report for this publication yet." }, { status: 404 });
+  }
+  return NextResponse.json(report);
+}

package/app/api/media/[...path]/route.ts

@@ -1,4 +1,5 @@
 import { NextResponse } from "next/server";
+import { buildMediaRouteResponse } from "../../../../lib/media-route-response";
 import { isGuestReadableStoragePath, signStorageUrl } from "../../../../lib/reader-storage-url";
 
 export const dynamic = "force-dynamic";
@@ -16,20 +17,8 @@ export async function GET(_request: Request, context: MediaRouteContext) {
     return NextResponse.json({ error: "Forbidden storage path." }, { status: 403 });
   }
 
-  const signedUrl = await signStorageUrl(storagePath);
-  const upstream = await fetch(signedUrl, { cache: "no-store" });
-  if (!upstream.ok) {
-    return NextResponse.json(
-      { error: `Upstream media fetch failed (${upstream.status}).` },
-      { status: upstream.status === 404 ? 404 : 502 },
-    );
-  }
-
-  const headers = new Headers();
-  const contentType = upstream.headers.get("content-type");
-  if (contentType) {
-    headers.set("content-type", contentType);
-  }
-  headers.set("cache-control", "public, max-age=3600, stale-while-revalidate=86400");
-  return new NextResponse(upstream.body, { status: 200, headers });
+  return buildMediaRouteResponse(storagePath, {
+    signStorageUrl,
+    fetchUpstream: (signedUrl) => fetch(signedUrl, { cache: "no-store" }),
+  });
 }

package/app/api/revalidate/route.ts

@@ -1,3 +1,4 @@
+import { toPublicReaderPath } from "../../../lib/reader-base-path";
 import { revalidatePath, revalidateTag } from "next/cache";
 import { NextResponse } from "next/server";
 import {
@@ -8,6 +9,8 @@ import {
   editionContentCacheTag,
   editionItemCacheTag,
 } from "../../../lib/cached-content-repository";
+import { isAuthorizedRevalidateRequest } from "../../../lib/revalidate-secret";
+import { prewarmPaths, resolvePrewarmOrigin } from "../../../lib/revalidate-prewarm";
 import { getEditionArticlePath, getEditionDatePath } from "../../../lib/edition-routes";
 
 export const dynamic = "force-dynamic";
@@ -18,12 +21,12 @@ type RevalidateRequestBody = {
   itemSlugs?: string[];
   paths?: string[];
   tags?: string[];
+  prewarm?: boolean;
 };
 
 export async function POST(request: Request) {
-  const configuredSecret = process.env.PAPYRUS_REVALIDATE_SECRET?.trim();
-  const providedSecret = request.headers.get("x-papyrus-revalidate-secret")?.trim();
-  if (!configuredSecret || providedSecret !== configuredSecret) {
+  const providedSecret = request.headers.get("x-papyrus-revalidate-secret");
+  if (!(await isAuthorizedRevalidateRequest(providedSecret))) {
     return NextResponse.json({ ok: false, error: "Unauthorized." }, { status: 401 });
   }
 
@@ -44,8 +47,8 @@ export async function POST(request: Request) {
     if (!normalized) continue;
     revalidateTag(articleCacheTag(normalized));
     revalidatedTags.add(articleCacheTag(normalized));
-    revalidatePath(`/articles/${encodeURIComponent(normalized)}`);
-    revalidatedPaths.add(`/articles/${encodeURIComponent(normalized)}`);
+    revalidatePath(toPublicReaderPath(`/articles/${encodeURIComponent(normalized)}`));
+    revalidatedPaths.add(toPublicReaderPath(`/articles/${encodeURIComponent(normalized)}`));
     if (editionDate) {
       revalidateTag(editionItemCacheTag(editionDate, normalized));
       revalidatedTags.add(editionItemCacheTag(editionDate, normalized));
@@ -76,8 +79,8 @@ export async function POST(request: Request) {
   revalidatedTags.add(ARCHIVE_CACHE_TAG);
   revalidateTag(ARTICLES_CACHE_TAG);
   revalidatedTags.add(ARTICLES_CACHE_TAG);
-  revalidatePath("/archive");
-  revalidatedPaths.add("/archive");
+  revalidatePath(toPublicReaderPath("/archive"));
+  revalidatedPaths.add(toPublicReaderPath("/archive"));
 
   for (const path of body.paths ?? []) {
     const normalized = path.trim();
@@ -86,9 +89,14 @@ export async function POST(request: Request) {
     revalidatedPaths.add(normalized);
   }
 
+  const prewarmed = body.prewarm === false
+    ? []
+    : await prewarmPaths(resolvePrewarmOrigin(request.url), [...revalidatedPaths]);
+
   return NextResponse.json({
     ok: true,
     revalidatedTags: [...revalidatedTags],
     revalidatedPaths: [...revalidatedPaths],
+    prewarmed,
   });
 }

package/app/archive/page.tsx

@@ -4,7 +4,7 @@ import { loadArchiveEditionPreviews } from "../../lib/archive-data";
 import { ARCHIVE_BATCH_SIZE } from "../../lib/archive-types";
 
 // Keep in sync with READER_REVALIDATE_SECONDS in lib/reader-route-config.ts
-export const revalidate = 3600;
+export const revalidate = 60;
 
 export default async function ArchivePage() {
   const initialBatch = await loadArchiveEditionPreviews({ limit: ARCHIVE_BATCH_SIZE });

package/app/articles/[slug]/page.tsx

@@ -1,11 +1,11 @@
 import { notFound } from "next/navigation";
 import { getSiteRenderer } from "../../../lib/site-renderer";
-import { getCachedArticle } from "../../../lib/cached-content-repository";
-import { generateArticleStaticParams } from "../../../lib/reader-static-params";
+import { getCachedArticle, getCachedVideoScript } from "../../../lib/cached-content-repository";
+import { generateArticleStaticParams, siteServesNextReaderRoutes } from "../../../lib/reader-static-params";
 import { SITE_BRAND } from "../../../lib/site-brand";
 
 // Keep in sync with READER_REVALIDATE_SECONDS in lib/reader-route-config.ts
-export const revalidate = 3600;
+export const revalidate = 60;
 
 export async function generateStaticParams() {
   return generateArticleStaticParams();
@@ -16,6 +16,7 @@ type ArticlePageProps = {
 };
 
 export async function generateMetadata({ params }: ArticlePageProps) {
+  if (!siteServesNextReaderRoutes()) return {};
   const { slug } = await params;
   const article = await getCachedArticle(slug);
   if (!article) return {};
@@ -26,10 +27,11 @@ export async function generateMetadata({ params }: ArticlePageProps) {
 }
 
 export default async function ArticlePage({ params }: ArticlePageProps) {
+  if (!siteServesNextReaderRoutes()) notFound();
   const { slug } = await params;
-  const article = await getCachedArticle(slug);
+  const [article, videoScript] = await Promise.all([getCachedArticle(slug), getCachedVideoScript(slug)]);
   if (!article) notFound();
 
   const siteRenderer = getSiteRenderer();
-  return <siteRenderer.renderArticle article={article} backHref="/" />;
+  return <siteRenderer.renderArticle article={article} videoScript={videoScript} backHref="/" />;
 }

package/app/blog-rhythm.css

@@ -0,0 +1,278 @@
+/*
+  Structural CSS for the rhythm blog layout (blogLayout: "rhythm").
+  Every rule is scoped to .blog-rhythm-shell, which only the rhythm layout
+  renders, so classic layouts are unaffected. The shell sets --blog-rhythm,
+  --blog-row-height, --blog-paint-buffer and --blog-paint-height inline.
+  Typography, colors and the header look belong to the publication's theme.css.
+  Optional tokens a publication may set:
+    --blog-hrule-foreground, --blog-section-rule, --blog-section-band-height,
+    --blog-page-padding-x, --blog-secondary-pair-min-width.
+*/
+
+.blog-rhythm-shell {
+  --blog-hrule-foreground: var(--border);
+  --blog-section-rule: var(--border);
+  --blog-section-band-height: calc(var(--blog-row-height) * 2);
+  --blog-page-padding-x: calc(var(--blog-rhythm) * 3);
+  --paper-rhythm: var(--blog-row-height);
+
+  isolation: isolate;
+  position: relative;
+}
+
+.blog-rhythm-shell.presentation-page--blog {
+  padding: calc(var(--blog-row-height) * 4) var(--blog-page-padding-x) 0;
+}
+
+.blog-rhythm-shell > :not(.blog-page-background) {
+  position: relative;
+  z-index: 1;
+}
+
+.blog-rhythm-shell[data-rhythm-overlay="true"]::before {
+  background-image:
+    repeating-linear-gradient(
+      to bottom,
+      rgb(var(--rhythm-overlay-rule-rgb) / var(--rhythm-overlay-rule-alpha)) 0,
+      rgb(var(--rhythm-overlay-rule-rgb) / var(--rhythm-overlay-rule-alpha)) 1px,
+      transparent 1px,
+      transparent var(--blog-row-height)
+    ),
+    repeating-linear-gradient(
+      to bottom,
+      rgb(var(--rhythm-overlay-blue-rgb) / var(--rhythm-overlay-blue-alpha)) 0,
+      rgb(var(--rhythm-overlay-blue-rgb) / var(--rhythm-overlay-blue-alpha)) var(--blog-row-height),
+      rgb(var(--rhythm-overlay-yellow-rgb) / var(--rhythm-overlay-yellow-alpha)) var(--blog-row-height),
+      rgb(var(--rhythm-overlay-yellow-rgb) / var(--rhythm-overlay-yellow-alpha)) calc(var(--blog-row-height) * 2)
+    );
+  content: "";
+  inset: 0;
+  pointer-events: none;
+  position: absolute;
+  z-index: 900;
+}
+
+.blog-rhythm-shell .presentation-header {
+  max-width: 100%;
+  min-width: 0;
+  width: 100%;
+}
+
+.blog-rhythm-shell .presentation-section-header,
+.blog-rhythm-shell .presentation-item,
+.blog-rhythm-shell .presentation-item__copy {
+  max-width: 100%;
+  min-width: 0;
+}
+
+.blog-rhythm-shell .presentation-section-header {
+  align-items: stretch;
+  border-bottom: 0;
+  border-top: 0;
+  display: flex;
+  flex-direction: column;
+  gap: var(--blog-row-height);
+  margin: 0;
+  min-height: 0;
+  padding: calc(var(--blog-row-height) * 4) 0 calc(var(--blog-row-height) * 2);
+  width: 100%;
+}
+
+.blog-rhythm-shell .presentation-section-header__band {
+  align-items: center;
+  display: grid;
+  gap: 0 var(--blog-rhythm);
+  grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
+  grid-template-rows: var(--blog-section-band-height);
+  width: 100%;
+}
+
+.blog-rhythm-shell .presentation-section-header__band::before,
+.blog-rhythm-shell .presentation-section-header__band::after {
+  background: var(--blog-section-rule);
+  content: "";
+  grid-row: 1;
+  height: var(--blog-section-band-height);
+}
+
+.blog-rhythm-shell .presentation-section-header__band::before {
+  grid-column: 1;
+}
+
+.blog-rhythm-shell .presentation-section-header__band::after {
+  grid-column: 3;
+}
+
+.blog-rhythm-shell .presentation-section-header__band p {
+  grid-column: 2;
+  grid-row: 1;
+  height: var(--blog-section-band-height);
+  justify-self: center;
+  line-height: var(--blog-section-band-height);
+  margin: 0;
+  padding: 0 var(--blog-rhythm);
+  width: max-content;
+}
+
+.blog-rhythm-shell .presentation-item {
+  border-bottom: 0;
+  gap: var(--blog-row-height) calc(var(--blog-rhythm) * 4);
+  padding-bottom: 0;
+}
+
+.blog-rhythm-shell .presentation-item--blog {
+  grid-template-columns: minmax(0, 1fr);
+}
+
+.blog-rhythm-shell .presentation-rhythm-hrule {
+  display: grid;
+  grid-column: 1 / -1;
+  grid-template-rows: repeat(5, var(--blog-row-height));
+  height: calc(var(--blog-row-height) * 5);
+  width: 100%;
+}
+
+.blog-rhythm-shell .presentation-rhythm-hrule__line {
+  background: var(--blog-hrule-foreground);
+  grid-row: 3;
+  height: var(--blog-row-height);
+}
+
+@media (min-width: 1100px) {
+  .blog-rhythm-shell .blog-section:has(> .presentation-item[data-item-index="2"]) {
+    column-gap: calc(var(--blog-row-height) * 2);
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+
+  .blog-rhythm-shell .blog-section:has(> .presentation-item[data-item-index="2"]) > .presentation-section-header,
+  .blog-rhythm-shell .blog-section:has(> .presentation-item[data-item-index="2"]) > .presentation-item[data-item-index="0"] {
+    grid-column: 1 / -1;
+  }
+
+  .blog-rhythm-shell .blog-section:has(> .presentation-item[data-item-index="2"]) > .presentation-rhythm-hrule[data-hide-in-secondary-pair="true"] {
+    display: none;
+  }
+}
+
+.blog-rhythm-shell .presentation-item[data-feature-layout][data-has-image="true"] {
+  display: flex;
+  flex-direction: column;
+  gap: 0;
+  grid-template-columns: minmax(0, 1fr);
+}
+
+.blog-rhythm-shell .presentation-item[data-feature-layout] .presentation-item__text-frame {
+  height: var(--feature-text-frame-height);
+  max-width: none;
+  overflow: hidden;
+  position: relative;
+  width: 100%;
+}
+
+.blog-rhythm-shell .presentation-item[data-feature-layout] .presentation-item__media {
+  height: var(--feature-media-height);
+  width: var(--feature-image-width);
+}
+
+.blog-rhythm-shell .presentation-item[data-feature-layout] .pictogram-figure__frame {
+  aspect-ratio: auto;
+  height: var(--feature-image-height);
+  width: var(--feature-image-width);
+}
+
+.blog-rhythm-shell .presentation-item--blog[data-feature-layout][data-has-image="true"] .presentation-item__copy {
+  display: contents;
+}
+
+.blog-rhythm-shell .presentation-item--blog[data-feature-layout][data-has-image="true"] .presentation-item__header {
+  width: 100%;
+}
+
+.blog-rhythm-shell .presentation-item--blog[data-feature-layout][data-has-image="true"] .presentation-item__body {
+  min-width: 0;
+  position: relative;
+  width: 100%;
+}
+
+.blog-rhythm-shell .presentation-item--blog[data-feature-layout][data-has-image="true"] .presentation-item__body .presentation-item__text-frame {
+  margin-top: 0;
+}
+
+.blog-rhythm-shell .presentation-item--blog[data-feature-layout][data-has-image="true"] .presentation-item__media {
+  margin: 0;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 1;
+}
+
+.blog-rhythm-shell .presentation-item__image img {
+  height: 100%;
+  object-fit: contain;
+  width: 100%;
+}
+
+.blog-rhythm-shell .presentation-item__video {
+  grid-column: 1 / -1;
+  margin: var(--blog-row-height) 0 0;
+}
+
+.blog-rhythm-shell .article-page__hero-video {
+  margin: 0 0 calc(var(--blog-rhythm) * 5);
+}
+
+.blog-rhythm-shell .article-page__hero-video .article-video,
+.blog-rhythm-shell .presentation-item__video-figure {
+  container-type: inline-size;
+}
+
+.blog-rhythm-shell .presentation-item__video-figure .article-video__media,
+.blog-rhythm-shell .article-page__hero-video .article-video__media {
+  height: round(up, calc(100cqw * 9 / 16), var(--blog-row-height));
+}
+
+.blog-rhythm-shell .article-float-grid[data-feature-layout][data-has-image="true"] {
+  display: grid;
+  gap: var(--feature-layout-gap);
+  grid-template-columns: minmax(0, 1fr) var(--feature-image-width);
+}
+
+.blog-rhythm-shell .article-float-grid[data-feature-layout] .article-page__hero-video,
+.blog-rhythm-shell .article-float-grid[data-feature-layout] .article-float-grid__header {
+  grid-column: 1 / -1;
+}
+
+.blog-rhythm-shell .article-float-grid[data-feature-layout] .article-float-grid__body {
+  align-self: start;
+  grid-column: 1;
+  max-width: var(--feature-copy-width);
+  min-width: 0;
+  width: var(--feature-copy-width);
+}
+
+.blog-rhythm-shell .article-float-grid[data-feature-layout] .article-float-grid__media,
+.blog-rhythm-shell .article-float-grid[data-feature-layout] .pictogram-figure__frame {
+  height: var(--feature-image-height);
+  width: var(--feature-image-width);
+}
+
+.blog-rhythm-shell .article-float-grid[data-feature-layout] .pictogram-figure__frame {
+  aspect-ratio: auto;
+}
+
+.blog-rhythm-shell .article-float-grid[data-feature-layout] .article-float-grid__media {
+  align-self: start;
+  grid-column: 2;
+  margin: 0;
+  position: relative;
+}
+
+.blog-rhythm-shell .article-float-grid .presentation-item__image {
+  margin: 0;
+}
+
+@media (max-width: 900px) {
+  .blog-rhythm-shell .presentation-item--blog {
+    grid-template-columns: 1fr;
+  }
+}

package/app/cyclotron/page.tsx

@@ -0,0 +1,13 @@
+import type { Metadata } from "next";
+import { PrimingProofPage } from "../../components/priming-proof-page";
+import { approvedPrimingProofReport } from "../../lib/priming-proof-report";
+import { SITE_BRAND } from "../../lib/site-brand";
+
+export const metadata: Metadata = {
+  title: `Cyclotron proof | ${SITE_BRAND.articleTitleSuffix}`,
+  description: "How often the relevance classifier agrees with editors on a fixed held-out set, before and after editor labels.",
+};
+
+export default function CyclotronProof() {
+  return <PrimingProofPage report={approvedPrimingProofReport(SITE_BRAND.id)} />;
+}

package/app/globals.css

@@ -45,6 +45,7 @@
   --color-surface-foreground: var(--surface-foreground);
   --color-foreground-strong: var(--foreground-strong);
   --color-foreground-muted: var(--foreground-muted);
+  --color-foreground-subtle: var(--foreground-subtle);
 }
 
 :root {
@@ -71,6 +72,7 @@
   --surface-foreground: var(--card-foreground);
   --foreground-strong: var(--slate-12);
   --foreground-muted: var(--slate-10);
+  --foreground-subtle: var(--slate-9);
   --border: var(--slate-6);
   --input: var(--slate-6);
   --ring: var(--slate-8);

package/app/layout.tsx

@@ -4,12 +4,14 @@ import Script from "next/script";
 import { AmplifyClientProvider } from "../components/amplify-client-provider";
 import { PapyrusConsoleShell } from "../components/papyrus-console-shell";
 import { TooltipProvider } from "../components/ui/tooltip";
+import { resolveBrandFontAssets } from "../lib/brand-fonts";
 import { getPresentationChoices, getSiteBrand } from "../lib/site-brand";
 import { getSiteStack } from "../lib/site-stack";
 import { isIndexable, showStagingBanner } from "../lib/site-env";
 import { StagingBanner } from "../components/staging-banner";
 import "./tailwind.css";
 import "./globals.css";
+import "./blog-rhythm.css";
 import "papyrus-site-theme";
 
 const playfairDisplay = Playfair_Display({
@@ -43,6 +45,7 @@ export default async function RootLayout({ children }: Readonly<{ children: Reac
   const siteBrand = getSiteBrand();
   const presentationChoices = getPresentationChoices(siteBrand);
   const siteStack = getSiteStack(siteBrand);
+  const brandFonts = resolveBrandFontAssets(siteBrand.fonts);
 
   return (
     <html
@@ -56,8 +59,21 @@ export default async function RootLayout({ children }: Readonly<{ children: Reac
       data-default-presentation={siteBrand.defaultPresentation}
       data-presentation-choices={presentationChoices.join(",")}
       {...(siteBrand.forcedPresentation ? { "data-forced-presentation": siteBrand.forcedPresentation } : {})}
+      {...(siteBrand.blogLayout === "rhythm" ? { "data-blog-layout": "rhythm" } : {})}
+      {...(brandFonts.isEmpty ? {} : { style: brandFonts.rootStyle as React.CSSProperties })}
       suppressHydrationWarning
     >
+      {brandFonts.isEmpty ? null : (
+        <head>
+          {brandFonts.preconnectOrigins.map((origin) => (
+            <link crossOrigin="anonymous" href={origin} key={origin} rel="preconnect" />
+          ))}
+          {brandFonts.stylesheetHrefs.map((href) => (
+            <link href={href} key={href} rel="stylesheet" />
+          ))}
+          {brandFonts.fontFaceCss ? <style data-brand-fonts="true">{brandFonts.fontFaceCss}</style> : null}
+        </head>
+      )}
       <body className={`${playfairDisplay.variable} ${plusJakartaSans.variable}`}>
         <Script id="papyrus-favicon-color-scheme" strategy="beforeInteractive">
           {`(() => {

package/app/newsroom/[section]/[...selection]/page.tsx

@@ -1,4 +1,6 @@
+import { resolveActiveSiteBrand } from "../../../../lib/site-brand-tenant";
 import { notFound, redirect } from "next/navigation";
+import { toPublicNewsroomPath } from "../../../../lib/newsroom-base-path";
 import { NewsDeskPage } from "../../../../components/news-desk-page";
 import type { NewsDeskTab } from "../../../../components/topic-steering-workspace";
 
@@ -26,6 +28,7 @@ type NewsDeskNestedSectionPageProps = {
 };
 
 const NEWS_DESK_ROUTE_SECTIONS = new Set<NewsDeskTab>([
+  "desks",
   "administration",
   "topics",
   "concepts",
@@ -37,13 +40,13 @@ const NEWS_DESK_ROUTE_SECTIONS = new Set<NewsDeskTab>([
 
 export default async function NewsDeskNestedSectionPage({ params, searchParams }: NewsDeskNestedSectionPageProps) {
   const { section, selection } = await params;
-  if (section === "users") redirect("/newsroom/administration/users");
-  if (section === "doctrine") redirect("/newsroom/administration/policies");
-  if (section === "administration" && selection[0] === "analysis") redirect("/newsroom/assignments");
-  if (section === "desks") {
+  if (section === "users") redirect(toPublicNewsroomPath("/newsroom/administration/users"));
+  if (section === "doctrine") redirect(toPublicNewsroomPath("/newsroom/administration/policies"));
+  if (section === "administration" && selection[0] === "analysis") redirect(toPublicNewsroomPath("/newsroom/assignments"));
+  if (section === "desks" && resolveActiveSiteBrand().newsroomLayout !== "organizer") {
     const category = selection[0] ? decodeURIComponent(selection[0]) : null;
-    if (category) redirect(`/newsroom/topics?category=${encodeURIComponent(category)}`);
-    redirect("/newsroom/topics");
+    if (category) redirect(toPublicNewsroomPath(`/newsroom/topics?category=${encodeURIComponent(category)}`));
+    redirect(toPublicNewsroomPath("/newsroom/topics"));
   }
   if (!NEWS_DESK_ROUTE_SECTIONS.has(section as NewsDeskTab)) notFound();
   return <NewsDeskPage section={section} selectionPath={selection} searchParams={searchParams} />;

package/app/newsroom/[section]/page.tsx

@@ -1,4 +1,6 @@
+import { resolveActiveSiteBrand } from "../../../lib/site-brand-tenant";
 import { notFound, redirect } from "next/navigation";
+import { toPublicNewsroomPath } from "../../../lib/newsroom-base-path";
 import { NewsDeskPage } from "../../../components/news-desk-page";
 import type { NewsDeskTab } from "../../../components/topic-steering-workspace";
 
@@ -27,6 +29,7 @@ type NewsDeskSectionPageProps = {
 };
 
 const NEWS_DESK_ROUTE_SECTIONS = new Set<NewsDeskTab>([
+  "desks",
   "administration",
   "topics",
   "concepts",
@@ -39,9 +42,9 @@ const NEWS_DESK_ROUTE_SECTIONS = new Set<NewsDeskTab>([
 
 export default async function NewsDeskSectionPage({ params, searchParams }: NewsDeskSectionPageProps) {
   const { section } = await params;
-  if (section === "users") redirect("/newsroom/administration/users");
-  if (section === "doctrine") redirect("/newsroom/administration/policies");
-  if (section === "desks") redirect("/newsroom/topics");
+  if (section === "users") redirect(toPublicNewsroomPath("/newsroom/administration/users"));
+  if (section === "doctrine") redirect(toPublicNewsroomPath("/newsroom/administration/policies"));
+  if (section === "desks" && resolveActiveSiteBrand().newsroomLayout !== "organizer") redirect(toPublicNewsroomPath("/newsroom/topics"));
   if (!NEWS_DESK_ROUTE_SECTIONS.has(section as NewsDeskTab)) notFound();
   return <NewsDeskPage section={section} searchParams={searchParams} />;
 }