Forum link showing incorrectly

#1512

#1511

Author: jmgasper

src/actions/sidebar.js

@@ -2,7 +2,14 @@
  * Sidebar related redux actions
  */
 import { fetchMemberProjects } from '../services/projects'
-import { SET_ACTIVE_PROJECT, LOAD_PROJECTS_FAILURE, LOAD_PROJECTS_PENDING, LOAD_PROJECTS_SUCCESS, RESET_SIDEBAR_ACTIVE_PARAMS } from '../config/constants'
+import {
+  SET_ACTIVE_PROJECT,
+  LOAD_PROJECTS_FAILURE,
+  LOAD_PROJECTS_PENDING,
+  LOAD_PROJECTS_SUCCESS,
+  RESET_SIDEBAR_ACTIVE_PARAMS,
+  UNLOAD_PROJECTS_SUCCESS
+} from '../config/constants'
 import _ from 'lodash'
 
 /**
@@ -58,8 +65,7 @@ export function loadProjects (filterProjectName = '', myProjects = true) {
 export function unloadProjects () {
   return (dispatch) => {
     dispatch({
-      type: LOAD_PROJECTS_SUCCESS,
-      projects: []
+      type: UNLOAD_PROJECTS_SUCCESS
     })
   }
 }

src/components/ChallengesComponent/ChallengeCard/index.js

@@ -323,7 +323,7 @@ class ChallengeCard extends React.Component {
           <a className={styles.link} href={communityAppUrl} target='_blank'>CA</a>
         </div>
         <div className={styles.col6}>
-          {forumLink ? (<a className={styles.link} href={forumLink} target='_blank'>CA</a>)
+          {forumLink ? (<a className={styles.link} href={forumLink} target='_blank'>Forum</a>)
             : (<a className={styles.link} href='javascript:void(0)'>Forum</a>)}
         </div>
       </div>

src/config/constants.js

@@ -55,6 +55,7 @@ export const getAWSContainerFileURL = (key) => `https://${FILE_PICKER_CONTAINER_
 export const LOAD_PROJECTS_SUCCESS = 'LOAD_PROJECTS_SUCCESS'
 export const LOAD_PROJECTS_PENDING = 'LOAD_PROJECTS_PENDING'
 export const LOAD_PROJECTS_FAILURE = 'LOAD_PROJECTS_FAILURE'
+export const UNLOAD_PROJECTS_SUCCESS = 'UNLOAD_PROJECTS_SUCCESS'
 
 // project billingAccount
 export const LOAD_PROJECT_BILLING_ACCOUNT = 'LOAD_PROJECT_BILLING_ACCOUNT'

src/containers/Users/index.js

@@ -3,7 +3,6 @@ import { connect } from 'react-redux'
 import _ from 'lodash'
 import PT from 'prop-types'
 import UsersComponent from '../../components/Users'
-import { loadProjects } from '../../actions/sidebar'
 import { loadProject, reloadProjectMembers } from '../../actions/projects'
 import { PROJECT_ROLES } from '../../config/constants'
 
@@ -17,7 +16,6 @@ class Users extends Component {
   }
 
   componentDidMount () {
-    this.props.loadProjects()
   }
 
   isEditable () {
@@ -76,13 +74,11 @@ const mapStateToProps = ({ sidebar, challenges, auth, projects }) => {
 
 const mapDispatchToProps = {
   loadProject,
-  loadProjects,
   reloadProjectMembers
 }
 
 Users.propTypes = {
   loadProject: PT.func.isRequired,
-  loadProjects: PT.func.isRequired,
   reloadProjectMembers: PT.func.isRequired,
   projects: PT.arrayOf(PT.object),
   projectMembers: PT.arrayOf(PT.object),

src/reducers/sidebar.js

@@ -6,7 +6,8 @@ import {
   LOAD_PROJECTS_SUCCESS,
   LOAD_PROJECTS_PENDING,
   LOAD_PROJECTS_FAILURE,
-  RESET_SIDEBAR_ACTIVE_PARAMS
+  RESET_SIDEBAR_ACTIVE_PARAMS,
+  UNLOAD_PROJECTS_SUCCESS
 } from '../config/constants'
 
 const initialState = {
@@ -19,9 +20,11 @@ const initialState = {
 export default function (state = initialState, action) {
   switch (action.type) {
     case SET_ACTIVE_PROJECT:
-      return { ...state, activeProjectId: action.projectId, projects: [], isLoading: false }
+      return { ...state, activeProjectId: action.projectId, projects: [], isLoading: false, isLoadProjectsSuccess: false }
     case LOAD_PROJECTS_SUCCESS:
       return { ...state, projects: action.projects, isLoading: false, isLoggedIn: true, isLoadProjectsSuccess: true }
+    case UNLOAD_PROJECTS_SUCCESS:
+      return { ...state, projects: [], isLoading: false, isLoggedIn: true, isLoadProjectsSuccess: false }
     case LOAD_PROJECTS_PENDING:
       return { ...state, isLoading: true }
     case LOAD_PROJECTS_FAILURE: