Documents: Use single-transaction create/update-and-publish endpoints (FE)

src/Umbraco.Web.UI.Client/mocks/db/document-publishing.manager.ts

@@ -1,9 +1,11 @@
 import type { UmbMockDocumentModel } from '../data/mock-data-set.types.js';
 import type { UmbDocumentMockDB } from './document.db.js';
 import type {
+	CreateAndPublishDocumentRequestModel,
 	PublishDocumentRequestModel,
 	PublishDocumentWithDescendantsRequestModel,
 	UnpublishDocumentRequestModel,
+	UpdateAndPublishDocumentRequestModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 import { UmbId } from '@umbraco-cms/backoffice/id';
 import type { DocumentVariantResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
@@ -55,6 +57,34 @@
 		this.#documentDb.detail.update(id, document);
 	}
 
+	createAndPublish(data: CreateAndPublishDocumentRequestModel) {
+		const id = this.#documentDb.detail.create(data);
+		this.#publishCultures(id, data.culturesToPublish);
+		return id;
+	}
+
+	updateAndPublish(id: string, data: UpdateAndPublishDocumentRequestModel) {
+		this.#documentDb.detail.update(id, data);
+		this.#publishCultures(id, data.culturesToPublish);
+	}
+
+	#publishCultures(id: string, culturesToPublish: Array<string>) {
+		const document: UmbMockDocumentModel = this.#documentDb.detail.read(id);
+
+		// Invariant content types publish with an empty cultures array; publish the invariant variant in that case.
+		const cultures: Array<string | null> = culturesToPublish.length > 0 ? culturesToPublish : [null];
+
+		cultures.forEach((culture) => {
+			const variant = document.variants.find((x) => x.culture === culture);
+			if (variant) {
+				variant.state = 'Published' as UmbDocumentVariantState;
+				variant.updateDate = new Date().toISOString();
+			}
+		});
+
+		this.#documentDb.detail.update(id, document);
+	}
+
 	publishWithDescendants(id: string, data: PublishDocumentWithDescendantsRequestModel) {
 		const document: UmbMockDocumentModel = this.#documentDb.detail.read(id);
 		const documents = this.getDescendants(id, []);
@@ -64,10 +94,7 @@
 			for (const culture of data.cultures) {
 				for (const d of documents) {
 					const variant = document.variants.find((x) => x.culture === culture);
-					if (
-						variant &&
-						(data.includeUnpublishedDescendants || variant.state !== 'Published')
-					) {
+					if (variant && (data.includeUnpublishedDescendants || variant.state !== 'Published')) {
 						variant.state = 'Published' as UmbDocumentVariantState;
 						variant.updateDate = new Date().toISOString();
 					}

src/Umbraco.Web.UI.Client/mocks/msw-handlers/document/detail.handlers.ts

@@ -4,11 +4,13 @@ import { umbMockManager } from '../../mock-manager.js';
 import { umbDocumentMockDb } from '../../db/document.db.js';
 import { UMB_SLUG } from './slug.js';
 import type {
+	CreateAndPublishDocumentRequestModel,
 	CreateDocumentRequestModel,
 	DefaultReferenceResponseModel,
 	GetDocumentByIdAvailableSegmentOptionsResponse,
 	GetDocumentByIdReferencedDescendantsResponse,
 	PagedIReferenceResponseModel,
+	UpdateAndPublishDocumentRequestModel,
 	UpdateDocumentRequestModel,
 } from '@umbraco-cms/backoffice/external/backend-api';
 import { umbracoPath } from '@umbraco-cms/backoffice/utils';
@@ -38,6 +40,21 @@ export const detailHandlers = [
 		});
 	}),
 
+	http.post(umbracoPath(`${UMB_SLUG}/create-and-publish`), async ({ request }) => {
+		const requestBody = (await request.json()) as CreateAndPublishDocumentRequestModel;
+		if (!requestBody) return new HttpResponse(null, { status: 400, statusText: 'no body found' });
+
+		const id = umbDocumentMockDb.publishing.createAndPublish(requestBody);
+
+		return HttpResponse.json(null, {
+			status: 201,
+			headers: {
+				Location: request.url + '/' + id,
+				'Umb-Generated-Resource': id,
+			},
+		});
+	}),
+
 	http.get(umbracoPath(`${UMB_SLUG}/configuration`), () => {
 		return HttpResponse.json(umbDocumentMockDb.getConfiguration());
 	}),
@@ -155,6 +172,19 @@ export const detailHandlers = [
 		}
 	}),
 
+	http.put(umbracoPath(`${UMB_SLUG}/:id/update-and-publish`), async ({ request, params }) => {
+		const id = params.id as string;
+		if (!id) return new HttpResponse(null, { status: 400 });
+		if (id === 'forbidden') {
+			// Simulate a forbidden response
+			return new HttpResponse(null, { status: 403 });
+		}
+		const requestBody = (await request.json()) as UpdateAndPublishDocumentRequestModel;
+		if (!requestBody) return new HttpResponse(null, { status: 400, statusText: 'no body found' });
+		umbDocumentMockDb.publishing.updateAndPublish(id, requestBody);
+		return new HttpResponse(null, { status: 200 });
+	}),
+
 	http.put(umbracoPath(`${UMB_SLUG}/:id`), async ({ request, params }) => {
 		const id = params.id as string;
 		if (!id) return new HttpResponse(null, { status: 400 });

src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/workspace-context/document-publishing.workspace-context.ts

@@ -1,4 +1,4 @@
 import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../workspace/context/document-workspace.context-token.js';
 import type {
 	UmbDocumentDetailModel,
 	UmbDocumentVariantOptionModel,
@@ -399,33 +399,36 @@
 		const entityType = this.#documentWorkspaceContext.getEntityType();
 		if (!entityType) throw new Error('Entity type is missing');
 
-		await this.#documentWorkspaceContext.performCreateOrUpdate(variantIds, saveData);
+		// Capture the current (draft) data before the operation, so variants that are not being published
+		// but still hold unsaved edits can be kept dirty after the reload below.
+		const dirtyData = this.#documentWorkspaceContext.getData();
 
-		const { error } = await this.#publishingRepository.publish(
-			unique,
-			variantIds.map((variantId) => ({ variantId })),
-		);
+		// Save and publish in a single server transaction (replaces the separate save + publish calls).
+		await this.#documentWorkspaceContext.performCreateOrUpdateAndPublish(variantIds, saveData);
 
-		if (!error) {
-			this.#notificationContext?.peek('positive', {
-				data: {
-					message: this.#localize.term('speechBubbles_editContentPublishedHeader'),
-				},
-			});
+		this.#notificationContext?.peek('positive', {
+			data: {
+				message: this.#localize.term('speechBubbles_editContentPublishedHeader'),
+			},
+		});
 
-			// Clear stale published data and pending changes state so the
-			// persistedData observer does not run a comparison against outdated
-			// data during reload, which would briefly show a false-positive
-			// "pending changes" state.
-			this.#clear();
+		// Clear stale published data and pending changes state so the
+		// persistedData observer does not run a comparison against outdated
+		// data during reload, which would briefly show a false-positive
+		// "pending changes" state.
+		this.#clear();
 
-			// reload the document so all states are updated after the publish operation
-			await this.#documentWorkspaceContext.reload();
-			await this.#loadAndProcessLastPublished();
+		// reload the document so all states are updated after the publish operation
+		await this.#documentWorkspaceContext.reload();
 
-			const event = new UmbRequestReloadStructureForEntityEvent({ unique, entityType });
-			this.#eventContext?.dispatchEvent(event);
-		}
+		// The reload resets the current data state to the full server document. Re-apply the edits of the
+		// variants that were not published, so they remain dirty (and the Discard-Changes guard fires).
+		await this.#documentWorkspaceContext.transferPublishedVariantsToCurrent(dirtyData, variantIds);
+
+		await this.#loadAndProcessLastPublished();
+
+		const event = new UmbRequestReloadStructureForEntityEvent({ unique, entityType });
+		this.#eventContext?.dispatchEvent(event);
 	}
 
 	#publishableVariantsFilter = (option: UmbDocumentVariantOptionModel) => {

src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.repository.ts

@@ -3,10 +3,41 @@ import { UmbDocumentServerDataSource } from './document-detail.server.data-sourc
 import { UMB_DOCUMENT_DETAIL_STORE_CONTEXT } from './document-detail.store.context-token.js';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbDetailRepositoryBase } from '@umbraco-cms/backoffice/repository';
-export class UmbDocumentDetailRepository extends UmbDetailRepositoryBase<UmbDocumentDetailModel> {
+import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
+export class UmbDocumentDetailRepository extends UmbDetailRepositoryBase<
+	UmbDocumentDetailModel,
+	UmbDocumentServerDataSource
+> {
 	constructor(host: UmbControllerHost) {
 		super(host, UmbDocumentServerDataSource, UMB_DOCUMENT_DETAIL_STORE_CONTEXT);
 	}
+
+	/**
+	 * Creates and publishes a new Document in a single operation
+	 * @param {UmbDocumentDetailModel} model - The Document to create
+	 * @param {Array<UmbVariantId>} variantIds - The variants to publish after creating
+	 * @param {string | null} parentUnique - The unique of the parent to create under
+	 * @returns {*}
+	 * @memberof UmbDocumentDetailRepository
+	 */
+	async createAndPublish(
+		model: UmbDocumentDetailModel,
+		variantIds: Array<UmbVariantId>,
+		parentUnique: string | null = null,
+	) {
+		return this.detailDataSource.createAndPublish(model, variantIds, parentUnique);
+	}
+
+	/**
+	 * Updates and publishes an existing Document in a single operation
+	 * @param {UmbDocumentDetailModel} model - The Document to update
+	 * @param {Array<UmbVariantId>} variantIds - The variants to publish after updating
+	 * @returns {*}
+	 * @memberof UmbDocumentDetailRepository
+	 */
+	async updateAndPublish(model: UmbDocumentDetailModel, variantIds: Array<UmbVariantId>) {
+		return this.detailDataSource.updateAndPublish(model, variantIds);
+	}
 }
 
 export { UmbDocumentDetailRepository as api };