variant model alignment

This commit is contained in:
Mads Rasmussen
2024-02-05 16:05:01 +01:00
parent 2588aba23d
commit ecb4d05c39
6 changed files with 8 additions and 8 deletions

View File

@@ -2,7 +2,6 @@ export interface UmbVariantModel {
createDate: string | null;
culture: string | null;
name: string;
publishDate: string | null;
segment: string | null;
updateDate: string | null;
}

View File

@@ -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;

View File

@@ -16,6 +16,7 @@ export interface UmbDocumentDetailModel {
export interface UmbDocumentVariantModel extends UmbVariantModel {
state: DocumentVariantStateModel | null;
publishDate: string | null;
}
export interface UmbDocumentUrlInfoModel {

View File

@@ -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<UmbRoute>;
@state()
_availableVariants: Array<VariantModelBaseModel> = [];
_availableVariants: Array<UmbVariantModel> = [];
@state()
_workspaceSplitViews: Array<ActiveVariant> = [];

View File

@@ -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(

View File

@@ -47,7 +47,6 @@ export class UmbMediaServerDataSource implements UmbDetailDataSource<UmbMediaDet
culture: null,
segment: null,
name: '',
publishDate: null,
createDate: null,
updateDate: null,
},
@@ -84,7 +83,6 @@ export class UmbMediaServerDataSource implements UmbDetailDataSource<UmbMediaDet
culture: variant.culture || null,
segment: variant.segment || null,
name: variant.name,
publishDate: null,
createDate: variant.createDate,
updateDate: variant.updateDate,
};