From 4feecd23a64338917e9fe33d925f23e5f25e205b Mon Sep 17 00:00:00 2001 From: Conrad S Date: Thu, 19 Jan 2017 11:52:53 -0500 Subject: [PATCH 1/3] Update front end to use new database return values. No blocpower_id, now building_id and lot_id. Relies on changes in buildingservice --- src/components/BuildingListTable/index.js | 10 ++++++---- src/components/BuildingOverview/index.js | 6 ++++-- src/containers/BuildingDetail/actions.js | 6 +++--- src/containers/BuildingDetail/index.js | 8 +++++--- src/containers/BuildingDetail/sagas.js | 6 +++--- src/containers/BuildingList/index.js | 3 ++- src/routes.js | 2 +- 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/components/BuildingListTable/index.js b/src/components/BuildingListTable/index.js index 275586a5..1693664d 100644 --- a/src/components/BuildingListTable/index.js +++ b/src/components/BuildingListTable/index.js @@ -13,19 +13,20 @@ export default function BuildingListTable({ buildings }) { const buildingItems = buildings.map(building => ( - + {/* TODO make entire row a link & make path relative React router Link component does not support relative paths */} - + {building.address} {building.bbl} - {building.blocpower_id} {building.borough} + {building.building_id} + {building.lot_id} {building.zipcode} ), @@ -49,7 +50,8 @@ BuildingListTable.propTypes = { buildings: PropTypes.arrayOf(PropTypes.shape({ address: PropTypes.state, bbl: PropTypes.number, - blocpower_id: PropTypes.number, + building_id: PropTypes.number, + lot_id: PropTypes.number, borough: PropTypes.string, zipcode: PropTypes.number, })), diff --git a/src/components/BuildingOverview/index.js b/src/components/BuildingOverview/index.js index ee12d28f..319aed1e 100644 --- a/src/components/BuildingOverview/index.js +++ b/src/components/BuildingOverview/index.js @@ -10,7 +10,8 @@ export default function BuildingOverview({ building }) { @@ -21,7 +22,8 @@ BuildingOverview.propTypes = { building: PropTypes.shape({ address: PropTypes.string, bbl: PropTypes.number, - blocpower_id: PropTypes.number, + building_id: PropTypes.number, + lot_id: PropTypes.number, borough: PropTypes.string, zipcode: PropTypes.number, }), diff --git a/src/containers/BuildingDetail/actions.js b/src/containers/BuildingDetail/actions.js index 356c3411..5a574bc8 100644 --- a/src/containers/BuildingDetail/actions.js +++ b/src/containers/BuildingDetail/actions.js @@ -11,14 +11,14 @@ import { /** * Load building details, this action starts the request saga * - * @param blocPowerID The current blocPowerID + * @param buildingID The current buildingID * @returns {object} An action object with a type of LOAD_BUILDING_DETAIL * passing the building detail */ -export function loadBuildingDetail(blocPowerID) { +export function loadBuildingDetail(buildingID) { return { type: LOAD_BUILDING_DETAIL, - payload: blocPowerID, + payload: buildingID, }; } diff --git a/src/containers/BuildingDetail/index.js b/src/containers/BuildingDetail/index.js index d8789ee3..92d2aba7 100644 --- a/src/containers/BuildingDetail/index.js +++ b/src/containers/BuildingDetail/index.js @@ -10,7 +10,7 @@ import TurkHit from '../../components/TurkHit'; class BuildingDetail extends Component { componentDidMount() { - this.props.loadBuildingDetail(this.props.params.blocPowerID); + this.props.loadBuildingDetail(this.props.params.buildingID); } render() { @@ -32,7 +32,8 @@ class BuildingDetail extends Component { ); @@ -57,7 +58,8 @@ BuildingDetail.propTypes = { overview: PropTypes.shape({ address: PropTypes.string, bbl: PropTypes.number, - blocpower_id: PropTypes.number, + building_id: PropTypes.number, + lot_id: PropTypes.number, borough: PropTypes.string, zipcode: PropTypes.number, loading: PropTypes.boolean, diff --git a/src/containers/BuildingDetail/sagas.js b/src/containers/BuildingDetail/sagas.js index 319b938a..55c0fae7 100644 --- a/src/containers/BuildingDetail/sagas.js +++ b/src/containers/BuildingDetail/sagas.js @@ -21,13 +21,13 @@ const HEADERS = new Headers({ /** * Detail page request/response handler * - * @param {object} action blocPowerId of building + * @param {object} action buildingId of building */ function* getBuildingDetail(action) { - const blocPowerId = action.payload; + const buildingId = action.payload; const data = yield call( request, - `${BUILDING_SERVICE_URL}/building/${blocPowerId}`, { + `${BUILDING_SERVICE_URL}/building/${buildingId}`, { method: 'GET', headers: HEADERS, } diff --git a/src/containers/BuildingList/index.js b/src/containers/BuildingList/index.js index 3e775c91..f7a5355b 100644 --- a/src/containers/BuildingList/index.js +++ b/src/containers/BuildingList/index.js @@ -113,7 +113,8 @@ BuildingList.propTypes = { PropTypes.shape({ address: PropTypes.string, bbl: PropTypes.number, - blocpower_id: PropTypes.number, + building_id: PropTypes.number, + lot_id: PropTypes.number, borough: PropTypes.string, zipcode: PropTypes.number, }) diff --git a/src/routes.js b/src/routes.js index 24075922..a86d916e 100644 --- a/src/routes.js +++ b/src/routes.js @@ -9,7 +9,7 @@ export default ( - + -- GitLab From f1f51a0cd25cc4bbbf0b9aac8ce11bb8100c1eac Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Thu, 19 Jan 2017 13:30:52 -0500 Subject: [PATCH 2/3] Remove lot_id from turk hit --- src/containers/BuildingDetail/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/containers/BuildingDetail/index.js b/src/containers/BuildingDetail/index.js index 92d2aba7..01b34909 100644 --- a/src/containers/BuildingDetail/index.js +++ b/src/containers/BuildingDetail/index.js @@ -33,7 +33,6 @@ class BuildingDetail extends Component { createHit={this.props.createHit} address={this.props.buildingDetail.overview.address} building_id={this.props.buildingDetail.overview.building_id} - lot_id={this.props.buildingDetail.overview.lot_id} hit={this.props.buildingDetail.hit} /> ); -- GitLab From 8ca25fe85341d937a71044156bef31063925e809 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Thu, 19 Jan 2017 13:46:18 -0500 Subject: [PATCH 3/3] Update turkhit component --- src/components/TurkHit/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/TurkHit/index.js b/src/components/TurkHit/index.js index e549d09d..a3d13882 100644 --- a/src/components/TurkHit/index.js +++ b/src/components/TurkHit/index.js @@ -2,7 +2,7 @@ import React, { PropTypes } from 'react'; import defaultForm from './defaultForm'; import './styles.scss'; -export default function TurkHit({ createHit, address, blocpower_id, hit }) { +export default function TurkHit({ createHit, address, building_id, hit }) { let hitStatus =
; if (!hit.error.message && hit.status !== '') { hitStatus = ( @@ -22,7 +22,7 @@ export default function TurkHit({ createHit, address, blocpower_id, hit }) { return (