diff --git a/web/components/core/activity.tsx b/web/components/core/activity.tsx index c8f6377b789..84170f5d85e 100644 --- a/web/components/core/activity.tsx +++ b/web/components/core/activity.tsx @@ -2,8 +2,9 @@ import { useRouter } from "next/router"; // icons import { Icon, Tooltip } from "components/ui"; +import { CopyPlus } from "lucide-react"; import { Squares2X2Icon } from "@heroicons/react/24/outline"; -import { BlockedIcon, BlockerIcon } from "components/icons"; +import { BlockedIcon, BlockerIcon, RelatedIcon } from "components/icons"; // helpers import { renderShortDateWithYearFormat } from "helpers/date-time.helper"; import { capitalizeFirstLetter } from "helpers/string.helper"; @@ -157,7 +158,7 @@ const activityDetails: { }, icon: , }, - blocks: { + blocked_by: { message: (activity) => { if (activity.old_value === "") return ( @@ -176,6 +177,44 @@ const activityDetails: { }, icon: , }, + duplicate: { + message: (activity) => { + if (activity.old_value === "") + return ( + <> + marked this issue as duplicate of{" "} + {activity.new_value}. + + ); + else + return ( + <> + removed this issue as a duplicate of{" "} + {activity.old_value}. + + ); + }, + icon: , + }, + relates_to: { + message: (activity) => { + if (activity.old_value === "") + return ( + <> + marked that this issue relates to{" "} + {activity.new_value}. + + ); + else + return ( + <> + removed the relation from{" "} + {activity.old_value}. + + ); + }, + icon: , + }, cycles: { message: (activity, showIssue, workspaceSlug) => { if (activity.verb === "created") diff --git a/web/components/issues/sidebar-select/blocked.tsx b/web/components/issues/sidebar-select/blocked.tsx index 9554a83bae7..d7e448377c8 100644 --- a/web/components/issues/sidebar-select/blocked.tsx +++ b/web/components/issues/sidebar-select/blocked.tsx @@ -73,7 +73,7 @@ export const SidebarBlockedSelect: React.FC = ({ ...selectedIssues.map((issue) => ({ issue: issueId as string, relation_type: "blocked_by" as const, - related_issue_detail: issue.blocked_issue_detail, + issue_detail: issue.blocked_issue_detail, related_issue: issue.blocked_issue_detail.id, })), ], @@ -111,17 +111,17 @@ export const SidebarBlockedSelect: React.FC = ({ {blockedByIssue && blockedByIssue.length > 0 ? blockedByIssue.map((relation) => (
- {`${relation.related_issue_detail?.project_detail.identifier}-${relation.related_issue_detail?.sequence_id}`} + {`${relation.issue_detail?.project_detail.identifier}-${relation.issue_detail?.sequence_id}`}