extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-13 15:08:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better handling of select validation

Browse Source
This commit is contained in:
nathan 2022-07-12 16:40:38 -06:00
parent 146f6e86f7
commit 2c08542529
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
api/js/etemplate/Et2Select/Et2Select.ts
View File

@ -449,28 +449,38 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
fieldName = await validator.config.fieldName; fieldName = await validator.config.fieldName;
} }
// @ts-ignore [allow-protected] // @ts-ignore [allow-protected]
const message = await validator._getMessage({ return validator._getMessage({
modelValue: value, modelValue: value,
formControl: this, formControl: this,
fieldName, fieldName,
}).then((message) =>
{
feedbackData.push({message, type: validator.type, validator});
}); });
feedbackData.push({message, type: validator.type, validator});
}.bind(this); }.bind(this);
const resultPromises = validators.map(async validator => let resultPromises = [];
validators.map(async validator =>
{ {
let values = this.value; let values = this.value;
if (!Array.isArray(values)) values = [values]; if(!Array.isArray(values))
if (!values.length) values = ['']; // so required validation works {
values.forEach(async value => { values = [values];
}
if(!values.length)
{
values = [''];
} // so required validation works
values.forEach(async value =>
{
const result = validator.execute(value, validator.param, {node: this}); const result = validator.execute(value, validator.param, {node: this});
if(result === true) if(result === true)
{ {
await doValidate(validator, value); resultPromises.push(doValidate(validator, value));
} }
else if (result !== false && typeof result.then === 'function') else if(result !== false && typeof result.then === 'function')
{ {
result.then(doValidate(validator, value)); result.then(doValidate(validator, value));
return result; resultPromises.push(result);
} }
}); });
}); });
@ -482,6 +492,8 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
feedback.feedbackData = feedbackData; feedback.feedbackData = feedbackData;
feedback.slot = "help-text"; feedback.slot = "help-text";
this.append(feedback); this.append(feedback);
// Not always visible?
(<HTMLElement>this.shadowRoot.querySelector("#help-text")).style.display = "initial";
} }
} }