From e37dc144a51db67f3aac8f63147812ee338e35a3 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 25 Sep 2024 09:20:08 +0200 Subject: [PATCH] fix after merge --- .../workspace/dictionary-workspace.context.ts | 14 +++---- .../user-group-workspace.context.ts | 40 ++++++++++--------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.context.ts index e58ce206a9..bc00429747 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.context.ts @@ -17,11 +17,11 @@ export class UmbDictionaryWorkspaceContext { readonly data = this._data.current; - readonly unique = this._data.createObservablePart((data) => data?.unique); - readonly entityType = this._data.createObservablePart((data) => data?.entityType); + readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique); + readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType); - readonly name = this._data.createObservablePart((data) => data?.name); - readonly dictionary = this._data.createObservablePart((data) => data); + readonly name = this._data.createObservablePartOfCurrent((data) => data?.name); + readonly dictionary = this._data.createObservablePartOfCurrent((data) => data); constructor(host: UmbControllerHost) { super(host, { @@ -58,11 +58,11 @@ export class UmbDictionaryWorkspaceContext } setName(name: string) { - this._data.updateCurrentData({ name }); + this._data.updateCurrent({ name }); } setPropertyValue(isoCode: string, translation: string) { - const currentData = this._data.getCurrentData(); + const currentData = this._data.getCurrent(); if (!currentData) return; // TODO: This can use some of our own methods, to make it simpler. see appendToFrozenArray() @@ -80,7 +80,7 @@ export class UmbDictionaryWorkspaceContext updatedValue?.push({ isoCode, translation }); } - this._data.setCurrentData({ ...currentData, translations: updatedValue }); + this._data.setCurrent({ ...currentData, translations: updatedValue }); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace.context.ts index 17a11c6027..a90517841f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace.context.ts @@ -17,20 +17,22 @@ export class UmbUserGroupWorkspaceContext { data = this._data.current; - readonly unique = this._data.createObservablePart((data) => data?.unique); - readonly name = this._data.createObservablePart((data) => data?.name || ''); - readonly alias = this._data.createObservablePart((data) => data?.alias || ''); - readonly aliasCanBeChanged = this._data.createObservablePart((data) => data?.aliasCanBeChanged); - readonly icon = this._data.createObservablePart((data) => data?.icon || null); - readonly sections = this._data.createObservablePart((data) => data?.sections || []); - readonly languages = this._data.createObservablePart((data) => data?.languages || []); - readonly hasAccessToAllLanguages = this._data.createObservablePart((data) => data?.hasAccessToAllLanguages || false); - readonly documentStartNode = this._data.createObservablePart((data) => data?.documentStartNode || null); - readonly documentRootAccess = this._data.createObservablePart((data) => data?.documentRootAccess || false); - readonly mediaStartNode = this._data.createObservablePart((data) => data?.mediaStartNode || null); - readonly mediaRootAccess = this._data.createObservablePart((data) => data?.mediaRootAccess || false); - readonly fallbackPermissions = this._data.createObservablePart((data) => data?.fallbackPermissions || []); - readonly permissions = this._data.createObservablePart((data) => data?.permissions || []); + readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique); + readonly name = this._data.createObservablePartOfCurrent((data) => data?.name || ''); + readonly alias = this._data.createObservablePartOfCurrent((data) => data?.alias || ''); + readonly aliasCanBeChanged = this._data.createObservablePartOfCurrent((data) => data?.aliasCanBeChanged); + readonly icon = this._data.createObservablePartOfCurrent((data) => data?.icon || null); + readonly sections = this._data.createObservablePartOfCurrent((data) => data?.sections || []); + readonly languages = this._data.createObservablePartOfCurrent((data) => data?.languages || []); + readonly hasAccessToAllLanguages = this._data.createObservablePartOfCurrent( + (data) => data?.hasAccessToAllLanguages || false, + ); + readonly documentStartNode = this._data.createObservablePartOfCurrent((data) => data?.documentStartNode || null); + readonly documentRootAccess = this._data.createObservablePartOfCurrent((data) => data?.documentRootAccess || false); + readonly mediaStartNode = this._data.createObservablePartOfCurrent((data) => data?.mediaStartNode || null); + readonly mediaRootAccess = this._data.createObservablePartOfCurrent((data) => data?.mediaRootAccess || false); + readonly fallbackPermissions = this._data.createObservablePartOfCurrent((data) => data?.fallbackPermissions || []); + readonly permissions = this._data.createObservablePartOfCurrent((data) => data?.permissions || []); constructor(host: UmbControllerHost) { super(host, { @@ -65,7 +67,7 @@ export class UmbUserGroupWorkspaceContext } updateProperty(alias: Alias, value: UmbUserGroupDetailModel[Alias]) { - this._data.updateCurrentData({ [alias]: value }); + this._data.updateCurrent({ [alias]: value }); } /** @@ -73,7 +75,7 @@ export class UmbUserGroupWorkspaceContext * @memberof UmbUserGroupWorkspaceContext */ getPermissions() { - return this._data.getCurrentData()?.permissions ?? []; + return this._data.getCurrent()?.permissions ?? []; } /** @@ -82,7 +84,7 @@ export class UmbUserGroupWorkspaceContext * @memberof UmbUserGroupWorkspaceContext */ setPermissions(permissions: Array) { - this._data.updateCurrentData({ permissions: permissions }); + this._data.updateCurrent({ permissions: permissions }); } /** @@ -90,7 +92,7 @@ export class UmbUserGroupWorkspaceContext * @memberof UmbUserGroupWorkspaceContext */ getFallbackPermissions() { - return this._data.getCurrentData()?.fallbackPermissions ?? []; + return this._data.getCurrent()?.fallbackPermissions ?? []; } /** @@ -99,7 +101,7 @@ export class UmbUserGroupWorkspaceContext * @memberof UmbUserGroupWorkspaceContext */ setFallbackPermissions(fallbackPermissions: Array) { - this._data.updateCurrentData({ fallbackPermissions }); + this._data.updateCurrent({ fallbackPermissions }); } }