From 928a3352bf797927d11e3afb41d73bc702f18232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 16 Oct 2024 10:33:03 +0200 Subject: [PATCH] property editor ui name, using label value --- .../libs/localization-api/localization.controller.ts | 5 +++-- .../extensions/property-editor-ui-element.interface.ts | 2 +- .../core/property/property/property.element.ts | 10 +++++----- .../text-box/property-editor-ui-text-box.element.ts | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/libs/localization-api/localization.controller.ts b/src/Umbraco.Web.UI.Client/src/libs/localization-api/localization.controller.ts index 587f7b14d8..d855db82a1 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/localization-api/localization.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/localization-api/localization.controller.ts @@ -109,8 +109,9 @@ export class UmbLocalizationController(key: K, ...args: FunctionParams): string { if (!this.#usedKeys.includes(key)) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/extensions/property-editor-ui-element.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/extensions/property-editor-ui-element.interface.ts index 483b90bcf8..58163db2d9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/extensions/property-editor-ui-element.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/extensions/property-editor-ui-element.interface.ts @@ -1,7 +1,7 @@ import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; export interface UmbPropertyEditorUiElement extends HTMLElement { - alias?: string; + name?: string; value?: unknown; config?: UmbPropertyEditorConfigCollection; mandatory?: boolean; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts index a6a4d719f8..1ec36a2abe 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts @@ -182,9 +182,6 @@ export class UmbPropertyElement extends UmbLitElement { this.#propertyContext.alias, (alias) => { this._alias = alias; - if (this._element) { - this._element.alias = alias; - } }, null, ); @@ -193,6 +190,9 @@ export class UmbPropertyElement extends UmbLitElement { this.#propertyContext.label, (label) => { this._label = label; + if (this._element) { + this._element.name = label; + } }, null, ); @@ -297,9 +297,9 @@ export class UmbPropertyElement extends UmbLitElement { if (this._element) { this._element.addEventListener('change', this._onPropertyEditorChange as any as EventListener); this._element.addEventListener('property-value-change', this._onPropertyEditorChange as any as EventListener); - // No need to observe mandatory or alias, as we already do so and set it on the _element if present: [NL] + // No need to observe mandatory or label, as we already do so and set it on the _element if present: [NL] this._element.mandatory = this._mandatory; - this._element.alias = this._alias; + this._element.name = this._label; // No need for a controller alias, as the clean is handled via the observer prop: this.#valueObserver = this.observe( diff --git a/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/property-editor-ui-text-box.element.ts b/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/property-editor-ui-text-box.element.ts index e0fb795227..7913e1a50c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/property-editor-ui-text-box.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/property-editors/text-box/property-editor-ui-text-box.element.ts @@ -35,11 +35,11 @@ export class UmbPropertyEditorUITextBoxElement mandatoryMessage = UMB_VALIDATION_EMPTY_LOCALIZATION_KEY; /** - * The alias of this field. + * The name of this field. * @type {string} */ @property({ type: String }) - alias?: string; + name?: string; #defaultType: UuiInputTypeType = 'text'; @@ -79,7 +79,7 @@ export class UmbPropertyEditorUITextBoxElement override render() { return html`