From e05ad9791cebd6bee43d39d8ab10ae846fd748aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 20 Mar 2024 14:29:12 +0100
Subject: [PATCH] fix block workspace

---
 .../workspace/block-workspace.context.ts      |  4 --
 .../block-workspace-view-edit-tab.element.ts  | 40 +++++++++----------
 .../edit/block-workspace-view-edit.element.ts | 16 ++++----
 .../workspace-editor.element.ts               |  6 +--
 4 files changed, 30 insertions(+), 36 deletions(-)

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 5ef003b564..b9ebead2b4 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
@@ -26,7 +26,6 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 	// Just for context token safety:
 	public readonly IS_BLOCK_WORKSPACE_CONTEXT = true;
 	//
-	readonly workspaceAlias;
 
 	#blockManager?: typeof UMB_BLOCK_MANAGER_CONTEXT.TYPE;
 	#retrieveBlockManager;
@@ -66,9 +65,6 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 		super(host, workspaceArgs.manifest.alias);
 		const manifest = workspaceArgs.manifest;
 		this.#entityType = manifest.meta?.entityType;
-		this.workspaceAlias = manifest.alias;
-
-		console.log('BLOCK WORKSPACE CONTEXT', this, manifest);
 
 		this.#retrieveModalContext = this.consumeContext(UMB_MODAL_CONTEXT, (context) => {
 			this.#modalContext = context;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts
index 7cf78cb5a3..ff6c616007 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts
@@ -77,27 +77,25 @@ export class UmbBlockWorkspaceViewEditTabElement extends UmbLitElement {
 	}
 
 	render() {
-		return this._containerId
-			? html`
-					${this._hasProperties
-						? html` <umb-block-workspace-view-edit-properties
-								.managerName=${this.#managerName}
-								class="properties"
-								.containerId=${this._containerId}></umb-block-workspace-view-edit-properties>`
-						: ''}
-					${repeat(
-						this._groups,
-						(group) => group.name,
-						(group) =>
-							html` <uui-box .headline=${group.name || ''}
-								><umb-block-workspace-view-edit-properties
-									.managerName=${this.#managerName}
-									class="properties"
-									.containerId=${group.id}></umb-block-workspace-view-edit-properties
-							></uui-box>`,
-					)}
-				`
-			: '';
+		return html`
+			${this._hasProperties
+				? html` <umb-block-workspace-view-edit-properties
+						.managerName=${this.#managerName}
+						class="properties"
+						.containerId=${this._containerId}></umb-block-workspace-view-edit-properties>`
+				: ''}
+			${repeat(
+				this._groups,
+				(group) => group.id,
+				(group) =>
+					html` <uui-box .headline=${group.name || ''}
+						><umb-block-workspace-view-edit-properties
+							.managerName=${this.#managerName}
+							class="properties"
+							.containerId=${group.id}></umb-block-workspace-view-edit-properties
+					></uui-box>`,
+			)}
+		`;
 	}
 
 	static styles = [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts
index d5aae61dd7..5a9aa48c74 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts
@@ -48,6 +48,14 @@ export class UmbBlockWorkspaceViewEditElement extends UmbLitElement implements U
 
 		this.#tabsStructureHelper.setIsRoot(true);
 		this.#tabsStructureHelper.setContainerChildType('Tab');
+		this.observe(
+			this.#tabsStructureHelper.mergedContainers,
+			(tabs) => {
+				this._tabs = tabs;
+				this._createRoutes();
+			},
+			null,
+		);
 
 		// _hasRootProperties can be gotten via _tabsStructureHelper.hasProperties. But we do not support root properties currently.
 
@@ -73,14 +81,6 @@ export class UmbBlockWorkspaceViewEditElement extends UmbLitElement implements U
 			},
 			'observeGroups',
 		);
-		this.observe(
-			this.#tabsStructureHelper.mergedContainers,
-			(tabs) => {
-				this._tabs = tabs;
-				this._createRoutes();
-			},
-			'observeTabs',
-		);
 	}
 
 	private _createRoutes() {
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 db5fa22a83..a97eb4b5ed 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
@@ -95,7 +95,7 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
 								<slot name="footer-info"></slot>
 								<slot name="actions" slot="actions"></slot>
 							</umb-workspace-footer>
-					  `}
+						`}
 			</umb-body-layout>
 		`;
 	}
@@ -119,7 +119,7 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
 								`,
 							)}
 						</uui-tab-group>
-				  `
+					`
 				: nothing}
 		`;
 	}
@@ -137,7 +137,7 @@ export class UmbWorkspaceEditorElement extends UmbLitElement {
 							@change=${(event: UmbRouterSlotChangeEvent) => {
 								this._activePath = event.target.localActiveViewPath;
 							}}></umb-router-slot>
-				  `
+					`
 				: nothing}
 		`;
 	}