Merge pull request #4563 from nursoltan-s/issue-4559

fix #4559

Author: sushilshinde

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

@@ -92,6 +92,7 @@ exports[`Matches shallow shapshot 1 shapshot 1 1`] = `
       setFilterState={[MockFunction]}
       setSort={[MockFunction]}
       sorts={Object {}}
+      userChallenges={Array []}
     />
     <div
       className="src-shared-components-challenge-listing-___style__sidebar-container-desktop___h0bz6"

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

@@ -319,6 +319,31 @@ function getSrmsDone(uuid, handle, params, tokenV3) {
   });
 }
 
+/**
+ * Payload creator for the action that initialize user registered challenges.
+ * @param {String} uuid
+ * @return {String}
+ */
+function getUserChallengesInit(uuid) {
+  return { uuid };
+}
+
+/**
+ * Payload creator for the action that loads user registered challenges.
+ * @param {String} userId
+ * @return {String}
+ */
+function getUserChallengesDone(userId, tokenV3) {
+  const service = getService(tokenV3);
+
+  return service.getUserResources(userId)
+    .then(item => item)
+    .catch((error) => {
+      fireErrorMessage('Error Getting User Challenges', error.content || error);
+      return Promise.reject(error);
+    });
+}
+
 export default createActions({
   CHALLENGE_LISTING: {
     DROP_CHALLENGES: _.noop,
@@ -353,6 +378,9 @@ export default createActions({
     GET_SRMS_INIT: getSrmsInit,
     GET_SRMS_DONE: getSrmsDone,
 
+    GET_USER_CHALLENGES_INIT: getUserChallengesInit,
+    GET_USER_CHALLENGES_DONE: getUserChallengesDone,
+
     EXPAND_TAG: id => id,
 
     /* Pass in community ID. */

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

@@ -21,6 +21,7 @@ function Listing({
   auth,
   challenges,
   challengeTypes,
+  userChallenges,
   challengesUrl,
   communityName,
   extraBucket,
@@ -45,7 +46,7 @@ function Listing({
   expandTag,
   pastSearchTimestamp,
 }) {
-  const buckets = getBuckets(_.get(auth.user, 'userId'));
+  const buckets = getBuckets(userChallenges);
   const isChallengesAvailable = (bucket) => {
     const filter = Filter.getFilterFunction(buckets[bucket].filter);
     const clonedChallenges = _.clone(challenges);
@@ -176,6 +177,7 @@ Listing.defaultProps = {
   // onExpandFilterResult: _.noop,
   openChallengesInNewTabs: false,
   pastSearchTimestamp: 0,
+  userChallenges: [],
 };
 
 Listing.propTypes = {
@@ -211,6 +213,7 @@ Listing.propTypes = {
   setSort: PT.func.isRequired,
   sorts: PT.shape().isRequired,
   pastSearchTimestamp: PT.number,
+  userChallenges: PT.arrayOf(PT.shape()),
 };
 
 const mapStateToProps = (state) => {

src/shared/components/challenge-listing/Sidebar/BucketSelector/Bucket/index.jsx

@@ -23,6 +23,13 @@ function Bucket({
   let countEl;
   if (!bucket.hideCount && !disabled) {
     const filter = Filter.getFilterFunction(bucket.filter);
+    const clonedChallenges = _.clone(challenges);
+    const filteredChallenges = [];
+    for (let i = 0; i < clonedChallenges.length; i += 1) {
+      if (filter(clonedChallenges[i])) {
+        filteredChallenges.push(clonedChallenges[i]);
+      }
+    }
     let count;
     if (allActiveChallengesLoaded) {
       count = challenges.filter(filter).length;
@@ -32,7 +39,7 @@ function Bucket({
           count = meta.allChallengesCount;
           break;
         case 'My Challenges':
-          count = meta.myChallengesCount;
+          count = filteredChallenges.length;
           break;
         case 'Open for registration':
           count = meta.openChallengesCount;

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

@@ -115,6 +115,7 @@ export default function ChallengeListing(props) {
         sorts={props.sorts}
         loadMoreActive={props.loadMoreActive}
         loadingActiveChallenges={props.loadingChallenges}
+        userChallenges={props.userChallenges}
       />
     );
   }
@@ -200,6 +201,7 @@ ChallengeListing.defaultProps = {
   expandTag: null,
   loadMoreActive: null,
   isBucketSwitching: false,
+  userChallenges: [],
 };
 
 ChallengeListing.propTypes = {
@@ -236,4 +238,5 @@ ChallengeListing.propTypes = {
   auth: PT.shape(),
   loadMoreActive: PT.func,
   isBucketSwitching: PT.bool,
+  userChallenges: PT.arrayOf(PT.string),
 };

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

@@ -148,6 +148,7 @@ export class ListingContainer extends React.Component {
       auth,
       getActiveChallenges,
       lastRequestedPageOfActiveChallenges,
+      getUserChallenges,
     } = this.props;
     const f = this.getBackendFilter();
     getActiveChallenges(
@@ -156,6 +157,10 @@ export class ListingContainer extends React.Component {
       auth.tokenV3,
       f.front,
     );
+    if (auth) {
+      const userId = _.get(auth.user, 'userId');
+      getUserChallenges(userId, auth.tokenV3);
+    }
   }
 
   render() {
@@ -204,6 +209,7 @@ export class ListingContainer extends React.Component {
       sorts,
       hideTcLinksInSidebarFooter,
       isBucketSwitching,
+      userChallenges,
     } = this.props;
 
     const { tokenV3 } = auth;
@@ -305,6 +311,7 @@ export class ListingContainer extends React.Component {
           groupIds={groupIds}
           auth={auth}
           isBucketSwitching={isBucketSwitching}
+          userChallenges={userChallenges}
         />
       </div>
     );
@@ -331,6 +338,7 @@ ListingContainer.defaultProps = {
   queryBucket: BUCKETS.ALL,
   meta: {},
   isBucketSwitching: false,
+  userChallenges: [],
 };
 
 ListingContainer.propTypes = {
@@ -401,6 +409,8 @@ ListingContainer.propTypes = {
   meta: PT.shape(),
   isBucketSwitching: PT.bool,
   selectBucketDone: PT.func.isRequired,
+  userChallenges: PT.arrayOf(PT.string),
+  getUserChallenges: PT.func.isRequired,
 };
 
 const mapStateToProps = (state, ownProps) => {
@@ -445,6 +455,7 @@ const mapStateToProps = (state, ownProps) => {
     isBucketSwitching: cl.sidebar.isBucketSwitching,
     expandedTags: cl.expandedTags,
     meta: cl.meta,
+    userChallenges: cl.userChallenges,
   };
 };
 
@@ -491,6 +502,11 @@ function mapDispatchToProps(dispatch) {
     setSort: (bucket, sort) => dispatch(a.setSort(bucket, sort)),
     markHeaderMenu: () => dispatch(ah.setCurrentNav('Compete', 'All Challenges')),
     expandTag: id => dispatch(a.expandTag(id)),
+    getUserChallenges: (userId, tokenV3) => {
+      const uuid = shortId();
+      dispatch(a.getUserChallengesInit(uuid));
+      dispatch(a.getUserChallengesDone(userId, tokenV3));
+    },
   };
 }
 

src/shared/containers/challenge-listing/Sidebar.jsx

@@ -59,10 +59,10 @@ export class SidebarContainer extends React.Component {
       tokenV2,
       updateAllSavedFilters,
       updateSavedFilter,
-      user,
+      userChallenges,
     } = this.props;
 
-    const buckets = getBuckets(user && user.userId);
+    const buckets = getBuckets(userChallenges);
 
     if (extraBucket) {
       buckets[extraBucket.name] = extraBucket;
@@ -115,6 +115,7 @@ SidebarContainer.defaultProps = {
   selectedCommunityId: '',
   tokenV2: null,
   user: null,
+  userChallenges: [],
 };
 
 SidebarContainer.propTypes = {
@@ -135,6 +136,7 @@ SidebarContainer.propTypes = {
   updateAllSavedFilters: PT.func.isRequired,
   updateSavedFilter: PT.func.isRequired,
   user: PT.shape(),
+  userChallenges: PT.arrayOf(PT.string),
 };
 
 function mapDispatchToProps(dispatch) {
@@ -167,6 +169,7 @@ function mapStateToProps(state, ownProps) {
     selectedCommunityId: state.challengeListing.selectedCommunityId,
     tokenV2: state.auth.tokenV2,
     user: state.auth.user,
+    userChallenges: state.challengeListing.userChallenges,
   };
 }
 

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

@@ -479,6 +479,31 @@ function onGetSrmsDone(state, { error, payload }) {
   };
 }
 
+/**
+ * Handles CHALLENGE_LISTING/GET_USER_CHALLENGES_INIT action
+ * @param {Object} state
+ * @return {Object} New state.
+ */
+function onGetUserChallengesInit(state) {
+  return {
+    ...state,
+    userChallenges: [],
+  };
+}
+
+/**
+ * Handles CHALLENGE_LISTING/GET_USER_CHALLENGES_DONE action
+ * @param {Object} state
+ * @param {Object} payload
+ * @return {Object} New state.
+ */
+function onGetUserChallengesDone(state, { payload }) {
+  return {
+    ...state,
+    userChallenges: payload,
+  };
+}
+
 /**
  * Creates a new Challenge Listing reducer with the specified initial state.
  * @param {Object} initialState Optional. Initial state.
@@ -556,6 +581,9 @@ function create(initialState) {
     [a.getSrmsInit]: onGetSrmsInit,
     [a.getSrmsDone]: onGetSrmsDone,
 
+    [a.getUserChallengesInit]: onGetUserChallengesInit,
+    [a.getUserChallengesDone]: onGetUserChallengesDone,
+
     [a.selectCommunity]: onSelectCommunity,
 
     [a.setFilter]: onSetFilter,

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

@@ -29,7 +29,6 @@ const BUCKET_DATA = {
   },
   [BUCKETS.MY]: {
     filter: {
-      started: true,
       status: ['Active'],
       // users: [userHandle],
     },
@@ -134,9 +133,9 @@ export const NO_LIVE_CHALLENGES_CONFIG = {
  * @param {String} userId id of the authenticated
  * user to filter out My Challenges.
  */
-export function getBuckets(userId) {
+export function getBuckets(userChallenges) {
   const res = _.cloneDeep(BUCKET_DATA);
-  res[BUCKETS.MY].filter.users = [userId];
+  res[BUCKETS.MY].filter.userChallenges = userChallenges;
   return res;
 }