From 05aef6a91fd00f4f602c0bd4ae2a2b1935f11fea Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 7 Jul 2025 08:31:27 +0200
Subject: [PATCH] Hide Document/Media Collection Workspace View until the item
 is created (#19644)

* only show collection items workspace view when document is created

* do not pass null for collection

* only show media collection view when media is created
---
 .../documents/documents/workspace/manifests.ts         |  9 ++++++++-
 .../src/packages/media/media/workspace/manifests.ts    | 10 +++++++++-
 .../media/media/workspace/media-workspace.context.ts   |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts
index 2cce72664a..ccae31b036 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts
@@ -5,7 +5,10 @@ import {
 	UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION,
 	UMB_WORKSPACE_HAS_CONTENT_COLLECTION_CONDITION_ALIAS,
 } from '@umbraco-cms/backoffice/content';
-import { UMB_WORKSPACE_CONDITION_ALIAS } from '@umbraco-cms/backoffice/workspace';
+import {
+	UMB_WORKSPACE_CONDITION_ALIAS,
+	UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
+} from '@umbraco-cms/backoffice/workspace';
 
 export const manifests: Array<UmbExtensionManifest> = [
 	{
@@ -36,6 +39,10 @@ export const manifests: Array<UmbExtensionManifest> = [
 			{
 				alias: UMB_WORKSPACE_HAS_CONTENT_COLLECTION_CONDITION_ALIAS,
 			},
+			{
+				alias: UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
+				match: false,
+			},
 		],
 	},
 	{
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts
index 4cb6f75235..d43932d72c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/manifests.ts
@@ -1,5 +1,9 @@
 import { UMB_MEDIA_WORKSPACE_ALIAS } from './constants.js';
-import { UmbSubmitWorkspaceAction, UMB_WORKSPACE_CONDITION_ALIAS } from '@umbraco-cms/backoffice/workspace';
+import {
+	UmbSubmitWorkspaceAction,
+	UMB_WORKSPACE_CONDITION_ALIAS,
+	UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
+} from '@umbraco-cms/backoffice/workspace';
 import { UMB_ENTITY_IS_NOT_TRASHED_CONDITION_ALIAS } from '@umbraco-cms/backoffice/recycle-bin';
 import {
 	UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION,
@@ -35,6 +39,10 @@ export const manifests: Array<UmbExtensionManifest> = [
 			{
 				alias: UMB_WORKSPACE_HAS_CONTENT_COLLECTION_CONDITION_ALIAS,
 			},
+			{
+				alias: UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
+				match: false,
+			},
 		],
 	},
 	{
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts
index 423d1cde14..c8a61f1a46 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts
@@ -76,7 +76,7 @@ export class UmbMediaWorkspaceContext
 					const mediaTypeUnique = info.match.params.mediaTypeUnique;
 					await this.createScaffold({
 						parent: { entityType: parentEntityType, unique: parentUnique },
-						preset: { mediaType: { unique: mediaTypeUnique, collection: null } },
+						preset: { mediaType: { unique: mediaTypeUnique } },
 					});
 
 					new UmbWorkspaceIsNewRedirectController(