From 8bf1a84d22230bc859838744c60c1976e3eba10c Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Sat, 11 Apr 2020 20:57:14 -0400 Subject: [PATCH 01/12] BI-1110-Building Overview Page --- src/components/SideBarDetail/index.js | 41 +++------------------------ 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/src/components/SideBarDetail/index.js b/src/components/SideBarDetail/index.js index 067653d9..d5c015da 100644 --- a/src/components/SideBarDetail/index.js +++ b/src/components/SideBarDetail/index.js @@ -27,50 +27,17 @@ const isActive = (url) => { export default function SideBarDetail({ building, children, contacts, user }) { const rootURL = `/buildings/${building.building_id}`; - let addressString; - if (building.street_address !== undefined) { - addressString = building.street_address[0]; - } - let addressListSection = ( -
- {` - ${addressString}, - ${building.borough}, - ${building.zipcode} - `} -
- ); - if ( - building.street_address !== undefined && - building.street_address.length > 1 - ) { - const addressListString = building.street_address.map(val => ( - - {val} - - )); + let addressListSection; + if (building.place_name !== undefined && building.place_name.length > 0) { addressListSection = (
-
Borough: {building.borough}
-
Zipcode: {building.zipcode}
-
- Address List{' '} - -
- - There can be multiple addresses for a single building - if the building has multiple entrances - - - - {addressListString} - -
+
{building.place_name}
); } + let contactListSection = null; let contactCounter = 0; if (contacts) { -- GitLab From e4e82a9540d7a1243da2ccae2004177277f964be Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Sat, 11 Apr 2020 21:23:08 -0400 Subject: [PATCH 02/12] Replaced street_address with place_name in building component --- src/containers/Building/index.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/containers/Building/index.js b/src/containers/Building/index.js index 62b442fc..051947e7 100644 --- a/src/containers/Building/index.js +++ b/src/containers/Building/index.js @@ -61,8 +61,8 @@ class Building extends Component { const salesForceId = nextProps.projects.projects[0].sales_force_id; this.props.loadContacts(salesForceId); } - if (nextProps.overview.street_address && !this.props.overview.street_address) { - const documentPath = `/Buildings/${nextProps.overview.street_address} (${nextProps.overview.building_id})`; + if (nextProps.overview.place_name && !this.props.overview.place_name) { + const documentPath = `/Buildings/${nextProps.overview.place_name} (${nextProps.overview.building_id})`; this.props.loadBuildingFolder( documentPath, true, @@ -76,12 +76,13 @@ class Building extends Component { updateStorage = (props) => { let buildingList = localStorage.activeBuildings; - const streetAddressString = props.overview.street_address.join(', '); + // const streetAddressString = props.overview.street_address.join(', '); + const streetAddressString = props.overview.place_name; if (buildingList !== undefined) { buildingList = JSON.parse(buildingList); const addList = [{ ...props.overview, - street_address: streetAddressString, + place_name: streetAddressString, }]; buildingList = buildingList.filter((val, index) => { // Make sure the list is smaller than 300 @@ -90,7 +91,7 @@ class Building extends Component { } const sameBuilding = ( props.overview.building_id === val.building_id && - streetAddressString === val.street_address + streetAddressString === val.place_name ); const sameLot = ( props.overview.bbl === val.bbl @@ -109,7 +110,7 @@ class Building extends Component { } else { buildingList = [{ ...props.overview, - street_address: streetAddressString, + place_name: streetAddressString, }]; } localStorage.setItem('activeBuildings', JSON.stringify(buildingList)); @@ -117,7 +118,7 @@ class Building extends Component { render() { const { error, loading } = this.props.overview; - const streetAddress = this.props.overview.street_address; + const streetAddress = this.props.overview.place_name; let mainContent = (
loading @@ -128,7 +129,7 @@ class Building extends Component { } /* FIXME: comparison of building_id and buildingId is needed because the - child components have a mismatch with buildingId and street_address + child components have a mismatch with buildingId and place_name */ if (this.props.children && !error && !loading && streetAddress !== undefined && parseInt(this.props.buildingId, 10) === this.props.overview.building_id) { -- GitLab From 6b049a0f8ff9b2f6c9d0bbb6d066860d2ef4a98d Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Sat, 11 Apr 2020 21:41:23 -0400 Subject: [PATCH 03/12] BI-1111-Building Questionnaire Page --- src/components/Questionnaire/BuildingInfo.js | 8 +------- src/containers/Questionnaire/index.js | 4 +--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/components/Questionnaire/BuildingInfo.js b/src/components/Questionnaire/BuildingInfo.js index 4d1e8bf2..e4ec043e 100644 --- a/src/components/Questionnaire/BuildingInfo.js +++ b/src/components/Questionnaire/BuildingInfo.js @@ -104,13 +104,7 @@ class BuildingInfo extends Component { } render() { - const address = this.props.address.map(addressItem => { - return ( -
- {addressItem} -
- ); - }); + const address = this.props.address; return (
diff --git a/src/containers/Questionnaire/index.js b/src/containers/Questionnaire/index.js index fa33a282..bf4aa04e 100644 --- a/src/containers/Questionnaire/index.js +++ b/src/containers/Questionnaire/index.js @@ -191,9 +191,7 @@ class Questionnaire extends Component { if (buildingInfo.data !== undefined && buildingInfo.data !== null && submittedAnswers.data !== undefined && submittedAnswers.data !== null && building !== undefined) { - const address = building.street_address.map(addressItem => { - return `${addressItem}, ${building.borough}`; - }); + const address = building.place_name; const tableHeader = { fontWeight: 'bold', -- GitLab From e20de80f35769d1b47a292666555d4d20c835c27 Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Mon, 13 Apr 2020 15:00:38 -0400 Subject: [PATCH 04/12] BI-1116-Building List Page --- src/components/BuildingListTable/index.js | 2 +- src/containers/BGroup/BGroup.js | 7 +++++-- src/containers/BGroup/BGroupBuildingTable.js | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/BuildingListTable/index.js b/src/components/BuildingListTable/index.js index 71366629..9d1df765 100644 --- a/src/components/BuildingListTable/index.js +++ b/src/components/BuildingListTable/index.js @@ -130,7 +130,7 @@ export default function BuildingListTable({ ); delete lotGrouping[building.bbl]; } - const placeName = building.placeName ? building.placeName : building.street_address; + const placeName = building.place_name ? building.place_name : building.street_address; return ( 0 && nextProps.bGroup.bGroupBuildings !== this.props.bGroup.bGroupBuildings @@ -210,8 +213,8 @@ export class BGroup extends Component { }; return acc; }, {}); - console.log("heatPumpScores"); // eslint-disable-line - console.log(heatPumpScores); // eslint-disable-line + // console.log("heatPumpScores"); // eslint-disable-line + // console.log(heatPumpScores); // eslint-disable-line this.setState({ heatPumpScores }); } else { // this.setState({ heatPumpError: true }); diff --git a/src/containers/BGroup/BGroupBuildingTable.js b/src/containers/BGroup/BGroupBuildingTable.js index f6e1f820..22f26328 100644 --- a/src/containers/BGroup/BGroupBuildingTable.js +++ b/src/containers/BGroup/BGroupBuildingTable.js @@ -807,8 +807,8 @@ export default class BGroupBuildingTable extends Component { val.gateway_install = gatewayDates[val.building_id]; val.building_simulation = simulationDates[val.building_id]; val.bbl = bbls[val.building_id]; - console.log("heatPumpScores rendering"); // eslint-disable-line - console.log(heatPumpScores); // eslint-disable-line + // console.log("heatPumpScores rendering"); // eslint-disable-line + // console.log(heatPumpScores); // eslint-disable-line if (heatPumpScores[val.building_id]) { val.heat_pump_score = heatPumpScores[val.building_id].score; val.building_proximities = heatPumpScores[val.building_id].building_proximities_cost; -- GitLab From 8f6fa918ca6bdad77e6b0164cda1f4a1d9bcf929 Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Mon, 13 Apr 2020 17:01:56 -0400 Subject: [PATCH 05/12] Landing Page Building List --- src/screens/HomePage/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/HomePage/index.js b/src/screens/HomePage/index.js index 61f15610..58cc99b6 100644 --- a/src/screens/HomePage/index.js +++ b/src/screens/HomePage/index.js @@ -164,7 +164,7 @@ class HomePage extends Component {
{i.bbl}
- {i.street_address} + {i.place_name} )); -- GitLab From 2dd402c0b975733f1ab2de5950852c3e8cd875f5 Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Sat, 11 Apr 2020 20:57:14 -0400 Subject: [PATCH 06/12] BI-1110-Building Overview Page --- src/components/SideBarDetail/index.js | 41 +++------------------------ 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/src/components/SideBarDetail/index.js b/src/components/SideBarDetail/index.js index 067653d9..d5c015da 100644 --- a/src/components/SideBarDetail/index.js +++ b/src/components/SideBarDetail/index.js @@ -27,50 +27,17 @@ const isActive = (url) => { export default function SideBarDetail({ building, children, contacts, user }) { const rootURL = `/buildings/${building.building_id}`; - let addressString; - if (building.street_address !== undefined) { - addressString = building.street_address[0]; - } - let addressListSection = ( -
- {` - ${addressString}, - ${building.borough}, - ${building.zipcode} - `} -
- ); - if ( - building.street_address !== undefined && - building.street_address.length > 1 - ) { - const addressListString = building.street_address.map(val => ( - - {val} - - )); + let addressListSection; + if (building.place_name !== undefined && building.place_name.length > 0) { addressListSection = (
-
Borough: {building.borough}
-
Zipcode: {building.zipcode}
-
- Address List{' '} - -
- - There can be multiple addresses for a single building - if the building has multiple entrances - - - - {addressListString} - -
+
{building.place_name}
); } + let contactListSection = null; let contactCounter = 0; if (contacts) { -- GitLab From 1da428aa571039dcebe94e13e69779e0c1254ff9 Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Sat, 11 Apr 2020 21:23:08 -0400 Subject: [PATCH 07/12] Replaced street_address with place_name in building component --- src/containers/Building/index.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/containers/Building/index.js b/src/containers/Building/index.js index 62b442fc..051947e7 100644 --- a/src/containers/Building/index.js +++ b/src/containers/Building/index.js @@ -61,8 +61,8 @@ class Building extends Component { const salesForceId = nextProps.projects.projects[0].sales_force_id; this.props.loadContacts(salesForceId); } - if (nextProps.overview.street_address && !this.props.overview.street_address) { - const documentPath = `/Buildings/${nextProps.overview.street_address} (${nextProps.overview.building_id})`; + if (nextProps.overview.place_name && !this.props.overview.place_name) { + const documentPath = `/Buildings/${nextProps.overview.place_name} (${nextProps.overview.building_id})`; this.props.loadBuildingFolder( documentPath, true, @@ -76,12 +76,13 @@ class Building extends Component { updateStorage = (props) => { let buildingList = localStorage.activeBuildings; - const streetAddressString = props.overview.street_address.join(', '); + // const streetAddressString = props.overview.street_address.join(', '); + const streetAddressString = props.overview.place_name; if (buildingList !== undefined) { buildingList = JSON.parse(buildingList); const addList = [{ ...props.overview, - street_address: streetAddressString, + place_name: streetAddressString, }]; buildingList = buildingList.filter((val, index) => { // Make sure the list is smaller than 300 @@ -90,7 +91,7 @@ class Building extends Component { } const sameBuilding = ( props.overview.building_id === val.building_id && - streetAddressString === val.street_address + streetAddressString === val.place_name ); const sameLot = ( props.overview.bbl === val.bbl @@ -109,7 +110,7 @@ class Building extends Component { } else { buildingList = [{ ...props.overview, - street_address: streetAddressString, + place_name: streetAddressString, }]; } localStorage.setItem('activeBuildings', JSON.stringify(buildingList)); @@ -117,7 +118,7 @@ class Building extends Component { render() { const { error, loading } = this.props.overview; - const streetAddress = this.props.overview.street_address; + const streetAddress = this.props.overview.place_name; let mainContent = (
loading @@ -128,7 +129,7 @@ class Building extends Component { } /* FIXME: comparison of building_id and buildingId is needed because the - child components have a mismatch with buildingId and street_address + child components have a mismatch with buildingId and place_name */ if (this.props.children && !error && !loading && streetAddress !== undefined && parseInt(this.props.buildingId, 10) === this.props.overview.building_id) { -- GitLab From c790debd73a966bab48648be8652cf865a4f395b Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Sat, 11 Apr 2020 21:41:23 -0400 Subject: [PATCH 08/12] BI-1111-Building Questionnaire Page --- src/components/Questionnaire/BuildingInfo.js | 8 +------- src/containers/Questionnaire/index.js | 4 +--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/components/Questionnaire/BuildingInfo.js b/src/components/Questionnaire/BuildingInfo.js index 4d1e8bf2..e4ec043e 100644 --- a/src/components/Questionnaire/BuildingInfo.js +++ b/src/components/Questionnaire/BuildingInfo.js @@ -104,13 +104,7 @@ class BuildingInfo extends Component { } render() { - const address = this.props.address.map(addressItem => { - return ( -
- {addressItem} -
- ); - }); + const address = this.props.address; return (
diff --git a/src/containers/Questionnaire/index.js b/src/containers/Questionnaire/index.js index fa33a282..bf4aa04e 100644 --- a/src/containers/Questionnaire/index.js +++ b/src/containers/Questionnaire/index.js @@ -191,9 +191,7 @@ class Questionnaire extends Component { if (buildingInfo.data !== undefined && buildingInfo.data !== null && submittedAnswers.data !== undefined && submittedAnswers.data !== null && building !== undefined) { - const address = building.street_address.map(addressItem => { - return `${addressItem}, ${building.borough}`; - }); + const address = building.place_name; const tableHeader = { fontWeight: 'bold', -- GitLab From 3cb90712b56076d38857d12af8d3b53f0b5b85e3 Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Mon, 13 Apr 2020 15:00:38 -0400 Subject: [PATCH 09/12] BI-1116-Building List Page --- src/components/BuildingListTable/index.js | 2 +- src/containers/BGroup/BGroup.js | 3 +++ src/containers/BGroup/BGroupBuildingTable.js | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/BuildingListTable/index.js b/src/components/BuildingListTable/index.js index 71366629..9d1df765 100644 --- a/src/components/BuildingListTable/index.js +++ b/src/components/BuildingListTable/index.js @@ -130,7 +130,7 @@ export default function BuildingListTable({ ); delete lotGrouping[building.bbl]; } - const placeName = building.placeName ? building.placeName : building.street_address; + const placeName = building.place_name ? building.place_name : building.street_address; return ( 0 && nextProps.bGroup.bGroupBuildings !== this.props.bGroup.bGroupBuildings diff --git a/src/containers/BGroup/BGroupBuildingTable.js b/src/containers/BGroup/BGroupBuildingTable.js index c5550bb8..131f84ad 100644 --- a/src/containers/BGroup/BGroupBuildingTable.js +++ b/src/containers/BGroup/BGroupBuildingTable.js @@ -806,8 +806,8 @@ export default class BGroupBuildingTable extends Component { val.gateway_install = gatewayDates[val.building_id]; val.building_simulation = simulationDates[val.building_id]; val.bbl = bbls[val.building_id]; - console.log("heatPumpScores rendering"); // eslint-disable-line - console.log(heatPumpScores); // eslint-disable-line + // console.log("heatPumpScores rendering"); // eslint-disable-line + // console.log(heatPumpScores); // eslint-disable-line if (heatPumpScores[val.building_id]) { val.heat_pump_score = heatPumpScores[val.building_id].score; val.building_proximities = heatPumpScores[val.building_id].building_proximities_cost; -- GitLab From 88256c6324836d2042a577dff487dc74f5ded6af Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Mon, 13 Apr 2020 17:01:56 -0400 Subject: [PATCH 10/12] Landing Page Building List --- src/screens/HomePage/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/HomePage/index.js b/src/screens/HomePage/index.js index 61f15610..58cc99b6 100644 --- a/src/screens/HomePage/index.js +++ b/src/screens/HomePage/index.js @@ -164,7 +164,7 @@ class HomePage extends Component {
{i.bbl}
- {i.street_address} + {i.place_name} )); -- GitLab From 52dfc42156a858f83801456eaccdecc1da9b0b36 Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Wed, 15 Apr 2020 13:22:20 -0400 Subject: [PATCH 11/12] removed console log --- src/containers/BGroup/BGroup.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/containers/BGroup/BGroup.js b/src/containers/BGroup/BGroup.js index dec4e82b..287edbd2 100644 --- a/src/containers/BGroup/BGroup.js +++ b/src/containers/BGroup/BGroup.js @@ -84,9 +84,6 @@ export class BGroup extends Component { } componentWillReceiveProps(nextProps) { - // console.log(this.props.bGroup.bGroupBuildings); - // console.log(nextProps.bGroup.bGroupBuildings); - // console.log(this.props.buildings.buildings); if ( nextProps.bGroup.bGroupBuildings.length > 0 && nextProps.bGroup.bGroupBuildings !== this.props.bGroup.bGroupBuildings -- GitLab From d2f18e77a5a07fce10f5c3dcfdd6d6255eb4ef15 Mon Sep 17 00:00:00 2001 From: Jinal Soni Date: Wed, 15 Apr 2020 17:25:33 -0400 Subject: [PATCH 12/12] refactored --- src/containers/BGroup/BGroupBuildingTable.js | 2 -- src/containers/Building/index.js | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/containers/BGroup/BGroupBuildingTable.js b/src/containers/BGroup/BGroupBuildingTable.js index 131f84ad..c9240a47 100644 --- a/src/containers/BGroup/BGroupBuildingTable.js +++ b/src/containers/BGroup/BGroupBuildingTable.js @@ -806,8 +806,6 @@ export default class BGroupBuildingTable extends Component { val.gateway_install = gatewayDates[val.building_id]; val.building_simulation = simulationDates[val.building_id]; val.bbl = bbls[val.building_id]; - // console.log("heatPumpScores rendering"); // eslint-disable-line - // console.log(heatPumpScores); // eslint-disable-line if (heatPumpScores[val.building_id]) { val.heat_pump_score = heatPumpScores[val.building_id].score; val.building_proximities = heatPumpScores[val.building_id].building_proximities_cost; diff --git a/src/containers/Building/index.js b/src/containers/Building/index.js index 051947e7..9e41c984 100644 --- a/src/containers/Building/index.js +++ b/src/containers/Building/index.js @@ -76,13 +76,12 @@ class Building extends Component { updateStorage = (props) => { let buildingList = localStorage.activeBuildings; - // const streetAddressString = props.overview.street_address.join(', '); - const streetAddressString = props.overview.place_name; + const place_name = props.overview.place_name; if (buildingList !== undefined) { buildingList = JSON.parse(buildingList); const addList = [{ ...props.overview, - place_name: streetAddressString, + place_name, }]; buildingList = buildingList.filter((val, index) => { // Make sure the list is smaller than 300 -- GitLab