π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-4025] fix: external user comment and reaction (#7692)
Anmol Singh Bhatia56cd0fc44502
diff --git a/apps/api/plane/app/serializers/issue.py b/apps/api/plane/app/serializers/issue.pyindex 1eda376015..8a643ce4dc 100644--- a/apps/api/plane/app/serializers/issue.py+++ b/apps/api/plane/app/serializers/issue.py@@ -667,16 +667,33 @@ class IssueReactionSerializer(BaseSerializer):class IssueReactionLiteSerializer(DynamicBaseSerializer):+ display_name = serializers.CharField(source="actor.display_name", read_only=True)+class Meta:model = IssueReaction- fields = ["id", "actor", "issue", "reaction"]+ fields = ["id", "actor", "issue", "reaction", "display_name"]class CommentReactionSerializer(BaseSerializer):+ display_name = serializers.CharField(source="actor.display_name", read_only=True)+class Meta:model = CommentReaction- fields = "__all__"- read_only_fields = ["workspace", "project", "comment", "actor", "deleted_at"]+ fields = [+ "id",+ "actor",+ "comment",+ "reaction",+ "display_name",+ "deleted_at",+ "workspace",+ "project",+ "created_at",+ "updated_at",+ "created_by",+ "updated_by",+ ]+ read_only_fields = ["workspace", "project", "comment", "actor", "deleted_at", "created_by", "updated_by"]class IssueVoteSerializer(BaseSerializer):diff --git a/apps/web/ce/components/comments/comment-block.tsx b/apps/web/ce/components/comments/comment-block.tsxindex 42c9dbfd1b..6ed7fc0946 100644--- a/apps/web/ce/components/comments/comment-block.tsx+++ b/apps/web/ce/components/comments/comment-block.tsx@@ -2,9 +2,8 @@ import { FC, ReactNode, useRef } from "react";import { observer } from "mobx-react";// plane importsimport { useTranslation } from "@plane/i18n";-import { Tooltip } from "@plane/propel/tooltip";-import { TIssueComment } from "@plane/types";-import { Avatar } from "@plane/ui";+import { EIssueCommentAccessSpecifier, TIssueComment } from "@plane/types";+import { Avatar, Tooltip } from "@plane/ui";import { calculateTimeAgo, cn, getFileURL, renderFormattedDate, renderFormattedTime } from "@plane/utils";// hooksimport { useMember } from "@/hooks/store/use-member";@@ -27,7 +26,13 @@ export const CommentBlock: FC<TCommentBlock> = observer((props) => {// translationconst { t } = useTranslation();- if (!comment || !userDetails) return null;+ const displayName = comment?.actor_detail?.is_bot+ ? comment?.actor_detail?.first_name + ` ${t("bot")}`+ : (userDetails?.display_name ?? comment?.actor_detail?.display_name);++ const avatarUrl = userDetails?.avatar_url ?? comment?.actor_detail?.avatar_url;++ if (!comment) return null;return (<div@@ -43,20 +48,15 @@ export const CommentBlock: FC<TCommentBlock> = observer((props) => {"flex-shrink-0 relative w-7 h-6 rounded-full transition-border duration-1000 flex justify-center items-center z-[3] uppercase font-medium")}>- <Avatar- size="base"- name={userDetails?.display_name}- src={getFileURL(userDetails?.avatar_url)}- className="flex-shrink-0"- />+ <Avatar size="base" name={displayName} src={getFileURL(avatarUrl)} className="flex-shrink-0" /></div><div className="flex flex-col gap-3 truncate flex-grow"><div className="flex w-full gap-2"><div className="flex-1 flex flex-wrap items-center gap-1">- <div className="text-xs font-medium">- {comment?.actor_detail?.is_bot- ? comment?.actor_detail?.first_name + ` ${t("bot")}`- : comment?.actor_detail?.display_name || userDetails.display_name}+ <div className="flex items-center gap-1">+ <span className="text-xs font-medium">+ {`${displayName}${comment.access === EIssueCommentAccessSpecifier.EXTERNAL ? " (External User)" : ""}`}+ </span></div><div className="text-xs text-custom-text-300">commented{" "}diff --git a/apps/web/core/components/issues/issue-detail/reactions/issue-comment.tsx b/apps/web/core/components/issues/issue-detail/reactions/issue-comment.tsxindex 4305ef6ede..911b4fe8a1 100644--- a/apps/web/core/components/issues/issue-detail/reactions/issue-comment.tsx+++ b/apps/web/core/components/issues/issue-detail/reactions/issue-comment.tsx@@ -85,7 +85,9 @@ export const IssueCommentReaction: FC<TIssueCommentReaction> = observer((props)const reactionUsers = (reactionIds?.[reaction] || []).map((reactionId) => {const reactionDetails = getCommentReactionById(reactionId);- return reactionDetails ? getUserDetails(reactionDetails.actor)?.display_name : null;+ return reactionDetails+ ? getUserDetails(reactionDetails?.actor)?.display_name || reactionDetails?.display_name+ : null;}).filter((displayName): displayName is string => !!displayName);const formattedUsers = formatTextList(reactionUsers);diff --git a/apps/web/core/components/issues/issue-detail/reactions/issue.tsx b/apps/web/core/components/issues/issue-detail/reactions/issue.tsxindex 243b26aef0..ff5ae30996 100644--- a/apps/web/core/components/issues/issue-detail/reactions/issue.tsx+++ b/apps/web/core/components/issues/issue-detail/reactions/issue.tsx@@ -85,7 +85,9 @@ export const IssueReaction: FC<TIssueReaction> = observer((props) => {const reactionUsers = (reactionIds?.[reaction] || []).map((reactionId) => {const reactionDetails = getReactionById(reactionId);- return reactionDetails ? getUserDetails(reactionDetails.actor)?.display_name : null;+ return reactionDetails+ ? getUserDetails(reactionDetails?.actor)?.display_name || reactionDetails?.display_name+ : null;}).filter((displayName): displayName is string => !!displayName);diff --git a/packages/types/src/issues/activity/issue_comment_reaction.ts b/packages/types/src/issues/activity/issue_comment_reaction.tsindex 892a3e9065..590b18ca5e 100644--- a/packages/types/src/issues/activity/issue_comment_reaction.ts+++ b/packages/types/src/issues/activity/issue_comment_reaction.ts@@ -9,6 +9,7 @@ export type TIssueCommentReaction = {updated_at: Date;created_by: string;updated_by: string;+ display_name: string;};export type TIssueCommentReactionMap = {diff --git a/packages/types/src/issues/issue_reaction.ts b/packages/types/src/issues/issue_reaction.tsindex 49c971f4af..bb0bf7a6a2 100644--- a/packages/types/src/issues/issue_reaction.ts+++ b/packages/types/src/issues/issue_reaction.ts@@ -5,6 +5,7 @@ export type TIssueReaction = {id: string;issue: string;reaction: string;+ display_name: string;};export interface IIssuePublicReaction {