ElyBy-Mirror/accounts-frontend
1
0
Fork 0
mirror of https://github.com/elyby/accounts-frontend.git synced 2025-02-24 03:08:00 +05:30
Code Issues Packages Projects Releases Wiki Activity

Decouple validation errors resolving into a separate module

Browse Source
This commit is contained in:
SleepWalker 2016-05-02 11:04:23 +03:00
parent 23ea4d4c47
commit b5c31078fc
3 changed files with 65 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/components/auth/authError/AuthError.jsx
View File

@ -1,10 +1,8 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import { FormattedMessage as Message } from 'react-intl'; import errorsDict from 'services/errorsDict';
import { PanelBodyHeader } from 'components/ui/Panel'; import { PanelBodyHeader } from 'components/ui/Panel';
import messages from './AuthError.messages';
export default class AuthError extends Component { export default class AuthError extends Component {
static displayName = 'AuthError'; static displayName = 'AuthError';
@ -16,9 +14,7 @@ export default class AuthError extends Component {
render() { render() {
let { error } = this.props; let { error } = this.props;
if (this.errorsMap[error]) { error = errorsDict.resolve(error);
error = this.errorsMap[error]();
}
return ( return (
<PanelBodyHeader type="error" onClose={this.props.onClose}> <PanelBodyHeader type="error" onClose={this.props.onClose}>
@ -26,56 +22,4 @@ export default class AuthError extends Component {
</PanelBodyHeader> </PanelBodyHeader>
); );
} }
errorsMap = {
'error.login_required': () => <Message {...messages.loginRequired} />,
'error.login_not_exist': () => <Message {...messages.loginNotExist} />,
'error.password_required': () => <Message {...messages.passwordRequired} />,
'error.password_incorrect': () => (
<span>
<Message {...messages.invalidPassword} />
<br/>
<Message {...messages.suggestResetPassword} values={{
link: (
<a href="#">
<Message {...messages.forgotYourPassword} />
</a>
)
}} />
</span>
),
'error.username_required': () => <Message {...messages.usernameRequired} />,
'error.email_required': () => <Message {...messages.emailRequired} />,
'error.email_invalid': () => <Message {...messages.emailInvalid} />,
'error.email_is_tempmail': () => <Message {...messages.emailIsTempmail} />,
'error.email_not_available': () => (
<span>
<Message {...messages.emailNotAvailable} />
<br/>
<Message {...messages.suggestResetPassword} values={{
link: (
<a href="#">
<Message {...messages.forgotYourPassword} />
</a>
)
}} />
</span>
),
'error.rePassword_required': () => <Message {...messages.rePasswordRequired} />,
'error.password_too_short': () => <Message {...messages.passwordTooShort} />,
'error.rePassword_does_not_match': () => <Message {...messages.passwordsDoesNotMatch} />,
'error.rulesAgreement_required': () => <Message {...messages.rulesAgreementRequired} />,
'error.you_must_accept_rules': () => this.errorsMap['error.rulesAgreement_required'](),
'error.key_required': () => <Message {...messages.keyRequired} />,
'error.key_is_required': () => this.errorsMap['error.key_required'](),
'error.key_not_exists': () => <Message {...messages.keyNotExists} />,
'error.newPassword_required': () => <Message {...messages.newPasswordRequired} />,
'error.newRePassword_required': () => <Message {...messages.newRePasswordRequired} />,
'error.newRePassword_does_not_match': () => <Message {...messages.passwordsDoesNotMatch} />
};
} }

63
src/services/errorsDict.js Normal file
View File

@ -0,0 +1,63 @@
import React from 'react';
import { FormattedMessage as Message } from 'react-intl';
import messages from './errorsDict.messages';
export default {
resolve(error) {
return errorsMap[error] ? errorsMap[error]() : error;
}
}
const errorsMap = {
'error.login_required': () => <Message {...messages.loginRequired} />,
'error.login_not_exist': () => <Message {...messages.loginNotExist} />,
'error.password_required': () => <Message {...messages.passwordRequired} />,
'error.password_incorrect': () => (
<span>
<Message {...messages.invalidPassword} />
<br/>
<Message {...messages.suggestResetPassword} values={{
link: (
<a href="#">
<Message {...messages.forgotYourPassword} />
</a>
)
}} />
</span>
),
'error.username_required': () => <Message {...messages.usernameRequired} />,
'error.email_required': () => <Message {...messages.emailRequired} />,
'error.email_invalid': () => <Message {...messages.emailInvalid} />,
'error.email_is_tempmail': () => <Message {...messages.emailIsTempmail} />,
'error.email_not_available': () => (
<span>
<Message {...messages.emailNotAvailable} />
<br/>
<Message {...messages.suggestResetPassword} values={{
link: (
<a href="#">
<Message {...messages.forgotYourPassword} />
</a>
)
}} />
</span>
),
'error.rePassword_required': () => <Message {...messages.rePasswordRequired} />,
'error.password_too_short': () => <Message {...messages.passwordTooShort} />,
'error.rePassword_does_not_match': () => <Message {...messages.passwordsDoesNotMatch} />,
'error.rulesAgreement_required': () => <Message {...messages.rulesAgreementRequired} />,
'error.you_must_accept_rules': () => this.errorsMap['error.rulesAgreement_required'](),
'error.key_required': () => <Message {...messages.keyRequired} />,
'error.key_is_required': () => this.errorsMap['error.key_required'](),
'error.key_not_exists': () => <Message {...messages.keyNotExists} />,
'error.newPassword_required': () => <Message {...messages.newPasswordRequired} />,
'error.newRePassword_required': () => <Message {...messages.newRePasswordRequired} />,
'error.newRePassword_does_not_match': () => <Message {...messages.passwordsDoesNotMatch} />
};

0
src/components/auth/authError/AuthError.messages.js → src/services/errorsDict.messages.js
View File