Merge pull request #3629 from topcoder-platform/hot-fix-past-challenge-search

Hot fix past challenge search

Author: sushilshinde

.circleci/config.yml

@@ -175,7 +175,8 @@ workflows:
             branches:
               only:
                 - develop                
-                - hot-fix-no-result
+                - hot-fix-past-challenge-search
+      # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:

__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap

@@ -37,6 +37,7 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
       "users": Object {},
     }
   }
+  domRef={null}
   expandTag={null}
   expandedTags={Array []}
   newChallengeDetails={false}
@@ -74,6 +75,7 @@ exports[`Matches shallow shapshot shapshot 2 1`] = `
       "users": Object {},
     }
   }
+  domRef={null}
   expandTag={null}
   expandedTags={Array []}
   newChallengeDetails={false}
@@ -109,6 +111,7 @@ exports[`Matches shallow shapshot shapshot 3 1`] = `
       "users": Object {},
     }
   }
+  domRef={null}
   expandTag={null}
   expandedTags={Array []}
   newChallengeDetails={false}

__tests__/shared/components/challenge-listing/Listing/__snapshots__/Bucket.jsx.snap

@@ -77,6 +77,7 @@ exports[`Matches shallow shapshot 1`] = `
     loading={false}
     newChallengeDetails={false}
     openChallengesInNewTabs={false}
+    searchTimestamp={0}
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""
@@ -226,6 +227,7 @@ exports[`Matches shallow shapshot 2`] = `
     loading={true}
     newChallengeDetails={false}
     openChallengesInNewTabs={false}
+    searchTimestamp={0}
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""
@@ -262,6 +264,7 @@ exports[`Matches shallow shapshot 3`] = `
     loading={true}
     newChallengeDetails={false}
     openChallengesInNewTabs={false}
+    searchTimestamp={0}
     setFilterState={[MockFunction]}
     setSort={[MockFunction]}
     sort=""

config/default.js

@@ -158,6 +158,12 @@ module.exports = {
    * object should be considered outdated, and updated as soon as possible. */
   USER_GROUP_MAXAGE: 24 * 60 * 60 * 1000,
 
+  /* Maximum time to wait before timeout on searching past challenges (seconds)
+   * when no result at all.
+   * Default: 30 seconds.
+   */
+  SEARCH_TIMEOUT: 30 * 1000,
+
   /* Filestack configuration for uploading Submissions
    * These are for the development back end */
   FILESTACK: {

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

@@ -50,6 +50,7 @@ function ChallengeCard({
   sampleWinnerProfile,
   selectChallengeDetailsTab,
   userHandle,
+  domRef,
 }) {
   const challenge = passedInChallenge;
   const {
@@ -110,7 +111,7 @@ function ChallengeCard({
   }
 
   return (
-    <div styleName="challengeCard">
+    <div ref={domRef} styleName="challengeCard">
       <div styleName="left-panel">
         <div styleName="challenge-track">
           <TrackAbbreviationTooltip track={challenge.track} subTrack={challenge.subTrack}>
@@ -200,6 +201,7 @@ ChallengeCard.defaultProps = {
   userHandle: '',
   expandedTags: [],
   expandTag: null,
+  domRef: null,
 };
 
 ChallengeCard.propTypes = {
@@ -214,6 +216,7 @@ ChallengeCard.propTypes = {
   userHandle: PT.string,
   expandedTags: PT.arrayOf(PT.number),
   expandTag: PT.func,
+  domRef: PT.func,
 };
 
 export default ChallengeCard;

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

@@ -7,7 +7,8 @@
 import _ from 'lodash';
 import PT from 'prop-types';
 import qs from 'qs';
-import React from 'react';
+import React, { useRef } from 'react';
+import { config } from 'topcoder-react-utils';
 import Sort from 'utils/challenge-listing/sort';
 import { NO_LIVE_CHALLENGES_CONFIG, BUCKETS } from 'utils/challenge-listing/buckets';
 import SortingSelectBar from 'components/SortingSelectBar';
@@ -44,7 +45,15 @@ export default function Bucket({
   expandedTags,
   expandTag,
   activeBucket,
+  searchTimestamp,
 }) {
+  const refs = useRef([]);
+  refs.current = [];
+  const addToRefs = (el) => {
+    if (el) {
+      refs.current.push(el);
+    }
+  };
   const filter = Filter.getFilterFunction(bucket.filter);
   const activeSort = sort || bucket.sorts[0];
 
@@ -69,7 +78,15 @@ export default function Bucket({
     }
   }
 
-  if (!filteredChallenges.length && !loadMore) {
+  let noPastResult = false;
+  // check if no past challenge is found after configurable amount of time has passed
+  if (activeBucket === BUCKETS.PAST && searchTimestamp > 0
+    && !filteredChallenges.length && !refs.current.length) {
+    const elapsedTime = Date.now() - searchTimestamp;
+    noPastResult = elapsedTime > config.SEARCH_TIMEOUT;
+  }
+
+  if (noPastResult || (!filteredChallenges.length && !loadMore)) {
     if (activeBucket === BUCKETS.ALL) {
       return null;
     }
@@ -93,6 +110,7 @@ export default function Bucket({
       userHandle={userHandle}
       expandedTags={expandedTags}
       expandTag={expandTag}
+      domRef={addToRefs}
     />
   ));
 
@@ -170,6 +188,7 @@ Bucket.defaultProps = {
   expandedTags: [],
   expandTag: null,
   activeBucket: '',
+  searchTimestamp: 0,
 };
 
 Bucket.propTypes = {
@@ -195,4 +214,5 @@ Bucket.propTypes = {
   expandedTags: PT.arrayOf(PT.number),
   expandTag: PT.func,
   activeBucket: PT.string,
+  searchTimestamp: PT.number,
 };

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

@@ -42,6 +42,7 @@ function Listing({
   sorts,
   expandedTags,
   expandTag,
+  pastSearchTimestamp,
 }) {
   const buckets = getBuckets(_.get(auth.user, 'handle'));
   const isChallengesAvailable = (bucket) => {
@@ -59,11 +60,13 @@ function Listing({
     let keepPlaceholders = false;
     let loading;
     let loadMore;
+    let searchTimestamp;
     switch (bucket) {
       case BUCKETS.PAST:
         keepPlaceholders = keepPastPlaceholders;
         loading = loadingPastChallenges;
         loadMore = loadMorePast;
+        searchTimestamp = pastSearchTimestamp;
         break;
       default:
         break;
@@ -113,6 +116,7 @@ function Listing({
             sort={sorts[bucket]}
             userHandle={_.get(auth, 'user.handle')}
             activeBucket={activeBucket}
+            searchTimestamp={searchTimestamp}
           />
         )
     );
@@ -167,6 +171,7 @@ Listing.defaultProps = {
   // onTechTagClicked: _.noop,
   // onExpandFilterResult: _.noop,
   openChallengesInNewTabs: false,
+  pastSearchTimestamp: 0,
 };
 
 Listing.propTypes = {
@@ -200,12 +205,14 @@ Listing.propTypes = {
   setFilterState: PT.func.isRequired,
   setSort: PT.func.isRequired,
   sorts: PT.shape().isRequired,
+  pastSearchTimestamp: PT.number,
 };
 
 const mapStateToProps = (state) => {
   const cl = state.challengeListing;
   return {
     allActiveChallengesLoaded: cl.allActiveChallengesLoaded,
+    pastSearchTimestamp: cl.pastSearchTimestamp,
   };
 };
 

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

@@ -216,12 +216,16 @@ function onGetPastChallengesDone(state, { error, payload }) {
     keepPastPlaceholders = challenges.filter(ff).length - state.challenges.filter(ff).length < 10;
   }
 
+  const pastSearchTimestamp = state.pastSearchTimestamp && state.pastSearchTimestamp > 0
+    ? state.pastSearchTimestamp : Date.now();
+
   return {
     ...state,
     allPastChallengesLoaded: loaded.length === 0,
     challenges,
     keepPastPlaceholders,
     loadingPastChallengesUUID: '',
+    pastSearchTimestamp,
   };
 }
 
@@ -237,6 +241,7 @@ function onSelectCommunity(state, { payload }) {
       * challenges). */
     allPastChallengesLoaded: false,
     lastRequestedPageOfPastChallenges: -1,
+    pastSearchTimestamp: -1,
   };
 }
 
@@ -273,6 +278,7 @@ function onSetFilter(state, { payload }) {
      * the code simple we just reset them each time a filter is modified. */
     allPastChallengesLoaded: false,
     lastRequestedPageOfPastChallenges: -1,
+    pastSearchTimestamp: -1,
   };
 }
 
@@ -488,6 +494,8 @@ function create(initialState) {
       openChallengesCount: 0,
       totalCount: 0,
     },
+
+    pastSearchTimestamp: -1,
   }));
 }
 

src/shared/utils/challenge-listing/buckets.js

@@ -122,9 +122,9 @@ const BUCKET_DATA = {
 export const NO_LIVE_CHALLENGES_CONFIG = {
   [BUCKETS.ALL]: 'No Live Challenges found in All Challenges',
   [BUCKETS.MY]: 'No challenges found in My Challenges',
-  [BUCKETS.OPEN_FOR_REGISTRATION]: 'No challenges found in Open for Registration',
+  [BUCKETS.OPEN_FOR_REGISTRATION]: 'No challenges found in Open for Registration Challenges',
   [BUCKETS.ONGOING]: 'No challenges found in Ongoing Challenges',
-  [BUCKETS.PAST]: 'No challenges found in Past',
+  [BUCKETS.PAST]: 'No challenges found in Past Challenges',
   [BUCKETS.SAVED_FILTER]: 'No challenges found in Saved filter Challenges',
   [BUCKETS.UPCOMING]: 'No challenges found in Upcoming Challenges',
 };