Merge pull request #4766 from coralproject/hotfix/revert-hidden-count-descendents-fix

nick-funk · web-flow · commit 6bcc459e95e5 · 2025-03-27T12:56:41.000-06:00
[HOTFIX 9.9.2] revert hidden count descendents fix
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.9.1",
+  "version": "9.9.2",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
diff --git a/client/src/core/client/framework/testHelpers/denormalize.ts b/client/src/core/client/framework/testHelpers/denormalize.ts
@@ -79,7 +79,6 @@ export function denormalizeStory(story: Fixture<GQLStory>) {
     commentCounts: {
       ...story.commentCounts,
       totalPublished: commentEdges.length,
-      totalPublishedAndVisible: commentEdges.length,
       tags: {
         ...(story.commentCounts && story.commentCounts.tags),
         FEATURED: featuredCommentsCount,
diff --git a/client/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx b/client/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx
@@ -645,6 +645,13 @@ const enhanced = withPaginationContainer<
           }
           mode
         }
+        commentCounts {
+          totalPublished
+          tags {
+            REVIEW
+            QUESTION
+          }
+        }
         comments(
           first: $count
           after: $cursor
diff --git a/client/src/core/client/stream/tabs/Comments/Stream/PreviousCountSpyContainer.tsx b/client/src/core/client/stream/tabs/Comments/Stream/PreviousCountSpyContainer.tsx
@@ -51,7 +51,7 @@ const PreviousCountSpyContainer: FunctionComponent<Props> = ({
     }
 
     // value is the current comment count as a string to be stored in storage.
-    const value = story.commentCounts.totalPublishedAndVisible.toString();
+    const value = story.commentCounts.totalPublished.toString();
 
     /**
      * update will take the current published comment count and update it in
@@ -71,7 +71,7 @@ const PreviousCountSpyContainer: FunctionComponent<Props> = ({
   }, [
     featureFlags,
     localStorage,
-    story.commentCounts.totalPublishedAndVisible,
+    story.commentCounts.totalPublished,
     story.id,
     story.isClosed,
   ]);
@@ -85,7 +85,7 @@ const enhanced = withFragmentContainer<Props>({
       id
       isClosed
       commentCounts {
-        totalPublishedAndVisible
+        totalPublished
       }
     }
   `,
diff --git a/client/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx b/client/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx
@@ -178,7 +178,7 @@ export const StreamContainer: FunctionComponent<Props> = (props) => {
   const warned = !!props.viewer?.status.current.includes(GQLUSER_STATUS.WARNED);
   const modMessaged = !!props.viewer?.status.modMessage.active;
 
-  const allCommentsCount = props.story.commentCounts.totalPublishedAndVisible;
+  const allCommentsCount = props.story.commentCounts.totalPublished;
   const featuredCommentsCount = props.story.commentCounts.tags.FEATURED;
   const unansweredCommentsCount = props.story.commentCounts.tags.UNANSWERED;
 
@@ -631,7 +631,7 @@ const enhanced = withFragmentContainer<Props>({
         mode
       }
       commentCounts {
-        totalPublishedAndVisible
+        totalPublished
         tags {
           FEATURED
           UNANSWERED
diff --git a/client/src/core/client/stream/tabs/Comments/helpers/incrementStoryCommentCounts.ts b/client/src/core/client/stream/tabs/Comments/helpers/incrementStoryCommentCounts.ts
@@ -17,14 +17,11 @@ export default function incrementStoryCommentCounts(
   if (story) {
     const commentCounts = story.getLinkedRecord("commentCounts");
     if (commentCounts) {
-      // Increment totalPublishedAndVisible.
-      const currentTotalPublishedAndVisible = commentCounts.getValue(
-        "totalPublishedAndVisible"
+      // Increment totalPublished.
+      const currentTotalPublished = commentCounts.getValue(
+        "totalPublished"
       ) as number;
-      commentCounts.setValue(
-        currentTotalPublishedAndVisible + 1,
-        "totalPublishedAndVisible"
-      );
+      commentCounts.setValue(currentTotalPublished + 1, "totalPublished");
 
       // Now increment tag counts.
       const commentCountsTags = commentCounts.getLinkedRecord("tags");
diff --git a/client/src/core/client/stream/tabs/Discussions/StoryRowContainer.tsx b/client/src/core/client/stream/tabs/Discussions/StoryRowContainer.tsx
@@ -58,7 +58,7 @@ const StoryRowContainer: FunctionComponent<Props> = ({
                 CLASSES.discussions.story.commentsCount
               )}
             >
-              {story.commentCounts.totalPublishedAndVisible}
+              {story.commentCounts.totalPublished}
             </span>
           </Flex>
         </Flex>
@@ -81,7 +81,7 @@ const enhanced = withFragmentContainer<Props>({
         publishedAt
       }
       commentCounts {
-        totalPublishedAndVisible
+        totalPublished
       }
     }
   `,
diff --git a/client/src/core/client/stream/test/fixtures.ts b/client/src/core/client/stream/test/fixtures.ts
@@ -408,7 +408,6 @@ export const baseStory = createFixture<GQLStory>({
   },
   commentCounts: {
     totalPublished: 0,
-    totalPublishedAndVisible: 0,
     tags: {
       FEATURED: 0,
       UNANSWERED: 0,
diff --git a/client/src/core/client/test/helpers/fixture.ts b/client/src/core/client/test/helpers/fixture.ts
@@ -299,7 +299,6 @@ export function createStory(
       isArchiving: false,
       commentCounts: {
         totalPublished: 0,
-        totalPublishedAndVisible: 0,
         tags: {
           FEATURED: 0,
           UNANSWERED: 0,
diff --git a/common/package.json b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.9.1",
+  "version": "9.9.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/config/package.json b/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.9.1",
+  "version": "9.9.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.9.1",
+  "version": "9.9.2",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
diff --git a/server/src/core/server/graph/resolvers/CommentCounts.ts b/server/src/core/server/graph/resolvers/CommentCounts.ts
@@ -1,7 +1,4 @@
-import {
-  calculateTotalPublishedAndVisibleCommentCount,
-  calculateTotalPublishedCommentCount,
-} from "coral-server/models/comment";
+import { calculateTotalPublishedCommentCount } from "coral-server/models/comment";
 import { Story } from "coral-server/models/story";
 
 import { GQLCommentCountsTypeResolver } from "coral-server/graph/schema/__generated__/types";
@@ -11,9 +8,6 @@ export type CommentCountsInput = Pick<Story, "commentCounts" | "id">;
 export const CommentCounts: GQLCommentCountsTypeResolver<CommentCountsInput> = {
   totalPublished: ({ commentCounts }) =>
     calculateTotalPublishedCommentCount(commentCounts.status),
-  totalPublishedAndVisible: ({ commentCounts }) =>
-    calculateTotalPublishedAndVisibleCommentCount(commentCounts),
   statuses: ({ commentCounts }) => commentCounts.status,
   tags: (s, input, ctx) => ctx.loaders.Comments.tagCounts.load(s.id),
-  relationships: ({ commentCounts }) => commentCounts.relationships,
 };
diff --git a/server/src/core/server/graph/schema/schema.graphql b/server/src/core/server/graph/schema/schema.graphql
@@ -4694,22 +4694,12 @@ type CommentStatusCounts {
   SYSTEM_WITHHELD: Int!
 }
 
-type CommentRelationshipCounts {
-  PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS: Int!
-}
-
 type CommentCounts {
   """
   totalPublished will return the count of all published Comments.
   """
   totalPublished: Int!
 
-  """
-  totalPublishedAndVisible will return the count of all published Comments that are also visible
-  in the stream.
-  """
-  totalPublishedAndVisible: Int!
-
   """
   tags stores the counts of all the Tags against Comment's on this Story.
   """
@@ -4719,12 +4709,6 @@ type CommentCounts {
   statuses stores the counts of all the statuses against Comments on this Story.
   """
   statuses: CommentStatusCounts! @auth(roles: [ADMIN, MODERATOR])
-
-  """
-  relationships stores the counts of relationships between comments, such as when
-  published comments have rejected ancestors
-  """
-  relationships: CommentRelationshipCounts!
 }
 
 ################################################################################
diff --git a/server/src/core/server/models/comment/comment.ts b/server/src/core/server/models/comment/comment.ts
@@ -167,11 +167,6 @@ export interface Comment extends TenantResource {
    * from the comment embed API
    */
   embeddedAt?: Date;
-
-  /**
-   * rejectedAncestorIDs are the commentIDs of any ancestors of a comment that are rejected
-   */
-  rejectedAncestorIDs?: string[];
 }
 
 export type CreateCommentInput = Omit<
@@ -997,42 +992,6 @@ export async function mergeManyCommentStories(
   );
 }
 
-export async function addCommentToRejectedAncestors(
-  mongo: MongoContext,
-  tenantID: string,
-  storyID: string,
-  commentIDs: string[],
-  rejectedCommentID: string
-) {
-  const result = await mongo.comments().updateMany(
-    {
-      tenantID,
-      storyID,
-      id: { $in: commentIDs },
-    },
-    { $push: { rejectedAncestorIDs: rejectedCommentID } }
-  );
-  return result;
-}
-
-export async function removeCommentFromRejectedAncestors(
-  mongo: MongoContext,
-  tenantID: string,
-  storyID: string,
-  commentIDs: string[],
-  approvedCommentID: string
-) {
-  const result = await mongo.comments().updateMany(
-    {
-      tenantID,
-      storyID,
-      id: { $in: commentIDs },
-    },
-    { $pull: { rejectedAncestorIDs: approvedCommentID } }
-  );
-  return result;
-}
-
 export async function addCommentTag(
   mongo: MongoContext,
   tenantID: string,
@@ -1751,33 +1710,3 @@ export async function retrieveLatestFeaturedCommentForAuthor(
 
   return results as Comment[];
 }
-
-export async function getDescendantsForComment(
-  mongo: MongoContext,
-  commentID: string,
-  tenantID: string,
-  storyID: string
-): Promise<Array<Comment & { descendants: Comment[] }>> {
-  const result = await mongo
-    .comments()
-    .aggregate([
-      {
-        $match: {
-          id: commentID,
-          tenantID,
-          storyID,
-        },
-      },
-      {
-        $graphLookup: {
-          from: "comments",
-          startWith: "$id",
-          connectFromField: "id",
-          connectToField: "parentID",
-          as: "descendants",
-        },
-      },
-    ])
-    .toArray();
-  return result as Array<Comment & { descendants: Comment[] }>;
-}
diff --git a/server/src/core/server/models/comment/counts/counts.ts b/server/src/core/server/models/comment/counts/counts.ts
@@ -14,7 +14,6 @@ import {
 
 import {
   createEmptyCommentModerationQueueCounts,
-  createEmptyCommentRelationshipCounts,
   createEmptyCommentStatusCounts,
   createEmptyCommentTagCounts,
   createEmptyRelatedCommentCounts,
@@ -80,10 +79,6 @@ export interface CommentTagCounts {
   tags: GQLCommentTagCounts;
 }
 
-export interface CommentRelationshipCounts {
-  PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS: number;
-}
-
 /**
  * RelatedCommentCounts stores all the Comment Counts that will be stored on
  * each related document (like a Story, or a Site).
@@ -108,12 +103,6 @@ export interface RelatedCommentCounts {
   moderationQueue: CommentModerationQueueCounts;
 
   tags: CommentTagCounts;
-
-  /**
-   * relationships stores the counts of relationships between comments, such as when
-   * published comments have rejected ancestors
-   */
-  relationships: CommentRelationshipCounts;
 }
 
 /**
@@ -147,19 +136,6 @@ export function mergeCommentStatusCount(
   return mergedStatusCounts;
 }
 
-export function mergeCommentRelationshipCounts(
-  ...relationship: CommentRelationshipCounts[]
-): CommentRelationshipCounts {
-  const merged = createEmptyCommentRelationshipCounts();
-
-  for (const count of relationship) {
-    merged.PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS +=
-      count.PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS;
-  }
-
-  return merged;
-}
-
 export function mergeCommentModerationQueueCount(
   ...moderationQueues: CommentModerationQueueCounts[]
 ): CommentModerationQueueCounts {
@@ -240,21 +216,6 @@ export function calculateTotalPublishedCommentCount(
   );
 }
 
-//
-
-export function calculateTotalPublishedAndVisibleCommentCount(
-  commentCounts: RelatedCommentCounts
-) {
-  const publishedCount = PUBLISHED_STATUSES.reduce(
-    (total, status) => total + commentCounts.status[status],
-    0
-  );
-  const notVisibleCount =
-    commentCounts.relationships?.PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS ??
-    0;
-  return publishedCount - notVisibleCount;
-}
-
 interface RelatedCommentCountsDocument extends Document {
   id: string;
   tenantID: string;
diff --git a/server/src/core/server/models/comment/counts/empty.ts b/server/src/core/server/models/comment/counts/empty.ts
@@ -7,7 +7,6 @@ import {
 import {
   CommentModerationCountsPerQueue,
   CommentModerationQueueCounts,
-  CommentRelationshipCounts,
   CommentStatusCounts,
   CommentTagCounts,
   RelatedCommentCounts,
@@ -96,16 +95,11 @@ export function createEmptyCommentTagCounts(): CommentTagCounts {
   };
 }
 
-export function createEmptyCommentRelationshipCounts(): CommentRelationshipCounts {
-  return { PUBLISHED_COMMENTS_WITH_REJECTED_ANCESTORS: 0 };
-}
-
 export function createEmptyRelatedCommentCounts(): RelatedCommentCounts {
   return {
     action: {},
     status: createEmptyCommentStatusCounts(),
     moderationQueue: createEmptyCommentModerationQueueCounts(),
     tags: createEmptyCommentTagCounts(),
-    relationships: createEmptyCommentRelationshipCounts(),
   };
 }
diff --git a/server/src/core/server/models/story/story.ts b/server/src/core/server/models/story/story.ts
diff --git a/server/src/core/server/services/stories/index.ts b/server/src/core/server/services/stories/index.ts
diff --git a/server/src/core/server/stacks/helpers/updateAllCommentCounts.ts b/server/src/core/server/stacks/helpers/updateAllCommentCounts.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@coralproject/talk",`
`3`		`- "version": "9.9.1",`
	`3`	`+ "version": "9.9.2",`
`4`	`4`	`"author": "The Coral Project",`
`5`	`5`	`"homepage": "https://coralproject.net/",`
`6`	`6`	`"sideEffects": [`
Original file line number	Diff line number	Diff line change
`@@ -645,6 +645,13 @@ const enhanced = withPaginationContainer<`
`645`	`645`	`}`
`646`	`646`	`mode`
`647`	`647`	`}`
	`648`	`+ commentCounts {`
	`649`	`+ totalPublished`
	`650`	`+ tags {`
	`651`	`+ REVIEW`
	`652`	`+ QUESTION`
	`653`	`+ }`
	`654`	`+ }`
`648`	`655`	`comments(`
`649`	`656`	`first: $count`
`650`	`657`	`after: $cursor`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ const StoryRowContainer: FunctionComponent<Props> = ({`
`58`	`58`	`CLASSES.discussions.story.commentsCount`
`59`	`59`	`)}`
`60`	`60`	`>`
`61`		`- {story.commentCounts.totalPublishedAndVisible}`
	`61`	`+ {story.commentCounts.totalPublished}`
`62`	`62`	`</span>`
`63`	`63`	`</Flex>`
`64`	`64`	`</Flex>`
`@@ -81,7 +81,7 @@ const enhanced = withFragmentContainer<Props>({`
`81`	`81`	`publishedAt`
`82`	`82`	`}`
`83`	`83`	`commentCounts {`
`84`		`- totalPublishedAndVisible`
	`84`	`+ totalPublished`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`,
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "common",`
`3`		`- "version": "9.9.1",`
	`3`	`+ "version": "9.9.2",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"types": "dist/index.d.ts",`