yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix validation messages

Browse Source
This commit is contained in:
Pierre Burgy 2017-08-17 11:26:01 +02:00
parent 780579df7b
commit 16f5273699
4 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-plugin-settings-manager/admin/src/components/InputNumber/index.js
View File

@ -66,12 +66,12 @@ class InputNumber extends React.Component { // eslint-disable-line react/prefer-
validate = (value) => {
let errors = [];
const requiredError = { id: 'request.error.validation.required' };
const requiredError = { id: 'settings-manager.request.error.validation.required' };
mapKeys(this.props.validations, (validationValue, validationKey) => {
switch (validationKey) {
case 'required':
if (value.length === 0) {
errors.push({ id: 'request.error.validation.required' });
errors.push({ id: 'settings-manager.request.error.validation.required' });
}
break;
default:

15
packages/strapi-plugin-settings-manager/admin/src/components/InputPassword/index.js
View File

@ -46,27 +46,27 @@ class InputPassword extends React.Component { // eslint-disable-line react/prefe
validate = (value) => {
let errors = [];
// handle i18n
const requiredError = { id: 'request.error.validation.required' };
const requiredError = { id: 'settings-manager.request.error.validation.required' };
mapKeys(this.props.validations, (validationValue, validationKey) => {
switch (validationKey) {
case 'maxLength':
if (value.length > validationValue) {
errors.push({ id: 'request.error.validation.maxLength' });
errors.push({ id: 'settings-manager.request.error.validation.maxLength' });
}
break;
case 'minLength':
if (value.length < validationValue) {
errors.push({ id: 'request.error.validation.minLength' });
errors.push({ id: 'settings-manager.request.error.validation.minLength' });
}
break;
case 'required':
if (value.length === 0) {
errors.push({ id: 'request.error.validation.required' });
errors.push({ id: 'settings-manager.request.error.validation.required' });
}
break;
case 'regex':
if (!new RegExp(validationValue).test(value)) {
errors.push({ id: 'request.error.validation.regex' });
errors.push({ id: 'settings-manager.request.error.validation.regex' });
}
break;
default:
@ -86,8 +86,9 @@ class InputPassword extends React.Component { // eslint-disable-line react/prefe
if (!this.props.noErrorsDescription) {
return (
map(this.state.errors, (error, key) => {
const displayError = isObject(error) && error.id ?
<FormattedMessage {...error} /> : error;
const displayError = isObject(error) && error.id
? <FormattedMessage id={error} />
: error;
return (
<div key={key} className="form-control-feedback">{displayError}</div>
);

15
packages/strapi-plugin-settings-manager/admin/src/components/InputText/index.js
View File

@ -67,27 +67,27 @@ class InputText extends React.Component { // eslint-disable-line react/prefer-st
validate = (value) => {
let errors = [];
// handle i18n
const requiredError = { id: 'request.error.validation.required' };
const requiredError = { id: 'settings-manager.request.error.validation.required' };
mapKeys(this.props.validations, (validationValue, validationKey) => {
switch (validationKey) {
case 'maxLength':
if (value.length > validationValue) {
errors.push({ id: 'request.error.validation.maxLength' });
errors.push({ id: 'settings-manager.request.error.validation.maxLength' });
}
break;
case 'minLength':
if (value.length < validationValue) {
errors.push({ id: 'request.error.validation.minLength' });
errors.push({ id: 'settings-manager.request.error.validation.minLength' });
}
break;
case 'required':
if (value.length === 0) {
errors.push({ id: 'request.error.validation.required' });
errors.push({ id: 'settings-manager.request.error.validation.required' });
}
break;
case 'regex':
if (!new RegExp(validationValue).test(value)) {
errors.push({ id: 'request.error.validation.regex' });
errors.push({ id: 'settings-manager.request.error.validation.regex' });
}
break;
default:
@ -105,8 +105,9 @@ class InputText extends React.Component { // eslint-disable-line react/prefer-st
if (!this.props.noErrorsDescription) {
return (
map(this.state.errors, (error, key) => {
const displayError = isObject(error) && error.id ?
<FormattedMessage {...error} /> : error;
const displayError = isObject(error) && error.id
? <FormattedMessage {...error} />
: error;
return (
<div key={key} className="form-control-feedback">{displayError}</div>
);

26
packages/strapi-plugin-settings-manager/admin/src/utils/inputValidations.js
View File

@ -5,7 +5,7 @@ import { findIndex, mapKeys, forEach, includes, has, isUndefined, reject, isEmpt
*
* @params {object, object} formData, formValidations
*
* @return {array} returns errors[{ target: inputTarget, errors: [{id: 'errorId'}]}]
* @return {array} returns errors[{ target: inputTarget, errors: [{id: 'settings-manager.errorId'}]}]
*
*/
@ -31,7 +31,7 @@ export function checkFormValidity(formData, formValidations) {
forEach(valueValidations.nestedValidations, (nestedValidations) => {
if (nestedValidations.validations.required && !has(formData, nestedValidations.target)) {
errors.push({ target: nestedValidations.target, errors: [{ id: 'request.error.validation.required' }] });
errors.push({ target: nestedValidations.target, errors: [{ id: 'settings-manager.request.error.validation.required' }] });
}
});
@ -42,7 +42,7 @@ export function checkFormValidity(formData, formValidations) {
if (!isEmpty(inputErrors)) errors.push({ target: key, errors: inputErrors });
if (formData['security.xframe.value'] && formData['security.xframe.value'] === 'ALLOW-FROM.ALLOW-FROM ') {
errors.push({ target: 'security.xframe.value.nested', errors: [{ id: 'request.error.validation.required' }] });
errors.push({ target: 'security.xframe.value.nested', errors: [{ id: 'settings-manager.request.error.validation.required' }] });
}
});
@ -53,27 +53,27 @@ export function checkFormValidity(formData, formValidations) {
function validate(value, validations) {
let errors = [];
// Handle i18n
const requiredError = { id: 'request.error.validation.required' };
const requiredError = { id: 'settings-manager.request.error.validation.required' };
mapKeys(validations, (validationValue, validationKey) => {
switch (validationKey) {
case 'maxLength':
if (value.length > validationValue) {
errors.push({ id: 'request.error.validation.maxLength' });
errors.push({ id: 'settings-manager.request.error.validation.maxLength' });
}
break;
case 'minLength':
if (value.length < validationValue) {
errors.push({ id: 'request.error.validation.minLength' });
errors.push({ id: 'settings-manager.request.error.validation.minLength' });
}
break;
case 'required':
if (value.length === 0) {
errors.push({ id: 'request.error.validation.required' });
errors.push({ id: 'settings-manager.request.error.validation.required' });
}
break;
case 'regex':
if (!new RegExp(validationValue).test(value)) {
errors.push({ id: 'request.error.validation.regex' });
errors.push({ id: 'settings-manager.request.error.validation.regex' });
}
break;
default:
@ -146,17 +146,17 @@ export function getInputsValidationsFromConfigs(configs) {
*
* @params {object} formData
*
* @return {array} returns errors[{ target: inputTarget, errors: [{id: 'errorId'}]}]
* @return {array} returns errors[{ target: inputTarget, errors: [{id: 'settings-manager.errorId'}]}]
*
*/
export function getRequiredInputsDb(data) {
const formErrors = [
{ target: 'database.connections.${name}.name', errors: [{ id: 'request.error.validation.required' }] },
{ target: 'database.connections.${name}.settings.host', errors: [{ id: 'request.error.validation.required' }] },
{ target: 'database.connections.${name}.settings.port', errors: [{ id: 'request.error.validation.required' }] },
{ target: 'database.connections.${name}.settings.database', errors: [{ id: 'request.error.validation.required' }] },
{ target: 'database.connections.${name}.name', errors: [{ id: 'settings-manager.request.error.validation.required' }] },
{ target: 'database.connections.${name}.settings.host', errors: [{ id: 'settings-manager.request.error.validation.required' }] },
{ target: 'database.connections.${name}.settings.port', errors: [{ id: 'settings-manager.request.error.validation.required' }] },
{ target: 'database.connections.${name}.settings.database', errors: [{ id: 'settings-manager.request.error.validation.required' }] },
];
// If size data === 2 user hasn't filled any input,