robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from git

Browse Source
This commit is contained in:
robbond
2021-11-01 11:21:39 +00:00
parent adcff32d73
commit d94b3b3e5a
210 changed files with 69742 additions and 3359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/account/personaldetails.js
+59 -38
View File
@@ -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;