From 521597bd75162647b7b27dc949d038fb5e6822f3 Mon Sep 17 00:00:00 2001 From: Aizizi Yigaimu Date: Fri, 13 Dec 2019 18:28:29 -0500 Subject: [PATCH 1/2] Add console log, fix popup issue --- src/AddressSearch.js | 12 +++++++++++- src/App.js | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/AddressSearch.js b/src/AddressSearch.js index c4029f7ad..137da2729 100644 --- a/src/AddressSearch.js +++ b/src/AddressSearch.js @@ -76,6 +76,7 @@ export default class AddressSearch extends React.Component { this.setState({ addressFound: false , loadingAddressSearchBtn: false, + disabledAddressSearchBtn: true, }); } @@ -177,6 +178,7 @@ export default class AddressSearch extends React.Component { ) } + let showMessage = false; let modalHeader = 'Oops, something is wrong'; let modalBody = this.props.message; let modalFooter = ( @@ -244,8 +246,16 @@ export default class AddressSearch extends React.Component { ); } + // showMessage = this.props.message === 'Please enter street address.' ? true : false; + showMessage = this.props.success === false ? true : false; + + console.log(this.props.success); + console.log(this.props.message); + console.log(showMessage); + console.log(this.state.showModal); + let message = ( - + {modalHeader} diff --git a/src/App.js b/src/App.js index f2ce82797..9168d43e6 100644 --- a/src/App.js +++ b/src/App.js @@ -866,18 +866,26 @@ class App extends React.Component { ReactGA.pageview('/intake'); const building = this.props.building; + console.log(this.props.building); // const questions = this.props.questions; const contact = this.props.contact; const complete = this.props.complete; let addressSearchMessage = ""; + let addressSearchSuccess = true; if (building.data !== undefined && building.data.success === false && building.data.message !== undefined) { + console.log(building.data.success); + console.log(building.data.message); + addressSearchSuccess = false; addressSearchMessage = this.props.building.data.message; + } else { + addressSearchSuccess = true; } const questions = { addressSearch: , -- GitLab From bab21e0bd86d044171edc9e1d697cdb15609015c Mon Sep 17 00:00:00 2001 From: Aizizi Yigaimu Date: Wed, 18 Dec 2019 14:40:02 -0500 Subject: [PATCH 2/2] add loading property to address search component --- src/AddressSearch.js | 11 +---------- src/App.js | 5 ++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/AddressSearch.js b/src/AddressSearch.js index 137da2729..e13d0d4cc 100644 --- a/src/AddressSearch.js +++ b/src/AddressSearch.js @@ -178,7 +178,6 @@ export default class AddressSearch extends React.Component { ) } - let showMessage = false; let modalHeader = 'Oops, something is wrong'; let modalBody = this.props.message; let modalFooter = ( @@ -246,16 +245,8 @@ export default class AddressSearch extends React.Component { ); } - // showMessage = this.props.message === 'Please enter street address.' ? true : false; - showMessage = this.props.success === false ? true : false; - - console.log(this.props.success); - console.log(this.props.message); - console.log(showMessage); - console.log(this.state.showModal); - let message = ( - + {modalHeader} diff --git a/src/App.js b/src/App.js index 9168d43e6..9c19735c2 100644 --- a/src/App.js +++ b/src/App.js @@ -845,6 +845,7 @@ class App extends React.Component { surveyId: this.props.building.data.surveyId, buildingId: this.props.building.data.buildingId, buildingQualified: this.state.buildingQualified, + userId: this.props.building.data.userId, }); }); this.setQuestion(this.state.questions.reviewAnswers.next); @@ -866,7 +867,6 @@ class App extends React.Component { ReactGA.pageview('/intake'); const building = this.props.building; - console.log(this.props.building); // const questions = this.props.questions; const contact = this.props.contact; const complete = this.props.complete; @@ -874,8 +874,6 @@ class App extends React.Component { let addressSearchMessage = ""; let addressSearchSuccess = true; if (building.data !== undefined && building.data.success === false && building.data.message !== undefined) { - console.log(building.data.success); - console.log(building.data.message); addressSearchSuccess = false; addressSearchMessage = this.props.building.data.message; } else { @@ -886,6 +884,7 @@ class App extends React.Component { addressSearch: , -- GitLab