Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ workflows:
branches:
only:
- develop
- feature/unassigned-tasks
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
Expand Down Expand Up @@ -371,6 +372,7 @@ workflows:
branches:
only:
- develop
- feature/unassigned-tasks
# Production builds are exectuted
# when PR is merged to the master
# Don't change anything in this configuration
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
"supertest": "^3.1.0",
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
"tc-ui": "^1.0.12",
"topcoder-react-lib": "1.2.0",
"topcoder-react-lib": "1000.28.0",
"topcoder-react-ui-kit": "2.0.1",
"topcoder-react-utils": "0.7.8",
"turndown": "^4.0.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,19 @@ export default function Bucket({
} else {
sortedChallenges = _.clone(challenges);
}

let filteredChallenges = sortedChallenges;
filteredChallenges = sortedChallenges.filter((ch) => {
if (ch.type === 'Task'
&& ch.task
&& ch.task.isTask
&& ch.task.isAssigned
&& Number(ch.task.memberId) !== Number(userId)) {
return null;
}
return ch;
});
Comment on lines +81 to +91
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SathyaJayabal This filter other members TaaS payment in FE.


// sortedChallenges.sort(Sort[activeSort].func);

// const bucketQuery = qs.stringify({
Expand Down Expand Up @@ -118,14 +131,14 @@ export default function Bucket({
// );
// }

if (!loading && sortedChallenges.length === 0) {
if (!loading && filteredChallenges.length === 0) {
return (
<div styleName="no-results">
{ (filterState.recommended && activeBucket === 'openForRegistration') ? null : `${NO_LIVE_CHALLENGES_CONFIG[activeBucket]}` }
</div>
);
}
const cards = sortedChallenges.map(challenge => (
const cards = filteredChallenges.map(challenge => (
<ChallengeCard
challenge={challenge}
challengeType={_.find(challengeTypes, { name: challenge.type })}
Expand Down
4 changes: 3 additions & 1 deletion src/shared/containers/challenge-detail/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,9 @@ class ChallengeDetailPageContainer extends React.Component {
}

let winners = challenge.winners || [];
winners = winners.filter(w => !w.type || w.type === 'final');
if (challenge.type !== 'Task') {
winners = winners.filter(w => !w.type || w.type === 'final');
}

let hasFirstPlacement = false;
if (!_.isEmpty(winners)) {
Expand Down