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 568290165d..2a8b77ddb3 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
@@ -71,15 +71,15 @@ export class UmbMemberWorkspaceViewMemberInfoElement extends UmbLitElement imple
#renderGeneralSection() {
return html`
- Created
+ Created
${this._createDate}
- Last edited
+ Last edited
${this._updateDate}
- Member Type
+ Member Type
- Id
+ Id
${this._unique}
`;
@@ -102,12 +102,10 @@ export class UmbMemberWorkspaceViewMemberInfoElement extends UmbLitElement imple
flex-direction: column;
gap: var(--uui-size-space-1);
}
+
.general-item:not(:last-child) {
margin-bottom: var(--uui-size-space-6);
}
- .general-item .headline {
- font-weight: bold;
- }
`,
];
}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member.element.ts
index 4d1dea9177..bb33e453b8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/member/member-workspace-view-member.element.ts
@@ -72,16 +72,16 @@ export class UmbMemberWorkspaceViewMemberElement extends UmbLitElement implement
#renderPasswordInput() {
if (this._isNew) {
return html`
-
+
this.#onPasswordUpdate()}>
-
+
this.#onPasswordUpdate()}>
+
${when(this._newPasswordError, () => html`${this._newPasswordError}
`)}
`;
}
@@ -99,7 +100,7 @@ export class UmbMemberWorkspaceViewMemberElement extends UmbLitElement implement
this._showChangePasswordForm,
() => html`
-
+
this.#onPasswordUpdate()}>
-
+
`,
- () =>
- html` html`
+ (this._showChangePasswordForm = true)}>`,
+ @click=${() => (this._showChangePasswordForm = true)}>
+ `,
)}
`;
@@ -135,62 +137,69 @@ export class UmbMemberWorkspaceViewMemberElement extends UmbLitElement implement
#renderLeftColumn() {
if (!this._workspaceContext) return;
- return html`
-
-
- this.#onChange('username', (e.target as HTMLInputElement).value)}>
-
-
- this.#onChange('email', (e.target as HTMLInputElement).value)}
- value=${this._workspaceContext.email}>
-
+ return html`
+
+
+
+ this.#onChange('username', (e.target as HTMLInputElement).value)}>
+
- ${this.#renderPasswordInput()}
+
+ this.#onChange('email', (e.target as HTMLInputElement).value)}>
+
-
-
-
+ ${this.#renderPasswordInput()}
-
- this.#onChange('isApproved', e.target.checked)}>
-
-
+
+
+
-
- this.#onChange('isLockedOut', e.target.checked)}>
-
-
+
+ this.#onChange('isApproved', e.target.checked)}>
+
+
-
- this.#onChange('isTwoFactorEnabled', e.target.checked)}>
-
-
-
-
`;
+
+ this.#onChange('isLockedOut', e.target.checked)}>
+
+
+
+
+ this.#onChange('isTwoFactorEnabled', e.target.checked)}>
+
+
+
+
+ `;
}
#renderRightColumn() {
@@ -200,11 +209,11 @@ export class UmbMemberWorkspaceViewMemberElement extends UmbLitElement implement
- Failed login attempts
+ Failed login attempts
${this._workspaceContext.failedPasswordAttempts}
- Last lockout date
+ Last lockout date
${this._workspaceContext.lastLockOutDate
? this.localize.date(this._workspaceContext.lastLockOutDate, TimeFormatOptions)
@@ -212,7 +221,7 @@ export class UmbMemberWorkspaceViewMemberElement extends UmbLitElement implement
- Last login
+ Last login
${this._workspaceContext.lastLoginDate
? this.localize.date(this._workspaceContext.lastLoginDate, TimeFormatOptions)
@@ -220,7 +229,7 @@ export class UmbMemberWorkspaceViewMemberElement extends UmbLitElement implement
-
Password changed
+
Password changed
${this._workspaceContext.lastPasswordChangeDate
? this.localize.date(this._workspaceContext.lastPasswordChangeDate, TimeFormatOptions)
@@ -237,13 +246,11 @@ export class UmbMemberWorkspaceViewMemberElement extends UmbLitElement implement
}
override render() {
- if (!this._workspaceContext) {
- return html`Not found
`;
- }
-
- return html`
- ${this.#renderLeftColumn()} ${this.#renderRightColumn()}
- `;
+ return html`
+
+ ${this.#renderLeftColumn()} ${this.#renderRightColumn()}
+
+ `;
}
static override styles = [
@@ -289,12 +296,10 @@ export class UmbMemberWorkspaceViewMemberElement extends UmbLitElement implement
flex-direction: column;
gap: var(--uui-size-space-1);
}
+
.general-item:not(:last-child) {
margin-bottom: var(--uui-size-space-6);
}
- .general-item .headline {
- font-weight: bold;
- }
`,
];
}