Merge branch 'develop' into prerelease

maproulette · Dec 6, 2019 · e013788 · e013788
2 parents 0ef9e18 + 1aabe80
commit e013788
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/components/ChallengePane/ChallengePane.js b/src/components/ChallengePane/ChallengePane.js
@@ -110,6 +110,7 @@ export class ChallengePane extends Component {
                    criteria={{boundingBox: fromLatLngBounds(this.state.bounds),
                               zoom: this.state.zoom,
                               filters: _get(this.props, 'searchCriteria.filters'),
+                              searchQuery: _get(this.props, 'searchCriteria.query'),
                               challengeStatus}}
                    updateTaskFilterBounds={(bounds, zoom, fromUserAction) => {
                      this.props.updateChallengeSearchMapBounds(bounds, fromUserAction)

diff --git a/src/components/HOCs/WithChallengeTaskClusters/WithChallengeTaskClusters.js b/src/components/HOCs/WithChallengeTaskClusters/WithChallengeTaskClusters.js
@@ -9,6 +9,7 @@ import _uniqueId from 'lodash/uniqueId'
 import _sum from 'lodash/sum'
 import _map from 'lodash/map'
 import _set from 'lodash/set'
+import _debounce from 'lodash/debounce'
 import { fromLatLngBounds,
          boundsWithinAllowedMaxDegrees } from '../../../services/MapBounds/MapBounds'
 import { fetchTaskClusters } from '../../../services/Task/TaskClusters'
@@ -134,8 +135,14 @@ export const WithChallengeTaskClusters = function(WrappedComponent, storeTasks=f
       }
     }
 
+    debouncedFetchClusters =
+      _debounce((showAsClusters) => this.fetchUpdatedClusters(showAsClusters), 400)
+
     componentDidUpdate(prevProps, prevState) {
-      if (!_isEqual(_omit(prevProps.criteria, ['page', 'pageSize']),
+      if (!_isEqual(_get(prevProps.criteria, 'searchQuery'), _get(this.props.criteria, 'searchQuery'))) {
+        this.debouncedFetchClusters(this.state.showAsClusters)
+      }
+      else if (!_isEqual(_omit(prevProps.criteria, ['page', 'pageSize']),
             _omit(this.props.criteria, ['page', 'pageSize']))) {
         this.fetchUpdatedClusters(this.state.showAsClusters)
       }