From ecb4d05c39d3c27842f718c5be02fd1890d82bf9 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 5 Feb 2024 16:05:01 +0100 Subject: [PATCH] variant model alignment --- src/Umbraco.Web.UI.Client/src/packages/core/variant/types.ts | 1 - .../src/packages/core/variant/variant-id.class.ts | 4 ++-- .../src/packages/documents/documents/types.ts | 1 + .../documents/workspace/document-workspace-editor.element.ts | 4 ++-- .../documents/workspace/document-workspace.context.ts | 4 +++- .../repository/detail/media-detail.server.data-source.ts | 2 -- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/variant/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/variant/types.ts index af3c5ffbbc..2b5997280d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/variant/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/variant/types.ts @@ -2,7 +2,6 @@ export interface UmbVariantModel { createDate: string | null; culture: string | null; name: string; - publishDate: string | null; segment: string | null; updateDate: string | null; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/variant/variant-id.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/variant/variant-id.class.ts index 752e8bcf11..01a495ea97 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/variant/variant-id.class.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/variant/variant-id.class.ts @@ -1,4 +1,4 @@ -export type variantObject = { culture?: string | null; segment?: string | null }; +export type variantObject = { culture: string | null; segment: string | null }; export const UMB_INVARIANT_CULTURE = 'invariant'; @@ -8,7 +8,7 @@ export class UmbVariantId { } public static CreateInvariant(): UmbVariantId { - return Object.freeze(new UmbVariantId({})); + return Object.freeze(new UmbVariantId({ culture: null, segment: null })); } public readonly culture: string | null = null; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/types.ts index 3be9350c14..780897232b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/types.ts @@ -16,6 +16,7 @@ export interface UmbDocumentDetailModel { export interface UmbDocumentVariantModel extends UmbVariantModel { state: DocumentVariantStateModel | null; + publishDate: string | null; } export interface UmbDocumentUrlInfoModel { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts index 1c4ec4170f..6dcf38a5e4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts @@ -2,9 +2,9 @@ import { UmbDocumentWorkspaceSplitViewElement } from './document-workspace-split import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from './document-workspace.context-token.js'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { customElement, state, css, html } from '@umbraco-cms/backoffice/external/lit'; +import type { UmbVariantModel } from '@umbraco-cms/backoffice/variant'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import type { UmbRoute, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; -import type { VariantModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; import type { ActiveVariant } from '@umbraco-cms/backoffice/workspace'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-document-workspace-editor') @@ -18,7 +18,7 @@ export class UmbDocumentWorkspaceEditorElement extends UmbLitElement { _routes?: Array; @state() - _availableVariants: Array = []; + _availableVariants: Array = []; @state() _workspaceSplitViews: Array = []; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts index d0fee291ce..4bc86ab5a0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts @@ -154,7 +154,9 @@ export class UmbDocumentWorkspaceContext value: UmbDocumentValueModel, variantId?: UmbVariantId, ) { - const entry = { ...variantId?.toObject(), alias, value }; + if (!variantId) throw new Error('VariantId is missing'); + + const entry = { ...variantId.toObject(), alias, value }; const currentData = this.#currentData.value; if (currentData) { const values = appendToFrozenArray( diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts index 4c8e0d4746..b8f2d3402d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/repository/detail/media-detail.server.data-source.ts @@ -47,7 +47,6 @@ export class UmbMediaServerDataSource implements UmbDetailDataSource