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

Fix invalid fields were not blocking submit

Browse Source
This commit is contained in:
nathan 2022-09-21 09:56:15 -06:00
parent d9cc794836
commit e6ce33b153
2 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
api/js/etemplate/Et2InputWidget/Et2InputWidget.ts
View File

@ -54,6 +54,8 @@ const Et2InputWidgetMixin = <T extends Constructor<LitElement>>(superclass : T)
protected validators : Validator[];
// Validators for every instance of a type of widget
protected defaultValidators : Validator[];
// Promise used during validation
protected validateComplete : Promise<undefined>;
protected isSlComponent = false;
@ -426,25 +428,31 @@ const Et2InputWidgetMixin = <T extends Constructor<LitElement>>(superclass : T)
values.forEach((value) => doCheck(value, validator));
}
});
await Promise.all(resultPromises);
this.validateComplete = Promise.all(resultPromises);
// Show feedback from all failing validators
if(feedbackData.length > 0)
// Wait until all validation is finished, then update UI
this.validateComplete.then(() =>
{
let feedback = <LionValidationFeedback>document.createElement("lion-validation-feedback");
feedback.feedbackData = feedbackData;
feedback.slot = "help-text";
this.append(feedback);
if(this.shadowRoot.querySelector("slot[name='feedback']"))
// Show feedback from all failing validators
if(feedbackData.length > 0)
{
feedback.slot = "feedback";
let feedback = <LionValidationFeedback>document.createElement("lion-validation-feedback");
feedback.feedbackData = feedbackData;
feedback.slot = "help-text";
this.append(feedback);
if(this.shadowRoot.querySelector("slot[name='feedback']"))
{
feedback.slot = "feedback";
}
else
{
// Not always visible?
(<HTMLElement>this.shadowRoot.querySelector("#help-text")).style.display = "initial";
}
}
else
{
// Not always visible?
(<HTMLElement>this.shadowRoot.querySelector("#help-text")).style.display = "initial";
}
}
});
return this.validateComplete;
}
set_validation_error(err : string | false)
@ -482,6 +490,17 @@ const Et2InputWidgetMixin = <T extends Constructor<LitElement>>(superclass : T)
this.validate();
}
/**
* Get a list of feedback types
*
* @returns {string[]}
*/
public get hasFeedbackFor() : string[]
{
let feedback = (<LionValidationFeedback>this.querySelector("lion-validation-feedback"))?.feedbackData || [];
return feedback.map((f) => f.type);
}
/**
* Called whenever the template gets submitted. We return false if the widget
* is not valid, which cancels the submission.

16
api/js/etemplate/etemplate2.ts
View File

@ -1086,14 +1086,18 @@ export class etemplate2
{
let invalid_widgets = widgets.filter((widget) => widget);
if(invalid_widgets.length)
if(invalid_widgets.length && !(invalid_widgets[0] instanceof et2_widget))
{
// Show the first invalid widget, not the last
if(invalid_widgets[0] && invalid_widgets[0] instanceof et2_widget)
// Handle validation_error (messages coming back from server as a response) if widget is children of a tabbox
let tmpWidget = invalid_widgets[0];
while(tmpWidget.getParent() && tmpWidget.getType() !== 'ET2-TABBOX')
{
let messages = [];
let valid = invalid_widgets[0].isValid(messages);
invalid_widgets[0].set_validation_error(messages);
tmpWidget = tmpWidget.getParent();
}
//Activate the tab where the widget with validation error is located
if(tmpWidget.getType() === 'ET2-TABBOX')
{
(<Et2Tabs><unknown>tmpWidget).activateTab(invalid_widgets[0]);
}
}
else