Merge pull request #7134 from topcoder-platform/develop

Clean up logs / PM-2525

Author: jmgasper

src/shared/containers/tc-communities/Loader.jsx

@@ -103,10 +103,6 @@ class Loader extends React.Component {
       // to see the "Public Site" on Zurich
       if (communityId === 'zurich') return Community({ member, meta });
       // All other get the not authorized page
-
-      console.log('Rendering Access Denied - Not Authenticated for !visitorGroups');
-      console.log(visitorGroups, meta, communityId, member);
-
       return (
         <AccessDenied
           cause={ACCESS_DENIED_REASON.NOT_AUTHENTICATED}
@@ -129,10 +125,6 @@ class Loader extends React.Component {
       // to any groups authorized to access this community
       return Community({ member, meta });
     }
-
-    console.log('Rendering Access Denied - Not Authenticated');
-    console.log(visitorGroups, meta, communityId, member);
-
     /* Visitor is not authorized to access this community. */
     return (
       <AccessDenied

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

@@ -6,6 +6,9 @@ import moment from 'moment';
  * @return {Date}
  */
 export function phaseEndDate(phase) {
+  if (phase.actualEndDate) {
+    return new Date(phase.actualEndDate);
+  }
   // 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`
@@ -17,7 +20,7 @@ export function phaseEndDate(phase) {
     return new Date(phase.scheduledEndDate);
   }
   // for other cases, take the `actualEndDate` as phase is already closed
-  return new Date(phase.scheduledEndDate || phase.actualEndDate);
+  return new Date(phase.actualEndDate || phase.scheduledEndDate);
 }
 
 /**
@@ -26,12 +29,15 @@ export function phaseEndDate(phase) {
  * @return {Date}
  */
 export function phaseStartDate(phase) {
+  if (phase.actualStartDate) {
+    return new Date(phase.actualStartDate);
+  }
   // 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.scheduledStartDate || phase.actualStartDate);
+  return new Date(phase.actualStartDate || phase.scheduledStartDate);
 }
 
 /**