From d192f9ea551aafe02a63e4b26d1c7a60984eeefd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 16 Oct 2024 10:53:41 +0200
Subject: [PATCH] fix live editing mode

---
 .../block/context/block-manager.context.ts    |  2 +-
 .../workspace/block-workspace.context.ts      | 21 +++++++++++--------
 .../element-property-dataset.context.ts       |  1 -
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts
index c650cee4c0..59109b8945 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts
@@ -78,7 +78,7 @@ export abstract class UmbBlockManagerContext<
 	setEditorConfiguration(configs: UmbPropertyEditorConfigCollection) {
 		this._editorConfiguration.setValue(configs);
 		if (this._liveEditingMode.getValue() === undefined) {
-			this._liveEditingMode.setValue(configs.getValueByAlias<boolean>('liveEditingMode'));
+			this._liveEditingMode.setValue(configs.getValueByAlias<boolean>('useLiveEditing'));
 		}
 	}
 	getEditorConfiguration(): UmbPropertyEditorConfigCollection | undefined {
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 df8349a9c3..4ea9f4370d 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
@@ -45,6 +45,7 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 
 	#entityType: string;
 
+	#liveEditingModePromise?: Promise<boolean>;
 	#liveEditingMode?: boolean;
 
 	#initialLayout?: LayoutDataType;
@@ -87,13 +88,13 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 		this.#retrieveBlockManager = this.consumeContext(UMB_BLOCK_MANAGER_CONTEXT, (manager) => {
 			this.#blockManager = manager;
 
-			this.observe(
+			this.#liveEditingModePromise = this.observe(
 				manager.liveEditingMode,
 				(liveEditingMode) => {
 					this.#liveEditingMode = liveEditingMode;
 				},
 				'observeLiveEditingMode',
-			);
+			).asPromise();
 
 			this.observe(
 				observeMultiple([
@@ -212,6 +213,7 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 	async load(unique: string) {
 		await this.#retrieveBlockManager;
 		await this.#retrieveBlockEntries;
+		await this.#liveEditingModePromise;
 		if (!this.#blockManager || !this.#blockEntries) {
 			throw new Error('Block manager not found');
 		}
@@ -235,6 +237,7 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 	async create(contentElementTypeId: string) {
 		await this.#retrieveBlockEntries;
 		await this.#retrieveModalContext;
+		await this.#liveEditingModePromise;
 		if (!this.#blockEntries) {
 			throw new Error('Block Entries not found');
 		}
@@ -257,13 +260,7 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 
 		// TODO: We should investigate if it makes sense to gather
 
-		if (!this.#liveEditingMode) {
-			this.#layout.setValue(blockCreated.layout as LayoutDataType);
-			this.content.setData(blockCreated.content);
-			if (blockCreated.settings) {
-				this.settings.setData(blockCreated.settings);
-			}
-		} else {
+		if (this.#liveEditingMode) {
 			// Insert already, cause we are in live editing mode:
 			const blockInserted = await this.#blockEntries.insert(
 				blockCreated.layout,
@@ -279,6 +276,12 @@ export class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLayoutBaseM
 
 			this.#observeBlockData(unique);
 			this.establishLiveSync();
+		} else {
+			this.#layout.setValue(blockCreated.layout as LayoutDataType);
+			this.content.setData(blockCreated.content);
+			if (blockCreated.settings) {
+				this.settings.setData(blockCreated.settings);
+			}
 		}
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/element-property-dataset.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/element-property-dataset.context.ts
index ac92247246..0490888eb7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/element-property-dataset.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/element-property-dataset.context.ts
@@ -82,7 +82,6 @@ export abstract class UmbElementPropertyDatasetContext<
 		this.observe(
 			this._dataOwner.structure.contentTypeProperties,
 			(props: UmbPropertyTypeModel[]) => {
-				console.log('props', props);
 				const map = props.map((prop) => ({ alias: prop.alias, variantId: this.#createPropertyVariantId(prop) }));
 				this.#propertyVariantIdMap.setValue(map);
 				// Resolve promise, to let the once waiting on this know.