wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-09 11:28:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Best tag working, only Optimistic Missing

Browse Source
This commit is contained in:
Belen Curcio
2017-05-17 11:57:51 -03:00
parent fb0e89485c
commit 6664f73d2d
9 changed files with 44 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/services/fragmentMatcher.js
+1 -2
View File
@@ -26,8 +26,7 @@ const fm = new IntrospectionFragmentMatcher({
{name: 'SetUserStatusResponse'},
{name: 'SuspendUserResponse'},
{name: 'SetCommentStatusResponse'},
{name: 'AddCommentTagResponse'},
{name: 'RemoveCommentTagResponse'},
{name: 'ModifyTagResponse'},
{name: 'IgnoreUserResponse'},
{name: 'StopIgnoringUserResponse'}
]
client/coral-embed-stream/src/components/Comment.js
+12 -10
View File
@@ -109,10 +109,10 @@ class Comment extends React.Component {
commentIsIgnored: React.PropTypes.func,
// dispatch action to add a tag to a comment
addCommentTag: React.PropTypes.func,
addTag: React.PropTypes.func,
// dispatch action to remove a tag from a comment
removeCommentTag: React.PropTypes.func,
removeTag: React.PropTypes.func,
// dispatch action to ignore another user
ignoreUser: React.PropTypes.func,
@@ -171,8 +171,8 @@ class Comment extends React.Component {
setActiveReplyBox,
activeReplyBox,
deleteAction,
addCommentTag,
removeCommentTag,
addTag,
removeTag,
ignoreUser,
disableReply,
commentIsIgnored,
@@ -213,18 +213,20 @@ class Comment extends React.Component {
const addBestTag = notifyOnError(
() =>
addCommentTag({
addTag({
id: comment.id,
tag: BEST_TAG
name: BEST_TAG,
asset_id: asset.id
}),
() => 'Failed to tag comment as best'
);
const removeBestTag = notifyOnError(
() =>
removeCommentTag({
removeTag({
id: comment.id,
tag: BEST_TAG
name: BEST_TAG,
asset_id: asset.id
}),
() => 'Failed to remove best comment tag'
);
@@ -394,8 +396,8 @@ class Comment extends React.Component {
currentUser={currentUser}
postFlag={postFlag}
deleteAction={deleteAction}
addCommentTag={addCommentTag}
removeCommentTag={removeCommentTag}
addTag={addTag}
removeTag={removeTag}
ignoreUser={ignoreUser}
charCountEnable={charCountEnable}
maxCharCount={maxCharCount}
client/coral-embed-stream/src/components/Stream.js
+6 -6
View File
@@ -33,8 +33,8 @@ class Stream extends React.Component {
loadMore,
deleteAction,
showSignInDialog,
addCommentTag,
removeCommentTag,
addTag,
removeTag,
pluginProps,
ignoreUser,
auth: {loggedIn, isAdmin, user},
@@ -166,8 +166,8 @@ class Stream extends React.Component {
currentUser={user}
postFlag={postFlag}
postDontAgree={postDontAgree}
addCommentTag={addCommentTag}
removeCommentTag={removeCommentTag}
addTag={addTag}
removeTag={removeTag}
ignoreUser={ignoreUser}
commentIsIgnored={commentIsIgnored}
loadMore={loadMore}
@@ -201,10 +201,10 @@ Stream.propTypes = {
postComment: PropTypes.func.isRequired,
// dispatch action to add a tag to a comment
addCommentTag: PropTypes.func,
addTag: PropTypes.func,
// dispatch action to remove a tag from a comment
removeCommentTag: PropTypes.func,
removeTag: PropTypes.func,
// dispatch action to ignore another user
ignoreUser: React.PropTypes.func,
client/coral-embed-stream/src/containers/Stream.js
+3 -4
View File
@@ -8,7 +8,7 @@ import isNil from 'lodash/isNil';
import {NEW_COMMENT_COUNT_POLL_INTERVAL} from '../constants/stream';
import {
withPostComment, withPostFlag, withPostDontAgree, withDeleteAction,
withAddCommentTag, withRemoveCommentTag, withIgnoreUser, withEditComment,
withAddTag, withRemoveTag, withIgnoreUser, withEditComment,
} from 'coral-framework/graphql/mutations';
import {notificationActions, authActions} from 'coral-framework';
@@ -243,10 +243,9 @@ export default compose(
withPostComment,
withPostFlag,
withPostDontAgree,
withAddCommentTag,
withRemoveCommentTag,
withAddTag,
withRemoveTag,
withIgnoreUser,
withDeleteAction,
withEditComment,
)(StreamContainer);
client/coral-embed-stream/src/graphql/index.js
+2 -33
View File
@@ -28,39 +28,8 @@ const extension = {
}
}
`,
RemoveCommentTagResponse: gql`
fragment CoralEmbedStream_RemoveCommentTagResponse on RemoveCommentTagResponse {
comment {
id
tags {
tag {
name
created_at
}
assigned_by {
id
}
}
}
errors {
translation_key
}
}
`,
AddCommentTagResponse: gql`
fragment CoralEmbedStream_AddCommentTagResponse on AddCommentTagResponse {
comment {
id
tags {
tag {
name
created_at
}
assigned_by {
id
}
}
}
ModifyTagResponse: gql`
fragment CoralEmbedStream_ModifyTagResponse on ModifyTagResponse {
errors {
translation_key
}
client/coral-framework/graphql/mutations.js
+16 -12
View File
@@ -95,39 +95,43 @@ export const withDeleteAction = withMutation(
}}),
});
export const withAddCommentTag = withMutation(
export const withAddTag = withMutation(
gql`
mutation AddCommentTag($id: ID!, $tag: String!) {
addCommentTag(id:$id, tag:$tag) {
...AddCommentTagResponse
mutation AddCommentTag($id: ID!, $asset_id: ID!, $name: String!) {
addTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
...ModifyTagResponse
}
}
`, {
props: ({mutate}) => ({
addCommentTag: ({id, tag}) => {
addTag: ({id, name, asset_id}) => {
return mutate({
variables: {
id,
tag
name,
asset_id
}
});
}}),
});
export const withRemoveCommentTag = withMutation(
export const withRemoveTag = withMutation(
gql`
mutation RemoveCommentTag($id: ID!, $tag: String!) {
removeCommentTag(id:$id, tag:$tag) {
...RemoveCommentTagResponse
mutation RemoveCommentTag($id: ID!, $asset_id: ID!, $name: String!) {
removeTag(tag: {name: $name, id: $id, item_type: COMMENTS, asset_id: $asset_id}) {
errors {
translation_key
}
}
}
`, {
props: ({mutate}) => ({
removeCommentTag: ({id, tag}) => {
removeTag: ({id, name, asset_id}) => {
return mutate({
variables: {
id,
tag
name,
asset_id
}
});
}}),
client/coral-framework/graphql/mutations/addCommentTag.graphql
-15
View File
@@ -1,15 +0,0 @@
mutation AddCommentTag ($id: ID!, $tag: String!) {
addCommentTag(id:$id, tag:$tag) {
comment {
id
tags {
tag {
name
}
}
}
errors {
translation_key
}
}
}
client/coral-framework/graphql/mutations/removeCommentTag.graphql
-15
View File
@@ -1,15 +0,0 @@
mutation RemoveCommentTag ($id: ID!, $tag: String!) {
removeCommentTag(id:$id, tag:$tag) {
comment {
id
tags {
tag {
name
}
}
}
errors {
translation_key
}
}
}
client/coral-plugin-best/BestButton.js
+4 -4
View File
@@ -6,10 +6,10 @@ import classnames from 'classnames';
// tag string for best comments
export const BEST_TAG = 'BEST';
export const commentIsBest = ({tags} = {}) => {
const isBest = Array.isArray(tags) && tags.some(t => t.name === BEST_TAG);
return isBest;
};
export const commentIsBest = ({tags} = {}) => tags.some(t => t.tag.name === BEST_TAG);
// const commentIsBest = tags => !!tags.filter(i => i.tag.name === 'BEST_TAG).length;
const name = 'coral-plugin-best';
const lang = new I18n(translations);