From 462de43a7ca4bafa11528c3644814d8b7bef75ea Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Sun, 5 Feb 2017 22:36:08 -0500 Subject: [PATCH 01/10] Rename buildingDetail to DetailPage --- src/routes.js | 4 ++-- src/screens/{BuildingDetail => DetailPage}/index.js | 0 src/screens/{BuildingDetail => DetailPage}/styles.css | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/screens/{BuildingDetail => DetailPage}/index.js (100%) rename src/screens/{BuildingDetail => DetailPage}/styles.css (100%) diff --git a/src/routes.js b/src/routes.js index e6a44002..2b1c549d 100644 --- a/src/routes.js +++ b/src/routes.js @@ -6,7 +6,7 @@ import { requireAuth, redirectIfLoggedIn } from './utils/auth'; import Login from './screens/Login'; import NotFound from './screens/NotFound'; import HomePage from './screens/HomePage'; -import BuildingDetail from './screens/BuildingDetail'; +import DetailPage from './screens/DetailPage'; import BuildingOverview from './containers/BuildingOverview'; import Dimensions from './containers/Dimensions'; import Utilities from './components/Utilities'; @@ -17,7 +17,7 @@ export default ( - + diff --git a/src/screens/BuildingDetail/index.js b/src/screens/DetailPage/index.js similarity index 100% rename from src/screens/BuildingDetail/index.js rename to src/screens/DetailPage/index.js diff --git a/src/screens/BuildingDetail/styles.css b/src/screens/DetailPage/styles.css similarity index 100% rename from src/screens/BuildingDetail/styles.css rename to src/screens/DetailPage/styles.css -- GitLab From aa01058538d0dd6ad7f00c83bc903c479a9c7a4e Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 6 Feb 2017 09:24:01 -0500 Subject: [PATCH 02/10] Rearrange building detail page --- src/components/Utilities/index.js | 28 ++--------------- src/containers/BuildingOverview/index.js | 40 ++++++++++++------------ src/containers/Dimensions/index.js | 12 ------- src/routes.js | 6 ++-- src/screens/DetailPage/index.js | 16 +++------- 5 files changed, 31 insertions(+), 71 deletions(-) diff --git a/src/components/Utilities/index.js b/src/components/Utilities/index.js index 4969a8e5..05762281 100644 --- a/src/components/Utilities/index.js +++ b/src/components/Utilities/index.js @@ -1,12 +1,10 @@ import React, { Component, PropTypes } from 'react'; -import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import buildingDetailPropTypes from '../../containers/BuildingOverview/buildingDetailPropType'; import request from '../../utils/request'; import { getHeaders, utilityURL } from '../../utils/rest_services'; -import { loadBuildingDetail } from '../../containers/BuildingOverview/actions'; import UtilityAccount from '../UtilityAccount'; class Utilities extends Component { @@ -21,23 +19,8 @@ class Utilities extends Component { } componentDidMount() { - const { address, building_id } = this.props.buildingDetail.overview; - - // TODO remove getting adress, should be done in backend - /* eslint-disable camelcase */ - if (!address || this.props.buildingId !== building_id) { - this.props.loadBuildingDetail(this.props.buildingId); - } else if (address && this.props.buildingId === building_id) { - this.getUtilityAccounts(address); - } - } - - componentDidUpdate(prevProps) { - const { address, building_id } = this.props.buildingDetail.overview; - const prevAddress = prevProps.buildingDetail.overview.address; - if (parseInt(this.props.buildingId, 10) === building_id && prevAddress !== address) { - this.getUtilityAccounts(address); - } + const { address } = this.props.buildingDetail.overview; + this.getUtilityAccounts(address); } getUtilityAccounts = (address) => { @@ -186,15 +169,10 @@ class Utilities extends Component { Utilities.propTypes = { buildingId: PropTypes.string, buildingDetail: buildingDetailPropTypes, - loadBuildingDetail: PropTypes.func, }; -function mapDispatchToProps(dispatch) { - return bindActionCreators({ loadBuildingDetail }, dispatch); -} - function mapStateToProps({ buildingDetail }) { return { buildingDetail }; } -export default connect(mapStateToProps, mapDispatchToProps)(Utilities); +export default connect(mapStateToProps)(Utilities); diff --git a/src/containers/BuildingOverview/index.js b/src/containers/BuildingOverview/index.js index 56666f90..e1d9a9e6 100644 --- a/src/containers/BuildingOverview/index.js +++ b/src/containers/BuildingOverview/index.js @@ -6,42 +6,42 @@ import buildingDetailPropTypes from './buildingDetailPropType'; import { loadBuildingDetail } from './actions'; import './styles.css'; -import BuildingOverviewTop from '../../components/BuildingOverviewTop'; +import SideBarDetail from '../../components/SideBarDetail'; class BuildingOverview extends Component { componentDidMount() { - this.props.loadBuildingDetail(this.props.params.buildingID); + this.props.loadBuildingDetail(this.props.buildingId); } render() { - let mainContent =
; - - if (this.props.buildingDetail.overview.error) { - mainContent = ( -

- {this.props.buildingDetail.overview.error.message} -

- ); - } else { - mainContent = ( - - ); - } - + const { error } = this.props.buildingDetail.overview; return (
- {mainContent} +
+ +
+
+
+ {error.message} +
+ {this.props.children && React.cloneElement(this.props.children, { + buildingId: this.props.buildingId, + building: this.props.buildingDetail.overview, + })} +
); } } BuildingOverview.propTypes = { + children: PropTypes.element, buildingDetail: buildingDetailPropTypes, - params: PropTypes.objectOf(PropTypes.string), + buildingId: PropTypes.string, loadBuildingDetail: PropTypes.func, }; diff --git a/src/containers/Dimensions/index.js b/src/containers/Dimensions/index.js index 7ca16d49..ecab85b1 100644 --- a/src/containers/Dimensions/index.js +++ b/src/containers/Dimensions/index.js @@ -8,10 +8,6 @@ import { hitDecision, } from './actions'; -import { - loadBuildingDetail, -} from '../BuildingOverview/actions'; - import buildingDetailPropTypes from '../BuildingOverview/buildingDetailPropType'; import turkHitPropTypes from './propTypes'; @@ -21,13 +17,7 @@ import TurkHit from '../../components/TurkHit'; class Dimensions extends Component { componentDidMount() { - /* eslint-disable camelcase */ - const { address, building_id } = this.props.buildingDetail.overview; - this.props.loadHit(this.props.buildingId); - if (!address || this.props.buildingId !== building_id) { - this.props.loadBuildingDetail(this.props.buildingId); - } } createHitConfirmation = (form) => { @@ -62,7 +52,6 @@ Dimensions.propTypes = { loadHit: PropTypes.func, createHit: PropTypes.func, hitDecision: PropTypes.func, - loadBuildingDetail: PropTypes.func, }; function mapDispatchToProps(dispatch) { @@ -70,7 +59,6 @@ function mapDispatchToProps(dispatch) { loadHit, createHit, hitDecision, - loadBuildingDetail, }, dispatch); } diff --git a/src/routes.js b/src/routes.js index 2b1c549d..37a64d12 100644 --- a/src/routes.js +++ b/src/routes.js @@ -7,7 +7,7 @@ import Login from './screens/Login'; import NotFound from './screens/NotFound'; import HomePage from './screens/HomePage'; import DetailPage from './screens/DetailPage'; -import BuildingOverview from './containers/BuildingOverview'; +import BuildingOverviewTop from './components/BuildingOverviewTop'; import Dimensions from './containers/Dimensions'; import Utilities from './components/Utilities'; @@ -17,9 +17,9 @@ export default ( - + - + diff --git a/src/screens/DetailPage/index.js b/src/screens/DetailPage/index.js index 85cfdc0d..825382ed 100644 --- a/src/screens/DetailPage/index.js +++ b/src/screens/DetailPage/index.js @@ -1,21 +1,15 @@ import React, { PropTypes } from 'react'; -import SideBarDetail from '../../components/SideBarDetail'; - import NavBar from '../../components/NavBar'; +import BuildingOverview from '../../containers/BuildingOverview'; export default function BuildingDetail(props) { return (
-
- -
-
- {props.children && React.cloneElement(props.children, { - buildingId: props.params.buildingID, - })} -
+ + { props.children } +
); } @@ -23,6 +17,6 @@ export default function BuildingDetail(props) { BuildingDetail.propTypes = { children: PropTypes.element, params: PropTypes.shape({ - buildingID: PropTypes.string, + buildingId: PropTypes.string, }), }; -- GitLab From 4ed82ecc92812a5dd6344c2298591ea986feba38 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 6 Feb 2017 09:32:15 -0500 Subject: [PATCH 03/10] Rename BuildingOverview to building --- src/components/Utilities/index.js | 2 +- src/containers/{BuildingOverview => Building}/actions.js | 0 .../buildingDetailPropType.js | 0 src/containers/{BuildingOverview => Building}/constants.js | 0 src/containers/{BuildingOverview => Building}/index.js | 0 src/containers/{BuildingOverview => Building}/reducer.js | 0 src/containers/{BuildingOverview => Building}/sagas.js | 0 src/containers/{BuildingOverview => Building}/styles.css | 0 src/containers/Dimensions/index.js | 2 +- src/reducers.js | 4 ++-- src/sagas.js | 4 ++-- src/screens/DetailPage/index.js | 6 +++--- 12 files changed, 9 insertions(+), 9 deletions(-) rename src/containers/{BuildingOverview => Building}/actions.js (100%) rename src/containers/{BuildingOverview => Building}/buildingDetailPropType.js (100%) rename src/containers/{BuildingOverview => Building}/constants.js (100%) rename src/containers/{BuildingOverview => Building}/index.js (100%) rename src/containers/{BuildingOverview => Building}/reducer.js (100%) rename src/containers/{BuildingOverview => Building}/sagas.js (100%) rename src/containers/{BuildingOverview => Building}/styles.css (100%) diff --git a/src/components/Utilities/index.js b/src/components/Utilities/index.js index 05762281..27f5fd07 100644 --- a/src/components/Utilities/index.js +++ b/src/components/Utilities/index.js @@ -1,6 +1,6 @@ import React, { Component, PropTypes } from 'react'; import { connect } from 'react-redux'; -import buildingDetailPropTypes from '../../containers/BuildingOverview/buildingDetailPropType'; +import buildingDetailPropTypes from '../../containers/Building/buildingDetailPropType'; import request from '../../utils/request'; import { getHeaders, utilityURL } from '../../utils/rest_services'; diff --git a/src/containers/BuildingOverview/actions.js b/src/containers/Building/actions.js similarity index 100% rename from src/containers/BuildingOverview/actions.js rename to src/containers/Building/actions.js diff --git a/src/containers/BuildingOverview/buildingDetailPropType.js b/src/containers/Building/buildingDetailPropType.js similarity index 100% rename from src/containers/BuildingOverview/buildingDetailPropType.js rename to src/containers/Building/buildingDetailPropType.js diff --git a/src/containers/BuildingOverview/constants.js b/src/containers/Building/constants.js similarity index 100% rename from src/containers/BuildingOverview/constants.js rename to src/containers/Building/constants.js diff --git a/src/containers/BuildingOverview/index.js b/src/containers/Building/index.js similarity index 100% rename from src/containers/BuildingOverview/index.js rename to src/containers/Building/index.js diff --git a/src/containers/BuildingOverview/reducer.js b/src/containers/Building/reducer.js similarity index 100% rename from src/containers/BuildingOverview/reducer.js rename to src/containers/Building/reducer.js diff --git a/src/containers/BuildingOverview/sagas.js b/src/containers/Building/sagas.js similarity index 100% rename from src/containers/BuildingOverview/sagas.js rename to src/containers/Building/sagas.js diff --git a/src/containers/BuildingOverview/styles.css b/src/containers/Building/styles.css similarity index 100% rename from src/containers/BuildingOverview/styles.css rename to src/containers/Building/styles.css diff --git a/src/containers/Dimensions/index.js b/src/containers/Dimensions/index.js index ecab85b1..314149d1 100644 --- a/src/containers/Dimensions/index.js +++ b/src/containers/Dimensions/index.js @@ -8,7 +8,7 @@ import { hitDecision, } from './actions'; -import buildingDetailPropTypes from '../BuildingOverview/buildingDetailPropType'; +import buildingDetailPropTypes from '../Building/buildingDetailPropType'; import turkHitPropTypes from './propTypes'; import './styles.css'; diff --git a/src/reducers.js b/src/reducers.js index 6870601e..bf22b798 100644 --- a/src/reducers.js +++ b/src/reducers.js @@ -2,14 +2,14 @@ import { combineReducers } from 'redux'; import { routerReducer } from 'react-router-redux'; import SearchBarReducer from './containers/SearchBar/reducer'; -import BuildingOverviewReducer from './containers/BuildingOverview/reducer'; +import BuildingReducer from './containers/Building/reducer'; import GoogleLoginReducer from './containers/GoogleLogin/reducer'; import DimensionsReducer from './containers/Dimensions/reducer'; export default combineReducers({ routing: routerReducer, buildingList: SearchBarReducer, - buildingDetail: BuildingOverviewReducer, + buildingDetail: BuildingReducer, googleLogin: GoogleLoginReducer, dimensions: DimensionsReducer, }); diff --git a/src/sagas.js b/src/sagas.js index 1d1af9dc..bd7d214a 100644 --- a/src/sagas.js +++ b/src/sagas.js @@ -1,10 +1,10 @@ import buildingsSearchSaga from './containers/SearchBar/sagas'; -import buildingOverviewSaga from './containers/BuildingOverview/sagas'; +import buildingSaga from './containers/Building/sagas'; import dimensionsSaga from './containers/Dimensions/sagas'; export default function* rootSaga() { yield [ - buildingOverviewSaga(), + buildingSaga(), dimensionsSaga(), buildingsSearchSaga(), ]; diff --git a/src/screens/DetailPage/index.js b/src/screens/DetailPage/index.js index 825382ed..721e57fd 100644 --- a/src/screens/DetailPage/index.js +++ b/src/screens/DetailPage/index.js @@ -1,15 +1,15 @@ import React, { PropTypes } from 'react'; import NavBar from '../../components/NavBar'; -import BuildingOverview from '../../containers/BuildingOverview'; +import Building from '../../containers/Building'; export default function BuildingDetail(props) { return (
- + { props.children } - +
); } -- GitLab From b1f82f82b935d7d851946829ab8e1d9c723759f4 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 6 Feb 2017 09:55:24 -0500 Subject: [PATCH 04/10] Move building info into sidebar --- src/components/SideBarDetail/index.js | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/components/SideBarDetail/index.js b/src/components/SideBarDetail/index.js index 3206e3cb..91f1e343 100644 --- a/src/components/SideBarDetail/index.js +++ b/src/components/SideBarDetail/index.js @@ -1,12 +1,25 @@ import React, { PropTypes } from 'react'; import { Link } from 'react-router'; import './styles.css'; +import buildingDetailPropType from '../../containers/Building/buildingDetailPropType'; -export default function SideBarDetail({ buildingId }) { - const rootURL = `/buildings/${buildingId}`; +export default function SideBarDetail({ building, children }) { + const rootURL = `/buildings/${building.building_id}`; return (
- Building ID: {buildingId} +
+
+ {building.address} +
+

{building.zipcode}

+
    +
  • BBL: {building.bbl}
  • +
  • Building ID: {building.building_id}
  • +
  • Lot ID: {building.lot_id}
  • +
  • Borough: {building.borough}
  • +
+
+ { children }
Overview
@@ -18,5 +31,6 @@ export default function SideBarDetail({ buildingId }) { } SideBarDetail.propTypes = { - buildingId: PropTypes.string, + children: PropTypes.element, + building: buildingDetailPropType, }; -- GitLab From 5bb0bbafa99ad28f5e015c25879ba70af6084b3a Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 6 Feb 2017 09:57:27 -0500 Subject: [PATCH 05/10] Rename BuildingOverviewTop to BuildingOverview --- .../{BuildingOverviewTop => BuildingOverview}/index.js | 0 .../{BuildingOverviewTop => BuildingOverview}/styles.css | 0 src/containers/Building/index.js | 2 +- src/routes.js | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/components/{BuildingOverviewTop => BuildingOverview}/index.js (100%) rename src/components/{BuildingOverviewTop => BuildingOverview}/styles.css (100%) diff --git a/src/components/BuildingOverviewTop/index.js b/src/components/BuildingOverview/index.js similarity index 100% rename from src/components/BuildingOverviewTop/index.js rename to src/components/BuildingOverview/index.js diff --git a/src/components/BuildingOverviewTop/styles.css b/src/components/BuildingOverview/styles.css similarity index 100% rename from src/components/BuildingOverviewTop/styles.css rename to src/components/BuildingOverview/styles.css diff --git a/src/containers/Building/index.js b/src/containers/Building/index.js index e1d9a9e6..0ab0cd76 100644 --- a/src/containers/Building/index.js +++ b/src/containers/Building/index.js @@ -19,7 +19,7 @@ class BuildingOverview extends Component { return (
- +
- + -- GitLab From d319dd196490575b5417fefd28a8728d7cdbce98 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 6 Feb 2017 09:58:09 -0500 Subject: [PATCH 06/10] Add .idea to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6c96c5cf..d09ce831 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ build .DS_Store .env npm-debug.log +.idea -- GitLab From 3a4f3919bbe055e94637d15511efb0496b1b7174 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 7 Feb 2017 10:05:26 -0500 Subject: [PATCH 07/10] Update error message when failing to retrieve the building --- src/containers/Building/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/containers/Building/index.js b/src/containers/Building/index.js index 0ab0cd76..cf4fba69 100644 --- a/src/containers/Building/index.js +++ b/src/containers/Building/index.js @@ -26,9 +26,9 @@ class BuildingOverview extends Component { className="alert alert-danger m-t-1" style={{ display: error ? 'block' : 'none' }} > - {error.message} + {`There was a error retrieving the building | ${error.message}`}
- {this.props.children && React.cloneElement(this.props.children, { + {!error && this.props.children && React.cloneElement(this.props.children, { buildingId: this.props.buildingId, building: this.props.buildingDetail.overview, })} -- GitLab From ab0f73dab2e343d3e63eb21b4747e8e1f042d00d Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 7 Feb 2017 12:28:26 -0500 Subject: [PATCH 08/10] Update props name in util --- src/components/Utilities/index.js | 20 +++++++++----------- src/containers/Building/index.js | 15 ++++++++++----- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/components/Utilities/index.js b/src/components/Utilities/index.js index 27f5fd07..f6577690 100644 --- a/src/components/Utilities/index.js +++ b/src/components/Utilities/index.js @@ -1,5 +1,4 @@ import React, { Component, PropTypes } from 'react'; -import { connect } from 'react-redux'; import buildingDetailPropTypes from '../../containers/Building/buildingDetailPropType'; import request from '../../utils/request'; @@ -19,8 +18,11 @@ class Utilities extends Component { } componentDidMount() { - const { address } = this.props.buildingDetail.overview; - this.getUtilityAccounts(address); + const { address } = this.props.building; + // FIXME: remove check if address is undefined + if (address !== undefined) { + this.getUtilityAccounts(address); + } } getUtilityAccounts = (address) => { @@ -59,7 +61,7 @@ class Utilities extends Component { body: JSON.stringify({ ...form, building_id: this.props.buildingId, - building_address: this.props.buildingDetail.overview.address, + building_address: this.props.building.address, }), }).then((res) => { if (res.err) { @@ -79,7 +81,7 @@ class Utilities extends Component { body: JSON.stringify({ ...form, building_id: parseInt(this.props.buildingId, 10), - building_address: this.props.buildingDetail.overview.address, + building_address: this.props.building.address, }), }).then((res) => { if (res.err) { @@ -168,11 +170,7 @@ class Utilities extends Component { Utilities.propTypes = { buildingId: PropTypes.string, - buildingDetail: buildingDetailPropTypes, + building: buildingDetailPropTypes, }; -function mapStateToProps({ buildingDetail }) { - return { buildingDetail }; -} - -export default connect(mapStateToProps)(Utilities); +export default Utilities; diff --git a/src/containers/Building/index.js b/src/containers/Building/index.js index cf4fba69..69086308 100644 --- a/src/containers/Building/index.js +++ b/src/containers/Building/index.js @@ -15,7 +15,15 @@ class BuildingOverview extends Component { } render() { - const { error } = this.props.buildingDetail.overview; + const { error, loading } = this.props.buildingDetail.overview; + let mainContent =
; + if (this.props.children && !error && !loading) { + mainContent = React.cloneElement(this.props.children, { + buildingId: this.props.buildingId, + building: this.props.buildingDetail.overview, + }); + } + return (
@@ -28,10 +36,7 @@ class BuildingOverview extends Component { > {`There was a error retrieving the building | ${error.message}`}
- {!error && this.props.children && React.cloneElement(this.props.children, { - buildingId: this.props.buildingId, - building: this.props.buildingDetail.overview, - })} + { mainContent }
); -- GitLab From ee1e4b78d78b9310c8195435b884e00cdeae7680 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 7 Feb 2017 12:32:29 -0500 Subject: [PATCH 09/10] Rename buildingDetailPropType to proptypes --- src/components/SideBarDetail/index.js | 2 +- src/components/Utilities/index.js | 2 +- src/containers/Building/index.js | 2 +- .../Building/{buildingDetailPropType.js => propTypes.js} | 0 src/containers/Dimensions/index.js | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/containers/Building/{buildingDetailPropType.js => propTypes.js} (100%) diff --git a/src/components/SideBarDetail/index.js b/src/components/SideBarDetail/index.js index 91f1e343..b3c1706c 100644 --- a/src/components/SideBarDetail/index.js +++ b/src/components/SideBarDetail/index.js @@ -1,7 +1,7 @@ import React, { PropTypes } from 'react'; import { Link } from 'react-router'; import './styles.css'; -import buildingDetailPropType from '../../containers/Building/buildingDetailPropType'; +import buildingDetailPropType from '../../containers/Building/propTypes'; export default function SideBarDetail({ building, children }) { const rootURL = `/buildings/${building.building_id}`; diff --git a/src/components/Utilities/index.js b/src/components/Utilities/index.js index f6577690..d6e9dcae 100644 --- a/src/components/Utilities/index.js +++ b/src/components/Utilities/index.js @@ -1,5 +1,5 @@ import React, { Component, PropTypes } from 'react'; -import buildingDetailPropTypes from '../../containers/Building/buildingDetailPropType'; +import buildingDetailPropTypes from '../../containers/Building/propTypes'; import request from '../../utils/request'; import { getHeaders, utilityURL } from '../../utils/rest_services'; diff --git a/src/containers/Building/index.js b/src/containers/Building/index.js index 69086308..c55a2936 100644 --- a/src/containers/Building/index.js +++ b/src/containers/Building/index.js @@ -1,7 +1,7 @@ import React, { Component, PropTypes } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import buildingDetailPropTypes from './buildingDetailPropType'; +import buildingDetailPropTypes from './propTypes'; import { loadBuildingDetail } from './actions'; diff --git a/src/containers/Building/buildingDetailPropType.js b/src/containers/Building/propTypes.js similarity index 100% rename from src/containers/Building/buildingDetailPropType.js rename to src/containers/Building/propTypes.js diff --git a/src/containers/Dimensions/index.js b/src/containers/Dimensions/index.js index 314149d1..137e56eb 100644 --- a/src/containers/Dimensions/index.js +++ b/src/containers/Dimensions/index.js @@ -8,7 +8,7 @@ import { hitDecision, } from './actions'; -import buildingDetailPropTypes from '../Building/buildingDetailPropType'; +import buildingDetailPropTypes from '../Building/propTypes'; import turkHitPropTypes from './propTypes'; import './styles.css'; -- GitLab From f2827d5b594e3c40efcdefd844e0a0ff74a7aa2b Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Tue, 7 Feb 2017 12:36:12 -0500 Subject: [PATCH 10/10] Check address before rendering children --- src/components/Utilities/index.js | 5 +---- src/containers/Building/index.js | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/Utilities/index.js b/src/components/Utilities/index.js index d6e9dcae..e2e895e4 100644 --- a/src/components/Utilities/index.js +++ b/src/components/Utilities/index.js @@ -19,10 +19,7 @@ class Utilities extends Component { componentDidMount() { const { address } = this.props.building; - // FIXME: remove check if address is undefined - if (address !== undefined) { - this.getUtilityAccounts(address); - } + this.getUtilityAccounts(address); } getUtilityAccounts = (address) => { diff --git a/src/containers/Building/index.js b/src/containers/Building/index.js index c55a2936..43d300ae 100644 --- a/src/containers/Building/index.js +++ b/src/containers/Building/index.js @@ -15,9 +15,9 @@ class BuildingOverview extends Component { } render() { - const { error, loading } = this.props.buildingDetail.overview; + const { error, loading, address } = this.props.buildingDetail.overview; let mainContent =
; - if (this.props.children && !error && !loading) { + if (this.props.children && !error && !loading && address !== undefined) { mainContent = React.cloneElement(this.props.children, { buildingId: this.props.buildingId, building: this.props.buildingDetail.overview, -- GitLab