Merge pull request #4605 from topcoder-platform/issue-4582

sushilshinde · web-flow · commit e0e25c928a16 · 2020-07-01T22:51:48.000+05:30
Issue#4582 : Fix mySubmission page
diff --git a/__tests__/shared/components/SubmissionManagement/ScreeningStatus.jsx b/__tests__/shared/components/SubmissionManagement/ScreeningStatus.jsx
@@ -11,7 +11,7 @@ test('Snapshot match', () => {
       screeningObject={{
         status: 'failed',
       }}
-      submissionId={12345}
+      submissionId="12345"
     />
   ));
   expect(rnd.getRenderOutput()).toMatchSnapshot();
@@ -22,7 +22,7 @@ test('Snapshot match', () => {
         status: 'failed',
         warnings: [],
       }}
-      submissionId={12345}
+      submissionId="12345"
     />
   ));
   expect(rnd.getRenderOutput()).toMatchSnapshot();
@@ -32,7 +32,7 @@ test('Snapshot match', () => {
       screeningObject={{
         status: 'passed',
       }}
-      submissionId={12345}
+      submissionId="12345"
     />
   ));
   expect(rnd.getRenderOutput()).toMatchSnapshot();
@@ -43,7 +43,7 @@ test('Snapshot match', () => {
         status: 'passed',
         warnings: [],
       }}
-      submissionId={12345}
+      submissionId="12345"
     />
   ));
   expect(rnd.getRenderOutput()).toMatchSnapshot();
@@ -54,7 +54,7 @@ test('Snapshot match', () => {
         status: 'pending',
         warnings: [],
       }}
-      submissionId={12345}
+      submissionId="12345"
     />
   ));
   expect(rnd.getRenderOutput()).toMatchSnapshot();
@@ -65,7 +65,7 @@ test('Snapshot match', () => {
         status: 'Screening Status',
         warnings: ['warning', 'warning'],
       }}
-      submissionId={12345}
+      submissionId="12345"
     />
   ));
   expect(rnd.getRenderOutput()).toMatchSnapshot();
@@ -87,7 +87,7 @@ const instance = TU.renderIntoDocument((<Wrapper
     status: 'pending',
     warnings: [],
   }}
-  submissionId={12345}
+  submissionId="12345"
 />));
 
 test('click', () => {
diff --git a/__tests__/shared/components/SubmissionManagement/Submission.jsx b/__tests__/shared/components/SubmissionManagement/Submission.jsx
@@ -23,7 +23,7 @@ test('Snapshot match', () => {
       onDelete={mockOnDelete}
       onShowDetails={mockOnShowDetails}
       submissionObject={{
-        submissionId: 12345,
+        id: '12345',
         screening: {},
       }}
       type="design"
@@ -51,7 +51,7 @@ const page = TU.renderIntoDocument((
     onDelete={mockOnDelete}
     onShowDetails={mockOnShowDetails}
     submissionObject={{
-      submissionId: 12345,
+      id: '12345',
       screening: {},
     }}
     type="design"
diff --git a/__tests__/shared/components/SubmissionManagement/SubmissionsTable.jsx b/__tests__/shared/components/SubmissionManagement/SubmissionsTable.jsx
@@ -8,7 +8,7 @@ test('Matches shallow shapshot', () => {
     <SubmissionsTable
       showDetails={{ 12345: true }}
       submissionObjects={[{
-        submissionId: 12345,
+        id: '12345',
       }]}
       type="DESIGN"
     />
diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap
@@ -36,7 +36,7 @@ exports[`Matches shallow shapshot 1`] = `
         showScreeningDetails={true}
         submissionObject={
           Object {
-            "submissionId": 12345,
+            "id": "12345",
           }
         }
         type="DESIGN"
@@ -52,7 +52,7 @@ exports[`Matches shallow shapshot 1`] = `
             helpPageUrl=""
             onlineReviewUrl=""
             screeningObject={Object {}}
-            submissionId={12345}
+            submissionId="12345"
           />
         </td>
       </tr>
diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/src/shared/components/SubmissionManagement/Submission/index.jsx
@@ -40,13 +40,13 @@ export default function Submission(props) {
   return (
     <tr styleName="submission-row">
       <td styleName="id-col">
-        {submissionObject.submissionId}
+        {submissionObject.id}
       </td>
       <td>
-        {submissionObject.submissionType}
+        {submissionObject.type}
       </td>
       <td styleName="date-col">
-        {formatDate(submissionObject.submissionDate)}
+        {formatDate(submissionObject.created)}
       </td>
       {
         type === 'DESIGN' && (
@@ -56,7 +56,7 @@ export default function Submission(props) {
               <ScreeningStatus
                 screeningObject={submissionObject.screening}
                 onShowDetails={onShowDetails}
-                submissionId={submissionObject.submissionId}
+                submissionId={submissionObject.id}
               />
               )}
           </td>
@@ -67,7 +67,7 @@ export default function Submission(props) {
           <a
             href={
               type === 'DESIGN'
-                ? `${config.URL.ONLINE_REVIEW}/review/actions/DownloadContestSubmission?uid=${submissionObject.submissionId}`
+                ? `${config.URL.ONLINE_REVIEW}/review/actions/DownloadContestSubmission?uid=${submissionObject.id}`
                 : submissionObject.download
             }
           >
@@ -80,14 +80,14 @@ export default function Submission(props) {
               downloads. Then we'll use this commented out code or
               remove it for good.
           <button
-            onClick={() => onDownload(submissionObject.submissionId)}
+            onClick={() => onDownload(submissionObject.id)}
           ><DownloadIcon /></button>
           */ }
           {status !== 'COMPLETED'
             && (
             <button
               styleName="delete-icon"
-              onClick={() => onDelete(submissionObject.submissionId)}
+              onClick={() => onDelete(submissionObject.id)}
               disabled={!allowDelete}
               type="button"
             >
@@ -97,7 +97,7 @@ export default function Submission(props) {
           }
           <button
             styleName={`expand-icon ${(showScreeningDetails ? 'expanded' : '')}`}
-            onClick={() => onShowDetails(submissionObject.submissionId)}
+            onClick={() => onShowDetails(submissionObject.id)}
             type="button"
           >
             <ExpandIcon />
@@ -116,15 +116,14 @@ Submission.defaultProps = {
 
 Submission.propTypes = {
   submissionObject: PT.shape({
-    submissionId: PT.number,
+    id: PT.string,
     warpreviewnings: PT.string,
     screening: PT.shape({
       status: PT.string,
     }),
     submitted: PT.string,
     type: PT.string,
-    submissionType: PT.any,
-    submissionDate: PT.any,
+    created: PT.any,
     download: PT.any,
   }),
   showScreeningDetails: PT.bool,
diff --git a/src/shared/components/SubmissionManagement/Submission/styles.scss b/src/shared/components/SubmissionManagement/Submission/styles.scss
@@ -21,7 +21,6 @@ $submission-space-50: $base-unit * 10;
     padding: $submission-space-20;
     background: $tc-white;
     border-top: 1px solid $tc-gray-10;
-    line-height: 12px;
 
     @include xs-to-lg {
       padding: $submission-space-10;
diff --git a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
@@ -185,6 +185,7 @@ SubmissionManagement.defaultProps = {
   helpPageUrl: '',
   loadingSubmissions: false,
   challengeUrl: '',
+  submissions: [],
 };
 
 SubmissionManagement.propTypes = {
@@ -195,7 +196,7 @@ SubmissionManagement.propTypes = {
   onDownload: PT.func,
   onShowDetails: PT.func,
   challenge: PT.shape().isRequired,
-  submissions: PT.arrayOf(PT.shape()).isRequired,
+  submissions: PT.arrayOf(PT.shape()),
   loadingSubmissions: PT.bool,
   challengeUrl: PT.string,
   submissionPhaseStartDate: PT.string.isRequired,
diff --git a/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx b/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
@@ -56,7 +56,7 @@ export default function SubmissionsTable(props) {
       const submission = (
         <Submission
           submissionObject={subObject}
-          showScreeningDetails={showDetails[subObject.submissionId]}
+          showScreeningDetails={showDetails[subObject.id]}
           type={type}
           onShowDetails={onShowDetails}
           onDelete={onDelete}
@@ -69,15 +69,15 @@ export default function SubmissionsTable(props) {
       submissionsWithDetails.push(submission);
 
       const submissionDetail = (
-        <tr key={subObject.submissionId} styleName="submission-row">
-          {showDetails[subObject.submissionId]
+        <tr key={subObject.id} styleName="submission-row">
+          {showDetails[subObject.id]
             && (
             <td colSpan="6" styleName="dev-details">
               <ScreeningDetails
                 screeningObject={subObject.screening}
                 helpPageUrl={helpPageUrl}
                 onlineReviewUrl={onlineReviewUrl}
-                submissionId={subObject.submissionId}
+                submissionId={subObject.id}
               />
             </td>
             )}
diff --git a/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx b/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx
@@ -334,7 +334,7 @@ FilestackFilePicker.defaultProps = {
 FilestackFilePicker.propTypes = {
   error: PT.string,
   userId: PT.string.isRequired,
-  challengeId: PT.number.isRequired,
+  challengeId: PT.string.isRequired,
   fileName: PT.string,
   fileExtensions: PT.arrayOf(PT.string).isRequired,
   title: PT.string.isRequired,
diff --git a/src/shared/components/SubmissionPage/Header/index.jsx b/src/shared/components/SubmissionPage/Header/index.jsx
@@ -37,7 +37,7 @@ const Header = ({
  * Prop Validation
  */
 Header.propTypes = {
-  challengeId: PT.number.isRequired,
+  challengeId: PT.string.isRequired,
   challengesUrl: PT.string.isRequired,
   title: PT.string.isRequired,
 };
diff --git a/src/shared/components/SubmissionPage/Submit/index.jsx b/src/shared/components/SubmissionPage/Submit/index.jsx
@@ -46,14 +46,13 @@ class Submit extends React.Component {
       userId,
     } = this.props;
 
-    const { subType, subPhaseId } = this.getSubDetails();
+    const subType = this.getSubDetails();
 
     const formData = new FormData();
     formData.append('url', sub.fileUrl);
     formData.append('type', subType);
     formData.append('memberId', userId);
     formData.append('challengeId', challengeId);
-    formData.append('submissionPhaseId', subPhaseId);
     if (sub.fileType) {
       formData.append('fileType', sub.fileType);
     }
@@ -75,24 +74,19 @@ class Submit extends React.Component {
       name: 'Final Fix',
     });
     let subType;
-    let subPhaseId;
 
     // Submission type logic
     if (checkpoint && checkpoint.isOpen) {
       subType = 'Checkpoint Submission';
-      subPhaseId = checkpoint.id;
     } else if (checkpoint && !checkpoint.isOpen && submission && submission.isOpen) {
       subType = 'Contest Submission';
-      subPhaseId = submission.id;
     } else if (finalFix && finalFix.isOpen) {
       subType = 'Studio Final Fix Submission';
-      subPhaseId = finalFix.id;
     } else {
       subType = 'Contest Submission';
-      subPhaseId = submission.id;
     }
 
-    return { subType, subPhaseId };
+    return subType;
   }
 
   reset() {
@@ -356,7 +350,7 @@ const filestackDataProp = PT.shape({
   size: PT.number.isRequired,
   key: PT.string.isRequired,
   container: PT.string.isRequired,
-  challengeId: PT.number.isRequired,
+  challengeId: PT.string.isRequired,
   fileUrl: PT.string.isRequired,
 });
 
@@ -366,7 +360,7 @@ const filestackDataProp = PT.shape({
 Submit.propTypes = {
   phases: PT.arrayOf(PT.object).isRequired,
   userId: PT.string.isRequired,
-  challengeId: PT.number.isRequired,
+  challengeId: PT.string.isRequired,
   challengeName: PT.string.isRequired,
   challengesUrl: PT.string.isRequired,
   communitiesList: PT.shape({
@@ -377,7 +371,7 @@ Submit.propTypes = {
     loadingUuid: PT.string.isRequired,
     timestamp: PT.number.isRequired,
   }).isRequired,
-  groups: PT.shape({}).isRequired,
+  groups: PT.arrayOf(PT.shape()).isRequired,
   isSubmitting: PT.bool.isRequired,
   submitDone: PT.bool.isRequired,
   errorMsg: PT.string,
diff --git a/src/shared/components/SubmissionPage/Uploading/index.jsx b/src/shared/components/SubmissionPage/Uploading/index.jsx
@@ -196,7 +196,7 @@ const Uploading = ({
  * Prop Validation
  */
 Uploading.propTypes = {
-  challengeId: PT.number.isRequired,
+  challengeId: PT.string.isRequired,
   challengeName: PT.string.isRequired,
   challengesUrl: PT.string.isRequired,
   isSubmitting: PT.bool.isRequired,
diff --git a/src/shared/components/SubmissionPage/index.jsx b/src/shared/components/SubmissionPage/index.jsx
@@ -75,7 +75,7 @@ const filestackDataProp = PT.shape({
 SubmissionsPage.propTypes = {
   userId: PT.string.isRequired,
   challengesUrl: PT.string.isRequired,
-  challengeId: PT.number.isRequired,
+  challengeId: PT.string.isRequired,
   challengeName: PT.string.isRequired,
   communitiesList: PT.shape({
     data: PT.arrayOf(PT.shape({
@@ -85,7 +85,7 @@ SubmissionsPage.propTypes = {
     loadingUuid: PT.string.isRequired,
     timestamp: PT.number.isRequired,
   }).isRequired,
-  groups: PT.shape({}).isRequired,
+  groups: PT.arrayOf(PT.shape()).isRequired,
   track: PT.string.isRequired,
   status: PT.string.isRequired,
   submitForm: PT.func.isRequired,
diff --git a/src/shared/components/challenge-detail/Submissions/index.jsx b/src/shared/components/challenge-detail/Submissions/index.jsx
@@ -292,25 +292,25 @@ class SubmissionsComponent extends React.Component {
       item => item.member === memberOfModal);
 
     const renderSubmission = s => (
-      <div styleName="submission" key={s.submissionId}>
+      <div styleName="submission" key={s.id}>
         <a
-          href={`${config.URL.STUDIO}?module=DownloadSubmission&sbmid=${s.submissionId}`}
+          href={`${config.URL.STUDIO}?module=DownloadSubmission&sbmid=${s.id}`}
           target="_blank"
           rel="noopener noreferrer"
         >
           <img
             alt=""
-            src={`${config.URL.STUDIO}/studio.jpg?module=DownloadSubmission&sbmid=${s.submissionId}&sbt=small&sfi=1`}
+            src={`${config.URL.STUDIO}/studio.jpg?module=DownloadSubmission&sbmid=${s.id}&sbt=small&sfi=1`}
           />
         </a>
         <div styleName="bottom-info">
           <div styleName="links">
             <a
-              href={`${config.URL.STUDIO}?module=DownloadSubmission&sbmid=${s.submissionId}`}
+              href={`${config.URL.STUDIO}?module=DownloadSubmission&sbmid=${s.id}`}
               target="_blank"
               rel="noopener noreferrer"
             >
-              {`#${s.submissionId}`}
+              {`#${s.id}`}
             </a>
             <a
               href={`${window.origin}/members/${s.createdBy}`}
diff --git a/src/shared/containers/ReviewOpportunityDetails.jsx b/src/shared/containers/ReviewOpportunityDetails.jsx
diff --git a/src/shared/containers/SubmissionManagement/index.jsx b/src/shared/containers/SubmissionManagement/index.jsx
diff --git a/src/shared/containers/SubmissionPage.jsx b/src/shared/containers/SubmissionPage.jsx
diff --git a/src/shared/containers/tco/scoreboard/index.jsx b/src/shared/containers/tco/scoreboard/index.jsx
diff --git a/src/shared/reducers/page/submission/index.js b/src/shared/reducers/page/submission/index.js
diff --git a/src/shared/reducers/page/submission_management.js b/src/shared/reducers/page/submission_management.js
