yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user avatar in document + media history

Browse Source
This commit is contained in:
Mads Rasmussen
2024-09-04 11:59:19 +02:00
parent bcdc33b00c
commit 3f970b41d0
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts
View File

@@ -120,13 +120,15 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
(item) => {
const { text, style } = getDocumentHistoryTagStyleAndText(item.logType);
const user = this.#userMap.get(item.user.unique);
const userName = user?.name ?? 'Unknown';
const avatarUrl = user && Array.isArray(user.avatarUrls) ? user.avatarUrls[1] : undefined;
return html`<umb-history-item
.name=${userName}
.name=${user?.name ?? 'Unknown'}
.detail=${this.localize.date(item.timestamp, TimeOptions)}>
<uui-avatar slot="avatar" .name="${userName}" img-src=${ifDefined(avatarUrl)}></uui-avatar>
<umb-user-avatar
slot="avatar"
.name=${user?.name}
kind=${ifDefined(user?.kind)}
.imgUrls=${user?.avatarUrls ?? []}></umb-user-avatar>
<span class="log-type">
<uui-tag look=${style.look} color=${style.color}>

8
src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info-history.element.ts
View File

@@ -102,13 +102,15 @@ export class UmbMediaWorkspaceViewInfoHistoryElement extends UmbLitElement {
(item) => {
const { text, style } = getMediaHistoryTagStyleAndText(item.logType);
const user = this.#userMap.get(item.user.unique);
const userName = user?.name ?? 'Unknown';
const avatarUrl = user && Array.isArray(user.avatarUrls) ? user.avatarUrls[1] : undefined;
return html`<umb-history-item
.name=${user?.name ?? 'Unknown'}
.detail=${this.localize.date(item.timestamp, TimeOptions)}>
<uui-avatar slot="avatar" .name="${userName}" img-src=${ifDefined(avatarUrl)}></uui-avatar>
<umb-user-avatar
slot="avatar"
.name=${user?.name}
kind=${ifDefined(user?.kind)}
.imgUrls=${user?.avatarUrls ?? []}></umb-user-avatar>
<span class="log-type">
<uui-tag look=${style.look} color=${style.color}>