Merge branch 'feature-refactor-challengelist' into issue-4964

Author: narekcat

.circleci/config.yml

@@ -259,7 +259,6 @@ workflows:
             branches:
               only:
                 - develop
-                - feature-refactor-challengelist
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx

@@ -43,12 +43,13 @@ export default function ChallengeFilters({
   validTypes,
   // isSavingFilter,
 }) {
-  // let filterRulesCount = 0;
-  // if (filterState.tags) filterRulesCount += 1;
-  // if (filterState.types) filterRulesCount += 1;
-  // if (filterState.endDate || filterState.startDate) filterRulesCount += 1;
-  // if (isReviewOpportunitiesBucket && filterState.reviewOpportunityType) filterRulesCount += 1;
-  // if (selectedCommunityId !== '') filterRulesCount += 1;
+  let filterRulesCount = 0;
+  if (filterState.groups && filterState.groups.length) filterRulesCount += 1;
+  if (filterState.tags && filterState.tags.length) filterRulesCount += 1;
+  if (filterState.types && filterState.types.length) filterRulesCount += 1;
+  if (filterState.endDateEnd || filterState.startDateStart) filterRulesCount += 1;
+  if (isReviewOpportunitiesBucket && filterState.reviewOpportunityType) filterRulesCount += 1;
+  if (selectedCommunityId !== '' && selectedCommunityId !== 'All') filterRulesCount += 1;
   const isTrackOn = track => filterState.tracks[track];
 
   const switchTrack = (track, on) => {
@@ -151,7 +152,7 @@ export default function ChallengeFilters({
           </span>
           <FiltersSwitch
             active={expanded}
-            // filtersCount={filterRulesCount}
+            filtersCount={filterRulesCount}
             onSwitch={setExpanded}
             styleName="FiltersSwitch"
           />

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

@@ -12,7 +12,7 @@ import React, { useRef } from 'react';
 import Sort from 'utils/challenge-listing/sort';
 // import { NO_LIVE_CHALLENGES_CONFIG, BUCKETS, BUCKET_DATA }
 // from 'utils/challenge-listing/buckets';
-import { BUCKET_DATA } from 'utils/challenge-listing/buckets';
+import { NO_LIVE_CHALLENGES_CONFIG, BUCKET_DATA } from 'utils/challenge-listing/buckets';
 import SortingSelectBar from 'components/SortingSelectBar';
 import Waypoint from 'react-waypoint';
 // import { challenge as challengeUtils } from 'topcoder-react-lib';
@@ -102,6 +102,13 @@ export default function Bucket({
   //   );
   // }
 
+  if (sortedChallenges.length === 0) {
+    return (
+      <div styleName="no-results">
+        { `${NO_LIVE_CHALLENGES_CONFIG[bucket]}` }
+      </div>
+    );
+  }
   const cards = sortedChallenges.map(challenge => (
     <ChallengeCard
       challenge={challenge}

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,
@@ -88,19 +91,19 @@ function Listing({
       case BUCKETS.MY:
         bucketChallenges = [].concat(myChallenges);
         loading = loadingMyChallenges;
-        loadMore = loadMoreMy;
+        loadMore = allMyChallengesLoaded ? null : loadMoreMy;
         newExpanded = newExpanded || (+meta.myChallengesCount === bucketChallenges.length);
         break;
       case BUCKETS.OPEN_FOR_REGISTRATION:
         bucketChallenges = [].concat(openForRegistrationChallenges);
         loading = loadingOpenForRegistrationChallenges;
-        loadMore = loadMoreOpenForRegistration;
+        loadMore = allOpenForRegistrationChallengesLoaded ? null : loadMoreOpenForRegistration;
         newExpanded = newExpanded || (+meta.openChallengesCount === bucketChallenges.length);
         break;
       case BUCKETS.ONGOING:
         bucketChallenges = [].concat(challenges);
         loading = loadingOnGoingChallenges;
-        loadMore = loadMoreOnGoing;
+        loadMore = allActiveChallengesLoaded ? null : loadMoreOnGoing;
         newExpanded = newExpanded || (+meta.ongoingChallengesCount === bucketChallenges.length);
         break;
       default:
@@ -189,9 +192,9 @@ function Listing({
   return (
     <div styleName="challengeCardContainer">
       {preListingMsg}
-      {auth.user ? getBucket(BUCKETS.MY) : null}
+      {(auth.user && myChallenges.length > 0) ? getBucket(BUCKETS.MY) : null}
       {/* {extraBucket ? getBucket(extraBucket) : null} */}
-      {getBucket(BUCKETS.OPEN_FOR_REGISTRATION)}
+      {openForRegistrationChallenges.length > 0 && getBucket(BUCKETS.OPEN_FOR_REGISTRATION)}
       {/* {getBucket(BUCKETS.ONGOING)} */}
     </div>
   );
@@ -231,6 +234,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()),
@@ -274,6 +280,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) {