From 978935c6e166cf86f004e40bb17d10993d1c2c34 Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Tue, 20 Oct 2020 19:14:22 +0700
Subject: [PATCH 1/5] fix: allow member to download own submission for design
 challenge

---
 .../__snapshots__/Submission.jsx.snap         | 14 ++++++---
 .../SubmissionManagement/Submission/index.jsx | 30 ++++++++++++++-----
 .../SubmissionManagement/index.jsx            |  3 ++
 .../SubmissionsTable/index.jsx                |  3 ++
 .../containers/SubmissionManagement/index.jsx |  1 +
 5 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
index 90c1a3249c..eee3e3054e 100644
--- a/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
+++ b/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
@@ -21,14 +21,17 @@ exports[`Snapshot match 1`] = `
     className="src-shared-components-SubmissionManagement-Submission-___styles__action-col___2M1RY"
   >
     <div>
-      <a>
+      <button
+        onClick={[Function]}
+        type="button"
+      >
         <DownloadIcon
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
         />
-      </a>
+      </button>
       <button
         className="src-shared-components-SubmissionManagement-Submission-___styles__delete-icon___2M67z"
         disabled={true}
@@ -81,14 +84,17 @@ exports[`Snapshot match 2`] = `
     className="src-shared-components-SubmissionManagement-Submission-___styles__action-col___2M1RY"
   >
     <div>
-      <a>
+      <button
+        onClick={[Function]}
+        type="button"
+      >
         <DownloadIcon
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
         />
-      </a>
+      </button>
       <button
         className="src-shared-components-SubmissionManagement-Submission-___styles__delete-icon___2M67z"
         disabled={true}
diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/src/shared/components/SubmissionManagement/Submission/index.jsx
index 2c29d62ef8..85869d1e2e 100644
--- a/src/shared/components/SubmissionManagement/Submission/index.jsx
+++ b/src/shared/components/SubmissionManagement/Submission/index.jsx
@@ -14,7 +14,7 @@
 import _ from 'lodash';
 import moment from 'moment';
 import React from 'react';
-import { config } from 'topcoder-react-utils';
+import { services } from 'topcoder-react-lib';
 import { COMPETITION_TRACKS, CHALLENGE_STATUS } from 'utils/tc';
 
 import PT from 'prop-types';
@@ -26,8 +26,11 @@ import ScreeningStatus from '../ScreeningStatus';
 
 import './styles.scss';
 
+const { getService } = services.submissions;
+
 export default function Submission(props) {
   const {
+    auth,
     submissionObject,
     showScreeningDetails,
     track,
@@ -66,15 +69,25 @@ export default function Submission(props) {
       }
       <td styleName="action-col">
         <div>
-          <a
-            href={
-              track === COMPETITION_TRACKS.DES
-                ? `${config.URL.ONLINE_REVIEW}/review/actions/DownloadContestSubmission?uid=${submissionObject.id}`
-                : submissionObject.download
-            }
+          <button
+            onClick={() => {
+              // download submission
+              const submissionsService = getService(auth.tokenV3);
+              submissionsService.downloadSubmission(submissionObject.id)
+                .then((blob) => {
+                  const url = window.URL.createObjectURL(new Blob([blob]));
+                  const link = document.createElement('a');
+                  link.href = url;
+                  link.setAttribute('download', `submission-${submissionObject.id}.zip`);
+                  document.body.appendChild(link);
+                  link.click();
+                  link.parentNode.removeChild(link);
+                });
+            }}
+            type="button"
           >
             <DownloadIcon />
-          </a>
+          </button>
           { /*
             TODO: At the moment we just fetch downloads from the legacy
               Topcoder Studio API, and we don't need any JS code to this.
@@ -136,4 +149,5 @@ Submission.propTypes = {
   onShowDetails: PT.func,
   status: PT.string.isRequired,
   allowDelete: PT.bool.isRequired,
+  auth: PT.shape().isRequired,
 };
diff --git a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
index 0692d888ff..37931a9530 100644
--- a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
+++ b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
@@ -26,6 +26,7 @@ import style from './styles.scss';
 
 export default function SubmissionManagement(props) {
   const {
+    auth,
     challenge,
     submissions,
     loadingSubmissions,
@@ -156,6 +157,7 @@ export default function SubmissionManagement(props) {
         {!loadingSubmissions
           && (
           <SubmissionsTable
+            auth={auth}
             submissionObjects={submissions}
             showDetails={showDetails}
             track={track}
@@ -208,4 +210,5 @@ SubmissionManagement.propTypes = {
   loadingSubmissions: PT.bool,
   challengeUrl: PT.string,
   submissionPhaseStartDate: PT.string.isRequired,
+  auth: PT.shape().isRequired,
 };
diff --git a/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx b/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
index 011930e4e5..f901bd7cc2 100644
--- a/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
+++ b/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
@@ -26,6 +26,7 @@ import './styles.scss';
 
 export default function SubmissionsTable(props) {
   const {
+    auth,
     submissionObjects,
     showDetails,
     track,
@@ -56,6 +57,7 @@ export default function SubmissionsTable(props) {
 
       const submission = (
         <Submission
+          auth={auth}
           submissionObject={subObject}
           showScreeningDetails={showDetails[subObject.id]}
           track={track}
@@ -150,4 +152,5 @@ SubmissionsTable.propTypes = {
   onShowDetails: PT.func,
   status: PT.string.isRequired,
   submissionPhaseStartDate: PT.string.isRequired,
+  auth: PT.shape().isRequired,
 };
diff --git a/src/shared/containers/SubmissionManagement/index.jsx b/src/shared/containers/SubmissionManagement/index.jsx
index 383c2d1050..4688e672e3 100644
--- a/src/shared/containers/SubmissionManagement/index.jsx
+++ b/src/shared/containers/SubmissionManagement/index.jsx
@@ -81,6 +81,7 @@ class SubmissionManagementPageContainer extends React.Component {
           {!isEmpty
             && (
             <SubmissionManagement
+              auth={authTokens}
               challenge={challenge}
               challengesUrl={challengesUrl}
               loadingSubmissions={Boolean(loadingSubmissionsForChallengeId)}

From 7dd554275bbf961ca7a7c6d146bfaa81b3adc0ed Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Tue, 20 Oct 2020 19:57:08 +0700
Subject: [PATCH 2/5] fix: refactor code

---
 .../SubmissionManagement/Submission/index.jsx | 23 ++++---------------
 .../SubmissionManagement/index.jsx            |  3 ---
 .../SubmissionsTable/index.jsx                |  3 ---
 .../containers/SubmissionManagement/index.jsx | 18 +++++++++++++--
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/src/shared/components/SubmissionManagement/Submission/index.jsx
index 85869d1e2e..7f3ef1114f 100644
--- a/src/shared/components/SubmissionManagement/Submission/index.jsx
+++ b/src/shared/components/SubmissionManagement/Submission/index.jsx
@@ -14,7 +14,7 @@
 import _ from 'lodash';
 import moment from 'moment';
 import React from 'react';
-import { services } from 'topcoder-react-lib';
+import { config } from 'topcoder-react-utils';
 import { COMPETITION_TRACKS, CHALLENGE_STATUS } from 'utils/tc';
 
 import PT from 'prop-types';
@@ -26,20 +26,19 @@ import ScreeningStatus from '../ScreeningStatus';
 
 import './styles.scss';
 
-const { getService } = services.submissions;
-
 export default function Submission(props) {
   const {
-    auth,
     submissionObject,
     showScreeningDetails,
     track,
+    onDownload,
     onDelete,
     onShowDetails,
     status,
     allowDelete,
   } = props;
   const formatDate = date => moment(+new Date(date)).format('MMM DD, YYYY hh:mm A');
+  const onDownloadSubmission = onDownload.bind(1, submissionObject.id);
 
   return (
     <tr styleName="submission-row">
@@ -70,20 +69,7 @@ export default function Submission(props) {
       <td styleName="action-col">
         <div>
           <button
-            onClick={() => {
-              // download submission
-              const submissionsService = getService(auth.tokenV3);
-              submissionsService.downloadSubmission(submissionObject.id)
-                .then((blob) => {
-                  const url = window.URL.createObjectURL(new Blob([blob]));
-                  const link = document.createElement('a');
-                  link.href = url;
-                  link.setAttribute('download', `submission-${submissionObject.id}.zip`);
-                  document.body.appendChild(link);
-                  link.click();
-                  link.parentNode.removeChild(link);
-                });
-            }}
+            onClick={() => onDownloadSubmission(submissionObject.id)}
             type="button"
           >
             <DownloadIcon />
@@ -149,5 +135,4 @@ Submission.propTypes = {
   onShowDetails: PT.func,
   status: PT.string.isRequired,
   allowDelete: PT.bool.isRequired,
-  auth: PT.shape().isRequired,
 };
diff --git a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
index 37931a9530..0692d888ff 100644
--- a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
+++ b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
@@ -26,7 +26,6 @@ import style from './styles.scss';
 
 export default function SubmissionManagement(props) {
   const {
-    auth,
     challenge,
     submissions,
     loadingSubmissions,
@@ -157,7 +156,6 @@ export default function SubmissionManagement(props) {
         {!loadingSubmissions
           && (
           <SubmissionsTable
-            auth={auth}
             submissionObjects={submissions}
             showDetails={showDetails}
             track={track}
@@ -210,5 +208,4 @@ SubmissionManagement.propTypes = {
   loadingSubmissions: PT.bool,
   challengeUrl: PT.string,
   submissionPhaseStartDate: PT.string.isRequired,
-  auth: PT.shape().isRequired,
 };
diff --git a/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx b/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
index f901bd7cc2..011930e4e5 100644
--- a/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
+++ b/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
@@ -26,7 +26,6 @@ import './styles.scss';
 
 export default function SubmissionsTable(props) {
   const {
-    auth,
     submissionObjects,
     showDetails,
     track,
@@ -57,7 +56,6 @@ export default function SubmissionsTable(props) {
 
       const submission = (
         <Submission
-          auth={auth}
           submissionObject={subObject}
           showScreeningDetails={showDetails[subObject.id]}
           track={track}
@@ -152,5 +150,4 @@ SubmissionsTable.propTypes = {
   onShowDetails: PT.func,
   status: PT.string.isRequired,
   submissionPhaseStartDate: PT.string.isRequired,
-  auth: PT.shape().isRequired,
 };
diff --git a/src/shared/containers/SubmissionManagement/index.jsx b/src/shared/containers/SubmissionManagement/index.jsx
index 4688e672e3..71f9cf9ce4 100644
--- a/src/shared/containers/SubmissionManagement/index.jsx
+++ b/src/shared/containers/SubmissionManagement/index.jsx
@@ -15,11 +15,13 @@ import PT from 'prop-types';
 import { connect } from 'react-redux';
 import { Modal } from 'topcoder-react-ui-kit';
 import { config } from 'topcoder-react-utils';
-import { actions } from 'topcoder-react-lib';
+import { actions, services } from 'topcoder-react-lib';
 
 import './styles.scss';
 import smpActions from '../../actions/page/submission_management';
 
+const { getService } = services.submissions;
+
 // The container component
 class SubmissionManagementPageContainer extends React.Component {
   componentDidMount() {
@@ -68,7 +70,19 @@ class SubmissionManagementPageContainer extends React.Component {
     const smConfig = {
       onShowDetails,
       onDelete: onSubmissionDelete,
-      onDownload: () => onDownloadSubmission(0, authTokens),
+      onDownload: (challengeType, submissionId) => {
+        const submissionsService = getService(authTokens.tokenV3);
+        submissionsService.downloadSubmission(submissionId)
+          .then((blob) => {
+            const url = window.URL.createObjectURL(new Blob([blob]));
+            const link = document.createElement('a');
+            link.href = url;
+            link.setAttribute('download', `submission-${challengeType}-${submissionId}.zip`);
+            document.body.appendChild(link);
+            link.click();
+            link.parentNode.removeChild(link);
+          });
+      },
       onlineReviewUrl: `${config.URL.ONLINE_REVIEW}/review/actions/ViewProjectDetails?pid=${challengeId}`,
       challengeUrl: `${challengesUrl}/${challengeId}`,
       addSumissionUrl: `${config.URL.BASE}/challenges/${challengeId}/submit`,

From 82349a3ee4cad94ff2129dc5a41c504cd8d89e09 Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Tue, 20 Oct 2020 19:58:48 +0700
Subject: [PATCH 3/5] fix: remove unused code

---
 src/shared/containers/SubmissionManagement/index.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/shared/containers/SubmissionManagement/index.jsx b/src/shared/containers/SubmissionManagement/index.jsx
index 71f9cf9ce4..67ba080fbb 100644
--- a/src/shared/containers/SubmissionManagement/index.jsx
+++ b/src/shared/containers/SubmissionManagement/index.jsx
@@ -95,7 +95,6 @@ class SubmissionManagementPageContainer extends React.Component {
           {!isEmpty
             && (
             <SubmissionManagement
-              auth={authTokens}
               challenge={challenge}
               challengesUrl={challengesUrl}
               loadingSubmissions={Boolean(loadingSubmissionsForChallengeId)}

From 726618a5bd3ead9079554cd7dc5f5905c975207c Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Tue, 20 Oct 2020 20:09:13 +0700
Subject: [PATCH 4/5] fix: lint

---
 src/shared/components/SubmissionManagement/Submission/index.jsx | 2 +-
 src/shared/containers/SubmissionManagement/index.jsx            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/src/shared/components/SubmissionManagement/Submission/index.jsx
index 7f3ef1114f..770b8ffb58 100644
--- a/src/shared/components/SubmissionManagement/Submission/index.jsx
+++ b/src/shared/components/SubmissionManagement/Submission/index.jsx
@@ -14,7 +14,6 @@
 import _ from 'lodash';
 import moment from 'moment';
 import React from 'react';
-import { config } from 'topcoder-react-utils';
 import { COMPETITION_TRACKS, CHALLENGE_STATUS } from 'utils/tc';
 
 import PT from 'prop-types';
@@ -131,6 +130,7 @@ Submission.propTypes = {
   }),
   showScreeningDetails: PT.bool,
   track: PT.string.isRequired,
+  onDownload: PT.func.isRequired,
   onDelete: PT.func.isRequired,
   onShowDetails: PT.func,
   status: PT.string.isRequired,
diff --git a/src/shared/containers/SubmissionManagement/index.jsx b/src/shared/containers/SubmissionManagement/index.jsx
index 67ba080fbb..0e7869781d 100644
--- a/src/shared/containers/SubmissionManagement/index.jsx
+++ b/src/shared/containers/SubmissionManagement/index.jsx
@@ -56,7 +56,6 @@ class SubmissionManagementPageContainer extends React.Component {
       isLoadingChallenge,
       mySubmissions,
       onCancelSubmissionDelete,
-      onDownloadSubmission,
       onShowDetails,
       onSubmissionDelete,
       onSubmissionDeleteConfirmed,

From 5c4a9eab5237e0a05088343ff2b46c7ee47fdb31 Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Tue, 20 Oct 2020 20:43:58 +0700
Subject: [PATCH 5/5] fix: test snapshot

---
 .../shared/components/SubmissionManagement/Submission.jsx     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/__tests__/shared/components/SubmissionManagement/Submission.jsx b/__tests__/shared/components/SubmissionManagement/Submission.jsx
index db738bc760..3f593267e3 100644
--- a/__tests__/shared/components/SubmissionManagement/Submission.jsx
+++ b/__tests__/shared/components/SubmissionManagement/Submission.jsx
@@ -4,6 +4,7 @@ import Submission from 'components/SubmissionManagement/Submission';
 import TU from 'react-dom/test-utils';
 
 const mockOnDelete = jest.fn();
+const mockOnDownload = jest.fn();
 const mockOnShowDetails = jest.fn();
 
 const rnd = new Rnd();
@@ -12,6 +13,7 @@ test('Snapshot match', () => {
   rnd.render((
     <Submission
       onDelete={mockOnDelete}
+      onDownload={mockOnDownload}
       onShowDetails={mockOnShowDetails}
       showScreeningDetails
       type="develop"
@@ -21,6 +23,7 @@ test('Snapshot match', () => {
   rnd.render((
     <Submission
       onDelete={mockOnDelete}
+      onDownload={mockOnDownload}
       onShowDetails={mockOnShowDetails}
       submissionObject={{
         id: '12345',
@@ -49,6 +52,7 @@ class Wrapper extends React.Component {
 const page = TU.renderIntoDocument((
   <Wrapper
     onDelete={mockOnDelete}
+    onDownload={mockOnDownload}
     onShowDetails={mockOnShowDetails}
     submissionObject={{
       id: '12345',