Skip to content

Commit 8cfc746

Browse files
committed
fix: review opp not show up for reviewers
1 parent 80a8e72 commit 8cfc746

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ exports[`Matches shallow shapshot 1`] = `
1313
disabled={false}
1414
expanding={false}
1515
isAuth={false}
16-
isReviewer={false}
1716
past={false}
1817
selectBucket={[MockFunction]}
1918
/>
@@ -37,7 +36,6 @@ exports[`Matches shallow shapshot 2`] = `
3736
disabled={false}
3837
expanding={false}
3938
isAuth={false}
40-
isReviewer={false}
4139
past={false}
4240
selectBucket={[MockFunction]}
4341
/>

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import PT from 'prop-types';
88
import React from 'react';
99
import { BUCKETS } from 'utils/challenge-listing/buckets';
10+
import { isReviewerOrAdmin } from 'utils/challenge-listing/helper';
1011
// import { challenge as challengeUtils } from 'topcoder-react-lib';
1112

1213
import Bucket from './Bucket';
@@ -29,12 +30,12 @@ export default function BucketSelector({
2930
// extraBucket,
3031
// filterState,
3132
isAuth,
32-
isReviewer,
3333
// savedFilters,
3434
selectBucket,
3535
// selectSavedFilter,
3636
// setEditSavedFiltersMode,
3737
past,
38+
auth,
3839
}) {
3940
// let filteredChallenges = challenges.filter(Filter.getFilterFunction(filterState));
4041

@@ -90,7 +91,7 @@ export default function BucketSelector({
9091
{getBucket(BUCKETS.OPEN_FOR_REGISTRATION)}
9192
{/* DISABLED: Until api receive fix community-app#5073 */}
9293
{/* {getBucket(BUCKETS.ONGOING)} */}
93-
{isReviewer ? getBucket(BUCKETS.REVIEW_OPPORTUNITIES) : null}
94+
{isReviewerOrAdmin(auth) ? getBucket(BUCKETS.REVIEW_OPPORTUNITIES) : null}
9495
{/* {getBucket(BUCKETS.PAST)} */}
9596
{/* NOTE: We do not show upcoming challenges for now, for various reasons,
9697
* more political than technical ;)
@@ -141,12 +142,16 @@ BucketSelector.defaultProps = {
141142
disabled: false,
142143
// extraBucket: null,
143144
isAuth: false,
144-
isReviewer: false,
145145
expanding: false,
146146
past: false,
147147
};
148148

149149
BucketSelector.propTypes = {
150+
auth: PT.shape({
151+
profile: PT.shape(),
152+
tokenV3: PT.string,
153+
user: PT.shape(),
154+
}).isRequired,
150155
activeBucket: PT.string.isRequired,
151156
expanding: PT.bool,
152157
// activeSavedFilter: PT.number.isRequired,
@@ -158,7 +163,6 @@ BucketSelector.propTypes = {
158163
// extraBucket: PT.string,
159164
// filterState: PT.shape().isRequired,
160165
isAuth: PT.bool,
161-
isReviewer: PT.bool,
162166
// savedFilters: PT.arrayOf(PT.shape()).isRequired,
163167
selectBucket: PT.func.isRequired,
164168
// selectSavedFilter: PT.func.isRequired,

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717

1818
import React from 'react';
1919
import PT from 'prop-types';
20-
import { isReviewerOrAdmin } from 'utils/challenge-listing/helper';
21-
// import _ from 'lodash';
20+
// import { isReviewerOrAdmin } from 'utils/challenge-listing/helper';
2221
import { isPastBucket } from 'utils/challenge-listing/buckets';
2322
import ChallengeSearchBar from 'containers/challenge-listing/ChallengeSearchBar';
2423
import BucketSelector from './BucketSelector';
@@ -115,7 +114,7 @@ export default function SideBarFilters({
115114
// extraBucket={extraBucket}
116115
// filterState={filterState}
117116
isAuth={isAuth}
118-
isReviewer={isReviewerOrAdmin(auth)}
117+
auth={auth}
119118
// savedFilters={savedFilters}
120119
selectBucket={selectBucket}
121120
// selectSavedFilter={selectSavedFilter}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ function mapStateToProps(state) {
189189
// hideTcLinksInFooter: ownProps.hideTcLinksInFooter,
190190
filterState: state.challengeListing.filter,
191191
isAuth: Boolean(state.auth.user),
192+
auth: state.auth,
192193
// communityFilters: state.tcCommunities.list.data,
193194
// selectedCommunityId: state.challengeListing.selectedCommunityId,
194195
// tokenV2: state.auth.tokenV2,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ function onGetReviewOpportunitiesDone(state, { payload, error }) {
509509
allReviewOpportunitiesLoaded: loaded.length === 0,
510510
meta: {
511511
...state.meta,
512-
openReviewCount: loaded.length,
512+
openReviewCount: reviewOpportunities.length,
513513
},
514514
};
515515
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,5 @@ export const isReviewerOrAdmin = (auth) => {
7777
return false;
7878
}
7979

80-
return _.intersection(roles, ['administrator', 'Reviewer']).length;
80+
return _.intersection(roles, ['administrator', 'Reviewer', 'Gamification Admin', 'Connect Admin', 'admin']).length;
8181
};

0 commit comments

Comments
 (0)