From 12d4e9f30888bbd213b75bbec52fb814bae2b591 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 28 Jan 2024 21:37:14 +0100 Subject: [PATCH] make local variant model --- .../src/packages/core/variant/index.ts | 1 + .../src/packages/core/variant/types.ts | 11 +++++++++++ .../workspace-variantable-context.interface.ts | 7 +++---- .../src/packages/documents/documents/types.ts | 12 +----------- 4 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/variant/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/variant/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/variant/index.ts index 2155245d23..cf4b565e59 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/variant/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/variant/index.ts @@ -1 +1,2 @@ export * from './variant-id.class.js'; +export * from './types.js'; 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 new file mode 100644 index 0000000000..cc4dbc93a8 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/variant/types.ts @@ -0,0 +1,11 @@ +import type { ContentStateModel } from '@umbraco-cms/backoffice/backend-api'; + +export interface UmbVariantModel { + createDate: string | null; + culture: string | null; + name: string; + publishDate: string | null; + segment: string | null; + state: ContentStateModel | null; + updateDate: string | null; +} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variantable-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variantable-context.interface.ts index 9ffa5998fe..4e2004e5f2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variantable-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-variantable-context.interface.ts @@ -2,8 +2,7 @@ import type { UmbWorkspaceSplitViewManager } from '../workspace-split-view-manag import type { UmbPropertyDatasetContext } from '../../property/property-dataset/property-dataset-context.interface.js'; import type { UmbSaveableWorkspaceContextInterface } from './saveable-workspace-context.interface.js'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; -import type { UmbVariantId } from '@umbraco-cms/backoffice/variant'; -import type { ContentStateModel, VariantResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; +import type { UmbVariantId, UmbVariantModel } from '@umbraco-cms/backoffice/variant'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export interface UmbVariantableWorkspaceContextInterface extends UmbSaveableWorkspaceContextInterface { @@ -12,9 +11,9 @@ export interface UmbVariantableWorkspaceContextInterface extends UmbSaveableWork setName(name: string, variantId?: UmbVariantId): void; // Variant: - variants: Observable>; + variants: Observable>; splitView: UmbWorkspaceSplitViewManager; - getVariant(variantId: UmbVariantId): VariantResponseModelBaseModel | undefined; + getVariant(variantId: UmbVariantId): UmbVariantModel | undefined; // Property: // This one is async cause it needs to structure to provide this data: 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 466c5cac32..d0a528bf5f 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 @@ -9,15 +9,5 @@ export interface UmbDocumentDetailModel { unique: string; urls: Array; values: Array; - variants: Array; -} - -export interface UmbDocumentVariantModel { - createDate: string | null; - culture: string | null; - name: string; - publishDate: string | null; - segment: string | null; - state: ContentStateModel | null; - updateDate: string | null; + variants: Array; }