Skip to content

Release v1.13.4 #5737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 7, 2021
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 2 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,6 @@ workflows:
branches:
only:
- develop
- docusign-cors
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
Expand All @@ -357,14 +356,14 @@ workflows:
filters:
branches:
only:
- ref-email-tracking
- free
# This is beta env for production soft releases
- "build-prod-beta":
context : org-global
filters:
branches:
only:
- slash-home-hotfix
- free
# This is stage env for production QA releases
- "build-prod-staging":
context : org-global
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": "1.2.1",
"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;
});

// 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