From 9c41d2f294ece227b40a5073c4674e66123bafdc Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Thu, 12 Oct 2023 14:44:34 +0200
Subject: [PATCH] sync state value when an entity action is executed

---
 .../user/workspace/user-workspace.context.ts  | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts
index 9ac4fc84a3..24f8229e85 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts
@@ -26,11 +26,22 @@ export class UmbUserWorkspaceContext
 	data = this.#data.asObservable();
 
 	async load(id: string) {
-		const { data } = await this.repository.requestById(id);
+		const { data, asObservable } = await this.repository.requestById(id);
 		if (data) {
 			this.setIsNew(false);
 			this.#data.update(data);
 		}
+
+		this.observe(asObservable(), (user) => this.onUserStoreChanges(user));
+	}
+
+	/* TODO: some properties are allowed to update without saving. 
+		For a user properties like state will be updated when one of the entity actions are executed.
+		Therefore we have to subscribe to the user store to update the state in the workspace data.
+		There might be a less manual way to do this.
+	*/
+	onUserStoreChanges(user: UmbUserDetail) {
+		this.#data.update({ state: user.state });
 	}
 
 	getEntityId(): string | undefined {
@@ -47,7 +58,7 @@ export class UmbUserWorkspaceContext
 
 	updateProperty<PropertyName extends keyof UmbUserDetail>(
 		propertyName: PropertyName,
-		value: UmbUserDetail[PropertyName]
+		value: UmbUserDetail[PropertyName],
 	) {
 		this.#data.update({ [propertyName]: value });
 	}
@@ -82,7 +93,7 @@ export class UmbUserWorkspaceContext
 	}
 }
 
-export const UMB_USER_WORKSPACE_CONTEXT = new UmbContextToken<UmbSaveableWorkspaceContextInterface, UmbUserWorkspaceContext>(
-	'UmbWorkspaceContext',
-	(context): context is UmbUserWorkspaceContext => context.getEntityType?.() === 'user'
-);
+export const UMB_USER_WORKSPACE_CONTEXT = new UmbContextToken<
+	UmbSaveableWorkspaceContextInterface,
+	UmbUserWorkspaceContext
+>('UmbWorkspaceContext', (context): context is UmbUserWorkspaceContext => context.getEntityType?.() === 'user');