From 04f7da81ec3f4403de297dbcd02f0aff1df4a8e9 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 16 Jan 2025 15:07:54 +0100 Subject: [PATCH] register links and history as info apps --- ...ument-history-workspace-info-app.element.ts} | 17 +++++++++-------- .../documents/audit-log/info-app/manifests.ts | 9 +++++++++ .../views/info => audit-log/info-app}/utils.ts | 11 +---------- .../documents/documents/audit-log/manifests.ts | 4 ++++ .../packages/documents/documents/constants.ts | 1 + .../src/packages/documents/documents/index.ts | 5 +++-- .../packages/documents/documents/manifests.ts | 4 ++++ .../documents/documents/repository/constants.ts | 1 - .../documents/documents/repository/index.ts | 1 - .../documents/documents/repository/manifests.ts | 3 +-- .../documents/documents/url/constants.ts | 1 + .../packages/documents/documents/url/index.ts | 3 +++ ...ocument-links-workspace-info-app.element.ts} | 16 ++++++++-------- .../documents/url/info-app/manifests.ts | 9 +++++++++ .../documents/documents/url/manifests.ts | 4 ++++ .../url => url/repository}/constants.ts | 0 .../repository}/document-url.repository.ts | 0 .../document-url.server.data-source.ts | 0 .../document-url.store.context-token.ts | 0 .../repository}/document-url.store.ts | 0 .../{repository/url => url/repository}/index.ts | 0 .../url => url/repository}/manifests.ts | 0 .../{repository/url => url/repository}/types.ts | 0 .../src/packages/documents/documents/utils.ts | 9 +++++++++ .../documents/documents/workspace/index.ts | 1 + .../document-workspace-view-info.element.ts | 7 ++----- 26 files changed, 69 insertions(+), 37 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{workspace/views/info/document-workspace-view-info-history.element.ts => audit-log/info-app/document-history-workspace-info-app.element.ts} (89%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/info-app/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{workspace/views/info => audit-log/info-app}/utils.ts (95%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/manifests.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/constants.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/index.ts rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{workspace/views/info/document-workspace-view-info-links.element.ts => url/info-app/document-links-workspace-info-app.element.ts} (92%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/info-app/manifests.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/manifests.ts rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{repository/url => url/repository}/constants.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{repository/url => url/repository}/document-url.repository.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{repository/url => url/repository}/document-url.server.data-source.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{repository/url => url/repository}/document-url.store.context-token.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{repository/url => url/repository}/document-url.store.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{repository/url => url/repository}/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{repository/url => url/repository}/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/documents/documents/{repository/url => url/repository}/types.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/index.ts 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/audit-log/info-app/document-history-workspace-info-app.element.ts similarity index 89% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/info-app/document-history-workspace-info-app.element.ts index cfa0bc151a..ec900a351d 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/audit-log/info-app/document-history-workspace-info-app.element.ts @@ -1,7 +1,8 @@ -import type { UmbDocumentAuditLogModel } from '../../../audit-log/types.js'; -import { UmbDocumentAuditLogRepository } from '../../../audit-log/index.js'; -import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../document-workspace.context-token.js'; -import { getDocumentHistoryTagStyleAndText, TimeOptions } from './utils.js'; +import { UmbDocumentAuditLogRepository } from '../repository/index.js'; +import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../workspace/constants.js'; +import type { UmbDocumentAuditLogModel } from '../types.js'; +import { TimeOptions } from '../../utils.js'; +import { getDocumentHistoryTagStyleAndText } from './utils.js'; import { css, customElement, html, nothing, repeat, state, when } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbPaginationManager } from '@umbraco-cms/backoffice/utils'; @@ -13,8 +14,8 @@ import type { ManifestEntityAction } from '@umbraco-cms/backoffice/entity-action import type { UmbUserItemModel } from '@umbraco-cms/backoffice/user'; import type { UUIPaginationEvent } from '@umbraco-cms/backoffice/external/uui'; -@customElement('umb-document-workspace-view-info-history') -export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement { +@customElement('umb-document-history-workspace-info-app') +export class UmbDocumentHistoryWorkspaceInfoAppElement extends UmbLitElement { #allowedActions = new Set(['Umb.EntityAction.Document.Rollback']); #auditLogRepository = new UmbDocumentAuditLogRepository(this); @@ -183,10 +184,10 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement { ]; } -export default UmbDocumentWorkspaceViewInfoHistoryElement; +export default UmbDocumentHistoryWorkspaceInfoAppElement; declare global { interface HTMLElementTagNameMap { - 'umb-document-workspace-view-info-history': UmbDocumentWorkspaceViewInfoHistoryElement; + 'umb-document-history-workspace-info-app': UmbDocumentHistoryWorkspaceInfoAppElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/info-app/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/info-app/manifests.ts new file mode 100644 index 0000000000..61e712b689 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/info-app/manifests.ts @@ -0,0 +1,9 @@ +export const manifests: Array = [ + { + type: 'workspaceInfoApp', + name: 'Document History Workspace Info App', + alias: 'Umb.WorkspaceInfoApp.Document.History', + element: () => import('./document-history-workspace-info-app.element.js'), + weight: 90, + }, +]; 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/audit-log/info-app/utils.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/utils.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/info-app/utils.ts index 5dc112913f..fcf0124809 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/audit-log/info-app/utils.ts @@ -1,4 +1,4 @@ -import { UmbDocumentAuditLog, type UmbDocumentAuditLogType } from '../../../audit-log/utils/index.js'; +import { UmbDocumentAuditLog, type UmbDocumentAuditLogType } from '../utils/index.js'; interface HistoryStyleMap { look: 'default' | 'primary' | 'secondary' | 'outline' | 'placeholder'; @@ -137,12 +137,3 @@ export function getDocumentHistoryTagStyleAndText(type: UmbDocumentAuditLogType) }; } } - -export const TimeOptions: Intl.DateTimeFormatOptions = { - year: 'numeric', - month: 'long', - day: 'numeric', - hour: 'numeric', - minute: 'numeric', - second: 'numeric', -}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/manifests.ts new file mode 100644 index 0000000000..9680516a9b --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/audit-log/manifests.ts @@ -0,0 +1,4 @@ +import { manifests as infoAppManifests } from './info-app/manifests.js'; +import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; + +export const manifests: Array = [...infoAppManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/constants.ts index b51328d592..456994bdd6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/constants.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/constants.ts @@ -12,5 +12,6 @@ export * from './reference/constants.js'; export * from './repository/constants.js'; export * from './rollback/constants.js'; export * from './search/constants.js'; +export * from './url/constants.js'; export * from './user-permissions/constants.js'; export * from './workspace/constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts index b172085015..fcc6565ced 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/index.ts @@ -1,9 +1,9 @@ import './components/index.js'; -export { UmbDocumentAuditLogRepository } from './audit-log/index.js'; +export * from './audit-log/index.js'; export * from './components/index.js'; -export * from './entity-actions/index.js'; export * from './constants.js'; +export * from './entity-actions/index.js'; export * from './global-contexts/index.js'; export * from './modals/index.js'; export * from './paths.js'; @@ -11,6 +11,7 @@ export * from './publishing/index.js'; export * from './recycle-bin/index.js'; export * from './reference/index.js'; export * from './repository/index.js'; +export * from './url/index.js'; export * from './user-permissions/index.js'; export * from './tree/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts index bb29839ea2..e744094a3c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/manifests.ts @@ -1,3 +1,4 @@ +import { manifests as auditLogManifests } from './audit-log/manifests.js'; import { manifests as collectionManifests } from './collection/manifests.js'; import { manifests as entityActionManifests } from './entity-actions/manifests.js'; import { manifests as entityBulkActionManifests } from './entity-bulk-actions/manifests.js'; @@ -13,12 +14,14 @@ import { manifests as rollbackManifests } from './rollback/manifests.js'; import { manifests as searchProviderManifests } from './search/manifests.js'; import { manifests as trackedReferenceManifests } from './reference/manifests.js'; import { manifests as treeManifests } from './tree/manifests.js'; +import { manifests as urlManifests } from './url/manifests.js'; import { manifests as userPermissionManifests } from './user-permissions/manifests.js'; import { manifests as workspaceManifests } from './workspace/manifests.js'; import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry'; export const manifests: Array = [ + ...auditLogManifests, ...collectionManifests, ...entityActionManifests, ...entityBulkActionManifests, @@ -34,6 +37,7 @@ export const manifests: Array = ...searchProviderManifests, ...trackedReferenceManifests, ...treeManifests, + ...urlManifests, ...userPermissionManifests, ...workspaceManifests, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/constants.ts index 655e81e66d..7a6c4a9d9c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/constants.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/constants.ts @@ -1,4 +1,3 @@ export * from './detail/constants.js'; export * from './item/constants.js'; -export * from './url/constants.js'; export * from './validation/constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/index.ts index 4e403fde93..8059abd30d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/index.ts @@ -1,6 +1,5 @@ export { UmbDocumentDetailRepository } from './detail/index.js'; export { UmbDocumentItemRepository } from './item/index.js'; -export { UmbDocumentUrlRepository, UMB_DOCUMENT_URL_REPOSITORY_ALIAS } from './url/index.js'; export { UmbDocumentPreviewRepository } from './preview/index.js'; export * from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/manifests.ts index 7c077b7378..4dfb0c911f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/manifests.ts @@ -1,5 +1,4 @@ import { manifests as detailManifests } from './detail/manifests.js'; import { manifests as itemManifests } from './item/manifests.js'; -import { manifests as urlManifests } from './url/manifests.js'; -export const manifests: Array = [...detailManifests, ...itemManifests, ...urlManifests]; +export const manifests: Array = [...detailManifests, ...itemManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/constants.ts new file mode 100644 index 0000000000..41a409dec1 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/constants.ts @@ -0,0 +1 @@ +export * from './repository/constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/index.ts new file mode 100644 index 0000000000..03eef61de7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/index.ts @@ -0,0 +1,3 @@ +export { UmbDocumentUrlRepository, UMB_DOCUMENT_URL_REPOSITORY_ALIAS } from './repository/index.js'; + +export * from './constants.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-links.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/info-app/document-links-workspace-info-app.element.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-links.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/info-app/document-links-workspace-info-app.element.ts index 4024d22977..21f09008aa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-links.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/info-app/document-links-workspace-info-app.element.ts @@ -1,7 +1,7 @@ -import { UmbDocumentUrlRepository } from '../../../repository/url/document-url.repository.js'; -import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../document-workspace.context-token.js'; -import type { UmbDocumentVariantOptionModel } from '../../../types.js'; -import type { UmbDocumentUrlModel } from '../../../repository/url/types.js'; +import { UmbDocumentUrlRepository } from '../repository/index.js'; +import type { UmbDocumentVariantOptionModel } from '../../types.js'; +import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../workspace/constants.js'; +import type { UmbDocumentUrlModel } from '../repository/types.js'; import { css, customElement, html, nothing, repeat, state, when } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbEntityActionEvent } from '@umbraco-cms/backoffice/entity-action'; @@ -18,8 +18,8 @@ interface UmbDocumentInfoViewLink { state: DocumentVariantStateModel | null | undefined; } -@customElement('umb-document-workspace-view-info-links') -export class UmbDocumentWorkspaceViewInfoLinksElement extends UmbLitElement { +@customElement('umb-document-links-workspace-info-app') +export class UmbDocumentLinksWorkspaceInfoAppElement extends UmbLitElement { #documentUrlRepository = new UmbDocumentUrlRepository(this); @state() @@ -284,10 +284,10 @@ export class UmbDocumentWorkspaceViewInfoLinksElement extends UmbLitElement { ]; } -export default UmbDocumentWorkspaceViewInfoLinksElement; +export default UmbDocumentLinksWorkspaceInfoAppElement; declare global { interface HTMLElementTagNameMap { - 'umb-document-workspace-view-info-links': UmbDocumentWorkspaceViewInfoLinksElement; + 'umb-document-links-workspace-info-app': UmbDocumentLinksWorkspaceInfoAppElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/info-app/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/info-app/manifests.ts new file mode 100644 index 0000000000..7e8a0b5d7d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/info-app/manifests.ts @@ -0,0 +1,9 @@ +export const manifests: Array = [ + { + type: 'workspaceInfoApp', + name: 'Document Links Workspace Info App', + alias: 'Umb.WorkspaceInfoApp.Document.Links', + element: () => import('./document-links-workspace-info-app.element.js'), + weight: 100, + }, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/manifests.ts new file mode 100644 index 0000000000..f241b57605 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/manifests.ts @@ -0,0 +1,4 @@ +import { manifests as infoAppManifests } from './info-app/manifests.js'; +import { manifests as repositoryManifests } from './repository/manifests.js'; + +export const manifests: Array = [...repositoryManifests, ...infoAppManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/constants.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/constants.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/document-url.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/document-url.repository.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/document-url.repository.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/document-url.repository.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/document-url.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/document-url.server.data-source.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/document-url.server.data-source.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/document-url.server.data-source.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/document-url.store.context-token.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/document-url.store.context-token.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/document-url.store.context-token.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/document-url.store.context-token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/document-url.store.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/document-url.store.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/document-url.store.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/document-url.store.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/types.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/url/types.ts rename to src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/repository/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts index a7e8ea7e4d..3622652b51 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/utils.ts @@ -37,3 +37,12 @@ export const sortVariants = (a: VariantType, b: VariantType) => { return compareDefault(a, b) || compareMandatory(a, b) || compareState(a, b) || compareName(a, b); }; + +export const TimeOptions: Intl.DateTimeFormatOptions = { + year: 'numeric', + month: 'long', + day: 'numeric', + hour: 'numeric', + minute: 'numeric', + second: 'numeric', +}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/index.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/index.ts new file mode 100644 index 0000000000..5414064f66 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/index.ts @@ -0,0 +1 @@ +export * from './document-workspace.context-token.js'; 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 0e7c96dadf..81d6954dc4 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,7 +1,7 @@ import { UMB_DOCUMENT_PROPERTY_DATASET_CONTEXT, UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../../../constants.js'; import type { UmbDocumentVariantModel } from '../../../types.js'; import { UMB_DOCUMENT_PUBLISHING_WORKSPACE_CONTEXT } from '../../../publishing/index.js'; -import { TimeOptions } from './utils.js'; +import { TimeOptions } from '../../../utils.js'; import { css, customElement, html, ifDefined, nothing, state } from '@umbraco-cms/backoffice/external/lit'; import { DocumentVariantStateModel } from '@umbraco-cms/backoffice/external/backend-api'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @@ -16,8 +16,6 @@ import { UMB_SECTION_USER_PERMISSION_CONDITION_ALIAS } from '@umbraco-cms/backof import { UMB_SETTINGS_SECTION_ALIAS } from '@umbraco-cms/backoffice/settings'; // import of local components -import './document-workspace-view-info-links.element.js'; -import './document-workspace-view-info-history.element.js'; import './document-workspace-view-info-reference.element.js'; @customElement('umb-document-workspace-view-info') @@ -182,10 +180,9 @@ export class UmbDocumentWorkspaceViewInfoElement extends UmbLitElement { override render() { return html`
- + -