From 8f1a07deb1b08dd6e68077d67bf7cfcb5753f49a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 12:35:40 +0100
Subject: [PATCH 01/38] remove custom implementation from data type

---
 .../workspace/data-type-workspace.context.ts        | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts
index 243e17d46bcb..eb2f69532f1e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts
@@ -114,19 +114,6 @@ export class UmbDataTypeWorkspaceContext
 		]);
 	}
 
-	override async load(unique: string) {
-		const response = await super.load(unique);
-		this.observe(response.asObservable?.(), (entity) => this.#onStoreChange(entity), 'umbDataTypeStoreObserver');
-		return response;
-	}
-
-	#onStoreChange(entity: EntityType | undefined) {
-		if (!entity) {
-			//TODO: This solution is alright for now. But reconsider when we introduce signal-r
-			history.pushState(null, '', 'section/settings/workspace/data-type-root');
-		}
-	}
-
 	override resetState() {
 		super.resetState();
 		this.#propertyEditorSchemaSettingsProperties = [];

From e571a7bd4bee1d67adfab1d5a00cd1eab28c9e53 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 12:36:10 +0100
Subject: [PATCH 02/38] clear workspace data when entity gets removed from the
 store

---
 .../entity-detail/entity-detail-workspace-base.ts   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
index 855370f93a2a..4981bd756fee 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
@@ -133,11 +133,24 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 			this._data.setPersisted(data);
 			this._data.setCurrent(data);
 			this.setIsNew(false);
+
+			this.observe(
+				response.asObservable(),
+				(entity) => this.#onStoreChange(entity),
+				'umbEntityDetailTypeStoreObserver',
+			);
 		}
 
 		return response;
 	}
 
+	#onStoreChange(entity: DetailModelType | undefined) {
+		if (!entity) {
+			this._data.setPersisted(undefined);
+			this._data.setCurrent(undefined);
+		}
+	}
+
 	/**
 	 * Method to check if the workspace data is loaded.
 	 * @returns { Promise<any> | undefined } true if the workspace data is loaded.

From a603379b0dc23a03eb1564eaf45ae908d43b1ff5 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 13:50:27 +0100
Subject: [PATCH 03/38] remove unused alias

---
 ...ck-grid-area-type-workspace-editor.element.ts | 16 ++++------------
 .../block-grid-area-type-workspace.context.ts    |  2 --
 .../block-type-workspace-editor.element.ts       | 16 ++++------------
 .../workspace/block-type-workspace.context.ts    |  4 ----
 .../workspace/block-workspace-editor.element.ts  |  7 +------
 .../block/workspace/block-workspace.context.ts   |  3 ---
 .../property-type-workspace-editor.element.ts    |  7 +------
 .../workspace/property-type-workspace.context.ts |  4 ----
 .../workspace-footer/workspace-footer.element.ts |  1 -
 .../workspace-split-view.element.ts              |  4 ----
 .../kinds/default/default-workspace.element.ts   |  1 -
 .../data-type-workspace-editor.element.ts        |  2 +-
 ...ent-blueprint-workspace-split-view.element.ts |  1 -
 .../document-type-workspace-editor.element.ts    |  2 +-
 .../document-workspace-split-view.element.ts     |  1 -
 .../language-workspace-editor.element.ts         |  4 +---
 .../media-type-workspace-editor.element.ts       |  2 +-
 .../media-workspace-split-view.element.ts        |  1 -
 .../member-group-workspace-editor.element.ts     |  2 +-
 .../member-type-workspace-editor.element.ts      |  2 +-
 .../member-workspace-split-view.element.ts       |  1 -
 .../workspace-package-builder.element.ts         |  6 +-----
 .../workspace/workspace-package.element.ts       |  2 +-
 .../created-packages-section-view.element.ts     |  6 ------
 .../relation-type-workspace-editor.element.ts    |  2 +-
 ...rtial-view-folder-workspace-editor.element.ts |  3 +--
 .../partial-view-workspace-editor.element.ts     |  2 +-
 .../script-folder-workspace-editor.element.ts    |  4 +---
 .../workspace/script-workspace-editor.element.ts |  2 +-
 ...stylesheet-folder-workspace-editor.element.ts |  4 +---
 .../stylesheet-workspace-editor.element.ts       |  2 +-
 .../template-workspace-editor.element.ts         |  2 +-
 .../user-group-workspace-editor.element.ts       |  6 +-----
 .../user/user-workspace-editor.element.ts        |  6 +-----
 .../webhook/webhook-workspace-editor.element.ts  |  6 +-----
 35 files changed, 29 insertions(+), 107 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace-editor.element.ts
index 20056eaf6ecd..5ddfa4ad5ac1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace-editor.element.ts
@@ -5,15 +5,11 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
 @customElement('umb-block-grid-area-type-workspace-editor')
 export class UmbBlockGridAreaTypeWorkspaceEditorElement extends UmbLitElement {
-	//
 	#workspaceContext?: typeof UMB_BLOCK_GRID_AREA_TYPE_WORKSPACE_CONTEXT.TYPE;
 
 	@state()
 	_name?: string;
 
-	@property({ type: String, attribute: false })
-	workspaceAlias?: string;
-
 	constructor() {
 		super();
 
@@ -28,14 +24,10 @@ export class UmbBlockGridAreaTypeWorkspaceEditorElement extends UmbLitElement {
 
 	// TODO: Localization, make it so that the headline is about area configuration?
 	override render() {
-		return this.workspaceAlias
-			? html`
-					<umb-workspace-editor
-						alias=${this.workspaceAlias}
-						headline=${this.localize.term('blockEditor_blockConfigurationOverlayTitle', [this._name])}>
-					</umb-workspace-editor>
-				`
-			: '';
+		return html`
+			<umb-workspace-editor headline=${this.localize.term('blockEditor_blockConfigurationOverlayTitle', [this._name])}>
+			</umb-workspace-editor>
+		`;
 	}
 
 	static override styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts
index 906c503a5713..4599a17cd889 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts
@@ -56,7 +56,6 @@ export class UmbBlockGridAreaTypeWorkspaceContext
 				component: () => import('./block-grid-area-type-workspace-editor.element.js'),
 				setup: (component, info) => {
 					const id = info.match.params.id;
-					(component as any).workspaceAlias = manifest.alias;
 					this.load(id);
 				},
 			},
@@ -64,7 +63,6 @@ export class UmbBlockGridAreaTypeWorkspaceContext
 				path: 'create',
 				component: () => import('./block-grid-area-type-workspace-editor.element.js'),
 				setup: (component) => {
-					(component as any).workspaceAlias = manifest.alias;
 					this.create();
 				},
 			},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts
index 18a5dacd63a9..d51e9efc2865 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts
@@ -8,7 +8,6 @@ import { UMB_DOCUMENT_TYPE_ITEM_REPOSITORY_ALIAS } from '@umbraco-cms/backoffice
 
 @customElement('umb-block-type-workspace-editor')
 export class UmbBlockTypeWorkspaceEditorElement extends UmbLitElement {
-	//
 	#itemManager = new UmbRepositoryItemsManager<UmbDocumentTypeItemModel>(
 		this,
 		UMB_DOCUMENT_TYPE_ITEM_REPOSITORY_ALIAS,
@@ -20,9 +19,6 @@ export class UmbBlockTypeWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	_name?: string;
 
-	@property({ type: String, attribute: false })
-	workspaceAlias?: string;
-
 	constructor() {
 		super();
 
@@ -45,14 +41,10 @@ export class UmbBlockTypeWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		return this.workspaceAlias
-			? html`
-					<umb-workspace-editor
-						alias=${this.workspaceAlias}
-						headline=${this.localize.term('blockEditor_blockConfigurationOverlayTitle', [this._name])}>
-					</umb-workspace-editor>
-				`
-			: '';
+		return html`
+			<umb-workspace-editor headline=${this.localize.term('blockEditor_blockConfigurationOverlayTitle', [this._name])}>
+			</umb-workspace-editor>
+		`;
 	}
 
 	static override styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts
index 4b99ed1c3b0c..e9e6d295af05 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace.context.ts
@@ -50,8 +50,6 @@ export class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlockTypeWith
 				path: 'create/:elementTypeKey/:groupKey',
 				component: UmbBlockTypeWorkspaceEditorElement,
 				setup: async (component, info) => {
-					(component as UmbBlockTypeWorkspaceEditorElement).workspaceAlias = manifest.alias;
-
 					const elementTypeKey = info.match.params.elementTypeKey;
 					const groupKey = info.match.params.groupKey === 'null' ? null : info.match.params.groupKey;
 					await this.create(elementTypeKey, groupKey);
@@ -67,8 +65,6 @@ export class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlockTypeWith
 				path: 'edit/:id',
 				component: UmbBlockTypeWorkspaceEditorElement,
 				setup: (component, info) => {
-					(component as UmbBlockTypeWorkspaceEditorElement).workspaceAlias = manifest.alias;
-
 					const id = info.match.params.id;
 					this.load(id);
 				},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts
index 1e8cefd58591..529074a07990 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts
@@ -6,9 +6,6 @@ import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
 
 @customElement('umb-block-workspace-editor')
 export class UmbBlockWorkspaceEditorElement extends UmbLitElement {
-	@property({ type: String, attribute: false })
-	workspaceAlias?: string;
-
 	constructor() {
 		super();
 		this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (context) => {
@@ -30,9 +27,7 @@ export class UmbBlockWorkspaceEditorElement extends UmbLitElement {
 	_headline: string = '';
 
 	override render() {
-		return this.workspaceAlias
-			? html` <umb-workspace-editor alias=${this.workspaceAlias} headline=${this._headline}> </umb-workspace-editor> `
-			: nothing;
+		return html`<umb-workspace-editor headline=${this._headline}> </umb-workspace-editor> `;
 	}
 
 	static override readonly styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts
index d7f83662feae..f7c829e4b0fc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace.context.ts
@@ -176,8 +176,6 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 				path: 'create/:elementTypeKey',
 				component: UmbBlockWorkspaceEditorElement,
 				setup: async (component, info) => {
-					(component as UmbBlockWorkspaceEditorElement).workspaceAlias = manifest.alias;
-
 					const elementTypeKey = info.match.params.elementTypeKey;
 					await this.create(elementTypeKey);
 
@@ -192,7 +190,6 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 				path: 'edit/:key',
 				component: UmbBlockWorkspaceEditorElement,
 				setup: (component, info) => {
-					(component as UmbBlockWorkspaceEditorElement).workspaceAlias = manifest.alias;
 					const key = decodeFilePath(info.match.params.key);
 					this.load(key);
 				},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace-editor.element.ts
index a68efbee13a0..5ff7d607e351 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace-editor.element.ts
@@ -4,7 +4,6 @@ import { customElement, css, html, state, property } from '@umbraco-cms/backoffi
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 @customElement('umb-property-type-workspace-editor')
 export class UmbPropertyTypeWorkspaceEditorElement extends UmbLitElement {
-	//
 	#workspaceContext?: typeof UMB_PROPERTY_TYPE_WORKSPACE_CONTEXT.TYPE;
 
 	@state()
@@ -13,9 +12,6 @@ export class UmbPropertyTypeWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	_name?: string;
 
-	@property({ type: String, attribute: false })
-	workspaceAlias?: string;
-
 	constructor() {
 		super();
 
@@ -32,10 +28,9 @@ export class UmbPropertyTypeWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		return this.workspaceAlias && this._isNew !== undefined
+		return this._isNew !== undefined
 			? html`
 					<umb-workspace-editor
-						alias=${this.workspaceAlias}
 						headline=${this.localize.term(
 							this._isNew ? 'contentTypeEditor_addProperty' : 'contentTypeEditor_editProperty',
 							[this._name],
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace.context.ts
index 20afdc3bb354..112d141099d6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace.context.ts
@@ -68,8 +68,6 @@ export class UmbPropertyTypeWorkspaceContext<PropertyTypeData extends UmbPropert
 				path: 'create/:containerUnique',
 				component: UmbPropertyTypeWorkspaceEditorElement,
 				setup: async (component, info) => {
-					(component as UmbPropertyTypeWorkspaceEditorElement).workspaceAlias = manifest.alias;
-
 					const containerUnique =
 						info.match.params.containerUnique === 'null' ? null : info.match.params.containerUnique;
 					await this.create(containerUnique);
@@ -85,8 +83,6 @@ export class UmbPropertyTypeWorkspaceContext<PropertyTypeData extends UmbPropert
 				path: 'edit/:unique',
 				component: UmbPropertyTypeWorkspaceEditorElement,
 				setup: (component, info) => {
-					(component as UmbPropertyTypeWorkspaceEditorElement).workspaceAlias = manifest.alias;
-
 					const unique = info.match.params.unique;
 					this.load(unique);
 				},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts
index b34f61e59d47..180c74525d5d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-footer/workspace-footer.element.ts
@@ -24,7 +24,6 @@ function ExtensionApiArgsMethod(
 
 /**
  * @element umb-workspace-footer
- * @description Uses the alias to insert extensions that targets this workspace-alias.
  * @slot - Slot for workspace footer items
  * @slot actions - Slot for workspace actions
  * @class UmbWorkspaceFooterLayout
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
index d20565411268..6283dd66177a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.element.ts
@@ -14,9 +14,6 @@ import './workspace-split-view-variant-selector.element.js';
  */
 @customElement('umb-workspace-split-view')
 export class UmbWorkspaceSplitViewElement extends UmbLitElement {
-	@property()
-	alias!: string;
-
 	@property({ type: Boolean })
 	displayNavigation = false;
 
@@ -43,7 +40,6 @@ export class UmbWorkspaceSplitViewElement extends UmbLitElement {
 	override render() {
 		return html`
 			<umb-workspace-editor
-				alias=${this.alias}
 				back-path=${ifDefined(this.backPath)}
 				.hideNavigation=${!this.displayNavigation}
 				.enforceNoFooter=${true}>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/default/default-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/default/default-workspace.element.ts
index 59596972ce80..ba2875f9ac8c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/default/default-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/kinds/default/default-workspace.element.ts
@@ -13,7 +13,6 @@ export class UmbDefaultWorkspaceElement extends UmbLitElement {
 		const headline = this.manifest?.meta.headline;
 
 		return html` <umb-workspace-editor
-			alias=${this.manifest.alias}
 			headline=${ifDefined(headline ? this.localize.string(headline) : undefined)}></umb-workspace-editor>`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
index ef4b4ddeda63..7456daa033c2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
@@ -17,7 +17,7 @@ export class UmbDataTypeWorkspaceEditorElement extends UmbLitElement {
 
 	override render() {
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.DataType">
+			<umb-workspace-editor>
 				<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>
 			</umb-workspace-editor>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace-split-view.element.ts
index 35723116aeaf..3b9e61341fbe 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace-split-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace-split-view.element.ts
@@ -42,7 +42,6 @@ export class UmbDocumentBlueprintWorkspaceSplitViewElement extends UmbLitElement
 								view.index + '_' + (view.culture ?? '') + '_' + (view.segment ?? '') + '_' + this._variants!.length,
 							(view) => html`
 								<umb-workspace-split-view
-									alias=${UMB_DOCUMENT_BLUEPRINT_WORKSPACE_ALIAS}
 									.splitViewIndex=${view.index}
 									.displayNavigation=${view.index === this._variants!.length - 1}></umb-workspace-split-view>
 							`,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type/document-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type/document-type-workspace-editor.element.ts
index 275fd2aacc8b..6fe2558d9d88 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type/document-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type/document-type-workspace-editor.element.ts
@@ -78,7 +78,7 @@ export class UmbDocumentTypeWorkspaceEditorElement extends UmbLitElement {
 
 	override render() {
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.DocumentType">
+			<umb-workspace-editor>
 				<div id="header" slot="header">
 					<uui-button id="icon" compact label="icon" look="outline" @click=${this._handleIconClick}>
 						<umb-icon name=${ifDefined(this._icon)}></umb-icon>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts
index 09c5ab3bbc10..720ad09ccd09 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-split-view.element.ts
@@ -44,7 +44,6 @@ export class UmbDocumentWorkspaceSplitViewElement extends UmbLitElement {
 								view.index + '_' + (view.culture ?? '') + '_' + (view.segment ?? '') + '_' + this._variants!.length,
 							(view) => html`
 								<umb-workspace-split-view
-									alias="Umb.Workspace.Document"
 									.splitViewIndex=${view.index}
 									.displayNavigation=${view.index === this._variants!.length - 1}>
 									<umb-document-workspace-split-view-variant-selector
diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
index 786869eb54ab..64c379d4ab3a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
@@ -19,9 +19,7 @@ export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		return html`<umb-workspace-editor
-			alias="Umb.Workspace.Language"
-			back-path="section/settings/workspace/language-root">
+		return html`<umb-workspace-editor back-path="section/settings/workspace/language-root">
 			${this._isNew
 				? html`<h3 slot="header">Add language</h3>`
 				: html`<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>`}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts
index af59bac4d61c..4c7fd19afb47 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace-editor.element.ts
@@ -82,7 +82,7 @@ export class UmbMediaTypeWorkspaceEditorElement extends UmbLitElement {
 
 	override render() {
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.MediaType">
+			<umb-workspace-editor>
 				<div id="header" slot="header">
 					<uui-button id="icon" compact label="icon" look="outline" @click=${this._handleIconClick}>
 						<umb-icon name=${ifDefined(this._icon)}></umb-icon>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace-split-view.element.ts
index 53da02132362..18f7af2f7ac0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace-split-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace-split-view.element.ts
@@ -42,7 +42,6 @@ export class UmbMediaWorkspaceSplitViewElement extends UmbLitElement {
 								view.index + '_' + (view.culture ?? '') + '_' + (view.segment ?? '') + '_' + this._variants!.length,
 							(view) => html`
 								<umb-workspace-split-view
-									alias="Umb.Workspace.Media"
 									.splitViewIndex=${view.index}
 									.displayNavigation=${view.index === this._variants!.length - 1}></umb-workspace-split-view>
 							`,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts
index 9de32097d1b8..7ac43079ade5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts
@@ -30,7 +30,7 @@ export class UmbMemberGroupWorkspaceEditorElement extends UmbLitElement {
 
 	override render() {
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.MemberGroup" back-path=${UMB_MEMBER_GROUP_ROOT_WORKSPACE_PATH}>
+			<umb-workspace-editor back-path=${UMB_MEMBER_GROUP_ROOT_WORKSPACE_PATH}>
 				<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>
 				${this.#renderActions()}
 				<umb-workspace-entity-action-menu slot="action-menu"></umb-workspace-entity-action-menu>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts
index 80090ec4347c..c9d8a5f54542 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace-editor.element.ts
@@ -77,7 +77,7 @@ export class UmbMemberTypeWorkspaceEditorElement extends UmbLitElement {
 
 	override render() {
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.MemberType">
+			<umb-workspace-editor>
 				<div id="header" slot="header">
 					<uui-button id="icon" compact label="icon" look="outline" @click=${this._handleIconClick}>
 						<umb-icon name=${ifDefined(this._icon)}></umb-icon>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member/member-workspace-split-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member/member-workspace-split-view.element.ts
index 978d3f89c317..cc449aa66e43 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member/member-workspace-split-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/member/member-workspace-split-view.element.ts
@@ -43,7 +43,6 @@ export class UmbMemberWorkspaceSplitViewElement extends UmbLitElement {
 								view.index + '_' + (view.culture ?? '') + '_' + (view.segment ?? '') + '_' + this._variants!.length,
 							(view) => html`
 								<umb-workspace-split-view
-									alias="Umb.Workspace.Member"
 									back-path=${UMB_MEMBER_ROOT_WORKSPACE_PATH}
 									.splitViewIndex=${view.index}
 									.displayNavigation=${view.index === this._variants!.length - 1}>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
index 2af872690a6e..cd2dd7c9fafb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
@@ -41,9 +41,6 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 	@property()
 	entityUnique?: string;
 
-	@property()
-	workspaceAlias?: string;
-
 	@state()
 	private _package?: UmbCreatedPackageDefinition;
 
@@ -123,9 +120,8 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
 	}
 
 	override render() {
-		if (!this.workspaceAlias) return nothing;
 		return html`
-			<umb-workspace-editor alias=${this.workspaceAlias} back-path="section/packages/view/created">
+			<umb-workspace-editor back-path="section/packages/view/created">
 				${this.#renderHeader()} ${this.#renderEditors()} ${this.#renderActions()}
 			</umb-workspace-editor>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/workspace/workspace-package.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/workspace/workspace-package.element.ts
index cdbaf1106c43..d0c87d8bc34b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/workspace/workspace-package.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-repo/workspace/workspace-package.element.ts
@@ -38,7 +38,7 @@ export class UmbWorkspacePackageElement extends UmbLitElement {
 	}
 
 	override render() {
-		return html`<umb-workspace-editor alias="Umb.Workspace.Package"> ${this._renderHeader()} </umb-workspace-editor> `;
+		return html`<umb-workspace-editor> ${this._renderHeader()} </umb-workspace-editor> `;
 	}
 
 	static override styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts
index f8921ed5d045..7537effb3e3c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/created-packages-section-view.element.ts
@@ -43,18 +43,12 @@ export class UmbCreatedPackagesSectionViewElement extends UmbLitElement implemen
 				setup: (component, info) => {
 					if (component) {
 						(component as any).entityUnique = info.match.params.unique;
-						(component as any).workspaceAlias = workspace.alias;
 					}
 				},
 			});
 			routes.push({
 				path: workspace.meta.entityType,
 				component: () => createExtensionElement(workspace),
-				setup: (component) => {
-					if (component) {
-						(component as any).workspaceAlias = workspace.alias;
-					}
-				},
 			});
 		});
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type/relation-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type/relation-type-workspace-editor.element.ts
index eb4a8299786c..73e7ac6b66de 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type/relation-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/workspace/relation-type/relation-type-workspace-editor.element.ts
@@ -37,7 +37,7 @@ export class UmbRelationTypeWorkspaceEditorElement extends UmbLitElement {
 
 	override render() {
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.RelationType" back-path="${UMB_RELATIONS_ROOT_WORKSPACE_PATH}">
+			<umb-workspace-editor back-path="${UMB_RELATIONS_ROOT_WORKSPACE_PATH}">
 				<div id="header" slot="header">
 					<uui-input id="name" .value=${this._name ?? ''} readonly>
 						<div id="alias" slot="append">${this._alias}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/workspace/partial-view-folder-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/workspace/partial-view-folder-workspace-editor.element.ts
index 5a796bd9233a..1c76b2e65468 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/workspace/partial-view-folder-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/workspace/partial-view-folder-workspace-editor.element.ts
@@ -35,8 +35,7 @@ export class UmbPartialViewFolderWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		return html`<umb-workspace-editor headline=${this._name} alias=${UMB_PARTIAL_VIEW_FOLDER_WORKSPACE_ALIAS}>
-		</umb-workspace-editor>`;
+		return html`<umb-workspace-editor headline=${this._name}> </umb-workspace-editor>`;
 	}
 
 	static override styles = [UmbTextStyles, css``];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts
index 28c87e47ff5b..b7307edf859b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts
@@ -79,7 +79,7 @@ export class UmbPartialViewWorkspaceEditorElement extends UmbLitElement {
 	override render() {
 		if (this._isNew === undefined) return;
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.PartialView">
+			<umb-workspace-editor>
 				<div id="workspace-header" slot="header">
 					<uui-input
 						placeholder=${this.localize.term('placeholders_entername')}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/workspace/script-folder-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/workspace/script-folder-workspace-editor.element.ts
index 9cd7909d5aa7..aa4d1dd764b0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/workspace/script-folder-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/tree/folder/workspace/script-folder-workspace-editor.element.ts
@@ -1,4 +1,3 @@
-import { UMB_SCRIPT_FOLDER_WORKSPACE_ALIAS } from './constants.js';
 import { UMB_SCRIPT_FOLDER_WORKSPACE_CONTEXT } from './script-folder-workspace.context-token.js';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -35,8 +34,7 @@ export class UmbScriptFolderWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		return html`<umb-workspace-editor headline=${this._name} alias=${UMB_SCRIPT_FOLDER_WORKSPACE_ALIAS}>
-		</umb-workspace-editor>`;
+		return html`<umb-workspace-editor headline=${this._name}> </umb-workspace-editor>`;
 	}
 
 	static override styles = [UmbTextStyles, css``];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts
index 0c9e13b5d373..52b5880fb024 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts
@@ -54,7 +54,7 @@ export class UmbScriptWorkspaceEditorElement extends UmbLitElement {
 	override render() {
 		if (this._isNew === undefined) return;
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.Script">
+			<umb-workspace-editor>
 				<div id="workspace-header" slot="header">
 					<uui-input
 						placeholder=${this.localize.term('placeholders_entername')}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/workspace/stylesheet-folder-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/workspace/stylesheet-folder-workspace-editor.element.ts
index d79af432940a..e9fa8bc2e280 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/workspace/stylesheet-folder-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/tree/folder/workspace/stylesheet-folder-workspace-editor.element.ts
@@ -1,4 +1,3 @@
-import { UMB_STYLESHEET_FOLDER_WORKSPACE_ALIAS } from './constants.js';
 import { UMB_STYLESHEET_FOLDER_WORKSPACE_CONTEXT } from './stylesheet-folder-workspace.context-token.js';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -35,8 +34,7 @@ export class UmbStylesheetFolderWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		return html`<umb-workspace-editor headline=${this._name} alias=${UMB_STYLESHEET_FOLDER_WORKSPACE_ALIAS}>
-		</umb-workspace-editor>`;
+		return html`<umb-workspace-editor headline=${this._name}> </umb-workspace-editor>`;
 	}
 
 	static override styles = [UmbTextStyles, css``];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts
index 68b9c40538e7..dd8692f1abba 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace-editor.element.ts
@@ -37,7 +37,7 @@ export class UmbStylesheetWorkspaceEditorElement extends UmbLitElement {
 	override render() {
 		return this._isNew !== undefined
 			? html`
-					<umb-workspace-editor alias="Umb.Workspace.StyleSheet">
+					<umb-workspace-editor>
 						<div id="header" slot="header">
 							<uui-input
 								placeholder="Enter stylesheet name..."
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
index 39fff0938d99..a883906a8345 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
@@ -160,7 +160,7 @@ export class UmbTemplateWorkspaceEditorElement extends UmbLitElement {
 	override render() {
 		// TODO: add correct UI elements
 		return html`
-			<umb-workspace-editor alias="Umb.Workspace.Template">
+			<umb-workspace-editor>
 				<umb-input-with-alias
 					slot="header"
 					id="name"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
index ba9214437f57..c335e070a7eb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
@@ -1,7 +1,6 @@
 import type { UmbUserGroupDetailModel } from '../../index.js';
 import { UMB_USER_GROUP_ROOT_WORKSPACE_PATH } from '../../paths.js';
 import { UMB_USER_GROUP_WORKSPACE_CONTEXT } from './user-group-workspace.context-token.js';
-import { UMB_USER_GROUP_WORKSPACE_ALIAS } from './constants.js';
 import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui';
 import { css, html, nothing, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement, umbFocus } from '@umbraco-cms/backoffice/lit-element';
@@ -172,10 +171,7 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 		if (!this._unique) return nothing;
 
 		return html`
-			<umb-workspace-editor
-				alias=${UMB_USER_GROUP_WORKSPACE_ALIAS}
-				class="uui-text"
-				back-path=${UMB_USER_GROUP_ROOT_WORKSPACE_PATH}>
+			<umb-workspace-editor class="uui-text" back-path=${UMB_USER_GROUP_ROOT_WORKSPACE_PATH}>
 				${this.#renderHeader()} ${this.#renderMain()}
 			</umb-workspace-editor>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
index 10afe3c6b528..14346584fc4d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
@@ -2,7 +2,6 @@ import type { UmbUserDetailModel } from '../../index.js';
 import { UMB_USER_ROOT_WORKSPACE_PATH } from '../../paths.js';
 import type { UmbUserWorkspaceContext } from './user-workspace.context.js';
 import { UMB_USER_WORKSPACE_CONTEXT } from './user-workspace.context-token.js';
-import { UMB_USER_WORKSPACE_ALIAS } from './constants.js';
 import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
@@ -39,10 +38,7 @@ export class UmbUserWorkspaceEditorElement extends UmbLitElement {
 		if (!this._user) return html`User not found`;
 
 		return html`
-			<umb-workspace-editor
-				alias=${UMB_USER_WORKSPACE_ALIAS}
-				class="uui-text"
-				back-path=${UMB_USER_ROOT_WORKSPACE_PATH}>
+			<umb-workspace-editor class="uui-text" back-path=${UMB_USER_ROOT_WORKSPACE_PATH}>
 				${this.#renderHeader()}
 				<div id="main">
 					<div id="left-column">${this.#renderLeftColumn()}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/workspace/webhook/webhook-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/workspace/webhook/webhook-workspace-editor.element.ts
index b0e52ae98292..1f190a1b04f4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/webhook/workspace/webhook/webhook-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/workspace/webhook/webhook-workspace-editor.element.ts
@@ -4,11 +4,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 @customElement('umb-webhook-workspace-editor')
 export class UmbWebhookWorkspaceEditorElement extends UmbLitElement {
 	override render() {
-		return html`
-			<umb-workspace-editor
-				alias="Umb.Workspace.Webhook"
-				back-path="section/settings/workspace/webhook-root"></umb-workspace-editor>
-		`;
+		return html` <umb-workspace-editor back-path="section/settings/workspace/webhook-root"></umb-workspace-editor> `;
 	}
 
 	static override styles = [UmbTextStyles];

From 591ecbebfa62f1fc4316eae9df1c04555ef5c809 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 13:56:17 +0100
Subject: [PATCH 04/38] remove custom workspace implementations

---
 .../partial-view-workspace.context.ts         | 14 -------------
 .../workspace/script-workspace.context.ts     | 20 -------------------
 2 files changed, 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts
index a26d2a1b5e23..4306af8a0a2a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts
@@ -96,20 +96,6 @@ export class UmbPartialViewWorkspaceContext
 		this._data.updateCurrent({ content: value });
 	}
 
-	override async load(unique: string) {
-		const response = await super.load(unique);
-		this.observe(response.asObservable?.(), (data) => this.#onDetailStoreChanges(data), 'umbDetailStoreObserver');
-		return response;
-	}
-
-	#onDetailStoreChanges(data: UmbPartialViewDetailModel | undefined) {
-		// Data is removed from the store
-		// TODO: revisit. We need to handle what should happen when the data is removed from the store
-		if (data === undefined) {
-			this._data.clear();
-		}
-	}
-
 	override async createScaffold(args: UmbPartialViewWorkspaceContextCreateArgs) {
 		let snippetContent = '';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts
index 4bdc50a90ace..37308ec33a3d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts
@@ -70,26 +70,6 @@ export class UmbScriptWorkspaceContext
 	public setContent(value: string) {
 		this._data.updateCurrent({ content: value });
 	}
-
-	/**
-	 * @description load the script
-	 * @param unique The unique identifier of the script
-	 * @returns {Promise<void>}
-	 * @memberof UmbScriptWorkspaceContext
-	 */
-	public override async load(unique: string) {
-		const response = await super.load(unique);
-		this.observe(response.asObservable?.(), (data) => this.#onDetailStoreChanges(data), 'umbDetailStoreObserver');
-		return response;
-	}
-
-	#onDetailStoreChanges(data: UmbScriptDetailModel | undefined) {
-		// Data is removed from the store
-		// TODO: revisit. We need to handle what should happen when the data is removed from the store
-		if (data === undefined) {
-			this._data.clear();
-		}
-	}
 }
 
 export { UmbScriptWorkspaceContext as api };

From 80b85a59db03d72603eec563875080c28139ee2d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 13:57:45 +0100
Subject: [PATCH 05/38] use data clear method instead

---
 .../entity-detail/entity-detail-workspace-base.ts | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
index 4981bd756fee..9fab0b692610 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
@@ -136,7 +136,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 
 			this.observe(
 				response.asObservable(),
-				(entity) => this.#onStoreChange(entity),
+				(entity) => this.#onDetailStoreChange(entity),
 				'umbEntityDetailTypeStoreObserver',
 			);
 		}
@@ -144,13 +144,6 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 		return response;
 	}
 
-	#onStoreChange(entity: DetailModelType | undefined) {
-		if (!entity) {
-			this._data.setPersisted(undefined);
-			this._data.setCurrent(undefined);
-		}
-	}
-
 	/**
 	 * Method to check if the workspace data is loaded.
 	 * @returns { Promise<any> | undefined } true if the workspace data is loaded.
@@ -327,6 +320,12 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 		);
 	}
 
+	#onDetailStoreChange(entity: DetailModelType | undefined) {
+		if (!entity) {
+			this._data.clear();
+		}
+	}
+
 	public override destroy(): void {
 		window.removeEventListener('willchangestate', this.#onWillNavigate);
 		this._detailRepository?.destroy();

From 2c829440d4db8f15e53541744a19ec1ce847cc2c Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 14:00:11 +0100
Subject: [PATCH 06/38] remove unused imports

---
 .../workspace/block-grid-area-type-workspace-editor.element.ts  | 2 +-
 .../workspace/block-grid-area-type-workspace.context.ts         | 2 +-
 .../block-type/workspace/block-type-workspace-editor.element.ts | 2 +-
 .../block/block/workspace/block-workspace-editor.element.ts     | 2 +-
 .../workspace/property-type-workspace-editor.element.ts         | 2 +-
 .../workspace/partial-view-folder-workspace-editor.element.ts   | 1 -
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace-editor.element.ts
index 5ddfa4ad5ac1..0a773ae41eb4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace-editor.element.ts
@@ -1,6 +1,6 @@
 import { UMB_BLOCK_GRID_AREA_TYPE_WORKSPACE_CONTEXT } from './block-grid-area-type-workspace.context.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { customElement, css, html, state, property } from '@umbraco-cms/backoffice/external/lit';
+import { customElement, css, html, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
 @customElement('umb-block-grid-area-type-workspace-editor')
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts
index 4599a17cd889..192ba4d8460e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts
@@ -62,7 +62,7 @@ export class UmbBlockGridAreaTypeWorkspaceContext
 			{
 				path: 'create',
 				component: () => import('./block-grid-area-type-workspace-editor.element.js'),
-				setup: (component) => {
+				setup: () => {
 					this.create();
 				},
 			},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts
index d51e9efc2865..ac7c4f6a7da0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/block-type-workspace-editor.element.ts
@@ -1,6 +1,6 @@
 import { UMB_BLOCK_TYPE_WORKSPACE_CONTEXT } from './block-type-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { customElement, css, html, state, property } from '@umbraco-cms/backoffice/external/lit';
+import { customElement, css, html, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbRepositoryItemsManager } from '@umbraco-cms/backoffice/repository';
 import type { UmbDocumentTypeItemModel } from '@umbraco-cms/backoffice/document-type';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts
index 529074a07990..1b93118d2ba4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-workspace-editor.element.ts
@@ -1,6 +1,6 @@
 import { UMB_BLOCK_WORKSPACE_CONTEXT } from './index.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { customElement, css, html, property, state, nothing } from '@umbraco-cms/backoffice/external/lit';
+import { customElement, css, html, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace-editor.element.ts
index 5ff7d607e351..1e1c30458048 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/property-type-workspace-editor.element.ts
@@ -1,6 +1,6 @@
 import { UMB_PROPERTY_TYPE_WORKSPACE_CONTEXT } from './property-type-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { customElement, css, html, state, property } from '@umbraco-cms/backoffice/external/lit';
+import { customElement, css, html, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 @customElement('umb-property-type-workspace-editor')
 export class UmbPropertyTypeWorkspaceEditorElement extends UmbLitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/workspace/partial-view-folder-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/workspace/partial-view-folder-workspace-editor.element.ts
index 1c76b2e65468..a086ae2bda91 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/workspace/partial-view-folder-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/tree/folder/workspace/partial-view-folder-workspace-editor.element.ts
@@ -1,4 +1,3 @@
-import { UMB_PARTIAL_VIEW_FOLDER_WORKSPACE_ALIAS } from './constants.js';
 import { UMB_PARTIAL_VIEW_FOLDER_WORKSPACE_CONTEXT } from './partial-view-folder-workspace.context-token.js';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';

From 14ef1e7bd7ce8567b09c503b5f13a25f342fe10c Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 14:26:55 +0100
Subject: [PATCH 07/38] wip entity-detail-not-found

---
 .../entity-detail-not-found.element.ts        | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-not-found.element.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-not-found.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-not-found.element.ts
new file mode 100644
index 000000000000..2a497d7e3c5e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-not-found.element.ts
@@ -0,0 +1,47 @@
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
+import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+
+@customElement('umb-entity-detail-not-found')
+export class UmbEntityDetailNotFoundElement extends UmbLitElement {
+	override render() {
+		return html`
+			<div class="uui-text">
+				<h4><umb-localize key="routing_routeNotFoundTitle"></umb-localize></h4>
+				<umb-localize key="routing_routeNotFoundDescription"></umb-localize>
+			</div>
+		`;
+	}
+
+	static override styles = [
+		UmbTextStyles,
+		css`
+			:host {
+				display: block;
+				width: 100%;
+				height: 100%;
+				min-width: 0;
+			}
+
+			:host > div {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				height: 100%;
+			}
+
+			@keyframes fadeIn {
+				100% {
+					opacity: 100%;
+				}
+			}
+		`,
+	];
+}
+
+declare global {
+	interface HTMLElementTagNameMap {
+		'umb-entity-detail-not-found': UmbEntityDetailNotFoundElement;
+	}
+}

From 51c5fabe56b1530fe213a76ca7c7bf1e57324717 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 18:48:19 +0100
Subject: [PATCH 08/38] add loader property + loader bar

---
 .../core/components/body-layout/body-layout.element.ts        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts
index d18591b19359..a9a5ff2f5428 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/body-layout/body-layout.element.ts
@@ -37,6 +37,9 @@ export class UmbBodyLayoutElement extends LitElement {
 	@property({ type: Boolean, reflect: true, attribute: 'header-transparent' })
 	public headerTransparent = false;
 
+	@property({ type: Boolean })
+	loading = false;
+
 	@state()
 	private _headerSlotHasChildren = false;
 
@@ -116,6 +119,7 @@ export class UmbBodyLayoutElement extends LitElement {
 
 			<!-- This div should be changed for the uui-scroll-container when it gets updated -->
 			<div id="main">
+				${this.loading ? html`<uui-loader-bar></uui-loader-bar>` : nothing}
 				<slot></slot>
 			</div>
 

From b391d74e69ff5c8ef80e7df99fc1a2aa89e297d9 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 18:48:34 +0100
Subject: [PATCH 09/38] add loader property + loader bar

---
 .../components/workspace-editor/workspace-editor.element.ts  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
index 61620df0db7c..7b23377d0615 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-editor/workspace-editor.element.ts
@@ -32,6 +32,9 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
 	@property({ attribute: 'back-path' })
 	public backPath?: string;
 
+	@property({ type: Boolean })
+	public loading = false;
+
 	@state()
 	private _workspaceViews: Array<ManifestWorkspaceView> = [];
 
@@ -83,7 +86,7 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
 
 	override render() {
 		return html`
-			<umb-body-layout main-no-padding .headline=${this.headline}>
+			<umb-body-layout main-no-padding .headline=${this.headline} ?loading=${this.loading}>
 				${this.#renderBackButton()}
 				<slot name="header" slot="header"></slot>
 				${this.#renderViews()}

From 32883905307f656670bec80bc21535e447d266a7 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 18:49:51 +0100
Subject: [PATCH 10/38] add loading state manager to entity detail base

---
 .../entity-detail/entity-detail-workspace-base.ts      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
index 9fab0b692610..4ddf57c71390 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
@@ -12,6 +12,7 @@ import {
 import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { umbExtensionsRegistry, type ManifestRepository } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
+import { UmbStateManager } from '@umbraco-cms/backoffice/utils';
 
 export interface UmbEntityDetailWorkspaceContextArgs {
 	entityType: string;
@@ -46,6 +47,8 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
 	public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
 
+	public readonly loading = new UmbStateManager(this);
+
 	protected _getDataPromise?: Promise<any>;
 	protected _detailRepository?: DetailRepositoryType;
 
@@ -56,6 +59,8 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined));
 	readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined));
 
+	#loadingStateUnique = 'umbLoadingEntityDetail';
+
 	#initResolver?: () => void;
 	#initialized = false;
 
@@ -120,6 +125,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	}
 
 	async load(unique: string) {
+		this.loading.addState({ unique: this.#loadingStateUnique, message: 'Loading Entity Details' });
 		this.#entityContext.setEntityType(this.#entityType);
 		this.#entityContext.setUnique(unique);
 		await this.#init;
@@ -141,6 +147,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 			);
 		}
 
+		this.loading.removeState(this.#loadingStateUnique);
 		return response;
 	}
 
@@ -163,6 +170,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	 * @returns { Promise<any> | undefined } The data of the scaffold.
 	 */
 	async createScaffold(args: CreateArgsType) {
+		this.loading.addState({ unique: this.#loadingStateUnique, message: 'Creating entity scaffold' });
 		await this.#init;
 		this.resetState();
 		this.#parent.setValue(args.parent);
@@ -181,6 +189,8 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 		this._data.setPersisted(data);
 		this._data.setCurrent(data);
 
+		this.loading.removeState(this.#loadingStateUnique);
+
 		return data;
 	}
 

From 18c8527cd3aaa17e67563ccacf3c89f185af7142 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 18:50:01 +0100
Subject: [PATCH 11/38] add entity-detail editor incl loading state

---
 .../entity-detail-workspace.context-token.ts  |  6 ++++
 .../entity-detail-not-found.element.ts        |  0
 .../entity-detail-workspace-editor.element.ts | 34 +++++++++++++++++++
 .../entity-detail/global-components/index.ts  |  5 +++
 .../core/workspace/entity-detail/index.ts     |  3 ++
 .../src/packages/core/workspace/index.ts      |  3 ++
 .../data-type-workspace-editor.element.ts     |  4 +--
 7 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace.context-token.ts
 rename src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/{ => global-components}/entity-detail-not-found.element.ts (100%)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/index.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace.context-token.ts
new file mode 100644
index 000000000000..11679d3305a4
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace.context-token.ts
@@ -0,0 +1,6 @@
+import type { UmbEntityDetailWorkspaceContextBase } from './entity-detail-workspace-base.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+
+export const UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT = new UmbContextToken<UmbEntityDetailWorkspaceContextBase>(
+	'UmbWorkspaceContext',
+);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-not-found.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-not-found.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-not-found.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-not-found.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
new file mode 100644
index 000000000000..978895410e6c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
@@ -0,0 +1,34 @@
+import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
+import { UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT } from '../entity-detail-workspace.context-token.js';
+import { customElement, html, state } from '@umbraco-cms/backoffice/external/lit';
+
+@customElement('umb-entity-detail-workspace-editor')
+export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
+	#context?: typeof UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT.TYPE;
+
+	@state()
+	private _isLoading = false;
+
+	constructor() {
+		super();
+
+		this.consumeContext(UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT, (context) => {
+			this.#context = context;
+			this.observe(this.#context.loading.isOn, (isLoading) => {
+				this._isLoading = isLoading;
+			});
+		});
+	}
+
+	protected override render() {
+		return html`<umb-workspace-editor ?loading=${this._isLoading}>
+			<slot name="header" slot="header"></slot>
+		</umb-workspace-editor>`;
+	}
+}
+
+declare global {
+	interface HTMLElementTagNameMap {
+		'umb-entity-detail-workspace-editor': UmbEntityDetailWorkspaceEditorElement;
+	}
+}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/index.ts
new file mode 100644
index 000000000000..7090e22a42b6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/index.ts
@@ -0,0 +1,5 @@
+import './entity-detail-not-found.element';
+import './entity-detail-workspace-editor.element';
+
+export * from './entity-detail-not-found.element';
+export * from './entity-detail-workspace-editor.element';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/index.ts
index df254d21f0b9..9f5213daca0a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/index.ts
@@ -1 +1,4 @@
+import './global-components/index.js';
+
 export * from './entity-detail-workspace-base.js';
+export * from './global-components/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts
index 770523ca9967..d18c4a1451fa 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/index.ts
@@ -1,3 +1,5 @@
+import './entity-detail/global-components/index.js';
+
 export * from './components/index.js';
 export * from './conditions/const.js';
 export * from './contexts/index.js';
@@ -15,3 +17,4 @@ export * from './workspace.context-token.js';
 export * from './workspace.element.js';
 export type * from './conditions/index.js';
 export type * from './types.js';
+export * from './entity-detail/global-components/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
index 7456daa033c2..49ede5f33974 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace-editor.element.ts
@@ -17,9 +17,9 @@ export class UmbDataTypeWorkspaceEditorElement extends UmbLitElement {
 
 	override render() {
 		return html`
-			<umb-workspace-editor>
+			<umb-entity-detail-workspace-editor>
 				<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>
-			</umb-workspace-editor>
+			</umb-entity-detail-workspace-editor>
 		`;
 	}
 

From 2e85f92a2a49e06c7f29671148bd08e0d3410156 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 21:00:24 +0100
Subject: [PATCH 12/38] add localization keys

---
 src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
index 6f53119e1481..3cd822caf09d 100644
--- a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
+++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
@@ -359,6 +359,16 @@ export default {
 		blueprintDescription:
 			'A Document Blueprint is predefined content that an editor can select to use as the\n      basis for creating new content\n    ',
 	},
+	entityDetail: {
+		notFoundTitle: (entityType: string) => {
+			const entityName = entityType ?? 'Item';
+			return `${entityName} not found`;
+		},
+		notFoundDescription: (entityType: string) => {
+			const entityName = entityType ?? 'item';
+			return `The requested ${entityName} could not be found. Please check the URL and try again.`;
+		},
+	},
 	media: {
 		clickToUpload: 'Click to upload',
 		orClickHereToUpload: 'or click here to choose files',

From ad70dfa80f7d71ebb64ca8e0e6d49e84ea613d83 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 21:00:45 +0100
Subject: [PATCH 13/38] update keys

---
 .../global-components/entity-detail-not-found.element.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-not-found.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-not-found.element.ts
index 2a497d7e3c5e..13662f4a6145 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-not-found.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-not-found.element.ts
@@ -1,14 +1,17 @@
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
 @customElement('umb-entity-detail-not-found')
 export class UmbEntityDetailNotFoundElement extends UmbLitElement {
+	@property({ type: String, attribute: 'entity-type' })
+	entityType = '';
+
 	override render() {
 		return html`
 			<div class="uui-text">
-				<h4><umb-localize key="routing_routeNotFoundTitle"></umb-localize></h4>
-				<umb-localize key="routing_routeNotFoundDescription"></umb-localize>
+				<h4>${this.localize.term('entityDetail_notFoundTitle', this.entityType)}</h4>
+				${this.localize.term('entityDetail_notFoundDescription', this.entityType)}
 			</div>
 		`;
 	}

From be8ab4e3b20e9d5bf18b6163c89c8624da0d67e5 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 21:01:05 +0100
Subject: [PATCH 14/38] render error element

---
 .../entity-detail-workspace-editor.element.ts    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
index 978895410e6c..9006bb8ae096 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
@@ -6,21 +6,31 @@ import { customElement, html, state } from '@umbraco-cms/backoffice/external/lit
 export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
 	#context?: typeof UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT.TYPE;
 
+	@state()
+	private _entityType = '';
+
 	@state()
 	private _isLoading = false;
 
+	@state()
+	private _exists = false;
+
 	constructor() {
 		super();
 
 		this.consumeContext(UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT, (context) => {
 			this.#context = context;
-			this.observe(this.#context.loading.isOn, (isLoading) => {
-				this._isLoading = isLoading;
-			});
+			this.observe(this.#context?.entityType, (entityType) => (this._entityType = entityType));
+			this.observe(this.#context?.loading.isOn, (isLoading) => (this._isLoading = isLoading));
+			this.observe(this.#context?.data, (data) => (this._exists = !!data));
 		});
 	}
 
 	protected override render() {
+		if (!this._exists && !this._isLoading) {
+			return html`<umb-entity-detail-not-found entity-type=${this._entityType}></umb-entity-detail-not-found>`;
+		}
+
 		return html`<umb-workspace-editor ?loading=${this._isLoading}>
 			<slot name="header" slot="header"></slot>
 		</umb-workspace-editor>`;

From 00d50abe3dbb2b9d21d2f04e64b8596f8c7fe1c9 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Mon, 11 Nov 2024 21:07:09 +0100
Subject: [PATCH 15/38] clean up

---
 .../entity-detail-workspace-base.ts           | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
index 4ddf57c71390..b2112af66d68 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
@@ -43,18 +43,17 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	 */
 	protected readonly _data = new UmbEntityWorkspaceDataManager<DetailModelType>(this);
 
+	#entityContext = new UmbEntityContext(this);
+	public readonly entityType = this.#entityContext.entityType;
+	public readonly unique = this.#entityContext.unique;
+
 	public readonly data = this._data.current;
-	public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
-	public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
 
 	public readonly loading = new UmbStateManager(this);
 
 	protected _getDataPromise?: Promise<any>;
 	protected _detailRepository?: DetailRepositoryType;
 
-	#entityContext = new UmbEntityContext(this);
-	#entityType: string;
-
 	#parent = new UmbObjectState<{ entityType: string; unique: UmbEntityUnique } | undefined>(undefined);
 	readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined));
 	readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined));
@@ -74,8 +73,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 
 	constructor(host: UmbControllerHost, args: UmbEntityWorkspaceContextArgs) {
 		super(host, args.workspaceAlias);
-		this.#entityType = args.entityType;
-		this.#entityContext.setEntityType(this.#entityType);
+		this.#entityContext.setEntityType(args.entityType);
 		window.addEventListener('willchangestate', this.#onWillNavigate);
 		this.#observeRepository(args.detailRepositoryAlias);
 	}
@@ -85,7 +83,9 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	 * @returns { string } The entity type
 	 */
 	getEntityType(): string {
-		return this.#entityType;
+		const entityType = this.#entityContext.getEntityType();
+		if (!entityType) throw new Error('Entity type is not set');
+		return entityType;
 	}
 
 	/**
@@ -125,9 +125,8 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	}
 
 	async load(unique: string) {
-		this.loading.addState({ unique: this.#loadingStateUnique, message: 'Loading Entity Details' });
-		this.#entityContext.setEntityType(this.#entityType);
 		this.#entityContext.setUnique(unique);
+		this.loading.addState({ unique: this.#loadingStateUnique, message: 'Loading Entity Details' });
 		await this.#init;
 		this.resetState();
 		this._getDataPromise = this._detailRepository!.requestByUnique(unique);
@@ -177,17 +176,18 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 		const request = this._detailRepository!.createScaffold(args.preset);
 		this._getDataPromise = request;
 		let { data } = await request;
-		if (!data) return undefined;
 
-		this.#entityContext.setEntityType(this.#entityType);
-		this.#entityContext.setUnique(data.unique);
+		if (data) {
+			this.#entityContext.setUnique(data.unique);
 
-		if (this.modalContext) {
-			data = { ...data, ...this.modalContext.data.preset };
+			if (this.modalContext) {
+				data = { ...data, ...this.modalContext.data.preset };
+			}
+
+			this.setIsNew(true);
+			this._data.setPersisted(data);
+			this._data.setCurrent(data);
 		}
-		this.setIsNew(true);
-		this._data.setPersisted(data);
-		this._data.setCurrent(data);
 
 		this.loading.removeState(this.#loadingStateUnique);
 

From df6fe95bcb9c8c7b54f3f9bf687b61325c213d48 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 19:59:55 +0100
Subject: [PATCH 16/38] add language root workspace path pattern

---
 .../packages/language/workspace/language-root/paths.ts    | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/paths.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/paths.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/paths.ts
new file mode 100644
index 000000000000..14a5d2c8ccc5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/paths.ts
@@ -0,0 +1,8 @@
+import { UMB_SETTINGS_SECTION_PATHNAME } from '@umbraco-cms/backoffice/settings';
+import { UMB_WORKSPACE_PATH_PATTERN } from '@umbraco-cms/backoffice/workspace';
+import { UMB_LANGUAGE_ROOT_ENTITY_TYPE } from '../../entity';
+
+export const UMB_LANGUAGE_ROOT_WORKSPACE_PATH = UMB_WORKSPACE_PATH_PATTERN.generateAbsolute({
+	sectionName: UMB_SETTINGS_SECTION_PATHNAME,
+	entityType: UMB_LANGUAGE_ROOT_ENTITY_TYPE,
+});

From cf993c11485f23998af5d4f2081f6fce38b90c1d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 20:00:19 +0100
Subject: [PATCH 17/38] use entity detail workspace editor element

---
 .../language/language-workspace-editor.element.ts        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
index 64c379d4ab3a..c0c81b8438bb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
@@ -2,6 +2,7 @@ import { UMB_LANGUAGE_WORKSPACE_CONTEXT } from './language-workspace.context-tok
 import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
+import { UMB_LANGUAGE_ROOT_WORKSPACE_PATH } from '../language-root/paths.js';
 @customElement('umb-language-workspace-editor')
 export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
 	#workspaceContext?: typeof UMB_LANGUAGE_WORKSPACE_CONTEXT.TYPE;
@@ -9,6 +10,10 @@ export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	_isNew?: boolean;
 
+	#getBackPath() {
+		return UMB_LANGUAGE_ROOT_WORKSPACE_PATH;
+	}
+
 	constructor() {
 		super();
 
@@ -19,11 +24,11 @@ export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		return html`<umb-workspace-editor back-path="section/settings/workspace/language-root">
+		return html`<umb-entity-detail-workspace-editor .backPath=${this.#getBackPath()}>
 			${this._isNew
 				? html`<h3 slot="header">Add language</h3>`
 				: html`<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>`}
-		</umb-workspace-editor>`;
+		</umb-entity-detail-workspace-editor>`;
 	}
 
 	static override styles = [UmbTextStyles];

From 0a4b07b320751c286bb29e5974e6351c05498624 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 20:00:41 +0100
Subject: [PATCH 18/38] pass backPath property

---
 .../entity-detail-workspace-editor.element.ts            | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
index 9006bb8ae096..100e3a9527db 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
@@ -1,10 +1,11 @@
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT } from '../entity-detail-workspace.context-token.js';
-import { customElement, html, state } from '@umbraco-cms/backoffice/external/lit';
+import { customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit';
 
 @customElement('umb-entity-detail-workspace-editor')
 export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
-	#context?: typeof UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT.TYPE;
+	@property({ attribute: 'back-path' })
+	public backPath?: string;
 
 	@state()
 	private _entityType = '';
@@ -15,6 +16,8 @@ export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	private _exists = false;
 
+	#context?: typeof UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT.TYPE;
+
 	constructor() {
 		super();
 
@@ -31,7 +34,7 @@ export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
 			return html`<umb-entity-detail-not-found entity-type=${this._entityType}></umb-entity-detail-not-found>`;
 		}
 
-		return html`<umb-workspace-editor ?loading=${this._isLoading}>
+		return html`<umb-workspace-editor ?loading=${this._isLoading} .backPath=${this.backPath}>
 			<slot name="header" slot="header"></slot>
 		</umb-workspace-editor>`;
 	}

From 6bb416956691c3df857083ad183b612fc89e0df6 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 20:19:46 +0100
Subject: [PATCH 19/38] use entity detail editor for user workspace

---
 .../entity-detail-workspace-editor.element.ts              | 2 ++
 .../user/workspace/user/user-workspace-editor.element.ts   | 6 ++----
 .../user/user/workspace/user/user-workspace.context.ts     | 7 ++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
index 100e3a9527db..c1b6d4e83feb 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
@@ -36,6 +36,8 @@ export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
 
 		return html`<umb-workspace-editor ?loading=${this._isLoading} .backPath=${this.backPath}>
 			<slot name="header" slot="header"></slot>
+			<slot name="action-menu" slot="action-menu"></slot>
+			<slot></slot>
 		</umb-workspace-editor>`;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
index 14346584fc4d..61a240b1ef30 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
@@ -35,16 +35,14 @@ export class UmbUserWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		if (!this._user) return html`User not found`;
-
 		return html`
-			<umb-workspace-editor class="uui-text" back-path=${UMB_USER_ROOT_WORKSPACE_PATH}>
+			<umb-entity-detail-workspace-editor class="uui-text" .backPath=${UMB_USER_ROOT_WORKSPACE_PATH}>
 				${this.#renderHeader()}
 				<div id="main">
 					<div id="left-column">${this.#renderLeftColumn()}</div>
 					<div id="right-column">${this.#renderRightColumn()}</div>
 				</div>
-			</umb-workspace-editor>
+			</umb-entity-detail-workspace-editor>
 		`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace.context.ts
index 5b0d7572db0e..8d0b4c3a1e9d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace.context.ts
@@ -82,12 +82,9 @@ export class UmbUserWorkspaceContext
 		There might be a less manual way to do this.
 	*/
 	onUserStoreChanges(user: EntityType | undefined) {
-		if (!user) {
-			//TODO: This solution is alright for now. But reconsider when we introduce signal-r
-			history.pushState(null, '', 'section/user-management');
-			return;
+		if (user) {
+			this._data.updateCurrent({ state: user.state, avatarUrls: user.avatarUrls });
 		}
-		this._data.updateCurrent({ state: user.state, avatarUrls: user.avatarUrls });
 	}
 
 	getState(): UmbUserStateEnum | null | undefined {

From fd7fd93825e0de6f38b6e1050f3a8718bd4f5893 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 20:20:35 +0100
Subject: [PATCH 20/38] simplify

---
 .../workspace/language/language-workspace-editor.element.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
index c0c81b8438bb..bb6b6c4dcfd1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
@@ -10,10 +10,6 @@ export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	_isNew?: boolean;
 
-	#getBackPath() {
-		return UMB_LANGUAGE_ROOT_WORKSPACE_PATH;
-	}
-
 	constructor() {
 		super();
 
@@ -24,7 +20,7 @@ export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		return html`<umb-entity-detail-workspace-editor .backPath=${this.#getBackPath()}>
+		return html`<umb-entity-detail-workspace-editor .backPath=${UMB_LANGUAGE_ROOT_WORKSPACE_PATH}>
 			${this._isNew
 				? html`<h3 slot="header">Add language</h3>`
 				: html`<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>`}

From 0aec36ac7a1dc5aa27262d1d252b137dc8a1953f Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 21:37:24 +0100
Subject: [PATCH 21/38] add default value

---
 .../workspace/entity-detail/entity-detail-workspace-base.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
index b2112af66d68..f859819373b0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
@@ -31,7 +31,7 @@ export interface UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType> {
 }
 
 export abstract class UmbEntityDetailWorkspaceContextBase<
-	DetailModelType extends UmbEntityModel,
+	DetailModelType extends UmbEntityModel = UmbEntityModel,
 	DetailRepositoryType extends UmbDetailRepository<DetailModelType> = UmbDetailRepository<DetailModelType>,
 	CreateArgsType extends
 		UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType> = UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType>,

From af0b0de4c2eed3cbcd601fe381ba2927baa72928 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 21:42:13 +0100
Subject: [PATCH 22/38] add descriminator

---
 .../entity-detail/entity-detail-workspace-base.ts         | 4 +++-
 .../entity-detail-workspace.context-token.ts              | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
index f859819373b0..863a924a5769 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
@@ -36,6 +36,9 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	CreateArgsType extends
 		UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType> = UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType>,
 > extends UmbSubmittableWorkspaceContextBase<DetailModelType> {
+	// Just for context token safety:
+	public readonly IS_ENTITY_DETAIL_WORKSPACE_CONTEXT = true;
+
 	/**
 	 * @description Data manager for the workspace.
 	 * @protected
@@ -48,7 +51,6 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	public readonly unique = this.#entityContext.unique;
 
 	public readonly data = this._data.current;
-
 	public readonly loading = new UmbStateManager(this);
 
 	protected _getDataPromise?: Promise<any>;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace.context-token.ts
index 11679d3305a4..a548bbb3411a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace.context-token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace.context-token.ts
@@ -1,6 +1,12 @@
+import type { UmbWorkspaceContext } from '../workspace-context.interface.js';
 import type { UmbEntityDetailWorkspaceContextBase } from './entity-detail-workspace-base.js';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 
-export const UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT = new UmbContextToken<UmbEntityDetailWorkspaceContextBase>(
+export const UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT = new UmbContextToken<
+	UmbWorkspaceContext,
+	UmbEntityDetailWorkspaceContextBase
+>(
 	'UmbWorkspaceContext',
+	undefined,
+	(context): context is UmbEntityDetailWorkspaceContextBase => (context as any).IS_ENTITY_DETAIL_WORKSPACE_CONTEXT,
 );

From 8111a0f2f91f632e42b6c4f4b20ccd8715b4e6b7 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 21:42:25 +0100
Subject: [PATCH 23/38] add null check

---
 .../entity-detail-workspace-editor.element.ts              | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
index c1b6d4e83feb..720afb74a656 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
@@ -1,6 +1,6 @@
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT } from '../entity-detail-workspace.context-token.js';
-import { customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit';
+import { customElement, html, ifDefined, property, state } from '@umbraco-cms/backoffice/external/lit';
 
 @customElement('umb-entity-detail-workspace-editor')
 export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
@@ -8,7 +8,7 @@ export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
 	public backPath?: string;
 
 	@state()
-	private _entityType = '';
+	private _entityType?: string;
 
 	@state()
 	private _isLoading = false;
@@ -31,7 +31,8 @@ export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
 
 	protected override render() {
 		if (!this._exists && !this._isLoading) {
-			return html`<umb-entity-detail-not-found entity-type=${this._entityType}></umb-entity-detail-not-found>`;
+			return html`<umb-entity-detail-not-found
+				entity-type=${ifDefined(this._entityType)}></umb-entity-detail-not-found>`;
 		}
 
 		return html`<umb-workspace-editor ?loading=${this._isLoading} .backPath=${this.backPath}>

From 22bfae8c3b41f2be145ad09b180b9fbde574b730 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 21:55:42 +0100
Subject: [PATCH 24/38] add todo

---
 .../src/packages/core/workspace/workspace-context.interface.ts  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts
index 578ff818a0bb..75feb04b5223 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts
@@ -1,6 +1,8 @@
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
+import type { Observable } from '@umbraco-cms/backoffice/observable-api';
 
 export interface UmbWorkspaceContext extends UmbApi {
 	readonly workspaceAlias: string;
 	getEntityType(): string;
+	// TODO: add entityType observable
 }

From b80bd6b58d8b1c197b667929987f5f3599d4cb63 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 21:55:49 +0100
Subject: [PATCH 25/38] observe unique

---
 .../workspace-entity-action-menu.element.ts         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts
index d7647ae8064d..897d37068f64 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-entity-action-menu/workspace-entity-action-menu.element.ts
@@ -26,16 +26,15 @@ export class UmbWorkspaceEntityActionMenuElement extends UmbLitElement {
 
 		this.consumeContext(UMB_ENTITY_WORKSPACE_CONTEXT, (context) => {
 			this._workspaceContext = context;
-			this._observeInfo();
+			this.observe(this._workspaceContext.unique, (unique) => {
+				this._unique = unique;
+				// TODO: the context does not have an observable for the entity type, so we need to use the
+				// getEntityType method until we can add an observable for it.
+				this._entityType = this._workspaceContext?.getEntityType();
+			});
 		});
 	}
 
-	private _observeInfo() {
-		if (!this._workspaceContext) return;
-		this._unique = this._workspaceContext.getUnique();
-		this._entityType = this._workspaceContext.getEntityType();
-	}
-
 	#onActionExecuted(event: UmbActionExecutedEvent) {
 		event.stopPropagation();
 

From f619428b1a083a33cb5aaa449db99143692955a7 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 21:58:04 +0100
Subject: [PATCH 26/38] fix lint errors

---
 .../workspace/entity-detail/global-components/index.ts    | 8 ++++----
 .../core/workspace/workspace-context.interface.ts         | 1 -
 .../packages/language/workspace/language-root/paths.ts    | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/index.ts
index 7090e22a42b6..e6c2301b73fc 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/index.ts
@@ -1,5 +1,5 @@
-import './entity-detail-not-found.element';
-import './entity-detail-workspace-editor.element';
+import './entity-detail-not-found.element.js';
+import './entity-detail-workspace-editor.element.js';
 
-export * from './entity-detail-not-found.element';
-export * from './entity-detail-workspace-editor.element';
+export * from './entity-detail-not-found.element.js';
+export * from './entity-detail-workspace-editor.element.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts
index 75feb04b5223..96690b0d2ad6 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts
@@ -1,5 +1,4 @@
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
-import type { Observable } from '@umbraco-cms/backoffice/observable-api';
 
 export interface UmbWorkspaceContext extends UmbApi {
 	readonly workspaceAlias: string;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/paths.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/paths.ts
index 14a5d2c8ccc5..67151808ab5c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/paths.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language-root/paths.ts
@@ -1,6 +1,6 @@
 import { UMB_SETTINGS_SECTION_PATHNAME } from '@umbraco-cms/backoffice/settings';
 import { UMB_WORKSPACE_PATH_PATTERN } from '@umbraco-cms/backoffice/workspace';
-import { UMB_LANGUAGE_ROOT_ENTITY_TYPE } from '../../entity';
+import { UMB_LANGUAGE_ROOT_ENTITY_TYPE } from '../../entity.js';
 
 export const UMB_LANGUAGE_ROOT_WORKSPACE_PATH = UMB_WORKSPACE_PATH_PATTERN.generateAbsolute({
 	sectionName: UMB_SETTINGS_SECTION_PATHNAME,

From 26c5b3523686b7477ad34233862bd0110287186b Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 22:07:59 +0100
Subject: [PATCH 27/38] render entity actions in entity-detail-editor

---
 .../entity-detail-workspace-editor.element.ts       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
index 720afb74a656..35996d27c32b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
@@ -1,6 +1,6 @@
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT } from '../entity-detail-workspace.context-token.js';
-import { customElement, html, ifDefined, property, state } from '@umbraco-cms/backoffice/external/lit';
+import { customElement, html, ifDefined, nothing, property, state } from '@umbraco-cms/backoffice/external/lit';
 
 @customElement('umb-entity-detail-workspace-editor')
 export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
@@ -16,6 +16,9 @@ export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
 	@state()
 	private _exists = false;
 
+	@state()
+	private _isNew? = false;
+
 	#context?: typeof UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT.TYPE;
 
 	constructor() {
@@ -26,6 +29,7 @@ export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
 			this.observe(this.#context?.entityType, (entityType) => (this._entityType = entityType));
 			this.observe(this.#context?.loading.isOn, (isLoading) => (this._isLoading = isLoading));
 			this.observe(this.#context?.data, (data) => (this._exists = !!data));
+			this.observe(this.#context?.isNew, (isNew) => (this._isNew = isNew));
 		});
 	}
 
@@ -37,10 +41,15 @@ export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
 
 		return html`<umb-workspace-editor ?loading=${this._isLoading} .backPath=${this.backPath}>
 			<slot name="header" slot="header"></slot>
-			<slot name="action-menu" slot="action-menu"></slot>
+			${this.#renderEntityActions()}
 			<slot></slot>
 		</umb-workspace-editor>`;
 	}
+
+	#renderEntityActions() {
+		if (this._isNew) return nothing;
+		return html`<umb-workspace-entity-action-menu slot="action-menu"></umb-workspace-entity-action-menu>`;
+	}
 }
 
 declare global {

From 583506409d6004501d54824755ea006ff05e310a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 22:08:10 +0100
Subject: [PATCH 28/38] implement editor

---
 .../language/language-workspace-editor.element.ts         | 2 +-
 .../user-group/user-group-workspace-editor.element.ts     | 8 ++------
 .../user/workspace/user/user-workspace-editor.element.ts  | 5 +----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
index bb6b6c4dcfd1..c7fa01b792b9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/language/workspace/language/language-workspace-editor.element.ts
@@ -23,7 +23,7 @@ export class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
 		return html`<umb-entity-detail-workspace-editor .backPath=${UMB_LANGUAGE_ROOT_WORKSPACE_PATH}>
 			${this._isNew
 				? html`<h3 slot="header">Add language</h3>`
-				: html`<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>`}
+				: html`<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable> `}
 		</umb-entity-detail-workspace-editor>`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
index c335e070a7eb..faad3211aee1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
@@ -168,12 +168,10 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		if (!this._unique) return nothing;
-
 		return html`
-			<umb-workspace-editor class="uui-text" back-path=${UMB_USER_GROUP_ROOT_WORKSPACE_PATH}>
+			<umb-entity-detail-workspace-editor class="uui-text" back-path=${UMB_USER_GROUP_ROOT_WORKSPACE_PATH}>
 				${this.#renderHeader()} ${this.#renderMain()}
-			</umb-workspace-editor>
+			</umb-entity-detail-workspace-editor>
 		`;
 	}
 
@@ -219,8 +217,6 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 					${umbFocus()}>
 				</umb-input-with-alias>
 			</div>
-
-			<umb-workspace-entity-action-menu slot="action-menu"></umb-workspace-entity-action-menu>
 		`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
index 61a240b1ef30..db74c4e2a4db 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user/user-workspace-editor.element.ts
@@ -47,10 +47,7 @@ export class UmbUserWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	#renderHeader() {
-		return html`
-			<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>
-			<umb-workspace-entity-action-menu slot="action-menu"></umb-workspace-entity-action-menu>
-		`;
+		return html` <umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>`;
 	}
 
 	#renderLeftColumn() {

From c0e665e38c2b8aa85b31cc85d9817f62191932a3 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 22:13:10 +0100
Subject: [PATCH 29/38] clean up member group

---
 .../member-group-workspace-editor.element.ts  | 28 ++-----------------
 .../member-group-workspace.context.ts         | 18 ------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts
index 7ac43079ade5..1aa09ae07ac2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts
@@ -6,35 +6,11 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
 @customElement('umb-member-group-workspace-editor')
 export class UmbMemberGroupWorkspaceEditorElement extends UmbLitElement {
-	@state()
-	private _unique?: string;
-
-	#workspaceContext?: typeof UMB_MEMBER_GROUP_WORKSPACE_CONTEXT.TYPE;
-
-	constructor() {
-		super();
-
-		this.consumeContext(UMB_MEMBER_GROUP_WORKSPACE_CONTEXT, (workspaceContext) => {
-			this.#workspaceContext = workspaceContext;
-			if (!this.#workspaceContext) return;
-			this.observe(this.#workspaceContext.unique, (unique) => (this._unique = unique ?? undefined));
-		});
-	}
-
-	#renderActions() {
-		// Actions only works if we have a valid unique.
-		if (!this._unique || this.#workspaceContext?.getIsNew()) return nothing;
-
-		return html`<umb-workspace-entity-action-menu slot="action-menu"></umb-workspace-entity-action-menu>`;
-	}
-
 	override render() {
 		return html`
-			<umb-workspace-editor back-path=${UMB_MEMBER_GROUP_ROOT_WORKSPACE_PATH}>
+			<umb-entity-detail-workspace-editor .backPath=${UMB_MEMBER_GROUP_ROOT_WORKSPACE_PATH}>
 				<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>
-				${this.#renderActions()}
-				<umb-workspace-entity-action-menu slot="action-menu"></umb-workspace-entity-action-menu>
-			</umb-workspace-editor>
+			</umb-entity-detail-workspace-editor>
 		`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace.context.ts
index 7b8c8f56870c..cfd7df9b5795 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace.context.ts
@@ -50,24 +50,6 @@ export class UmbMemberGroupWorkspaceContext
 		]);
 	}
 
-	override async load(unique: string) {
-		const response = await super.load(unique);
-
-		this.observe(
-			response.asObservable?.(),
-			(memberGroup) => this.#onMemberGroupStoreChange(memberGroup),
-			'umbMemberGroupStoreObserver',
-		);
-
-		return response;
-	}
-
-	#onMemberGroupStoreChange(memberGroup: UmbMemberGroupDetailModel | undefined) {
-		if (!memberGroup) {
-			history.pushState(null, '', 'section/member-management/view/member-groups');
-		}
-	}
-
 	getName() {
 		return this._data.getCurrent()?.name;
 	}

From d5b52448ca422cf534413bb3348d90512b7748e7 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 22:16:02 +0100
Subject: [PATCH 30/38] use new editor

---
 .../workspace/dictionary-workspace-editor.element.ts          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts
index 68314a229646..18529e2e86fd 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace-editor.element.ts
@@ -6,9 +6,9 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 export class UmbDictionaryWorkspaceEditorElement extends UmbLitElement {
 	override render() {
 		return html`
-			<umb-workspace-editor back-path=${UMB_DICTIONARY_OVERVIEW_DASHBOARD_PATH}>
+			<umb-entity-detail-workspace-editor .backPath=${UMB_DICTIONARY_OVERVIEW_DASHBOARD_PATH}>
 				<umb-workspace-header-name-editable slot="header"></umb-workspace-header-name-editable>
-			</umb-workspace-editor>
+			</umb-entity-detail-workspace-editor>
 		`;
 	}
 }

From 49f376e209c9fc2b97a589e115e86d4d0d5bde1f Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 22:19:14 +0100
Subject: [PATCH 31/38] use new editor

---
 .../workspace/webhook/webhook-workspace-editor.element.ts    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/workspace/webhook/webhook-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/workspace/webhook/webhook-workspace-editor.element.ts
index 1f190a1b04f4..6532bb03aa7c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/webhook/workspace/webhook/webhook-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/workspace/webhook/webhook-workspace-editor.element.ts
@@ -4,7 +4,10 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 @customElement('umb-webhook-workspace-editor')
 export class UmbWebhookWorkspaceEditorElement extends UmbLitElement {
 	override render() {
-		return html` <umb-workspace-editor back-path="section/settings/workspace/webhook-root"></umb-workspace-editor> `;
+		return html`
+			<umb-entity-detail-workspace-editor
+				back-path="section/settings/workspace/webhook-root"></umb-entity-detail-workspace-editor>
+		`;
 	}
 
 	static override styles = [UmbTextStyles];

From 921e3b8695d719f6a7f60d1beba2e6c11aace576 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 22:26:38 +0100
Subject: [PATCH 32/38] remove unused

---
 .../member-group/member-group-workspace-editor.element.ts      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts
index 1aa09ae07ac2..50ce0fd57106 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts
@@ -1,7 +1,6 @@
 import { UMB_MEMBER_GROUP_ROOT_WORKSPACE_PATH } from '../../paths.js';
-import { UMB_MEMBER_GROUP_WORKSPACE_CONTEXT } from './member-group-workspace.context-token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 
 @customElement('umb-member-group-workspace-editor')

From ce9548e7b8aca2ee1f117459ec98364b247b3798 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 12 Nov 2024 22:44:44 +0100
Subject: [PATCH 33/38] use new editor

---
 .../workspace/partial-view-workspace-editor.element.ts       | 5 ++---
 .../scripts/workspace/script-workspace-editor.element.ts     | 5 ++---
 .../templates/workspace/template-workspace-editor.element.ts | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts
index b7307edf859b..f5a7e79e8ea1 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace-editor.element.ts
@@ -77,9 +77,8 @@ export class UmbPartialViewWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		if (this._isNew === undefined) return;
 		return html`
-			<umb-workspace-editor>
+			<umb-entity-detail-workspace-editor>
 				<div id="workspace-header" slot="header">
 					<uui-input
 						placeholder=${this.localize.term('placeholders_entername')}
@@ -103,7 +102,7 @@ export class UmbPartialViewWorkspaceEditorElement extends UmbLitElement {
 					</div>
 					${this.#renderCodeEditor()}
 				</uui-box>
-			</umb-workspace-editor>
+			</umb-entity-detail-workspace-editor>
 		`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts
index 52b5880fb024..461790808780 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace-editor.element.ts
@@ -52,9 +52,8 @@ export class UmbScriptWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	override render() {
-		if (this._isNew === undefined) return;
 		return html`
-			<umb-workspace-editor>
+			<umb-entity-detail-workspace-editor>
 				<div id="workspace-header" slot="header">
 					<uui-input
 						placeholder=${this.localize.term('placeholders_entername')}
@@ -70,7 +69,7 @@ export class UmbScriptWorkspaceEditorElement extends UmbLitElement {
 					<div slot="header"></div>
 					${this.#renderCodeEditor()}
 				</uui-box>
-			</umb-workspace-editor>
+			</umb-entity-detail-workspace-editor>
 		`;
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
index a883906a8345..3fb1a5563542 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace-editor.element.ts
@@ -160,7 +160,7 @@ export class UmbTemplateWorkspaceEditorElement extends UmbLitElement {
 	override render() {
 		// TODO: add correct UI elements
 		return html`
-			<umb-workspace-editor>
+			<umb-entity-detail-workspace-editor>
 				<umb-input-with-alias
 					slot="header"
 					id="name"
@@ -195,7 +195,7 @@ export class UmbTemplateWorkspaceEditorElement extends UmbLitElement {
 
 					${this.#renderCodeEditor()}
 				</uui-box>
-			</umb-workspace-editor>
+			</umb-entity-detail-workspace-editor>
 		`;
 	}
 

From a327baf9655a6d5c738b1118d88c72742bb210f1 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 13 Nov 2024 15:19:23 +0100
Subject: [PATCH 34/38] temp hide the editor instead of removing it

---
 .../entity-detail-workspace-editor.element.ts | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
index 35996d27c32b..8add4ff8b902 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.ts
@@ -1,6 +1,6 @@
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UMB_ENTITY_DETAIL_WORKSPACE_CONTEXT } from '../entity-detail-workspace.context-token.js';
-import { customElement, html, ifDefined, nothing, property, state } from '@umbraco-cms/backoffice/external/lit';
+import { css, customElement, html, ifDefined, nothing, property, state } from '@umbraco-cms/backoffice/external/lit';
 
 @customElement('umb-entity-detail-workspace-editor')
 export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
@@ -34,22 +34,40 @@ export class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
 	}
 
 	protected override render() {
-		if (!this._exists && !this._isLoading) {
-			return html`<umb-entity-detail-not-found
-				entity-type=${ifDefined(this._entityType)}></umb-entity-detail-not-found>`;
-		}
-
-		return html`<umb-workspace-editor ?loading=${this._isLoading} .backPath=${this.backPath}>
-			<slot name="header" slot="header"></slot>
-			${this.#renderEntityActions()}
-			<slot></slot>
-		</umb-workspace-editor>`;
+		return html` ${!this._exists && !this._isLoading
+				? html`<umb-entity-detail-not-found entity-type=${ifDefined(this._entityType)}></umb-entity-detail-not-found>`
+				: nothing}
+
+			<!-- TODO: It is currently on purpose that the workspace editor is always in the DOM, even when it doesn't have data. 
+			 We currently rely on the entity actions to be available to execute, and we ran into an issue when the entity got deleted; then the DOM got cleared, and the delete action couldn't complete. 
+			 We need to look into loading the entity actions in the workspace context instead so we don't rely on the DOM.
+		 -->
+			<umb-workspace-editor
+				?loading=${this._isLoading}
+				.backPath=${this.backPath}
+				class="${this._exists === false ? 'hide' : ''}">
+				<slot name="header" slot="header"></slot>
+				${this.#renderEntityActions()}
+				<slot></slot>
+			</umb-workspace-editor>`;
 	}
 
 	#renderEntityActions() {
 		if (this._isNew) return nothing;
 		return html`<umb-workspace-entity-action-menu slot="action-menu"></umb-workspace-entity-action-menu>`;
 	}
+
+	static override styles = [
+		css`
+			umb-workspace-editor {
+				visibility: visible;
+			}
+
+			umb-workspace-editor.hide {
+				visibility: hidden;
+			}
+		`,
+	];
 }
 
 declare global {

From 39b9b98540c5b3a3425c7bf0a1cb72818ec7405a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 13 Nov 2024 15:23:28 +0100
Subject: [PATCH 35/38] update message

---
 .../workspace/entity-detail/entity-detail-workspace-base.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
index 863a924a5769..0f8e27d3b992 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
@@ -128,7 +128,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 
 	async load(unique: string) {
 		this.#entityContext.setUnique(unique);
-		this.loading.addState({ unique: this.#loadingStateUnique, message: 'Loading Entity Details' });
+		this.loading.addState({ unique: this.#loadingStateUnique, message: `Loading ${this.getEntityType()} Details` });
 		await this.#init;
 		this.resetState();
 		this._getDataPromise = this._detailRepository!.requestByUnique(unique);
@@ -171,7 +171,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	 * @returns { Promise<any> | undefined } The data of the scaffold.
 	 */
 	async createScaffold(args: CreateArgsType) {
-		this.loading.addState({ unique: this.#loadingStateUnique, message: 'Creating entity scaffold' });
+		this.loading.addState({ unique: this.#loadingStateUnique, message: `Creating ${this.getEntityType()} scaffold` });
 		await this.#init;
 		this.resetState();
 		this.#parent.setValue(args.parent);

From f6aa21c5aa7eabb66fae8cfa366bec1cca348f44 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Fri, 15 Nov 2024 08:38:28 +0100
Subject: [PATCH 36/38] remove unused import

---
 .../block/block-list/context/block-list-entries.context.ts       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entries.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entries.context.ts
index f9f15b699a81..f381f7d00b76 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entries.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/context/block-list-entries.context.ts
@@ -8,7 +8,6 @@ import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
-import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
 
 export class UmbBlockListEntriesContext extends UmbBlockEntriesContext<
 	typeof UMB_BLOCK_LIST_MANAGER_CONTEXT,

From dd5311e855ca7ab4c5854a947cd451833f85c48d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 19 Nov 2024 08:33:00 +0100
Subject: [PATCH 37/38] Update workspace-context.interface.ts

---
 .../src/packages/core/workspace/workspace-context.interface.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts
index 96690b0d2ad6..941c7a064ca5 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context.interface.ts
@@ -3,5 +3,6 @@ import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
 export interface UmbWorkspaceContext extends UmbApi {
 	readonly workspaceAlias: string;
 	getEntityType(): string;
+	// TODO: Consider if its more right to make a new interface for UmbEntityWorkspaceContext, cause this on might be intended for the extension type Workspace Context
 	// TODO: add entityType observable
 }

From cad2d7095287e784a5074abf1a9435bab57493ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Tue, 19 Nov 2024 08:49:47 +0100
Subject: [PATCH 38/38] minor refactor

---
 .../entity-detail-workspace-base.ts           | 33 +++++--------------
 .../core/workspace/entity-detail/index.ts     |  1 +
 .../core/workspace/entity-detail/types.ts     | 17 ++++++++++
 3 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/types.ts

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
index 36d957d6dea7..bcb4b29eef42 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
@@ -1,5 +1,6 @@
 import { UmbSubmittableWorkspaceContextBase } from '../submittable/index.js';
 import { UmbEntityWorkspaceDataManager } from '../entity/entity-workspace-data-manager.js';
+import type { UmbEntityDetailWorkspaceContextArgs, UmbEntityDetailWorkspaceContextCreateArgs } from './types.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbEntityContext, type UmbEntityModel, type UmbEntityUnique } from '@umbraco-cms/backoffice/entity';
@@ -14,21 +15,7 @@ import { umbExtensionsRegistry, type ManifestRepository } from '@umbraco-cms/bac
 import type { UmbDetailRepository } from '@umbraco-cms/backoffice/repository';
 import { UmbStateManager } from '@umbraco-cms/backoffice/utils';
 
-export interface UmbEntityDetailWorkspaceContextArgs {
-	entityType: string;
-	workspaceAlias: string;
-	detailRepositoryAlias: string;
-}
-
-/**
- * @deprecated Use UmbEntityDetailWorkspaceContextArgs instead
- */
-export type UmbEntityWorkspaceContextArgs = UmbEntityDetailWorkspaceContextArgs;
-
-export interface UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType> {
-	parent: UmbEntityModel;
-	preset?: Partial<DetailModelType>;
-}
+const LOADING_STATE_UNIQUE = 'umbLoadingEntityDetail';
 
 export abstract class UmbEntityDetailWorkspaceContextBase<
 	DetailModelType extends UmbEntityModel = UmbEntityModel,
@@ -62,8 +49,6 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 		parent ? parent.entityType : undefined,
 	);
 
-	#loadingStateUnique = 'umbLoadingEntityDetail';
-
 	#initResolver?: () => void;
 	#initialized = false;
 
@@ -138,7 +123,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 
 	async load(unique: string) {
 		this.#entityContext.setUnique(unique);
-		this.loading.addState({ unique: this.#loadingStateUnique, message: `Loading ${this.getEntityType()} Details` });
+		this.loading.addState({ unique: LOADING_STATE_UNIQUE, message: `Loading ${this.getEntityType()} Details` });
 		await this.#init;
 		this.resetState();
 		this._getDataPromise = this._detailRepository!.requestByUnique(unique);
@@ -158,7 +143,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 			);
 		}
 
-		this.loading.removeState(this.#loadingStateUnique);
+		this.loading.removeState(LOADING_STATE_UNIQUE);
 		return response;
 	}
 
@@ -181,7 +166,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	 * @returns { Promise<any> | undefined } The data of the scaffold.
 	 */
 	public async createScaffold(args: CreateArgsType) {
-		this.loading.addState({ unique: this.#loadingStateUnique, message: `Creating ${this.getEntityType()} scaffold` });
+		this.loading.addState({ unique: LOADING_STATE_UNIQUE, message: `Creating ${this.getEntityType()} scaffold` });
 		await this.#init;
 		this.resetState();
 		this.setParent(args.parent);
@@ -202,7 +187,7 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 			this._data.setCurrent(data);
 		}
 
-		this.loading.removeState(this.#loadingStateUnique);
+		this.loading.removeState(LOADING_STATE_UNIQUE);
 
 		return data;
 	}
@@ -303,9 +288,9 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 		}
 
 		if (this._checkWillNavigateAway(newUrl) && this._getHasUnpersistedChanges()) {
-			/* Since ours modals are async while events are synchronous, we need to prevent the default behavior of the event, even if the modal hasn’t been resolved yet. 
-			Once the modal is resolved (the user accepted to discard the changes and navigate away from the route), we will push a new history state. 
-			This push will make the "willchangestate" event happen again and due to this somewhat "backward" behavior, 
+			/* Since ours modals are async while events are synchronous, we need to prevent the default behavior of the event, even if the modal hasn’t been resolved yet.
+			Once the modal is resolved (the user accepted to discard the changes and navigate away from the route), we will push a new history state.
+			This push will make the "willchangestate" event happen again and due to this somewhat "backward" behavior,
 			we set an "allowNavigateAway"-flag to prevent the "discard-changes" functionality from running in a loop.*/
 			e.preventDefault();
 			const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/index.ts
index 9f5213daca0a..ff2ab6d70c3d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/index.ts
@@ -2,3 +2,4 @@ import './global-components/index.js';
 
 export * from './entity-detail-workspace-base.js';
 export * from './global-components/index.js';
+export type * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/types.ts
new file mode 100644
index 000000000000..97bcf40aa501
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/entity-detail/types.ts
@@ -0,0 +1,17 @@
+import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
+
+export interface UmbEntityDetailWorkspaceContextArgs {
+	entityType: string;
+	workspaceAlias: string;
+	detailRepositoryAlias: string;
+}
+
+/**
+ * @deprecated Use UmbEntityDetailWorkspaceContextArgs instead
+ */
+export type UmbEntityWorkspaceContextArgs = UmbEntityDetailWorkspaceContextArgs;
+
+export interface UmbEntityDetailWorkspaceContextCreateArgs<DetailModelType> {
+	parent: UmbEntityModel;
+	preset?: Partial<DetailModelType>;
+}