From 51f7b6bee954f8a5d846cb59ea302b2dd376d6e3 Mon Sep 17 00:00:00 2001 From: JesmoDev <26099018+JesmoDev@users.noreply.github.com> Date: Tue, 7 May 2024 11:36:00 +0200 Subject: [PATCH 1/2] use member unique instead of member type --- .../member/member-workspace-view-member-info.element.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member-info.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member-info.element.ts index 48025bc6a3..0922383fcd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member-info.element.ts @@ -27,6 +27,9 @@ export class UmbMemberWorkspaceViewMemberInfoElement extends UmbLitElement imple @state() private _updateDate = 'Unknown'; + @state() + private _unique = ''; + constructor() { super(); @@ -44,6 +47,7 @@ export class UmbMemberWorkspaceViewMemberInfoElement extends UmbLitElement imple this.observe(this._workspaceContext.contentTypeUnique, (unique) => (this._memberTypeUnique = unique || '')); this.observe(this._workspaceContext.createDate, (date) => (this._createDate = date || 'Unknown')); this.observe(this._workspaceContext.updateDate, (date) => (this._updateDate = date || 'Unknown')); + this.observe(this._workspaceContext.unique, (unique) => (this._unique = unique || '')); const memberType = (await this._memberTypeItemRepository.requestItems([this._memberTypeUnique])).data?.[0]; if (!memberType) return; @@ -83,7 +87,7 @@ export class UmbMemberWorkspaceViewMemberInfoElement extends UmbLitElement imple
- ${this._memberTypeUnique} + ${this._unique}
`; } From 8bbb95c4dfb28e2a7c0edeb70b315df716e05316 Mon Sep 17 00:00:00 2001 From: JesmoDev <26099018+JesmoDev@users.noreply.github.com> Date: Tue, 7 May 2024 11:36:35 +0200 Subject: [PATCH 2/2] cleanup --- ...mber-workspace-view-member-info.element.ts | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member-info.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member-info.element.ts index 0922383fcd..096bd46d96 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member-info.element.ts @@ -16,12 +16,8 @@ export class UmbMemberWorkspaceViewMemberInfoElement extends UmbLitElement imple @state() private _memberTypeIcon = ''; - private _workspaceContext?: typeof UMB_MEMBER_WORKSPACE_CONTEXT.TYPE; - private _memberTypeItemRepository: UmbMemberTypeItemRepository = new UmbMemberTypeItemRepository(this); - @state() private _editMemberTypePath = ''; - @state() private _createDate = 'Unknown'; @state() @@ -30,6 +26,9 @@ export class UmbMemberWorkspaceViewMemberInfoElement extends UmbLitElement imple @state() private _unique = ''; + #workspaceContext?: typeof UMB_MEMBER_WORKSPACE_CONTEXT.TYPE; + #memberTypeItemRepository: UmbMemberTypeItemRepository = new UmbMemberTypeItemRepository(this); + constructor() { super(); @@ -43,13 +42,13 @@ export class UmbMemberWorkspaceViewMemberInfoElement extends UmbLitElement imple }); this.consumeContext(UMB_MEMBER_WORKSPACE_CONTEXT, async (context) => { - this._workspaceContext = context; - this.observe(this._workspaceContext.contentTypeUnique, (unique) => (this._memberTypeUnique = unique || '')); - this.observe(this._workspaceContext.createDate, (date) => (this._createDate = date || 'Unknown')); - this.observe(this._workspaceContext.updateDate, (date) => (this._updateDate = date || 'Unknown')); - this.observe(this._workspaceContext.unique, (unique) => (this._unique = unique || '')); + this.#workspaceContext = context; + this.observe(this.#workspaceContext.contentTypeUnique, (unique) => (this._memberTypeUnique = unique || '')); + this.observe(this.#workspaceContext.createDate, (date) => (this._createDate = date || 'Unknown')); + this.observe(this.#workspaceContext.updateDate, (date) => (this._updateDate = date || 'Unknown')); + this.observe(this.#workspaceContext.unique, (unique) => (this._unique = unique || '')); - const memberType = (await this._memberTypeItemRepository.requestItems([this._memberTypeUnique])).data?.[0]; + const memberType = (await this.#memberTypeItemRepository.requestItems([this._memberTypeUnique])).data?.[0]; if (!memberType) return; this._memberTypeName = memberType.name; this._memberTypeIcon = memberType.icon;