Files
kandev/apps/web/components/task/changes-panel-timeline.tsx
T
José Almeida 2b8513f902 feat: add multi-select and drag-to-move for file tree and changes panel (#490)
* feat: add multi-select and drag-to-move for file tree and changes panel

Add Shift-click range and Ctrl/Cmd-click toggle selection to the file
tree and staged/unstaged changes sections. Includes bulk actions
(delete, stage, unstage, discard), drag-and-drop file moving into
directories, keyboard shortcuts (Escape, Ctrl+A), and E2E tests.

* fix: move bulk action components to file-row to fix max-lines lint

* style: apply prettier formatting to all changed files

* fix: bulk delete all selected items and update anchor on stale shift-click

* fix: address CodeRabbit review comments

- Keep original file-row-* data-testid for backwards compat
- Remove eager onClearSelection from bulk actions (auto-pruned by hook)
- Variant-scope bulk-discard/bulk-unstage test ids
- Remove index.lock deletion from E2E GitHelper retry loop

* fix: fix E2E tests — create files after session open, remove DnD test

- Create files AFTER opening session so WS detects git status changes
- Add proper git env vars (GIT_AUTHOR_NAME, etc.) matching existing tests
- Use element.press("Escape") instead of page keyboard for proper focus
- Remove drag-to-directory test (Playwright dragTo doesn't support HTML5
  dataTransfer events needed by our DnD implementation)

* fix: rename E2E task titles to avoid ambiguous 'Changes' tab selector

* fix: make file list focusable for Escape key handler in E2E tests

* fix: improve selection styling and ignore right-clicks in selection handler

- Use text-accent-foreground on selected rows for dark mode readability
- Override child span colors with [&_span]:text-accent-foreground
- Use hover:bg-accent/80 instead of hover:bg-muted on selected items
- Skip selection handling on right-click (button === 2) so context menu
  works without clearing multi-selection

* fix: plain click should not select — only Ctrl/Cmd+click and Shift+click

Plain click now clears any selection and performs the original action
(open file / toggle folder / open diff). Selection only happens with
modifier keys. handleClick returns boolean to indicate whether the
click was consumed by selection logic.

* fix: fix multi-select bugs and expand E2E test coverage

Bug fixes:
- Change isSelected from boolean to function prop so children compute
  their own selection state (fixes nested file selection)
- Inline TreeNodeRow JSX into TreeNodeItem so ContextMenuTrigger asChild
  can attach refs directly (fixes right-click context menu)
- Set lastClickedRef on plain click so shift-click has a valid anchor
- Add click-outside handler to clear selection

E2E tests expanded to 14 file-tree tests + 3 changes-panel tests:
- Ctrl-click select, toggle, multi-select
- Plain click clears selection
- Shift-click range after plain click and ctrl-click anchors
- Directory selection and nested file selection
- Right-click context menu (single + bulk delete)
- Click outside clears selection
- Escape clears selection

* fix: move AlertDialog outside ContextMenu to fix delete action

The AlertDialog wrapping the ContextMenu caused Radix focus management
to intercept context menu item selection, making Delete trigger Rename.
Moving AlertDialog to a sibling of ContextMenu fixes the conflict.

* fix: reorder context menu — Delete first, Rename second

Radix ContextMenu auto-focuses the first item on open, which caused
accidental Rename triggers. Putting Delete first (the more common
action for selection) avoids this.

* fix: don't clear selection when clicking context menu or dialog

The click-outside handler was clearing selection when clicking on
context menu items or confirmation dialog buttons (rendered in portals
outside the tree container). Now skips clearing for elements with
role=menu, role=alertdialog, or role=dialog.

Also extended the bulk delete E2E test to verify both files are
actually removed after confirming the dialog.

* fix: hide file count in delete dialog when folder children not loaded

When a folder hasn't been expanded, its children aren't loaded yet so
countFilesInTree returns 0. Instead of showing "0 files", hide the
count entirely and just show "delete <folder name>".

* fix: show confirmation dialog for bulk discard in changes panel

Bulk discard was calling git.discard() directly, bypassing the
confirmation dialog. Now routes through handleBulkDiscardClick which
opens the DiscardDialog with a bulk message ("discard changes to N
files") before executing.

* fix: address remaining CodeRabbit review comments

- Deduplicate filenames on move: when moving files with identical names
  to the same directory, append "(1)", "(2)" etc. to avoid collisions.
  Both tree update and rename API calls use the same deduplication.
- Replace void operator with .catch(() => {}) for bulk stage/unstage
  to prevent unhandled promise rejections.
- Add document-level dragend listener as safety net to clear stuck drag
  state if the element's onDragEnd doesn't fire (Escape, out-of-window).

* test: add unit tests for file tree move deduplication and visible paths

* fix: address all remaining PR review comments

- Move onSelectionChange out of React state updater (side effect fix)
- Stabilize keyboard listener deps (pass callbacks not object)
- Remove unnecessary useMemo in BulkActionBar
- Fix ghost-restore on partial bulk delete (remove all at once)
- Fix blank filename on single-file bulk discard
- Add aria-selected and role=treeitem for accessibility
- Extract computeNextSelection params into object (max-params lint)

* fix: add missing bulk action props to WorkingTreeProps type

WorkingTreeSections referenced onBulkStage, onBulkUnstage, and
onBulkDiscard but WorkingTreeProps Pick didn't include them, causing
a TypeScript build failure.

* fix: address final review comments

- Add unit tests for computeNextSelection (8 tests covering ctrl-click,
  shift-click range, stale anchor, reverse range, shift+ctrl extend)
- Extract shared E2E helpers (GitHelper, makeGitEnv, openTaskSession,
  createStandardProfile) to e2e/helpers/git-helper.ts
- Fix misleading comment in bulk delete (says "re-insert only failed"
  but implementation restores full snapshot)

* fix: use Promise.all for bulk delete to prevent partial rollback

Individual .catch() handlers could restore already-deleted files
if a later delete failed. Now uses Promise.all so rollback only
happens if any delete rejects.

* test: add renderHook tests for useMultiSelect hook behaviors

- Stale-path pruning: items shrink → selected paths auto-pruned
- Plain click: returns false, clears existing selection
- selectAll/clearSelection: work correctly, fire onSelectionChange
- Install @testing-library/react for renderHook support

* fix: handle false returns from onDeleteFile in bulk delete Promise.all

* chore: remove unused @testing-library/react-hooks dependency
2026-04-11 17:43:21 +01:00

498 lines
15 KiB
TypeScript

"use client";
import { useState, useMemo, useCallback } from "react";
import {
IconGitPullRequest,
IconCloudUpload,
IconChevronDown,
IconChevronRight,
IconLoader2,
} from "@tabler/icons-react";
import { useMultiSelect } from "@/hooks/use-multi-select";
import { Button } from "@kandev/ui/button";
import { Tooltip, TooltipContent, TooltipTrigger } from "@kandev/ui/tooltip";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from "@kandev/ui/dropdown-menu";
import { cn } from "@/lib/utils";
import type { FileInfo } from "@/lib/state/store";
import { LineStat } from "@/components/diff-stat";
import { FileStatusIcon } from "./file-status-icon";
import { FileRow, BulkActionBar, DefaultActionButtons } from "./changes-panel-file-row";
import { CommitRow, type CommitItem } from "./commit-row";
// --- Timeline visual components ---
type ChangedFile = {
path: string;
status: FileInfo["status"];
staged: boolean;
plus: number | undefined;
minus: number | undefined;
oldPath: string | undefined;
};
// --- Timeline section dot colors ---
const DOT_COLORS = {
unstaged: "bg-yellow-500",
staged: "bg-emerald-500",
commits: "bg-blue-500",
pr: "bg-purple-500",
action: "bg-muted-foreground/25",
} as const;
function TimelineDot({ color }: { color: string }) {
return <div className={cn("relative z-10 size-1.5 rounded-full shrink-0 mt-[5px]", color)} />;
}
function TimelineSection({
dotColor,
label,
count,
action,
isLast,
children,
collapsible = true,
"data-testid": testId,
}: {
dotColor: string;
label?: string;
count?: number;
action?: React.ReactNode;
isLast?: boolean;
children?: React.ReactNode;
collapsible?: boolean;
"data-testid"?: string;
}) {
const [collapsed, setCollapsed] = useState(false);
const canCollapse = collapsible && !!label;
return (
<div className="relative flex gap-2.5" data-testid={testId}>
{/* Vertical line + dot */}
<div className="flex flex-col items-center">
<TimelineDot color={dotColor} />
{!isLast && <div className="w-px flex-1 bg-border/60" />}
</div>
{/* Content */}
<div className="flex-1 min-w-0 pb-3">
{/* Header */}
{label && (
<div className="flex items-center justify-between gap-2 -mt-0.5 mb-1">
{canCollapse ? (
<button
type="button"
className="flex items-center gap-1 text-[11px] font-medium uppercase tracking-wider text-foreground/70 cursor-pointer hover:text-foreground/90"
onClick={() => setCollapsed((c) => !c)}
aria-expanded={!collapsed}
data-testid={`${testId ?? label.toLowerCase()}-collapse-toggle`}
>
{label}
{typeof count === "number" && (
<span className="text-muted-foreground/50 font-normal">({count})</span>
)}
{collapsed ? (
<IconChevronRight className="h-3 w-3 text-muted-foreground/50" />
) : (
<IconChevronDown className="h-3 w-3 text-muted-foreground/50" />
)}
</button>
) : (
<span className="text-[11px] font-medium uppercase tracking-wider text-foreground/70">
{label}
{typeof count === "number" && (
<span className="ml-1 text-muted-foreground/50 font-normal">({count})</span>
)}
</span>
)}
{action}
</div>
)}
{/* Children (file list, buttons, etc.) */}
{!collapsed && children}
</div>
</div>
);
}
// --- Commits section ---
type CommitsSectionProps = {
commits: CommitItem[];
isLast: boolean;
onOpenCommitDetail?: (sha: string) => void;
onRevertCommit?: (sha: string) => void;
onAmendCommit?: (currentMessage: string) => void;
onResetToCommit?: (sha: string) => void;
};
export function CommitsSection({
commits,
isLast,
onOpenCommitDetail,
onRevertCommit,
onAmendCommit,
onResetToCommit,
}: CommitsSectionProps) {
// Find the first unpushed commit for context menu actions (amend/revert only on latest unpushed)
const firstUnpushedIndex = commits.findIndex((c) => c.pushed !== true);
return (
<TimelineSection
dotColor={DOT_COLORS.commits}
label="Commits"
count={commits.length}
isLast={isLast}
data-testid="commits-section"
>
<ul data-testid="commits-list" className="space-y-0.5">
{commits.map((commit, index) => (
<CommitRow
key={`${commit.commit_sha}-${index}`}
commit={commit}
isLatest={index === firstUnpushedIndex}
onOpenCommitDetail={onOpenCommitDetail}
onAmendCommit={commit.pushed ? undefined : onAmendCommit}
onRevertCommit={commit.pushed ? undefined : onRevertCommit}
onResetToCommit={commit.pushed ? undefined : onResetToCommit}
/>
))}
</ul>
</TimelineSection>
);
}
// --- Action buttons section (Create PR / Push) ---
type ActionButtonsSectionProps = {
onOpenPRDialog: () => void;
onPush: () => void;
onForcePush: () => void;
isLoading: boolean;
loadingOperation: string | null;
aheadCount: number;
canPush: boolean;
canCreatePR: boolean;
existingPrUrl?: string;
isLast?: boolean;
};
export function ActionButtonsSection({
onOpenPRDialog,
onPush,
onForcePush,
isLoading,
loadingOperation,
aheadCount,
canPush,
canCreatePR,
existingPrUrl,
isLast = true,
}: ActionButtonsSectionProps) {
const prExists = !!existingPrUrl;
const createPrDisabled = !canCreatePR || prExists || isLoading;
const pushDisabled = !canPush || isLoading;
const isPushing = loadingOperation === "push";
const isCreatingPR = loadingOperation === "create_pr";
let pushTooltip: string | null = null;
if (isLoading) pushTooltip = "A git operation is in progress";
else if (!canPush) pushTooltip = "No commits ahead of remote";
return (
<TimelineSection dotColor={DOT_COLORS.action} isLast={isLast}>
<div className="flex items-center gap-2 -mt-0.5">
<Tooltip>
<TooltipTrigger asChild>
<span>
<Button
size="sm"
variant="outline"
className="h-6 text-[11px] px-2.5 gap-1 cursor-pointer"
onClick={onOpenPRDialog}
disabled={createPrDisabled}
>
{isCreatingPR ? (
<IconLoader2 className="h-3 w-3 animate-spin" />
) : (
<IconGitPullRequest className="h-3 w-3" />
)}
Create PR
</Button>
</span>
</TooltipTrigger>
{prExists && <TooltipContent>A pull request already exists for this task</TooltipContent>}
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<span className="flex items-center">
<Button
size="sm"
variant="outline"
className="h-6 text-[11px] px-2.5 gap-1 cursor-pointer rounded-r-none border-r-0"
onClick={onPush}
disabled={pushDisabled}
>
{isPushing ? (
<IconLoader2 className="h-3 w-3 animate-spin" />
) : (
<IconCloudUpload className="h-3 w-3" />
)}
Push
{aheadCount > 0 && !isPushing && (
<span className="text-muted-foreground">{aheadCount} ahead</span>
)}
</Button>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
size="sm"
variant="outline"
className="h-6 w-5 px-0 cursor-pointer rounded-l-none"
disabled={pushDisabled}
>
<IconChevronDown className="h-3 w-3" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-48">
<DropdownMenuItem className="cursor-pointer gap-2 text-xs" onClick={onForcePush}>
<IconCloudUpload className="h-3.5 w-3.5 shrink-0" />
Force Push (with lease)
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</span>
</TooltipTrigger>
{pushTooltip && <TooltipContent>{pushTooltip}</TooltipContent>}
</Tooltip>
</div>
</TimelineSection>
);
}
// --- File list sections (Unstaged / Staged) ---
type FileListSectionProps = {
variant: "unstaged" | "staged";
files: ChangedFile[];
pendingStageFiles: Set<string>;
isLast: boolean;
actionLabel: string;
isActionLoading?: boolean;
onAction: () => void;
secondaryActionLabel?: string;
isSecondaryActionLoading?: boolean;
onSecondaryAction?: () => void;
onOpenDiff: (path: string) => void;
onEditFile: (path: string) => void;
onStage: (path: string) => void;
onUnstage: (path: string) => void;
onDiscard: (path: string) => void;
onBulkStage?: (paths: string[]) => void;
onBulkUnstage?: (paths: string[]) => void;
onBulkDiscard?: (paths: string[]) => void;
};
export function FileListSection(props: FileListSectionProps) {
const {
variant,
files,
pendingStageFiles,
isLast,
onOpenDiff,
onEditFile,
onStage,
onUnstage,
onDiscard,
} = props;
const dotColor = variant === "unstaged" ? DOT_COLORS.unstaged : DOT_COLORS.staged;
const label = variant === "unstaged" ? "Unstaged" : "Staged";
const filePaths = useMemo(() => files.map((f) => f.path), [files]);
const multiSelect = useMultiSelect({ items: filePaths });
const hasSelection = multiSelect.selectedPaths.size > 0;
const handleKeyDown = useCallback(
(e: React.KeyboardEvent) => {
if (e.key === "Escape" && hasSelection) multiSelect.clearSelection();
},
[hasSelection, multiSelect],
);
return (
<TimelineSection
dotColor={dotColor}
label={label}
count={files.length}
isLast={isLast}
data-testid={`${variant}-files-section`}
>
{files.length > 0 && (
<div>
<ul
data-testid={`${variant}-file-list`}
className="space-y-0.5"
tabIndex={-1}
onKeyDown={handleKeyDown}
>
{files.map((file) => (
<FileRow
key={file.path}
file={file}
isPending={pendingStageFiles.has(file.path)}
isSelected={multiSelect.isSelected(file.path)}
onSelect={multiSelect.handleClick}
onOpenDiff={onOpenDiff}
onStage={onStage}
onUnstage={onUnstage}
onDiscard={onDiscard}
onEditFile={onEditFile}
/>
))}
</ul>
</div>
)}
{files.length > 0 && (
<div className="mt-1.5 flex items-center gap-1.5">
{hasSelection ? (
<BulkActionBar
variant={variant}
selectionCount={multiSelect.selectedPaths.size}
selectedPaths={multiSelect.selectedPaths}
onBulkStage={props.onBulkStage}
onBulkUnstage={props.onBulkUnstage}
onBulkDiscard={props.onBulkDiscard}
/>
) : (
<DefaultActionButtons
actionLabel={props.actionLabel}
isActionLoading={props.isActionLoading}
onAction={props.onAction}
secondaryActionLabel={props.secondaryActionLabel}
isSecondaryActionLoading={props.isSecondaryActionLoading}
onSecondaryAction={props.onSecondaryAction}
/>
)}
</div>
)}
</TimelineSection>
);
}
// --- PR files section (read-only, from GitHub PR diff) ---
export type PRChangedFile = {
path: string;
status: FileInfo["status"];
plus: number | undefined;
minus: number | undefined;
oldPath: string | undefined;
};
type PRFilesSectionProps = {
files: PRChangedFile[];
isLast: boolean;
onOpenDiff: (path: string) => void;
};
export function PRFilesSection({ files, isLast, onOpenDiff }: PRFilesSectionProps) {
return (
<TimelineSection
dotColor={DOT_COLORS.pr}
label="PR Changes"
count={files.length}
isLast={isLast}
data-testid="pr-changes-section"
>
{files.length > 0 && (
<ul className="space-y-0.5">
{files.map((file) => (
<PRFileRow key={file.path} file={file} onOpenDiff={onOpenDiff} />
))}
</ul>
)}
</TimelineSection>
);
}
function PRFileRow({
file,
onOpenDiff,
}: {
file: PRChangedFile;
onOpenDiff: (path: string) => void;
}) {
const lastSlash = file.path.lastIndexOf("/");
const folder = lastSlash === -1 ? "" : file.path.slice(0, lastSlash);
const name = lastSlash === -1 ? file.path : file.path.slice(lastSlash + 1);
return (
<li
className="group flex items-center justify-between gap-2 text-sm rounded-md px-1 py-0.5 -mx-1 hover:bg-muted/60 cursor-pointer"
onClick={() => onOpenDiff(file.path)}
>
<div className="flex items-center gap-2 min-w-0">
<div className="flex-shrink-0 flex items-center justify-center size-4">
<IconGitPullRequest className="h-3 w-3 text-purple-500" />
</div>
<button type="button" className="min-w-0 text-left cursor-pointer" title={file.path}>
<p className="flex text-foreground text-xs min-w-0">
{folder && <span className="text-foreground/60 truncate shrink">{folder}/</span>}
<span className="font-medium text-foreground whitespace-nowrap shrink-0">{name}</span>
</p>
</button>
</div>
<div className="flex items-center gap-2">
<LineStat added={file.plus} removed={file.minus} />
<FileStatusIcon status={file.status} />
</div>
</li>
);
}
// --- Review progress bar ---
type ReviewProgressBarProps = {
reviewedCount: number;
totalFileCount: number;
onOpenReview?: () => void;
};
export function ReviewProgressBar({
reviewedCount,
totalFileCount,
onOpenReview,
}: ReviewProgressBarProps) {
const progressPercent = totalFileCount > 0 ? (reviewedCount / totalFileCount) * 100 : 0;
if (totalFileCount <= 0) return null;
return (
<Tooltip>
<TooltipTrigger asChild>
<div
className="shrink-0 flex items-center gap-2 pt-2 border-t border-border/40 cursor-pointer transition-colors"
onClick={onOpenReview}
>
<div className="flex-1 h-0.5 rounded-full bg-muted-foreground/10 overflow-hidden">
<div
className="h-full bg-muted-foreground/25 rounded-full transition-all duration-300"
style={{ width: `${progressPercent}%` }}
/>
</div>
<span className="text-[10px] text-muted-foreground/40 whitespace-nowrap">
{reviewedCount}/{totalFileCount} reviewed
</span>
</div>
</TooltipTrigger>
<TooltipContent>
{reviewedCount} of {totalFileCount} files reviewed
</TooltipContent>
</Tooltip>
);
}