Merge branch 'develop' of github.com:topcoder-platform/community-app into develop

Author: jmgasper

__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap

@@ -30,6 +30,7 @@ exports[`Matches shallow shapshot 1`] = `
             "id": "test-challenge",
           }
         }
+        isWorkflowRunComplete={true}
         onDelete={[Function]}
         onDownload={[Function]}
         onOpenDownloadArtifactsModal={[Function]}

src/shared/components/SubmissionManagement/Submission/index.jsx

@@ -42,6 +42,7 @@ export default function Submission(props) {
     onOpenRatingsListModal,
     status,
     allowDelete,
+    isWorkflowRunComplete,
   } = props;
   const formatDate = date => moment(+new Date(date)).format('MMM DD, YYYY hh:mm A');
   const onDownloadSubmission = onDownload.bind(1, submissionObject.id);
@@ -66,6 +67,10 @@ export default function Submission(props) {
     }
   }
 
+  const showDeleteButton = status !== CHALLENGE_STATUS.COMPLETED
+  && track === COMPETITION_TRACKS.DES
+  && safeForDownloadCheck === true;
+
   return (
     <tr styleName="submission-row">
       <td styleName="id-col">
@@ -146,17 +151,33 @@ export default function Submission(props) {
              onClick={() => onDownload(submissionObject.id)}
            ><DownloadIcon /></button>
            */ }
-          {status !== CHALLENGE_STATUS.COMPLETED
-             && track === COMPETITION_TRACKS.DES
-             && safeForDownloadCheck === true && (
-             <button
-               styleName="delete-icon"
-               onClick={() => onDelete(submissionObject.id)}
-               disabled={!allowDelete}
-               type="button"
-             >
-               <DeleteIcon />
-             </button>
+          {showDeleteButton && (
+            isWorkflowRunComplete ? (
+              <button
+                styleName="delete-icon"
+                onClick={() => onDelete(submissionObject.id)}
+                type="button"
+                disabled={!allowDelete}
+              >
+                <DeleteIcon />
+              </button>
+            ) : (
+            // Disabled delete button with tooltip when workflow run is pending
+              <Tooltip content={() => (
+                <div styleName="tooltip-content">
+                  You can delete this submission only after the review is complete.
+                </div>
+              )}
+              >
+                <button
+                  styleName="delete-icon"
+                  disabled
+                  type="button"
+                >
+                  <DeleteIcon />
+                </button>
+              </Tooltip>
+            )
           )
           }
           { !isTopCrowdChallenge
@@ -217,4 +238,5 @@ Submission.propTypes = {
   allowDelete: PT.bool.isRequired,
   onOpenDownloadArtifactsModal: PT.func,
   onOpenRatingsListModal: PT.func,
+  isWorkflowRunComplete: PT.bool.isRequired,
 };

src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx

@@ -74,9 +74,29 @@ export default function SubmissionsTable(props) {
     submissionObjects.forEach((subObject) => {
       // submissionPhaseStartDate will be the start date of
       // the current submission/checkpoint or empty string if any other phase
+
+      const TERMINAL_STATUSES = [
+        'COMPLETED',
+        'FAILURE',
+        'CANCELLED',
+        'SUCCESS',
+      ];
+
+      const workflowRunsForSubmission = submissionWorkflowRuns
+      && submissionWorkflowRuns[subObject.id]
+        ? submissionWorkflowRuns[subObject.id]
+        : null;
+
+      const hasRuns = workflowRunsForSubmission && workflowRunsForSubmission.length > 0;
+
+      const isWorkflowRunComplete = !hasRuns
+        ? true
+        : workflowRunsForSubmission.every(run => TERMINAL_STATUSES.includes(run.status));
+
       const allowDelete = submissionPhaseStartDate
         && moment(subObject.submissionDate).isAfter(submissionPhaseStartDate);
 
+
       const submission = (
         <Submission
           challenge={challenge}
@@ -91,13 +111,10 @@ export default function SubmissionsTable(props) {
           allowDelete={allowDelete}
           onOpenDownloadArtifactsModal={onOpenDownloadArtifactsModal}
           onOpenRatingsListModal={onOpenRatingsListModal}
+          isWorkflowRunComplete={isWorkflowRunComplete}
         />
       );
       submissionsWithDetails.push(submission);
-      const workflowRunsForSubmission = submissionWorkflowRuns
-      && submissionWorkflowRuns[subObject.id]
-        ? submissionWorkflowRuns[subObject.id]
-        : null;
 
       const submissionDetail = (
         <tr key={subObject.id} styleName="submission-row">