From ca9d0bbefb4959ce6d01c19a45fadbf6d6a76b6e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 24 Sep 2024 14:39:31 +0200 Subject: [PATCH] fix load response --- .../data-type/workspace/data-type-workspace.context.ts | 10 +++++----- .../user/user/workspace/user/user-workspace.context.ts | 6 ++++-- 2 files changed, 9 insertions(+), 7 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 89315e4742..e902659c6d 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 @@ -112,12 +112,12 @@ export class UmbDataTypeWorkspaceContext ]); } - async load(unique: string) { - const { asObservable } = await super.load(unique); + override async load(unique: string) { + const response = await super.load(unique); - if (asObservable) { - this.observe(asObservable(), (entity) => this.#onStoreChange(entity), 'umbDataTypeStoreObserver'); - } + this.observe(response.asObservable?.(), (entity) => this.#onStoreChange(entity), 'umbDataTypeStoreObserver'); + + return response; } #onStoreChange(entity: EntityType | undefined) { 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 d898aa5794..8dd825a3b2 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 @@ -53,9 +53,9 @@ export class UmbUserWorkspaceContext } override async load(unique: string) { - const { asObservable } = await super.load(unique); + const response = await super.load(unique); - this.observe(asObservable(), (user) => this.onUserStoreChanges(user), 'umbUserStoreObserver'); + this.observe(response.asObservable?.(), (user) => this.onUserStoreChanges(user), 'umbUserStoreObserver'); if (!this._detailRepository) { throw new Error('Detail repository is missing'); @@ -64,6 +64,8 @@ export class UmbUserWorkspaceContext // Get the calculated start nodes const { data: calculatedStartNodes } = await this._detailRepository.requestCalculateStartNodes(unique); this.#calculatedStartNodes.setValue(calculatedStartNodes); + + return response; } /* TODO: some properties are allowed to update without saving.