Skip to content

Commit 6bcc459

Browse files
nick-funknick-funk
authored
Merge pull request #4766 from coralproject/hotfix/revert-hidden-count-descendents-fix
[HOTFIX 9.9.2] revert hidden count descendents fix
2 parents 65ac587 + b136a0d commit 6bcc459

File tree

20 files changed

+28
-309
lines changed

20 files changed

+28
-309
lines changed

‎client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coralproject/talk",
3-
"version": "9.9.1",
3+
"version": "9.9.2",
44
"author": "The Coral Project",
55
"homepage": "https://coralproject.net/",
66
"sideEffects": [

‎client/src/core/client/framework/testHelpers/denormalize.ts

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ export function denormalizeStory(story: Fixture<GQLStory>) {
7979
commentCounts: {
8080
...story.commentCounts,
8181
totalPublished: commentEdges.length,
82-
totalPublishedAndVisible: commentEdges.length,
8382
tags: {
8483
...(story.commentCounts && story.commentCounts.tags),
8584
FEATURED: featuredCommentsCount,

‎client/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx

+7
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,13 @@ const enhanced = withPaginationContainer<
645645
}
646646
mode
647647
}
648+
commentCounts {
649+
totalPublished
650+
tags {
651+
REVIEW
652+
QUESTION
653+
}
654+
}
648655
comments(
649656
first: $count
650657
after: $cursor

‎client/src/core/client/stream/tabs/Comments/Stream/PreviousCountSpyContainer.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const PreviousCountSpyContainer: FunctionComponent<Props> = ({
5151
}
5252

5353
// value is the current comment count as a string to be stored in storage.
54-
const value = story.commentCounts.totalPublishedAndVisible.toString();
54+
const value = story.commentCounts.totalPublished.toString();
5555

5656
/**
5757
* update will take the current published comment count and update it in
@@ -71,7 +71,7 @@ const PreviousCountSpyContainer: FunctionComponent<Props> = ({
7171
}, [
7272
featureFlags,
7373
localStorage,
74-
story.commentCounts.totalPublishedAndVisible,
74+
story.commentCounts.totalPublished,
7575
story.id,
7676
story.isClosed,
7777
]);
@@ -85,7 +85,7 @@ const enhanced = withFragmentContainer<Props>({
8585
id
8686
isClosed
8787
commentCounts {
88-
totalPublishedAndVisible
88+
totalPublished
8989
}
9090
}
9191
`,

‎client/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export const StreamContainer: FunctionComponent<Props> = (props) => {
178178
const warned = !!props.viewer?.status.current.includes(GQLUSER_STATUS.WARNED);
179179
const modMessaged = !!props.viewer?.status.modMessage.active;
180180

181-
const allCommentsCount = props.story.commentCounts.totalPublishedAndVisible;
181+
const allCommentsCount = props.story.commentCounts.totalPublished;
182182
const featuredCommentsCount = props.story.commentCounts.tags.FEATURED;
183183
const unansweredCommentsCount = props.story.commentCounts.tags.UNANSWERED;
184184

@@ -631,7 +631,7 @@ const enhanced = withFragmentContainer<Props>({
631631
mode
632632
}
633633
commentCounts {
634-
totalPublishedAndVisible
634+
totalPublished
635635
tags {
636636
FEATURED
637637
UNANSWERED

‎client/src/core/client/stream/tabs/Comments/helpers/incrementStoryCommentCounts.ts

+4-7
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@ export default function incrementStoryCommentCounts(
1717
if (story) {
1818
const commentCounts = story.getLinkedRecord("commentCounts");
1919
if (commentCounts) {
20-
// Increment totalPublishedAndVisible.
21-
const currentTotalPublishedAndVisible = commentCounts.getValue(
22-
"totalPublishedAndVisible"
20+
// Increment totalPublished.
21+
const currentTotalPublished = commentCounts.getValue(
22+
"totalPublished"
2323
) as number;
24-
commentCounts.setValue(
25-
currentTotalPublishedAndVisible + 1,
26-
"totalPublishedAndVisible"
27-
);
24+
commentCounts.setValue(currentTotalPublished + 1, "totalPublished");
2825

2926
// Now increment tag counts.
3027
const commentCountsTags = commentCounts.getLinkedRecord("tags");

‎client/src/core/client/stream/tabs/Discussions/StoryRowContainer.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const StoryRowContainer: FunctionComponent<Props> = ({
5858
CLASSES.discussions.story.commentsCount
5959
)}
6060
>
61-
{story.commentCounts.totalPublishedAndVisible}
61+
{story.commentCounts.totalPublished}
6262
</span>
6363
</Flex>
6464
</Flex>
@@ -81,7 +81,7 @@ const enhanced = withFragmentContainer<Props>({
8181
publishedAt
8282
}
8383
commentCounts {
84-
totalPublishedAndVisible
84+
totalPublished
8585
}
8686
}
8787
`,

‎client/src/core/client/stream/test/fixtures.ts

-1
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,6 @@ export const baseStory = createFixture<GQLStory>({
408408
},
409409
commentCounts: {
410410
totalPublished: 0,
411-
totalPublishedAndVisible: 0,
412411
tags: {
413412
FEATURED: 0,
414413
UNANSWERED: 0,

‎client/src/core/client/test/helpers/fixture.ts

-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ export function createStory(
299299
isArchiving: false,
300300
commentCounts: {
301301
totalPublished: 0,
302-
totalPublishedAndVisible: 0,
303302
tags: {
304303
FEATURED: 0,
305304
UNANSWERED: 0,

‎common/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "common",
3-
"version": "9.9.1",
3+
"version": "9.9.2",
44
"description": "",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "common",
3-
"version": "9.9.1",
3+
"version": "9.9.2",
44
"description": "",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",

‎server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coralproject/talk",
3-
"version": "9.9.1",
3+
"version": "9.9.2",
44
"author": "The Coral Project",
55
"homepage": "https://coralproject.net/",
66
"sideEffects": [

‎server/src/core/server/graph/resolvers/CommentCounts.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
calculateTotalPublishedAndVisibleCommentCount,
3-
calculateTotalPublishedCommentCount,
4-
} from "coral-server/models/comment";
1+
import { calculateTotalPublishedCommentCount } from "coral-server/models/comment";
52
import { Story } from "coral-server/models/story";
63

74
import { GQLCommentCountsTypeResolver } from "coral-server/graph/schema/__generated__/types";
@@ -11,9 +8,6 @@ export type CommentCountsInput = Pick<Story, "commentCounts" | "id">;
118
export const CommentCounts: GQLCommentCountsTypeResolver<CommentCountsInput> = {
129
totalPublished: ({ commentCounts }) =>
1310
calculateTotalPublishedCommentCount(commentCounts.status),
14-
totalPublishedAndVisible: ({ commentCounts }) =>
15-
calculateTotalPublishedAndVisibleCommentCount(commentCounts),
1611
statuses: ({ commentCounts }) => commentCounts.status,
1712
tags: (s, input, ctx) => ctx.loaders.Comments.tagCounts.load(s.id),
18-
relationships: ({ commentCounts }) => commentCounts.relationships,
1913
};

‎server/src/core/server/graph/schema/schema.graphql

-16
Original file line numberDiff line numberDiff line change
@@ -4694,22 +4694,12 @@ type CommentStatusCounts {
46944694
SYSTEM_WITHHELD: Int!
46954695
}
46964696

4697-
type CommentRelationshipCounts {
4698-
PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS: Int!
4699-
}
4700-
47014697
type CommentCounts {
47024698
"""
47034699
totalPublished will return the count of all published Comments.
47044700
"""
47054701
totalPublished: Int!
47064702

4707-
"""
4708-
totalPublishedAndVisible will return the count of all published Comments that are also visible
4709-
in the stream.
4710-
"""
4711-
totalPublishedAndVisible: Int!
4712-
47134703
"""
47144704
tags stores the counts of all the Tags against Comment's on this Story.
47154705
"""
@@ -4719,12 +4709,6 @@ type CommentCounts {
47194709
statuses stores the counts of all the statuses against Comments on this Story.
47204710
"""
47214711
statuses: CommentStatusCounts! @auth(roles: [ADMIN, MODERATOR])
4722-
4723-
"""
4724-
relationships stores the counts of relationships between comments, such as when
4725-
published comments have rejected ancestors
4726-
"""
4727-
relationships: CommentRelationshipCounts!
47284712
}
47294713

47304714
################################################################################

‎server/src/core/server/models/comment/comment.ts

-71
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,6 @@ export interface Comment extends TenantResource {
167167
* from the comment embed API
168168
*/
169169
embeddedAt?: Date;
170-
171-
/**
172-
* rejectedAncestorIDs are the commentIDs of any ancestors of a comment that are rejected
173-
*/
174-
rejectedAncestorIDs?: string[];
175170
}
176171

177172
export type CreateCommentInput = Omit<
@@ -997,42 +992,6 @@ export async function mergeManyCommentStories(
997992
);
998993
}
999994

1000-
export async function addCommentToRejectedAncestors(
1001-
mongo: MongoContext,
1002-
tenantID: string,
1003-
storyID: string,
1004-
commentIDs: string[],
1005-
rejectedCommentID: string
1006-
) {
1007-
const result = await mongo.comments().updateMany(
1008-
{
1009-
tenantID,
1010-
storyID,
1011-
id: { $in: commentIDs },
1012-
},
1013-
{ $push: { rejectedAncestorIDs: rejectedCommentID } }
1014-
);
1015-
return result;
1016-
}
1017-
1018-
export async function removeCommentFromRejectedAncestors(
1019-
mongo: MongoContext,
1020-
tenantID: string,
1021-
storyID: string,
1022-
commentIDs: string[],
1023-
approvedCommentID: string
1024-
) {
1025-
const result = await mongo.comments().updateMany(
1026-
{
1027-
tenantID,
1028-
storyID,
1029-
id: { $in: commentIDs },
1030-
},
1031-
{ $pull: { rejectedAncestorIDs: approvedCommentID } }
1032-
);
1033-
return result;
1034-
}
1035-
1036995
export async function addCommentTag(
1037996
mongo: MongoContext,
1038997
tenantID: string,
@@ -1751,33 +1710,3 @@ export async function retrieveLatestFeaturedCommentForAuthor(
17511710

17521711
return results as Comment[];
17531712
}
1754-
1755-
export async function getDescendantsForComment(
1756-
mongo: MongoContext,
1757-
commentID: string,
1758-
tenantID: string,
1759-
storyID: string
1760-
): Promise<Array<Comment & { descendants: Comment[] }>> {
1761-
const result = await mongo
1762-
.comments()
1763-
.aggregate([
1764-
{
1765-
$match: {
1766-
id: commentID,
1767-
tenantID,
1768-
storyID,
1769-
},
1770-
},
1771-
{
1772-
$graphLookup: {
1773-
from: "comments",
1774-
startWith: "$id",
1775-
connectFromField: "id",
1776-
connectToField: "parentID",
1777-
as: "descendants",
1778-
},
1779-
},
1780-
])
1781-
.toArray();
1782-
return result as Array<Comment & { descendants: Comment[] }>;
1783-
}

‎server/src/core/server/models/comment/counts/counts.ts

-39
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414

1515
import {
1616
createEmptyCommentModerationQueueCounts,
17-
createEmptyCommentRelationshipCounts,
1817
createEmptyCommentStatusCounts,
1918
createEmptyCommentTagCounts,
2019
createEmptyRelatedCommentCounts,
@@ -80,10 +79,6 @@ export interface CommentTagCounts {
8079
tags: GQLCommentTagCounts;
8180
}
8281

83-
export interface CommentRelationshipCounts {
84-
PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS: number;
85-
}
86-
8782
/**
8883
* RelatedCommentCounts stores all the Comment Counts that will be stored on
8984
* each related document (like a Story, or a Site).
@@ -108,12 +103,6 @@ export interface RelatedCommentCounts {
108103
moderationQueue: CommentModerationQueueCounts;
109104

110105
tags: CommentTagCounts;
111-
112-
/**
113-
* relationships stores the counts of relationships between comments, such as when
114-
* published comments have rejected ancestors
115-
*/
116-
relationships: CommentRelationshipCounts;
117106
}
118107

119108
/**
@@ -147,19 +136,6 @@ export function mergeCommentStatusCount(
147136
return mergedStatusCounts;
148137
}
149138

150-
export function mergeCommentRelationshipCounts(
151-
...relationship: CommentRelationshipCounts[]
152-
): CommentRelationshipCounts {
153-
const merged = createEmptyCommentRelationshipCounts();
154-
155-
for (const count of relationship) {
156-
merged.PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS +=
157-
count.PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS;
158-
}
159-
160-
return merged;
161-
}
162-
163139
export function mergeCommentModerationQueueCount(
164140
...moderationQueues: CommentModerationQueueCounts[]
165141
): CommentModerationQueueCounts {
@@ -240,21 +216,6 @@ export function calculateTotalPublishedCommentCount(
240216
);
241217
}
242218

243-
//
244-
245-
export function calculateTotalPublishedAndVisibleCommentCount(
246-
commentCounts: RelatedCommentCounts
247-
) {
248-
const publishedCount = PUBLISHED_STATUSES.reduce(
249-
(total, status) => total + commentCounts.status[status],
250-
0
251-
);
252-
const notVisibleCount =
253-
commentCounts.relationships?.PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS ??
254-
0;
255-
return publishedCount - notVisibleCount;
256-
}
257-
258219
interface RelatedCommentCountsDocument extends Document {
259220
id: string;
260221
tenantID: string;

‎server/src/core/server/models/comment/counts/empty.ts

-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
import {
88
CommentModerationCountsPerQueue,
99
CommentModerationQueueCounts,
10-
CommentRelationshipCounts,
1110
CommentStatusCounts,
1211
CommentTagCounts,
1312
RelatedCommentCounts,
@@ -96,16 +95,11 @@ export function createEmptyCommentTagCounts(): CommentTagCounts {
9695
};
9796
}
9897

99-
export function createEmptyCommentRelationshipCounts(): CommentRelationshipCounts {
100-
return { PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS: 0 };
101-
}
102-
10398
export function createEmptyRelatedCommentCounts(): RelatedCommentCounts {
10499
return {
105100
action: {},
106101
status: createEmptyCommentStatusCounts(),
107102
moderationQueue: createEmptyCommentModerationQueueCounts(),
108103
tags: createEmptyCommentTagCounts(),
109-
relationships: createEmptyCommentRelationshipCounts(),
110104
};
111105
}

0 commit comments

Comments
 (0)