@@ -26,7 +36,7 @@ const TaaSList = ({ taasProjects, auth, isLoading }) => {
return (
-
No project selected. Select one below
+
Projects
{(isCopilot || isAdmin) && (
{
)}
- {taasProjects.length > 0 ? (
-
- {taasProjects.map(p => (
- -
-
-
- ))}
-
+ {projects.length > 0 ? (
+ <>
+
+ {projects.map(p => (
+ -
+
+
+ ))}
+
+ {projects && projects.length < projectsCount - 1 && (
+ // fix
+
+ )}
+
) : (
No TaaS projects available yet
)}
@@ -57,20 +73,29 @@ const TaaSList = ({ taasProjects, auth, isLoading }) => {
}
TaaSList.propTypes = {
- taasProjects: PropTypes.array,
+ projectsCount: PropTypes.number.isRequired,
+ projects: PropTypes.array,
auth: PropTypes.object.isRequired,
- isLoading: PropTypes.bool.isRequired
+ isLoading: PropTypes.bool.isRequired,
+ loadProjects: PropTypes.func.isRequired,
+ unloadProjects: PropTypes.func.isRequired,
+ loadMore: PropTypes.func.isRequired
}
-const mapStateToProps = ({ sidebar, auth }) => {
+const mapStateToProps = ({ projects, auth }) => {
return {
- taasProjects: sidebar.taasProjects,
- isLoading: sidebar.isLoading,
+ projectsCount: projects.projectsCount,
+ projects: projects.projects,
+ isLoading: projects.isLoading,
auth
}
}
-const mapDispatchToProps = {}
+const mapDispatchToProps = {
+ loadProjects: _loadProjects,
+ unloadProjects: _unloadProjects,
+ loadMore: loadMoreProjects
+}
export default withRouter(
connect(mapStateToProps, mapDispatchToProps)(TaaSList)
diff --git a/src/containers/Tab/index.js b/src/containers/Tab/index.js
index d9845f37..22853e66 100644
--- a/src/containers/Tab/index.js
+++ b/src/containers/Tab/index.js
@@ -5,7 +5,6 @@ import { connect } from 'react-redux'
import Tab from '../../components/Tab'
import {
loadProjects,
- loadTaasProjects,
setActiveProject,
resetSidebarActiveParams,
unloadProjects
@@ -35,7 +34,7 @@ class TabContainer extends Component {
!isLoading &&
!selfService &&
// do not fetch projects for users page
- history.location.pathname !== '/users'
+ history.location.pathname === '/'
) {
this.loadProjects(this.props)
}
@@ -46,7 +45,11 @@ class TabContainer extends Component {
}
componentWillReceiveProps (nextProps) {
- const { projectId, isLoading, selfService, projects, isLoadProjectsSuccess } = nextProps
+ const { projectId, activeProjectId, isLoading, selfService, projects, isLoadProjectsSuccess } = nextProps
+
+ if (projectId && activeProjectId < 0) {
+ this.props.setActiveProject(parseInt(projectId))
+ }
if (nextProps.history.location.pathname === '/') {
this.setState({ currentTab: 1 })
@@ -96,9 +99,7 @@ class TabContainer extends Component {
loadProjects (props) {
const { history } = props
- if (history.location.pathname === '/taas') {
- this.props.loadTaasProjects()
- } else {
+ if (history.location.pathname === '/') {
this.props.loadProjects()
}
}
@@ -139,7 +140,6 @@ TabContainer.propTypes = {
isLoading: PropTypes.bool,
isLoadProjectsSuccess: PropTypes.bool,
loadProjects: PropTypes.func,
- loadTaasProjects: PropTypes.func,
unloadProjects: PropTypes.func,
activeProjectId: PropTypes.number,
history: PropTypes.any.isRequired,
@@ -155,7 +155,6 @@ const mapStateToProps = ({ sidebar }) => ({
const mapDispatchToProps = {
loadProjects,
- loadTaasProjects,
unloadProjects,
setActiveProject,
resetSidebarActiveParams
diff --git a/src/reducers/projects.js b/src/reducers/projects.js
index a2e9a938..e26c90d3 100644
--- a/src/reducers/projects.js
+++ b/src/reducers/projects.js
@@ -3,6 +3,10 @@
*/
import _ from 'lodash'
import {
+ LOAD_PROJECTS_PENDING,
+ LOAD_PROJECTS_SUCCESS,
+ LOAD_PROJECTS_FAILURE,
+ UNLOAD_PROJECTS_SUCCESS,
LOAD_PROJECT_BILLING_ACCOUNTS_PENDING,
LOAD_PROJECT_BILLING_ACCOUNTS_SUCCESS,
LOAD_PROJECT_BILLING_ACCOUNTS_FAILURE,
@@ -55,7 +59,7 @@ const dateFormat = 'MMM DD, YYYY'
*/
const buildBillingAccountOptions = (billingAccountObj) => {
const billingAccountOptions = billingAccountObj.map(billingAccount => ({
- label: `(${billingAccount.tcBillingAccountId}) ${
+ label: `[${billingAccount.tcBillingAccountId}] ${billingAccount.name} ${
billingAccount.endDate
? ' - ' + moment(billingAccount.endDate).format(dateFormat)
: ''
@@ -80,11 +84,44 @@ const initialState = {
isPhasesLoading: false,
phases: [],
isProjectTypesLoading: false,
- projectTypes: []
+ projectFilters: {},
+ projectTypes: [],
+ projects: [],
+ projectsCount: 0,
+ projectsPage: 0
}
export default function (state = initialState, action) {
switch (action.type) {
+ case LOAD_PROJECTS_PENDING:
+ return { ...state, isLoading: true }
+ case LOAD_PROJECTS_SUCCESS:
+ return {
+ ...state,
+ projectFilters: action.filters,
+ projects: action.projects,
+ projectsCount: action.total,
+ projectsPage: action.page,
+ isLoading: false
+ }
+ case UNLOAD_PROJECTS_SUCCESS:
+ return {
+ ...state,
+ isLoading: false,
+ projectFilters: {},
+ projects: [],
+ projectsCount: 0,
+ projectsPage: 0
+ }
+ case LOAD_PROJECTS_FAILURE: {
+ const errorMessage = _.get(
+ action.payload,
+ 'response.data.message',
+ 'Failed to load projects'
+ )
+ toastFailure('Error', errorMessage)
+ return { ...state, isLoading: false }
+ }
case LOAD_PROJECT_DETAILS_PENDING:
return { ...state, isLoading: true }
case LOAD_PROJECT_DETAILS_FAILURE: {
diff --git a/src/reducers/sidebar.js b/src/reducers/sidebar.js
index be25da00..5fac3a82 100644
--- a/src/reducers/sidebar.js
+++ b/src/reducers/sidebar.js
@@ -15,10 +15,10 @@ import { toastFailure } from '../util/toaster'
const initialState = {
activeProjectId: -1,
isLoading: false,
+ projectFilters: {},
projects: [],
- taasProjects: [],
- total: 0,
- page: 0,
+ projectsTotal: 0,
+ projectsPage: 0,
isLoadProjectsSuccess: false
}
@@ -29,18 +29,15 @@ export default function (state = initialState, action) {
case LOAD_PROJECTS_SUCCESS:
return {
...state,
- projects: _.filter(action.projects, p => p.type !== 'talent-as-a-service'),
- taasProjects: _.filter(action.projects, {
- type: 'talent-as-a-service'
- }),
- total: action.total,
- page: action.page,
+ projects: action.projects,
+ projectsTotal: action.total,
+ projectsPage: action.page,
isLoading: false,
isLoggedIn: true,
isLoadProjectsSuccess: true
}
case UNLOAD_PROJECTS_SUCCESS:
- return { ...state, total: 0, page: 0, projects: [], isLoading: false, isLoggedIn: true, isLoadProjectsSuccess: false }
+ return { ...state, projectsTotal: 0, projectsPage: 0, projects: [], isLoading: false, isLoggedIn: true, isLoadProjectsSuccess: false }
case LOAD_PROJECTS_PENDING:
return { ...state, isLoading: true }
case LOAD_PROJECTS_FAILURE: {
diff --git a/src/routes.js b/src/routes.js
index fee5af10..aa87a527 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -11,6 +11,7 @@ import TopBarContainer from './containers/TopbarContainer'
import FooterContainer from './containers/FooterContainer'
import Tab from './containers/Tab'
import Challenges from './containers/Challenges'
+import Projects from './containers/Projects'
import TaaSList from './containers/TaaSList'
import ProjectAssets from './containers/ProjectAssets'
import TaaSProjectForm from './containers/TaaSProjectForm'
@@ -195,7 +196,7 @@ class Routes extends React.Component {
/>
renderApp(
- ,
+ ,
,
,
diff --git a/src/services/challenges.js b/src/services/challenges.js
index 0abab43d..f3c441c7 100644
--- a/src/services/challenges.js
+++ b/src/services/challenges.js
@@ -12,6 +12,7 @@ const {
CHALLENGE_PHASES_URL,
CHALLENGE_TIMELINES_URL,
SUBMISSIONS_API_URL,
+ REVIEW_TYPE_API_URL,
GROUPS_API_URL,
TERMS_API_URL,
RESOURCES_API_URL,
@@ -267,6 +268,11 @@ export async function fetchSubmissions (challengeId) {
return _.get(response, 'data', [])
}
+export async function getReviewTypes () {
+ const response = await axiosInstance.get(`${REVIEW_TYPE_API_URL}?perPage=500&page=1`)
+ return _.get(response, 'data', [])
+}
+
/**
* Api request for fetching resource roles
* @returns {Promise<*>}