From f6caa8c5657c42669779df39c80bc2bd8178053c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 1 Dec 2023 16:48:21 +0100 Subject: [PATCH] clean as part of refactor for simpler variant ctx --- .../variant-context.interface.ts | 17 +++++++++-------- ...workspace-invariantable-context.interface.ts | 3 +-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/variant-context/variant-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/variant-context/variant-context.interface.ts index 48fe5bc9a3..c63f7fd280 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/variant-context/variant-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/variant-context/variant-context.interface.ts @@ -1,5 +1,5 @@ -import type { UmbVariantId } from "../../variant/variant-id.class.js"; -import type { Observable } from "@umbraco-cms/backoffice/external/rxjs"; +import type { UmbVariantId } from '../../variant/variant-id.class.js'; +import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; /** * A variant context, represents a set of properties. @@ -15,20 +15,21 @@ import type { Observable } from "@umbraco-cms/backoffice/external/rxjs"; * Also setting the name is an additional feature. */ export interface UmbVariantContext { - getType(): string; getUnique(): string | undefined; //getUniqueName(): string; - getVariantId: (() => UmbVariantId); + getVariantId: () => UmbVariantId; getName(): string | undefined; readonly name: Observable; + // Should it be possible to get the properties as a list of property aliases? + //readonly properties: Observable>; + destroy(): void; // Property methods: - propertyVariantId?: ((propertyAlias: string) => Promise>); - propertyValueByAlias(propertyAlias: string): Promise>; - setPropertyValue(propertyAlias: string, value: unknown): Promise; - + propertyVariantId?: (propertyAlias: string) => Observable; + propertyValueByAlias(propertyAlias: string): Observable; + setPropertyValue(propertyAlias: string, value: unknown): void; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-context.interface.ts index 07a16286ea..dc539d296a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-context/workspace-invariantable-context.interface.ts @@ -6,7 +6,6 @@ import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; export interface UmbInvariantableWorkspaceContextInterface extends UmbSaveableWorkspaceContextInterface { - // Name: getName(): string | undefined; setName(name: string): void; @@ -15,6 +14,6 @@ export interface UmbInvariantableWorkspaceContextInterface propertyValueByAlias(alias: string): Promise>; getPropertyValue(alias: string): ReturnType; setPropertyValue(alias: string, value: unknown): Promise; - + createVariantContext(host: UmbControllerHost, variantId?: UmbVariantId): UmbVariantContext; }