Skip to content

PM-973 invite by mail #1623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 8, 2025
Merged

PM-973 invite by mail #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4fd1543
PM-973 - move add user to own component
vas3a Mar 28, 2025
81a1173
PM-973 - invite user modal
vas3a Mar 28, 2025
06ab559
PM-973 - invite by email
vas3a Mar 30, 2025
592b787
PM-973 - add invitation dialog after user accepts invitation through …
vas3a Apr 7, 2025
5823808
Merge remote-tracking branch 'origin/develop' into PM-973_invite-by-mail
vas3a Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 87 additions & 71 deletions src/components/UserCard/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import _ from 'lodash'
import moment from 'moment'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import cn from 'classnames'
Expand All @@ -6,7 +8,6 @@ import { PROJECT_ROLES } from '../../config/constants'
import PrimaryButton from '../Buttons/PrimaryButton'
import AlertModal from '../Modal/AlertModal'
import { updateProjectMemberRole } from '../../services/projects'
import _ from 'lodash'

const theme = {
container: styles.modalContainer
Expand Down Expand Up @@ -58,7 +59,7 @@ class UserCard extends Component {
}

render () {
const { user, onRemoveClick, isEditable } = this.props
const { isInvite, user, onRemoveClick, isEditable } = this.props
const showRadioButtons = _.includes(_.values(PROJECT_ROLES), user.role)
return (
<div>
Expand Down Expand Up @@ -90,76 +91,90 @@ class UserCard extends Component {
)}
<div className={styles.item}>
<div className={cn(styles.col5)}>
{user.handle}
</div>
<div className={cn(styles.col5)}>
{showRadioButtons && (<div className={styles.tcRadioButton}>
<input
name={`user-${user.id}`}
type='radio'
id={`read-${user.id}`}
checked={user.role === PROJECT_ROLES.READ}
onChange={(e) => e.target.checked && this.updatePermission(PROJECT_ROLES.READ)}
/>
<label className={cn({ [styles.isDisabled]: !isEditable })} htmlFor={`read-${user.id}`}>
<div>
Read
</div>
<input type='hidden' />
</label>
</div>)}
</div>
<div className={cn(styles.col5)}>
{showRadioButtons && (<div className={styles.tcRadioButton}>
<input
name={`user-${user.id}`}
type='radio'
id={`write-${user.id}`}
checked={user.role === PROJECT_ROLES.WRITE}
onChange={(e) => e.target.checked && this.updatePermission(PROJECT_ROLES.WRITE)}
/>
<label className={cn({ [styles.isDisabled]: !isEditable })} htmlFor={`write-${user.id}`}>
<div>
Write
</div>
<input type='hidden' />
</label>
</div>)}
</div>
<div className={cn(styles.col5)}>
{showRadioButtons && (<div className={styles.tcRadioButton}>
<input
name={`user-${user.id}`}
type='radio'
id={`full-access-${user.id}`}
checked={user.role === PROJECT_ROLES.MANAGER}
onChange={(e) => e.target.checked && this.updatePermission(PROJECT_ROLES.MANAGER)}
/>
<label className={cn({ [styles.isDisabled]: !isEditable })} htmlFor={`full-access-${user.id}`}>
<div>
Full Access
</div>
<input type='hidden' />
</label>
</div>)}
</div>
<div className={cn(styles.col5)}>
{showRadioButtons && (<div className={styles.tcRadioButton}>
<input
name={`user-${user.id}`}
type='radio'
id={`copilot-${user.id}`}
checked={user.role === PROJECT_ROLES.COPILOT}
onChange={(e) => e.target.checked && this.updatePermission(PROJECT_ROLES.COPILOT)}
/>
<label className={cn({ [styles.isDisabled]: !isEditable })} htmlFor={`copilot-${user.id}`}>
<div>
Copilot
</div>
<input type='hidden' />
</label>
</div>)}
{isInvite ? user.email : user.handle}
</div>
{!isInvite && (
<>
<div className={cn(styles.col5)}>
{showRadioButtons && (<div className={styles.tcRadioButton}>
<input
name={`user-${user.id}`}
type='radio'
id={`read-${user.id}`}
checked={user.role === PROJECT_ROLES.READ}
onChange={(e) => e.target.checked && this.updatePermission(PROJECT_ROLES.READ)}
/>
<label className={cn({ [styles.isDisabled]: !isEditable })} htmlFor={`read-${user.id}`}>
<div>
Read
</div>
<input type='hidden' />
</label>
</div>)}
</div>
<div className={cn(styles.col5)}>
{showRadioButtons && (<div className={styles.tcRadioButton}>
<input
name={`user-${user.id}`}
type='radio'
id={`write-${user.id}`}
checked={user.role === PROJECT_ROLES.WRITE}
onChange={(e) => e.target.checked && this.updatePermission(PROJECT_ROLES.WRITE)}
/>
<label className={cn({ [styles.isDisabled]: !isEditable })} htmlFor={`write-${user.id}`}>
<div>
Write
</div>
<input type='hidden' />
</label>
</div>)}
</div>
<div className={cn(styles.col5)}>
{showRadioButtons && (<div className={styles.tcRadioButton}>
<input
name={`user-${user.id}`}
type='radio'
id={`full-access-${user.id}`}
checked={user.role === PROJECT_ROLES.MANAGER}
onChange={(e) => e.target.checked && this.updatePermission(PROJECT_ROLES.MANAGER)}
/>
<label className={cn({ [styles.isDisabled]: !isEditable })} htmlFor={`full-access-${user.id}`}>
<div>
Full Access
</div>
<input type='hidden' />
</label>
</div>)}
</div>
<div className={cn(styles.col5)}>
{showRadioButtons && (<div className={styles.tcRadioButton}>
<input
name={`user-${user.id}`}
type='radio'
id={`copilot-${user.id}`}
checked={user.role === PROJECT_ROLES.COPILOT}
onChange={(e) => e.target.checked && this.updatePermission(PROJECT_ROLES.COPILOT)}
/>
<label className={cn({ [styles.isDisabled]: !isEditable })} htmlFor={`copilot-${user.id}`}>
<div>
Copilot
</div>
<input type='hidden' />
</label>
</div>)}
</div>
</>
)}
{isInvite && (
<>
<div className={cn(styles.col5)} />
<div className={cn(styles.col5)}>
Invited {moment(user.createdAt).format('MMM D, YY')}
</div>
<div className={cn(styles.col5)} />
<div className={cn(styles.col5)} />
</>
)}
{isEditable ? (<div className={cn(styles.col5)}>
<PrimaryButton
text={'Remove'}
Expand All @@ -173,6 +188,7 @@ class UserCard extends Component {
}

UserCard.propTypes = {
isInvite: PropTypes.bool,
user: PropTypes.object,
updateProjectNember: PropTypes.func.isRequired,
onRemoveClick: PropTypes.func.isRequired,
Expand Down
13 changes: 12 additions & 1 deletion src/components/Users/Users.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@
text-decoration: none;
font-size: 12px;
}

&.inviteEmailInput {
input {
width: 250px;
}
}
}
}

Expand Down Expand Up @@ -395,10 +401,15 @@
}

.addButtonContainer {
width: 110px;
display: flex;
justify-content: flex-start;
height: 30px;
margin-top: 20px;
margin-bottom: 20px;
gap: 8px;
> * {
width: 125px;
}
}

.addUserContentContainer {
Expand Down
Loading