diff --git a/src/components/Utilities/index.js b/src/components/Utilities/index.js index 5fd1dc159fb56f3057727e5d6d3e837196a87aba..c526b49ed449ce8cb03d9d46b026aa72be7bdee7 100644 --- a/src/components/Utilities/index.js +++ b/src/components/Utilities/index.js @@ -2,6 +2,7 @@ import React, { Component, PropTypes } from 'react'; import buildingDetailPropTypes from '../../containers/Building/propTypes'; import request from '../../utils/request'; +import ErrorAlert from '../../components/ErrorAlert'; import { getHeaders, scrapeURL, accountURL } from '../../utils/restServices'; import UtilityAccount from '../UtilityAccount'; @@ -55,7 +56,7 @@ class Utilities extends Component { }); this.resetErrorMessage(); } else if (res.err) { - this.setState({ error: `Failed to retrieve utility accounts. | ${res.err.message}` }); + this.setState({ error: res.err }); } }); } @@ -78,7 +79,7 @@ class Utilities extends Component { }), }).then((res) => { if (res.err) { - this.setState({ error: `Failed to retrieve utility bill. | ${res.err.message}` }); + this.setState({ error: res.err }); } else { const data = res.data; setBillData(data.bill_database_output); @@ -113,7 +114,7 @@ class Utilities extends Component { }), }).then((res) => { if (res.err) { - this.setState({ error: `Failed to update utility bill. | ${res.err.message}` }); + this.setState({ error: res.err }); } else { const data = res.data; // If we upload disaggregated bill there will be no bill data @@ -155,7 +156,7 @@ class Utilities extends Component { }), }).then((res) => { if (res.err) { - this.setState({ error: `There was an error while creating the account. | ${res.err.message}` }); + this.setState({ error: res.err }); const allAccounts = this.state.accountLines.slice(); allAccounts.pop(); allAccounts.push(this.createUtilityComponent()); @@ -199,7 +200,7 @@ class Utilities extends Component { this.setState({ accountLines: newAccounts }); this.resetErrorMessage(); } else { - this.setState({ error: `Failed to delete account. | ${res.err.message}` }); + this.setState({ error: res.err }); } }); } @@ -245,12 +246,10 @@ class Utilities extends Component { render() { return (
-
- {this.state.error} -
+ {this.state.accountLines}
);