@byline/host-tanstack-start 4.18.0 → 5.0.0

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

@@ -9,7 +9,12 @@
 import { act } from 'react'
 
 import { BylineFieldServicesProvider } from '@byline/admin/react'
-import { defineAdminConfig, defineSingleton, type SingletonDefinition } from '@byline/core'
+import {
+  defineAdminConfig,
+  defineSingleton,
+  ERR_DOCUMENT_STALE,
+  type SingletonDefinition,
+} from '@byline/core'
 import { adminTranslations } from '@byline/i18n/admin'
 import { I18nProvider } from '@byline/i18n/react'
 import { createRoot, type Root } from 'react-dom/client'
@@ -54,6 +59,14 @@ vi.mock('../../server-fns/singletons/index.js', () => ({
   copySingletonToLocale: mocks.copyToLocale,
 }))
 
+vi.mock('../../server-fns/collections/index.js', () => ({
+  hasCommittedDocumentHookFailure: (result: unknown) =>
+    typeof result === 'object' &&
+    result != null &&
+    'status' in result &&
+    result.status === 'committed-hook-failed',
+}))
+
 vi.mock('../../server-fns/preview/index.js', () => ({
   enablePreviewModeFn: vi.fn(async () => {}),
 }))
@@ -141,6 +154,7 @@ const locales = [
 const loadedDocument = {
   id: 'doc-settings',
   versionId: 'version-1',
+  revision: 7,
   path: '__singleton__/site-settings',
   status: 'draft',
   fields: { title: 'Loaded title', attachment: null },
@@ -225,13 +239,29 @@ function latestToastDescription(): string {
 beforeEach(() => {
   vi.clearAllMocks()
   mocks.guardStates.length = 0
-  mocks.update.mockResolvedValue({ versionId: 'version-next' })
-  mocks.changeStatus.mockResolvedValue({ newStatus: 'published' })
-  mocks.unpublish.mockResolvedValue({ archivedCount: 1 })
-  mocks.schedule.mockResolvedValue({ state: 'armed' })
-  mocks.confirmSchedule.mockResolvedValue({ state: 'armed' })
-  mocks.cancelSchedule.mockResolvedValue(null)
-  mocks.copyToLocale.mockResolvedValue({ versionId: 'version-next' })
+  mocks.update.mockResolvedValue({
+    documentId: 'doc-settings',
+    revision: 8,
+    versionId: 'version-next',
+  })
+  mocks.changeStatus.mockResolvedValue({
+    documentId: 'doc-settings',
+    revision: 8,
+    newStatus: 'published',
+  })
+  mocks.unpublish.mockResolvedValue({ documentId: 'doc-settings', revision: 8, archivedCount: 1 })
+  mocks.schedule.mockResolvedValue({ documentId: 'doc-settings', revision: 8, state: 'armed' })
+  mocks.confirmSchedule.mockResolvedValue({
+    documentId: 'doc-settings',
+    revision: 8,
+    state: 'armed',
+  })
+  mocks.cancelSchedule.mockResolvedValue({ schedule: null, revision: 8 })
+  mocks.copyToLocale.mockResolvedValue({
+    documentId: 'doc-settings',
+    revision: 8,
+    versionId: 'version-next',
+  })
 
   defineAdminConfig({
     routes: { admin: '/internal/cms' },
@@ -308,7 +338,7 @@ describe('SingletonView', () => {
     expect(container.querySelector('.byline-preview-link')).toBeNull()
   })
 
-  it('saves full data with the active locale and the correct optimistic version', async () => {
+  it('saves full data with the active locale and the observed revision or explicit empty slot', async () => {
     render(null, 'en')
     typeIntoTitle('First save')
     await submit()
@@ -318,7 +348,7 @@ describe('SingletonView', () => {
         singleton: 'site-settings',
         data: { title: 'First save', attachment: undefined },
         locale: 'en',
-        expectedVersionId: undefined,
+        expectedState: 'empty',
       },
     })
     expect(mocks.invalidate).toHaveBeenCalledTimes(1)
@@ -334,19 +364,28 @@ describe('SingletonView', () => {
         singleton: 'site-settings',
         data: { title: 'Second save', attachment: null },
         locale: 'fr',
-        expectedVersionId: 'version-1',
+        expectedRevision: 7,
       },
     })
     expect(mocks.invalidate).toHaveBeenCalledTimes(2)
   })
 
   it('distinguishes stale saves from a singleton missing on the server', async () => {
-    mocks.update.mockRejectedValueOnce({ code: 'ERR_CONFLICT' })
+    mocks.update.mockRejectedValueOnce(
+      ERR_DOCUMENT_STALE({
+        message: 'Test failure',
+        details: {
+          reason: 'revision_mismatch',
+          documentId: 'doc-settings',
+          expectedRevision: 7,
+          currentRevision: 8,
+        },
+      })
+    )
     render(loadedDocument)
     typeIntoTitle('Stale edit')
     await submit()
-    const conflict = latestToastDescription()
-    expect(conflict).toContain('Someone else saved this singleton first')
+    expect(container.textContent).toContain('This document has changed since you opened it.')
 
     act(() => root.unmount())
     root = createRoot(container)
@@ -354,13 +393,22 @@ describe('SingletonView', () => {
     render(loadedDocument)
     typeIntoTitle('Missing edit')
     await submit()
-    const notConfigured = latestToastDescription()
-    expect(notConfigured).toContain('not configured on the server')
-    expect(notConfigured).not.toBe(conflict)
+    expect(container.textContent).toContain('This document is no longer available.')
+    expect(container.textContent).not.toContain('This document has changed since you opened it.')
   })
 
   it('keeps a failed save dirty with the navigation guard active', async () => {
-    mocks.update.mockRejectedValueOnce({ code: 'ERR_CONFLICT' })
+    mocks.update.mockRejectedValueOnce(
+      ERR_DOCUMENT_STALE({
+        message: 'Test failure',
+        details: {
+          reason: 'revision_mismatch',
+          documentId: 'doc-settings',
+          expectedRevision: 7,
+          currentRevision: 8,
+        },
+      })
+    )
     render(loadedDocument)
     typeIntoTitle('Unsaved change')
     await submit()
@@ -370,6 +418,26 @@ describe('SingletonView', () => {
     expect(container.textContent).toContain('Cancel')
   })
 
+  it('treats a committed afterSave failure as saved, warns, and reloads canonical state', async () => {
+    mocks.update.mockResolvedValueOnce({
+      status: 'committed-hook-failed',
+      documentId: 'doc-settings',
+      documentVersionId: 'version-next',
+      revision: 8,
+      sideEffectFailure: { phase: 'afterSave', code: 'ERR_UNHANDLED' },
+    })
+    render(loadedDocument)
+    typeIntoTitle('Committed change')
+    await submit()
+
+    expect(latestToastDescription()).toContain(
+      'Your changes were saved, but a post-save update failed'
+    )
+    expect(mocks.invalidate).toHaveBeenCalledOnce()
+    expect(mocks.guardStates.at(-1)).toBe(false)
+    expect(container.textContent).toContain('Close')
+  })
+
   it('re-runs the loader and remounts before unlocking saved-document uploads', async () => {
     const loader = vi
       .fn<() => Promise<typeof loadedDocument | null>>()

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

@@ -13,7 +13,6 @@ import { useRouter } from '@tanstack/react-router'
 import { FormRenderer } from '@byline/admin/react'
 import type { SingletonAdminConfig, SingletonDefinition } from '@byline/core'
 import {
-  ErrorCodes,
   getDefaultStatus,
   getWorkflow,
   getWorkflowStatuses,
@@ -23,6 +22,10 @@ import { useTranslation } from '@byline/i18n/react'
 import { Container, Section, useToastManager } from '@byline/ui/react'
 
 import { getAdminRoutePath } from '../../routes/admin-path.js'
+import {
+  hasCommittedDocumentHookFailure,
+  type SerializedDocumentPublishSchedule,
+} from '../../server-fns/collections/index.js'
 import {
   cancelSingletonScheduledPublish,
   changeSingletonStatus,
@@ -34,8 +37,8 @@ import {
 } from '../../server-fns/singletons/index.js'
 import { useNavigate } from '../chrome/loose-router.js'
 import { useTanStackNavigationGuard } from '../collections/tanstack-navigation-guard.js'
+import { useDocumentMutationState } from '../document-mutation-state.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> & {
@@ -44,16 +47,10 @@ type SingletonDocument = Record<string, any> & {
   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,
+  document: loadedDocument,
   initialData,
   locale,
   contentLocales,
@@ -68,6 +65,8 @@ export function SingletonView({
   contentLocales: ReadonlyArray<ContentLocaleOption>
   defaultContentLocale: string
 }) {
+  const mutation = useDocumentMutationState(loadedDocument)
+  const document = mutation.document ?? null
   const router = useRouter()
   const navigate = useNavigate()
   const toastManager = useToastManager()
@@ -119,31 +118,50 @@ export function SingletonView({
     )
   }
 
+  const notifyCommittedHookFailure = () => {
+    toast(
+      t('collections.save.hookFailedToast'),
+      t('collections.save.hookFailedDescription'),
+      'warning'
+    )
+  }
+
   const handleSubmit = async ({ data }: { data: Record<string, any> }) => {
     try {
-      await updateSingleton({
+      mutation.assertWritable()
+      const result = await updateSingleton({
         data: {
           singleton: path,
           data,
           locale: locale ?? defaultContentLocale,
-          expectedVersionId: document?.versionId,
+          ...(document == null
+            ? { expectedState: 'empty' as const }
+            : { expectedRevision: mutation.expectedRevision() }),
         },
       })
+      mutation.adopt(result)
       if (document != null) notifyScheduleSuspended()
-      toast(
-        t('singletons.edit.updateTitle', { label }),
-        t('singletons.edit.updatedDescription', { label: label.toLowerCase() }),
-        'success'
-      )
+      if (hasCommittedDocumentHookFailure(result)) {
+        notifyCommittedHookFailure()
+      } else {
+        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() })
+      const handled = mutation.report(err)
+      if (handled === 'blocked') throw err
+      if (handled === 'committed') {
+        notifyCommittedHookFailure()
+        await reload()
+        return
+      }
+      const description = t('singletons.edit.updateFailedDescription', {
+        label: label.toLowerCase(),
+      })
       toast(t('singletons.edit.updateTitle', { label }), description, 'danger')
 
       // FormRenderer commits its clean baseline only when this promise
@@ -155,7 +173,11 @@ export function SingletonView({
 
   const handleStatusChange = async (status: string) => {
     try {
-      await changeSingletonStatus({ data: { singleton: path, status } })
+      mutation.assertWritable()
+      const result = await changeSingletonStatus({
+        data: { expectedRevision: mutation.expectedRevision(), singleton: path, status },
+      })
+      mutation.adopt(result)
       toast(
         t('collections.edit.statusUpdateTitle', { label }),
         t('collections.edit.statusChangedDescription', { status }),
@@ -163,9 +185,18 @@ export function SingletonView({
       )
       await reload()
     } catch (err) {
+      const handled = mutation.report(err)
+      if (handled === 'blocked') throw err
+      if (handled === 'committed') {
+        notifyCommittedHookFailure()
+        await reload()
+        return
+      }
       toast(
         t('collections.edit.statusUpdateTitle', { label }),
-        t('collections.edit.statusChangeFailedDescription', { message: (err as Error).message }),
+        t('collections.edit.statusChangeFailedDescription', {
+          message: t('documentConcurrency.failed'),
+        }),
         'danger'
       )
       throw err
@@ -174,7 +205,11 @@ export function SingletonView({
 
   const handleUnpublish = async () => {
     try {
-      await unpublishSingleton({ data: { singleton: path } })
+      mutation.assertWritable()
+      const result = await unpublishSingleton({
+        data: { expectedRevision: mutation.expectedRevision(), singleton: path },
+      })
+      mutation.adopt(result)
       toast(
         t('collections.edit.unpublishTitle', { label }),
         t('collections.edit.unpublishedDescription'),
@@ -182,9 +217,18 @@ export function SingletonView({
       )
       await reload()
     } catch (err) {
+      const handled = mutation.report(err)
+      if (handled === 'blocked') throw err
+      if (handled === 'committed') {
+        notifyCommittedHookFailure()
+        await reload()
+        return
+      }
       toast(
         t('collections.edit.unpublishTitle', { label }),
-        t('collections.edit.unpublishFailedDescription', { message: (err as Error).message }),
+        t('collections.edit.unpublishFailedDescription', {
+          message: t('documentConcurrency.failed'),
+        }),
         'danger'
       )
       throw err
@@ -199,27 +243,34 @@ export function SingletonView({
     overwrite: boolean
   }) => {
     try {
-      await copySingletonToLocale({
+      mutation.assertWritable()
+      const result = await copySingletonToLocale({
         data: {
+          expectedRevision: mutation.expectedRevision(),
           singleton: path,
           sourceLocale: locale ?? defaultContentLocale,
           targetLocale,
           overwrite,
         },
       })
+      mutation.adopt(result)
       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'
-      )
+      if (hasCommittedDocumentHookFailure(result)) {
+        notifyCommittedHookFailure()
+      } else {
+        toast(
+          t('collections.edit.copyToLocaleTitle', { label }),
+          t('collections.edit.copiedSuccessMessage', {
+            source: sourceLabel,
+            target: targetLabel,
+          }),
+          'success'
+        )
+      }
       notifyScheduleSuspended()
       navigate({
         to: getAdminRoutePath('singletons', '$singleton'),
@@ -227,9 +278,16 @@ export function SingletonView({
         search: { locale: targetLocale },
       })
     } catch (err) {
+      const handled = mutation.report(err)
+      if (handled === 'blocked') throw err
+      if (handled === 'committed') {
+        notifyCommittedHookFailure()
+        await reload()
+        return
+      }
       toast(
         t('collections.edit.copyToLocaleTitle', { label }),
-        t('collections.edit.copyFailedDescription', { message: (err as Error).message }),
+        t('collections.edit.copyFailedDescription', { message: t('documentConcurrency.failed') }),
         'danger'
       )
       throw err
@@ -238,9 +296,16 @@ export function SingletonView({
 
   const handleSchedulePublication = async ({ publishAt }: { publishAt: string }) => {
     try {
-      await scheduleSingletonPublish({
-        data: { singleton: path, publishAt, expectedVersionId: String(document?.versionId) },
+      mutation.assertWritable()
+      const result = await scheduleSingletonPublish({
+        data: {
+          expectedRevision: mutation.expectedRevision(),
+          singleton: path,
+          publishAt,
+          expectedVersionId: String(document?.versionId),
+        },
       })
+      mutation.adopt(result)
       toast(
         t('scheduledPublication.toast.scheduledTitle'),
         t('scheduledPublication.toast.scheduledDescription'),
@@ -248,16 +313,29 @@ export function SingletonView({
       )
       await reload()
     } catch (err) {
-      toast(t('scheduledPublication.toast.failedTitle'), (err as Error).message, 'danger')
+      const handled = mutation.report(err)
+      if (handled === 'blocked') throw err
+      if (handled === 'committed') {
+        notifyCommittedHookFailure()
+        await reload()
+        return
+      }
+      toast(t('scheduledPublication.toast.failedTitle'), t('documentConcurrency.failed'), 'danger')
       throw err
     }
   }
 
   const handleConfirmScheduledPublication = async () => {
     try {
-      await confirmSingletonScheduledPublish({
-        data: { singleton: path, expectedVersionId: String(document?.versionId) },
+      mutation.assertWritable()
+      const result = await confirmSingletonScheduledPublish({
+        data: {
+          expectedRevision: mutation.expectedRevision(),
+          singleton: path,
+          expectedVersionId: String(document?.versionId),
+        },
       })
+      mutation.adopt(result)
       toast(
         t('scheduledPublication.toast.confirmedTitle'),
         t('scheduledPublication.toast.confirmedDescription'),
@@ -265,14 +343,25 @@ export function SingletonView({
       )
       await reload()
     } catch (err) {
-      toast(t('scheduledPublication.toast.failedTitle'), (err as Error).message, 'danger')
+      const handled = mutation.report(err)
+      if (handled === 'blocked') throw err
+      if (handled === 'committed') {
+        notifyCommittedHookFailure()
+        await reload()
+        return
+      }
+      toast(t('scheduledPublication.toast.failedTitle'), t('documentConcurrency.failed'), 'danger')
       throw err
     }
   }
 
   const handleCancelScheduledPublication = async () => {
     try {
-      await cancelSingletonScheduledPublish({ data: { singleton: path } })
+      mutation.assertWritable()
+      const result = await cancelSingletonScheduledPublish({
+        data: { expectedRevision: mutation.expectedRevision(), singleton: path },
+      })
+      mutation.adopt({ ...result, documentId: String(document?.id) })
       toast(
         t('scheduledPublication.toast.cancelledTitle'),
         t('scheduledPublication.toast.cancelledDescription'),
@@ -280,7 +369,14 @@ export function SingletonView({
       )
       await reload()
     } catch (err) {
-      toast(t('scheduledPublication.toast.failedTitle'), (err as Error).message, 'danger')
+      const handled = mutation.report(err)
+      if (handled === 'blocked') throw err
+      if (handled === 'committed') {
+        notifyCommittedHookFailure()
+        await reload()
+        return
+      }
+      toast(t('scheduledPublication.toast.failedTitle'), t('documentConcurrency.failed'), 'danger')
       throw err
     }
   }
@@ -289,6 +385,10 @@ export function SingletonView({
     <Section>
       <Container>
         <FormRenderer
+          mutationIssue={mutation.issue}
+          mutationsBlocked={mutation.blocked}
+          observedRevision={mutation.revision}
+          onMutationError={mutation.report}
           mode={document == null ? 'create' : 'edit'}
           fields={fields}
           onSubmit={handleSubmit}

package/src/integrations/byline-field-services.ts

@@ -44,12 +44,11 @@ const uploadField: UploadFieldFn = (collection, formData, createDocument) =>
   serverUploadField(collection, formData, createDocument)
 
 const placeTreeNode: PlaceTreeNodeFn = async (input) => {
-  const { orderKey } = await serverPlaceTreeNode({ data: input })
-  return { orderKey }
+  return serverPlaceTreeNode({ data: input })
 }
 
 const removeFromTree: RemoveFromTreeFn = async (input) => {
-  await serverRemoveFromTree({ data: input })
+  return serverRemoveFromTree({ data: input })
 }
 
 const getTreeAncestors: GetTreeAncestorsFn = (input) =>

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

@@ -152,6 +152,7 @@ export function createCollectionEditRoute(path: string) {
             ]}
           />
           <EditView
+            key={`${collection}/${id}/${locale}`}
             collectionDefinition={collectionDef}
             adminConfig={adminConfig ?? undefined}
             initialData={data}

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

@@ -1,3 +1,4 @@
+import { parseDocumentRevision } from '@byline/core'
 /**
  * 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
@@ -177,8 +178,13 @@ export function createCollectionListRoute(path: string) {
                 beforeDocumentId,
                 afterDocumentId,
               }) => {
-                await placeTreeNode({
+                return await placeTreeNode({
                   data: {
+                    expectedRevision: parseDocumentRevision(
+                      (data as { rows: CollectionTreeRow[] }).rows.find(
+                        (row) => row.id === documentId
+                      )?.revision
+                    ),
                     collection,
                     documentId,
                     parentDocumentId,
@@ -199,8 +205,13 @@ export function createCollectionListRoute(path: string) {
               orderable={collectionDef.orderable === true}
               listActions={adminConfig?.listActions}
               onReorder={async ({ documentId, beforeDocumentId, afterDocumentId }) => {
-                await reorderCollectionDocument({
+                return await reorderCollectionDocument({
                   data: {
+                    expectedRevision: parseDocumentRevision(
+                      data.docs.find(
+                        (row: { id: string; revision?: number }) => row.id === documentId
+                      )?.revision
+                    ),
                     collection,
                     documentId,
                     beforeDocumentId,

package/src/routes/create-singleton-route.test.node.ts

@@ -1,3 +1,4 @@
+import { testAdapter } from '../../../core/src/storage/db-adapter.test-helper.js'
 /**
  * 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
@@ -61,7 +62,7 @@ vi.mock('@byline/core', () => ({
   getServerConfig: () => ({
     i18n: { content: { defaultLocale: 'en' } },
     scheduledPublication: { enabled: mocks.scheduledPublicationEnabled },
-    db: { queries: { documents: { getPublishedVersion: mocks.getPublishedVersion } } },
+    db: testAdapter({ queries: { documents: { getPublishedVersion: mocks.getPublishedVersion } } }),
   }),
   getSingletonAdminConfig: () => null,
 }))
@@ -112,6 +113,7 @@ describe('singleton editor route loader', () => {
 
     await expect(load('fr')).resolves.toEqual({
       document: null,
+      expectedEmpty: true,
       initialData: { title: 'Default title' },
     })
     expect(mocks.read).toHaveBeenCalledWith({
@@ -130,6 +132,12 @@ describe('singleton editor route loader', () => {
       versionId: 'version-current',
       status: 'draft',
       fields: { title: 'Loaded' },
+      revision: 7,
+      scheduledPublication: {
+        state: 'armed',
+        publishAt: '2026-09-01T00:00:00.000Z',
+        targetVersionId: 'version-current',
+      },
     })
     mocks.getPublishedVersion.mockResolvedValue({
       document_id: 'document-settings',
@@ -167,6 +175,6 @@ describe('singleton editor route loader', () => {
       collection_id: 'collection-settings',
       document_id: 'document-settings',
     })
-    expect(mocks.getScheduledPublish).toHaveBeenCalledTimes(1)
+    expect(mocks.getScheduledPublish).not.toHaveBeenCalled()
   })
 })

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

@@ -10,7 +10,7 @@ import { createFileRoute, notFound } from '@tanstack/react-router'
 import { createServerFn } from '@tanstack/react-start'
 
 import type { DocumentPublishScheduleInfo } from '@byline/client'
-import { getAdminBylineClient, getAdminRequestContext } from '@byline/client/server'
+import { getAdminRequestContext } from '@byline/client/server'
 import {
   buildInitialDataFromFields,
   documentAbilityKey,
@@ -51,6 +51,7 @@ export const getSingletonRouteDocument = createServerFn({ method: 'GET' })
     if (document == null) {
       return {
         document: null,
+        expectedEmpty: true,
         initialData: serialise(
           await buildInitialDataFromFields(definition.fields, {
             locale: data.locale ?? getServerConfig().i18n.content.defaultLocale,
@@ -93,9 +94,9 @@ export const getSingletonRouteDocument = createServerFn({ method: 'GET' })
         actor?.hasAbility(documentAbilityKey(definition, 'changeStatus')) === true &&
         actor.hasAbility(documentAbilityKey(definition, 'publish'))
       if (canSchedulePublication) {
-        scheduledPublish = await getAdminBylineClient()
-          .singleton(data.singleton)
-          .getScheduledPublish()
+        scheduledPublish = (
+          document as unknown as { scheduledPublication: DocumentPublishScheduleInfo | null }
+        ).scheduledPublication
       }
     }
     const serializedSchedule = scheduledPublish == null ? null : serialise(scheduledPublish)
@@ -159,6 +160,7 @@ export function createSingletonRoute(path: string) {
             ]}
           />
           <SingletonView
+            key={`${singleton}/${locale}`}
             singletonDefinition={definition}
             adminConfig={getSingletonAdminConfig(singleton) ?? undefined}
             document={routeState.document}