Merge pull request #4993 from topcoder-platform/feature-refactor-challengelist-fixes

Feature refactor challengelist fixes

Author: luizrrodrigues

src/shared/components/challenge-listing/Listing/index.jsx

@@ -20,6 +20,9 @@ import './style.scss';
 function Listing({
   activeBucket,
   auth,
+  allActiveChallengesLoaded,
+  allMyChallengesLoaded,
+  allOpenForRegistrationChallengesLoaded,
   challenges,
   openForRegistrationChallenges,
   myChallenges,
@@ -86,17 +89,17 @@ function Listing({
       case BUCKETS.MY:
         bucketChallenges = [].concat(myChallenges);
         loading = loadingMyChallenges;
-        loadMore = loadMoreMy;
+        loadMore = allMyChallengesLoaded ? null : loadMoreMy;
         break;
       case BUCKETS.OPEN_FOR_REGISTRATION:
         bucketChallenges = [].concat(openForRegistrationChallenges);
         loading = loadingOpenForRegistrationChallenges;
-        loadMore = loadMoreOpenForRegistration;
+        loadMore = allOpenForRegistrationChallengesLoaded ? null : loadMoreOpenForRegistration;
         break;
       case BUCKETS.ONGOING:
         bucketChallenges = [].concat(challenges);
         loading = loadingOnGoingChallenges;
-        loadMore = loadMoreOnGoing;
+        loadMore = allActiveChallengesLoaded ? null : loadMoreOnGoing;
         break;
       default:
         break;
@@ -226,6 +229,9 @@ Listing.propTypes = {
       userId: PT.string,
     }),
   }).isRequired,
+  allActiveChallengesLoaded: PT.bool.isRequired,
+  allMyChallengesLoaded: PT.bool.isRequired,
+  allOpenForRegistrationChallengesLoaded: PT.bool.isRequired,
   challenges: PT.arrayOf(PT.shape()),
   openForRegistrationChallenges: PT.arrayOf(PT.shape()),
   myChallenges: PT.arrayOf(PT.shape()),
@@ -268,6 +274,9 @@ const mapStateToProps = (state) => {
   const cl = state.challengeListing;
   return {
     // allActiveChallengesLoaded: cl.allActiveChallengesLoaded,
+    allActiveChallengesLoaded: cl.allActiveChallengesLoaded,
+    allMyChallengesLoaded: cl.allMyChallengesLoaded,
+    allOpenForRegistrationChallengesLoaded: cl.allOpenForRegistrationChallengesLoaded,
     // pastSearchTimestamp: cl.pastSearchTimestamp,
     challengeTypes: cl.challengeTypes,
   };

src/shared/reducers/challenge-listing/index.js

@@ -104,6 +104,7 @@ function onGetActiveChallengesDone(state, { error, payload }) {
     challenges,
     // lastUpdateOfActiveChallenges: Date.now(),
     loadingActiveChallengesUUID: '',
+    allActiveChallengesLoaded: challenges.length >= payload.meta.allChallengesCount,
     meta: {
       ...state.meta,
       ongoingChallengesCount: payload.meta.allChallengesCount,
@@ -558,6 +559,7 @@ function onGetOpenForRegistrationChallengesDone(state, { error, payload }) {
     ...state,
     openForRegistrationChallenges: challenges,
     loadingOpenForRegistrationChallengesUUID: '',
+    allOpenForRegistrationChallengesLoaded: challenges.length >= payload.meta.allChallengesCount,
     meta: {
       ...state.meta,
       openChallengesCount: payload.meta.allChallengesCount,
@@ -577,6 +579,7 @@ function onGetMyChallengesDone(state, { error, payload }) {
     ...state,
     myChallenges: challenges,
     loadingMyChallengesUUID: '',
+    allMyChallengesLoaded: challenges.length >= payload.meta.allChallengesCount,
     meta: {
       ...state.meta,
       myChallengesCount: payload.meta.allChallengesCount,
@@ -619,7 +622,9 @@ function create(initialState) {
   return handleActions({
     [a.dropChallenges]: state => ({
       ...state,
-      // allActiveChallengesLoaded: false,
+      allActiveChallengesLoaded: false,
+      allMyChallengesLoaded: false,
+      allOpenForRegistrationChallengesLoaded: false,
       // allPastChallengesLoaded: false,
       // allReviewOpportunitiesLoaded: false,
       challenges: [],
@@ -754,7 +759,9 @@ function create(initialState) {
       },
     }),
   }, _.defaults(_.clone(initialState) || {}, {
-    // allActiveChallengesLoaded: false,
+    allActiveChallengesLoaded: false,
+    allMyChallengesLoaded: false,
+    allOpenForRegistrationChallengesLoaded: false,
     // allPastChallengesLoaded: false,
     allReviewOpportunitiesLoaded: false,
 

src/shared/utils/url.js

@@ -49,7 +49,10 @@ export function updateQuery(update) {
     if (_.isArray(value) && value.length > 0) filterArray.push(value.map(item => `${key}[]=${item}`).join('&'));
     // eslint-disable-next-line max-len
     else if (_.isUndefined(value) || _.isEmpty(value) || (_.isArray(value) && value.length === 0)) delete query[key];
-    else query += `${key}=${value}`;
+    else {
+      const separator = query === '?' ? '' : '&';
+      query += `${separator}${key}=${value}`;
+    }
   });
   if (query === '?') {
     if (filterArray.length > 0) {