merging up release branch

Author: JoshuaVulcan

src/SpatialFeaturesLayer/index.js

@@ -18,7 +18,7 @@ export const LINES_LAYER_ID = 'spatial-features-lines';
 export const POLYGONS_LAYER_ID = 'spatial-features-polygons';
 // const POLYGONS_LABELS_LAYER_ID = 'spatial-features-polygon-labels';
 
-const BEFORE_LAYER_ID = 'sky';
+const BEFORE_LAYER_ID = 'feature-separation-layer';
 
 const DEFAULT_LINE_PAINT_COLOR = [
   'case',

src/SpatialFeaturesLayer/index.test.js

@@ -18,9 +18,6 @@ jest.mock('../ducks/analyzers', () => ({}));
 jest.mock('../utils/map', () => ({
   addMapImage: jest.fn()
 }));
-jest.mock('../MessageBadgeLayer', () => ({
-  LAYER_ID: 'message-badge-layer'
-}));
 
 jest.mock('../constants', () => ({
   API_URL: 'http://test-api.com/',
@@ -108,7 +105,7 @@ describe('SpatialFeaturesLayer', () => {
         ['==', ['geometry-type'], 'Point'],
         ['!', ['in', ['get', 'id'], ['literal', ['hidden-feature-1', 'hidden-feature-2']]]]
       ])
-    }), 'message-badge-layer');
+    }), 'feature-separation-layer');
 
     // Verify line layer was added
     expect(mockMap.addLayer).toHaveBeenCalledWith(expect.objectContaining({
@@ -121,7 +118,7 @@ describe('SpatialFeaturesLayer', () => {
         ['==', ['geometry-type'], 'LineString'],
         ['!', ['in', ['get', 'id'], ['literal', ['hidden-feature-1', 'hidden-feature-2']]]]
       ])
-    }), 'message-badge-layer');
+    }), 'feature-separation-layer');
 
     // Verify polygon layer was added
     expect(mockMap.addLayer).toHaveBeenCalledWith(expect.objectContaining({
@@ -134,7 +131,7 @@ describe('SpatialFeaturesLayer', () => {
         ['==', ['geometry-type'], 'Polygon'],
         ['!', ['in', ['get', 'id'], ['literal', ['hidden-feature-1', 'hidden-feature-2']]]]
       ])
-    }), 'message-badge-layer');
+    }), 'feature-separation-layer');
 
     // Verify click handlers were added
     expect(mockMap.on).toHaveBeenCalledWith('click', SYMBOLS_LAYER_ID, expect.any(Function));

src/ducks/subjects.js

@@ -81,23 +81,21 @@ export const clearSubjectData = () => ({
 });
 
 export const fetchSubjectGroups = () => dispatch => axios.get(SUBJECT_GROUPS_API_URL)
-  .then(response => dispatch(fetchSubjectGroupsSuccess(response)));
+  .then(response => dispatch(fetchSubjectGroupsSuccess(response)))
+  .catch(_error => dispatch(fetchSubjectGroupsError())); // Fallback to empty array on error
 
 const fetchMapSubjectsSuccess = response => ({
   type: FETCH_MAP_SUBJECTS_SUCCESS,
   payload: response.data,
 });
-/* 
-const fetchMapSubjectsError = error => ({
-  type: FETCH_MAP_SUBJECTS_ERROR,
-  payload: error,
-});
- */
+
 const fetchSubjectGroupsSuccess = response => ({
   type: FETCH_SUBJECT_GROUPS_SUCCESS,
-  payload: response.data.data,
+  payload: response?.data?.data ?? [],
 });
 
+const fetchSubjectGroupsError = _error => fetchSubjectGroupsSuccess([]);
+
 const INITIAL_MAP_SUBJECT_STATE = {
   bbox: null,
   subjects: [],