holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Et2Select: Fix manual message was repeated for each selected value. Once is enough.

Browse Source
This commit is contained in:
nathan 2022-07-14 11:32:24 -06:00
parent 6eed7b5a0e
commit 523c785049
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import {Et2WithSearchMixin} from "./SearchMixin";
import {Et2Tag} from "./Tag/Et2Tag"; import {Et2Tag} from "./Tag/Et2Tag";
import {LionValidationFeedback} from "@lion/form-core"; import {LionValidationFeedback} from "@lion/form-core";
import {RowLimitedMixin} from "../Layout/RowLimitedMixin"; import {RowLimitedMixin} from "../Layout/RowLimitedMixin";
import {ManualMessage} from "../Validators/ManualMessage";
// export Et2WidgetWithSelect which is used as type in other modules // export Et2WidgetWithSelect which is used as type in other modules
export class Et2WidgetWithSelect extends RowLimitedMixin(Et2widgetWithSelectMixin(SlSelect)) export class Et2WidgetWithSelect extends RowLimitedMixin(Et2widgetWithSelectMixin(SlSelect))
@ -441,6 +442,7 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
let validators = [...(this.validators || []), ...(this.defaultValidators || [])]; let validators = [...(this.validators || []), ...(this.defaultValidators || [])];
let fieldName = this.id; let fieldName = this.id;
let feedbackData = []; let feedbackData = [];
let resultPromises = [];
this.querySelector("lion-validation-feedback")?.remove(); this.querySelector("lion-validation-feedback")?.remove();
const doValidate = async function(validator, value) const doValidate = async function(validator, value)
{ {
@ -458,7 +460,20 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
feedbackData.push({message, type: validator.type, validator}); feedbackData.push({message, type: validator.type, validator});
}); });
}.bind(this); }.bind(this);
let resultPromises = []; const doCheck = async(value, validator) =>
{
const result = validator.execute(value, validator.param, {node: this});
if(result === true)
{
resultPromises.push(doValidate(validator, value));
}
else if(result !== false && typeof result.then === 'function')
{
result.then(doValidate(validator, value));
resultPromises.push(result);
}
};
validators.map(async validator => validators.map(async validator =>
{ {
let values = this.value; let values = this.value;
@ -470,19 +485,17 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
{ {
values = ['']; values = [''];
} // so required validation works } // so required validation works
values.forEach(async value =>
// Run manual validation messages just once, doesn't usually matter what the value is
if(validator instanceof ManualMessage)
{ {
const result = validator.execute(value, validator.param, {node: this}); doCheck(values, validator);
if(result === true) }
{ else
resultPromises.push(doValidate(validator, value)); {
} // Validate each individual item
else if(result !== false && typeof result.then === 'function') values.forEach((value) => doCheck(value, validator));
{ }
result.then(doValidate(validator, value));
resultPromises.push(result);
}
});
}); });
await Promise.all(resultPromises); await Promise.all(resultPromises);