mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-19 07:41:22 +02:00
Code Issues Releases Wiki Activity

Change implementation to add validation rules, of which 'required' is shown in the frontend

Browse Source
This commit is contained in:
David Sevilla Martin
2019-11-13 19:43:16 -05:00
committed by Franz Liedke
parent 96d3ae22f2
commit 42861dd986
12 changed files with 116 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
framework/core/js/src/admin/components/MailPage.js
View File

@@ -6,6 +6,10 @@ import Select from '../../common/components/Select';
import LoadingIndicator from '../../common/components/LoadingIndicator';
import saveSettings from '../utils/saveSettings';
// From https://www.30secondsofcode.org/snippet/deepFlatten
// Array.prototype.flatMap is not supported in IE or Edge
const deepFlatten = arr => [].concat(...arr.map(v => (Array.isArray(v) ? deepFlatten(v) : v)));
export default class MailPage extends Page {
init() {
super.init();
@@ -15,7 +19,6 @@ export default class MailPage extends Page {
this.driverFields = {};
this.fields = ['mail_driver', 'mail_from'];
this.fieldsRequired = [];
this.values = {};
const settings = app.data.settings;
@@ -37,8 +40,6 @@ export default class MailPage extends Page {
}
}
this.fieldsRequired = response['data'].map(driver => driver['attributes']['fieldsRequired']).flat();
this.loading = false;
m.redraw();
});
@@ -56,6 +57,7 @@ export default class MailPage extends Page {
}
const fields = this.driverFields[this.values.mail_driver()];
const fieldKeys = Object.keys(fields);
return (
<div className="MailPage">
@@ -88,18 +90,18 @@ export default class MailPage extends Page {
]
})}
{Object.keys(fields).length > 0 && FieldSet.component({
{fieldKeys.length > 0 && FieldSet.component({
label: app.translator.trans(`core.admin.email.${this.values.mail_driver()}_heading`),
className: 'MailPage-MailSettings',
children: [
fields.filter(field => this.fieldsRequired.includes(field) && !this.values[field]()).length > 0 && Alert.component({
fieldKeys.filter(field => fields[field] && fields[field].indexOf('required') !== -1 && !this.values[field]()).length > 0 && Alert.component({
children: app.translator.trans('core.admin.email.incomplete_configuration_text'),
dismissible: false,
}),
<div className="MailPage-MailSettings-input">
{Object.keys(fields).map(field => [
<label>{app.translator.trans(`core.admin.email.${field}_label`)} {this.fieldsRequired.includes(field) ? '*' : ''}</label>,
{fieldKeys.map(field => [
<label>{app.translator.trans(`core.admin.email.${field}_label`)} {(fields[field] || '').indexOf('required') !== -1 ? '*' : ''}</label>,
this.renderField(field),
])}
</div>
@@ -125,7 +127,7 @@ export default class MailPage extends Page {
const prop = this.values[name];
if (typeof field === 'string') {
return <input className="FormControl" value={prop() || ''} oninput={m.withAttr('value', prop)} required={this.fieldsRequired.includes(field)} />;
return <input className="FormControl" value={prop() || ''} oninput={m.withAttr('value', prop)} required={(fields[field] || '').indexOf('required') !== -1} />;
} else {
return <Select value={prop()} options={field} onchange={prop} />;
}