Merge pull request #4837 from topcoder-platform/release-v5-develop

Release v5 develop

Author: sushilshinde

src/server/tc-communities/tco19/metadata.json

@@ -1,9 +1,6 @@
 {
   "challengeFilter": {
-    "groupIds": ["20000078"],
-    "or": [{
-      "tags": ["TCO", "TCO19"]
-    }]
+    "events": ["tco19"]
   },
   "communityId": "tco19",
   "communityName": "TCO19",

src/shared/components/ReviewOpportunityDetailsPage/ChallengeSpecTab/index.jsx

@@ -29,24 +29,6 @@ const ChallengeSpecTab = ({ challenge }) => (
       </article>
       )
     }
-    {
-      challenge.finalSubmissionGuidelines
-      && (
-      <article>
-        <h2 styleName="h2">
-          Final Submission Guidelines
-        </h2>
-        <div
-          /* eslint-disable react/no-danger */
-          dangerouslySetInnerHTML={{
-            __html: challenge.finalSubmissionGuidelines,
-          }}
-          /* eslint-enable react/no-danger */
-          styleName="rawHtml"
-        />
-      </article>
-      )
-    }
   </div>
 );
 

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

@@ -41,7 +41,7 @@ class MySubmissionsView extends React.Component {
     }
 
     if (isMM) {
-      loadMMSubmissions(challenge.id, challenge.registrants, auth.tokenV3);
+      loadMMSubmissions(challenge.id, auth.tokenV3);
     }
   }
 

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

@@ -45,7 +45,6 @@ export default function ChallengeDetailsView(props) {
     legacy,
     legacyId,
     documents,
-    finalSubmissionGuidelines,
     userDetails,
     metadata,
     events,
@@ -196,35 +195,6 @@ export default function ChallengeDetailsView(props) {
                       </article>
                       )
                     }
-                    {
-                      finalSubmissionGuidelines
-                      && (
-                      <article>
-                        <h2>
-                          Final Submission Guidelines
-                        </h2>
-                        {
-                          editMode ? (
-                            <Editor
-                              connector={toolbarConnector}
-                              id="submissionGuidelines"
-                              initialMode={EDITOR_MODES.WYSIWYG}
-                              ref={n => n && n.setHtml(finalSubmissionGuidelines)}
-                            />
-                          ) : (
-                            <div
-                              /* eslint-disable react/no-danger */
-                              dangerouslySetInnerHTML={{
-                                __html: finalSubmissionGuidelines,
-                              }}
-                              /* eslint-enable react/no-danger */
-                              styleName="rawHtml"
-                            />
-                          )
-                        }
-                      </article>
-                      )
-                    }
                   </div>
                 )
                 : (
@@ -408,7 +378,6 @@ ChallengeDetailsView.defaultProps = {
     track: 'design',
     reviewType: undefined,
     numberOfCheckpointsPrizes: 0,
-    finalSubmissionGuidelines: '',
     environment: '',
     descriptionFormat: 'HTML',
     codeRepo: '',
@@ -438,7 +407,6 @@ ChallengeDetailsView.propTypes = {
     groups: PT.any,
     reviewType: PT.string,
     numberOfCheckpointsPrizes: PT.number,
-    finalSubmissionGuidelines: PT.string,
     environment: PT.string,
     codeRepo: PT.string,
     userDetails: PT.shape({

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

@@ -54,7 +54,7 @@ class SubmissionsComponent extends React.Component {
     }
 
     if (isMM) {
-      loadMMSubmissions(challenge.id, challenge.registrants, auth.tokenV3);
+      loadMMSubmissions(challenge.id, auth.tokenV3);
     }
     this.updateSortedSubmissions();
   }
@@ -175,13 +175,16 @@ class SubmissionsComponent extends React.Component {
             valueA = `${a.member || ''}`.toLowerCase();
             valueB = `${b.member || ''}`.toLowerCase();
           } else {
-            valueA = _.get(a.registrant, 'memberHandle', '');
-            valueB = _.get(b.registrant, 'memberHandle', '');
+            valueA = _.get(a.registrant, 'memberHandle', '').toLowerCase();
+            valueB = _.get(b.registrant, 'memberHandle', '').toLowerCase();
           }
           valueIsString = true;
           break;
         }
         case 'Time':
+          valueA = new Date(a.submissions && a.submissions[0].submissionTime);
+          valueB = new Date(b.submissions && b.submissions[0].submissionTime);
+          break;
         case 'Submission Date': {
           valueA = new Date(a.created);
           valueB = new Date(b.created);
@@ -247,7 +250,7 @@ class SubmissionsComponent extends React.Component {
 
     let isReviewPhaseComplete = false;
     _.forEach(allPhases, (phase) => {
-      if (phase.name === 'Review' && !phase.isOpen) {
+      if (phase.name === 'Review' && !phase.isOpen && moment(phase.scheduledStartDate).isBefore()) {
         isReviewPhaseComplete = true;
       }
     });

src/shared/containers/challenge-detail/index.jsx

@@ -728,31 +728,27 @@ function mapStateToProps(state, props) {
     if (!_.isEmpty(mmSubmissions)) {
       mmSubmissions = mmSubmissions.map((submission) => {
         let registrant;
-        let { member } = submission;
-        if (auth.user.handle === submission.member) {
+        const { memberId } = submission;
+        let member = memberId;
+        if (`${auth.user.userId}` === `${memberId}`) {
           mySubmissions = submission.submissions || [];
           mySubmissions.forEach((mySubmission, index) => {
             mySubmissions[index].id = mySubmissions.length - index;
           });
         }
-        let submissionDetail = _.find(challenge.submissions, { createdBy: submission.createdBy });
-        if (!submissionDetail) {
-          // get submission detail from submissions challenge detail
-          submissionDetail = _.find(challenge.submissions, s => (`${s.memberId}` === `${submission.memberId}`));
-        }
+        const submissionDetail = _.find(challenge.submissions, s => (`${s.memberId}` === `${submission.memberId}`));
 
         if (submissionDetail) {
           member = submissionDetail.createdBy;
           ({ registrant } = submissionDetail);
         }
 
         if (!registrant) {
-          registrant = _.find(challenge.registrants, { handle: submission.member });
+          registrant = _.find(challenge.registrants, r => `${r.memberId}` === `${memberId}`);
         }
 
-        if (!submissionDetail && registrant) {
-          // sometime member is member id, do this to make sure it's alway member handle
-          member = registrant.handle;
+        if (registrant) {
+          member = registrant.memberHandle;
         }
 
         return ({
@@ -926,10 +922,10 @@ const mapDispatchToProps = (dispatch) => {
       dispatch(a.updateChallengeInit(uuid));
       dispatch(a.updateChallengeDone(uuid, challenge, tokenV3));
     },
-    loadMMSubmissions: (challengeId, registrants, tokenV3) => {
+    loadMMSubmissions: (challengeId, tokenV3) => {
       const a = actions.challenge;
       dispatch(a.getMmSubmissionsInit(challengeId));
-      dispatch(a.getMmSubmissionsDone(challengeId, registrants, tokenV3));
+      dispatch(a.getMmSubmissionsDone(challengeId, tokenV3));
     },
     loadSubmissionInformation: (challengeId, submissionId, tokenV3) => {
       const a = actions.challenge;