fix: counts is different

Author: dedywahyudi

__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap

@@ -69,6 +69,7 @@ exports[`Matches shallow shapshot 2`] = `
           isReviewer={false}
           loading={true}
           past={false}
+          reviewCount={0}
         />
       </div>
     </div>

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

@@ -15,6 +15,7 @@ exports[`Matches shallow shapshot 1`] = `
       isAuth={false}
       loading={true}
       past={false}
+      reviewCount={0}
       selectBucket={[MockFunction]}
     />
   </div>
@@ -39,6 +40,7 @@ exports[`Matches shallow shapshot 2`] = `
       isAuth={false}
       loading={true}
       past={false}
+      reviewCount={0}
       selectBucket={[MockFunction]}
     />
   </div>

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

@@ -29,6 +29,7 @@ exports[`Matches shallow shapshot 1 shapshot 1 1`] = `
     >
       <Connect(SidebarContainer)
         expanding={false}
+        reviewCount={0}
         setFilterState={[MockFunction]}
       />
       <Connect(Container)
@@ -99,6 +100,7 @@ exports[`Matches shallow shapshot 2 shapshot 2 1`] = `
     >
       <Connect(SidebarContainer)
         expanding={false}
+        reviewCount={0}
         setFilterState={[MockFunction]}
       />
       <Connect(Container)

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

@@ -18,6 +18,7 @@ function Bucket({
   // challenges,
   disabled,
   onClick,
+  reviewCount,
   // allActiveChallengesLoaded,
   meta,
   loading,
@@ -53,7 +54,7 @@ function Bucket({
       count = meta.myPastChallengesCount;
       break;
     case BUCKETS.REVIEW_OPPORTUNITIES:
-      count = meta.openReviewCount;
+      count = reviewCount;
       break;
     default:
   }
@@ -104,6 +105,7 @@ Bucket.defaultProps = {
   disabled: false,
   onClick: _.noop,
   meta: {},
+  reviewCount: 0,
   loading: true,
 };
 
@@ -122,6 +124,7 @@ Bucket.propTypes = {
   meta: PT.shape(),
   // allActiveChallengesLoaded: PT.bool.isRequired,
   loading: PT.bool,
+  reviewCount: PT.number,
 };
 
 const mapStateToProps = (state) => {

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

@@ -36,6 +36,7 @@ export default function BucketSelector({
   // setEditSavedFiltersMode,
   past,
   auth,
+  reviewCount,
   loading,
 }) {
   // let filteredChallenges = challenges.filter(Filter.getFilterFunction(filterState));
@@ -52,6 +53,7 @@ export default function BucketSelector({
       <Bucket
         active={!disabled && isActive}
         bucket={bucket}
+        reviewCount={reviewCount}
         // challenges={challenges}
         disabled={disabled}
         onClick={() => {
@@ -146,6 +148,7 @@ BucketSelector.defaultProps = {
   isAuth: false,
   expanding: false,
   past: false,
+  reviewCount: 0,
   loading: true,
 };
 
@@ -168,6 +171,7 @@ BucketSelector.propTypes = {
   isAuth: PT.bool,
   // savedFilters: PT.arrayOf(PT.shape()).isRequired,
   selectBucket: PT.func.isRequired,
+  reviewCount: PT.number,
   // selectSavedFilter: PT.func.isRequired,
   // setEditSavedFiltersMode: PT.func.isRequired,
   past: PT.bool,

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

@@ -53,6 +53,7 @@ export default function SideBarFilters({
   // updateSavedFilter,
   // setFilter,
   setFilterState,
+  reviewCount,
   loading,
 }) {
   const past = isPastBucket(activeBucket);
@@ -116,6 +117,7 @@ export default function SideBarFilters({
           // filterState={filterState}
           isAuth={isAuth}
           auth={auth}
+          reviewCount={reviewCount}
           // savedFilters={savedFilters}
           selectBucket={selectBucket}
           // selectSavedFilter={selectSavedFilter}
@@ -138,6 +140,7 @@ SideBarFilters.defaultProps = {
   // extraBucket: null,
   // hideTcLinksInFooter: false,
   isAuth: false,
+  reviewCount: 0,
   expanding: false,
 };
 
@@ -161,6 +164,7 @@ SideBarFilters.propTypes = {
   // hideTcLinksInFooter: PT.bool,
   auth: PT.shape().isRequired,
   isAuth: PT.bool,
+  reviewCount: PT.number,
   // resetFilterName: PT.func.isRequired,
   // savedFilters: PT.arrayOf(PT.shape()).isRequired,
   selectBucket: PT.func.isRequired,

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

@@ -7,6 +7,10 @@
 import FilterPanel from 'containers/challenge-listing/FilterPanel';
 // import moment from 'moment';
 import React from 'react';
+import {
+  BUCKET_DATA,
+} from 'utils/challenge-listing/buckets';
+import { challenge as challengeUtils } from 'topcoder-react-lib';
 import PT from 'prop-types';
 // import { challenge as challengeUtils } from 'topcoder-react-lib';
 import Sidebar from 'containers/challenge-listing/Sidebar';
@@ -20,7 +24,7 @@ import ChallengeTab from './ChallengeTab';
 
 import './style.scss';
 
-// const Filter = challengeUtils.filter;
+const Filter = challengeUtils.filter;
 
 // Number of challenge placeholder card to display
 // const CHALLENGE_PLACEHOLDER_COUNT = 8;
@@ -54,10 +58,30 @@ export default function ChallengeListing(props) {
     setPreviousBucketOfPastChallengesTab,
     previousBucketOfPastChallengesTab,
     previousBucketOfActiveTab,
+    reviewOpportunities,
+    filterState,
+    challengeTypes,
   } = props;
 
   // const { challenges } = props;
 
+  // const activeSort = sort || BUCKET_DATA[bucket].sorts[0];
+
+  // const sortedOpportunities = _.clone(opportunities);
+  // sortedOpportunities.sort(Sort[activeSort].func);
+
+  /* Filtering for Review Opportunities will be done entirely in the front-end
+   * which means it can be done at render, rather than in the reducer,
+   * which avoids reloading the review opportunities from server every time
+   * a filter is changed.  */
+  const filteredOpportunities = reviewOpportunities.filter(
+    Filter.getReviewOpportunitiesFilterFunction({
+      ...BUCKET_DATA.reviewOpportunities.filter, // Default bucket filters from utils/buckets.js
+      ...filterState, // User selected filters
+    }, challengeTypes),
+    // }),
+  );
+
   // if (communityFilter) {
   //   challenges = challenges.filter(Filter.getFilterFunction(props.communityFilter));
   // }
@@ -178,6 +202,7 @@ export default function ChallengeListing(props) {
             loadingMyChallenges={props.loadingMyChallenges}
             loadingOpenForRegistrationChallenges={props.loadingOpenForRegistrationChallenges}
             loadingReviewOpportunities={props.loadingReviewOpportunities}
+            reviewCount={filteredOpportunities.length}
           />
 
           <FilterPanel
@@ -219,6 +244,7 @@ ChallengeListing.defaultProps = {
   expandTag: null,
   loadMoreActive: null,
   expanding: false,
+  challengeTypes: [],
   // isBucketSwitching: false,
   // userChallenges: [],
 };
@@ -233,6 +259,7 @@ ChallengeListing.propTypes = {
   allChallenges: PT.arrayOf(PT.shape()).isRequired,
   pastChallenges: PT.arrayOf(PT.shape()).isRequired,
   challengesUrl: PT.string.isRequired,
+  challengeTypes: PT.arrayOf(PT.shape()),
   // communityFilter: PT.shape(),
   communityName: PT.string,
   defaultCommunityId: PT.string.isRequired,

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

@@ -23,6 +23,7 @@ import Banner from 'components/tc-communities/Banner';
 import sidebarActions from 'actions/challenge-listing/sidebar';
 import filterPanelActions from 'actions/challenge-listing/filter-panel';
 import communityActions from 'actions/tc-communities';
+
 // import SORT from 'utils/challenge-listing/sort';
 import {
   BUCKETS, filterChanged, sortChangedBucket,
@@ -516,6 +517,7 @@ export class ListingContainer extends React.Component {
       setFilter,
       setSort,
       sorts,
+      setReviewCount,
       // hideTcLinksInSidebarFooter,
       // isBucketSwitching,
       // userChallenges,
@@ -702,6 +704,7 @@ export class ListingContainer extends React.Component {
           // userChallenges={[]}
           isLoggedIn={isLoggedIn}
           meta={meta}
+          setReviewCount={setReviewCount}
           setSearchText={setSearchText}
           previousBucketOfActiveTab={previousBucketOfActiveTab}
           previousBucketOfPastChallengesTab={previousBucketOfPastChallengesTab}
@@ -837,6 +840,7 @@ ListingContainer.propTypes = {
   // userChallenges: PT.arrayOf(PT.string),
   // getUserChallenges: PT.func.isRequired,
   setSearchText: PT.func.isRequired,
+  setReviewCount: PT.func.isRequired,
   filterState: PT.shape().isRequired,
   loading: PT.bool,
 };