From a2d22a19d809474081b906e896acc76a53f91db9 Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Wed, 10 Jan 2024 12:05:58 +0100 Subject: [PATCH] date uses localize.date now --- ...ment-workspace-view-info-history.element.ts | 18 +++--------------- .../document-workspace-view-info.element.ts | 14 +++++++++++--- .../documents/workspace/views/info/utils.ts | 9 +++++++++ 3 files changed, 23 insertions(+), 18 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 1d091d8af8..c74ac7ab8d 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 @@ -1,4 +1,4 @@ -import { HistoryTagStyleAndText } from './utils.js'; +import { HistoryTagStyleAndText, TimeOptions } from './utils.js'; import { UmbAuditLogRepository } from '@umbraco-cms/backoffice/audit-log'; import { css, @@ -24,7 +24,6 @@ import { UmbCurrentUserContext } from '@umbraco-cms/backoffice/current-user'; export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement { #logRepository: UmbAuditLogRepository; #itemsPerPage = 10; - #userIsoCode = 'en-US'; @property() documentUnique = ''; @@ -41,10 +40,6 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement { constructor() { super(); this.#logRepository = new UmbAuditLogRepository(this); - const context = new UmbCurrentUserContext(this); - this.observe(context.languageIsoCode, (IsoCode) => { - this.#userIsoCode = IsoCode; - }); } protected firstUpdated(): void { @@ -110,7 +105,7 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement { ${repeat( this._items, - (item) => item.timestamp + this.#userIsoCode, + (item) => item.timestamp, (item) => { const { text, style } = HistoryTagStyleAndText(item.logType); return html` + detail=${this.localize.date(item.timestamp, TimeOptions)}> ${this.localize.term(text.label)} ${this.localize.term(text.desc, item.parameters)} diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts index 014ae1523e..2e1adf16c5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info.element.ts @@ -1,3 +1,4 @@ +import { TimeOptions } from './utils.js'; import { css, html, customElement, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UMB_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; @@ -7,6 +8,7 @@ import './document-workspace-view-info-history.element.js'; import './document-workspace-view-info-reference.element.js'; import { UmbDocumentWorkspaceContext } from '@umbraco-cms/backoffice/document'; import { ContentUrlInfoModel } from '@umbraco-cms/backoffice/backend-api'; +import { UmbCurrentUserContext } from '@umbraco-cms/backoffice/current-user'; @customElement('umb-document-workspace-view-info') export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { @@ -27,6 +29,9 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { @state() private _urls?: Array; + @state() + private _createDate = 'Unknown'; + constructor() { super(); @@ -60,8 +65,9 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { this._documentUnique = unique!; }); - const something = (this._workspaceContext as UmbDocumentWorkspaceContext).getData(); - console.log(something); + this.observe((this._workspaceContext as UmbDocumentWorkspaceContext).variants, (variants) => { + this._createDate = Array.isArray(variants) ? variants[0].createDate : 'Unknown'; + }); } render() { @@ -116,7 +122,9 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement {
- + + +
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/utils.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/utils.ts index 300f9f95fa..2a3bb65c39 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/utils.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/utils.ts @@ -67,3 +67,12 @@ export function HistoryTagStyleAndText(type: AuditTypeModel): HistoryData { }; } } + +export const TimeOptions: Intl.DateTimeFormatOptions = { + year: 'numeric', + month: 'long', + day: 'numeric', + hour: 'numeric', + minute: 'numeric', + second: 'numeric', +};