From e20e5c7e9ea3a97cf988d0ce4a8c8ea1e909f30c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 Oct 2023 20:37:43 +0100 Subject: [PATCH] add controller alias --- .../user/current-user/current-user-header-app.element.ts | 2 +- .../modals/current-user/current-user-modal.element.ts | 2 +- .../user-profile-apps/user-profile-app-history.element.ts | 2 +- .../user-profile-apps/user-profile-app-profile.element.ts | 2 +- .../user-group-table-sections-column-layout.element.ts | 2 +- .../components/input-user-group/user-group-input.element.ts | 4 ++-- .../user-group-picker/user-group-picker-modal.element.ts | 2 +- .../user-group-default-permission-list.element.ts | 3 ++- .../views/table/user-table-collection-view.element.ts | 6 +++--- .../user/user/components/user-input/user-input.element.ts | 4 ++-- .../user/conditions/user-allow-action-base.condition.ts | 2 +- .../user-workspace-access-settings.element.ts | 2 +- .../user-workspace-info/user-workspace-info.element.ts | 2 +- .../user-workspace-profile-settings.element.ts | 4 ++-- .../user/user/workspace/user-workspace-editor.element.ts | 2 +- .../packages/user/user/workspace/user-workspace.context.ts | 2 +- 16 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-header-app.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-header-app.element.ts index 14fb85a219..4abe681457 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-header-app.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/current-user-header-app.element.ts @@ -34,7 +34,7 @@ export class UmbCurrentUserHeaderAppElement extends UmbLitElement { this.observe(this._auth.currentUser, (currentUser) => { this._currentUser = currentUser; - }); + }, 'umbCurrentUserObserver'); } private _handleUserClick() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts index c6aebb4229..8683436a27 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user/current-user-modal.element.ts @@ -35,7 +35,7 @@ export class UmbCurrentUserModalElement extends UmbLitElement { this.observe(this.#authContext.currentUser, (currentUser) => { this._currentUser = currentUser; - }); + }, 'umbCurrentUserObserver'); } private _close() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-history.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-history.element.ts index 1cf1ba9256..1416c59731 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-history.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-history.element.ts @@ -27,7 +27,7 @@ export class UmbUserProfileAppHistoryElement extends UmbLitElement { if (this.#currentUserHistoryStore) { this.observe(this.#currentUserHistoryStore.latestHistory, (history) => { this._history = history; - }); + }, 'umbCurrentUserHistoryObserver'); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-profile.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-profile.element.ts index 11a7af78f2..d8326a99df 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-profile.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/user-profile-apps/user-profile-app-profile.element.ts @@ -34,7 +34,7 @@ export class UmbUserProfileAppProfileElement extends UmbLitElement { this.observe(this._auth.currentUser, (currentUser) => { this._currentUser = currentUser; - }); + }, 'umbCurrentUserObserver'); } private _edit() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-sections-column-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-sections-column-layout.element.ts index 5464f45b59..234492f9b8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-sections-column-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/components/user-group-table-sections-column-layout.element.ts @@ -23,7 +23,7 @@ export class UmbUserGroupTableSectionsColumnLayoutElement extends UmbLitElement private observeSectionNames() { this.observe(umbExtensionsRegistry.extensionsOfType('section'), (sections) => { this._sectionsNames = sections.filter((x) => this.value.includes(x.alias)).map((x) => x.meta.label || x.name); - }); + }, 'umbUserGroupTableSectionsColumnLayoutObserver'); } render() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts index 910d439cb9..8cf95fadf3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/components/input-user-group/user-group-input.element.ts @@ -85,8 +85,8 @@ export class UmbUserGroupInputElement extends FormControlMixin(UmbLitElement) { () => !!this.max && this.#pickerContext.getSelection().length > this.max, ); - this.observe(this.#pickerContext.selection, (selection) => (super.value = selection.join(','))); - this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems)); + this.observe(this.#pickerContext.selection, (selection) => (super.value = selection.join(',')), 'umbUserGroupInputSelectionObserver'); + this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), 'umbUserGroupInputItemsObserver'); } protected getFormElement() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts index 0a0bf1582d..88af248707 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts @@ -30,7 +30,7 @@ export class UmbUserGroupPickerModalElement extends UmbModalBaseElement (this._userGroups = items)); + this.observe(asObservable(), (items) => (this._userGroups = items), 'umbUserGroupsObserver'); } #onSelected(event: UUIMenuItemEvent, item: UserGroupResponseModel) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts index 58c2876c10..9f85fcfaca 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/components/user-group-default-permission-list.element.ts @@ -25,6 +25,7 @@ export class UmbUserGroupDefaultPermissionListElement extends UmbLitElement { this.observe( this.#userGroupWorkspaceContext.data, (userGroup) => (this._userGroupDefaultPermissions = userGroup?.permissions), + 'umbUserGroupPermissionsObserver' ); }); } @@ -32,7 +33,7 @@ export class UmbUserGroupDefaultPermissionListElement extends UmbLitElement { #observeUserPermissions() { this.observe(umbExtensionsRegistry.extensionsOfType('userPermission'), (userPermissionManifests) => { this._entityTypes = [...new Set(userPermissionManifests.map((manifest) => manifest.meta.entityType))]; - }); + }, 'umbUserPermissionsObserver'); } #onSelectedUserPermission(event: UmbSelectionChangeEvent) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts index 3df5133902..4846c965d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts @@ -69,11 +69,11 @@ export class UmbUserTableCollectionViewElement extends UmbLitElement { this.consumeContext(UMB_COLLECTION_CONTEXT, (instance) => { this.#collectionContext = instance as UmbUserCollectionContext; - this.observe(this.#collectionContext.selection, (selection) => (this._selection = selection)); + this.observe(this.#collectionContext.selection, (selection) => (this._selection = selection), 'umbCollectionSelectionObserver'); this.observe(this.#collectionContext.items, (items) => { this._users = items; this.#observeUserGroups(); - }); + }, 'umbCollectionItemsObserver'); }); } @@ -84,7 +84,7 @@ export class UmbUserTableCollectionViewElement extends UmbLitElement { this.observe(asObservable(), (userGroups) => { this._userGroupItems = userGroups; this.#createTableItems(); - }); + }, 'umbUserGroupItemsObserver'); } #getUserGroupNames(ids: Array) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts index 15d6f274b4..e73ca89b3a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/components/user-input/user-input.element.ts @@ -85,8 +85,8 @@ export class UmbUserInputElement extends FormControlMixin(UmbLitElement) { () => !!this.max && this.#pickerContext.getSelection().length > this.max, ); - this.observe(this.#pickerContext.selection, (selection) => (super.value = selection.join(','))); - this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems)); + this.observe(this.#pickerContext.selection, (selection) => (super.value = selection.join(',')), 'umbUserInputSelectionObserver'); + this.observe(this.#pickerContext.selectedItems, (selectedItems) => (this._items = selectedItems), 'umbUserInputItemsObserver'); } protected getFormElement() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-action-base.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-action-base.condition.ts index f2f7e7f59e..59171f4c06 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-action-base.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-action-base.condition.ts @@ -25,7 +25,7 @@ export class UmbUserActionConditionBase extends UmbBaseController implements Umb this.observe(userContext.data, (data) => { this.userData = data; this.onUserDataChange(); - }); + }, 'umbUserDataActionConditionObserver'); }); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts index 813e293b88..f85ad54e7f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access-settings/user-workspace-access-settings.element.ts @@ -20,7 +20,7 @@ export class UmbUserWorkspaceAccessSettingsElement extends UmbLitElement { this.consumeContext(UMB_USER_WORKSPACE_CONTEXT, (instance) => { this.#userWorkspaceContext = instance; - this.observe(this.#userWorkspaceContext.data, (user) => (this._user = user)); + this.observe(this.#userWorkspaceContext.data, (user) => (this._user = user), 'umbUserObserver'); }); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-info/user-workspace-info.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-info/user-workspace-info.element.ts index f790b34e09..29fff4fb76 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-info/user-workspace-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-info/user-workspace-info.element.ts @@ -25,7 +25,7 @@ export class UmbUserWorkspaceInfoElement extends UmbLitElement { this.observe(this.#userWorkspaceContext.data, (user) => { this._user = user; this.#setUserInfoItems(user); - }); + }, 'umbUserObserver'); }); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts index de8c853f1d..c04216db28 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-profile-settings/user-workspace-profile-settings.element.ts @@ -32,7 +32,7 @@ export class UmbUserWorkspaceProfileSettingsElement extends UmbLitElement { this.consumeContext(UMB_USER_WORKSPACE_CONTEXT, (instance) => { this.#userWorkspaceContext = instance; - this.observe(this.#userWorkspaceContext.data, (user) => (this._user = user)); + this.observe(this.#userWorkspaceContext.data, (user) => (this._user = user), 'umbUserObserver'); }); } @@ -80,7 +80,7 @@ export class UmbUserWorkspaceProfileSettingsElement extends UmbLitElement { selected: true, }); } - }); + }, 'umbUserObserver'); } render() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts index be1e347e33..bb91cfd6d2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace-editor.element.ts @@ -29,7 +29,7 @@ export class UmbUserWorkspaceEditorElement extends UmbLitElement { #observeUser() { if (!this.#workspaceContext) return; - this.observe(this.#workspaceContext.data, (user) => (this._user = user)); + this.observe(this.#workspaceContext.data, (user) => (this._user = user), 'umbUserObserver'); } // TODO. find a way where we don't have to do this for all workspaces. 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 65a4cf5c06..3dd9c4b11b 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 @@ -32,7 +32,7 @@ export class UmbUserWorkspaceContext this.#data.update(data); } - this.observe(asObservable(), (user) => this.onUserStoreChanges(user)); + this.observe(asObservable(), (user) => this.onUserStoreChanges(user), 'umbUserStoreObserver'); } /* TODO: some properties are allowed to update without saving.