Merge pull request #626 from nazaninreihani/profile-validate

Profile validate

Author: arnabk

src/settings/SettingsAddress.js

@@ -1,9 +1,12 @@
 import React, { PureComponent } from 'react';
+import head from 'lodash.head';
+import validate from 'validate.js';
 import { Legend, Button, InputGroup, ErrorMsg, ServerErrorMsg } from 'binary-components';
 import { actions } from '../_store';
 import States from './States';
 import UpdateNotice from '../containers/UpdateNotice';
 import * as LiveData from '../_data/LiveData';
+import { getConstraints } from './SettingsAddress.validation.config';
 
 export default class SettingsAddress extends PureComponent {
 
@@ -28,6 +31,14 @@ export default class SettingsAddress extends PureComponent {
 			address_state: props.address_state,
 			address_postcode: props.address_postcode,
 			phone: props.phone,
+      touched: {
+        address_line_1: false,
+        address_line_2: false,
+        address_city: false,
+        address_state: false,
+        address_postcode: false,
+				phone: false,
+			},
 		};
 	}
 
@@ -36,15 +47,27 @@ export default class SettingsAddress extends PureComponent {
         actions.getStatesForCountry(country_code);
     }
 
-	onEntryChange = (e: SyntheticEvent) =>
-		this.setState({ [e.target.id]: e.target.value });
+  onEntryChange = (e: SyntheticEvent) =>
+		this.setState({
+			[e.target.id]: e.target.value,
+			touched: { ...this.state.touched, [e.target.id]: true },
+			hasError: false,
+		}, () => {
+		this.validateForm();
+	});
 
-	onFormSubmit = (e: SyntheticEvent) => {
-		e.preventDefault();
+  validateForm = () => {
+		this.constraints = getConstraints(this.props, this.state);
 		this.setState({
-			validatedOnce: true,
+			errors: validate(this.state, this.constraints, { format: 'grouped', fullMessages: false, cleanAttributes: false }) || {},
 		});
-		if (this.allValid) {
+	}
+
+	onFormSubmit = (e: SyntheticEvent) => {
+		e.preventDefault();
+    if (Object.keys(this.state.errors).length > 0) {
+			this.setState({ hasError: true });
+		} else {
 			this.performUpdateSettings();
 		}
 	}
@@ -71,63 +94,69 @@ export default class SettingsAddress extends PureComponent {
 
 	render() {
 		const { states } = this.props;
-		const { validatedOnce, address_line_1, address_line_2, address_city, address_state,
-			address_postcode, country_code, phone, phoneError, serverError, success } = this.state;
-
-		this.allValid = address_line_1 && address_city;
+		const { address_line_1, address_line_2, address_city, address_state,
+			address_postcode, country_code, phone, serverError, success, hasError, touched, errors } = this.state;
 
 		return (
 			<form className="settings-address" onSubmit={this.onFormSubmit}>
 				{serverError && <ServerErrorMsg text={serverError} />}
+        {hasError && <ErrorMsg text="Please fill the form with valid values" />}
 				<UpdateNotice text="Address updated" show={success} />
 				<Legend text="Address" />
 				<InputGroup
 					id="address_line_1"
+					name="address_line_1"
 					type="text"
 					label="Address"
 					value={address_line_1}
 					onChange={this.onEntryChange}
 				/>
-				{validatedOnce && !address_line_1 &&
-					<ErrorMsg text="This field is required." />
-				}
+				{touched.address_line_1 && <ErrorMsg text={head((errors || {}).address_line_1)} />}
 				<InputGroup
 					id="address_line_2"
+					name="address_line_2"
 					type="text"
 					label=" "
 					value={address_line_2}
 					onChange={this.onEntryChange}
 				/>
+        {touched.address_line_2 && <ErrorMsg text={head((errors || {}).address_line_2)} />}
 				<InputGroup
 					id="address_city"
+					name="address_city"
 					type="text"
 					label="Town/City"
 					defaultValue={address_city}
 					onChange={this.onEntryChange}
 				/>
+        {touched.address_city && <ErrorMsg text={head((errors || {}).address_city)} />}
 				<States
 					id="address_state"
+					name="address_state"
 					country={country_code}
 					states={states}
 					onChange={this.onEntryChange}
 					selected={address_state}
 				/>
+        {touched.address_state && <ErrorMsg text={head((errors || {}).address_state)} />}
 				<InputGroup
 					id="address_postcode"
+					name="address_postcode"
 					type="text"
 					label="Postal Code / ZIP"
 					defaultValue={address_postcode}
 					onChange={this.onEntryChange}
 				/>
+        {touched.address_postcode && <ErrorMsg text={head((errors || {}).address_postcode)} />}
 				<InputGroup
 					id="phone"
+					name="phone"
 					type="tel"
 					label="Telephone"
 					defaultValue={phone}
 					onChange={this.onEntryChange}
 				/>
-				{phoneError === 'length' && <ErrorMsg text="You should enter between 6-35 characters." />}
-				{phoneError === 'allowed' && <ErrorMsg text="Only numbers, space, - are allowed." />}
+        {touched.phone && <ErrorMsg text={head((errors || {}).phone)} />}
 				<Button
 					text="Update"
 					onClick={this.tryUpdate}

src/settings/SettingsAddress.validation.config.js

@@ -0,0 +1,64 @@
+import validate from 'validate.js';
+
+/*eslint-disable */
+validate.validators.validateAddress = (value) => {
+  if(/[`~!#$%^&*)(_=+\[}{\]\\";:\?><|]+/.test(value)) {
+    return 'Only letters, numbers, space, hyphen, period, and apostrophe are allowed.';
+  }
+}
+
+validate.validators.validateGeneral = (value) => {
+  if(/[`~!@#$%^&*)(_=+\[}{\]\\\/";:\?><,|\d]+/.test(value)) {
+    return 'Only letters, space, hyphen, period, and apostrophe are allowed.';
+  }
+}
+/*eslint-enable */
+
+export const getConstraints = () => {
+  const constraints = {
+    address_line_1: {
+      presence: {
+        presence: true,
+        message: 'This field is required.',
+      },
+      validateAddress: true,
+    },
+    address_line_2: {
+      validateAddress: true,
+    },
+    address_city: {
+      presence: {
+        presence: true,
+        message: 'This field is required.',
+      },
+      validateGeneral: true,
+    },
+    address_state: {
+      presence: {
+        presence: true,
+        message: 'This field is required.',
+      },
+    },
+    address_postcode: {
+      format: {
+        /*eslint-disable */
+        pattern: /^([a-zA-Z\d-\s])*$/,
+        /*eslint-enable */
+        message: 'Only letters, numbers, space, and hyphen are allowed.',
+      },
+    },
+    phone: {
+      presence: {
+        presence: true,
+        message: 'This field is required.',
+      },
+      format: {
+        /*eslint-disable */
+        pattern: /^\+?[0-9\s]*$/,
+        /*eslint-enable */
+        message: 'Only numbers and spaces are allowed.',
+      },
+    },
+  };
+  return constraints;
+};

src/settings/States.js

@@ -17,7 +17,7 @@ export default class States extends PureComponent {
             <fieldset>
                 {noLabel ? null : <label htmlFor={id}>State/Province</label>}
                 <select id={id} onChange={onChange} value={selected}>
-                    {states.map((x, i) => (
+                    {states && states.map((x, i) => (
                         <option key={i} value={x.value}>{x.text}</option>
                     ))}
                 </select>

src/settings/__tests__/settingsaddress-test.js

@@ -0,0 +1,113 @@
+import React from 'react';
+import SettingsAddress from '../SettingsAddress';
+import { mountWithIntl } from 'enzyme-react-intl';
+
+describe('<SettingsSelfExclusion />', () => {
+  // test max_balance as an input which should be number and being validated (other inputs behave like this too)
+  it('Component should be rendered', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+
+    expect(wrapper.type()).toBeDefined();
+  });
+
+  it('address line 1 should have required error when input is empty', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+    const addressLine1 = wrapper.find('#address_line_1');
+    addressLine1.node.value = null;
+    addressLine1.simulate('change');
+    const errors = wrapper.state('errors');
+
+    expect(errors.address_line_1[0]).toEqual('This field is required.');
+  });
+
+  it('address line 1 should be valid when format is valid', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+    const addressLine1 = wrapper.find('#address_line_1');
+    addressLine1.node.value = 'test 123 test';
+    addressLine1.simulate('change');
+    const errors = wrapper.state('errors');
+
+    expect(errors.address_line_1).toBeUndefined();
+  });
+
+  it('address line 1 should not be valid when format is not valid', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+    const addressLine1 = wrapper.find('#address_line_1');
+    addressLine1.node.value = 'test " test';
+    addressLine1.simulate('change');
+    const errors = wrapper.state('errors');
+
+    expect(errors.address_line_1[0]).toEqual('Only letters, numbers, space, hyphen, period, and apostrophe are allowed.');
+  });
+
+  it('address line 2 should not have required error when input is empty', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+    const addressLine2 = wrapper.find('#address_line_2');
+    addressLine2.node.value = null;
+    addressLine2.simulate('change');
+    const errors = wrapper.state('errors');
+
+    expect(errors.address_line_2s).toBeUndefined();
+  });
+
+  it('address city should be valid when format is valid', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+    const addressCity = wrapper.find('#address_city');
+    addressCity.node.value = 'test test';
+    addressCity.simulate('change');
+    const errors = wrapper.state('errors');
+
+    expect(errors.address_city).toBeUndefined();
+  });
+
+  it('address city should not be valid when format is not valid', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+    const addressCity = wrapper.find('#address_city');
+    addressCity.node.value = 'test " test';
+    addressCity.simulate('change');
+    const errors = wrapper.state('errors');
+
+    expect(errors.address_city[0]).toEqual('Only letters, space, hyphen, period, and apostrophe are allowed.');
+  });
+
+  it('address city should be valid when format is valid', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+    const addressPostCode = wrapper.find('#address_postcode');
+    addressPostCode.node.value = 'test 123 test';
+    addressPostCode.simulate('change');
+    const errors = wrapper.state('errors');
+
+    expect(errors.address_postcode).toBeUndefined();
+  });
+
+  it('address city should not be valid when format is not valid', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+    const addressPostCode = wrapper.find('#address_postcode');
+    addressPostCode.node.value = 'test " test';
+    addressPostCode.simulate('change');
+    const errors = wrapper.state('errors');
+
+    expect(errors.address_postcode[0]).toEqual('Only letters, numbers, space, and hyphen are allowed.');
+  });
+
+  it('phone should be valid when format is valid', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+    const phone = wrapper.find('#phone');
+    phone.node.value = '123 456 789';
+    phone.simulate('change');
+    const errors = wrapper.state('errors');
+
+    expect(errors.phone).toBeUndefined();
+  });
+
+  it('phone should not be valid when format is not valid', () => {
+    const wrapper = mountWithIntl(<SettingsAddress />);
+    const phone = wrapper.find('#phone');
+    phone.node.value = 'test 123';
+    phone.simulate('change');
+    const errors = wrapper.state('errors');
+
+    expect(errors.phone[0]).toEqual('Only numbers and spaces are allowed.');
+  });
+
+});