From de5703b7deff19a45b2c836ec1104ac50ebed6e6 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 26 Apr 2024 11:08:40 +0200 Subject: [PATCH 1/3] slot avatar element into history item element --- .../history/history-item.element.ts | 22 ++++--------------- ...ent-workspace-view-info-history.element.ts | 4 +--- ...dia-workspace-view-info-history.element.ts | 4 +--- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-item.element.ts index f7f46543d5..a4af2a808e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/history/history-item.element.ts @@ -1,35 +1,19 @@ -import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app'; -import { css, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; +import { css, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-history-item') export class UmbHistoryItemElement extends UmbLitElement { - @property({ type: String }) - src?: string; - @property({ type: String }) name?: string; @property({ type: String }) detail?: string; - @state() - private _serverUrl?: string; - - constructor() { - super(); - this.consumeContext(UMB_APP_CONTEXT, (instance) => { - this._serverUrl = instance.getServerUrl(); - }); - } - render() { return html`
- +
${this.name} ${this.detail} @@ -55,10 +39,12 @@ export class UmbHistoryItemElement extends UmbLitElement { --uui-button-height: calc(var(--uui-size-2) * 4); margin-right: var(--uui-size-2); } + #actions-container { opacity: 0; transition: opacity 120ms; } + :host(:hover) #actions-container { opacity: 1; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts index 216c381979..c0bac5c30c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts @@ -129,10 +129,8 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement { const { text, style } = HistoryTagStyleAndText(item.logType); return html` + ${this.localize.term(text.label)} ${this.localize.term(text.desc, item.parameters)} diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info-history.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info-history.element.ts index e3bbef6456..1b14ecc9af 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info-history.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info-history.element.ts @@ -106,10 +106,8 @@ export class UmbMediaWorkspaceViewInfoHistoryElement extends UmbLitElement { const { text, style } = HistoryTagStyleAndText(item.logType); return html` + ${this.localize.term(text.label)} ${this.localize.term(text.desc, item.parameters)} From 223595eac0f5789dd717eaf958b24e02934b958f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 26 Apr 2024 11:33:58 +0200 Subject: [PATCH 2/3] temp bring back the avatar logic --- ...ment-workspace-view-info-history.element.ts | 18 +++++++++++++++++- ...edia-workspace-view-info-history.element.ts | 16 +++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts index c0bac5c30c..79ca53ee46 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts @@ -18,6 +18,7 @@ import type { AuditLogWithUsernameResponseModel } from '@umbraco-cms/backoffice/ import { DirectionModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; +import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app'; @customElement('umb-document-workspace-view-info-history') export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement { @@ -36,9 +37,16 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement { @state() private _currentPage = 1; + @state() + private _serverUrl = ''; + constructor() { super(); this.#logRepository = new UmbAuditLogRepository(this); + + this.consumeContext(UMB_APP_CONTEXT, (instance) => { + this._serverUrl = instance.getServerUrl(); + }); } protected firstUpdated(): void { @@ -127,10 +135,18 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement { (item) => item.timestamp, (item) => { const { text, style } = HistoryTagStyleAndText(item.logType); + const avatar = Array.isArray(item.userAvatars) ? item.userAvatars[1] : undefined; + // TODO: we need to get the absolute url for the avatars from the server + const avatarUrl = avatar ? `${this._serverUrl}${avatar}` : undefined; + return html` - + + ${this.localize.term(text.label)} ${this.localize.term(text.desc, item.parameters)} diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info-history.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info-history.element.ts index 1b14ecc9af..c110432190 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info-history.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/info/media-workspace-view-info-history.element.ts @@ -15,6 +15,7 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { AuditLogWithUsernameResponseModel } from '@umbraco-cms/backoffice/external/backend-api'; import { DirectionModel } from '@umbraco-cms/backoffice/external/backend-api'; +import { UMB_APP_CONTEXT } from '@umbraco-cms/backoffice/app'; @customElement('umb-media-workspace-view-info-history') export class UmbMediaWorkspaceViewInfoHistoryElement extends UmbLitElement { @@ -33,9 +34,16 @@ export class UmbMediaWorkspaceViewInfoHistoryElement extends UmbLitElement { @state() private _currentPage = 1; + @state() + private _serverUrl = ''; + constructor() { super(); this.#logRepository = new UmbAuditLogRepository(this); + + this.consumeContext(UMB_APP_CONTEXT, (instance) => { + this._serverUrl = instance.getServerUrl(); + }); } protected firstUpdated(): void { @@ -104,10 +112,16 @@ export class UmbMediaWorkspaceViewInfoHistoryElement extends UmbLitElement { (item) => item.timestamp, (item) => { const { text, style } = HistoryTagStyleAndText(item.logType); + const avatar = Array.isArray(item.userAvatars) ? item.userAvatars[1] : undefined; + // TODO: we need to get the absolute url for the avatars from the server + const avatarUrl = avatar ? `${this._serverUrl}${avatar}` : undefined; return html` - + ${this.localize.term(text.label)} ${this.localize.term(text.desc, item.parameters)} From 4807887f74d51f94696f4051156088cc8a9e988e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 26 Apr 2024 12:15:18 +0200 Subject: [PATCH 3/3] only show eslint errors --- src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml b/src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml index 8e77e1488c..bd973a46e3 100644 --- a/src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml +++ b/src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml @@ -34,7 +34,7 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - run: npm ci --no-audit --no-fund --prefer-offline - - run: npm run lint + - run: npm run lint:errors - run: npm run build - run: npm run generate:jsonschema:dist - run: npx playwright install --with-deps