Skip to content

added assign to me button #1027

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.

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 4 commits into from
Jan 11, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,10 @@
.readOnlyValue {
margin-bottom: 0.5rem; // the same like `label` to be aligned
}

.assignSelfField {
margin-left: 20px;
padding-top: 6px;
}
}

12 changes: 10 additions & 2 deletions src/components/ChallengeEditor/AssignedMember-Field/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ import cn from 'classnames'
import styles from './AssignedMember-Field.module.scss'
import SelectUserAutocomplete from '../../SelectUserAutocomplete'

const AssignedMemberField = ({ challenge, onChange, assignedMemberDetails, readOnly }) => {
const AssignedMemberField = ({ challenge, onAssignSelf, onChange, assignedMemberDetails, readOnly }) => {
const value = assignedMemberDetails ? {
// if we know assigned member details, then show user `handle`, otherwise fallback to `userId`
label: assignedMemberDetails.handle,
value: assignedMemberDetails.userId + ''
} : null

return (
<div className={styles.row}>
<div className={cn(styles.field, styles.col1)}>
Expand All @@ -28,6 +29,12 @@ const AssignedMemberField = ({ challenge, onChange, assignedMemberDetails, readO
/>
)}
</div>
<div className={styles.assignSelfField}>
<a href='#' onClick={(e) => {
e.preventDefault()
onAssignSelf()
}}>Assign to me</a>
</div>
</div>
)
}
Expand All @@ -41,7 +48,8 @@ AssignedMemberField.propTypes = {
challenge: PropTypes.shape().isRequired,
onChange: PropTypes.func,
assignedMemberDetails: PropTypes.shape(),
readOnly: PropTypes.bool
readOnly: PropTypes.bool,
onAssignSelf: PropTypes.func
}

export default AssignedMemberField
21 changes: 20 additions & 1 deletion src/components/ChallengeEditor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ class ChallengeEditor extends Component {
this.onUpdateOthers = this.onUpdateOthers.bind(this)
this.onUpdateCheckbox = this.onUpdateCheckbox.bind(this)
this.onUpdateAssignedMember = this.onUpdateAssignedMember.bind(this)
this.onAssignSelf = this.onAssignSelf.bind(this)
this.addFileType = this.addFileType.bind(this)
this.removeFileType = this.removeFileType.bind(this)
this.updateFileTypesMetadata = this.updateFileTypesMetadata.bind(this)
Expand Down Expand Up @@ -335,6 +336,22 @@ class ChallengeEditor extends Component {
})
}

/**
* Update Assigned Member to Current User
*/
onAssignSelf () {
const { loggedInUser } = this.props

const assignedMemberDetails = {
handle: loggedInUser.handle,
userId: loggedInUser.userId
}

this.setState({
assignedMemberDetails
})
}

/**
* Update Single Select
* @param option The select option
Expand Down Expand Up @@ -1326,6 +1343,7 @@ class ChallengeEditor extends Component {
challenge={challenge}
onChange={this.onUpdateAssignedMember}
assignedMemberDetails={assignedMemberDetails}
onAssignSelf={this.onAssignSelf}
/>
)}
<CopilotField challenge={challenge} copilots={metadata.members} onUpdateOthers={this.onUpdateOthers} />
Expand Down Expand Up @@ -1469,7 +1487,8 @@ ChallengeEditor.propTypes = {
updateChallengeDetails: PropTypes.func.isRequired,
createChallenge: PropTypes.func,
replaceResourceInRole: PropTypes.func,
partiallyUpdateChallengeDetails: PropTypes.func.isRequired
partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
loggedInUser: PropTypes.shape().isRequired
}

export default withRouter(ChallengeEditor)
4 changes: 3 additions & 1 deletion src/containers/ChallengeEditor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ class ChallengeEditor extends Component {
updateChallengeDetails,
partiallyUpdateChallengeDetails,
createChallenge,
replaceResourceInRole
replaceResourceInRole,
loggedInUser
// members
} = this.props
const {
Expand Down Expand Up @@ -335,6 +336,7 @@ class ChallengeEditor extends Component {
updateChallengeDetails={updateChallengeDetails}
replaceResourceInRole={replaceResourceInRole}
partiallyUpdateChallengeDetails={partiallyUpdateChallengeDetails}
loggedInUser={loggedInUser}
/>
))
} />
Expand Down