Sorting and filtering bugs

Author: jmgasper

src/components/ChallengesComponent/ChallengeCard/index.js

@@ -95,16 +95,18 @@ const hoverComponents = (challenge, onUpdateLaunch, deleteModalLaunch) => {
 }
 
 const renderStatus = (status, getStatusText) => {
-  switch (status) {
+  const statusMessage = status.split(' ')[0]
+  switch (statusMessage) {
     case CHALLENGE_STATUS.ACTIVE:
     case CHALLENGE_STATUS.APPROVED:
     case CHALLENGE_STATUS.NEW:
     case CHALLENGE_STATUS.DRAFT:
     case CHALLENGE_STATUS.COMPLETED:
-      const statusText = getStatusText ? getStatusText(status) : status
-      return (<ChallengeStatus status={status} statusText={statusText} />)
+    case CHALLENGE_STATUS.CANCELLED:
+      const statusText = getStatusText ? getStatusText(statusMessage) : statusMessage
+      return (<ChallengeStatus status={statusMessage} statusText={statusText} />)
     default:
-      return (<span className={styles.statusText}>{statusText}</span>)
+      return (<span className={styles.statusText}>{status}</span>)
   }
 }
 
@@ -204,7 +206,7 @@ class ChallengeCard extends React.Component {
     const deleteMessage = isCheckChalengePermission
       ? 'Checking permissions...'
       : `Do you want to delete "${challenge.name}"?`
-    const directUrl = `${DIRECT_PROJECT_URL}/contest/detail?projectId=${challenge.legacyId}`
+    const orUrl = `${ONLINE_REVIEW_URL}/review/actions/ViewProjectDetails?pid=${challenge.legacyId}`
     const communityAppUrl = `${COMMUNITY_APP_URL}/challenges/${challenge.id}`
 
     return (
@@ -279,7 +281,7 @@ class ChallengeCard extends React.Component {
           {(disableHover ? <Link className={styles.link} to={`/projects/${challenge.projectId}/challenges/${challenge.id}/edit`}>Edit</Link> : hoverComponents(challenge, this.onUpdateLaunch, this.deleteModalLaunch))}
         </div>
         <div className={styles.col6}>
-          <a className={styles.link} href={directUrl} target='_blank'>OR</a>
+          <a className={styles.link} href={orUrl} target='_blank'>OR</a>
         </div>
         <div className={styles.col6}>
           <a className={styles.link} href={communityAppUrl} target='_blank'>CA</a>

src/components/ChallengesComponent/ChallengeList/index.js

@@ -7,6 +7,7 @@ import PropTypes from 'prop-types'
 import { DebounceInput } from 'react-debounce-input'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faFile, faUser } from '@fortawesome/free-solid-svg-icons'
+import isAfter from 'date-fns/isAfter'
 import DateTime from '@nateradebaugh/react-datetime'
 import Pagination from 'react-js-pagination'
 import cn from 'classnames'
@@ -298,19 +299,10 @@ class ChallengeList extends Component {
       value: _.capitalize(item)
     }))
 
-    statusOptions.unshift({
-      label: 'All Challenge Status',
-      value: null
-    })
-
     const challengeTypesOptions = challengeTypes.map(item => ({
       label: item.name,
       value: item.abbreviation
     }))
-    challengeTypesOptions.unshift({
-      label: 'All Challenge Types',
-      value: null
-    })
 
     let selectedTab = 0
     switch (status) {
@@ -467,12 +459,13 @@ class ChallengeList extends Component {
                 onChange={e =>
                   this.updateSearchParam(
                     searchText,
-                    e.value,
+                    e ? e.value : null,
                     challengeType,
                     challengeDate,
                     projectOption
                   )
                 }
+                isClearable
               />
             </div>
           </div>
@@ -509,6 +502,9 @@ class ChallengeList extends Component {
                 value={
                   challengeDate.startDateEnd ? challengeDate.startDateEnd : null
                 }
+                isValidDate={(current) => {
+                  return isAfter(current, challengeDate.startDateStart)
+                }}
                 onChange={e =>
                   this.updateSearchParam(
                     searchText,
@@ -545,6 +541,7 @@ class ChallengeList extends Component {
                     projectOption
                   )
                 }
+                isClearable
               />
             </div>
           </div>
@@ -580,6 +577,9 @@ class ChallengeList extends Component {
                 value={
                   challengeDate.endDateEnd ? challengeDate.endDateEnd : null
                 }
+                isValidDate={(current) => {
+                  return isAfter(current, challengeDate.endDateStart)
+                }}
                 onChange={e =>
                   this.updateSearchParam(
                     searchText,

src/components/ChallengesComponent/ChallengeStatus/ChallengeStatus.module.scss

@@ -37,5 +37,9 @@
   &.yellow {
     background-color: $status-yellow;
   }
+
+  &.red {
+    background-color: $tc-red;
+  }
 }
 

src/components/ChallengesComponent/ChallengeStatus/index.js

@@ -15,7 +15,8 @@ const statuses = {
   [CHALLENGE_STATUS.APPROVED]: styles.yellow,
   [CHALLENGE_STATUS.NEW]: styles.yellow,
   [CHALLENGE_STATUS.DRAFT]: styles.gray,
-  [CHALLENGE_STATUS.COMPLETED]: styles.blue
+  [CHALLENGE_STATUS.COMPLETED]: styles.blue,
+  [CHALLENGE_STATUS.CANCELLED]: styles.red
 }
 
 const ChallengeStatus = ({ status, statusText }) => {

src/components/ChallengesComponent/ChallengeTag/ChallengeTag.module.scss

@@ -58,6 +58,10 @@ $corner-radius: 2px;
       background: $track-code-grey;
     }
 
+    &.MA {
+      background: $track-code-grey;
+    }
+
     &.withTco {
       border-bottom-left-radius: 0;
       border-bottom-right-radius: 0;

src/components/ChallengesComponent/ChallengeTag/index.js

@@ -8,7 +8,7 @@ export default function ChallengeTag ({
   type, challengeTypes
 }) {
   let abbreviation = getChallengeTypeAbbr(type, challengeTypes)
-  if (['CH', 'F2F', 'TSK', 'MM', 'RDM', 'SKL', 'SRM', 'PC'].indexOf(abbreviation) < 0) {
+  if (['CH', 'F2F', 'TSK', 'MM', 'RDM', 'SKL', 'MA', 'SRM', 'PC'].indexOf(abbreviation) < 0) {
     abbreviation = ''
   }
   return (

src/containers/Challenges/index.js

@@ -57,7 +57,7 @@ class Challenges extends Component {
         window.localStorage.setItem('projectLoading', 'true')
         this.props.loadProject(projectId)
       }
-      this.reloadChallenges(this.props)
+      this.reloadChallenges(this.props, true)
     }
   }