Merge pull request #6840 from topcoder-platform/marathon_match_submission_download

Revert RDM submission download changes for further QA

Author: jmgasper

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

@@ -21,7 +21,6 @@ const { getService } = services.submissions;
 
 export default function SubmissionHistoryRow({
   isMM,
-  isRDM,
   submission,
   finalScore,
   provisionalScore,
@@ -82,7 +81,7 @@ export default function SubmissionHistoryRow({
           </div>
         </div>
         {
-          isLoggedIn && (isMM || isRDM)
+          isLoggedIn && isMM
           && (numWinners > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED) && (
             <div styleName="col-2 col center">
               <div styleName="mobile-header">Action</div>
@@ -122,7 +121,6 @@ SubmissionHistoryRow.defaultProps = {
 
 SubmissionHistoryRow.propTypes = {
   isMM: PT.bool.isRequired,
-  isRDM: PT.bool.isRequired,
   submission: PT.number.isRequired,
   finalScore: PT.oneOfType([
     PT.number,

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

@@ -19,7 +19,7 @@ import SubmissionHistoryRow from './SubmissionHistoryRow';
 import style from './style.scss';
 
 export default function SubmissionRow({
-  isMM, isRDM, openHistory, member, submissions, score, toggleHistory, challengeStatus,
+  isMM, openHistory, member, submissions, score, toggleHistory, challengeStatus,
   isReviewPhaseComplete, finalRank, provisionalRank, onShowPopup, rating, viewAsTable,
   numWinners, auth, isLoggedIn,
 }) {
@@ -166,8 +166,7 @@ export default function SubmissionRow({
                   Time
                 </div>
                 {
-                  (isMM || isRDM)
-                  && (numWinners > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED) && (
+                  isMM && (numWinners > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED) && (
                     <div styleName="col-2 col center">
                       Action
                     </div>
@@ -186,7 +185,6 @@ export default function SubmissionRow({
                   <SubmissionHistoryRow
                     isReviewPhaseComplete={isReviewPhaseComplete}
                     isMM={isMM}
-                    isRDM={isRDM}
                     challengeStatus={challengeStatus}
                     submission={submissions.length - index}
                     {...submissionHistory}
@@ -226,7 +224,6 @@ SubmissionRow.defaultProps = {
 
 SubmissionRow.propTypes = {
   isMM: PT.bool.isRequired,
-  isRDM: PT.bool.isRequired,
   openHistory: PT.bool.isRequired,
   member: PT.string.isRequired,
   challengeStatus: PT.string.isRequired,

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

@@ -6,7 +6,7 @@
 import React from 'react';
 import PT from 'prop-types';
 import moment from 'moment';
-import { isMM as checkIsMM, isRDM as checkIsRDM } from 'utils/challenge';
+import { isMM as checkIsMM } from 'utils/challenge';
 import _ from 'lodash';
 import { connect } from 'react-redux';
 import { config } from 'topcoder-react-utils';
@@ -309,7 +309,6 @@ class SubmissionsComponent extends React.Component {
     } = challenge;
 
     const isMM = this.isMM();
-    const isRDM = checkIsRDM(challenge);
     const isLoggedIn = !_.isEmpty(auth.tokenV3);
     const isReviewPhaseComplete = this.checkIsReviewPhaseComplete();
 
@@ -605,7 +604,7 @@ class SubmissionsComponent extends React.Component {
           }
           {
             ((numWinners > 0 || challenge.status === CHALLENGE_STATUS.COMPLETED)
-            && (isMM || isRDM) && isLoggedIn) && (
+            && isMM && isLoggedIn) && (
               <div styleName="block-download-all">
                 <button
                   disabled={downloadingAll}
@@ -846,7 +845,6 @@ class SubmissionsComponent extends React.Component {
                   submissions={sortedSubmissions}
                   isReviewPhaseComplete={isReviewPhaseComplete}
                   isMM={isMM}
-                  isRDM={isRDM}
                   key={submission.member}
                   {...submission}
                   challengeStatus={challenge.status}

src/shared/components/challenge-detail/Winners/Winner/index.jsx

@@ -19,7 +19,6 @@ function getId(submissions, placement) {
 export default function Winner({
   isDesign,
   isMM,
-  isRDM,
   prizes,
   submissions,
   viewable,
@@ -90,7 +89,7 @@ export default function Winner({
       </div>
       <div styleName="download-container">
         {
-        ((!winner.submissionDownloadLink || !viewable) && (isMM || isRDM) && isLoggedIn) && (
+        ((!winner.submissionDownloadLink || !viewable) && isMM && isLoggedIn) && (
           <button
             onClick={() => {
               // download submission
@@ -146,7 +145,6 @@ Winner.defaultProps = {
 Winner.propTypes = {
   isDesign: PT.bool.isRequired,
   isMM: PT.bool.isRequired,
-  isRDM: PT.bool.isRequired,
   prizes: PT.arrayOf(PT.shape()),
   submissions: PT.arrayOf(PT.object).isRequired,
   viewable: PT.bool.isRequired,

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

@@ -22,7 +22,6 @@ export default function Winners({
   viewable,
   isDesign,
   isMM,
-  isRDM,
   isLoggedIn,
   auth,
   challengeStatus,
@@ -32,7 +31,7 @@ export default function Winners({
     <div styleName="container">
       {
         ((winners.length > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED)
-        && (isMM || isRDM) && isLoggedIn) && (
+        && isMM && isLoggedIn) && (
           <div styleName="block-download-all">
             <button
               disabled={downloadingAll}
@@ -81,7 +80,6 @@ export default function Winners({
           <Winner
             isDesign={isDesign}
             isMM={isMM}
-            isRDM={isRDM}
             key={`${w.handle}-${w.placement}`}
             prizes={prizes}
             submissions={submissions}
@@ -103,7 +101,6 @@ Winners.defaultProps = {
   viewable: false,
   isDesign: false,
   isMM: false,
-  isRDM: false,
   isLoggedIn: false,
   challengeStatus: '',
 };
@@ -115,7 +112,6 @@ Winners.propTypes = {
   viewable: PT.bool,
   isDesign: PT.bool,
   isMM: PT.bool,
-  isRDM: PT.bool,
   isLoggedIn: PT.bool,
   challengeStatus: PT.string,
   auth: PT.shape().isRequired,

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

@@ -8,7 +8,7 @@
 
 import _ from 'lodash';
 import communityActions from 'actions/tc-communities';
-import { isMM as checkIsMM, isRDM as checkIsRDM } from 'utils/challenge';
+import { isMM as checkIsMM } from 'utils/challenge';
 import LoadingPagePlaceholder from 'components/LoadingPagePlaceholder';
 import pageActions from 'actions/page';
 import ChallengeHeader from 'components/challenge-detail/Header';
@@ -439,7 +439,6 @@ class ChallengeDetailPageContainer extends React.Component {
 
     const isEmpty = _.isEmpty(challenge);
     const isMM = checkIsMM(challenge);
-    const isRDM = checkIsRDM(challenge);
     const isLegacyMM = isMM && Boolean(challenge.roundId);
 
     if (isLoadingChallenge || isLoadingTerms) {
@@ -662,7 +661,6 @@ class ChallengeDetailPageContainer extends React.Component {
                 submissions={challenge.submissions}
                 isDesign={track.toLowerCase() === 'design'}
                 isMM={isMM}
-                isRDM={isRDM}
                 isLoggedIn={isLoggedIn}
                 auth={auth}
               />

src/shared/utils/challenge.js

@@ -13,16 +13,6 @@ export function isMM(challenge) {
   return tags.includes('Marathon Match') || isMMType;
 }
 
-/**
- * check if is rapid development match challenge
- * @param {Object} challenge challenge object
- */
-export function isRDM(challenge) {
-  const tags = _.get(challenge, 'tags') || [];
-  const isMMType = challenge ? challenge.type === 'Rapid Development Match' : false;
-  return tags.includes('Rapid Development Match') || isMMType;
-}
-
 /**
  * Set challenge type to challenge
  * @param {Object} challenges challenge object