-
-
setUserPermissionToAdd(PROJECT_ROLES.WRITE)}
- />
-
+ {showSelectUserError && (
+
+
Please select a member.
+
+ )}
+
+
+
+
+
+
+
setUserPermissionToAdd(PROJECT_ROLES.READ)}
+ />
+
+
+
+
+
+
setUserPermissionToAdd(PROJECT_ROLES.WRITE)}
+ />
+
+
+
+
+
+
setUserPermissionToAdd(PROJECT_ROLES.MANAGER)}
+ />
+
+
+
+
+
+
setUserPermissionToAdd(PROJECT_ROLES.COPILOT)}
+ />
+
+
+
+ {addUserError && (
+
{addUserError}
+ )}
-
-
-
setUserPermissionToAdd(PROJECT_ROLES.MANAGER)}
+
-
- {addUserError && (
-
{addUserError}
- )}
-
-
-
+ )
+ }
)
}
@@ -188,7 +230,10 @@ UserAddModalContent.propTypes = {
projectId: PropTypes.number.isRequired,
addNewProjectMember: PropTypes.func.isRequired,
onMemberInvited: PropTypes.func.isRequired,
- onClose: PropTypes.func.isRequired
+ onClose: PropTypes.func.isRequired,
+ projectOption: PropTypes.any.isRequired,
+ projectMembers: PropTypes.array.isRequired,
+ updateProjectMember: PropTypes.func.isRequired
}
export default UserAddModalContent
diff --git a/src/config/constants.js b/src/config/constants.js
index 8955269c..daa323e1 100644
--- a/src/config/constants.js
+++ b/src/config/constants.js
@@ -59,7 +59,7 @@ export const FILE_PICKER_PROGRESS_INTERVAL = 100
export const FILE_PICKER_UPLOAD_RETRY = 2
export const FILE_PICKER_UPLOAD_TIMEOUT = 30 * 60 * 1000 // 30 minutes
export const SPECIFICATION_ATTACHMENTS_FOLDER = 'SPECIFICATION_ATTACHMENTS'
-export const MEMBERS_API_URL = process.env.MEMBERS_API_URL
+export const MEMBERS_API_URL = process.env.MEMBER_API_URL
export const getAWSContainerFileURL = (key) => `https://${FILE_PICKER_CONTAINER_NAME}.s3.amazonaws.com/${key}`
@@ -227,10 +227,10 @@ export const PHASE_STATUS = {
// List of prize sets types
export const PRIZE_SETS_TYPE = {
- CHALLENGE_PRIZES: 'PLACEMENT',
- COPILOT_PAYMENT: 'COPILOT',
- REVIEWER_PAYMENT: 'REVIEWER',
- CHECKPOINT_PRIZES: 'CHECKPOINT'
+ CHALLENGE_PRIZES: 'placement',
+ COPILOT_PAYMENT: 'copilot',
+ REVIEWER_PAYMENT: 'reviewer',
+ CHECKPOINT_PRIZES: 'checkpoint'
}
export const REVIEW_TYPES = {
@@ -368,7 +368,7 @@ export const GROUPS_DROPDOWN_PER_PAGE = 1000000 // make sure we are getting all
/**
* The list of challenge types which can have multiple prizes
*/
-export const CHALLENGE_TYPES_WITH_MULTIPLE_PRIZES = ['CHALLENGE']
+export const CHALLENGE_TYPES_WITH_MULTIPLE_PRIZES = ['Challenge', 'Marathon Match']
/**
* All the repeating messages.
diff --git a/src/containers/ChallengeEditor/index.js b/src/containers/ChallengeEditor/index.js
index e46dc711..f8dd590c 100644
--- a/src/containers/ChallengeEditor/index.js
+++ b/src/containers/ChallengeEditor/index.js
@@ -40,7 +40,7 @@ import { loadSubmissions } from '../../actions/challengeSubmissions'
import { loadProject } from '../../actions/projects'
import { connect } from 'react-redux'
-import { SUBMITTER_ROLE_UUID, MESSAGE, PROJECT_ROLES, CHALLENGE_STATUS } from '../../config/constants'
+import { SUBMITTER_ROLE_UUID, MESSAGE, PROJECT_ROLES } from '../../config/constants'
import { patchChallenge } from '../../services/challenges'
import ConfirmationModal from '../../components/Modal/ConfirmationModal'
import AlertModal from '../../components/Modal/AlertModal'
@@ -281,7 +281,7 @@ class ChallengeEditor extends Component {
try {
this.setState({ isLaunching: true })
const payload = {
- status: CHALLENGE_STATUS.ACTIVE
+ status: 'Active'
}
if (isTask) {
payload.startDate = moment().format()
diff --git a/src/containers/ProjectInvitations/index.js b/src/containers/ProjectInvitations/index.js
index 58e6f20d..fc9c4e49 100644
--- a/src/containers/ProjectInvitations/index.js
+++ b/src/containers/ProjectInvitations/index.js
@@ -46,16 +46,22 @@ const ProjectInvitations = ({ match, auth, isProjectLoading, history, projectDet
const updateInvite = useCallback(async (status, source) => {
setIsUpdating(status)
- await updateProjectMemberInvite(projectId, invitation.id, status, source)
-
- // await for the project details to propagate
- await delay(1000)
- await loadProjectInvites(projectId)
- toastr.success('Success', `Successfully ${status} the invitation.`)
-
- // await for the project details to fetch
- await delay(1000)
- history.push(status === PROJECT_MEMBER_INVITE_STATUS_ACCEPTED ? `/projects/${projectId}/challenges` : '/projects')
+ try {
+ await updateProjectMemberInvite(projectId, invitation.id, status, source)
+
+ // await for the project details to propagate
+ await delay(1000)
+ await loadProjectInvites(projectId)
+ toastr.success('Success', `Successfully ${status} the invitation.`)
+
+ // await for the project details to fetch
+ await delay(1000)
+ history.push(status === PROJECT_MEMBER_INVITE_STATUS_ACCEPTED ? `/projects/${projectId}/challenges` : '/projects')
+ } catch (e) {
+ toastr.error('Error', e.response.data.message)
+ await delay(1000)
+ history.push('/projects')
+ }
}, [projectId, invitation, loadProjectInvites, history])
const acceptInvite = useCallback(() => updateInvite(PROJECT_MEMBER_INVITE_STATUS_ACCEPTED, source), [updateInvite, source])
diff --git a/src/containers/Projects/styles.module.scss b/src/containers/Projects/styles.module.scss
index ef18461d..3fdceafb 100644
--- a/src/containers/Projects/styles.module.scss
+++ b/src/containers/Projects/styles.module.scss
@@ -51,6 +51,10 @@
border-radius: 3px;
border: 1px solid $light-gray;
background-color: $lighter-gray;
+
+ > div {
+ width: 100%;
+ }
}
.tcCheckbox {
diff --git a/src/containers/Users/index.js b/src/containers/Users/index.js
index ab6b39f6..6f1cef67 100644
--- a/src/containers/Users/index.js
+++ b/src/containers/Users/index.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react'
import { connect } from 'react-redux'
import _ from 'lodash'
import PT from 'prop-types'
+import { withRouter } from 'react-router-dom'
import UsersComponent from '../../components/Users'
import { PROJECT_ROLES } from '../../config/constants'
import { fetchInviteMembers, fetchProjectById } from '../../services/projects'
@@ -22,7 +23,11 @@ class Users extends Component {
projectMembers: null,
invitedMembers: null,
isAdmin: false,
- isLoadingProject: false
+ isLoadingProject: false,
+ project: props.location.state && props.location.state.projectId ? {
+ id: props.location.state && props.location.state.projectId,
+ name: props.location.state && props.location.state.projectName
+ } : null
}
this.loadProject = this.loadProject.bind(this)
this.updateProjectMember = this.updateProjectMember.bind(this)
@@ -33,7 +38,7 @@ class Users extends Component {
}
componentDidMount () {
- const { token, isLoading, loadAllUserProjects, page } = this.props
+ const { token, isLoading, loadAllUserProjects, page, location } = this.props
if (!isLoading) {
const isAdmin = checkAdmin(token)
const isManager = checkManager(token)
@@ -44,6 +49,10 @@ class Users extends Component {
this.setState({
isAdmin
})
+
+ if (location.state && location.state.projectId) {
+ this.loadProject(location.state.projectId)
+ }
}
}
@@ -157,6 +166,7 @@ class Users extends Component {
isSearchingUserProjects
} = this.props
const {
+ project,
projectMembers,
invitedMembers,
isAdmin,
@@ -164,6 +174,7 @@ class Users extends Component {
} = this.state
return (
{
}
Users.propTypes = {
+ location: PT.object.isRequired,
projects: PT.arrayOf(PT.object),
resultSearchUserProjects: PT.arrayOf(PT.object),
auth: PT.object,
@@ -220,4 +232,4 @@ const mapDispatchToProps = {
loadNextProjects
}
-export default connect(mapStateToProps, mapDispatchToProps)(Users)
+export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Users))
diff --git a/src/services/projects.js b/src/services/projects.js
index a3cf43c0..1a03221c 100644
--- a/src/services/projects.js
+++ b/src/services/projects.js
@@ -103,9 +103,10 @@ export async function fetchProjectPhases (id) {
* @param newRole the new role
* @returns {Promise<*>}
*/
-export async function updateProjectMemberRole (projectId, memberRecordId, newRole) {
+export async function updateProjectMemberRole (projectId, memberRecordId, newRole, action) {
const response = await axiosInstance.patch(`${PROJECTS_API_URL}/${projectId}/members/${memberRecordId}`, {
- role: newRole
+ role: newRole,
+ action
})
return _.get(response, 'data')
}