2b8513f902
* 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
267 lines
7.8 KiB
TypeScript
267 lines
7.8 KiB
TypeScript
"use client";
|
|
|
|
import { useState } from "react";
|
|
import { IconGitCommit, IconLoader2, IconCheck } from "@tabler/icons-react";
|
|
|
|
import { Button } from "@kandev/ui/button";
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
DialogFooter,
|
|
DialogClose,
|
|
} from "@kandev/ui/dialog";
|
|
import {
|
|
AlertDialog,
|
|
AlertDialogAction,
|
|
AlertDialogCancel,
|
|
AlertDialogContent,
|
|
AlertDialogDescription,
|
|
AlertDialogFooter,
|
|
AlertDialogHeader,
|
|
AlertDialogTitle,
|
|
} from "@kandev/ui/alert-dialog";
|
|
import { Label } from "@kandev/ui/label";
|
|
import { Input } from "@kandev/ui/input";
|
|
import { Textarea } from "@kandev/ui/textarea";
|
|
import { RadioGroup, RadioGroupItem } from "@kandev/ui/radio-group";
|
|
|
|
// --- Discard Confirmation Dialog ---
|
|
|
|
type DiscardDialogProps = {
|
|
open: boolean;
|
|
onOpenChange: (open: boolean) => void;
|
|
fileToDiscard: string | null;
|
|
filesToDiscard: string[] | null;
|
|
onConfirm: () => void;
|
|
};
|
|
|
|
export function DiscardDialog({
|
|
open,
|
|
onOpenChange,
|
|
fileToDiscard,
|
|
filesToDiscard,
|
|
onConfirm,
|
|
}: DiscardDialogProps) {
|
|
const isBulk = filesToDiscard && filesToDiscard.length > 1;
|
|
const displayFile = fileToDiscard ?? (filesToDiscard?.length === 1 ? filesToDiscard[0] : null);
|
|
const description = isBulk
|
|
? `This will permanently discard all changes to ${filesToDiscard.length} files. This action cannot be undone.`
|
|
: null;
|
|
|
|
return (
|
|
<AlertDialog open={open} onOpenChange={onOpenChange}>
|
|
<AlertDialogContent>
|
|
<AlertDialogHeader>
|
|
<AlertDialogTitle>Discard changes?</AlertDialogTitle>
|
|
<AlertDialogDescription>
|
|
{description ?? (
|
|
<>
|
|
This will permanently discard all changes to{" "}
|
|
<span className="font-semibold">{displayFile}</span>. This action cannot be undone.
|
|
</>
|
|
)}
|
|
</AlertDialogDescription>
|
|
</AlertDialogHeader>
|
|
<AlertDialogFooter>
|
|
<AlertDialogCancel>Cancel</AlertDialogCancel>
|
|
<AlertDialogAction
|
|
onClick={onConfirm}
|
|
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
|
|
>
|
|
Discard
|
|
</AlertDialogAction>
|
|
</AlertDialogFooter>
|
|
</AlertDialogContent>
|
|
</AlertDialog>
|
|
);
|
|
}
|
|
|
|
// --- Amend Commit Message Dialog ---
|
|
|
|
type AmendDialogProps = {
|
|
open: boolean;
|
|
onOpenChange: (open: boolean) => void;
|
|
amendMessage: string;
|
|
onAmendMessageChange: (value: string) => void;
|
|
onAmend: () => void;
|
|
isLoading: boolean;
|
|
};
|
|
|
|
export function AmendDialog({
|
|
open,
|
|
onOpenChange,
|
|
amendMessage,
|
|
onAmendMessageChange,
|
|
onAmend,
|
|
isLoading,
|
|
}: AmendDialogProps) {
|
|
return (
|
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
|
<DialogContent className="sm:max-w-[500px]">
|
|
<DialogHeader>
|
|
<DialogTitle className="flex items-center gap-2">
|
|
<IconGitCommit className="h-5 w-5" />
|
|
Amend Commit Message
|
|
</DialogTitle>
|
|
</DialogHeader>
|
|
<div className="space-y-4 py-2">
|
|
<p className="text-sm text-muted-foreground">
|
|
Edit the message for the most recent commit.
|
|
</p>
|
|
<Textarea
|
|
placeholder="Enter new commit message..."
|
|
value={amendMessage}
|
|
onChange={(e) => onAmendMessageChange(e.target.value)}
|
|
rows={4}
|
|
className="resize-none"
|
|
autoFocus
|
|
/>
|
|
</div>
|
|
<DialogFooter>
|
|
<DialogClose asChild>
|
|
<Button type="button" variant="outline" className="cursor-pointer">
|
|
Cancel
|
|
</Button>
|
|
</DialogClose>
|
|
<Button
|
|
onClick={onAmend}
|
|
disabled={!amendMessage.trim() || isLoading}
|
|
className="cursor-pointer"
|
|
>
|
|
{isLoading ? (
|
|
<>
|
|
<IconLoader2 className="h-4 w-4 animate-spin mr-2" />
|
|
Amending...
|
|
</>
|
|
) : (
|
|
<>
|
|
<IconCheck className="h-4 w-4 mr-2" />
|
|
Amend
|
|
</>
|
|
)}
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
}
|
|
|
|
// --- Reset to Commit Dialog ---
|
|
|
|
type ResetDialogProps = {
|
|
open: boolean;
|
|
onOpenChange: (open: boolean) => void;
|
|
commitSha: string | null;
|
|
onReset: (mode: "soft" | "hard") => void;
|
|
isLoading: boolean;
|
|
};
|
|
|
|
export function ResetDialog({
|
|
open,
|
|
onOpenChange,
|
|
commitSha,
|
|
onReset,
|
|
isLoading,
|
|
}: ResetDialogProps) {
|
|
const shortSha = commitSha?.slice(0, 7) ?? "";
|
|
const [mode, setMode] = useState<"soft" | "hard">("soft");
|
|
const [confirmation, setConfirmation] = useState("");
|
|
|
|
const isHardResetConfirmed = mode === "hard" && confirmation === shortSha;
|
|
const canReset = !!commitSha && (mode === "soft" || isHardResetConfirmed);
|
|
|
|
const handleOpenChange = (newOpen: boolean) => {
|
|
if (!newOpen) {
|
|
// Reset state when closing
|
|
setMode("soft");
|
|
setConfirmation("");
|
|
}
|
|
onOpenChange(newOpen);
|
|
};
|
|
|
|
const handleReset = () => {
|
|
if (canReset) {
|
|
onReset(mode);
|
|
}
|
|
};
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={handleOpenChange}>
|
|
<DialogContent className="sm:max-w-[450px]">
|
|
<DialogHeader>
|
|
<DialogTitle>Reset to commit {shortSha}</DialogTitle>
|
|
</DialogHeader>
|
|
<div className="space-y-4 py-2">
|
|
<RadioGroup
|
|
value={mode}
|
|
onValueChange={(v) => setMode(v as "soft" | "hard")}
|
|
className="space-y-3"
|
|
>
|
|
<div className="flex items-start space-x-3">
|
|
<RadioGroupItem value="soft" id="reset-soft" className="mt-1" />
|
|
<div className="flex-1">
|
|
<Label htmlFor="reset-soft" className="font-medium cursor-pointer">
|
|
Soft Reset
|
|
</Label>
|
|
<p className="text-sm text-muted-foreground">
|
|
Move HEAD to this commit. Keep all changes staged.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div className="flex items-start space-x-3">
|
|
<RadioGroupItem value="hard" id="reset-hard" className="mt-1" />
|
|
<div className="flex-1">
|
|
<Label htmlFor="reset-hard" className="font-medium cursor-pointer text-destructive">
|
|
Hard Reset
|
|
</Label>
|
|
<p className="text-sm text-muted-foreground">
|
|
Discard all changes permanently. This cannot be undone.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</RadioGroup>
|
|
|
|
{mode === "hard" && (
|
|
<div className="space-y-2 p-3 border border-destructive/50 rounded-md bg-destructive/5">
|
|
<p className="text-xs text-destructive font-medium">
|
|
Type <code className="bg-muted px-1 rounded">{shortSha}</code> to confirm:
|
|
</p>
|
|
<Input
|
|
value={confirmation}
|
|
onChange={(e) => setConfirmation(e.target.value)}
|
|
placeholder={shortSha}
|
|
className="font-mono h-8 text-sm"
|
|
autoComplete="off"
|
|
/>
|
|
</div>
|
|
)}
|
|
</div>
|
|
<DialogFooter>
|
|
<DialogClose asChild>
|
|
<Button type="button" variant="outline" disabled={isLoading} className="cursor-pointer">
|
|
Cancel
|
|
</Button>
|
|
</DialogClose>
|
|
<Button
|
|
onClick={handleReset}
|
|
disabled={!canReset || isLoading}
|
|
variant={mode === "hard" ? "destructive" : "default"}
|
|
className="cursor-pointer"
|
|
>
|
|
{isLoading ? (
|
|
<>
|
|
<IconLoader2 className="h-4 w-4 animate-spin mr-2" />
|
|
Resetting...
|
|
</>
|
|
) : (
|
|
<>Reset</>
|
|
)}
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
}
|