Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Commits on Source (2)
(feat) mature toggle comment poster
· 02de8cf2
Martin Santangelo
authored
Jan 03, 2020
02de8cf2
Merge branch 'feat/add-mature-toggle-comment-poster' into 'release/3.15.0'
· 75a7a614
Brian Hatchet
authored
Jan 07, 2020
Add mature toggle comment poster See merge request
!478
75a7a614
Hide whitespace changes
Inline
Side-by-side
src/comments/CommentList.js
View file @
75a7a614
...
...
@@ -21,6 +21,7 @@ import { observer, inject } from 'mobx-react/native';
import
*
as
Progress
from
'
react-native-progress
'
;
import
Icon
from
'
react-native-vector-icons/Ionicons
'
;
import
IconMC
from
'
react-native-vector-icons/MaterialCommunityIcons
'
;
import
IconMd
from
'
react-native-vector-icons/MaterialIcons
'
;
import
ActionSheet
from
'
react-native-actionsheet
'
;
import
Comment
from
'
./Comment
'
;
...
...
@@ -337,7 +338,17 @@ class CommentList extends React.Component<PropsType, StateType> {
return
(
<
View
>
<
View
style
=
{[
CS
.
rowJustifyCenter
,
CS
.
margin
,
CS
.
padding
,
CS
.
backgroundWhite
,
CS
.
borderRadius12x
,
CS
.
borderGreyed
,
CS
.
borderHair
]}
testID
=
{
this
.
props
.
parent
?
'
CommentParentView
'
:
''
}
>
<
View
style
=
{[
CS
.
rowJustifyCenter
,
CS
.
margin
,
CS
.
padding
,
CS
.
backgroundWhite
,
CS
.
borderRadius12x
,
CS
.
borderGreyed
,
CS
.
borderHair
,
]}
testID
=
{
this
.
props
.
parent
?
'
CommentParentView
'
:
''
}
>
<
Image
source
=
{
avatarImg
}
style
=
{
CmpStyle
.
posterAvatar
}
/
>
<
TextInput
style
=
{[
CS
.
flexContainer
,
CS
.
marginLeft
,
inputStyle
,
{
paddingVertical
:
2
}]}
...
...
@@ -359,8 +370,22 @@ class CommentList extends React.Component<PropsType, StateType> {
(
comments
.
saving
||
attachment
.
checkingVideoLength
)
?
<
ActivityIndicator
size
=
{
'
large
'
}
/>
:
<
View
style
=
{[
CS
.
rowJustifyEnd
,
CS
.
centered
]}
>
<
TouchableOpacity
onPress
=
{
this
.
showAttachment
}
style
=
{
CS
.
paddingRight2x
}
><
Icon
name
=
"
md-attach
"
size
=
{
24
}
style
=
{
CS
.
paddingRight2x
}
/></
TouchableOpacity
>
<
TouchableOpacity
onPress
=
{
this
.
postComment
}
style
=
{
CS
.
paddingRight2x
}
testID
=
'
PostCommentButton
'
><
Icon
name
=
"
md-send
"
size
=
{
24
}
/></
TouchableOpacity
>
<
TouchableOpacity
onPress
=
{
this
.
showAttachment
}
style
=
{
CS
.
paddingRight2x
}
>
<
Icon
name
=
"
md-attach
"
size
=
{
24
}
style
=
{[
CS
.
paddingRight2x
,
CS
.
colorDarkGreyed
]}
/
>
<
/TouchableOpacity
>
<
TouchableOpacity
onPress
=
{
comments
.
toggleMature
}
style
=
{
CS
.
paddingRight2x
}
>
<
IconMd
name
=
"
explicit
"
size
=
{
24
}
style
=
{[
CS
.
paddingRight2x
,
comments
.
mature
?
CS
.
colorDanger
:
CS
.
colorDarkGreyed
]}
/
>
<
/TouchableOpacity
>
<
TouchableOpacity
onPress
=
{
this
.
postComment
}
style
=
{
CS
.
paddingRight2x
}
testID
=
"
PostCommentButton
"
>
<
Icon
name
=
"
md-send
"
size
=
{
24
}
style
=
{
CS
.
colorDarkGreyed
}
/
>
<
/TouchableOpacity
>
<
/View
>
}
<
/View
>
...
...
src/comments/CommentsStore.js
View file @
75a7a614
...
...
@@ -39,6 +39,7 @@ export default class CommentsStore {
@
observable
loaded
=
false
;
@
observable
saving
=
false
;
@
observable
text
=
''
;
@
observable
mature
=
0
;
@
observable
loadingPrevious
=
false
;
@
observable
loadingNext
=
false
;
...
...
@@ -71,6 +72,11 @@ export default class CommentsStore {
return
(
this
.
parent
&&
this
.
parent
.
child_path
)
?
this
.
parent
.
child_path
:
'
0:0:0
'
;
}
@
action
toggleMature
=
()
=>
{
this
.
mature
=
this
.
mature
?
0
:
1
;
};
/**
* Set the entity
* @param {object} entity
...
...
@@ -332,8 +338,9 @@ export default class CommentsStore {
const
comment
=
{
comment
:
this
.
text
,
parent_path
:
this
.
getParentPath
()
}
mature
:
this
.
mature
,
parent_path
:
this
.
getParentPath
(),
};
if
(
this
.
attachment
.
guid
)
{
comment
.
attachment_guid
=
this
.
attachment
.
guid
;
...
...
@@ -347,7 +354,6 @@ export default class CommentsStore {
Object
.
assign
(
comment
,
entity
.
getClientMetadata
());
try
{
const
data
=
await
postComment
(
this
.
guid
,
comment
);
this
.
pushComment
(
data
.
comment
);
...
...