Created separate variable in redux store to have count of all projects for customers

Author: RishiRajSahu

src/projects/actions/loadProjects.js

@@ -25,27 +25,23 @@ const getProjectsWithMembers = (dispatch, getState, criteria, pageNum) => {
     return dispatch({
       type: GET_PROJECTS,
       payload: getProjects(criteria, pageNum)
-        .then((data) => {
+        .then((originalData) => {
           const retryForCustomer = criteria.status === PROJECT_STATUS_ACTIVE && state.loadUser.user.roles &&  state.loadUser.user.roles.length === 1
             && state.loadUser.user.roles[0] === ROLE_TOPCODER_USER
-          if(data.totalCount === 0 && retryForCustomer) {
+          if(originalData.totalCount === 0 && retryForCustomer) {
             //retrying for customer if active projects are 0 but there are some projects with other status
             //This is to bypass the walkthrough page which we ideally show for customer with zero projects
             const newCriteria = {
               sort: 'updatedAt desc'
             }
             return getProjects(newCriteria, pageNum)
-              .then((data2) => {
-                //if there no project in any status return original result
-                if(data2.totalCount === 0) {
-                  return data
-                } else {
-                  data2.projects.length = 0
-                  return data2
-                }
+              .then((allProjectsData) => {
+                //add allprojects count to be updated to redux store
+                originalData.allProjectsCount = allProjectsData.totalCount
+                return originalData
               })
           } else {
-            return data
+            return originalData
           }
         }),
       meta: {

src/projects/list/components/Projects/Projects.jsx

@@ -189,12 +189,11 @@ class Projects extends Component {
   }
 
   render() {
-    const { isPowerUser, isCustomer, isLoading, totalCount, criteria, projectsListView, setProjectsListView, setInfiniteAutoload, loadProjects, history, orgConfig } = this.props
+    const { isPowerUser, isCustomer, isLoading, totalCount, criteria, projectsListView, setProjectsListView, setInfiniteAutoload, loadProjects, history, orgConfig, allProjectsCount } = this.props
     // show walk through if user is customer and no projects were returned
     // for default filters
-    const showWalkThrough = !isLoading && totalCount === 0 &&
-      _.isEqual(criteria, PROJECT_LIST_DEFAULT_CRITERIA) &&
-      !isPowerUser
+    const showWalkThrough = !isLoading && !isPowerUser && totalCount === 0 && allProjectsCount === 0 &&
+    _.isEqual(criteria, PROJECT_LIST_DEFAULT_CRITERIA)
     const getStatusCriteriaText = (criteria) => {
       return (_.find(PROJECT_STATUS, { value: criteria.status }) || { name: ''}).name
     }
@@ -287,6 +286,7 @@ const mapStateToProps = ({ projectSearch, members, loadUser, projectState, templ
     projects    : projectSearch.projects,
     members     : members.members,
     totalCount  : projectSearch.totalCount,
+    allProjectsCount: projectSearch.allProjectsCount,
     pageNum     : projectSearch.pageNum,
     criteria    : projectSearch.criteria,
     infiniteAutoload: projectSearch.infiniteAutoload,

src/projects/reducers/projectSearch.js

@@ -15,6 +15,7 @@ export const initialState = {
   projects: [],
   error: false,
   totalCount: 0,
+  allProjectsCount: 0,
   pageNum: 1,
   // make a copy of constant to avoid unintentional modifications
   criteria: {...PROJECT_LIST_DEFAULT_CRITERIA},
@@ -53,8 +54,8 @@ export default function(state = initialState, action) {
     })
   case GET_PROJECTS_SUCCESS: {
     const updatedProjects = action.meta.keepPrevious
-      ? { projects : { $push : action.payload.projects }, totalCount: { $set : action.payload.totalCount} }
-      : { projects : { $set : action.payload.projects }, totalCount: { $set : action.payload.totalCount} }
+      ? { projects : { $push : action.payload.projects }, totalCount: { $set : action.payload.totalCount}, allProjectsCount: { $set : action.payload.allProjectsCount} }
+      : { projects : { $set : action.payload.projects }, totalCount: { $set : action.payload.totalCount}, allProjectsCount: { $set : action.payload.allProjectsCount} }
     return update(state, updatedProjects)
   }