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/assets/lang/en.ts

@@ -1542,9 +1542,11 @@ export default {
 		cssSavedText: 'Stylesheet saved without any errors',
 		dataTypeSaved: 'Datatype saved',
 		dictionaryItemSaved: 'Dictionary item saved',
+		editContentPublishedFailed: 'Document could not be published or saved',
 		editContentPublishedFailedByValidation: 'Document could not be published, but we saved it for you',
 		editContentPublishedFailedByParent: 'Document could not be published, because a parent page is not published',
 		editContentPublishedHeader: 'Document published',
+		editContentPublishedReloadFailed: 'Document published, but the editor could not be refreshed',
 		editContentPublishedText: 'and is visible on the website',
 		editContentUnpublishedHeader: 'Document unpublished',
 		editContentUnpublishedText: 'and is no longer visible on the website',
@@ -2192,7 +2194,7 @@ export default {
 		updateDate: 'User last updated',
 		userCreated: 'has been created',
 		userCreatedSuccessHelp: 'The new user has successfully been created. To log in to Umbraco use the password below.',
-		userCreatedApiSuccessHelp: 'Set client credentials for the account via the user\'s profile.',
+		userCreatedApiSuccessHelp: "Set client credentials for the account via the user's profile.",
 		userHasPassword: 'The user already has a password set',
 		userHasGroup: "The user is already in group '%0%'",
 		userLockoutNotEnabled: 'Lockout is not enabled for this user',

src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts

@@ -1,4 +1,4 @@
 import type { UmbBlockDataModel, UmbBlockDataValueModel, UmbBlockLayoutBaseModel } from '../types.js';
 import { UMB_BLOCK_ENTRIES_CONTEXT, UMB_BLOCK_MANAGER_CONTEXT } from '../context/index.js';
 import { UmbBlockWorkspaceEditorElement } from './block-workspace-editor.element.js';
 import { UmbBlockElementManager } from './block-element-manager.js';
@@ -12,6 +12,7 @@
 	UmbWorkspaceIsNewRedirectController,
 	type ManifestWorkspace,
 	UmbWorkspaceIsNewRedirectControllerAlias,
+	umbWorkspaceWillNavigateAway,
 } from '@umbraco-cms/backoffice/workspace';
 import {
 	UmbBooleanState,
@@ -362,10 +363,7 @@
 	 * @memberof UmbEntityWorkspaceContextBase
 	 */
 	protected _checkWillNavigateAway(newUrl: string | URL): boolean {
-		if (newUrl instanceof URL) {
-			newUrl = newUrl.href;
-		}
-		return !newUrl.includes(this.routes.getActiveLocalPath());
+		return umbWorkspaceWillNavigateAway(this.routes, this.getUnique(), newUrl);
 	}
 
 	setEditorSize(editorSize: UUIModalSidebarSize) {