rename and simplify user profile validation function

This commit is contained in:
Daniel Ternyak 2019-02-17 14:36:17 -06:00
parent 5fb6f4c36a
commit 0ac4c0591d
No known key found for this signature in database
GPG Key ID: DF212D2DC5D0E245
2 changed files with 3 additions and 7 deletions

View File

@ -12,7 +12,7 @@ import { Input, Form, Col, Row, Button, Alert, Icon } from 'antd';
import { SOCIAL_INFO } from 'utils/social';
import { SOCIAL_SERVICE, User } from 'types';
import { UserState } from 'modules/users/reducers';
import { getCreateTeamMemberError } from 'modules/create/utils';
import { validateUserProfile } from 'modules/create/utils';
import AvatarEdit from './AvatarEdit';
import './ProfileEdit.less';
@ -85,7 +85,7 @@ class ProfileEdit extends React.PureComponent<Props, State> {
socialVerificationError,
activeSocialService,
} = this.state;
const error = getCreateTeamMemberError(fields, true);
const error = validateUserProfile(fields);
const isMissingField = !fields.displayName || !fields.title;
const isDisabled =
!!error ||

View File

@ -127,15 +127,11 @@ export function getCreateErrors(
return errors;
}
export function getCreateTeamMemberError(user: User, noEmail?: boolean | null) {
export function validateUserProfile(user: User) {
if (user.displayName.length > 30) {
return 'Display name can only be 30 characters maximum';
} else if (user.title.length > 30) {
return 'Title can only be 30 characters maximum';
} else if (!noEmail) {
if (!user.emailAddress || !/.+\@.+\..+/.test(user.emailAddress)) {
return 'That doesnt look like a valid email address';
}
}
return '';