Merge branch 'dev' into aws-economize

hackforla · Feb 1, 2021 · e14ef31 · e14ef31
2 parents 42d9cc9 + 9477ad5
commit e14ef31
Show file tree

Hide file tree

Showing 12 changed files with 363 additions and 161 deletions.
diff --git a/.github/workflows/build_test_backend.yml b/.github/workflows/build_test_backend.yml
@@ -13,12 +13,12 @@ jobs:
         run: |
           cp .env.example .env
           docker-compose up --no-start api
-      - name: Lint API
-        run: docker-compose run api flake8
       - name: Seed database and run API
         run: |
           docker-compose up -d api
       - name: Run unit tests
         run: docker-compose run api pytest
+      - name: Lint API
+        run: docker-compose run api flake8
       # - name: Run Postman tests
       #   run: chmod +x postman/test.sh && postman/test.sh
diff --git a/client/components/Map/Map.jsx b/client/components/Map/Map.jsx
@@ -2,6 +2,7 @@
 
 import React from 'react';
 // import PropTypes from 'proptypes';
+import { connect } from 'react-redux';
 import { withStyles } from '@material-ui/core/styles';
 import mapboxgl from 'mapbox-gl';
 
@@ -15,7 +16,6 @@ import {
 } from './constants';
 
 import {
-  ncBoundaries,
   ccBoundaries,
   ncNameFromId,
   ccNameFromId,
@@ -62,7 +62,7 @@ class Map extends React.Component {
       activeRequestsLayer: 'points',
       selectedTypes: props.selectedTypes,
       locationInfo: INITIAL_LOCATION,
-      geoFilterType: GEO_FILTER_TYPES.address,
+      geoFilterType: GEO_FILTER_TYPES.nc,
       filterGeo: null,
       filteredRequestCounts: {},
       hoveredRegionName: null,
@@ -127,8 +127,39 @@ class Map extends React.Component {
     if (
       this.state.filterGeo !== prevState.filterGeo ||
       this.state.selectedTypes !== prevState.selectedTypes
-    )
-      this.map.once('idle', this.setFilteredRequestCounts);
+      ) this.map.once('idle', this.setFilteredRequestCounts);
+
+    if (this.props.ncBoundaries != prevProps.ncBoundaries) {
+      this.ncLayer.init({
+        map: this.map,
+        addListeners: true,
+        sourceId: 'nc',
+        sourceData: this.props.ncBoundaries,
+        idProperty: 'nc_id',
+        onSelectRegion: geo => {
+          this.setState({
+            locationInfo: {
+              nc: {
+                name: ncNameFromId(geo.properties.nc_id),
+                // url removed from /geojson payload
+                // need to map from /councils response
+                // url: geo.properties.waddress || geo.properties.dwebsite,
+              },
+            },
+          });
+          this.map.once('zoomend', () => {
+            this.setState({ filterGeo: geo });
+          });
+        },
+        onHoverRegion: geo => {
+          this.setState({
+            hoveredRegionName: geo
+              ? ncNameFromId(geo.properties.nc_id)
+              : null
+          });
+        }
+      });
+    }
   }
 
   initLayers = addListeners => {
@@ -155,34 +186,6 @@ class Map extends React.Component {
       }),
     });
 
-    this.ncLayer.init({
-      map: this.map,
-      addListeners,
-      sourceId: 'nc',
-      sourceData: ncBoundaries,
-      idProperty: 'nc_id',
-      onSelectRegion: geo => {
-        this.setState({
-          locationInfo: {
-            nc: {
-              name: ncNameFromId(geo.properties.nc_id),
-              url: geo.properties.waddress || geo.properties.dwebsite,
-            },
-          },
-        });
-        this.map.once('zoomend', () => {
-          this.setState({ filterGeo: geo });
-        });
-      },
-      onHoverRegion: geo => {
-        this.setState({
-          hoveredRegionName: geo
-            ? ncNameFromId(geo.properties.nc_id)
-            : null
-        });
-      }
-    });
-
     this.ccLayer.init({
       map: this.map,
       addListeners,
@@ -257,7 +260,7 @@ class Map extends React.Component {
 
     const features = this.map.queryRenderedFeatures(e.point, {
       layers: [
-        // 'request-circles',
+        'request-circles',
         ...masks,
         ...hoverables
       ]
@@ -503,6 +506,8 @@ Map.propTypes = {};
 
 Map.defaultProps = {};
 
-export default withStyles(styles)(Map);
+const mapStateToProps = state => ({
+  ncBoundaries: state.metadata.ncGeojson,
+});
 
-// export default Map;
+export default connect(mapStateToProps, null)(withStyles(styles)(Map));
diff --git a/client/components/Map/index.js b/client/components/Map/index.js
@@ -47,6 +47,8 @@ class MapContainer extends React.Component {
   }
 
   getOpenRequests = async () => {
+    // const url = `${process.env.API_URL}/requests/pins/open`;
+    // const { data } = await axios.get(url);
     const url = `${process.env.API_URL}/open-requests`;
     const { data } = await axios.post(url);
     this.openRequests = data;
@@ -61,14 +63,14 @@ class MapContainer extends React.Component {
 
         return this.setState({
           requests: this.convertRequests(this.openRequests.requests),
-          ncCounts: this.openRequests.counts.nc,
-          ccCounts: this.openRequests.counts.cc,
+          // ncCounts: this.openRequests.counts.nc,
+          // ccCounts: this.openRequests.counts.cc,
         });
       case MAP_MODES.CLOSED:
         return this.setState({
           requests: this.convertRequests(pins),
-          ncCounts: null,
-          ccCounts: null,
+          // ncCounts: null,
+          // ccCounts: null,
         });
     }
   };