Merge pull request #5737 from topcoder-platform/develop

Release v1.13.4
topcoder-platform · Oct 7, 2021 · fd596b3 · fd596b3
2 parents 243cbbe + 2ba154f
commit fd596b3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -343,7 +343,6 @@ workflows:
             branches:
               only:
                 - develop
-                - docusign-cors
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -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         

diff --git a/package.json b/package.json
@@ -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",

diff --git a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
@@ -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({
@@ -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 })}

diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx
@@ -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)) {