get user-specific challenges;

Author: doctorhilarius

src/actions/challenges.js

@@ -58,7 +58,7 @@ import { removeChallengeFromPhaseProduct, saveChallengeAsPhaseProduct } from '..
 /**
  * Loads active challenges of project by page
  */
-export function loadChallengesByPage (page, projectId, status, filterChallengeName = null, selfService = false) {
+export function loadChallengesByPage (page, projectId, status, filterChallengeName = null, selfService = false, userHandle = null) {
   return (dispatch, getState) => {
     dispatch({
       type: LOAD_CHALLENGES_PENDING,
@@ -87,6 +87,9 @@ export function loadChallengesByPage (page, projectId, status, filterChallengeNa
     }
     if (selfService) {
       filters.selfService = true
+      if (userHandle) {
+        filters.selfServiceCopilot = userHandle
+      }
     }
 
     return fetchChallenges(filters, {

src/components/ChallengesComponent/ChallengeList/index.js

@@ -51,7 +51,7 @@ class ChallengeList extends Component {
     const { status, filterChallengeName, loadChallengesByPage, activeProjectId, selfService } = this.props
     this.setState({ searchText }, () => {
       if (status !== projectStatus || searchText !== filterChallengeName) {
-        loadChallengesByPage(1, activeProjectId, projectStatus, searchText, selfService)
+        loadChallengesByPage(1, activeProjectId, projectStatus, searchText, selfService, this.getHandle())
       }
     })
   }
@@ -64,7 +64,7 @@ class ChallengeList extends Component {
     const { searchText } = this.state
     const { page, loadChallengesByPage, activeProjectId, status, selfService } = this.props
     if (page !== pageNumber) {
-      loadChallengesByPage(pageNumber, activeProjectId, status, searchText, selfService)
+      loadChallengesByPage(pageNumber, activeProjectId, status, searchText, selfService, this.getHandle())
     }
   }
 
@@ -74,7 +74,7 @@ class ChallengeList extends Component {
   reloadChallengeList () {
     const { searchText } = this.state
     const { page, loadChallengesByPage, activeProjectId, status, selfService } = this.props
-    loadChallengesByPage(page, activeProjectId, status, searchText, selfService)
+    loadChallengesByPage(page, activeProjectId, status, searchText, selfService, this.getHandle())
   }
 
   /**
@@ -104,6 +104,10 @@ class ChallengeList extends Component {
     }
   }
 
+  getHandle () {
+    return this.props.auth && this.props.auth.user ? this.props.auth.user.handle : null
+  }
+
   render () {
     const { searchText, errorMessage } = this.state
     const {
@@ -117,7 +121,8 @@ class ChallengeList extends Component {
       partiallyUpdateChallengeDetails,
       deleteChallenge,
       isBillingAccountExpired,
-      selfService
+      selfService,
+      auth
     } = this.props
     if (warnMessage) {
       return <Message warnMessage={warnMessage} />
@@ -289,7 +294,8 @@ ChallengeList.propTypes = {
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
   deleteChallenge: PropTypes.func.isRequired,
   isBillingAccountExpired: PropTypes.bool,
-  selfService: PropTypes.bool
+  selfService: PropTypes.bool,
+  auth: PropTypes.object.isRequired
 }
 
 export default ChallengeList

src/components/ChallengesComponent/index.js

@@ -28,7 +28,8 @@ const ChallengesComponent = ({
   partiallyUpdateChallengeDetails,
   deleteChallenge,
   isBillingAccountExpired,
-  selfService
+  selfService,
+  auth
 }) => {
   return (
     <Sticky top={10}>
@@ -78,6 +79,7 @@ const ChallengesComponent = ({
               deleteChallenge={deleteChallenge}
               isBillingAccountExpired={isBillingAccountExpired}
               selfService={selfService}
+              auth={auth}
             />
           )}
         </div>
@@ -104,7 +106,8 @@ ChallengesComponent.propTypes = {
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
   deleteChallenge: PropTypes.func.isRequired,
   isBillingAccountExpired: PropTypes.bool,
-  selfService: PropTypes.bool
+  selfService: PropTypes.bool,
+  auth: PropTypes.object.isRequired
 }
 
 ChallengesComponent.defaultProps = {

src/containers/Challenges/index.js

@@ -85,7 +85,8 @@ class Challenges extends Component {
       partiallyUpdateChallengeDetails,
       deleteChallenge,
       isBillingAccountExpired,
-      selfService
+      selfService,
+      auth
     } = this.props
     const { searchProjectName, onlyMyProjects } = this.state
     const projectInfo = _.find(projects, { id: activeProjectId }) || {}
@@ -149,6 +150,7 @@ class Challenges extends Component {
           deleteChallenge={deleteChallenge}
           isBillingAccountExpired={isBillingAccountExpired}
           selfService={selfService}
+          auth={auth}
         />
         }
       </Fragment>
@@ -178,16 +180,18 @@ Challenges.propTypes = {
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
   deleteChallenge: PropTypes.func.isRequired,
   isBillingAccountExpired: PropTypes.bool,
-  selfService: PropTypes.bool
+  selfService: PropTypes.bool,
+  auth: PropTypes.object.isRequired
 }
 
-const mapStateToProps = ({ challenges, sidebar, projects }) => ({
+const mapStateToProps = ({ challenges, sidebar, projects, auth }) => ({
   ..._.omit(challenges, ['projectId']),
   challengeProjectId: challenges.projectId,
   activeProjectId: sidebar.activeProjectId,
   projects: sidebar.projects,
   projectDetail: projects.projectDetail,
-  isBillingAccountExpired: projects.isBillingAccountExpired
+  isBillingAccountExpired: projects.isBillingAccountExpired,
+  auth: auth
 })
 
 const mapDispatchToProps = {