Merge pull request #6872 from topcoder-platform/M2MHotfix

Submission download buttons

Author: jmgasper

.circleci/config.yml

@@ -350,6 +350,7 @@ workflows:
             branches:
               only:
                 - PROD-4183
+                - M2MHotfix
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global

__tests__/shared/components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow/__snapshots__/index.jsx.snap

@@ -57,27 +57,6 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
         15:49:35
       </div>
     </div>
-    <div
-      className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col-2___2KjRa src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col___2-hjE src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__center___2l_Ch"
-    >
-      <div
-        className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__mobile-header___3NsEQ"
-      >
-        Action
-      </div>
-      <button
-        onClick={[Function]}
-        type="button"
-      >
-        <DownloadIcon
-          fill="none"
-          height="18"
-          viewBox="0 0 18 18"
-          width="18"
-          xmlns="http://www.w3.org/2000/svg"
-        />
-      </button>
-    </div>
   </div>
 </div>
 `;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 // import ReactDOM from 'react-dom';
 import Renderer from 'react-test-renderer/shallow';
-import TU from 'react-dom/test-utils';
+// import TU from 'react-dom/test-utils';
 import SubmissionHistoryRow from 'components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow';
 
 const mockData = {
@@ -32,14 +32,14 @@ describe('Matches shallow shapshot', () => {
   });
 });
 
+/*
 class Wrapper extends React.Component {
   componentDidMount() {}
 
   render() {
     return <SubmissionHistoryRow {...this.props} />;
   }
 }
-
 describe('render properly', () => {
   test('click', () => {
     const instance = TU.renderIntoDocument((<Wrapper {...mockData} />));
@@ -48,3 +48,4 @@ describe('render properly', () => {
     TU.Simulate.click(matches[0]);
   });
 });
+*/

__tests__/shared/components/challenge-detail/Winners/Winner/__snapshots__/index.jsx.snap

@@ -55,19 +55,6 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
   </div>
   <div
     className="src-shared-components-challenge-detail-Winners-Winner-___style__download-container___OXVza"
-  >
-    <button
-      onClick={[Function]}
-      type="button"
-    >
-      <DownloadIcon
-        fill="none"
-        height="18"
-        viewBox="0 0 18 18"
-        width="18"
-        xmlns="http://www.w3.org/2000/svg"
-      />
-    </button>
-  </div>
+  />
 </div>
 `;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 // import ReactDOM from 'react-dom';
 import Renderer from 'react-test-renderer/shallow';
-import TU from 'react-dom/test-utils';
+// import TU from 'react-dom/test-utils';
 import Winner from 'components/challenge-detail/Winners/Winner';
 
 const mockData = {
@@ -53,14 +53,14 @@ describe('Matches shallow shapshot', () => {
   });
 });
 
+/*
 class Wrapper extends React.Component {
   componentDidMount() {}
 
   render() {
     return <Winner {...this.props} />;
   }
 }
-
 describe('render properly', () => {
   test('click', () => {
     const instance = TU.renderIntoDocument((<Wrapper {...mockData} />));
@@ -69,3 +69,4 @@ describe('render properly', () => {
     TU.Simulate.click(matches[0]);
   });
 });
+*/

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

@@ -34,6 +34,8 @@ export default function SubmissionHistoryRow({
   submissionId,
   isLoggedIn,
 }) {
+  // todo: hide download button until update submissions API
+  const hideDownloadForMMRDM = true;
   const getInitialReviewResult = () => {
     if (provisionalScore && provisionalScore < 0) return <FailedSubmissionTooltip />;
     switch (status) {
@@ -82,7 +84,7 @@ export default function SubmissionHistoryRow({
           </div>
         </div>
         {
-          isLoggedIn && (isMM || isRDM)
+          !hideDownloadForMMRDM && isLoggedIn && (isMM || isRDM)
           && (numWinners > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED) && (
             <div styleName="col-2 col center">
               <div styleName="mobile-header">Action</div>

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

@@ -307,6 +307,8 @@ class SubmissionsComponent extends React.Component {
       type,
       tags,
     } = challenge;
+    // todo: hide download button until update submissions API
+    const hideDownloadForMMRDM = true;
 
     const isMM = this.isMM();
     const isRDM = checkIsRDM(challenge);
@@ -479,7 +481,8 @@ class SubmissionsComponent extends React.Component {
         }
         <div styleName={`${viewAsTable ? 'view-as-table' : ''}`}>
           {
-            ((numWinners > 0 || challenge.status === CHALLENGE_STATUS.COMPLETED)
+            (!hideDownloadForMMRDM
+            && (numWinners > 0 || challenge.status === CHALLENGE_STATUS.COMPLETED)
             && (isMM || isRDM) && isLoggedIn) && (
               <div styleName="block-download-all">
                 <button

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

@@ -27,6 +27,8 @@ export default function Winner({
   isLoggedIn,
   auth,
 }) {
+  // todo: hide download button until update submissions API
+  const hideDownloadForMMRDM = true;
   const [windowOrigin, setWindowOrigin] = useState();
   useEffect(() => {
     setWindowOrigin(window.origin);
@@ -90,7 +92,9 @@ export default function Winner({
       </div>
       <div styleName="download-container">
         {
-        ((!winner.submissionDownloadLink || !viewable) && (isMM || isRDM) && isLoggedIn) && (
+        (!hideDownloadForMMRDM
+        && (!winner.submissionDownloadLink || !viewable)
+        && (isMM || isRDM) && isLoggedIn) && (
           <button
             onClick={() => {
               // download submission

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

@@ -27,11 +27,14 @@ export default function Winners({
   auth,
   challengeStatus,
 }) {
+  // todo: hide download button until update submissions API
+  const hideDownloadForMMRDM = true;
   const [downloadingAll, setDownloadingAll] = useState(false);
   return (
     <div styleName="container">
       {
-        ((winners.length > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED)
+        !hideDownloadForMMRDM
+        && ((winners.length > 0 || challengeStatus === CHALLENGE_STATUS.COMPLETED)
         && (isMM || isRDM) && isLoggedIn) && (
           <div styleName="block-download-all">
             <button