Merge pull request #1065 from hackforla/FRONT-circle-layer-fix

RequestsLayer circle-color fix
hackforla · Apr 1, 2021 · a7d8bf9 · a7d8bf9
2 parents 917f365 + abe0cd6
commit a7d8bf9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/client/components/Map/Map.jsx b/client/components/Map/Map.jsx
@@ -158,7 +158,7 @@ class Map extends React.Component {
       }
     }
 
-    if (this.props.requestTypes != prevProps.requestTypes || !this.map.getSource('requests')) {
+    if (this.props.requestTypes != prevProps.requestTypes) {
       this.requestsLayer.init({
         map: this.map,
       });

diff --git a/client/components/Map/RequestDetail.jsx b/client/components/Map/RequestDetail.jsx
@@ -202,13 +202,14 @@ export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(R
 RequestDetail.propTypes = {
   requestId: PropTypes.number,
   pinsInfo: PropTypes.shape({}),
-  requestTypes: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
+  requestTypes: PropTypes.arrayOf(PropTypes.shape({})),
   agencies: PropTypes.arrayOf(PropTypes.shape({})),
   getPinInfo: PropTypes.func.isRequired,
 };
 
 RequestDetail.defaultProps = {
   requestId: null,
   pinsInfo: {},
-  agencies: [],
+  agencies: null,
+  requestTypes: null,
 };
diff --git a/client/components/Map/layers/RequestsLayer.js b/client/components/Map/layers/RequestsLayer.js
@@ -29,11 +29,16 @@ function typeFilter(selectedTypes) {
 }
 
 class RequestsLayer extends React.Component {
+  constructor(props) {
+    super(props);
+    this.ready = false;
+  }
+
   init = ({ map }) => {
     this.map = map;
-
     this.addSources();
     this.addLayers();
+    this.ready = true;
   }
 
   componentDidUpdate(prev) {
@@ -50,7 +55,7 @@ class RequestsLayer extends React.Component {
     if (selectedTypes !== prev.selectedTypes)
       this.setSelectedTypes(selectedTypes);
 
-    if (requests !== prev.requests)
+    if (requests !== prev.requests && this.ready)
       this.setRequests(requests);
 
     if (colorScheme !== prev.colorScheme)

diff --git a/client/components/main/Desktop/RequestTypeSelector/index.js b/client/components/main/Desktop/RequestTypeSelector/index.js
@@ -90,10 +90,10 @@ export default connect(
 )(RequestTypeSelector);
 
 RequestTypeSelector.propTypes = {
-  requestTypes: PropTypes.arrayOf(PropTypes.shape({
-    typeId: PropTypes.number,
-    typeName: PropTypes.string,
-    color: PropTypes.string,
-  })).isRequired,
+  requestTypes: PropTypes.arrayOf(PropTypes.shape({})),
   updateTypesFilter: PropTypes.func.isRequired,
 };
+
+RequestTypeSelector.defaultProps = {
+  requestTypes: null,
+};
diff --git a/client/redux/reducers/metadata.js b/client/redux/reducers/metadata.js
@@ -55,7 +55,7 @@ const initialState = {
   version: null,
   lastPulledUTC: null,
   lastPulledLocal: null,
-  requestTypes: [],
+  requestTypes: null,
   councils: null,
   regions: null,
   agencies: null,