Merge pull request #7093 from topcoder-platform/develop

[PROD RELEASE] - Bug fixes

Author: kkartunov

src/shared/components/challenge-detail/Registrants/index.jsx

@@ -234,8 +234,8 @@ export default class Registrants extends React.Component {
           break;
         }
         case 'Submitted Date': {
-          const checkpointA = this.getFinal(a);
-          const checkpointB = this.getFinal(b);
+          const checkpointA = this.getFinal(a) || this.getSubmissionDate(a);
+          const checkpointB = this.getFinal(b) || this.getSubmissionDate(b);
           if (checkpointA) {
             valueA = new Date(checkpointA);
           }

src/shared/components/challenge-detail/Specification/index.jsx

@@ -47,15 +47,23 @@ export default function ChallengeDetailsView(props) {
     metadata,
     events,
     track,
+    phases,
   } = challenge;
 
+  const getScoreCardByPhase = (phaseName) => {
+    const phase = phases.find(item => item.name === phaseName);
+    const scoreCardConstraint = phase && phase.constraints && phase.constraints.find(item => item.name === 'Scorecard');
+    return scoreCardConstraint ? scoreCardConstraint.value : '';
+  };
+
   const roles = (userDetails || {}).roles || [];
   const {
-    reviewScorecardId,
-    screeningScorecardId,
     forumId,
   } = legacy;
 
+  const reviewScorecardId = getScoreCardByPhase('Review');
+  const screeningScorecardId = getScoreCardByPhase('Screening');
+
   let stockArtValue = '';
   const allowStockArt = _.find(metadata, { name: 'allowStockArt' });
   if (allowStockArt) {
@@ -421,6 +429,7 @@ ChallengeDetailsView.propTypes = {
     }),
     metadata: PT.array,
     events: PT.arrayOf(PT.string),
+    phases: PT.arrayOf(PT.any),
   }),
   challengesUrl: PT.string.isRequired,
   communitiesList: PT.arrayOf(PT.shape({