yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Niels Lyngsø
2024-04-15 22:14:22 +02:00
parent ece9ba408b
commit 6e0fd5a8d8
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/packages/core/property/property-layout/property-layout.element.ts
View File

@@ -56,16 +56,6 @@ export class UmbPropertyLayoutElement extends LitElement {
@property({ type: Boolean, reflect: true })
public invalid?: boolean;
/**
* @description Describe why the property is invalid.
* @type {boolean}
* @attr
* @default undefined
*/
@property({ type: String, attribute: 'invalid-message' })
public invalidMessage?: string;
// TODO: put the invalidMessage in some hover tooltip or something. [NL]
render() {
// TODO: Only show alias on label if user has access to DocumentType within settings:
return html`

11
src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts
View File

@@ -109,10 +109,8 @@ export class UmbPropertyElement extends UmbLitElement {
@property({ type: String, attribute: false })
public set dataPath(dataPath: string | undefined) {
this.#dataPath = dataPath;
new UmbObserveValidationStateController(this, dataPath, (feedback) => {
// TODO: Join in a pretty way, and localized way(how to join one or more items varies depending on the language. [NL]
// TODO: Also wrap in a general localized message, like "Contains these errors: ..."; [NL]
this._validationMessage = feedback.length > 0 ? feedback.map((x) => x.message).join(', ') : undefined;
new UmbObserveValidationStateController(this, dataPath, (invalid) => {
this._invalid = invalid;
});
}
public get dataPath(): string | undefined {
@@ -127,7 +125,7 @@ export class UmbPropertyElement extends UmbLitElement {
private _element?: ManifestPropertyEditorUi['ELEMENT_TYPE'];
@state()
private _validationMessage?: string;
private _invalid?: boolean;
@state()
private _alias?: string;
@@ -278,8 +276,7 @@ export class UmbPropertyElement extends UmbLitElement {
alias="${ifDefined(this._alias)}"
label="${ifDefined(this._label)}"
description="${ifDefined(this._description)}"
?invalid=${this._validationMessage !== undefined}
.invalidMessage=${this._validationMessage}>
?invalid=${this._invalid}>
${this._renderPropertyActionMenu()}
${this._variantDifference
? html`<uui-tag look="secondary" slot="description">${this._variantDifference}</uui-tag>`