fix(admin): preserve revision tokens after unpublish/discard/restore (#3089) (#3092)

EmDash-Run: c935372c-f26a-4aca-9d95-801ea67056cd

Co-authored-by: emdashbot[bot] <emdashbot[bot]@users.noreply.github.com>

Author: emdashbot[bot]

.changeset/unpublish-token-fix.md

@@ -0,0 +1,8 @@
+---
+"@emdash-cms/admin": patch
+"emdash": patch
+---
+
+Fix stale revision tokens after unpublish, discard, and revision restore.
+
+The admin editor now reads the new `_rev` returned by unpublish, discard-draft, and revision-restore responses and advances its optimistic-concurrency token before the next save. Unpublish also flushes pending editor changes before sending the request, matching the ordering already used for publish, schedule, and publication-date changes, and it now catches the promise rejection when the action is blocked by invalid fields or a click while another publishing action is already in progress. This prevents subsequent autosaves or publish actions from being refused as a 409 conflict, stops unpublished posts from overwriting unsaved edits, and avoids unhandled promise rejections from the unpublish button.

packages/admin/src/components/ContentEditor.tsx

@@ -173,9 +173,15 @@ export interface ContentEditorProps {
 		slug?: string;
 		bylines?: BylineCreditInput[];
 	}) => void | Promise<void>;
-	onUnpublish?: () => void;
+	onUnpublish?: (payload?: {
+		data: Record<string, unknown>;
+		slug?: string;
+		bylines?: BylineCreditInput[];
+	}) => void | Promise<void>;
 	/** Callback to discard draft changes (revert to published version) */
 	onDiscardDraft?: () => void;
+	/** Callback when a revision is restored from the sidebar. */
+	onRevisionRestored?: (item: ContentItem) => void;
 	/** Callback to schedule for future publishing */
 	onSchedule?: (
 		scheduledAt: string,
@@ -279,6 +285,7 @@ export function ContentEditor({
 	onPublish,
 	onUnpublish,
 	onDiscardDraft,
+	onRevisionRestored,
 	onSchedule,
 	onUnschedule,
 	isScheduling,
@@ -741,6 +748,11 @@ export function ContentEditor({
 		() => (onUnschedule ? runScheduleChange((payload) => onUnschedule(payload)) : undefined),
 		[onUnschedule, runScheduleChange],
 	);
+	const handleUnpublish = React.useCallback(() => {
+		if (!onUnpublish) return;
+		const unpublish = onUnpublish;
+		void Promise.resolve(runScheduleChange((payload) => unpublish(payload))).catch(() => undefined);
+	}, [onUnpublish, runScheduleChange]);
 	const handlePublishedAtChange = React.useCallback(
 		(publishedAt: string) =>
 			onPublishedAtChange
@@ -980,7 +992,7 @@ export function ContentEditor({
 												isScheduling={isScheduling}
 												isUnscheduling={isUnscheduling}
 												onPublish={handlePublish}
-												onUnpublish={onUnpublish}
+												onUnpublish={handleUnpublish}
 												onOpenSchedule={onSchedule ? handleOpenSchedule : undefined}
 												onUnschedule={onUnschedule ? handleUnschedule : undefined}
 												onMenuOpenChange={setPublishingMenuOpen}
@@ -1047,7 +1059,7 @@ export function ContentEditor({
 													isScheduling={isScheduling}
 													isUnscheduling={isUnscheduling}
 													onPublish={handlePublish}
-													onUnpublish={onUnpublish}
+													onUnpublish={handleUnpublish}
 													onOpenSchedule={onSchedule ? handleOpenSchedule : undefined}
 													onUnschedule={onUnschedule ? handleUnschedule : undefined}
 													onMenuOpenChange={setPublishingMenuOpen}
@@ -1159,7 +1171,7 @@ export function ContentEditor({
 								isLoadingPreview={isLoadingPreview}
 								onPreview={handlePreview}
 								onPublish={handlePublish}
-								onUnpublish={onUnpublish}
+								onUnpublish={handleUnpublish}
 								onOpenSchedule={onSchedule ? handleOpenSchedule : undefined}
 								onUnschedule={onUnschedule ? handleUnschedule : undefined}
 								onMenuOpenChange={setPublishingMenuOpen}
@@ -1192,6 +1204,7 @@ export function ContentEditor({
 								onPublishedAtChange={onPublishedAtChange ? handlePublishedAtChange : undefined}
 								isUpdatingPublishedAt={isUpdatingPublishedAt}
 								onDiscardDraft={onDiscardDraft}
+								onRevisionRestored={onRevisionRestored}
 								onDelete={onDelete}
 								isDeleting={isDeleting}
 								currentUser={currentUser}

packages/admin/src/components/ContentSettingsPanel.tsx

@@ -714,6 +714,7 @@ export interface ContentSettingsPanelProps {
 	onPublishedAtChange?: (publishedAt: string) => void | Promise<void>;
 	isUpdatingPublishedAt?: boolean;
 	onDiscardDraft?: () => void;
+	onRevisionRestored?: (item: ContentItem) => void;
 	onDelete?: () => void;
 	isDeleting?: boolean;
 	currentUser?: CurrentUserInfo;
@@ -766,6 +767,7 @@ export const ContentSettingsPanel = React.memo(function ContentSettingsPanel({
 	onPublishedAtChange,
 	isUpdatingPublishedAt,
 	onDiscardDraft,
+	onRevisionRestored,
 	onDelete,
 	isDeleting,
 	currentUser,
@@ -1171,7 +1173,12 @@ export const ContentSettingsPanel = React.memo(function ContentSettingsPanel({
 				{!isNew && item && supportsRevisions && (
 					<SortableContentSettingsSection id="revisions" label={t`Revisions`} disclosure>
 						<div className="p-4">
-							<RevisionHistory collection={collection} entryId={item.id} reserveHeaderEnd />
+							<RevisionHistory
+								collection={collection}
+								entryId={item.id}
+								onRestored={onRevisionRestored}
+								reserveHeaderEnd
+							/>
 						</div>
 					</SortableContentSettingsSection>
 				)}

packages/admin/src/components/RevisionHistory.tsx

@@ -5,7 +5,7 @@ import { ArrowCounterClockwise, CaretDown, Plus, Minus, PencilSimple } from "@ph
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import * as React from "react";
 
-import { fetchRevisions, restoreRevision, type Revision } from "../lib/api";
+import { fetchRevisions, restoreRevision, type ContentItem, type Revision } from "../lib/api";
 import { cn, formatRelativeTime, parseTimestamp } from "../lib/utils";
 import { ConfirmDialog } from "./ConfirmDialog";
 
@@ -69,8 +69,8 @@ function formatDiffValue(value: unknown): string {
 interface RevisionHistoryProps {
 	collection: string;
 	entryId: string;
-	/** Called when a revision is successfully restored */
-	onRestored?: () => void;
+	/** Called when a revision is successfully restored with the returned item. */
+	onRestored?: (item: ContentItem) => void;
 	/** Reserve the inline end of the disclosure header for an external control. */
 	reserveHeaderEnd?: boolean;
 }
@@ -114,7 +114,7 @@ export function RevisionHistory({
 
 	const restoreMutation = useMutation({
 		mutationFn: (revisionId: string) => restoreRevision(revisionId),
-		onSuccess: () => {
+		onSuccess: (restoredItem) => {
 			// Invalidate content and revisions queries
 			void queryClient.invalidateQueries({
 				queryKey: ["content", collection, entryId],
@@ -124,7 +124,7 @@ export function RevisionHistory({
 			});
 			setSelectedRevision(null);
 			setRestoreTarget(null);
-			onRestored?.();
+			onRestored?.(restoredItem);
 			toastManager.add({
 				title: t`Revision restored`,
 				description: t`Content has been updated to the selected revision.`,

packages/admin/src/lib/api/content.ts

@@ -512,19 +512,21 @@ export async function publishContent(
 export async function unpublishContent(
 	collection: string,
 	id: string,
-	options?: { locale?: string },
+	options?: { locale?: string; _rev?: string },
 ): Promise<ContentItem> {
 	const params = new URLSearchParams();
 	if (options?.locale) params.set("locale", options.locale);
 	const query = params.toString() ? `?${params}` : "";
 	const response = await apiFetch(`${API_BASE}/content/${collection}/${id}/unpublish${query}`, {
 		method: "POST",
+		headers: { "Content-Type": "application/json" },
+		body: JSON.stringify({ _rev: options?._rev }),
 	});
-	const data = await parseApiResponse<{ item: ContentItem }>(
+	const data = await parseApiResponse<{ item: ContentItem; _rev?: string }>(
 		response,
 		"Failed to unpublish content",
 	);
-	return data.item;
+	return { ...data.item, _rev: data._rev };
 }
 
 /**
@@ -541,8 +543,11 @@ export async function discardDraft(
 	const response = await apiFetch(`${API_BASE}/content/${collection}/${id}/discard-draft${query}`, {
 		method: "POST",
 	});
-	const data = await parseApiResponse<{ item: ContentItem }>(response, "Failed to discard draft");
-	return data.item;
+	const data = await parseApiResponse<{ item: ContentItem; _rev?: string }>(
+		response,
+		"Failed to discard draft",
+	);
+	return { ...data.item, _rev: data._rev };
 }
 
 /**
@@ -633,9 +638,9 @@ export async function restoreRevision(revisionId: string): Promise<ContentItem>
 		await throwResponseError(response, i18n._(msg`Failed to restore revision`));
 	}
 
-	const data = await parseApiResponse<{ item: ContentItem }>(
+	const data = await parseApiResponse<{ item: ContentItem; _rev?: string }>(
 		response,
 		i18n._(msg`Failed to restore revision`),
 	);
-	return data.item;
+	return { ...data.item, _rev: data._rev };
 }

packages/admin/src/router.tsx

@@ -883,6 +883,7 @@ function ContentEditPage() {
 		revisionTokensRef.current.set(rawItem.id, rawItem._rev);
 	}
 	const editorSaveQueueRef = React.useRef<Promise<void>>(Promise.resolve());
+	const unpublishRequestRef = React.useRef<Promise<void> | null>(null);
 	const serializeEditorSave = React.useCallback(<T,>(operation: () => Promise<T>) => {
 		const result = editorSaveQueueRef.current.then(operation);
 		editorSaveQueueRef.current = result.then(
@@ -1189,8 +1190,13 @@ function ContentEditPage() {
 	});
 
 	const unpublishMutation = useMutation({
-		mutationFn: () => unpublishContent(collection, id, { locale: rawItem?.locale ?? activeLocale }),
-		onSuccess: () => {
+		mutationFn: (_rev?: string) =>
+			unpublishContent(collection, id, {
+				locale: rawItem?.locale ?? activeLocale,
+				_rev,
+			}),
+		onSuccess: (unpublishedItem) => {
+			revisionTokensRef.current.set(id, unpublishedItem._rev);
 			void queryClient.invalidateQueries({
 				queryKey: ["content", collection, id],
 			});
@@ -1209,8 +1215,9 @@ function ContentEditPage() {
 
 	const discardDraftMutation = useMutation({
 		mutationFn: () => discardDraft(collection, id, { locale: rawItem?.locale ?? activeLocale }),
-		onSuccess: () => {
+		onSuccess: (discardedItem) => {
 			setConflictedEntryId((conflicted) => (conflicted === id ? "" : conflicted));
+			revisionTokensRef.current.set(id, discardedItem._rev);
 			void queryClient.invalidateQueries({
 				queryKey: ["content", collection, id],
 			});
@@ -1465,8 +1472,42 @@ function ContentEditPage() {
 		],
 	);
 	const handleUnpublish = React.useCallback(
-		() => unpublishMutation.mutate(),
-		[unpublishMutation.mutate],
+		async (payload?: {
+			data: Record<string, unknown>;
+			slug?: string;
+			bylines?: BylineCreditInput[];
+		}) => {
+			if (unpublishRequestRef.current) return unpublishRequestRef.current;
+
+			const request = (async () => {
+				const savedItem = await serializeEditorSave(async () => {
+					if (!payload) return;
+					return updateMutation.mutateAsync({
+						targetId: id,
+						targetLocale: rawItem?.locale ?? activeLocale,
+						source: "editor",
+						changes: payload,
+					});
+				});
+				const currentToken = savedItem?._rev ?? revisionTokensRef.current.get(id);
+				await unpublishMutation.mutateAsync(currentToken);
+			})();
+			unpublishRequestRef.current = request;
+			void request
+				.catch(() => undefined)
+				.finally(() => {
+					if (unpublishRequestRef.current === request) unpublishRequestRef.current = null;
+				});
+			return request;
+		},
+		[
+			activeLocale,
+			id,
+			rawItem?.locale,
+			serializeEditorSave,
+			unpublishMutation.mutateAsync,
+			updateMutation.mutateAsync,
+		],
 	);
 	const handleDiscardDraft = React.useCallback(
 		() => discardDraftMutation.mutate(),
@@ -1545,6 +1586,14 @@ function ContentEditPage() {
 			updateBylineMutation.mutateAsync({ id: bylineId, ...input }),
 		[updateBylineMutation.mutateAsync],
 	);
+	const handleRevisionRestored = React.useCallback(
+		(restoredItem: ContentItem) => {
+			if (restoredItem._rev) {
+				revisionTokensRef.current.set(id, restoredItem._rev);
+			}
+		},
+		[id],
+	);
 
 	if (!manifest) {
 		return <LoadingScreen />;
@@ -1582,6 +1631,7 @@ function ContentEditPage() {
 			onPublish={handlePublish}
 			onUnpublish={handleUnpublish}
 			onDiscardDraft={handleDiscardDraft}
+			onRevisionRestored={handleRevisionRestored}
 			onSchedule={handleSchedule}
 			onUnschedule={handleUnschedule}
 			isScheduling={scheduleMutation.isPending}

packages/admin/tests/lib/api/content-token.test.ts

@@ -0,0 +1,90 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { discardDraft, restoreRevision, unpublishContent } from "../../../src/lib/api/index.js";
+
+const CONTENT_ITEM = {
+	id: "post_1",
+	type: "posts",
+	slug: "post-one",
+	status: "published",
+	locale: "en",
+	translationGroup: null,
+	data: { title: "Sample" },
+	authorId: null,
+	primaryBylineId: null,
+	createdAt: "2026-01-01T00:00:00Z",
+	updatedAt: "2026-01-02T00:00:00Z",
+	publishedAt: "2026-01-01T00:00:00Z",
+	scheduledAt: null,
+	liveRevisionId: "rev-live",
+	draftRevisionId: "rev-draft",
+};
+
+function jsonResponse(body: unknown) {
+	return new Response(JSON.stringify({ data: body }), {
+		status: 200,
+		headers: { "Content-Type": "application/json" },
+	});
+}
+
+describe("Content token APIs", () => {
+	let originalFetch: typeof fetch;
+
+	beforeEach(() => {
+		originalFetch = globalThis.fetch;
+	});
+
+	afterEach(() => {
+		globalThis.fetch = originalFetch;
+	});
+
+	it("unpublishContent returns the new _rev token from the response", async () => {
+		globalThis.fetch = vi.fn(async () =>
+			jsonResponse({ item: CONTENT_ITEM, _rev: "rev-unpublish-1" }),
+		) as typeof fetch;
+
+		const result = await unpublishContent("posts", "post_1");
+		expect(result._rev).toBe("rev-unpublish-1");
+	});
+
+	it("unpublishContent forwards the current _rev token when provided", async () => {
+		const requests: { url: string; body: Record<string, unknown> }[] = [];
+		globalThis.fetch = vi.fn(async (input, init?) => {
+			const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
+			requests.push({
+				url,
+				body: typeof init?.body === "string" ? JSON.parse(init.body) : {},
+			});
+			return jsonResponse({ item: CONTENT_ITEM, _rev: "rev-unpublish-1" });
+		}) as typeof fetch;
+
+		await unpublishContent("posts", "post_1", { _rev: "rev-initial" });
+		expect(requests).toHaveLength(1);
+		expect(requests[0]?.url).toBe("/_emdash/api/content/posts/post_1/unpublish");
+		expect(requests[0]?.body).toEqual({ _rev: "rev-initial" });
+	});
+
+	it("discardDraft returns the new _rev token from the response", async () => {
+		globalThis.fetch = vi.fn(async () =>
+			jsonResponse({
+				item: { ...CONTENT_ITEM, status: "published", draftRevisionId: null },
+				_rev: "rev-discard-1",
+			}),
+		) as typeof fetch;
+
+		const result = await discardDraft("posts", "post_1");
+		expect(result._rev).toBe("rev-discard-1");
+	});
+
+	it("restoreRevision returns the new _rev token from the response", async () => {
+		globalThis.fetch = vi.fn(async () =>
+			jsonResponse({
+				item: { ...CONTENT_ITEM, data: { title: "Restored" } },
+				_rev: "rev-restore-1",
+			}),
+		) as typeof fetch;
+
+		const result = await restoreRevision("revision-old");
+		expect(result._rev).toBe("rev-restore-1");
+	});
+});