Files
kandev/apps/web/components/task/file-tree-utils.test.ts
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

106 lines
4.0 KiB
TypeScript

import { describe, it, expect } from "vitest";
import type { FileTreeNode } from "@/lib/types/backend";
import {
moveNodesInTree,
computeMoveTargets,
findNodeByPath,
getVisiblePaths,
} from "./file-tree-utils";
function file(name: string, parentPath = ""): FileTreeNode {
const path = parentPath ? `${parentPath}/${name}` : name;
return { name, path, is_dir: false, size: 0 };
}
function dir(name: string, children: FileTreeNode[], parentPath = ""): FileTreeNode {
const path = parentPath ? `${parentPath}/${name}` : name;
return { name, path, is_dir: true, children };
}
function root(children: FileTreeNode[]): FileTreeNode {
return { name: "", path: "", is_dir: true, children };
}
const UTILS_TS = "utils.ts";
describe("computeMoveTargets", () => {
it("computes simple move without collision", () => {
const tree = root([file("a.ts"), dir("lib", [file("b.ts", "lib")])]);
const result = computeMoveTargets(tree, ["a.ts"], "lib");
expect(result).toEqual([{ oldPath: "a.ts", newPath: "lib/a.ts" }]);
});
it("deduplicates when target already has a file with the same name", () => {
const tree = root([dir("src", [file(UTILS_TS, "src")]), dir("lib", [file(UTILS_TS, "lib")])]);
const result = computeMoveTargets(tree, [`src/${UTILS_TS}`], "lib");
expect(result).toEqual([{ oldPath: `src/${UTILS_TS}`, newPath: "lib/utils (1).ts" }]);
});
it("deduplicates when two source files have the same name", () => {
const tree = root([
dir("src", [file(UTILS_TS, "src")]),
dir("lib", [file(UTILS_TS, "lib")]),
dir("target", []),
]);
const result = computeMoveTargets(tree, [`src/${UTILS_TS}`, `lib/${UTILS_TS}`], "target");
expect(result).toEqual([
{ oldPath: `src/${UTILS_TS}`, newPath: `target/${UTILS_TS}` },
{ oldPath: `lib/${UTILS_TS}`, newPath: "target/utils (1).ts" },
]);
});
it("deduplicates with multiple existing collisions", () => {
const tree = root([
file("readme.md"),
dir("dest", [file("readme.md", "dest"), file("readme (1).md", "dest")]),
]);
const result = computeMoveTargets(tree, ["readme.md"], "dest");
expect(result).toEqual([{ oldPath: "readme.md", newPath: "dest/readme (2).md" }]);
});
it("handles files without extensions", () => {
const tree = root([file("Makefile"), dir("dest", [file("Makefile", "dest")])]);
const result = computeMoveTargets(tree, ["Makefile"], "dest");
expect(result).toEqual([{ oldPath: "Makefile", newPath: "dest/Makefile (1)" }]);
});
});
describe("moveNodesInTree", () => {
it("moves a file into a directory", () => {
const tree = root([file("a.ts"), dir("lib", [])]);
const result = moveNodesInTree(tree, ["a.ts"], "lib");
expect(findNodeByPath(result, "a.ts")).toBeNull();
expect(findNodeByPath(result, "lib/a.ts")).not.toBeNull();
});
it("deduplicates on collision during move", () => {
const tree = root([
dir("src", [file("x.ts", "src")]),
dir("lib", [file("x.ts", "lib")]),
dir("dest", []),
]);
const result = moveNodesInTree(tree, ["src/x.ts", "lib/x.ts"], "dest");
expect(findNodeByPath(result, "dest/x.ts")).not.toBeNull();
expect(findNodeByPath(result, "dest/x (1).ts")).not.toBeNull();
expect(findNodeByPath(result, "src/x.ts")).toBeNull();
expect(findNodeByPath(result, "lib/x.ts")).toBeNull();
});
});
describe("getVisiblePaths", () => {
it("returns all nodes in DFS order including directories", () => {
const tree = root([dir("lib", [file("config.ts", "lib")], ""), file("readme.md")]);
const expanded = new Set(["lib"]);
const paths = getVisiblePaths(tree, expanded);
// dirs first then files, alphabetical within each group
expect(paths).toEqual(["lib", "lib/config.ts", "readme.md"]);
});
it("excludes collapsed directory children", () => {
const tree = root([dir("lib", [file("config.ts", "lib")], ""), file("readme.md")]);
const expanded = new Set<string>();
const paths = getVisiblePaths(tree, expanded);
expect(paths).toEqual(["lib", "readme.md"]);
});
});