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

[CORL-1180] Moderation + Editing Improvements (#3020)

Browse Source 
* fix: handle moderating edited comments better

* fix: add back deleted audit trail entry

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Wyatt Johnson
2020-07-16 19:59:51 +00:00
committed by GitHub
co-authored by kodiakhq[bot]
parent 4f5c0e285c
commit 5b589bfe2b
9 changed files with 98 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/client/admin/mutations/ApproveCommentMutation.ts
+17 -2
View File
@@ -47,7 +47,7 @@ const ApproveCommentMutation = createMutation(
}
}
}
...ModeratedByContainer_comment
...ModerateCardContainer_comment
}
moderationQueues(
storyID: $storyID
@@ -83,7 +83,22 @@ const ApproveCommentMutation = createMutation(
proxy.setValue("APPROVED", "status");
proxy.setValue(true, "viewerDidModerate");
},
updater: (store) => {
updater: (store, data) => {
// If no comment came back or the returned comment status was the same,
// don't remove it from the connections!
if (
!data.approveComment ||
!data.approveComment.comment ||
data.approveComment.comment.status !== "APPROVED"
) {
return;
}
// Ensure that the comment retains the viewerDidModerate state after it
// comes back from the update.
const proxy = store.get(input.commentID)!;
proxy.setValue(true, "viewerDidModerate");
const connections = [
getQueueConnection(
store,
src/core/client/admin/mutations/RejectCommentMutation.ts
+17 -2
View File
@@ -47,7 +47,7 @@ const RejectCommentMutation = createMutation(
}
}
}
...ModeratedByContainer_comment
...ModerateCardContainer_comment
}
moderationQueues(
storyID: $storyID
@@ -83,7 +83,22 @@ const RejectCommentMutation = createMutation(
proxy.setValue("REJECTED", "status");
proxy.setValue(true, "viewerDidModerate");
},
updater: (store) => {
updater: (store, data) => {
// If no comment came back or the returned comment status was the same,
// don't remove it from the connections!
if (
!data.rejectComment ||
!data.rejectComment.comment ||
data.rejectComment.comment.status !== "REJECTED"
) {
return;
}
// Ensure that the comment retains the viewerDidModerate state after it
// comes back from the update.
const proxy = store.get(input.commentID)!;
proxy.setValue(true, "viewerDidModerate");
const connections = [
getQueueConnection(store, "REPORTED", input.storyID),
getQueueConnection(store, "PENDING", input.storyID),
src/core/client/admin/test/moderate/regularQueue.spec.tsx
+2 -2
View File
@@ -375,7 +375,7 @@ it("approves comment in reported queue", async () => {
});
return {
comment: {
id: reportedComments[0].id,
...reportedComments[0],
status: GQLCOMMENT_STATUS.APPROVED,
statusHistory: {
edges: [
@@ -473,7 +473,7 @@ it("rejects comment in reported queue", async () => {
});
return {
comment: {
id: reportedComments[0].id,
...reportedComments[0],
status: GQLCOMMENT_STATUS.REJECTED,
statusHistory: {
edges: [
src/core/client/admin/test/moderate/rejectedQueue.spec.tsx
+1 -1
View File
@@ -245,7 +245,7 @@ it("approves comment in rejected queue", async () => {
});
return {
comment: {
id: rejectedComments[0].id,
...rejectedComments[0],
status: GQLCOMMENT_STATUS.APPROVED,
statusHistory: {
edges: [
src/core/client/admin/test/moderate/singleComment.spec.tsx
+2 -3
View File
@@ -95,7 +95,7 @@ it("approves single comment", async () => {
});
return {
comment: {
id: comment.id,
...comment,
status: GQLCOMMENT_STATUS.APPROVED,
statusHistory: {
edges: [
@@ -148,9 +148,8 @@ it("rejects single comment", async () => {
});
return {
comment: {
id: comment.id,
...comment,
status: GQLCOMMENT_STATUS.REJECTED,
author: comment.author,
statusHistory: {
edges: [
{