From f891a5bbd78e2cb1983ee22b079267b93dc05f8a Mon Sep 17 00:00:00 2001 From: Naiyuan Qing <145280634+NevilleQingNY@users.noreply.github.com> Date: Wed, 1 Apr 2026 15:37:33 +0800 Subject: [PATCH] refactor(web): unify assignee dropdowns with ActorAvatar and shared AssigneePicker - Replace inline initials/Bot divs with ActorAvatar across all assignee UIs - Replace issue-detail sidebar DropdownMenu with shared AssigneePicker - Delete BatchAssigneePicker (~130 lines), reuse AssigneePicker in controlled mode - Add controlled mode (open/onOpenChange), align, and triggerRender props to AssigneePicker/PropertyPicker - Add canAssignAgent visibility check to issue-detail more menu - Clean up unused imports (Bot, useAuthStore, useWorkspaceStore, etc.) Co-Authored-By: Claude Opus 4.6 (1M context) --- .../components/batch-action-toolbar.tsx | 152 ++---------------- apps/web/features/issues/components/index.ts | 2 +- .../issues/components/issue-detail.tsx | 74 ++------- .../issues/components/issues-header.tsx | 14 +- .../components/pickers/assignee-picker.tsx | 43 +++-- .../issues/components/pickers/index.ts | 2 +- .../components/pickers/property-picker.tsx | 7 +- 7 files changed, 54 insertions(+), 240 deletions(-) diff --git a/apps/web/features/issues/components/batch-action-toolbar.tsx b/apps/web/features/issues/components/batch-action-toolbar.tsx index e52365f4..0d6e3c2a 100644 --- a/apps/web/features/issues/components/batch-action-toolbar.tsx +++ b/apps/web/features/issues/components/batch-action-toolbar.tsx @@ -1,7 +1,7 @@ "use client"; import { useState } from "react"; -import { X, Trash2, Bot, Lock, UserMinus } from "lucide-react"; +import { X, Trash2 } from "lucide-react"; import { toast } from "sonner"; import { Button } from "@/components/ui/button"; import { @@ -19,15 +19,14 @@ import { PopoverTrigger, PopoverContent, } from "@/components/ui/popover"; -import type { Agent, UpdateIssueRequest } from "@/shared/types"; +import type { UpdateIssueRequest } from "@/shared/types"; import { ALL_STATUSES, STATUS_CONFIG, PRIORITY_ORDER, PRIORITY_CONFIG } from "@/features/issues/config"; -import { useAuthStore } from "@/features/auth"; -import { useWorkspaceStore, useActorName } from "@/features/workspace"; import { useIssueStore } from "@/features/issues/store"; import { useIssueSelectionStore } from "@/features/issues/stores/selection-store"; import { api } from "@/shared/api"; import { StatusIcon } from "./status-icon"; import { PriorityIcon } from "./priority-icon"; +import { AssigneePicker } from "./pickers"; export function BatchActionToolbar() { const selectedIds = useIssueSelectionStore((s) => s.selectedIds); @@ -44,7 +43,7 @@ export function BatchActionToolbar() { const ids = Array.from(selectedIds); - const handleBatchUpdate = async (updates: UpdateIssueRequest) => { + const handleBatchUpdate = async (updates: Partial) => { setLoading(true); try { await api.batchUpdateIssues(ids, updates); @@ -161,11 +160,15 @@ export function BatchActionToolbar() { {/* Assignee */} - } + trigger="Assignee" + align="center" /> {/* Delete */} @@ -207,136 +210,3 @@ export function BatchActionToolbar() { ); } -function canAssignAgent(agent: Agent, userId: string | undefined, memberRole: string | undefined): boolean { - if (agent.visibility !== "private") return true; - if (agent.owner_id === userId) return true; - if (memberRole === "owner" || memberRole === "admin") return true; - return false; -} - -function BatchAssigneePicker({ - open, - onOpenChange, - onUpdate, - loading, -}: { - open: boolean; - onOpenChange: (v: boolean) => void; - onUpdate: (updates: UpdateIssueRequest) => void; - loading: boolean; -}) { - const [filter, setFilter] = useState(""); - const user = useAuthStore((s) => s.user); - const members = useWorkspaceStore((s) => s.members); - const agents = useWorkspaceStore((s) => s.agents); - const { getActorInitials } = useActorName(); - - const currentMember = members.find((m) => m.user_id === user?.id); - const memberRole = currentMember?.role; - - const query = filter.toLowerCase(); - const filteredMembers = members.filter((m) => - m.name.toLowerCase().includes(query), - ); - const filteredAgents = agents.filter((a) => - a.name.toLowerCase().includes(query), - ); - - return ( - { - onOpenChange(v); - if (!v) setFilter(""); - }} - > - - } - > - Assignee - - -
- setFilter(e.target.value)} - placeholder="Assign to..." - className="w-full bg-transparent text-sm placeholder:text-muted-foreground outline-none" - /> -
-
- - - {filteredMembers.length > 0 && ( -
-
- Members -
- {filteredMembers.map((m) => ( - - ))} -
- )} - - {filteredAgents.length > 0 && ( -
-
- Agents -
- {filteredAgents.map((a) => { - const allowed = canAssignAgent(a, user?.id, memberRole); - return ( - - ); - })} -
- )} -
- - - ); -} diff --git a/apps/web/features/issues/components/index.ts b/apps/web/features/issues/components/index.ts index 37608d08..6df36291 100644 --- a/apps/web/features/issues/components/index.ts +++ b/apps/web/features/issues/components/index.ts @@ -1,6 +1,6 @@ export { StatusIcon } from "./status-icon"; export { PriorityIcon } from "./priority-icon"; -export { StatusPicker, PriorityPicker, AssigneePicker, DueDatePicker } from "./pickers"; +export { StatusPicker, PriorityPicker, AssigneePicker, canAssignAgent, DueDatePicker } from "./pickers"; export { IssueDetail } from "./issue-detail"; export { IssuesPage } from "./issues-page"; export { CommentCard } from "./comment-card"; diff --git a/apps/web/features/issues/components/issue-detail.tsx b/apps/web/features/issues/components/issue-detail.tsx index 7eddf905..3b5ea855 100644 --- a/apps/web/features/issues/components/issue-detail.tsx +++ b/apps/web/features/issues/components/issue-detail.tsx @@ -5,7 +5,6 @@ import { useDefaultLayout, usePanelRef } from "react-resizable-panels"; import Link from "next/link"; import { useRouter } from "next/navigation"; import { - Bot, Calendar, Check, ChevronLeft, @@ -58,7 +57,7 @@ import { Avatar, AvatarFallback, AvatarGroup, AvatarGroupCount } from "@/compone import { ActorAvatar } from "@/components/common/actor-avatar"; import type { UpdateIssueRequest, IssueStatus, IssuePriority, TimelineEntry } from "@/shared/types"; import { ALL_STATUSES, STATUS_CONFIG, PRIORITY_ORDER, PRIORITY_CONFIG } from "@/features/issues/config"; -import { StatusIcon, PriorityIcon, DueDatePicker } from "@/features/issues/components"; +import { StatusIcon, PriorityIcon, DueDatePicker, AssigneePicker, canAssignAgent } from "@/features/issues/components"; import { CommentCard } from "./comment-card"; import { CommentInput } from "./comment-input"; import { AgentLiveCard, TaskRunHistory } from "./agent-live-card"; @@ -174,6 +173,7 @@ export function IssueDetail({ issueId, onDelete, defaultSidebarOpen = true, layo const workspace = useWorkspaceStore((s) => s.workspace); const members = useWorkspaceStore((s) => s.members); const agents = useWorkspaceStore((s) => s.agents); + const currentMemberRole = members.find((m) => m.user_id === user?.id)?.role; // Issue navigation const allIssues = useIssueStore((s) => s.issues); @@ -421,21 +421,17 @@ export function IssueDetail({ issueId, onDelete, defaultSidebarOpen = true, layo key={m.user_id} onClick={() => handleUpdateField({ assignee_type: "member", assignee_id: m.user_id })} > -
- {getActorInitials("member", m.user_id)} -
+ {m.name} {issue.assignee_type === "member" && issue.assignee_id === m.user_id && ✓} ))} - {agents.map((a) => ( + {agents.filter((a) => canAssignAgent(a, user?.id, currentMemberRole)).map((a) => ( handleUpdateField({ assignee_type: "agent", assignee_id: a.id })} > -
- -
+ {a.name} {issue.assignee_type === "agent" && issue.assignee_id === a.id && ✓} @@ -873,60 +869,12 @@ export function IssueDetail({ issueId, onDelete, defaultSidebarOpen = true, layo {/* Assignee */} - - - {issue.assignee_type && issue.assignee_id ? ( - <> - - {getActorName(issue.assignee_type, issue.assignee_id)} - - ) : ( - Unassigned - )} - - - handleUpdateField({ assignee_type: null, assignee_id: null })}> - - Unassigned - - {members.length > 0 && ( - <> - - - Members - {members.map((m) => ( - handleUpdateField({ assignee_type: "member", assignee_id: m.user_id })}> -
- {getActorInitials("member", m.user_id)} -
- {m.name} - - ))} - - - )} - {agents.length > 0 && ( - <> - - - Agents - {agents.map((a) => ( - handleUpdateField({ assignee_type: "agent", assignee_id: a.id })}> -
- -
- {a.name} - - ))} - - - )} - - + {/* Due date */} diff --git a/apps/web/features/issues/components/issues-header.tsx b/apps/web/features/issues/components/issues-header.tsx index 33b6680d..27c28d59 100644 --- a/apps/web/features/issues/components/issues-header.tsx +++ b/apps/web/features/issues/components/issues-header.tsx @@ -4,7 +4,6 @@ import { useMemo, useState } from "react"; import { ArrowDown, ArrowUp, - Bot, Check, ChevronDown, CircleDot, @@ -47,7 +46,8 @@ import { PRIORITY_CONFIG, } from "@/features/issues/config"; import { StatusIcon, PriorityIcon } from "@/features/issues/components"; -import { useWorkspaceStore, useActorName } from "@/features/workspace"; +import { useWorkspaceStore } from "@/features/workspace"; +import { ActorAvatar } from "@/components/common/actor-avatar"; import { useIssueViewStore, SORT_OPTIONS, @@ -147,8 +147,6 @@ function ActorSubContent({ const [search, setSearch] = useState(""); const members = useWorkspaceStore((s) => s.members); const agents = useWorkspaceStore((s) => s.agents); - const { getActorInitials } = useActorName(); - const query = search.toLowerCase(); const filteredMembers = members.filter((m) => m.name.toLowerCase().includes(query), @@ -208,9 +206,7 @@ function ActorSubContent({ className={FILTER_ITEM_CLASS} > -
- {getActorInitials("member", m.user_id)} -
+ {m.name} {count > 0 && ( @@ -239,9 +235,7 @@ function ActorSubContent({ className={FILTER_ITEM_CLASS} > -
- -
+ {a.name} {count > 0 && ( diff --git a/apps/web/features/issues/components/pickers/assignee-picker.tsx b/apps/web/features/issues/components/pickers/assignee-picker.tsx index 5ffd0d2c..c75589ba 100644 --- a/apps/web/features/issues/components/pickers/assignee-picker.tsx +++ b/apps/web/features/issues/components/pickers/assignee-picker.tsx @@ -1,10 +1,11 @@ "use client"; import { useState } from "react"; -import { Bot, Lock, UserMinus } from "lucide-react"; +import { Lock, UserMinus } from "lucide-react"; import type { Agent, IssueAssigneeType, UpdateIssueRequest } from "@/shared/types"; import { useAuthStore } from "@/features/auth"; import { useWorkspaceStore, useActorName } from "@/features/workspace"; +import { ActorAvatar } from "@/components/common/actor-avatar"; import { PropertyPicker, PickerItem, @@ -12,7 +13,7 @@ import { PickerEmpty, } from "./property-picker"; -function canAssignAgent(agent: Agent, userId: string | undefined, memberRole: string | undefined): boolean { +export function canAssignAgent(agent: Agent, userId: string | undefined, memberRole: string | undefined): boolean { if (agent.visibility !== "private") return true; if (agent.owner_id === userId) return true; if (memberRole === "owner" || memberRole === "admin") return true; @@ -24,18 +25,28 @@ export function AssigneePicker({ assigneeId, onUpdate, trigger: customTrigger, + triggerRender, + open: controlledOpen, + onOpenChange: controlledOnOpenChange, + align, }: { assigneeType: IssueAssigneeType | null; assigneeId: string | null; onUpdate: (updates: Partial) => void; trigger?: React.ReactNode; + triggerRender?: React.ReactElement; + open?: boolean; + onOpenChange?: (v: boolean) => void; + align?: "start" | "center" | "end"; }) { - const [open, setOpen] = useState(false); + const [internalOpen, setInternalOpen] = useState(false); + const open = controlledOpen ?? internalOpen; + const setOpen = controlledOnOpenChange ?? setInternalOpen; const [filter, setFilter] = useState(""); const user = useAuthStore((s) => s.user); const members = useWorkspaceStore((s) => s.members); const agents = useWorkspaceStore((s) => s.agents); - const { getActorName, getActorInitials } = useActorName(); + const { getActorName } = useActorName(); const currentMember = members.find((m) => m.user_id === user?.id); const memberRole = currentMember?.role; @@ -64,25 +75,15 @@ export function AssigneePicker({ if (!v) setFilter(""); }} width="w-52" + align={align} searchable searchPlaceholder="Assign to..." onSearchChange={setFilter} + triggerRender={triggerRender} trigger={ customTrigger ? customTrigger : assigneeType && assigneeId ? ( <> -
- {assigneeType === "agent" ? ( - - ) : ( - getActorInitials(assigneeType, assigneeId) - )} -
+ {triggerLabel} ) : ( @@ -117,9 +118,7 @@ export function AssigneePicker({ setOpen(false); }} > -
- {getActorInitials("member", m.user_id)} -
+ {m.name} ))} @@ -145,9 +144,7 @@ export function AssigneePicker({ setOpen(false); }} > -
- -
+ {a.name} {a.visibility === "private" && ( diff --git a/apps/web/features/issues/components/pickers/index.ts b/apps/web/features/issues/components/pickers/index.ts index 12a238c6..3b5876bc 100644 --- a/apps/web/features/issues/components/pickers/index.ts +++ b/apps/web/features/issues/components/pickers/index.ts @@ -1,5 +1,5 @@ export { PropertyPicker, PickerItem, PickerSection, PickerEmpty } from "./property-picker"; export { StatusPicker } from "./status-picker"; export { PriorityPicker } from "./priority-picker"; -export { AssigneePicker } from "./assignee-picker"; +export { AssigneePicker, canAssignAgent } from "./assignee-picker"; export { DueDatePicker } from "./due-date-picker"; diff --git a/apps/web/features/issues/components/pickers/property-picker.tsx b/apps/web/features/issues/components/pickers/property-picker.tsx index 1329fa4d..6a53c82f 100644 --- a/apps/web/features/issues/components/pickers/property-picker.tsx +++ b/apps/web/features/issues/components/pickers/property-picker.tsx @@ -16,6 +16,7 @@ export function PropertyPicker({ open, onOpenChange, trigger, + triggerRender, width = "w-48", align = "end", searchable = false, @@ -26,6 +27,7 @@ export function PropertyPicker({ open: boolean; onOpenChange: (v: boolean) => void; trigger: React.ReactNode; + triggerRender?: React.ReactElement; width?: string; align?: "start" | "center" | "end"; searchable?: boolean; @@ -48,7 +50,10 @@ export function PropertyPicker({ return ( - + {trigger}