@byline/host-tanstack-start 4.16.0 → 4.18.0

package/src/admin-shell/singletons/view.tsx

@@ -0,0 +1,351 @@
+'use client'
+
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+
+import { useRouter } from '@tanstack/react-router'
+
+import { FormRenderer } from '@byline/admin/react'
+import type { SingletonAdminConfig, SingletonDefinition } from '@byline/core'
+import {
+  ErrorCodes,
+  getDefaultStatus,
+  getWorkflow,
+  getWorkflowStatuses,
+  validateStatusTransition,
+} from '@byline/core'
+import { useTranslation } from '@byline/i18n/react'
+import { Container, Section, useToastManager } from '@byline/ui/react'
+
+import { getAdminRoutePath } from '../../routes/admin-path.js'
+import {
+  cancelSingletonScheduledPublish,
+  changeSingletonStatus,
+  confirmSingletonScheduledPublish,
+  copySingletonToLocale,
+  scheduleSingletonPublish,
+  unpublishSingleton,
+  updateSingleton,
+} from '../../server-fns/singletons/index.js'
+import { useNavigate } from '../chrome/loose-router.js'
+import { useTanStackNavigationGuard } from '../collections/tanstack-navigation-guard.js'
+import { SingletonViewMenu } from './view-menu.js'
+import type { SerializedDocumentPublishSchedule } from '../../server-fns/collections/index.js'
+import type { ContentLocaleOption } from '../collections/view-menu.js'
+
+type SingletonDocument = Record<string, any> & {
+  id: string
+  status: string
+  fields: Record<string, any>
+}
+
+function errorCode(error: unknown): string | null {
+  return typeof (error as { code?: unknown })?.code === 'string'
+    ? (error as { code: string }).code
+    : null
+}
+
+export function SingletonView({
+  singletonDefinition,
+  adminConfig,
+  document,
+  initialData,
+  locale,
+  contentLocales,
+  defaultContentLocale,
+}: {
+  singletonDefinition: SingletonDefinition
+  adminConfig?: SingletonAdminConfig
+  document: SingletonDocument | null
+  /** Schema defaults resolved by the server-side route loader for an empty slot. */
+  initialData?: Record<string, any>
+  locale?: string
+  contentLocales: ReadonlyArray<ContentLocaleOption>
+  defaultContentLocale: string
+}) {
+  const router = useRouter()
+  const navigate = useNavigate()
+  const toastManager = useToastManager()
+  const { t } = useTranslation('byline-admin')
+  const { path, label, fields } = singletonDefinition
+
+  const workflowStatuses = getWorkflowStatuses(singletonDefinition)
+  const currentStatus = document?.status ?? getDefaultStatus(singletonDefinition)
+  const currentIndex = workflowStatuses.findIndex((status) => status.name === currentStatus)
+  const nextStatus =
+    currentIndex !== -1 && currentIndex < workflowStatuses.length - 1
+      ? workflowStatuses[currentIndex + 1]
+      : undefined
+  const publishedVersion = document?._publishedVersion ?? null
+  const restoreWarnings = document?._restoreWarnings as string[] | undefined
+  const scheduledPublicationEnabled = document?._scheduledPublicationEnabled === true
+  const canSchedulePublication = document?._canSchedulePublication === true
+  const scheduledPublication = (document?._scheduledPublish ??
+    null) as SerializedDocumentPublishSchedule | null
+  const publishTransitionValid =
+    document != null &&
+    currentStatus !== 'published' &&
+    workflowStatuses.length > 1 &&
+    validateStatusTransition(getWorkflow(singletonDefinition), currentStatus, 'published').valid
+  const canArmSchedule =
+    scheduledPublicationEnabled && canSchedulePublication && publishTransitionValid
+
+  const reload = async () => {
+    // Invalidation is load-bearing after the first save: the refreshed loader
+    // supplies the mapped document id/version, flips FormRenderer to edit mode,
+    // and unlocks fields that require a saved document.
+    await router.invalidate()
+  }
+
+  const toast = (title: string, description: string, intent: 'success' | 'warning' | 'danger') => {
+    toastManager.add({
+      title,
+      description,
+      data: { intent, iconType: intent, icon: true, close: true },
+    })
+  }
+
+  const notifyScheduleSuspended = () => {
+    if (scheduledPublication?.state !== 'armed') return
+    toast(
+      t('scheduledPublication.toast.suspendedTitle'),
+      t('scheduledPublication.toast.suspendedDescription'),
+      'warning'
+    )
+  }
+
+  const handleSubmit = async ({ data }: { data: Record<string, any> }) => {
+    try {
+      await updateSingleton({
+        data: {
+          singleton: path,
+          data,
+          locale: locale ?? defaultContentLocale,
+          expectedVersionId: document?.versionId,
+        },
+      })
+      if (document != null) notifyScheduleSuspended()
+      toast(
+        t('singletons.edit.updateTitle', { label }),
+        t('singletons.edit.updatedDescription', { label: label.toLowerCase() }),
+        'success'
+      )
+      await reload()
+    } catch (err) {
+      const code = errorCode(err)
+      const description =
+        code === ErrorCodes.CONFLICT
+          ? t('singletons.edit.conflictDescription')
+          : code === ErrorCodes.NOT_FOUND
+            ? t('singletons.edit.notConfiguredDescription')
+            : t('singletons.edit.updateFailedDescription', { label: label.toLowerCase() })
+      toast(t('singletons.edit.updateTitle', { label }), description, 'danger')
+
+      // FormRenderer commits its clean baseline only when this promise
+      // resolves. Rethrow so a failed singleton save leaves the editor dirty
+      // and its navigation guard active.
+      throw err
+    }
+  }
+
+  const handleStatusChange = async (status: string) => {
+    try {
+      await changeSingletonStatus({ data: { singleton: path, status } })
+      toast(
+        t('collections.edit.statusUpdateTitle', { label }),
+        t('collections.edit.statusChangedDescription', { status }),
+        'success'
+      )
+      await reload()
+    } catch (err) {
+      toast(
+        t('collections.edit.statusUpdateTitle', { label }),
+        t('collections.edit.statusChangeFailedDescription', { message: (err as Error).message }),
+        'danger'
+      )
+      throw err
+    }
+  }
+
+  const handleUnpublish = async () => {
+    try {
+      await unpublishSingleton({ data: { singleton: path } })
+      toast(
+        t('collections.edit.unpublishTitle', { label }),
+        t('collections.edit.unpublishedDescription'),
+        'success'
+      )
+      await reload()
+    } catch (err) {
+      toast(
+        t('collections.edit.unpublishTitle', { label }),
+        t('collections.edit.unpublishFailedDescription', { message: (err as Error).message }),
+        'danger'
+      )
+      throw err
+    }
+  }
+
+  const handleCopyToLocale = async ({
+    targetLocale,
+    overwrite,
+  }: {
+    targetLocale: string
+    overwrite: boolean
+  }) => {
+    try {
+      await copySingletonToLocale({
+        data: {
+          singleton: path,
+          sourceLocale: locale ?? defaultContentLocale,
+          targetLocale,
+          overwrite,
+        },
+      })
+      const sourceLocale = locale ?? defaultContentLocale
+      const sourceLabel =
+        contentLocales.find((entry) => entry.code === sourceLocale)?.label ?? sourceLocale
+      const targetLabel =
+        contentLocales.find((entry) => entry.code === targetLocale)?.label ?? targetLocale
+      toast(
+        t('collections.edit.copyToLocaleTitle', { label }),
+        t('collections.edit.copiedSuccessMessage', {
+          source: sourceLabel,
+          target: targetLabel,
+        }),
+        'success'
+      )
+      notifyScheduleSuspended()
+      navigate({
+        to: getAdminRoutePath('singletons', '$singleton'),
+        params: { singleton: path },
+        search: { locale: targetLocale },
+      })
+    } catch (err) {
+      toast(
+        t('collections.edit.copyToLocaleTitle', { label }),
+        t('collections.edit.copyFailedDescription', { message: (err as Error).message }),
+        'danger'
+      )
+      throw err
+    }
+  }
+
+  const handleSchedulePublication = async ({ publishAt }: { publishAt: string }) => {
+    try {
+      await scheduleSingletonPublish({
+        data: { singleton: path, publishAt, expectedVersionId: String(document?.versionId) },
+      })
+      toast(
+        t('scheduledPublication.toast.scheduledTitle'),
+        t('scheduledPublication.toast.scheduledDescription'),
+        'success'
+      )
+      await reload()
+    } catch (err) {
+      toast(t('scheduledPublication.toast.failedTitle'), (err as Error).message, 'danger')
+      throw err
+    }
+  }
+
+  const handleConfirmScheduledPublication = async () => {
+    try {
+      await confirmSingletonScheduledPublish({
+        data: { singleton: path, expectedVersionId: String(document?.versionId) },
+      })
+      toast(
+        t('scheduledPublication.toast.confirmedTitle'),
+        t('scheduledPublication.toast.confirmedDescription'),
+        'success'
+      )
+      await reload()
+    } catch (err) {
+      toast(t('scheduledPublication.toast.failedTitle'), (err as Error).message, 'danger')
+      throw err
+    }
+  }
+
+  const handleCancelScheduledPublication = async () => {
+    try {
+      await cancelSingletonScheduledPublish({ data: { singleton: path } })
+      toast(
+        t('scheduledPublication.toast.cancelledTitle'),
+        t('scheduledPublication.toast.cancelledDescription'),
+        'success'
+      )
+      await reload()
+    } catch (err) {
+      toast(t('scheduledPublication.toast.failedTitle'), (err as Error).message, 'danger')
+      throw err
+    }
+  }
+
+  return (
+    <Section>
+      <Container>
+        <FormRenderer
+          mode={document == null ? 'create' : 'edit'}
+          fields={fields}
+          onSubmit={handleSubmit}
+          initialData={document ?? (initialData ? { fields: initialData } : undefined)}
+          adminConfig={adminConfig}
+          heading={label}
+          showPath={false}
+          initialLocale={locale}
+          defaultLocale={defaultContentLocale}
+          onLocaleChange={
+            document == null
+              ? undefined
+              : (nextLocale) =>
+                  navigate({
+                    to: getAdminRoutePath('singletons', '$singleton'),
+                    params: { singleton: path },
+                    search: { locale: nextLocale },
+                  })
+          }
+          useNavigationGuard={useTanStackNavigationGuard}
+          headerSlot={
+            document == null ? undefined : (
+              <SingletonViewMenu
+                singleton={path}
+                activeView="edit"
+                locale={locale}
+                contentLocales={contentLocales}
+                defaultContentLocale={defaultContentLocale}
+                adminConfig={adminConfig}
+                doc={document}
+              />
+            )
+          }
+          onStatusChange={document == null ? undefined : handleStatusChange}
+          onUnpublish={document != null && publishedVersion ? handleUnpublish : undefined}
+          scheduledPublication={document == null ? null : scheduledPublication}
+          onSchedulePublication={canArmSchedule ? handleSchedulePublication : undefined}
+          onConfirmScheduledPublication={
+            canArmSchedule && scheduledPublication?.state === 'needs_reconfirm'
+              ? handleConfirmScheduledPublication
+              : undefined
+          }
+          onCancelScheduledPublication={
+            document != null && scheduledPublication != null
+              ? handleCancelScheduledPublication
+              : undefined
+          }
+          onCopyToLocale={document == null ? undefined : handleCopyToLocale}
+          contentLocales={document == null ? undefined : contentLocales}
+          publishedVersion={document == null ? null : publishedVersion}
+          restoreWarnings={restoreWarnings}
+          nextStatus={document == null ? undefined : nextStatus}
+          workflowStatuses={document == null ? undefined : workflowStatuses}
+          onCancel={() => navigate({ to: getAdminRoutePath() })}
+          collectionPath={path}
+        />
+      </Container>
+    </Section>
+  )
+}

package/src/integrations/api-utils.ts

@@ -16,12 +16,16 @@
 // src/server.ts (TanStack Start server entry point) before any
 // requests are handled. No need to import it here.
 
-import type { CollectionDefinition, CollectionRecord } from '@byline/core'
-import { getCollectionDefinition } from '@byline/core'
+import type {
+  CollectionDefinition,
+  CollectionRecord,
+  MultiCollectionDefinition,
+} from '@byline/core'
+import { getCollectionDefinition, isSingleton } from '@byline/core'
 
 import { bylineCore } from './byline-core.js'
 
-export interface EnsuredCollection {
+export interface EnsuredDocumentResource {
   definition: CollectionDefinition
   collection: {
     id: string
@@ -31,21 +35,28 @@ export interface EnsuredCollection {
   }
 }
 
+export interface EnsuredCollection extends EnsuredDocumentResource {
+  definition: MultiCollectionDefinition
+}
+
 /**
- * Resolve a collection for an admin API request.
+ * Resolve either registered document-resource kind against the reconciled
+ * collection record.
  *
  * Collections are reconciled with the database once at startup by
  * `initBylineCore()` (see `packages/core/src/services/collection-bootstrap.ts`).
  * This helper is a per-request cache lookup against the resulting in-memory
  * registry — no DB I/O, no hash work.
  *
- * Returns `null` when the path is not registered in the client/server config.
+ * This broader seam is reserved for operations such as field upload whose core
+ * service is explicitly kind-aware; collection route families continue to use
+ * `ensureCollection` below.
  */
-export async function ensureCollection(path: string): Promise<EnsuredCollection | null> {
+export async function ensureDocumentResource(
+  path: string
+): Promise<EnsuredDocumentResource | null> {
   const definition = getCollectionDefinition(path)
-  if (definition == null) {
-    return null
-  }
+  if (definition == null) return null
 
   let record: CollectionRecord
   try {
@@ -64,3 +75,17 @@ export async function ensureCollection(path: string): Promise<EnsuredCollection
     },
   }
 }
+
+/**
+ * Narrow the shared document-resource resolution to a multi-document
+ * collection for a collection-scoped admin API request.
+ *
+ * Returns `null` when the path is unregistered or belongs to a singleton, so
+ * collection route families cannot accidentally admit the other resource kind.
+ */
+export async function ensureCollection(path: string): Promise<EnsuredCollection | null> {
+  const resource = await ensureDocumentResource(path)
+  return resource != null && !isSingleton(resource.definition)
+    ? { ...resource, definition: resource.definition }
+    : null
+}

package/src/routes/create-admin-dashboard-route.test.node.ts

@@ -0,0 +1,70 @@
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  getCollectionStats: vi.fn(),
+  collections: [
+    { path: 'articles', labels: { singular: 'Article', plural: 'Articles' }, showStats: true },
+    {
+      singleton: true,
+      path: 'site-settings',
+      label: 'Site settings',
+      // Deliberately collection-like: kind must win even for malformed input.
+      showStats: true,
+    },
+  ],
+}))
+
+vi.mock('@tanstack/react-router', () => ({
+  createFileRoute: () => (options: Record<string, unknown>) => ({ options }),
+}))
+
+vi.mock('@byline/core', () => ({
+  filterReadableCollections: (collections: unknown[]) => collections,
+  getAdminConfig: () => ({ collections: mocks.collections }),
+  isSingleton: (definition: { singleton?: boolean }) => definition.singleton === true,
+}))
+
+vi.mock('../server-fns/collections/index.js', () => ({
+  getCollectionStats: mocks.getCollectionStats,
+}))
+vi.mock('../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js', () => ({
+  BreadcrumbsClient: () => null,
+}))
+vi.mock('../admin-shell/chrome/dashboard.js', () => ({ AdminDashboard: () => null }))
+vi.mock('@byline/i18n/react', () => ({ useTranslation: () => ({ t: (key: string) => key }) }))
+vi.mock('./admin-path.js', () => ({ getAdminRoutePath: () => '/admin' }))
+
+import { createAdminDashboardRoute } from './create-admin-dashboard-route.js'
+
+type DashboardLoader = (input: {
+  context: { user: { is_super_admin: boolean; abilities: string[] } }
+}) => Promise<{ statsMap: Record<string, Array<{ status: string; count: number }>> }>
+
+describe('admin dashboard route loader', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mocks.getCollectionStats.mockResolvedValue([{ status: 'published', count: 4 }])
+  })
+
+  it('never requests collection statistics for a singleton resource', async () => {
+    const route = createAdminDashboardRoute('/admin/') as {
+      options: { loader: DashboardLoader }
+    }
+
+    await expect(
+      route.options.loader({ context: { user: { is_super_admin: true, abilities: [] } } })
+    ).resolves.toEqual({ statsMap: { articles: [{ status: 'published', count: 4 }] } })
+
+    expect(mocks.getCollectionStats).toHaveBeenCalledOnce()
+    expect(mocks.getCollectionStats).toHaveBeenCalledWith('articles')
+    expect(mocks.getCollectionStats).not.toHaveBeenCalledWith('site-settings')
+  })
+})

package/src/routes/create-admin-dashboard-route.tsx

@@ -8,7 +8,12 @@
 
 import { createFileRoute } from '@tanstack/react-router'
 
-import { filterReadableCollections, getAdminConfig } from '@byline/core'
+import {
+  filterReadableCollections,
+  getAdminConfig,
+  isSingleton,
+  type MultiCollectionDefinition,
+} from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
@@ -40,7 +45,10 @@ export function createAdminDashboardRoute(path: string) {
 
       await Promise.all(
         visible
-          .filter((c) => c.showStats === true)
+          .filter(
+            (resource): resource is MultiCollectionDefinition =>
+              !isSingleton(resource) && resource.showStats === true
+          )
           .map(async (c) => {
             try {
               statsMap[c.path] = await getCollectionStats(c.path)

package/src/routes/create-collection-api-route.tsx

@@ -8,8 +8,7 @@
 
 import { createFileRoute, notFound } from '@tanstack/react-router'
 
-import type { CollectionDefinition } from '@byline/core'
-import { getCollectionDefinition } from '@byline/core'
+import type { MultiCollectionDefinition } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 import { z } from 'zod'
 
@@ -18,6 +17,7 @@ import { ApiView } from '../admin-shell/collections/api.js'
 import { getCollectionDocument } from '../server-fns/collections/index.js'
 import { getAdminRoutePath } from './admin-path.js'
 import { getContentLocaleRouteConfig } from './get-content-locale-route-config.js'
+import { getMultiCollectionDefinition } from './get-multi-collection-definition.js'
 
 const searchSchema = z.object({
   locale: z.string().optional(),
@@ -44,7 +44,7 @@ export function createCollectionApiRoute(path: string) {
       params: { collection: string; id: string }
       deps: { locale?: string; depth?: number }
     }) => {
-      const collectionDef = getCollectionDefinition(params.collection)
+      const collectionDef = getMultiCollectionDefinition(params.collection)
       if (!collectionDef) {
         throw notFound()
       }
@@ -74,7 +74,7 @@ export function createCollectionApiRoute(path: string) {
       const data = Route.useLoaderData()
       const { collection, id } = Route.useParams() as { collection: string; id: string }
       const { locale, depth } = Route.useSearch() as z.infer<typeof searchSchema>
-      const collectionDef = getCollectionDefinition(collection) as CollectionDefinition
+      const collectionDef = getMultiCollectionDefinition(collection) as MultiCollectionDefinition
       const { t } = useTranslation('byline-admin')
       const { contentLocales, defaultContentLocale } = getContentLocaleRouteConfig()
 

package/src/routes/create-collection-create-route.tsx

@@ -8,18 +8,15 @@
 
 import { createFileRoute, notFound } from '@tanstack/react-router'
 
-import type { CollectionDefinition } from '@byline/core'
-import {
-  buildInitialDataFromFields,
-  getCollectionAdminConfig,
-  getCollectionDefinition,
-} from '@byline/core'
+import type { MultiCollectionDefinition } from '@byline/core'
+import { buildInitialDataFromFields, getCollectionAdminConfig } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 import { z } from 'zod'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
 import { CreateView } from '../admin-shell/collections/create.js'
 import { getAdminRoutePath } from './admin-path.js'
+import { getMultiCollectionDefinition } from './get-multi-collection-definition.js'
 
 const searchSchema = z.object({
   /** URL-encoded list search state to return to on cancel — see list-return-state.ts. */
@@ -36,7 +33,7 @@ export function createCollectionCreateRoute(path: string) {
       params: { collection: string }
       // biome-ignore lint/suspicious/noExplicitAny: collection-specific shape
     }): Promise<{ initialData: any }> => {
-      const collectionDef = getCollectionDefinition(params.collection)
+      const collectionDef = getMultiCollectionDefinition(params.collection)
       if (!collectionDef) {
         throw notFound()
       }
@@ -50,7 +47,7 @@ export function createCollectionCreateRoute(path: string) {
       const { collection } = Route.useParams() as { collection: string }
       // biome-ignore lint/suspicious/noExplicitAny: collection-specific shape
       const { initialData } = Route.useLoaderData() as { initialData: any }
-      const collectionDef = getCollectionDefinition(collection) as CollectionDefinition
+      const collectionDef = getMultiCollectionDefinition(collection) as MultiCollectionDefinition
       const adminConfig = getCollectionAdminConfig(collection)
       const { t } = useTranslation('byline-admin')
       const search = Route.useSearch() as z.infer<typeof searchSchema>

package/src/routes/create-collection-edit-route.tsx

@@ -9,8 +9,8 @@
 import { useEffect, useRef, useState } from 'react'
 import { createFileRoute, notFound } from '@tanstack/react-router'
 
-import type { CollectionDefinition } from '@byline/core'
-import { getCollectionAdminConfig, getCollectionDefinition } from '@byline/core'
+import type { MultiCollectionDefinition } from '@byline/core'
+import { getCollectionAdminConfig } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 import { useToastManager } from '@byline/ui/react'
 import { z } from 'zod'
@@ -21,6 +21,7 @@ import { EditView } from '../admin-shell/collections/edit.js'
 import { getCollectionDocument } from '../server-fns/collections/index.js'
 import { getAdminRoutePath } from './admin-path.js'
 import { getContentLocaleRouteConfig } from './get-content-locale-route-config.js'
+import { getMultiCollectionDefinition } from './get-multi-collection-definition.js'
 import { decodeListReturnState } from './list-return-state.js'
 import { persistListReturnState, readListReturnState } from './list-return-storage.js'
 
@@ -46,7 +47,7 @@ export function createCollectionEditRoute(path: string) {
       params: { collection: string; id: string }
       deps: { locale?: string }
     }) => {
-      const collectionDef = getCollectionDefinition(params.collection)
+      const collectionDef = getMultiCollectionDefinition(params.collection)
       if (!collectionDef) {
         throw notFound()
       }
@@ -77,7 +78,7 @@ export function createCollectionEditRoute(path: string) {
       const { collection, id } = Route.useParams() as { collection: string; id: string }
       const search = Route.useSearch() as z.infer<typeof searchSchema>
       const { locale } = search
-      const collectionDef = getCollectionDefinition(collection) as CollectionDefinition
+      const collectionDef = getMultiCollectionDefinition(collection) as MultiCollectionDefinition
       const adminConfig = getCollectionAdminConfig(collection)
       const { t } = useTranslation('byline-admin')
       const toastManager = useToastManager()

package/src/routes/create-collection-history-route.tsx

@@ -8,12 +8,8 @@
 
 import { createFileRoute, notFound } from '@tanstack/react-router'
 
-import type { CollectionDefinition } from '@byline/core'
-import {
-  getCollectionAdminConfig,
-  getCollectionDefinition,
-  getWorkflowStatuses,
-} from '@byline/core'
+import type { MultiCollectionDefinition } from '@byline/core'
+import { getCollectionAdminConfig, getWorkflowStatuses } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 import { z } from 'zod'
 
@@ -26,6 +22,7 @@ import {
 } from '../server-fns/collections/index.js'
 import { getAdminRoutePath } from './admin-path.js'
 import { getContentLocaleRouteConfig } from './get-content-locale-route-config.js'
+import { getMultiCollectionDefinition } from './get-multi-collection-definition.js'
 
 const searchSchema = z.object({
   page: z.coerce.number().min(1).optional(),
@@ -68,7 +65,7 @@ export function createCollectionHistoryRoute(path: string) {
         locale?: string
       }
     }) => {
-      const collectionDef = getCollectionDefinition(params.collection)
+      const collectionDef = getMultiCollectionDefinition(params.collection)
       if (!collectionDef) {
         throw notFound()
       }
@@ -111,7 +108,7 @@ export function createCollectionHistoryRoute(path: string) {
     component: function CollectionHistoryComponent() {
       const { history, currentDocument, auditLog } = Route.useLoaderData()
       const { collection } = Route.useParams() as { collection: string; id: string }
-      const collectionDef = getCollectionDefinition(collection) as CollectionDefinition
+      const collectionDef = getMultiCollectionDefinition(collection) as MultiCollectionDefinition
       const adminConfig = getCollectionAdminConfig(collection)
       const { t } = useTranslation('byline-admin')
       const { contentLocales, defaultContentLocale } = getContentLocaleRouteConfig()