From abef7e9d0f9cee2f188c7aeec728d3f6353baa00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Thu, 4 Jan 2024 11:59:12 +0100
Subject: [PATCH] fix block type workspace context token

---
 ...id-type-workspace-view-settings.element.ts | 46 +------------------
 .../workspace/block-type-workspace.context.ts |  5 +-
 .../block/block-type/workspace/index.ts       |  1 +
 3 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-settings.element.ts
index 09b06fc88e..72460b223a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-settings.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/workspace/views/block-grid-type-workspace-view-settings.element.ts
@@ -1,10 +1,7 @@
-import { UmbBlockTypeBase } from '@umbraco-cms/backoffice/block';
-import { UmbBlockTypeWorkspaceContext } from '../../../block-type/workspace/block-type-workspace.context.js';
-import { css, html, customElement, state, ifDefined } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { UmbWorkspaceViewElement } from '@umbraco-cms/backoffice/extension-registry';
-import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace';
 
 @customElement('umb-block-grid-type-workspace-view')
 export class UmbBlockTypeGridWorkspaceViewSettingsElement extends UmbLitElement implements UmbWorkspaceViewElement {
@@ -13,47 +10,6 @@ export class UmbBlockTypeGridWorkspaceViewSettingsElement extends UmbLitElement
 	@state()
 	private _showSizeOptions = false;
 
-	@state()
-	private _backgroundColor?: string;
-
-	@state()
-	private _contentElementTypeKey?: string;
-
-	@state()
-	private _editorSize?: string;
-
-	@state()
-	private _iconColor?: string;
-
-	@state()
-	private _label?: string;
-
-	@state()
-	private _settingsElementTypeKey?: string;
-
-	@state()
-	private _stylesheet?: string;
-
-	@state()
-	private _view?: string;
-
-	constructor() {
-		super();
-		this.consumeContext(UMB_WORKSPACE_CONTEXT, (instance) => {
-			const workspace = instance as UmbBlockTypeWorkspaceContext;
-			this.observe(workspace.data, (data) => {
-				this._backgroundColor = data?.backgroundColor;
-				this._contentElementTypeKey = data?.contentElementTypeKey;
-				this._editorSize = data?.editorSize;
-				this._iconColor = data?.iconColor;
-				this._label = data?.label;
-				this._settingsElementTypeKey = data?.settingsElementTypeKey;
-				this._stylesheet = data?.stylesheet;
-				this._view = data?.view;
-			});
-		});
-	}
-
 	render() {
 		return html`
 			<uui-box headline=${this.localize.term('general_general')}>
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 a91551049b..d866fb7ebf 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
@@ -15,6 +15,9 @@ export class UmbBlockTypeWorkspaceContext<BlockTypeData extends UmbBlockTypeBase
 	extends UmbEditableWorkspaceContextBase<never, BlockTypeData>
 	implements UmbInvariantableWorkspaceContextInterface
 {
+	// Just for context token safety:
+	public readonly IS_BLOCK_TYPE_WORKSPACE_CONTEXT = true;
+
 	#entityType: string;
 	#data = new UmbObjectState<BlockTypeData | undefined>(undefined);
 	readonly data = this.#data.asObservable();
@@ -122,5 +125,5 @@ export const UMB_BLOCK_TYPE_WORKSPACE_CONTEXT = new UmbContextToken<
 >(
 	'UmbWorkspaceContext',
 	undefined,
-	(context): context is UmbBlockTypeWorkspaceContext => context.getEntityType?.() === 'data-type',
+	(context): context is UmbBlockTypeWorkspaceContext => (context as any).IS_BLOCK_TYPE_WORKSPACE_CONTEXT,
 );
diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/index.ts
index d9af0b933c..acf530d9a2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-type/workspace/index.ts
@@ -1 +1,2 @@
 export * from './block-type-workspace.element.js';
+export * from './block-type-workspace.context.js';