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

an attempt to correct validation property settings

Browse Source
This commit is contained in:
Niels Lyngsø
2023-12-06 09:47:45 +01:00
parent e29af00440
commit fbff64f0c9
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Umbraco.Web.UI.Client/src/packages/core/modal/common/property-settings/property-settings-modal.element.ts
View File

@@ -17,10 +17,10 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
> {
//TODO: Should these options come from the server?
// TODO: Or should they come from a extension point?
@state() private _customValidationOptions = [
@state() private _customValidationOptions: Array<Option> = [
{
name: 'No validation',
value: null,
value: '!NOVALIDATION!',
selected: true,
},
{
@@ -66,19 +66,21 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
this._originalPropertyData = this._value;
const regEx = this._value.validation?.regEx ?? null;
const newlySelected = this._customValidationOptions.find((option) => {
option.selected = option.value === regEx;
return option.selected;
});
if (newlySelected === undefined) {
this._customValidationOptions[4].selected = true;
this.updateValue({
validation: { ...this._value.validation, regEx: this._customValidationOptions[4].value },
});
} else {
this.updateValue({
validation: { ...this._value.validation, regEx: regEx },
if (regEx) {
const newlySelected = this._customValidationOptions.find((option) => {
option.selected = option.value === regEx;
return option.selected;
});
if (newlySelected === undefined) {
this._customValidationOptions[4].selected = true;
this.updateValue({
validation: { ...this._value.validation, regEx: this._customValidationOptions[4].value },
});
} else {
this.updateValue({
validation: { ...this._value.validation, regEx: regEx },
});
}
}
}
@@ -163,7 +165,8 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
}
#onCustomValidationChange(event: UUISelectEvent) {
const regEx = event.target.value || event.target.value === '' ? event.target.value.toString() : null;
const value = event.target.value.toString();
const regEx = value !== '!NOVALIDATION!' ? value : null;
this._customValidationOptions.forEach((option) => {
option.selected = option.value === regEx;
@@ -175,9 +178,10 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
}
#onValidationRegExChange(event: UUIInputEvent) {
const regEx = event.target.value || event.target.value === '' ? event.target.value.toString() : null;
const value = event.target.value.toString();
const regEx = value !== '!NOVALIDATION!' ? value : null;
const betterChoice = this._customValidationOptions.find((option) => {
option.selected = option.value === regEx;
option.selected = option.value === value;
return option.selected;
});
if (betterChoice === undefined) {