From dd20afff9090de307aa8026336d1b0d639fd3b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Fri, 28 Aug 2015 16:18:10 +0200 Subject: [PATCH] rename LoanContract to Contract --- ...ontract_actions.js => contract_actions.js} | 16 +++++------ js/actions/contract_list_actions.js | 27 +++++++++++++++++++ js/actions/loan_contract_list_actions.js | 27 ------------------- js/components/ascribe_forms/form_contract.js | 14 +++++----- js/components/ascribe_forms/form_loan.js | 14 +++++----- js/constants/api_urls.js | 2 +- js/fetchers/ownership_fetcher.js | 10 +++---- js/stores/contract_list_store.js | 22 +++++++++++++++ ...an_contract_store.js => contract_store.js} | 12 ++++----- js/stores/loan_contract_list_store.js | 22 --------------- 10 files changed, 83 insertions(+), 83 deletions(-) rename js/actions/{loan_contract_actions.js => contract_actions.js} (75%) create mode 100644 js/actions/contract_list_actions.js delete mode 100644 js/actions/loan_contract_list_actions.js create mode 100644 js/stores/contract_list_store.js rename js/stores/{loan_contract_store.js => contract_store.js} (56%) delete mode 100644 js/stores/loan_contract_list_store.js diff --git a/js/actions/loan_contract_actions.js b/js/actions/contract_actions.js similarity index 75% rename from js/actions/loan_contract_actions.js rename to js/actions/contract_actions.js index cc7e5a5b..83a788b8 100644 --- a/js/actions/loan_contract_actions.js +++ b/js/actions/contract_actions.js @@ -4,27 +4,27 @@ import alt from '../alt'; import OwnershipFetcher from '../fetchers/ownership_fetcher'; -class LoanContractActions { +class ContractActions { constructor() { this.generateActions( - 'updateLoanContract', - 'flushLoanContract' + 'updateContract', + 'flushContract' ); } fetchLoanContract(email) { if(email.match(/.+\@.+\..+/)) { - OwnershipFetcher.fetchLoanContract(email) + OwnershipFetcher.fetchContract(email) .then((contracts) => { if (contracts && contracts.length > 0) { - this.actions.updateLoanContract({ + this.actions.updateContract({ contractKey: contracts[0].s3Key, contractUrl: contracts[0].s3Url, contractEmail: email }); } else { - this.actions.updateLoanContract({ + this.actions.updateContract({ contractKey: null, contractUrl: null, contractEmail: null @@ -33,7 +33,7 @@ class LoanContractActions { }) .catch((err) => { console.logGlobal(err); - this.actions.updateLoanContract({ + this.actions.updateContract({ contractKey: null, contractUrl: null, contractEmail: null @@ -45,4 +45,4 @@ class LoanContractActions { } } -export default alt.createActions(LoanContractActions); +export default alt.createActions(ContractActions); diff --git a/js/actions/contract_list_actions.js b/js/actions/contract_list_actions.js new file mode 100644 index 00000000..f4257d37 --- /dev/null +++ b/js/actions/contract_list_actions.js @@ -0,0 +1,27 @@ +'use strict'; + +import alt from '../alt'; +import OwnershipFetcher from '../fetchers/ownership_fetcher'; + + +class ContractListActions { + constructor() { + this.generateActions( + 'updateContractList', + 'flushContractList' + ); + } + + fetchContractList() { + OwnershipFetcher.fetchContractList() + .then((contracts) => { + this.actions.updateContractList(contracts); + }) + .catch((err) => { + console.logGlobal(err); + this.actions.updateContractList([]); + }); + } +} + +export default alt.createActions(ContractListActions); diff --git a/js/actions/loan_contract_list_actions.js b/js/actions/loan_contract_list_actions.js deleted file mode 100644 index bc5cef82..00000000 --- a/js/actions/loan_contract_list_actions.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -import alt from '../alt'; -import OwnershipFetcher from '../fetchers/ownership_fetcher'; - - -class LoanContractListActions { - constructor() { - this.generateActions( - 'updateLoanContractList', - 'flushLoanContractList' - ); - } - - fetchLoanContractList() { - OwnershipFetcher.fetchLoanContractList() - .then((contracts) => { - this.actions.updateLoanContractList(contracts); - }) - .catch((err) => { - console.logGlobal(err); - this.actions.updateLoanContractList([]); - }); - } -} - -export default alt.createActions(LoanContractListActions); diff --git a/js/components/ascribe_forms/form_contract.js b/js/components/ascribe_forms/form_contract.js index 5b811cf6..d4e58c79 100644 --- a/js/components/ascribe_forms/form_contract.js +++ b/js/components/ascribe_forms/form_contract.js @@ -2,8 +2,8 @@ import React from 'react'; -import LoanContractListActions from '../../actions/loan_contract_list_actions'; -import LoanContractListStore from '../../stores/loan_contract_list_store'; +import ContractListActions from '../../actions/contract_list_actions'; +import ContractListStore from '../../stores/contract_list_store'; import GlobalNotificationModel from '../../models/global_notification_model'; import GlobalNotificationActions from '../../actions/global_notification_actions'; @@ -26,7 +26,7 @@ let ContractForm = React.createClass({ getInitialState() { return mergeOptions( - LoanContractListStore.getState(), + ContractListStore.getState(), { selectedContract: 0 } @@ -34,12 +34,12 @@ let ContractForm = React.createClass({ }, componentDidMount() { - LoanContractListStore.listen(this.onChange); - LoanContractListActions.fetchLoanContractList(); + ContractListStore.listen(this.onChange); + ContractListActions.fetchContractList(); }, componentWillUnmount() { - LoanContractListStore.unlisten(this.onChange); + ContractListStore.unlisten(this.onChange); }, onChange(state) { @@ -92,7 +92,7 @@ let ContractForm = React.createClass({