rename and simplify user profile validation function
This commit is contained in:
parent
5fb6f4c36a
commit
0ac4c0591d
|
@ -12,7 +12,7 @@ import { Input, Form, Col, Row, Button, Alert, Icon } from 'antd';
|
||||||
import { SOCIAL_INFO } from 'utils/social';
|
import { SOCIAL_INFO } from 'utils/social';
|
||||||
import { SOCIAL_SERVICE, User } from 'types';
|
import { SOCIAL_SERVICE, User } from 'types';
|
||||||
import { UserState } from 'modules/users/reducers';
|
import { UserState } from 'modules/users/reducers';
|
||||||
import { getCreateTeamMemberError } from 'modules/create/utils';
|
import { validateUserProfile } from 'modules/create/utils';
|
||||||
import AvatarEdit from './AvatarEdit';
|
import AvatarEdit from './AvatarEdit';
|
||||||
import './ProfileEdit.less';
|
import './ProfileEdit.less';
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ class ProfileEdit extends React.PureComponent<Props, State> {
|
||||||
socialVerificationError,
|
socialVerificationError,
|
||||||
activeSocialService,
|
activeSocialService,
|
||||||
} = this.state;
|
} = this.state;
|
||||||
const error = getCreateTeamMemberError(fields, true);
|
const error = validateUserProfile(fields);
|
||||||
const isMissingField = !fields.displayName || !fields.title;
|
const isMissingField = !fields.displayName || !fields.title;
|
||||||
const isDisabled =
|
const isDisabled =
|
||||||
!!error ||
|
!!error ||
|
||||||
|
|
|
@ -127,15 +127,11 @@ export function getCreateErrors(
|
||||||
return errors;
|
return errors;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getCreateTeamMemberError(user: User, noEmail?: boolean | null) {
|
export function validateUserProfile(user: User) {
|
||||||
if (user.displayName.length > 30) {
|
if (user.displayName.length > 30) {
|
||||||
return 'Display name can only be 30 characters maximum';
|
return 'Display name can only be 30 characters maximum';
|
||||||
} else if (user.title.length > 30) {
|
} else if (user.title.length > 30) {
|
||||||
return 'Title can only be 30 characters maximum';
|
return 'Title can only be 30 characters maximum';
|
||||||
} else if (!noEmail) {
|
|
||||||
if (!user.emailAddress || !/.+\@.+\..+/.test(user.emailAddress)) {
|
|
||||||
return 'That doesn’t look like a valid email address';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return '';
|
return '';
|
||||||
|
|
Loading…
Reference in New Issue