Updates for navigation, layout, and new “All Work” tab contents

Author: jmgasper

src/actions/challenges.js

@@ -72,19 +72,35 @@ export function loadChallengesByPage (
   filterSortOrder = null
 ) {
   return (dispatch, getState) => {
-    dispatch({
-      type: LOAD_CHALLENGES_PENDING,
-      challenges: [],
-      projectId: projectId,
-      status,
-      filterChallengeName,
-      filterChallengeType,
-      filterDate,
-      filterSortBy,
-      filterSortOrder,
-      perPage: PAGE_SIZE,
-      page
-    })
+    if (_.isObject(projectId)) {
+      dispatch({
+        type: LOAD_CHALLENGES_PENDING,
+        challenges: [],
+        status,
+        filterProjectOption: projectId,
+        filterChallengeName,
+        filterChallengeType,
+        filterDate,
+        filterSortBy,
+        filterSortOrder,
+        perPage: PAGE_SIZE,
+        page
+      })
+    } else {
+      dispatch({
+        type: LOAD_CHALLENGES_PENDING,
+        challenges: [],
+        status,
+        projectId,
+        filterChallengeName,
+        filterChallengeType,
+        filterDate,
+        filterSortBy,
+        filterSortOrder,
+        perPage: PAGE_SIZE,
+        page
+      })
+    }
 
     const filters = {
       sortBy: 'startDate',
@@ -116,8 +132,13 @@ export function loadChallengesByPage (
     }
     if (_.isInteger(projectId) && projectId > 0) {
       filters['projectId'] = projectId
+    } else if (_.isObject(projectId) && projectId.value > 0) {
+      filters['projectId'] = projectId.value
     }
-    if (!_.isEmpty(status)) {
+
+    if (status === 'all') {
+      delete filters['status']
+    } else if (!_.isEmpty(status)) {
       filters['status'] = status === '' ? undefined : _.startCase(status.toLowerCase())
     } else if (!(_.isInteger(projectId) && projectId > 0)) {
       filters['status'] = 'Active'

src/assets/images/ico-arrow-down.svg

@@ -2,19 +2,17 @@
  * Component that sets the general structure of the app
  */
 import React from 'react'
-import TwoColsLayout from '../TwoColsLayout'
+import TwoRowsLayout from '../TwoRowsLayout'
 
 const App = (content, topbar, sidebar) => () => {
   return (
-    <TwoColsLayout scrollIndependent>
-      <TwoColsLayout.Sidebar>
-        {sidebar}
-      </TwoColsLayout.Sidebar>
-      <TwoColsLayout.Content>
+    <TwoRowsLayout scrollIndependent>
+      <TwoRowsLayout.Content>
         {topbar || null}
+        {sidebar}
         {content}
-      </TwoColsLayout.Content>
-    </TwoColsLayout>
+      </TwoRowsLayout.Content>
+    </TwoRowsLayout>
   )
 }
 

src/assets/images/nav-active-item.svg

@@ -200,7 +200,7 @@ class ChallengeCard extends React.Component {
 
   render () {
     const { isLaunch, isConfirm, isSaving, isDeleteLaunch, isCheckChalengePermission, hasEditChallengePermission } = this.state
-    const { challenge, reloadChallengeList, isBillingAccountExpired, disableHover, getStatusText, challengeTypes } = this.props
+    const { setActiveProject, challenge, reloadChallengeList, isBillingAccountExpired, disableHover, getStatusText, challengeTypes } = this.props
     const deleteMessage = isCheckChalengePermission
       ? 'Checking permissions...'
       : `Do you want to delete "${challenge.name}"?`
@@ -255,7 +255,7 @@ class ChallengeCard extends React.Component {
           <ChallengeTag type={challenge.type} challengeTypes={challengeTypes} />
         </div>
 
-        <Link className={styles.col2} to={`/projects/${challenge.projectId}/challenges/${challenge.id}/view`}>
+        <Link className={styles.col2} to={`/projects/${challenge.projectId}/challenges/${challenge.id}/view`} onClick={() => setActiveProject(parseInt(challenge.projectId))}>
           <div className={styles.name}>
             <span className={styles.block}>{challenge.name}</span>
           </div>
@@ -294,13 +294,15 @@ class ChallengeCard extends React.Component {
 
 ChallengeCard.defaultPrps = {
   reloadChallengeList: () => { },
-  challengeTypes: []
+  challengeTypes: [],
+  setActiveProject: () => {}
 }
 
 ChallengeCard.propTypes = {
   challenge: PropTypes.object,
   reloadChallengeList: PropTypes.func,
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
+  setActiveProject: PropTypes.func,
   deleteChallenge: PropTypes.func.isRequired,
   isBillingAccountExpired: PropTypes.bool,
   disableHover: PropTypes.bool,

src/components/App/index.js

@@ -7,6 +7,10 @@
   justify-content: space-between;
 }
 
+.dashboardRow {
+  align-items: flex-end;
+}
+
 .row {
   display: flex;
   justify-content: flex-end;
@@ -349,4 +353,4 @@
   display: flex;
   flex-direction: column;
   justify-content: center;
-}
+}