Merge pull request #4571 from nursoltan-s/issue-4546

Issue 4546

Author: sushilshinde

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

@@ -8,15 +8,19 @@ import PT from 'prop-types';
 import moment from 'moment';
 import _ from 'lodash';
 import cn from 'classnames';
+import { getRatingLevel } from 'utils/tc';
 
 import sortList from 'utils/challenge-detail/sort';
 import CheckMark from '../icons/check-mark.svg';
 import ArrowDown from '../../../../assets/images/arrow-down.svg';
 import './style.scss';
 
+const BUG_HUNT = 'Bug Hunt';
+const F2F = 'First2Finish';
+
 function formatDate(date) {
   if (!date) return '-';
-  return moment(date).format('MMM DD, YYYY HH:mm');
+  return moment(date).local().format('MMM DD, YYYY HH:mm');
 }
 
 function getDate(arr, handle) {
@@ -194,8 +198,8 @@ export default class Registrants extends React.Component {
           break;
         }
         case 'Registration Date': {
-          valueA = new Date(a.registrationDate);
-          valueB = new Date(b.registrationDate);
+          valueA = new Date(a.created);
+          valueB = new Date(b.created);
           break;
         }
         case 'Round 1 Submitted Date': {
@@ -241,14 +245,20 @@ export default class Registrants extends React.Component {
     const {
       prizeSets,
       legacy,
+      type,
     } = challenge;
+
     const { track } = legacy;
+
     const { sortedRegistrants } = this.state;
     const { field, sort } = this.getRegistrantsSortParam();
     const revertSort = (sort === 'desc') ? 'asc' : 'desc';
     const isDesign = track.toLowerCase() === 'design';
     const isF2F = track.indexOf('FIRST_2_FINISH') > -1;
-    const isBugHunt = track.indexOf('BUG_HUNT') > -1;
+
+    const isBugHunt = track.indexOf('BUG_HUNT') > -1
+      || type === BUG_HUNT
+      || type === F2F;
     const placementPrizes = _.find(prizeSets, { type: 'placement' });
     const { prizes } = placementPrizes || [];
 
@@ -382,17 +392,11 @@ export default class Registrants extends React.Component {
           {
             sortedRegistrants.map((r) => {
               const placement = getPlace(results, r.memberHandle, places);
-              const colorStyle = JSON.parse(r.colorStyle.replace(/(\w+):\s*([^;]*)/g, '{"$1": "$2"}'));
               let checkpoint = this.getCheckPoint(r);
               if (checkpoint) {
                 checkpoint = formatDate(checkpoint);
               }
-              let final = this.getFinal(r);
-              if (final) {
-                final = formatDate(final);
-              } else {
-                final = '-';
-              }
+              const final = this.getFinal(r);
 
               return (
                 <div styleName="row" key={r.memberHandle} role="row">
@@ -403,8 +407,11 @@ export default class Registrants extends React.Component {
                           Rating
                         </div>
                         <div>
-                          <span style={colorStyle} role="cell">
-                            { !_.isNil(r.rating) ? r.rating : '-'}
+                          <span
+                            styleName={`level-${getRatingLevel(_.get(r, 'rating', 0))}`}
+                            role="cell"
+                          >
+                            { (!_.isNil(r.rating) && r.rating !== 0) ? r.rating : '-'}
                           </span>
                         </div>
                       </div>
@@ -414,7 +421,7 @@ export default class Registrants extends React.Component {
                     <span role="cell">
                       <a
                         href={`${window.origin}/members/${r.memberHandle}`}
-                        style={colorStyle}
+                        styleName={`level-${getRatingLevel(_.get(r, 'rating', 0))}`}
                         target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
                       >
                         {r.memberHandle}
@@ -453,7 +460,7 @@ export default class Registrants extends React.Component {
                     </div>
                     <div>
                       <span role="cell">
-                        {final}
+                        {formatDate(final)}
                       </span>
                       {placement > 0 && (
                       <span role="cell" styleName={`placement ${placement < 4 ? `placement-${placement}` : ''}`}>
@@ -496,6 +503,7 @@ Registrants.propTypes = {
     registrants: PT.arrayOf(PT.shape()).isRequired,
     round1Introduction: PT.string,
     round2Introduction: PT.string,
+    type: PT.string,
   }).isRequired,
   results: PT.arrayOf(PT.shape()),
   checkpointResults: PT.shape(),

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

@@ -163,8 +163,6 @@
   a,
   a:hover,
   a:visited {
-    color: $tc-dark-blue-110;
-
     &:hover {
       text-decoration: underline;
     }
@@ -281,3 +279,23 @@
   margin: 10px 10px 0 10px;
   padding-top: 5px;
 }
+
+.level-1 {
+  color: $tc-level-1 !important;
+}
+
+.level-2 {
+  color: $tc-level-2 !important;
+}
+
+.level-3 {
+  color: $tc-level-3 !important;
+}
+
+.level-4 {
+  color: $tc-level-4 !important;
+}
+
+.level-5 {
+  color: $tc-level-5 !important;
+}