diff --git a/js/actions/contract_agreement_list_actions.js b/js/actions/contract_agreement_list_actions.js index 4993b129..1eedf5b0 100644 --- a/js/actions/contract_agreement_list_actions.js +++ b/js/actions/contract_agreement_list_actions.js @@ -22,8 +22,7 @@ class ContractAgreementListActions { if (contractAgreementList.count > 0) { this.actions.updateContractAgreementList(contractAgreementList.results); resolve(contractAgreementList.results); - } - else{ + } else { resolve(null); } }) @@ -35,13 +34,13 @@ class ContractAgreementListActions { ); } - fetchAvailableContractAgreementList(issuer, createContractAgreement) { + fetchAvailableContractAgreementList(issuer, createPublicContractAgreement) { return Q.Promise((resolve, reject) => { OwnershipFetcher.fetchContractAgreementList(issuer, true, null) .then((acceptedContractAgreementList) => { // if there is at least an accepted contract agreement, we're going to // use it - if(acceptedContractAgreementList.count > 0) { + if (acceptedContractAgreementList.count > 0) { this.actions.updateContractAgreementList(acceptedContractAgreementList.results); } else { // otherwise, we're looking for contract agreements that are still pending @@ -50,15 +49,13 @@ class ContractAgreementListActions { // overcomplicate the method OwnershipFetcher.fetchContractAgreementList(issuer, null, true) .then((pendingContractAgreementList) => { - if(pendingContractAgreementList.count > 0) { + if (pendingContractAgreementList.count > 0) { this.actions.updateContractAgreementList(pendingContractAgreementList.results); - } else { + } else if (createPublicContractAgreement) { // if there was neither a pending nor an active contractAgreement - // found and createContractAgreement is set to true, we create a - // new contract agreement - if(createContractAgreement) { - this.actions.createContractAgreementFromPublicContract(issuer); - } + // found and createPublicContractAgreement is set to true, we create a + // new public contract agreement + this.actions.createContractAgreementFromPublicContract(issuer); } }) .catch((err) => { @@ -81,8 +78,7 @@ class ContractAgreementListActions { // create an agreement with the public contract if there is one if (publicContract && publicContract.length > 0) { return this.actions.createContractAgreement(null, publicContract[0]); - } - else { + } else { /* contractAgreementList in the store is already set to null; */ @@ -91,21 +87,17 @@ class ContractAgreementListActions { if (publicContracAgreement) { this.actions.updateContractAgreementList([publicContracAgreement]); } - }).catch((err) => { - console.logGlobal(err); - }); + }).catch(console.logGlobal); } createContractAgreement(issuer, contract){ return Q.Promise((resolve, reject) => { - OwnershipFetcher.createContractAgreement(issuer, contract).then( - (contractAgreement) => { - resolve(contractAgreement); - } - ).catch((err) => { - console.logGlobal(err); - reject(err); - }); + OwnershipFetcher + .createContractAgreement(issuer, contract).then(resolve) + .catch((err) => { + console.logGlobal(err); + reject(err); + }); }); } } diff --git a/js/components/ascribe_forms/form_consign.js b/js/components/ascribe_forms/form_consign.js index 0d4fa899..77f81a69 100644 --- a/js/components/ascribe_forms/form_consign.js +++ b/js/components/ascribe_forms/form_consign.js @@ -4,6 +4,7 @@ import React from 'react'; import Button from 'react-bootstrap/lib/Button'; +import ContractAgreementProperty from './property_contract_agreement'; import InputTextAreaToggable from './input_textarea_toggable'; import Form from './form'; import Property from './property'; @@ -22,6 +23,7 @@ let ConsignForm = React.createClass({ email: React.PropTypes.string, message: React.PropTypes.string, labels: React.PropTypes.object, + createPublicContractAgreement: React.PropTypes.bool, handleSuccess: React.PropTypes.func }, @@ -52,6 +54,7 @@ let ConsignForm = React.createClass({ const { email } = this.state; const { autoFocusProperty, + createPublicContractAgreement, email: defaultEmail, handleSuccess, id, @@ -107,6 +110,12 @@ let ConsignForm = React.createClass({ placeholder={getLangText('Enter a message...')} required /> + diff --git a/js/components/ascribe_forms/form_loan.js b/js/components/ascribe_forms/form_loan.js index 022d81d9..a0b1240f 100644 --- a/js/components/ascribe_forms/form_loan.js +++ b/js/components/ascribe_forms/form_loan.js @@ -6,20 +6,18 @@ import classnames from 'classnames'; import Button from 'react-bootstrap/lib/Button'; +import ContractAgreementProperty from './property_contract_agreement'; import Form from './form'; -import Property from './property'; import InputTextAreaToggable from './input_textarea_toggable'; import InputDate from './input_date'; -import InputCheckbox from './input_checkbox'; - -import ContractAgreementListStore from '../../stores/contract_agreement_list_store'; -import ContractAgreementListActions from '../../actions/contract_agreement_list_actions'; +import Property from './property'; import AscribeSpinner from '../ascribe_spinner'; +import AclInformation from '../ascribe_buttons/acl_information'; + import { mergeOptions } from '../../utils/general_utils'; import { getLangText } from '../../utils/lang_utils'; -import AclInformation from '../ascribe_buttons/acl_information'; let LoanForm = React.createClass({ propTypes: { @@ -49,55 +47,20 @@ let LoanForm = React.createClass({ showPersonalMessage: true, showEndDate: true, showStartDate: true, - showPassword: true, - createPublicContractAgreement: true + showPassword: true }; }, getInitialState() { - return ContractAgreementListStore.getState(); - }, - - componentDidMount() { - ContractAgreementListStore.listen(this.onChange); - this.getContractAgreementsOrCreatePublic(this.props.email); - }, - - /** - * This method needs to be in form_loan as some whitelabel pages (Cyland) load - * the loanee's email async! - * - * SO LEAVE IT IN! - */ - componentWillReceiveProps(nextProps) { - if(nextProps && nextProps.email && this.props.email !== nextProps.email) { - this.getContractAgreementsOrCreatePublic(nextProps.email); - } - }, - - componentWillUnmount() { - ContractAgreementListStore.unlisten(this.onChange); - }, - - onChange(state) { - this.setState(state); - }, - - getContractAgreementsOrCreatePublic(email){ - ContractAgreementListActions.flushContractAgreementList.defer(); - if (email) { - // fetch the available contractagreements (pending/accepted) - ContractAgreementListActions.fetchAvailableContractAgreementList(email, true); - } return { email: this.props.email || '' }; }, - getFormData(){ + getFormData() { return mergeOptions( this.props.id, - this.getContractAgreementId() + this.refs.contractAgreement.getFormDataForProperty() ); }, @@ -108,90 +71,8 @@ let LoanForm = React.createClass({ }); }, - getContractAgreementId() { - if (this.state.contractAgreementList && this.state.contractAgreementList.length > 0) { - return {'contract_agreement_id': this.state.contractAgreementList[0].id}; - } - return {}; - }, - - getContractCheckbox() { - if(this.state.contractAgreementList && this.state.contractAgreementList.length > 0) { - // we need to define a key on the InputCheckboxes as otherwise - // react is not rerendering them on a store switch and is keeping - // the default value of the component (which is in that case true) - let contractAgreement = this.state.contractAgreementList[0]; - let contract = contractAgreement.contract; - - if(contractAgreement.datetime_accepted) { - return ( - - ); - } else { - return ( - - - - {getLangText('I agree to the')}  - - {getLangText('terms of ')} {contract.issuer} - - - - - ); - } - } else { - return ( - - ); - } - }, - - getAppendix() { - if(this.state.contractAgreementList && this.state.contractAgreementList.length > 0) { - let appendix = this.state.contractAgreementList[0].appendix; - if (appendix && appendix.default) { - return ( - - 
{appendix.default}
- - ); - } - } - return null; + handleReset(event) { + this.handleEmailOnChange(); }, getButtons() { @@ -222,7 +103,7 @@ let LoanForm = React.createClass({ const { email } = this.state; const { children, - email, + createPublicContractAgreement, email: defaultEmail, handleSuccess, gallery, @@ -242,7 +123,7 @@ let LoanForm = React.createClass({ ref='form' url={url} getFormData={this.getFormData} - onReset={this.handleOnChange} + onReset={this.handleReset} handleSuccess={handleSuccess} buttons={this.getButtons()} spinner={ @@ -309,8 +190,12 @@ let LoanForm = React.createClass({ placeholder={getLangText('Enter a message...')} required={showPersonalMessage}/> - {this.getContractCheckbox()} - {this.getAppendix()} + 0) { + ContractAgreementListActions.flushContractAgreementList(); + } + }, + + componentWillUnmount() { + ContractAgreementListStore.unlisten(this.onChange); + }, + + onChange(state) { + this.setState(state); + }, + + getFormDataForProperty() { + return this.getContractAgreementId(); + }, + + getContractAgreementId() { + if (this.state.contractAgreementList && this.state.contractAgreementList.length > 0) { + return { 'contract_agreement_id': this.state.contractAgreementList[0].id }; + } else { + return {}; + } + }, + + getContractAgreementsOrCreatePublic(email) { + ContractAgreementListActions.flushContractAgreementList.defer(); + + if (email) { + // fetch the available contractagreements (pending/accepted) + ContractAgreementListActions.fetchAvailableContractAgreementList(email, this.props.createPublicContractAgreement); + } + }, + + getAppendix() { + const { contractAgreementList } = this.state; + + if (contractAgreementList && contractAgreementList.length > 0) { + const appendix = contractAgreementList[0].appendix; + if (appendix && appendix.default) { + return ( + + 
{appendix.default}
+ + ); + } + } + }, + + getContractCheckbox() { + const { contractAgreementList } = this.state; + + if (contractAgreementList && contractAgreementList.length > 0) { + // we need to define a key on the InputCheckboxes as otherwise + // react is not rerendering them on a store switch and is keeping + // the default value of the component (which is in that case true) + const contractAgreement = contractAgreementList[0]; + const { issuer: contractIssuer, blob: { url_safe: contractUrl } } = contractAgreement.contract; + + if (contractAgreement.datetime_accepted) { + return ( + + ); + } else { + return ( + + + + {getLangText('I agree to the')}  + + {getLangText('terms of ')} {contractIssuer} + + + + + ); + } + } else { + return ( + + ); + } + }, + + render() { + return ( +
+ {this.getContractCheckbox()} + {this.getAppendix()} +
+ ); + } +}); + +export default ContractAgreementProperty; diff --git a/js/utils/regex_utils.js b/js/utils/regex_utils.js new file mode 100644 index 00000000..af948b2b --- /dev/null +++ b/js/utils/regex_utils.js @@ -0,0 +1,7 @@ +'use strict' + +export function isEmail(string) { + // This is a bit of a weak test for an email, but you really can't win them all + // http://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address + return !!string && string.match(/.*@.*\..*/); +}