Merge pull request #100 from nrotstan/add-output-prop-to-with-sorted-challenges

Support output prop on WithSortedChallenges.

Author: nrotstan

src/components/ChallengePane/ChallengeResultList/ChallengeResultList.js

@@ -113,7 +113,8 @@ export default WithCurrentUser(
       WithFilteredChallenges(
         WithSearchResults(
           WithSortedChallenges(
-            ChallengeResultList
+            ChallengeResultList,
+            'filteredChallenges'
           ),
           'challenges',
           'filteredChallenges'

src/components/HOCs/WithSortedChallenges/WithSortedChallenges.js

@@ -3,28 +3,35 @@ import PropTypes from 'prop-types'
 import _get from 'lodash/get'
 import _findIndex from 'lodash/findIndex'
 import _sortBy from 'lodash/sortBy'
+import _isEmpty from 'lodash/isEmpty'
 import _omit from 'lodash/omit'
 
 const FEATURED_POINTS = -1
 const SAVED_POINTS = -2
 
-export default function(WrappedComponent) {
+export default function(WrappedComponent,
+                        challengesProp='challenges',
+                        outputProp) {
   class WithSortedChallenges extends Component {
     render() {
       // Give extra points to featured challenges and -- if we're given a
       // user -- saved challenges
       const savedChallenges = _get(this.props, 'user.savedChallenges', [])
 
-      const sortedChallenges = _sortBy(this.props.challenges, challenge => {
+      const sortedChallenges = _sortBy(this.props[challengesProp], challenge => {
         let score = 0
         score += challenge.featured ? FEATURED_POINTS : 0
         score += _findIndex(savedChallenges, {id: challenge.id}) !== -1 ?
                  SAVED_POINTS : 0
         return score
       })
 
-      return <WrappedComponent challenges={sortedChallenges}
-                               {..._omit(this.props, 'challenges')} />
+      if (_isEmpty(outputProp)) {
+        outputProp = challengesProp
+      }
+
+      return <WrappedComponent {...{[outputProp]: sortedChallenges}}
+                               {..._omit(this.props, outputProp)} />
     }
   }