Merge pull request #4426 from coralproject/fix/user-action-presence-r…

…r-qa-archived Fix reported states for archived, Q&A, and R&R stories when data cache is enabled
coralproject · Dec 4, 2023 · d87e620 · d87e620
2 parents 64b978a + cfaa294
commit d87e620
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/client/src/core/client/admin/permissions/story.ts b/client/src/core/client/admin/permissions/story.ts
@@ -17,7 +17,7 @@ const permissionMap: PermissionMap<AbilityType, PermissionContext> = {
     [GQLUSER_ROLE.MODERATOR]: () => true,
   },
   ARCHIVE_STORY: {
-    [GQLUSER_ROLE.ADMIN]: () => false,
+    [GQLUSER_ROLE.ADMIN]: () => true,
   },
 };
 

diff --git a/server/src/core/server/graph/loaders/Comments.ts b/server/src/core/server/graph/loaders/Comments.ts
@@ -58,7 +58,7 @@ const tagFilter = (tag?: GQLTAG): CommentConnectionInput["filter"] => {
   return {};
 };
 
-const isRatingsAndReviews = (
+export const isRatingsAndReviews = (
   tenant: Pick<Tenant, "featureFlags">,
   story: Story
 ) => {
@@ -68,7 +68,7 @@ const isRatingsAndReviews = (
   );
 };
 
-const isQA = (tenant: Pick<Tenant, "featureFlags">, story: Story) => {
+export const isQA = (tenant: Pick<Tenant, "featureFlags">, story: Story) => {
   return (
     hasFeatureFlag(tenant, GQLFEATURE_FLAG.ENABLE_QA) &&
     story.settings.mode === GQLSTORY_MODE.QA
@@ -173,6 +173,8 @@ const mapVisibleComment = (user?: Pick<User, "role">) => {
 interface ActionPresenceArgs {
   commentID: string;
   isArchived: boolean;
+  isQA: boolean;
+  isRR: boolean;
 }
 
 /**
@@ -268,13 +270,15 @@ export default (ctx: GraphContext) => ({
 
     const commentIDs = args.map((rd) => rd.commentID);
     const hasArchivedData = args.some((rd) => rd.isArchived);
+    const hasRROrQA = args.some((rd) => rd.isQA || rd.isRR);
 
     const result = await retrieveManyUserActionPresence(
       ctx.mongo,
       ctx.cache.commentActions,
       ctx.tenant.id,
       ctx.user.id,
       commentIDs,
+      !(hasRROrQA || hasArchivedData),
       hasArchivedData
     );
 

diff --git a/server/src/core/server/graph/resolvers/Comment.ts b/server/src/core/server/graph/resolvers/Comment.ts
@@ -32,6 +32,7 @@ import {
 } from "coral-server/graph/schema/__generated__/types";
 
 import GraphContext from "../context";
+import { isQA, isRatingsAndReviews } from "../loaders/Comments";
 import { setCacheHint } from "../setCacheHint";
 
 export const maybeLoadOnlyID = async (
@@ -223,6 +224,8 @@ export const Comment: GQLCommentTypeResolver<comment.Comment> = {
     return ctx.loaders.Comments.retrieveMyActionPresence.load({
       commentID: c.id,
       isArchived: !!story.isArchived,
+      isRR: isRatingsAndReviews(ctx.tenant, story),
+      isQA: isQA(ctx.tenant, story),
     });
   },
 

diff --git a/server/src/core/server/models/action/comment.ts b/server/src/core/server/models/action/comment.ts
@@ -383,11 +383,13 @@ export async function retrieveManyUserActionPresence(
   tenantID: string,
   userID: string | null,
   commentIDs: string[],
+  useCache = true,
   isArchived = false
 ): Promise<GQLActionPresence[]> {
   let actions: Readonly<CommentAction>[] = [];
 
-  const cacheAvailable = await commentActionsCache.available(tenantID);
+  const cacheAvailable =
+    useCache && (await commentActionsCache.available(tenantID));
   if (cacheAvailable) {
     const actionsFromCache = await commentActionsCache.findMany(
       tenantID,