From 9415f2a80b7973535c73c2adcc0316c91bf7abbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 20 Feb 2023 15:55:23 +0100 Subject: [PATCH] rename to umb-datatype-based-property --- .../documents/workspace/document-workspace.context.ts | 4 ++-- .../document-workspace-view-edit-properties.element.ts | 4 ++-- .../data-type-based-property.element.ts} | 6 +++--- .../src/backoffice/shared/components/index.ts | 2 +- .../workspace-property/workspace-property.context.ts | 3 +++ .../views/edit/workspace-view-content-edit.element.ts | 6 ++++-- .../workspace-context/workspace-entity-context.interface.ts | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-) rename src/Umbraco.Web.UI.Client/src/backoffice/shared/components/{content-property/content-property.element.ts => data-type-based-property/data-type-based-property.element.ts} (93%) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts index cd9725437a..29dd81a6b9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/document-workspace.context.ts @@ -236,8 +236,8 @@ export class UmbDocumentWorkspaceContext return data.filter((x) => x.name === name && x.type === containerType); }); } - setPropertyValue(alias: string, value: unknown) { - const entry = { alias: alias, value: value }; + setPropertyValue(alias: string, value: unknown, culture: string | null, segment: string | null) { + const entry = { alias, value, culture, segment }; const currentData = this.#draft.value; if (currentData) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-properties.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-properties.element.ts index 14903459cd..c35b244dce 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-properties.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/workspace/views/document-workspace-view-edit-properties.element.ts @@ -133,9 +133,9 @@ export class UmbDocumentWorkspaceViewEditPropertiesElement extends UmbLitElement this._propertyStructure, (property) => property.alias, (property) => - html` ` + .value=${this._propertyValueMap.get(property.alias!)?.value}> ` ); } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/data-type-based-property/data-type-based-property.element.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/shared/components/data-type-based-property/data-type-based-property.element.ts index efb343d311..0547d4c7c7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/content-property/content-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/data-type-based-property/data-type-based-property.element.ts @@ -8,8 +8,8 @@ import '../workspace-property/workspace-property.element'; import { UmbLitElement } from '@umbraco-cms/element'; import { UmbObserverController } from '@umbraco-cms/observable-api'; -@customElement('umb-content-property') -export class UmbContentPropertyElement extends UmbLitElement { +@customElement('umb-datatype-based-property') +export class UmbDataTypeBasedPropertyElement extends UmbLitElement { static styles = [ UUITextStyles, css` @@ -71,6 +71,6 @@ export class UmbContentPropertyElement extends UmbLitElement { declare global { interface HTMLElementTagNameMap { - 'umb-content-property': UmbContentPropertyElement; + 'umb-datatype-based-property': UmbDataTypeBasedPropertyElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts index 2d6e7725aa..fb5537509e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts @@ -5,7 +5,7 @@ import './backoffice-frame/backoffice-modal-container.element'; import './backoffice-frame/backoffice-notification-container.element'; import './ref-property-editor-ui/ref-property-editor-ui.element'; -import './content-property/content-property.element'; +import './data-type-based-property/data-type-based-property.element'; import './table/table.element'; import './code-block/code-block.element'; import './extension-slot/extension-slot.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.context.ts index 2a8f245f37..59b5532ca5 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace-property/workspace-property.context.ts @@ -24,6 +24,9 @@ export class UmbWorkspacePropertyContext { public readonly value = this._data.getObservablePart((data) => data.value); public readonly config = this._data.getObservablePart((data) => data.config); + // culture + // segment + private _workspaceContext?: UmbWorkspaceEntityContextInterface; constructor(host: UmbControllerHostInterface) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/edit/workspace-view-content-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/edit/workspace-view-content-edit.element.ts index b974eda86c..487c53fa29 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/edit/workspace-view-content-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-content/views/edit/workspace-view-content-edit.element.ts @@ -60,7 +60,7 @@ export class UmbWorkspaceViewContentEditElement extends UmbLitElement { this._properties = content?.properties || []; console.log('content', content); - //Maybe we should not give the value(Data), but the umb-content-property should get the context and observe its own data. + //Maybe we should not give the value(Data), but the umb-datatype-based-property should get the context and observe its own data. //This would become a more specific Observer therefor better performance?.. Note to self: Debate with Mads how he sees this perspective. }, 'observeWorkspaceContextData' @@ -75,7 +75,9 @@ export class UmbWorkspaceViewContentEditElement extends UmbLitElement { this._properties, (property) => property.alias, (property) => - html` ` + html` ` )} `; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-entity-context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-entity-context.interface.ts index 87fd3e526e..082d7085b6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-entity-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-entity-context.interface.ts @@ -8,7 +8,7 @@ export interface UmbWorkspaceEntityContextInterface extends UmbWork getData(): T; - setPropertyValue(alias: string, value: unknown): void; + //setPropertyValue(alias: string, value: unknown): void; save(): Promise; }