Merge from git
This commit is contained in:
@@ -24,6 +24,7 @@ const RenderTextfield = ({
|
||||
input,
|
||||
type,
|
||||
errorMsg,
|
||||
disabled,
|
||||
meta: { touched, error },
|
||||
...custom
|
||||
}) => {
|
||||
@@ -55,18 +56,23 @@ const RenderTextfield = ({
|
||||
name={id}
|
||||
id={id}
|
||||
type={type}
|
||||
disabled={disabled ? true : false}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
const PersonalDetails = (props) => {
|
||||
let PersonalDetails = (props) => {
|
||||
const {
|
||||
handleSubmit,
|
||||
value,
|
||||
setPersonalDetailsComplete,
|
||||
setAccountUpdatedComplete,
|
||||
load,
|
||||
pristine,
|
||||
reset,
|
||||
submitting,
|
||||
} = props;
|
||||
let { t, lang } = useTranslation();
|
||||
|
||||
@@ -126,17 +132,18 @@ const PersonalDetails = (props) => {
|
||||
errorMsg="Is required"
|
||||
/>
|
||||
<Field
|
||||
name="email"
|
||||
id="email"
|
||||
name="emailaddress1"
|
||||
id="emailaddress1"
|
||||
component={RenderTextfield}
|
||||
type="email"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
validate={[required, email]}
|
||||
label="Email address"
|
||||
disabled
|
||||
/>
|
||||
<Field
|
||||
name="telephone"
|
||||
id="telephone"
|
||||
name="telephone1"
|
||||
id="telephone1"
|
||||
component={RenderTextfield}
|
||||
type="number"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
@@ -145,8 +152,8 @@ const PersonalDetails = (props) => {
|
||||
/>
|
||||
|
||||
<Field
|
||||
name="companygroup"
|
||||
id="companygroup"
|
||||
name="company"
|
||||
id="company"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
@@ -162,8 +169,8 @@ const PersonalDetails = (props) => {
|
||||
</legend>
|
||||
|
||||
<Field
|
||||
name="addressline1"
|
||||
id="addressline1"
|
||||
name="address1_line1"
|
||||
id="address1_line1"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
@@ -172,8 +179,8 @@ const PersonalDetails = (props) => {
|
||||
errorMsg="Is required"
|
||||
/>
|
||||
<Field
|
||||
name="addressline2"
|
||||
id="addressline2"
|
||||
name="address1_line2"
|
||||
id="address1_line2"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
@@ -181,8 +188,8 @@ const PersonalDetails = (props) => {
|
||||
errorMsg="Is required"
|
||||
/>
|
||||
<Field
|
||||
name="towncity"
|
||||
id="towncity"
|
||||
name="address1_city"
|
||||
id="address1_city"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-10"
|
||||
@@ -191,8 +198,8 @@ const PersonalDetails = (props) => {
|
||||
errorMsg="Is required"
|
||||
/>
|
||||
<Field
|
||||
name="county"
|
||||
id="county"
|
||||
name="address1_county"
|
||||
id="address1_county"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-10"
|
||||
@@ -201,8 +208,8 @@ const PersonalDetails = (props) => {
|
||||
errorMsg="Is required"
|
||||
/>
|
||||
<Field
|
||||
name="postcode"
|
||||
id="postcode"
|
||||
name="address1_postalcode"
|
||||
id="address1_postalcode"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-5"
|
||||
@@ -235,7 +242,7 @@ const PersonalDetails = (props) => {
|
||||
</>
|
||||
)
|
||||
) : (
|
||||
<PersonalDetailsComplete />
|
||||
<PersonalDetailsComplete props={props} />
|
||||
)}
|
||||
</>
|
||||
);
|
||||
@@ -262,23 +269,37 @@ const mapDispatchToProps = (dispatch) => {
|
||||
|
||||
const selector = formValueSelector("personalDetailsForm"); // <-- same as form name
|
||||
|
||||
export default connect(
|
||||
mapStateToProps,
|
||||
mapDispatchToProps
|
||||
//, (state) => ({
|
||||
// initialValues: state.accountDetails.accountDetails.data,
|
||||
// // search: state.search,
|
||||
// searchResultsObj: state.searchResultsObj,
|
||||
// formData: state.formData,
|
||||
// appealType: state.appealType,
|
||||
// accountDetails: state.accountDetails,
|
||||
// form: state.form,
|
||||
// pull initial values from account reducer
|
||||
//})
|
||||
)(
|
||||
reduxForm({
|
||||
form: "personalDetailsForm",
|
||||
enableReinitialize: true, // this is needed!!
|
||||
destroyOnUnmount: false,
|
||||
})(PersonalDetails)
|
||||
);
|
||||
// export default connect(
|
||||
// mapStateToProps,
|
||||
// mapDispatchToProps
|
||||
// //, (state) => ({
|
||||
// // initialValues: state.accountDetails.accountDetails.data,
|
||||
// // // search: state.search,
|
||||
// // searchResultsObj: state.searchResultsObj,
|
||||
// // formData: state.formData,
|
||||
// // appealType: state.appealType,
|
||||
// // accountDetails: state.accountDetails,
|
||||
// // form: state.form,
|
||||
// // pull initial values from account reducer
|
||||
// //})
|
||||
// )(
|
||||
// reduxForm({
|
||||
// form: "personalDetailsForm",
|
||||
// enableReinitialize: true, // this is needed!!
|
||||
// destroyOnUnmount: false,
|
||||
// })(PersonalDetails)
|
||||
// );
|
||||
|
||||
// Decorate with reduxForm(). It will read the initialValues prop provided by connect()
|
||||
PersonalDetails = reduxForm({
|
||||
form: "personalDetailsForm",
|
||||
enableReinitialize: true, // this is needed!!
|
||||
destroyOnUnmount: false,
|
||||
})(PersonalDetails);
|
||||
|
||||
// You have to connect() to any reducers that you wish to connect to yourself
|
||||
PersonalDetails = connect((state) => ({
|
||||
initialValues: state.accountDetails.accountDetails, // pull initial values from account reducer
|
||||
}))(PersonalDetails);
|
||||
|
||||
export default PersonalDetails;
|
||||
|
||||
@@ -80,7 +80,7 @@ const BuildCheckPersonalDetails = (props) => {
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.personalDetailsForm.values
|
||||
.email
|
||||
.emailaddress1
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -104,7 +104,7 @@ const BuildCheckPersonalDetails = (props) => {
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.personalDetailsForm.values
|
||||
.telephone
|
||||
.telephone1
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -127,7 +127,7 @@ const BuildCheckPersonalDetails = (props) => {
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.personalDetailsForm.values
|
||||
.companygroup
|
||||
.company
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -155,7 +155,7 @@ const BuildCheckPersonalDetails = (props) => {
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.personalDetailsForm.values
|
||||
.addressline1
|
||||
.address1_line1
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -179,7 +179,7 @@ const BuildCheckPersonalDetails = (props) => {
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.personalDetailsForm.values
|
||||
.addressline2
|
||||
.address1_line2
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -203,7 +203,7 @@ const BuildCheckPersonalDetails = (props) => {
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.personalDetailsForm.values
|
||||
.towncity
|
||||
.address1_city
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -227,7 +227,7 @@ const BuildCheckPersonalDetails = (props) => {
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.personalDetailsForm.values
|
||||
.county
|
||||
.address1_county
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -251,7 +251,7 @@ const BuildCheckPersonalDetails = (props) => {
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.personalDetailsForm.values
|
||||
.postcode
|
||||
.address1_postalcode
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import _ from "lodash";
|
||||
import Link from "next/link";
|
||||
import React, { useState } from "react";
|
||||
import React, { useState, useEffect } from "react";
|
||||
import { useRouter } from "next/router";
|
||||
import useTranslation from "next-translate/useTranslation";
|
||||
import {
|
||||
@@ -17,6 +17,7 @@ import {
|
||||
setRegisterFormComplete,
|
||||
setAccountCreatedComplete,
|
||||
} from "react-redux";
|
||||
import { updateAccount } from "../../actions";
|
||||
|
||||
const PersonalDetailsComplete = (props) => {
|
||||
const {
|
||||
@@ -30,6 +31,12 @@ const PersonalDetailsComplete = (props) => {
|
||||
const router = useRouter();
|
||||
const { locale } = router;
|
||||
|
||||
useEffect(() => {
|
||||
let contactid = props.accountDetails.loggedinUserId;
|
||||
let updateBody = props.props.props.form.personalDetailsForm.values;
|
||||
updateAccount(contactid, updateBody);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<>
|
||||
<p className="govuk-body">Your details have been updated</p>
|
||||
@@ -41,7 +48,9 @@ const PersonalDetailsComplete = (props) => {
|
||||
</p>
|
||||
|
||||
<p className="govuk-body">
|
||||
<Link href="/myportal">
|
||||
<Link
|
||||
href={"/myportal?q=" + props.accountDetails.loggedinUserId}
|
||||
>
|
||||
<a className="govuk-link">Return to My Portal</a>
|
||||
</Link>
|
||||
</p>
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
getFormSubmitErrors,
|
||||
} from "redux-form";
|
||||
import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
|
||||
import { setAccCr } from "../../store/accountDetails/action";
|
||||
|
||||
const RegisterFormCheck = (props) => {
|
||||
const {
|
||||
@@ -18,6 +19,7 @@ const RegisterFormCheck = (props) => {
|
||||
value,
|
||||
setRegisterFormComplete,
|
||||
setAccountCreatedComplete,
|
||||
setAccCr,
|
||||
} = props;
|
||||
let { t, lang } = useTranslation();
|
||||
|
||||
@@ -26,11 +28,16 @@ const RegisterFormCheck = (props) => {
|
||||
|
||||
return (
|
||||
<>
|
||||
<p>Check that the details you entered are correct.</p>
|
||||
<h2 className="govuk-heading-m">About you</h2>
|
||||
<p>{t("account:register-new-account-check-details-paragraph")}</p>
|
||||
<h2 className="govuk-heading-m">
|
||||
{" "}
|
||||
{t("account:register-new-account-sub-heading-1")}
|
||||
</h2>
|
||||
<dl className="govuk-summary-list govuk-!-margin-bottom-9">
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">First name</dt>
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t("account:register-new-account-first-name-label")}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.accountRegisterForm.values
|
||||
@@ -45,15 +52,19 @@ const RegisterFormCheck = (props) => {
|
||||
setRegisterFormComplete(false);
|
||||
}}
|
||||
>
|
||||
Change
|
||||
{t("common:change-link-label")}
|
||||
<span className="govuk-visually-hidden">
|
||||
first name
|
||||
{t(
|
||||
"account:register-new-account-first-name-label"
|
||||
)}
|
||||
</span>
|
||||
</a>
|
||||
</dd>
|
||||
</div>
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">Last name</dt>
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t("account:register-new-account-last-name-label")}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.accountRegisterForm.values
|
||||
@@ -68,20 +79,24 @@ const RegisterFormCheck = (props) => {
|
||||
setRegisterFormComplete(false);
|
||||
}}
|
||||
>
|
||||
Change
|
||||
{t("common:change-link-label")}
|
||||
|
||||
<span className="govuk-visually-hidden">
|
||||
{" "}
|
||||
last name
|
||||
{t(
|
||||
"account:register-new-account-last-name-label"
|
||||
)}
|
||||
</span>
|
||||
</a>
|
||||
</dd>
|
||||
</div>
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">Email address</dt>
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t("account:register-new-account-email-address-label")}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.accountRegisterForm.values
|
||||
.email
|
||||
.emailaddress1
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -92,20 +107,25 @@ const RegisterFormCheck = (props) => {
|
||||
setRegisterFormComplete(false);
|
||||
}}
|
||||
>
|
||||
Change
|
||||
{t("common:change-link-label")}
|
||||
|
||||
<span className="govuk-visually-hidden">
|
||||
{" "}
|
||||
email address
|
||||
{t(
|
||||
"account:register-new-account-email-address-label"
|
||||
)}
|
||||
</span>
|
||||
</a>
|
||||
</dd>
|
||||
</div>
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">Telephone</dt>
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t("account:register-new-account-phone-label")}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.accountRegisterForm.values
|
||||
.telephone
|
||||
.telephone1
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -116,14 +136,15 @@ const RegisterFormCheck = (props) => {
|
||||
setRegisterFormComplete(false);
|
||||
}}
|
||||
>
|
||||
Change
|
||||
{t("common:change-link-label")}
|
||||
|
||||
<span className="govuk-visually-hidden">
|
||||
telephone
|
||||
{t("account:register-new-account-phone-label")}
|
||||
</span>
|
||||
</a>
|
||||
</dd>
|
||||
</div>
|
||||
<div className="govuk-summary-list__row">
|
||||
{/* <div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">Company/Group</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
@@ -146,17 +167,21 @@ const RegisterFormCheck = (props) => {
|
||||
</span>
|
||||
</a>
|
||||
</dd>
|
||||
</div>
|
||||
</div> */}
|
||||
</dl>
|
||||
<dl className="govuk-summary-list govuk-!-margin-bottom-9">
|
||||
<h2 className="govuk-heading-m">Your address</h2>
|
||||
<h2 className="govuk-heading-m">
|
||||
{t("account:register-new-account-sub-heading-2")}
|
||||
</h2>
|
||||
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">Address Line 1</dt>
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t("account:register-new-account-address-line-1-label")}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.accountRegisterForm.values
|
||||
.addressline1
|
||||
.address1_line1
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -167,20 +192,25 @@ const RegisterFormCheck = (props) => {
|
||||
setRegisterFormComplete(false);
|
||||
}}
|
||||
>
|
||||
Change
|
||||
{t("common:change-link-label")}
|
||||
|
||||
<span className="govuk-visually-hidden">
|
||||
{" "}
|
||||
address line 1
|
||||
{t(
|
||||
"account:register-new-account-address-line-1-label"
|
||||
)}
|
||||
</span>
|
||||
</a>
|
||||
</dd>
|
||||
</div>
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">Address line 2</dt>
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t("account:register-new-account-address-line-2-label")}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.accountRegisterForm.values
|
||||
.addressline2
|
||||
.address1_line2
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -191,20 +221,25 @@ const RegisterFormCheck = (props) => {
|
||||
setRegisterFormComplete(false);
|
||||
}}
|
||||
>
|
||||
Change
|
||||
{t("common:change-link-label")}
|
||||
|
||||
<span className="govuk-visually-hidden">
|
||||
{" "}
|
||||
address line 2
|
||||
{t(
|
||||
"account:register-new-account-address-line-2-label"
|
||||
)}
|
||||
</span>
|
||||
</a>
|
||||
</dd>
|
||||
</div>
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">Town/City</dt>
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t("account:register-new-account-town-label")}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.accountRegisterForm.values
|
||||
.towncity
|
||||
.address1_city
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -215,20 +250,24 @@ const RegisterFormCheck = (props) => {
|
||||
setRegisterFormComplete(false);
|
||||
}}
|
||||
>
|
||||
Change
|
||||
{t("common:change-link-label")}
|
||||
|
||||
<span className="govuk-visually-hidden">
|
||||
{" "}
|
||||
town/city
|
||||
{t("account:register-new-account-town-label")}
|
||||
</span>
|
||||
</a>
|
||||
</dd>
|
||||
</div>
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">County</dt>
|
||||
<dt className="govuk-summary-list__key">
|
||||
{" "}
|
||||
{t("account:register-new-account-county-label")}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.accountRegisterForm.values
|
||||
.county
|
||||
.address1_county
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -239,20 +278,24 @@ const RegisterFormCheck = (props) => {
|
||||
setRegisterFormComplete(false);
|
||||
}}
|
||||
>
|
||||
Change
|
||||
{t("common:change-link-label")}
|
||||
|
||||
<span className="govuk-visually-hidden">
|
||||
{" "}
|
||||
county
|
||||
{t("account:register-new-account-county-label")}
|
||||
</span>
|
||||
</a>
|
||||
</dd>
|
||||
</div>
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">Postcode</dt>
|
||||
<dt className="govuk-summary-list__key">
|
||||
{" "}
|
||||
{t("account:register-new-account-postcode-label")}
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{
|
||||
props.props.props.form.accountRegisterForm.values
|
||||
.postcode
|
||||
.address1_postalcode
|
||||
}
|
||||
</dd>
|
||||
<dd className="govuk-summary-list__actions">
|
||||
@@ -263,10 +306,13 @@ const RegisterFormCheck = (props) => {
|
||||
setRegisterFormComplete(false);
|
||||
}}
|
||||
>
|
||||
Change
|
||||
{t("common:change-link-label")}
|
||||
|
||||
<span className="govuk-visually-hidden">
|
||||
{" "}
|
||||
postcode
|
||||
{t(
|
||||
"account:register-new-account-postcode-label"
|
||||
)}
|
||||
</span>
|
||||
</a>
|
||||
</dd>
|
||||
@@ -278,10 +324,11 @@ const RegisterFormCheck = (props) => {
|
||||
className="govuk-button"
|
||||
data-module="govuk-button"
|
||||
onClick={() => {
|
||||
setAccCr(false);
|
||||
setAccountCreatedComplete(true);
|
||||
}}
|
||||
>
|
||||
Continue
|
||||
{t("common:continue-button")}
|
||||
</button>
|
||||
</div>
|
||||
</>
|
||||
@@ -304,6 +351,9 @@ const mapDispatchToProps = (dispatch) => {
|
||||
setCurrentSection: (currentSection) => {
|
||||
dispatch(setCurrentSection(currentSection));
|
||||
},
|
||||
setAccCr: (accState) => {
|
||||
dispatch(setAccCr(accState));
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import _ from "lodash";
|
||||
import Link from "next/link";
|
||||
import React, { useState } from "react";
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { useRouter } from "next/router";
|
||||
import useTranslation from "next-translate/useTranslation";
|
||||
|
||||
import jsonpath from "jsonpath";
|
||||
import {
|
||||
Field,
|
||||
reduxForm,
|
||||
@@ -18,6 +20,10 @@ import {
|
||||
setAccountCreatedComplete,
|
||||
} from "react-redux";
|
||||
|
||||
import { setAccCr, setLogout } from "../../store/accountDetails/action";
|
||||
|
||||
import { getEmailAccountCheck, createAccount } from "../../actions";
|
||||
|
||||
const RegisterComplete = (props) => {
|
||||
const {
|
||||
footerLinks,
|
||||
@@ -26,37 +32,94 @@ const RegisterComplete = (props) => {
|
||||
value,
|
||||
setRegisterFormComplete,
|
||||
setAccountCreatedComplete,
|
||||
setAccCr,
|
||||
} = props;
|
||||
let { t, lang } = useTranslation();
|
||||
|
||||
const router = useRouter();
|
||||
const { locale } = router;
|
||||
|
||||
return (
|
||||
const [accountCreated, setAccountCreated] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
let accountBody = props.props.props.form.accountRegisterForm.values;
|
||||
let emailAddress =
|
||||
props.props.props.form.accountRegisterForm.values.emailaddress1;
|
||||
Object.assign(accountBody, {
|
||||
"pinswg_typeofinvolvement": 846040001,
|
||||
});
|
||||
|
||||
accountBody = _.omit(accountBody, ["custom_password_check"]);
|
||||
|
||||
let checkEmailObj = {};
|
||||
|
||||
switch (props.accountDetails.accCr) {
|
||||
case "created":
|
||||
case "exists":
|
||||
break;
|
||||
|
||||
default:
|
||||
let emailExists = getEmailAccountCheck(
|
||||
accountBody.emailaddress1
|
||||
).then((data) => {
|
||||
data["@odata.count"] > 0
|
||||
? setAccCr("exists")
|
||||
: (checkEmailObj = createAccount(accountBody).then(
|
||||
(data) => {
|
||||
//console.log(data);
|
||||
setAccCr("created");
|
||||
}
|
||||
));
|
||||
});
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
return props.accountDetails.accCr == "created" ? (
|
||||
<>
|
||||
<p className="govuk-body">We have sent you a confirmation email.</p>
|
||||
|
||||
<h2 className="govuk-heading-m">What happens next</h2>
|
||||
|
||||
<p className="govuk-body">
|
||||
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a
|
||||
metus non quam mollis egestas. Integer ac leo cursus, laoreet
|
||||
nulla sed, tempus tellus. Mauris condimentum erat arcu.
|
||||
{t("account:register-new-account-confirmation-email")}
|
||||
</p>
|
||||
|
||||
<h2 className="govuk-heading-m">
|
||||
{t("account:register-new-account-sub-heading-what-next")}
|
||||
</h2>
|
||||
|
||||
<p className="govuk-body">
|
||||
Sed imperdiet dignissim ipsum. Orci varius natoque penatibus et
|
||||
magnis dis parturient montes, nascetur ridiculus mus. In id leo
|
||||
in turpis aliquam venenatis ut non erat. Ut est arcu, luctus sit
|
||||
amet pretium sed, iaculis non purus. Etiam dictum tortor commodo
|
||||
luctus rhoncus.
|
||||
{t("account:register-new-account-paragraph-what-next")}
|
||||
</p>
|
||||
|
||||
<p className="govuk-body">
|
||||
<Link href="/">
|
||||
<a className="govuk-link">Login to My Portal</a>
|
||||
<a
|
||||
className="govuk-link"
|
||||
onClick={() => {
|
||||
setLogout(), window.localStorage.clear();
|
||||
}}
|
||||
>
|
||||
{t("account:register-new-account-my-portal-link")}
|
||||
</a>
|
||||
</Link>
|
||||
</p>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<h2 className="govuk-heading-m">
|
||||
{t("account:register-new-account-account-failed")}
|
||||
</h2>
|
||||
<p className="govuk-body">
|
||||
<a
|
||||
onClick={() => {
|
||||
setRegisterFormComplete(false),
|
||||
setAccountCreatedComplete(false),
|
||||
setAccCr("false");
|
||||
}}
|
||||
className="govuk-link"
|
||||
>
|
||||
Try registering again
|
||||
</a>
|
||||
</p>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -73,8 +136,11 @@ const mapStateToProps = (state) => {
|
||||
|
||||
const mapDispatchToProps = (dispatch) => {
|
||||
return {
|
||||
setCurrentSection: (currentSection) => {
|
||||
dispatch(setCurrentSection(currentSection));
|
||||
setAccCr: (accountCreated) => {
|
||||
dispatch(setAccCr(accountCreated));
|
||||
},
|
||||
setLogout: () => {
|
||||
dispatch(setLogout());
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
@@ -28,33 +28,34 @@ const RenderTextfield = ({
|
||||
}) => {
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
className={
|
||||
touched && error
|
||||
? "govuk-form-group govuk-form-group--error"
|
||||
: "govuk-form-group "
|
||||
}
|
||||
>
|
||||
<div className="govuk-form-group ">
|
||||
<label className="govuk-label " htmlFor={id} id={id + "_label"}>
|
||||
{label}
|
||||
</label>
|
||||
{touched && error && (
|
||||
<span id={id + "-error"} className="govuk-error-message">
|
||||
<span className="govuk-visually-hidden">Error:</span>{" "}
|
||||
{touched &&
|
||||
((error && (
|
||||
<span>{errorMsg ? errorMsg : error}</span>
|
||||
)) ||
|
||||
(warning && <span>{warning}</span>))}
|
||||
</span>
|
||||
)}
|
||||
<input
|
||||
{...input}
|
||||
className={className}
|
||||
name={name}
|
||||
id={id}
|
||||
type={type}
|
||||
/>
|
||||
<div>
|
||||
<input
|
||||
{...input}
|
||||
className={className}
|
||||
name={name}
|
||||
id={id}
|
||||
type={type}
|
||||
/>
|
||||
{touched && error && (
|
||||
<span
|
||||
id={id + "-error"}
|
||||
className="govuk-error-message govuk-form-group--error"
|
||||
>
|
||||
<span className="govuk-visually-hidden">
|
||||
Error:
|
||||
</span>{" "}
|
||||
{touched &&
|
||||
((error && (
|
||||
<span>{errorMsg ? errorMsg : error}</span>
|
||||
)) ||
|
||||
(warning && <span>{warning}</span>))}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
@@ -63,6 +64,8 @@ const RenderTextfield = ({
|
||||
const RegisterForm = (props) => {
|
||||
const {
|
||||
handleSubmit,
|
||||
pristine,
|
||||
valid,
|
||||
value,
|
||||
setRegisterFormComplete,
|
||||
setAccountCreatedComplete,
|
||||
@@ -87,21 +90,51 @@ const RegisterForm = (props) => {
|
||||
? "Invalid phone number"
|
||||
: undefined;
|
||||
|
||||
const passwordsMatch = (value, allValues) =>
|
||||
value !== allValues.pinswg_custom_password
|
||||
? "Passwords don't match"
|
||||
: undefined;
|
||||
|
||||
const minLength = (min) => (value) =>
|
||||
value && value.length < min
|
||||
? `Must be ${min} characters or more`
|
||||
: undefined;
|
||||
const minLength5 = minLength(5);
|
||||
|
||||
const [hasErrors, setHasErrors] = useState("");
|
||||
|
||||
const onHandleSubmit = (values) => {
|
||||
//console.log(values);
|
||||
setRegisterFormComplete(true);
|
||||
};
|
||||
|
||||
console.log(pristine);
|
||||
return (
|
||||
<>
|
||||
{!pristine && !valid && (
|
||||
<div>
|
||||
<span
|
||||
id={"summary-error"}
|
||||
className="govuk-error-message govuk-form-group--error-summary"
|
||||
>
|
||||
<span className="govuk-visually-hidden">Error:</span>{" "}
|
||||
<span className="govuk-error-exclamation">
|
||||
There are errors on this page. Please correct any
|
||||
required fields and submit again.
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{props.accountCreatedComplete != true ? (
|
||||
props.registerFormComplete == false ? (
|
||||
<form onSubmit={handleSubmit(onHandleSubmit)}>
|
||||
<fieldset className="govuk-fieldset">
|
||||
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
|
||||
<h2 className="govuk-fieldset__heading">
|
||||
About you
|
||||
{t(
|
||||
"account:register-new-account-sub-heading-1"
|
||||
)}
|
||||
</h2>
|
||||
</legend>
|
||||
<Field
|
||||
@@ -111,8 +144,12 @@ const RegisterForm = (props) => {
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
validate={[required]}
|
||||
label="First name"
|
||||
errorMsg="Is required"
|
||||
label={t(
|
||||
"account:register-new-account-first-name-label"
|
||||
)}
|
||||
errorMsg={t(
|
||||
"account:register-new-account-first-name-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="lastname"
|
||||
@@ -121,93 +158,143 @@ const RegisterForm = (props) => {
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
validate={[required]}
|
||||
label="Last name"
|
||||
errorMsg="Is required"
|
||||
label={t(
|
||||
"account:register-new-account-last-name-label"
|
||||
)}
|
||||
errorMsg={t(
|
||||
"account:register-new-account-last-name-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="email"
|
||||
id="email"
|
||||
name="emailaddress1"
|
||||
id="emailaddress1"
|
||||
component={RenderTextfield}
|
||||
type="email"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
validate={[required, email]}
|
||||
label="Email address"
|
||||
label={t(
|
||||
"account:register-new-account-email-address-label"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="telephone"
|
||||
id="telephone"
|
||||
name="telephone1"
|
||||
id="telephone1"
|
||||
component={RenderTextfield}
|
||||
type="number"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
validate={[required, phoneNumber]}
|
||||
label="Telephone"
|
||||
label={t(
|
||||
"account:register-new-account-phone-label"
|
||||
)}
|
||||
/>
|
||||
|
||||
<Field
|
||||
name="companygroup"
|
||||
id="companygroup"
|
||||
name="pinswg_custom_password"
|
||||
id="pinswg_custom_password"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
type="password"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
label="Company/Group"
|
||||
errorMsg="Is required"
|
||||
label={t(
|
||||
"account:register-new-account-password-label"
|
||||
)}
|
||||
validate={[required, minLength5]}
|
||||
errorMsg={t(
|
||||
"account:register-new-account-password-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="custom_password_check"
|
||||
id="custom_password_check"
|
||||
component={RenderTextfield}
|
||||
type="password"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
label={t(
|
||||
"account:register-new-account-confirm-password-label"
|
||||
)}
|
||||
validate={[
|
||||
required,
|
||||
passwordsMatch,
|
||||
minLength5,
|
||||
]}
|
||||
errorMsg={t(
|
||||
"account:register-new-account-confirm-password-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
</fieldset>
|
||||
<fieldset className="govuk-fieldset">
|
||||
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
|
||||
<h2 className="govuk-fieldset__heading">
|
||||
What is your address?
|
||||
{t(
|
||||
"account:register-new-account-sub-heading-2"
|
||||
)}
|
||||
</h2>
|
||||
</legend>
|
||||
|
||||
<Field
|
||||
name="addressline1"
|
||||
id="addressline1"
|
||||
name="address1_line1"
|
||||
id="address1_line1"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
label="Address line 1"
|
||||
label={t(
|
||||
"account:register-new-account-address-line-1-label"
|
||||
)}
|
||||
validate={[required]}
|
||||
errorMsg="Is required"
|
||||
errorMsg={t(
|
||||
"account:register-new-account-address-line-1-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="addressline2"
|
||||
id="addressline2"
|
||||
name="address1_line2"
|
||||
id="address1_line2"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
label="Address line 2"
|
||||
errorMsg="Is required"
|
||||
label={t(
|
||||
"account:register-new-account-address-line-2-label"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="towncity"
|
||||
id="towncity"
|
||||
name="address1_city"
|
||||
id="address1_city"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-10"
|
||||
label="Town/City"
|
||||
label={t(
|
||||
"account:register-new-account-town-label"
|
||||
)}
|
||||
validate={[required]}
|
||||
errorMsg="Is required"
|
||||
errorMsg={t(
|
||||
"account:register-new-account-town-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="county"
|
||||
id="county"
|
||||
name="address1_county"
|
||||
id="address1_county"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-10"
|
||||
label="County"
|
||||
label={t(
|
||||
"account:register-new-account-county-label"
|
||||
)}
|
||||
validate={[required]}
|
||||
errorMsg="Is required"
|
||||
errorMsg={t(
|
||||
"account:register-new-account-county-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="postcode"
|
||||
id="postcode"
|
||||
name="address1_postalcode"
|
||||
id="address1_postalcode"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-5"
|
||||
label="Postcode"
|
||||
label={t(
|
||||
"account:register-new-account-postcode-label"
|
||||
)}
|
||||
validate={[required]}
|
||||
errorMsg="Is required"
|
||||
errorMsg={t(
|
||||
"account:register-new-account-postcode-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
</fieldset>
|
||||
|
||||
@@ -217,7 +304,7 @@ const RegisterForm = (props) => {
|
||||
className="govuk-button"
|
||||
data-module="govuk-button"
|
||||
>
|
||||
Continue
|
||||
{t("common:continue-button")}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -229,7 +316,11 @@ const RegisterForm = (props) => {
|
||||
/>
|
||||
)
|
||||
) : (
|
||||
<RegisterComplete />
|
||||
<RegisterComplete
|
||||
props={props}
|
||||
setRegisterFormComplete={setRegisterFormComplete}
|
||||
setAccountCreatedComplete={setAccountCreatedComplete}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user