Merge pull request #177 from suppermancool/issue-171

#171 fix load challenge after change project id

Author: jmgasper

src/actions/challenges.js

@@ -44,7 +44,7 @@ export function loadChallengesByPage (page, projectId, status, filterChallengeNa
     dispatch({
       type: LOAD_CHALLENGES_PENDING,
       challenges: [],
-      projectId: projectId ? `${projectId}` : '',
+      projectId: projectId,
       status,
       filterChallengeName,
       perPage: PAGE_SIZE,

src/containers/Challenges/index.js

@@ -16,23 +16,29 @@ import {
 
 class Challenges extends Component {
   componentDidMount () {
-    const { activeProjectId, filterChallengeName, resetSidebarActiveParams, menu, projectId, challenges, status, projectDetail: reduxProjectInfo } = this.props
+    const { activeProjectId, resetSidebarActiveParams, menu, projectId } = this.props
     if (menu === 'NULL' && activeProjectId !== -1) {
       resetSidebarActiveParams()
     } else {
-      const id = activeProjectId > 0 ? activeProjectId : (projectId ? parseInt(projectId) : null)
-      // only load challenge if it's init state
+      this.props.loadChallengesByPage(1, projectId ? parseInt(projectId) : -1, CHALLENGE_STATUS.ACTIVE, '')
+      if (projectId) {
+        this.props.loadProject(projectId)
+      }
+    }
+  }
+
+  componentWillReceiveProps (nextProps) {
+    this.reloadChallenges(nextProps)
+  }
+
+  reloadChallenges (props) {
+    const { activeProjectId, projectDetail: reduxProjectInfo, projectId, challengeProjectId, loadProject } = props
+    if (activeProjectId !== challengeProjectId) {
+      this.props.loadChallengesByPage(1, projectId ? parseInt(projectId) : -1, CHALLENGE_STATUS.ACTIVE, '')
       if (
-        challenges.length === 0 ||
-        status !== CHALLENGE_STATUS.ACTIVE ||
-        filterChallengeName ||
-        `${activeProjectId}` !== `${projectId}`
+        (!reduxProjectInfo || `${reduxProjectInfo.id}` !== projectId)
       ) {
-        // load first page for challenges
-        this.props.loadChallengesByPage(1, id, CHALLENGE_STATUS.ACTIVE, '')
-      }
-      if (!reduxProjectInfo || reduxProjectInfo.id !== id) {
-        this.props.loadProject(id)
+        loadProject(projectId)
       }
     }
   }
@@ -94,7 +100,8 @@ Challenges.propTypes = {
 }
 
 const mapStateToProps = ({ challenges, sidebar, projects }) => ({
-  ...challenges,
+  ..._.omit(challenges, ['projectId']),
+  challengeProjectId: challenges.projectId,
   activeProjectId: sidebar.activeProjectId,
   projects: sidebar.projects,
   projectDetail: projects.projectDetail

src/reducers/challenges.js

@@ -37,7 +37,8 @@ const initialState = {
   status: '',
   perPage: 0,
   page: 1,
-  totalChallenges: 0
+  totalChallenges: 0,
+  projectId: -1
 }
 
 function toastrSuccess (title, message) {