fix(challenge-listing): fix failing test

Author: cagdas001

src/shared/components/challenge-listing/ChallengeCard/Status/index.jsx

@@ -6,8 +6,9 @@ import LeaderboardAvatar from 'components/challenge-listing/LeaderboardAvatar';
 import { config, Link } from 'topcoder-react-utils';
 import { TABS as DETAIL_TABS } from 'actions/page/challenge-details';
 import 'moment-duration-format';
+import { phaseEndDate } from 'utils/challenge-listing/helper';
 import {
-  getTimeLeft, phaseEndDate,
+  getTimeLeft,
 } from 'utils/challenge-detail/helper';
 
 import ChallengeProgressBar from '../../ChallengeProgressBar';

src/shared/components/challenge-listing/Tooltips/ProgressBarTooltip/index.jsx

@@ -17,8 +17,8 @@ import _ from 'lodash';
 import React from 'react';
 import PT from 'prop-types';
 import Tooltip from 'components/Tooltip';
+import { phaseStartDate, phaseEndDate } from 'utils/challenge-listing/helper';
 import LoaderIcon from '../../../Loader/Loader';
-import { phaseStartDate, phaseEndDate } from '../../../../utils/challenge-detail/helper';
 import './style.scss';
 
 const getDate = date => moment(date).format('MMM DD');

src/shared/utils/challenge-detail/helper.jsx

@@ -9,6 +9,7 @@ import { challenge as challengeUtils } from 'topcoder-react-lib';
 import { config } from 'topcoder-react-utils';
 import Prize from 'components/challenge-listing/ChallengeCard/Prize';
 import { BUCKETS, getBuckets } from 'utils/challenge-listing/buckets';
+import { phaseEndDate } from 'utils/challenge-listing/helper';
 
 const Filter = challengeUtils.filter;
 
@@ -32,36 +33,6 @@ export function getChallengeTypeAbbr(track, challengeTypes) {
   return null;
 }
 
-/**
-  * Returns phase's end date.
-  * @param {Object} phase
-  * @return {Date}
-  */
-export function phaseEndDate(phase) {
-  // Case 1: phase is still open. take the `scheduledEndDate`
-  // Case 2: phase is not open but `scheduledStartDate` is a future date.
-  // This means phase is not yet started. So take the `scheduledEndDate`
-  if (phase.isOpen || moment(phase.scheduledStartDate).isAfter()) {
-    return new Date(phase.scheduledEndDate);
-  }
-  // for other cases, take the `actualEndDate` as phase is already closed
-  return new Date(phase.actualEndDate);
-}
-
-/**
-  * Returns phase's start date.
-  * @param {Object} phase
-  * @return {Date}
-  */
-export function phaseStartDate(phase) {
-  // Case 1: Phase is not yet started. take the `scheduledStartDate`
-  if (phase.isOpen !== true && moment(phase.scheduledStartDate).isAfter()) {
-    return new Date(phase.scheduledStartDate);
-  }
-  // For all other cases, take the `actualStartDate` as phase is already started
-  return new Date(phase.actualStartDate);
-}
-
 /**
  * Get end date
  * @param {Object} challenge challenge info

src/shared/utils/challenge-listing/helper.js

@@ -0,0 +1,31 @@
+import moment from 'moment';
+
+/**
+ * Returns phase's end date.
+ * @param {Object} phase
+ * @return {Date}
+ */
+export function phaseEndDate(phase) {
+  // Case 1: phase is still open. take the `scheduledEndDate`
+  // Case 2: phase is not open but `scheduledStartDate` is a future date.
+  // This means phase is not yet started. So take the `scheduledEndDate`
+  if (phase.isOpen || moment(phase.scheduledStartDate).isAfter()) {
+    return new Date(phase.scheduledEndDate);
+  }
+  // for other cases, take the `actualEndDate` as phase is already closed
+  return new Date(phase.actualEndDate);
+}
+
+/**
+ * Returns phase's start date.
+ * @param {Object} phase
+ * @return {Date}
+ */
+export function phaseStartDate(phase) {
+  // Case 1: Phase is not yet started. take the `scheduledStartDate`
+  if (phase.isOpen !== true && moment(phase.scheduledStartDate).isAfter()) {
+    return new Date(phase.scheduledStartDate);
+  }
+  // For all other cases, take the `actualStartDate` as phase is already started
+  return new Date(phase.actualStartDate);
+}

src/shared/utils/challenge-listing/sort.js

@@ -4,7 +4,7 @@
 
 import moment from 'moment';
 import { find, sumBy } from 'lodash';
-import { phaseStartDate, phaseEndDate } from '../challenge-detail/helper';
+import { phaseStartDate, phaseEndDate } from './helper';
 
 export const SORTS = {
   CURRENT_PHASE: 'current-phase',
@@ -27,15 +27,21 @@ export default {
   },
   [SORTS.MOST_RECENT]: {
     func: (a, b) => {
-      const getRegistrationStartDate = (challenge) => {
-        // extract the registration phase from `challenge.phases`,
+      const getChallengeStartDate = (challenge) => {
+        // extract the phases from `challenge.phases`,
         // as `challenge.registrationStartDate` returned from API is not reliable
         const registrationPhase = find(challenge.phases, p => p.name === 'Registration');
-        return moment(phaseStartDate(registrationPhase));
+        const submissionPhase = find(challenge.phases, p => p.name === 'Submission');
+        // registration phase exists
+        if (registrationPhase) {
+          return moment(phaseStartDate(registrationPhase));
+        }
+        // registration phase doesnt exist, This is possibly a F2F or TSK. Take submission phase
+        return moment(phaseStartDate(submissionPhase));
       };
-      const aRegistrationStartDate = getRegistrationStartDate(a);
-      const bRegistrationStartDate = getRegistrationStartDate(b);
-      return bRegistrationStartDate.diff(aRegistrationStartDate);
+      const aChallengeStartDate = getChallengeStartDate(a);
+      const bChallengeStartDate = getChallengeStartDate(b);
+      return bChallengeStartDate.diff(aChallengeStartDate);
     },
     name: 'Most recent',
   },