From d8dd78dd4ffb6bc07710057b63912a36d8798446 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Tue, 16 Apr 2024 13:56:33 +0200
Subject: [PATCH] Bugfix: Create a document when no blueprint available

---
 .../create/document-create-options-modal.element.ts          | 5 ++---
 .../documents/workspace/document-workspace.context.ts        | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts
index eb4361a1ec..da98aa2e2f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/document-create-options-modal.element.ts
@@ -78,7 +78,7 @@ export class UmbDocumentCreateOptionsModalElement extends UmbModalBaseElement<
 			history.pushState(
 				null,
 				'',
-				`section/content/workspace/document/create/parent/${this.data?.parent.entityType}/${this.data?.parent.unique ?? 'null'}/${documentTypeUnique}/${blueprintUnique}`,
+				`section/content/workspace/document/create/parent/${this.data?.parent.entityType}/${this.data?.parent.unique ?? 'null'}/${documentTypeUnique}/blueprint/${blueprintUnique}`,
 			);
 		}
 		this._submitModal();
@@ -90,9 +90,8 @@ export class UmbDocumentCreateOptionsModalElement extends UmbModalBaseElement<
 
 		/** TODO: Fix this to use the correct endpoint when it becomes available */
 		const { data } = await this.#documentBlueprintItemRepository.requestItems([]);
-		if (!data?.length) return;
 
-		this._availableBlueprints = data.filter((blueprint) => blueprint.documentType.unique === documentTypeUnique);
+		this._availableBlueprints = data?.filter((blueprint) => blueprint.documentType.unique === documentTypeUnique) ?? [];
 
 		if (!this._availableBlueprints.length) {
 			this.#onNavigate(documentTypeUnique);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
index c41e96a116..30c3780d38 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts
@@ -160,7 +160,7 @@ export class UmbDocumentWorkspaceContext
 
 		this.routes.setRoutes([
 			{
-				path: 'create/parent/:entityType/:parentUnique/:documentTypeUnique/:blueprintUnique',
+				path: 'create/parent/:entityType/:parentUnique/:documentTypeUnique/blueprint/:blueprintUnique',
 				component: () => import('./document-workspace-editor.element.js'),
 				setup: async (_component, info) => {
 					const parentEntityType = info.match.params.entityType;
@@ -248,8 +248,7 @@ export class UmbDocumentWorkspaceContext
 		this.resetState();
 		this.#parent.setValue(parent);
 
-		/**TODO Explore bug: A way to make blueprintUnique undefined/null when no unique is given, rather than setting it to invariant */
-		if (blueprintUnique && blueprintUnique.toLowerCase() !== 'invariant') {
+		if (blueprintUnique) {
 			const { data } = await this.#blueprintRepository.requestByUnique(blueprintUnique);
 
 			this.#getDataPromise = this.repository.createScaffold({