@@ -430,7 +280,23 @@ class Users extends Component {
+
+ )
+ })
+ }
+
+
+ {
+ _.map(invitedMembers, (member) => {
+ return (
+ -
+
)
@@ -441,6 +307,8 @@ class Users extends Component {
)
}
+ {isLoadingProject && }
+
)
}
@@ -448,16 +316,20 @@ class Users extends Component {
Users.propTypes = {
loadProject: PropTypes.func.isRequired,
- updateProjectNember: PropTypes.func.isRequired,
- removeProjectNember: PropTypes.func.isRequired,
+ updateProjectMember: PropTypes.func.isRequired,
+ removeProjectMember: PropTypes.func.isRequired,
+ addNewProjectInvite: PropTypes.func.isRequired,
addNewProjectMember: PropTypes.func.isRequired,
auth: PropTypes.object,
isEditable: PropTypes.bool,
isSearchingUserProjects: PropTypes.bool,
projects: PropTypes.arrayOf(PropTypes.object),
projectMembers: PropTypes.arrayOf(PropTypes.object),
+ invitedMembers: PropTypes.arrayOf(PropTypes.object),
+ isLoadingProject: PropTypes.bool.isRequired,
searchUserProjects: PropTypes.func.isRequired,
- resultSearchUserProjects: PropTypes.arrayOf(PropTypes.object)
+ resultSearchUserProjects: PropTypes.arrayOf(PropTypes.object),
+ loadNextProjects: PropTypes.func.isRequired
}
export default Users
diff --git a/src/components/Users/invite-user.modal.js b/src/components/Users/invite-user.modal.js
new file mode 100644
index 00000000..37caa3b7
--- /dev/null
+++ b/src/components/Users/invite-user.modal.js
@@ -0,0 +1,141 @@
+import React, { useState } from 'react'
+import PropTypes from 'prop-types'
+import cn from 'classnames'
+import { find, get } from 'lodash'
+import Modal from '../Modal'
+import PrimaryButton from '../Buttons/PrimaryButton'
+import { inviteUserToProject } from '../../services/projects'
+import { PROJECT_ROLES } from '../../config/constants'
+
+import styles from './Users.module.scss'
+
+const theme = {
+ container: styles.modalContainer
+}
+
+const validateEmail = (email) => {
+ const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+ return emailRegex.test(email)
+}
+
+const InviteUserModalContent = ({ projectId, onClose, onMemberInvited, projectMembers, invitedMembers }) => {
+ const [emailToInvite, setEmailToInvite] = useState('')
+ const [showEmailError, setShowEmailError] = useState(false)
+ const [inviteUserError, setInviteUserError] = useState(null)
+ const [isInviting, setIsInviting] = useState(false)
+
+ const checkEmail = () => {
+ if (!validateEmail(emailToInvite)) {
+ setShowEmailError(true)
+ return false
+ }
+
+ if (find(invitedMembers, { email: emailToInvite })) {
+ setInviteUserError('Email is already invited!')
+ return false
+ }
+
+ if (find(projectMembers, { email: emailToInvite })) {
+ setInviteUserError('Member already part of the project!')
+ return false
+ }
+
+ return true
+ }
+
+ const onInviteUserConfirmClick = async () => {
+ if (isInviting) return
+
+ if (!checkEmail()) {
+ return
+ }
+
+ setIsInviting(true)
+ setInviteUserError(null)
+
+ try {
+ // api restriction: ONLY "customer" role can be invited via email
+ const { success: invitations = [], failed } = await inviteUserToProject(projectId, {
+ emails: [emailToInvite],
+ role: PROJECT_ROLES.CUSTOMER
+ })
+
+ if (failed) {
+ const error = get(failed, '0.message', 'Unable to invite user')
+ setInviteUserError(error)
+ setIsInviting(false)
+ } else {
+ onMemberInvited(invitations[0] || {})
+ onClose()
+ }
+ } catch (e) {
+ const error = get(e, 'response.data.message', 'Unable to invite user')
+ setInviteUserError(error)
+ setIsInviting(false)
+ }
+ }
+
+ return (
+
+
+
Invite User
+
+
+
+ Email* :
+
+
+ {
+ setEmailToInvite(e.target.value)
+ setShowEmailError(false)
+ setInviteUserError(null)
+ }}
+ onBlur={checkEmail}
+ />
+
+
+ {showEmailError && (
+
+
Please enter a valid email address.
+
+ )}
+ {inviteUserError && (
+
+ )}
+
+
+
+ )
+}
+
+InviteUserModalContent.propTypes = {
+ projectId: PropTypes.number.isRequired,
+ onClose: PropTypes.func.isRequired,
+ onMemberInvited: PropTypes.func.isRequired,
+ projectMembers: PropTypes.arrayOf(PropTypes.object),
+ invitedMembers: PropTypes.arrayOf(PropTypes.object)
+}
+
+export default InviteUserModalContent
diff --git a/src/components/Users/user-add.modal.js b/src/components/Users/user-add.modal.js
new file mode 100644
index 00000000..58b68d20
--- /dev/null
+++ b/src/components/Users/user-add.modal.js
@@ -0,0 +1,194 @@
+import React, { useState } from 'react'
+import PropTypes from 'prop-types'
+import cn from 'classnames'
+import { get } from 'lodash'
+import Modal from '../Modal'
+import SelectUserAutocomplete from '../SelectUserAutocomplete'
+import { PROJECT_ROLES } from '../../config/constants'
+import PrimaryButton from '../Buttons/PrimaryButton'
+import { addUserToProject, inviteUserToProject } from '../../services/projects'
+
+import styles from './Users.module.scss'
+
+const theme = {
+ container: styles.modalContainer
+}
+
+const UserAddModalContent = ({ projectId, addNewProjectMember, onMemberInvited, onClose }) => {
+ const [userToAdd, setUserToAdd] = useState(null)
+ const [userPermissionToAdd, setUserPermissionToAdd] = useState(PROJECT_ROLES.READ)
+ const [showSelectUserError, setShowSelectUserError] = useState(false)
+ const [addUserError, setAddUserError] = useState(null)
+ const [isAdding, setIsAdding] = useState(false)
+
+ const onUpdateUserToAdd = (option) => {
+ if (option && option.value) {
+ setUserToAdd({
+ handle: option.label,
+ userId: parseInt(option.value, 10)
+ })
+ setShowSelectUserError(false)
+ } else {
+ setUserToAdd(null)
+ }
+ }
+
+ const onAddUserConfirmClick = async () => {
+ if (isAdding) return
+
+ if (!userToAdd) {
+ setShowSelectUserError(true)
+ return
+ }
+
+ setIsAdding(true)
+ setAddUserError(null)
+
+ try {
+ if (userPermissionToAdd === PROJECT_ROLES.COPILOT) {
+ const { success: invitations = [], failed, ...rest } = await inviteUserToProject(projectId, {
+ handles: [userToAdd.handle],
+ role: userPermissionToAdd
+ })
+ if (failed) {
+ const error = get(failed, '0.message', 'User cannot be invited')
+ setAddUserError(error)
+ setIsAdding(false)
+ } else if (rest.message) {
+ setAddUserError(rest.message)
+ setIsAdding(false)
+ } else {
+ onMemberInvited(invitations[0] || {})
+ onClose()
+ }
+ } else {
+ const newUserInfo = await addUserToProject(projectId, userToAdd.userId, userPermissionToAdd)
+ newUserInfo.handle = userToAdd.handle
+ addNewProjectMember(newUserInfo)
+ onClose()
+ }
+ } catch (e) {
+ const error = get(e, 'response.data.message', 'Unable to add user')
+ setAddUserError(error)
+ setIsAdding(false)
+ }
+ }
+
+ return (
+
+
+
Add User
+
+
+ {showSelectUserError && (
+
+
Please select a member.
+
+ )}
+
+
+
+
+
+
+
setUserPermissionToAdd(PROJECT_ROLES.READ)}
+ />
+
+
+
+
+
+
setUserPermissionToAdd(PROJECT_ROLES.WRITE)}
+ />
+
+
+
+
+
+
setUserPermissionToAdd(PROJECT_ROLES.MANAGER)}
+ />
+
+
+
+
+
+
setUserPermissionToAdd(PROJECT_ROLES.COPILOT)}
+ />
+
+
+
+
+ {addUserError && (
+
{addUserError}
+ )}
+
+
+
+ )
+}
+UserAddModalContent.propTypes = {
+ projectId: PropTypes.number.isRequired,
+ addNewProjectMember: PropTypes.func.isRequired,
+ onMemberInvited: PropTypes.func.isRequired,
+ onClose: PropTypes.func.isRequired
+}
+
+export default UserAddModalContent
diff --git a/src/config/constants.js b/src/config/constants.js
index 2ee6e0ee..0b7de032 100644
--- a/src/config/constants.js
+++ b/src/config/constants.js
@@ -4,6 +4,7 @@
export const {
COMMUNITY_APP_URL,
CHALLENGE_API_URL,
+ COPILOTS_URL,
SUBMISSION_REVIEW_APP_URL,
STUDIO_URL,
CONNECT_APP_URL,
@@ -30,9 +31,11 @@ export const {
SKILLS_V5_API_URL,
UPDATE_SKILLS_V5_API_URL,
SALESFORCE_BILLING_ACCOUNT_LINK,
- TYPEFORM_URL
+ PROFILE_URL
} = process.env
+
export const CREATE_FORUM_TYPE_IDS = typeof process.env.CREATE_FORUM_TYPE_IDS === 'string' ? process.env.CREATE_FORUM_TYPE_IDS.split(',') : process.env.CREATE_FORUM_TYPE_IDS
+export const PROJECTS_API_URL = process.env.PROJECTS_API_URL || process.env.PROJECT_API_URL
/**
* Filepicker config
@@ -41,9 +44,14 @@ export const CREATE_FORUM_TYPE_IDS = typeof process.env.CREATE_FORUM_TYPE_IDS ==
// but if we want to test file uploading we should provide the real value in `FILE_PICKER_API_KEY` env variable
export const FILE_PICKER_API_KEY = process.env.FILE_PICKER_API_KEY || 'DUMMY'
export const FILE_PICKER_CONTAINER_NAME = process.env.FILE_PICKER_CONTAINER_NAME || 'tc-challenge-v5-dev'
+export const FILE_PICKER_SUBMISSION_CONTAINER_NAME = process.env.FILE_PICKER_SUBMISSION_CONTAINER_NAME || 'submission-staging-dev'
+export const PROJECT_ATTACHMENTS_FOLDER = process.env.PROJECT_ATTACHMENTS_FOLDER || 'PROJECT_ATTACHMENTS'
export const FILE_PICKER_REGION = process.env.FILE_PICKER_REGION || 'us-east-1'
+export const FILE_PICKER_LOCATION = process.env.FILE_PICKER_LOCATION || 's3'
export const FILE_PICKER_CNAME = process.env.FILE_PICKER_CNAME || 'fs.topcoder.com'
export const FILE_PICKER_FROM_SOURCES = ['local_file_system', 'googledrive', 'dropbox']
+export const ASSETS_FILE_PICKER_FROM_SOURCES = ['local_file_system']
+export const ASSETS_FILE_PICKER_MAX_FILES = 4
export const FILE_PICKER_ACCEPT = ['.bmp', '.gif', '.jpg', '.tex', '.xls', '.xlsx', '.doc', '.docx', '.zip', '.txt', '.pdf', '.png', '.ppt', '.pptx', '.rtf', '.csv']
export const FILE_PICKER_MAX_FILES = 10
export const FILE_PICKER_MAX_SIZE = 500 * 1024 * 1024 // 500Mb
@@ -51,6 +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 getAWSContainerFileURL = (key) => `https://${FILE_PICKER_CONTAINER_NAME}.s3.amazonaws.com/${key}`
@@ -173,16 +182,33 @@ export const LOAD_PROJECT_TYPES_SUCCESS = 'LOAD_PROJECT_TYPES_SUCCESS'
export const LOAD_PROJECT_TYPES_PENDING = 'LOAD_PROJECT_TYPES_PENDING'
export const LOAD_PROJECT_TYPES_FAILURE = 'LOAD_PROJECT_TYPES_FAILURE'
+export const LOAD_PROJECT_INVITES = 'LOAD_PROJECT_INVITES'
+export const LOAD_PROJECT_INVITES_SUCCESS = 'LOAD_PROJECT_INVITES_SUCCESS'
+export const LOAD_PROJECT_INVITES_PENDING = 'LOAD_PROJECT_INVITES_PENDING'
+export const LOAD_PROJECT_INVITES_FAILURE = 'LOAD_PROJECT_INVITES_FAILURE'
+
export const CREATE_PROJECT = 'CREATE_PROJECT'
export const CREATE_PROJECT_PENDING = 'CREATE_PROJECT_PENDING'
export const CREATE_PROJECT_SUCCESS = 'CREATE_PROJECT_SUCCESS'
export const CREATE_PROJECT_FAILURE = 'CREATE_PROJECT_FAILURE'
+export const ADD_PROJECT_ATTACHMENT_SUCCESS = 'ADD_PROJECT_ATTACHMENT_SUCCESS'
+export const UPDATE_PROJECT_ATTACHMENT_SUCCESS = 'UPDATE_PROJECT_ATTACHMENT_SUCCESS'
+export const REMOVE_PROJECT_ATTACHMENT_SUCCESS = 'REMOVE_PROJECT_ATTACHMENT_SUCCESS'
+
export const UPDATE_PROJECT = 'UPDATE_PROJECT'
export const UPDATE_PROJECT_PENDING = 'UPDATE_PROJECT_PENDING'
export const UPDATE_PROJECT_SUCCESS = 'UPDATE_PROJECT_SUCCESS'
export const UPDATE_PROJECT_FAILURE = 'UPDATE_PROJECT_FAILURE'
+export const PROJECT_MEMBER_INVITE_STATUS_ACCEPTED = 'accepted'
+export const PROJECT_MEMBER_INVITE_STATUS_REFUSED = 'refused'
+export const PROJECT_MEMBER_INVITE_STATUS_CANCELED = 'canceled'
+export const PROJECT_MEMBER_INVITE_STATUS_PENDING = 'pending'
+export const PROJECT_MEMBER_INVITE_STATUS_REQUESTED = 'requested'
+export const PROJECT_MEMBER_INVITE_STATUS_REQUEST_APPROVED = 'request_approved'
+export const PROJECT_MEMBER_INVITE_STATUS_REQUEST_REJECTED = 'request_rejected'
+
// Name of challenge tracks
export const CHALLENGE_TRACKS = {
DESIGN: DES_TRACK_ID,
@@ -232,6 +258,7 @@ export const MARATHON_MATCH_SUBTRACKS = [
export const PROJECT_ROLES = {
READ: 'observer',
+ CUSTOMER: 'customer',
WRITE: 'customer',
MANAGER: 'manager',
COPILOT: 'copilot'
@@ -298,11 +325,17 @@ export const COPILOT_ROLES = [
'copilot'
]
+export const MANAGER_ROLES = [
+ 'project manager'
+]
+
export const downloadAttachmentURL = (challengeId, attachmentId, token) =>
`${CHALLENGE_API_URL}/${challengeId}/attachments/${attachmentId}/download?token=${token}`
export const PAGE_SIZE = 10
+export const PROJECTS_PAGE_SIZE = 20
+
/**
* The minimal number of characters to enter before starting showing autocomplete suggestions
*/
@@ -351,6 +384,13 @@ export const CANCEL_REASONS = [
'Cancelled - Zero Registrations'
]
+/**
+ * System reviewers
+ */
+export const SystemReviewers = {
+ Default: 'TC System'
+}
+
/**
* Milestone product details
*/
@@ -396,7 +436,8 @@ export const SPECIAL_CHALLENGE_TAGS = [
/**
* Possible statuses of projects
*/
-export const PROJECT_STATUS = [
+export const PROJECT_STATUSES = [
+ { label: 'Draft', value: 'draft' },
{ label: 'Active', value: 'active' },
{ label: 'In Review', value: 'in_review' },
{ label: 'Reviewed', value: 'reviewed' },
@@ -405,6 +446,15 @@ export const PROJECT_STATUS = [
{ label: 'Paused', value: 'paused' }
]
+export const PROJECT_STATUS = {
+ ACTIVE: 'active',
+ IN_REVIEW: 'in_review',
+ REVIEWED: 'reviewed',
+ COMPLETED: 'completed',
+ CANCELLED: 'cancelled',
+ PAUSED: 'paused'
+}
+
export const JOB_ROLE_OPTIONS = [
{ value: null, label: 'Select Role' },
{ value: 'designer', label: 'Designer' },
@@ -418,3 +468,17 @@ export const JOB_WORKLOAD_OPTIONS = [
{ value: 'fulltime', label: 'Full-Time' },
{ value: 'fractional', label: 'Fractional' }
]
+
+/*
+* Project Attachment types
+*/
+export const ATTACHMENT_TYPE_FILE = 'file'
+export const ATTACHMENT_TYPE_LINK = 'link'
+
+/**
+ * Project assets shared with type text
+ */
+export const PROJECT_ASSETS_SHARED_WITH_ALL_MEMBERS = 'All Project Members'
+export const PROJECT_ASSETS_SHARED_WITH_ADMIN = 'Only Admins'
+
+export const PROJECT_TYPE_TAAS = 'talent-as-a-service'
diff --git a/src/containers/ChallengeEditor/index.js b/src/containers/ChallengeEditor/index.js
index 2f55d3b5..dffcc934 100644
--- a/src/containers/ChallengeEditor/index.js
+++ b/src/containers/ChallengeEditor/index.js
@@ -62,7 +62,8 @@ class ChallengeEditor extends Component {
showLaunchModal: false,
showRejectModal: false,
cancelReason: null,
- loginUserRoleInProject: ''
+ loginUserRoleInProject: '',
+ submissionsListPage: 1
}
this.onLaunchChallenge = this.onLaunchChallenge.bind(this)
@@ -95,7 +96,8 @@ class ChallengeEditor extends Component {
loadResourceRoles,
loadSubmissions,
loadChallengeDetails,
- loadResources
+ loadResources,
+ submissionsPerPage
} = this.props
loadTimelineTemplates()
loadChallengePhases()
@@ -109,7 +111,8 @@ class ChallengeEditor extends Component {
match,
loadChallengeDetails,
loadResources,
- loadSubmissions
+ loadSubmissions,
+ submissionsPerPage
)
// this.unlisten = this.props.history.listen(() => {
// const { isLoading } = this.props
@@ -160,12 +163,16 @@ class ChallengeEditor extends Component {
newMatch,
loadChallengeDetails,
loadResources,
- loadSubmissions
+ loadSubmissions,
+ submissionsPerPage
) {
let projectId = _.get(newMatch.params, 'projectId', null)
projectId = projectId ? parseInt(projectId) : null
const challengeId = _.get(newMatch.params, 'challengeId', null)
- await [loadResources(challengeId), loadSubmissions(challengeId)]
+ await [loadResources(challengeId), loadSubmissions(challengeId, {
+ page: 1,
+ perPage: submissionsPerPage
+ })]
loadChallengeDetails(projectId, challengeId)
if (!challengeId) {
@@ -423,7 +430,11 @@ class ChallengeEditor extends Component {
isProjectPhasesLoading,
showRejectChallengeModal,
createResource,
- deleteResource
+ deleteResource,
+ totalSubmissions,
+ submissionsPerPage,
+ page,
+ loadSubmissions
// members
} = this.props
const {
@@ -623,6 +634,10 @@ class ChallengeEditor extends Component {
onApproveChallenge={this.onApproveChallenge}
createResource={createResource}
deleteResource={deleteResource}
+ loadSubmissions={loadSubmissions}
+ totalSubmissions={totalSubmissions}
+ submissionsPerPage={submissionsPerPage}
+ page={page}
/>
)}
/>
@@ -680,13 +695,16 @@ ChallengeEditor.propTypes = {
loadProject: PropTypes.func,
projectPhases: PropTypes.arrayOf(PropTypes.object),
isProjectPhasesLoading: PropTypes.bool,
- showRejectChallengeModal: PropTypes.func
+ showRejectChallengeModal: PropTypes.func,
+ totalSubmissions: PropTypes.number,
+ submissionsPerPage: PropTypes.number,
+ page: PropTypes.number
// members: PropTypes.arrayOf(PropTypes.shape())
}
const mapStateToProps = ({
projects,
- challengeSubmissions: { challengeSubmissions },
+ challengeSubmissions: { challengeSubmissions, totalSubmissions, submissionsPerPage, page },
challenges: {
challengeDetails,
challengeResources,
@@ -715,7 +733,10 @@ const mapStateToProps = ({
token: auth.token,
loggedInUser: auth.user,
failedToLoad,
- errorMessage
+ errorMessage,
+ totalSubmissions,
+ submissionsPerPage,
+ page
// members
})
}
diff --git a/src/containers/Challenges/index.js b/src/containers/Challenges/index.js
index 4b56402a..f3edb55a 100644
--- a/src/containers/Challenges/index.js
+++ b/src/containers/Challenges/index.js
@@ -6,9 +6,7 @@ import React, { Component, Fragment } from 'react'
// import { Redirect } from 'react-router-dom'
import PropTypes from 'prop-types'
import { connect } from 'react-redux'
-import { Link } from 'react-router-dom'
import ChallengesComponent from '../../components/ChallengesComponent'
-import ProjectCard from '../../components/ProjectCard'
// import Loader from '../../components/Loader'
import {
loadChallengesByPage,
@@ -16,15 +14,14 @@ import {
deleteChallenge,
loadChallengeTypes
} from '../../actions/challenges'
-import { loadProject, updateProject } from '../../actions/projects'
+import { loadProject, loadProjects, updateProject } from '../../actions/projects'
import {
- loadProjects,
+ loadNextProjects,
setActiveProject,
resetSidebarActiveParams
} from '../../actions/sidebar'
-import styles from './Challenges.module.scss'
-import { checkAdmin, checkAdminOrCopilot } from '../../util/tc'
-import { PrimaryButton } from '../../components/Buttons'
+import { checkAdmin, checkIsUserInvitedToProject } from '../../util/tc'
+import { withRouter } from 'react-router-dom'
class Challenges extends Component {
constructor (props) {
@@ -46,6 +43,7 @@ class Challenges extends Component {
} = this.props
loadChallengeTypes()
if (dashboard) {
+ this.props.loadProjects('', {})
this.reloadChallenges(this.props, true, true)
}
if (menu === 'NULL' && activeProjectId !== -1) {
@@ -59,6 +57,14 @@ class Challenges extends Component {
}
}
+ componentDidUpdate () {
+ const { auth } = this.props
+
+ if (checkIsUserInvitedToProject(auth.token, this.props.projectDetail)) {
+ this.props.history.push(`/projects/${this.props.projectId}/invitation`)
+ }
+ }
+
componentWillReceiveProps (nextProps) {
if (
(nextProps.dashboard && this.props.dashboard !== nextProps.dashboard) ||
@@ -140,49 +146,20 @@ class Challenges extends Component {
dashboard,
selfService,
auth,
- metadata
+ metadata,
+ fetchNextProjects
} = this.props
const { challengeTypes = [] } = metadata
- const projectInfo = _.find(projects, { id: activeProjectId }) || {}
- const projectComponents =
- !dashboard &&
- projects.map((p) => (
-
-
-
- ))
return (
- {!dashboard &&
- (!!projectComponents.length ||
- (activeProjectId === -1 && !selfService)) ? (
-
- {activeProjectId === -1 && !selfService && (
-
-
No project selected. Select one below
- {checkAdminOrCopilot(auth.token) && (
-
-
-
- )}
-
- )}
-
-
+
+
Assets Library
+
+ {hasProjectAccess && (
+
+ {
+ if (selectedTab === 0) {
+ openFileUpload()
+ } else if (selectedTab === 1) {
+ setShowAddLink(true)
+ }
+ }}
+ />
+
+ )}
+
+
+
+ {hasProjectAccess && (
+ <>
+
+
{
+ if (selectedTab === 0) {
+ setShowAttachmentOptions(item)
+ } else if (selectedTab === 1) {
+ setShowAddLink(item)
+ }
+ }}
+ onRemove={item => {
+ if (selectedTab === 0) {
+ setShowDeleteFile(item)
+ } else if (selectedTab === 1) {
+ setShowDeleteLink(item)
+ }
+ }}
+ datas={tableDatas}
+ isLink={isLink}
+ members={projectDetail.members}
+ loggedInUser={loggedInUser}
+ isAdmin={isAdmin}
+ />
+
+ )}
+
+ {showAttachmentOptions && (
+ setShowAttachmentOptions(false)}
+ attachment={
+ showAttachmentOptions === true ? null : showAttachmentOptions
+ }
+ members={projectDetail.members}
+ projectId={projectId}
+ loggedInUser={loggedInUser}
+ newAttachments={pendingUploadFiles}
+ />
+ )}
+ {showAddLink && (
+ setShowAddLink(false)}
+ projectId={projectId}
+ link={showAddLink === true ? null : showAddLink}
+ />
+ )}
+ {showDeleteFile && (
+ setShowDeleteFile(null)}
+ theme={theme}
+ confirmText='Delete file'
+ confirmType='danger'
+ cancelType='info'
+ isProcessing={isProcessing}
+ onConfirm={() => {
+ setIsProcessing(true)
+ removeProjectAttachmentApi(projectId, showDeleteFile.id)
+ .then(() => {
+ toastr.success('Success', 'Removed file successfully.')
+ removeAttachment(showDeleteFile.id)
+ setIsProcessing(false)
+ setShowDeleteFile(null)
+ })
+ .catch(e => {
+ setIsProcessing(false)
+ const errorMessage = _.get(
+ e,
+ 'response.data.message',
+ 'Failed to remove file.'
+ )
+ toastr.error('Error', errorMessage)
+ })
+ }}
+ />
+ )}
+ {showDeleteLink && (
+ setShowDeleteLink(null)}
+ onConfirm={() => {
+ setIsProcessing(true)
+ removeProjectAttachmentApi(projectId, showDeleteLink.id)
+ .then(() => {
+ toastr.success('Success', 'Removed link successfully.')
+ removeAttachment(showDeleteLink.id)
+ setIsProcessing(false)
+ setShowDeleteLink(null)
+ })
+ .catch(e => {
+ setIsProcessing(false)
+ const errorMessage = _.get(
+ e,
+ 'response.data.message',
+ 'Failed to remove link.'
+ )
+ toastr.error('Error', errorMessage)
+ })
+ }}
+ theme={theme}
+ confirmText='Delete link'
+ confirmType='danger'
+ cancelType='info'
+ isProcessing={isProcessing}
+ />
+ )}
+
@@ -97,6 +128,7 @@ class ProjectEditor extends Component {
setActiveProject={setActiveProject}
history={history}
isEdit={isEdit}
+ canManage={canManage}
projectDetail={projectDetail}
/>
diff --git a/src/containers/ProjectInvitations/ProjectInvitations.module.scss b/src/containers/ProjectInvitations/ProjectInvitations.module.scss
new file mode 100644
index 00000000..865f95f9
--- /dev/null
+++ b/src/containers/ProjectInvitations/ProjectInvitations.module.scss
@@ -0,0 +1,120 @@
+@import '../../styles/includes';
+
+.modalContainer {
+ padding: 0;
+ position: fixed;
+ overflow: auto;
+ z-index: 10000;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ box-sizing: border-box;
+ width: auto;
+ max-width: none;
+ transform: none;
+ background: transparent;
+ color: $text-color;
+ opacity: 1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ :global {
+ button.close {
+ margin-right: 5px;
+ margin-top: 5px;
+ }
+ }
+
+ .contentContainer {
+ box-sizing: border-box;
+ background: $white;
+ opacity: 1;
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ align-items: center;
+ border-radius: 6px;
+ margin: 0 auto;
+ width: 852px;
+ padding: 30px;
+
+ .content {
+ padding: 30px;
+ width: 100%;
+ height: 100%;
+ }
+
+ .title {
+ @include roboto-bold();
+
+ font-size: 30px;
+ line-height: 36px;
+ margin-bottom: 30px;
+ margin-top: 0;
+ }
+
+ span {
+ @include roboto;
+
+ font-size: 22px;
+ font-weight: 400;
+ line-height: 26px;
+ }
+
+ &.confirm {
+ width: 999px;
+
+ .buttonGroup {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 30px;
+
+ .buttonSizeA {
+ width: 193px;
+ height: 40px;
+ margin-right: 33px;
+
+ span {
+ font-size: 18px;
+ font-weight: 500;
+ }
+ }
+
+ .buttonSizeB {
+ width: 160px;
+ height: 40px;
+
+ span {
+ font-size: 18px;
+ font-weight: 500;
+ line-height: 22px;
+ }
+ }
+ }
+ }
+
+ .buttonGroup {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 30px;
+
+ .button {
+ width: 135px;
+ height: 40px;
+ margin-right: 66px;
+
+ span {
+ font-size: 18px;
+ font-weight: 500;
+ }
+ }
+
+ .button:last-child {
+ margin-right: 0;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/containers/ProjectInvitations/index.js b/src/containers/ProjectInvitations/index.js
new file mode 100644
index 00000000..58e6f20d
--- /dev/null
+++ b/src/containers/ProjectInvitations/index.js
@@ -0,0 +1,127 @@
+import PropTypes from 'prop-types'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import { connect } from 'react-redux'
+import { withRouter } from 'react-router-dom'
+import { toastr } from 'react-redux-toastr'
+import { checkIsUserInvitedToProject } from '../../util/tc'
+import { isEmpty } from 'lodash'
+import { loadProjectInvites } from '../../actions/projects'
+import ConfirmationModal from '../../components/Modal/ConfirmationModal'
+
+import styles from './ProjectInvitations.module.scss'
+import { updateProjectMemberInvite } from '../../services/projectMemberInvites'
+import { PROJECT_MEMBER_INVITE_STATUS_ACCEPTED, PROJECT_MEMBER_INVITE_STATUS_REFUSED } from '../../config/constants'
+import { delay } from '../../util/delay'
+
+const theme = {
+ container: styles.modalContainer
+}
+
+const ProjectInvitations = ({ match, auth, isProjectLoading, history, projectDetail, loadProjectInvites }) => {
+ const automaticAction = useMemo(() => [PROJECT_MEMBER_INVITE_STATUS_ACCEPTED, PROJECT_MEMBER_INVITE_STATUS_REFUSED].includes(match.params.action) ? match.params.action : undefined, [match.params])
+ const projectId = useMemo(() => parseInt(match.params.projectId), [match.params])
+ const invitation = useMemo(() => checkIsUserInvitedToProject(auth.token, projectDetail), [auth.token, projectDetail])
+ const [isUpdating, setIsUpdating] = useState(automaticAction || false)
+ const isAccepting = isUpdating === PROJECT_MEMBER_INVITE_STATUS_ACCEPTED
+ const isDeclining = isUpdating === PROJECT_MEMBER_INVITE_STATUS_REFUSED
+ const queryParams = new URLSearchParams(window.location.search)
+ const source = queryParams.get('source')
+
+ useEffect(() => {
+ if (!projectId) {
+ return
+ }
+
+ if (isProjectLoading || isEmpty(projectDetail)) {
+ if (!isProjectLoading) {
+ loadProjectInvites(projectId)
+ }
+ return
+ }
+
+ if (!invitation) {
+ history.push(`/projects`)
+ }
+ }, [projectId, auth, projectDetail, isProjectLoading, history])
+
+ 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')
+ }, [projectId, invitation, loadProjectInvites, history])
+
+ const acceptInvite = useCallback(() => updateInvite(PROJECT_MEMBER_INVITE_STATUS_ACCEPTED, source), [updateInvite, source])
+ const declineInvite = useCallback(() => updateInvite(PROJECT_MEMBER_INVITE_STATUS_REFUSED, source), [updateInvite, source])
+
+ useEffect(() => {
+ if (!invitation || !automaticAction) {
+ return
+ }
+
+ if (automaticAction === PROJECT_MEMBER_INVITE_STATUS_ACCEPTED) {
+ acceptInvite()
+ } else if (automaticAction === PROJECT_MEMBER_INVITE_STATUS_REFUSED) {
+ declineInvite()
+ }
+ }, [invitation, automaticAction, source])
+
+ return (
+ <>
+ {invitation && (
+
+ )}
+
+ )
+}
+
+ProjectInvitations.propTypes = {
+ match: PropTypes.shape({
+ params: PropTypes.shape({
+ projectId: PropTypes.string
+ })
+ }).isRequired,
+ auth: PropTypes.object.isRequired,
+ isProjectLoading: PropTypes.bool,
+ history: PropTypes.object,
+ loadProjectInvites: PropTypes.func.isRequired,
+ projectDetail: PropTypes.object
+}
+
+const mapStateToProps = ({ projects, auth }) => {
+ return {
+ projectDetail: projects.projectDetail,
+ isProjectLoading: projects.isLoading || projects.isProjectInvitationsLoading,
+ auth
+ }
+}
+
+const mapDispatchToProps = {
+ loadProjectInvites
+}
+
+export default withRouter(
+ connect(mapStateToProps, mapDispatchToProps)(ProjectInvitations)
+)
diff --git a/src/containers/Projects/index.js b/src/containers/Projects/index.js
new file mode 100644
index 00000000..893f3f78
--- /dev/null
+++ b/src/containers/Projects/index.js
@@ -0,0 +1,162 @@
+import React, { useEffect, useMemo, useState } from 'react'
+import cn from 'classnames'
+import { DebounceInput } from 'react-debounce-input'
+import { withRouter, Link } from 'react-router-dom'
+import { connect } from 'react-redux'
+import PropTypes from 'prop-types'
+import Loader from '../../components/Loader'
+import { checkAdminOrCopilot, checkIsUserInvitedToProject, checkManager } from '../../util/tc'
+import { PrimaryButton } from '../../components/Buttons'
+import Select from '../../components/Select'
+import ProjectCard from '../../components/ProjectCard'
+import InfiniteLoadTrigger from '../../components/InfiniteLoadTrigger'
+import { loadProjects, loadMoreProjects, unloadProjects } from '../../actions/projects'
+import { PROJECT_STATUSES } from '../../config/constants'
+
+import styles from './styles.module.scss'
+
+const Projects = ({ projects, auth, isLoading, projectsCount, loadProjects, loadMoreProjects, unloadProjects }) => {
+ const [search, setSearch] = useState()
+ const [projectStatus, setProjectStatus] = useState('')
+ const [showOnlyMyProjects, setOnlyMyProjects] = useState(false)
+ const selectedStatus = useMemo(() => PROJECT_STATUSES.find(s => s.value === projectStatus))
+
+ const isProjectManager = checkManager(auth.token)
+ useEffect(() => {
+ const params = {}
+ if (projectStatus) {
+ params.status = projectStatus
+ }
+
+ if (isProjectManager) {
+ params.memberOnly = showOnlyMyProjects
+ }
+ loadProjects(search, params)
+ }, [search, projectStatus, showOnlyMyProjects, isProjectManager])
+
+ // unload projects on dismount
+ useEffect(() => () => unloadProjects, [])
+
+ if (isLoading && projects.length === 0) {
+ return (
+
+
+
+ )
+ }
+
+ return (
+
+
+
Projects
+ {checkAdminOrCopilot(auth.token) && (
+
+
+
+ )}
+
+
+
+
+
+
+
+ setSearch(e.target.value)}
+ value={search}
+ />
+
+
+
+
+
+
+
+
+
+
+ {
+ checkManager(auth.token) && (
+
+
setOnlyMyProjects(!showOnlyMyProjects)}
+ />
+
+
+ )
+ }
+
+
+ {projects.length > 0 ? (
+ <>
+
+ {projects.map(p => (
+ -
+
+
+ ))}
+
+ {projects && projects.length < projectsCount - 1 && (
+ // fix
+
+ )}
+
+ ) : (
+
No projects available yet
+ )}
+
@@ -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/TaaSProjectForm/index.js b/src/containers/TaaSProjectForm/index.js
index dc22e380..c583e8e0 100644
--- a/src/containers/TaaSProjectForm/index.js
+++ b/src/containers/TaaSProjectForm/index.js
@@ -156,6 +156,7 @@ const TaaSProjectForm = ({
setInitValues({
name: projectDetail.name,
jobs: _.cloneDeep(taasJobs).map(item => ({
+ jobId: item.jobId,
title: item.title,
people: parseInt(item.people),
duration: parseInt(item.duration),
diff --git a/src/containers/Tab/index.js b/src/containers/Tab/index.js
index bf72d6df..22853e66 100644
--- a/src/containers/Tab/index.js
+++ b/src/containers/Tab/index.js
@@ -34,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)
}
@@ -45,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 })
@@ -95,9 +99,7 @@ class TabContainer extends Component {
loadProjects (props) {
const { history } = props
- if (history.location.pathname === '/taas') {
- this.props.loadProjects('', false, { type: 'talent-as-a-service', status: undefined })
- } else {
+ if (history.location.pathname === '/') {
this.props.loadProjects()
}
}
diff --git a/src/containers/Users/index.js b/src/containers/Users/index.js
index 7a1ecf3f..ab6b39f6 100644
--- a/src/containers/Users/index.js
+++ b/src/containers/Users/index.js
@@ -4,11 +4,12 @@ import _ from 'lodash'
import PT from 'prop-types'
import UsersComponent from '../../components/Users'
import { PROJECT_ROLES } from '../../config/constants'
-import { fetchProjectById } from '../../services/projects'
-import { checkAdmin } from '../../util/tc'
+import { fetchInviteMembers, fetchProjectById } from '../../services/projects'
+import { checkAdmin, checkManager } from '../../util/tc'
import {
loadAllUserProjects,
+ loadNextProjects,
searchUserProjects
} from '../../actions/users'
@@ -19,25 +20,41 @@ class Users extends Component {
this.state = {
loginUserRoleInProject: '',
projectMembers: null,
- isAdmin: false
+ invitedMembers: null,
+ isAdmin: false,
+ isLoadingProject: false
}
this.loadProject = this.loadProject.bind(this)
- this.updateProjectNember = this.updateProjectNember.bind(this)
- this.removeProjectNember = this.removeProjectNember.bind(this)
+ this.updateProjectMember = this.updateProjectMember.bind(this)
+ this.removeProjectMember = this.removeProjectMember.bind(this)
+ this.addNewProjectInvite = this.addNewProjectInvite.bind(this)
this.addNewProjectMember = this.addNewProjectMember.bind(this)
+ this.loadNextProjects = this.loadNextProjects.bind(this)
}
componentDidMount () {
- const { token, isLoading, loadAllUserProjects } = this.props
+ const { token, isLoading, loadAllUserProjects, page } = this.props
if (!isLoading) {
const isAdmin = checkAdmin(token)
- loadAllUserProjects(isAdmin)
+ const isManager = checkManager(token)
+ const params = {
+ page
+ }
+ loadAllUserProjects(params, isAdmin, isManager)
this.setState({
isAdmin
})
}
}
+ loadNextProjects () {
+ const { loadNextProjects: nextProjectsHandler, token } = this.props
+ const isAdmin = checkAdmin(token)
+ const isManager = checkManager(token)
+
+ nextProjectsHandler(isAdmin, isManager)
+ }
+
isEditable () {
const { loginUserRoleInProject } = this.state
if (loginUserRoleInProject === PROJECT_ROLES.READ) {
@@ -64,17 +81,27 @@ class Users extends Component {
}
loadProject (projectId) {
- fetchProjectById(projectId).then((project) => {
+ this.setState({ isLoadingProject: true })
+ fetchProjectById(projectId).then(async (project) => {
const projectMembers = _.get(project, 'members')
+ const invitedMembers = _.get(project, 'invites') || []
+ const invitedUserIds = _.filter(_.map(invitedMembers, 'userId'))
+ const invitedUsers = await fetchInviteMembers(invitedUserIds)
+
this.setState({
- projectMembers
+ projectMembers,
+ invitedMembers: invitedMembers.map(m => ({
+ ...m,
+ email: m.email || invitedUsers[m.userId].handle
+ })),
+ isLoadingProject: false
})
const { loggedInUser } = this.props
this.updateLoginUserRoleInProject(projectMembers, loggedInUser)
})
}
- updateProjectNember (newMemberInfo) {
+ updateProjectMember (newMemberInfo) {
const { projectMembers } = this.state
const newProjectMembers = projectMembers.map(pm => pm.id === newMemberInfo.id ? ({
...pm,
@@ -87,12 +114,14 @@ class Users extends Component {
this.updateLoginUserRoleInProject(newProjectMembers, loggedInUser)
}
- removeProjectNember (projectMember) {
- const { projectMembers } = this.state
+ removeProjectMember (projectMember) {
+ const { projectMembers, invitedMembers } = this.state
const newProjectMembers = _.filter(projectMembers, pm => pm.id !== projectMember.id)
+ const newInvitedMembers = _.filter(invitedMembers, pm => pm.id !== projectMember.id)
const { loggedInUser } = this.props
this.setState({
- projectMembers: newProjectMembers
+ projectMembers: newProjectMembers,
+ invitedMembers: newInvitedMembers
})
this.updateLoginUserRoleInProject(newProjectMembers, loggedInUser)
}
@@ -110,6 +139,15 @@ class Users extends Component {
this.updateLoginUserRoleInProject(newProjectMembers, loggedInUser)
}
+ addNewProjectInvite (invitedMember) {
+ this.setState(() => ({
+ invitedMembers: [
+ ...(this.state.invitedMembers || []),
+ invitedMember
+ ]
+ }))
+ }
+
render () {
const {
projects,
@@ -120,16 +158,22 @@ class Users extends Component {
} = this.props
const {
projectMembers,
- isAdmin
+ invitedMembers,
+ isAdmin,
+ isLoadingProject
} = this.state
return (
{
return {
projects: users.allUserProjects,
+ page: users.page,
isLoading: users.isLoadingAllUserProjects,
resultSearchUserProjects: users.searchUserProjects,
isSearchingUserProjects: users.isSearchingUserProjects,
@@ -164,12 +209,15 @@ Users.propTypes = {
isLoading: PT.bool,
isSearchingUserProjects: PT.bool,
loadAllUserProjects: PT.func.isRequired,
- searchUserProjects: PT.func.isRequired
+ searchUserProjects: PT.func.isRequired,
+ loadNextProjects: PT.func.isRequired,
+ page: PT.number
}
const mapDispatchToProps = {
loadAllUserProjects,
- searchUserProjects
+ searchUserProjects,
+ loadNextProjects
}
export default connect(mapStateToProps, mapDispatchToProps)(Users)
diff --git a/src/reducers/challengeSubmissions.js b/src/reducers/challengeSubmissions.js
index 389c10a4..ab70bda7 100644
--- a/src/reducers/challengeSubmissions.js
+++ b/src/reducers/challengeSubmissions.js
@@ -11,7 +11,10 @@ const initialState = {
isLoading: true,
loadingId: null,
challengeId: null,
- challengeSubmissions: []
+ challengeSubmissions: [],
+ totalSubmissions: 0,
+ submissionsPerPage: 10,
+ page: 1
}
export default function (state = initialState, action) {
@@ -19,10 +22,13 @@ export default function (state = initialState, action) {
case LOAD_CHALLENGE_SUBMISSIONS_SUCCESS:
return {
...state,
- challengeSubmissions: action.payload,
+ challengeSubmissions: action.payload.data,
isLoading: false,
loadingId: null,
- challengeId: state.loadingId
+ challengeId: state.loadingId,
+ totalSubmissions: action.payload.headers['x-total'],
+ page: action.payload.page,
+ submissionsPerPage: action.payload.perPage
}
case LOAD_CHALLENGE_SUBMISSIONS_PENDING:
return {
@@ -30,7 +36,8 @@ export default function (state = initialState, action) {
isLoading: true,
loadingId: action.challengeId,
challengeId: null,
- challengeSubmissions: []
+ challengeSubmissions: [],
+ totalPages: 0
}
case LOAD_CHALLENGE_SUBMISSIONS_FAILURE:
return {
@@ -38,7 +45,8 @@ export default function (state = initialState, action) {
isLoading: false,
loadingId: null,
challengeId: null,
- challengeSubmissions: []
+ challengeSubmissions: [],
+ totalPages: 0
}
default:
return state
diff --git a/src/reducers/projects.js b/src/reducers/projects.js
index a6b94b9c..f81713c6 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,
@@ -23,7 +27,13 @@ import {
UPDATE_PROJECT_SUCCESS,
UPDATE_PROJECT_DETAILS_FAILURE,
UPDATE_PROJECT_DETAILS_PENDING,
- UPDATE_PROJECT_DETAILS_SUCCESS
+ UPDATE_PROJECT_DETAILS_SUCCESS,
+ ADD_PROJECT_ATTACHMENT_SUCCESS,
+ UPDATE_PROJECT_ATTACHMENT_SUCCESS,
+ REMOVE_PROJECT_ATTACHMENT_SUCCESS,
+ LOAD_PROJECT_INVITES_PENDING,
+ LOAD_PROJECT_INVITES_SUCCESS,
+ LOAD_PROJECT_INVITES_FAILURE
} from '../config/constants'
import { toastSuccess, toastFailure } from '../util/toaster'
import moment from 'moment-timezone'
@@ -52,7 +62,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)
: ''
@@ -71,17 +81,51 @@ const initialState = {
isBillingAccountExpired: false,
isBillingAccountLoading: false,
isBillingAccountLoadingFailed: false,
+ isProjectInvitationsLoading: false,
currentBillingAccount: null,
billingStartDate: null,
billingEndDate: null,
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: {
@@ -221,6 +265,29 @@ export default function (state = initialState, action) {
...state,
isProjectTypesLoading: false
}
+ case LOAD_PROJECT_INVITES_PENDING:
+ return {
+ ...state,
+ projectDetail: {
+ ...state.projectDetail,
+ invites: []
+ },
+ isProjectInvitationsLoading: true
+ }
+ case LOAD_PROJECT_INVITES_SUCCESS:
+ return {
+ ...state,
+ projectDetail: {
+ ...state.projectDetail,
+ invites: action.payload
+ },
+ isProjectInvitationsLoading: false
+ }
+ case LOAD_PROJECT_INVITES_FAILURE:
+ return {
+ ...state,
+ isProjectInvitationsLoading: false
+ }
case UPDATE_PROJECT_PENDING:
return {
...state,
@@ -244,6 +311,34 @@ export default function (state = initialState, action) {
...state,
isUpdatingProject: false
}
+ case ADD_PROJECT_ATTACHMENT_SUCCESS:
+ return {
+ ...state,
+ projectDetail: {
+ ...state.projectDetail,
+ attachments: [...(state.projectDetail.attachments || []), action.payload]
+ }
+ }
+ case UPDATE_PROJECT_ATTACHMENT_SUCCESS:
+ return {
+ ...state,
+ projectDetail: {
+ ...state.projectDetail,
+ attachments: state.projectDetail.attachments.map(item =>
+ item.id !== action.payload.id ? item : action.payload
+ )
+ }
+ }
+ case REMOVE_PROJECT_ATTACHMENT_SUCCESS:
+ return {
+ ...state,
+ projectDetail: {
+ ...state.projectDetail,
+ attachments: state.projectDetail.attachments.filter(
+ item => item.id !== action.payload
+ )
+ }
+ }
default:
return state
}
diff --git a/src/reducers/sidebar.js b/src/reducers/sidebar.js
index abb6b049..5fac3a82 100644
--- a/src/reducers/sidebar.js
+++ b/src/reducers/sidebar.js
@@ -15,8 +15,10 @@ import { toastFailure } from '../util/toaster'
const initialState = {
activeProjectId: -1,
isLoading: false,
+ projectFilters: {},
projects: [],
- taasProjects: [],
+ projectsTotal: 0,
+ projectsPage: 0,
isLoadProjectsSuccess: false
}
@@ -27,16 +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'
- }),
+ projects: action.projects,
+ projectsTotal: action.total,
+ projectsPage: action.page,
isLoading: false,
isLoggedIn: true,
isLoadProjectsSuccess: true
}
case UNLOAD_PROJECTS_SUCCESS:
- return { ...state, 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/reducers/users.js b/src/reducers/users.js
index 8dc18247..e293c154 100644
--- a/src/reducers/users.js
+++ b/src/reducers/users.js
@@ -14,7 +14,9 @@ const initialState = {
allUserProjects: [],
isLoadingAllUserProjects: false,
searchUserProjects: [],
- isSearchingUserProjects: false
+ isSearchingUserProjects: false,
+ page: 1,
+ total: null
}
export default function (state = initialState, action) {
@@ -23,7 +25,9 @@ export default function (state = initialState, action) {
return {
...state,
allUserProjects: action.projects,
- isLoadingAllUserProjects: false
+ isLoadingAllUserProjects: false,
+ page: action.page,
+ total: action.total
}
case LOAD_ALL_USER_PROJECTS_PENDING:
return { ...state, isLoadingAllUserProjects: true }
diff --git a/src/routes.js b/src/routes.js
index c26549d7..b830f9f6 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -11,7 +11,9 @@ 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'
import ChallengeEditor from './containers/ChallengeEditor'
import { getFreshToken, decodeToken } from 'tc-auth-lib'
@@ -31,6 +33,7 @@ import ConfirmationModal from './components/Modal/ConfirmationModal'
import Users from './containers/Users'
import { isBetaMode, removeFromLocalStorage, saveToLocalStorage } from './util/localstorage'
import ProjectEditor from './containers/ProjectEditor'
+import ProjectInvitations from './containers/ProjectInvitations'
const { ACCOUNTS_APP_LOGIN_URL, IDLE_TIMEOUT_MINUTES, IDLE_TIMEOUT_GRACE_MINUTES, COMMUNITY_APP_URL } = process.env
@@ -108,7 +111,7 @@ class Routes extends React.Component {
} else {
console.error('An unexpected error occurred while getting auth token')
}
- const redirectBackToUrl = encodeURIComponent(window.location.origin + this.props.location.pathname)
+ const redirectBackToUrl = encodeURIComponent(window.location.origin + this.props.location.pathname + this.props.location.search)
window.location = `${ACCOUNTS_APP_LOGIN_URL}?retUrl=${redirectBackToUrl}`
})
}
@@ -194,7 +197,7 @@ class Routes extends React.Component {
/>
renderApp(
- ,
+ ,
,
,
@@ -208,6 +211,14 @@ class Routes extends React.Component {
)()}
/>
+ renderApp(
+ ,
+ ,
+ ,
+
+ )()}
+ />
renderApp(
,
@@ -216,6 +227,20 @@ class Routes extends React.Component {
)()}
/>
+ {(isCopilot || isAdmin) && (
+
+ renderApp(
+ ,
+ ,
+ ,
+
+ )()
+ }
+ />
+ )}
{
!isReadOnly && (
}
*/
-export async function fetchSubmissions (challengeId) {
- const response = await axiosInstance.get(`${SUBMISSIONS_API_URL}?challengeId=${challengeId}&perPage=100`)
+export async function fetchSubmissions (challengeId, pageObj) {
+ const { page, perPage } = pageObj
+ const response = await axiosInstance.get(`${SUBMISSIONS_API_URL}?challengeId=${challengeId}&perPage=${perPage}&page=${page}`)
+ return {
+ data: _.get(response, 'data', []),
+ headers: _.get(response, 'headers', {}),
+ page,
+ perPage
+ }
+}
+
+export async function getReviewTypes () {
+ const response = await axiosInstance.get(`${REVIEW_TYPE_API_URL}?perPage=500&page=1`)
return _.get(response, 'data', [])
}
diff --git a/src/services/projectMemberInvites.js b/src/services/projectMemberInvites.js
new file mode 100644
index 00000000..cfa9a660
--- /dev/null
+++ b/src/services/projectMemberInvites.js
@@ -0,0 +1,73 @@
+import { axiosInstance as axios } from './axiosWithAuth'
+import { PROJECTS_API_URL } from '../config/constants'
+
+/**
+ * Update project member invite based on project's id & given member
+ * @param {integer} projectId unique identifier of the project
+ * @param {integer} inviteId unique identifier of the invite
+ * @param {string} status the new status for invitation
+ * @return {object} project member invite returned by api
+ */
+export function updateProjectMemberInvite (projectId, inviteId, status, source) {
+ const url = `${PROJECTS_API_URL}/${projectId}/invites/${inviteId}`
+ const body = {
+ status
+ }
+
+ if (source) {
+ body.source = source
+ }
+ return axios.patch(url, body)
+ .then(resp => resp.data)
+}
+
+/**
+ * Delete project member invite based on project's id & given invite's id
+ * @param {integer} projectId unique identifier of the project
+ * @param {integer} inviteId unique identifier of the invite
+ * @return {object} project member invite returned by api
+ */
+export function deleteProjectMemberInvite (projectId, inviteId) {
+ const url = `${PROJECTS_API_URL}/${projectId}/invites/${inviteId}`
+ return axios.delete(url)
+}
+
+/**
+ * Create a project member invite based on project's id & given member
+ * @param {integer} projectId unique identifier of the project
+ * @param {object} member invite
+ * @return {object} project member invite returned by api
+ */
+export function createProjectMemberInvite (projectId, member) {
+ const fields = 'id,projectId,userId,email,role,status,createdAt,updatedAt,createdBy,updatedBy,handle'
+ const url = `${PROJECTS_API_URL}/${projectId}/invites/?fields=` + encodeURIComponent(fields)
+ return axios({
+ method: 'post',
+ url,
+ data: member,
+ validateStatus (status) {
+ return (status >= 200 && status < 300) || status === 403
+ }
+ })
+ .then(resp => resp.data)
+}
+
+export function getProjectMemberInvites (projectId) {
+ const fields = 'id,projectId,userId,email,role,status,createdAt,updatedAt,createdBy,updatedBy,handle'
+ const url = `${PROJECTS_API_URL}/${projectId}/invites/?fields=` +
+ encodeURIComponent(fields)
+ return axios.get(url)
+ .then(resp => {
+ return resp.data
+ })
+}
+
+/**
+ * Get a project member invite based on project's id
+ * @param {integer} projectId unique identifier of the project
+ * @return {object} project member invite returned by api
+ */
+export function getProjectInviteById (projectId) {
+ return axios.get(`${PROJECTS_API_URL}/${projectId}/invites`)
+ .then(resp => resp.data)
+}
diff --git a/src/services/projects.js b/src/services/projects.js
index 2aa70898..a3cf43c0 100644
--- a/src/services/projects.js
+++ b/src/services/projects.js
@@ -2,12 +2,17 @@ import _ from 'lodash'
import { axiosInstance } from './axiosWithAuth'
import * as queryString from 'query-string'
import {
+ ATTACHMENT_TYPE_FILE,
+ FILE_PICKER_SUBMISSION_CONTAINER_NAME,
GENERIC_PROJECT_MILESTONE_PRODUCT_NAME,
GENERIC_PROJECT_MILESTONE_PRODUCT_TYPE,
PHASE_PRODUCT_CHALLENGE_ID_FIELD,
- PHASE_PRODUCT_TEMPLATE_ID
+ PHASE_PRODUCT_TEMPLATE_ID,
+ PROJECTS_API_URL,
+ MEMBERS_API_URL
} from '../config/constants'
-const { PROJECT_API_URL } = process.env
+import { paginationHeaders } from '../util/pagination'
+import { createProjectMemberInvite } from './projectMemberInvites'
/**
* Get billing accounts based on project id
@@ -17,7 +22,7 @@ const { PROJECT_API_URL } = process.env
* @returns {Promise