[PROD RELEASE] - Updates & fixes

.circleci/config.yml

@@ -179,6 +179,7 @@ workflows:
             branches:
               only:
                 - develop
+                - PM-3686_group-submissions-in-challenge-details
 
       - "build-prod":
           context: org-global

src/shared/components/Dashboard/Challenges/index.jsx

@@ -38,26 +38,32 @@ export default function ChallengesFeed({
             <LoadingIndicator />
           </div>
         ) : (
-          (challenges || []).map(challenge => (
-            <div styleName="row" key={challenge.id}>
-              <a
-                href={`/challenges/${challenge.id}`}
-                target="_blank"
-                rel="noreferrer"
-              >
-                {challenge.name}
-              </a>
-              <div styleName="prize">
-                <span styleName="amount">
-                  {`$${_.sum(
-                    challenge.prizeSets
-                      .filter(set => set.type === 'PLACEMENT')
-                      .map(item => _.sum(item.prizes.map(prize => prize.value))),
-                  ).toLocaleString()}`}
-                </span>
+          (challenges || []).map((challenge) => {
+            const placementPrizes = challenge.prizeSets
+              .filter(set => set.type === 'PLACEMENT')
+              .flatMap(item => item.prizes);
+            const prizeTotal = _.sum(placementPrizes.map(prize => prize.value));
+            const prizeType = placementPrizes.length > 0 ? placementPrizes[0].type : null;
+            const isPointBasedPrize = prizeType === 'POINT';
+            const prizeSymbol = isPointBasedPrize ? '' : '$';
+
+            return (
+              <div styleName="row" key={challenge.id}>
+                <a
+                  href={`/challenges/${challenge.id}`}
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  {challenge.name}
+                </a>
+                <div styleName="prize">
+                  <span styleName="amount">
+                    {`${prizeSymbol}${prizeTotal.toLocaleString()}`}
+                  </span>
+                </div>
               </div>
-            </div>
-          ))
+            );
+          })
         )}
       </div>
     </div>

src/shared/components/ReviewOpportunityDetailsPage/ChallengeSpecTab/index.jsx

@@ -3,6 +3,7 @@
  */
 import React from 'react';
 import PT from 'prop-types';
+import MarkdownRenderer from 'components/MarkdownRenderer';
 
 import './styles.scss';
 
@@ -19,13 +20,10 @@ const ChallengeSpecTab = ({ challenge }) => (
           Challenge Overview
         </h2>
         <div
-          /* eslint-disable react/no-danger */
-          dangerouslySetInnerHTML={{
-            __html: challenge.description,
-          }}
-          /* eslint-enable react/no-danger */
           styleName="rawHtml"
-        />
+        >
+          <MarkdownRenderer markdown={challenge.description} />
+        </div>
       </article>
       )
     }

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

@@ -46,7 +46,7 @@ export default function Submission(props) {
   } = props;
   const formatDate = date => moment(+new Date(date)).format('MMM DD, YYYY hh:mm A');
   const onDownloadSubmission = onDownload.bind(1, submissionObject.id);
-  const safeForDownloadCheck = safeForDownload(submissionObject.url);
+  const safeForDownloadCheck = safeForDownload(submissionObject);
   const onDownloadArtifacts = onOpenDownloadArtifactsModal.bind(1, submissionObject.id);
   const onOpenRatingsList = onOpenRatingsListModal.bind(1, submissionObject.id);
   const onOpenReviewApp = () => {

src/shared/components/challenge-detail/Header/style.scss

@@ -550,6 +550,7 @@
 
 .block-tags-container {
   display: flex;
+  flex-wrap: wrap;
   gap: 8px;
 }
 
@@ -559,6 +560,7 @@
     background-color: $color-black-10 !important;
     border: none;
     margin: 0;
+    padding: 4px 8px;
 
     &:hover {
       background-color: #d4d4d4 !important;

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

@@ -26,6 +26,7 @@ export default function SubmissionHistoryRow({
   finalScore,
   provisionalScore,
   submissionTime,
+  createdAt,
   isReviewPhaseComplete,
   status,
   challengeStatus,
@@ -42,9 +43,11 @@ export default function SubmissionHistoryRow({
   };
   const provisionalScoreValue = parseScore(provisionalScore);
   const finalScoreValue = parseScore(finalScore);
-  const submissionMoment = submissionTime ? moment(submissionTime) : null;
+
+  const timeField = isMM ? submissionTime : createdAt;
+  const submissionMoment = timeField ? moment(timeField) : null;
   const submissionTimeDisplay = submissionMoment
-    ? `${submissionMoment.format('DD MMM YYYY')} ${submissionMoment.format('HH:mm:ss')}`
+    ? submissionMoment.format('MMM DD, YYYY HH:mm')
     : 'N/A';
   const getInitialReviewResult = () => {
     if (status === 'failed') return <FailedSubmissionTooltip />;
@@ -85,13 +88,17 @@ export default function SubmissionHistoryRow({
             {getFinalScore()}
           </div>
         </div>
-        <div styleName="col-3 col">
-          <div styleName="mobile-header">PROVISIONAL SCORE</div>
-          <div>
-            {getInitialReviewResult()}
-          </div>
-        </div>
-        <div styleName={`col-4 col ${isMM ? 'mm' : ''}`}>
+        {
+          isMM && (
+            <div styleName="col-3 col">
+              <div styleName="mobile-header">PROVISIONAL SCORE</div>
+              <div>
+                {getInitialReviewResult()}
+              </div>
+            </div>
+          )
+        }
+        <div styleName={`${isMM ? 'col-4' : 'col-3'} col ${isMM ? 'mm' : ''}`}>
           <div styleName="mobile-header">TIME</div>
           <div>
             {submissionTimeDisplay}
@@ -134,6 +141,8 @@ SubmissionHistoryRow.defaultProps = {
   provisionalScore: null,
   isReviewPhaseComplete: false,
   isLoggedIn: false,
+  createdAt: null,
+  submissionTime: null,
 };
 
 SubmissionHistoryRow.propTypes = {
@@ -154,7 +163,11 @@ SubmissionHistoryRow.propTypes = {
   submissionTime: PT.oneOfType([
     PT.string,
     PT.oneOf([null]),
-  ]).isRequired,
+  ]),
+  createdAt: PT.oneOfType([
+    PT.string,
+    PT.oneOf([null]),
+  ]),
   challengeStatus: PT.string.isRequired,
   isReviewPhaseComplete: PT.bool,
   auth: PT.shape().isRequired,