Skip to content

Commit 001e9ac

Browse files
committed
1 parent af4884b commit 001e9ac

File tree

4 files changed

+34
-23
lines changed

4 files changed

+34
-23
lines changed

src/components/ChallengeEditor/AssignedMember-Field/AssignedMember-Field.module.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@
2424
}
2525

2626
&.col1 {
27-
max-width: 185px;
28-
min-width: 185px;
27+
width: 100px;
2928
margin-right: 14px;
3029
white-space: nowrap;
3130
display: flex;
3231
align-items: center;
32+
33+
&.showAssignToMe {
34+
width: 185px;
35+
}
3336
}
3437

3538
&.col2 {

src/components/ChallengeEditor/AssignedMember-Field/index.js

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,15 @@ import cn from 'classnames'
77
import styles from './AssignedMember-Field.module.scss'
88
import SelectUserAutocomplete from '../../SelectUserAutocomplete'
99

10-
const AssignedMemberField = ({ challenge, onAssignSelf, onChange, assignedMemberDetails, readOnly }) => {
10+
const AssignedMemberField = ({
11+
challenge,
12+
onAssignSelf,
13+
onChange,
14+
assignedMemberDetails,
15+
readOnly,
16+
showAssignToMe,
17+
label
18+
}) => {
1119
const value = assignedMemberDetails ? {
1220
// if we know assigned member details, then show user `handle`, otherwise fallback to `userId`
1321
label: assignedMemberDetails.handle,
@@ -16,8 +24,14 @@ const AssignedMemberField = ({ challenge, onAssignSelf, onChange, assignedMember
1624

1725
return (
1826
<div className={styles.row}>
19-
<div className={cn(styles.field, styles.col1)}>
20-
<label htmlFor='assignedMember'>Assigned Member :</label>
27+
<div className={cn(
28+
styles.field,
29+
styles.col1,
30+
{
31+
[styles.showAssignToMe]: showAssignToMe
32+
}
33+
)}>
34+
<label htmlFor='assignedMember'>{label} :</label>
2135
</div>
2236
<div className={cn(styles.field, styles.col2)}>
2337
{readOnly ? (
@@ -30,29 +44,33 @@ const AssignedMemberField = ({ challenge, onAssignSelf, onChange, assignedMember
3044
)}
3145
</div>
3246
{
33-
!readOnly &&
34-
<div className={styles.assignSelfField}>
47+
(!readOnly && showAssignToMe)
48+
? (<div className={styles.assignSelfField}>
3549
<a href='#' onClick={(e) => {
3650
e.preventDefault()
3751
onAssignSelf()
3852
}}>Assign to me</a>
39-
</div>
53+
</div>) : null
4054
}
4155
</div>
4256
)
4357
}
4458

4559
AssignedMemberField.defaultProps = {
4660
assignedMemberDetails: null,
47-
readOnly: false
61+
readOnly: false,
62+
showAssignToMe: true,
63+
label: 'Assigned Member'
4864
}
4965

5066
AssignedMemberField.propTypes = {
5167
challenge: PropTypes.shape().isRequired,
5268
onChange: PropTypes.func,
5369
assignedMemberDetails: PropTypes.shape(),
5470
readOnly: PropTypes.bool,
55-
onAssignSelf: PropTypes.func
71+
showAssignToMe: PropTypes.bool,
72+
onAssignSelf: PropTypes.func,
73+
label: PropTypes.string
5674
}
5775

5876
export default AssignedMemberField

src/components/ChallengeEditor/ResourcesAdd/index.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,8 @@ const ResourcesAdd = ({
6666
setAssignedMemberDetails(null)
6767
}
6868
}}
69-
onAssignSelf={rs => {
70-
const assignedMemberDetails = {
71-
handle: loggedInUser.handle,
72-
userId: loggedInUser.userId,
73-
email: loggedInUser.email
74-
}
75-
76-
setAssignedMemberDetails({
77-
assignedMemberDetails
78-
})
79-
}}
69+
showAssignToMe={false}
70+
label='Member'
8071
/>
8172

8273
<div className={styles.fieldContainer}>

src/components/ChallengeEditor/ResourcesAdd/styles.module.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@
7777
margin: 30px 30px 0 30px;
7878

7979
.field {
80-
max-width: 185px;
81-
min-width: 185px;
80+
width: 100px;
8281
margin-right: 14px;
8382
white-space: nowrap;
8483
display: flex;

0 commit comments

Comments
 (0)