M1.5: main window layout and project tree against mocked engine events
Left Project tool window (hide/show stripe, pointer and keyboard resize), editor area placeholder and status bar. Project tree with lazy project.children listings, WAI-ARIA keyboard navigation, Lucide icons, dimmed ignored/excluded entries and refresh on TreeChanged. Empty state runs project.openDialog. Pinia store fed only by engine events and command results; events come through a local onEngineEvent adapter until the desktop bridge (M1.4) lands. Lucide via @lucide/vue (the renamed lucide-vue-next, ISC). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
faadb05eb3
commit
003b7970e6
16 changed files with 1541 additions and 32 deletions
230
ui/tests/project/ProjectTree.test.ts
Normal file
230
ui/tests/project/ProjectTree.test.ts
Normal file
|
|
@ -0,0 +1,230 @@
|
|||
/**
|
||||
* Tests for the Project tool window: empty state, lazy expansion, keyboard
|
||||
* navigation, refresh on `TreeChanged` and error display. The engine is
|
||||
* mocked: `invoke` answers `project.children` from an in-memory folder and
|
||||
* events go through the local dispatcher in `engineEvents.ts`.
|
||||
*/
|
||||
import { flushPromises, mount, type VueWrapper } from "@vue/test-utils";
|
||||
import { createPinia, setActivePinia } from "pinia";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
const invoke = vi.hoisted(() => vi.fn());
|
||||
vi.mock("@tauri-apps/api/core", () => ({ invoke }));
|
||||
|
||||
import { emitEngineEvent, type TreeEntry } from "../../src/components/project/engineEvents";
|
||||
import ProjectToolWindow from "../../src/components/project/ProjectToolWindow.vue";
|
||||
import { useProjectStore } from "../../src/stores/project";
|
||||
|
||||
/** In-memory folder listings by directory, as `project.children` returns them. */
|
||||
let folder: Record<string, TreeEntry[]>;
|
||||
|
||||
/**
|
||||
* Builds an entry.
|
||||
*
|
||||
* @param path - project-relative path.
|
||||
* @param kind - entry kind.
|
||||
* @param ignored - ignore flag.
|
||||
*/
|
||||
function entry(path: string, kind: "dir" | "file", ignored = false): TreeEntry {
|
||||
return { name: path.split("/").pop() ?? path, path, kind, ignored };
|
||||
}
|
||||
|
||||
/** Mock engine: answers `project.children`, accepts other commands. */
|
||||
function engine(command: string, args: { command: string; params: { dir?: string } }): unknown {
|
||||
if (command !== "engine_execute") {
|
||||
return Promise.reject(new Error(`unexpected ${command}`));
|
||||
}
|
||||
if (args.command === "project.children") {
|
||||
const dir = args.params.dir ?? "";
|
||||
const entries = folder[dir];
|
||||
return entries
|
||||
? Promise.resolve(entries)
|
||||
: Promise.reject(Object.assign(new Error(`cannot list ${dir}`), { code: "not_found" }));
|
||||
}
|
||||
return Promise.resolve(null);
|
||||
}
|
||||
|
||||
/** Mounts the tool window and opens the mock project through an event. */
|
||||
async function mountOpen(): Promise<VueWrapper> {
|
||||
const wrapper = mount(ProjectToolWindow, { attachTo: document.body });
|
||||
emitEngineEvent({ type: "ProjectOpened", root: { path: "/tmp/demo", name: "demo" } });
|
||||
await flushPromises();
|
||||
return wrapper;
|
||||
}
|
||||
|
||||
/** Visible entry paths, in order. */
|
||||
function paths(wrapper: VueWrapper): string[] {
|
||||
return wrapper.findAll("[data-test=tree-row]").map((row) => row.attributes("data-path") ?? "");
|
||||
}
|
||||
|
||||
/**
|
||||
* Presses a key on the tree and waits for the engine.
|
||||
*
|
||||
* @param wrapper - the mounted tool window.
|
||||
* @param key - the key name.
|
||||
*/
|
||||
async function press(wrapper: VueWrapper, key: string): Promise<void> {
|
||||
await wrapper.get("[data-test=project-tree]").trigger("keydown", { key });
|
||||
await flushPromises();
|
||||
}
|
||||
|
||||
/** Path of the selected row, or null. */
|
||||
function selectedPath(wrapper: VueWrapper): string | null {
|
||||
const row = wrapper.find("[data-test=tree-row][aria-selected=true]");
|
||||
return row.exists() ? (row.attributes("data-path") ?? null) : null;
|
||||
}
|
||||
|
||||
/** Calls of `project.children`, as the `dir` params. */
|
||||
function childrenCalls(): string[] {
|
||||
return invoke.mock.calls
|
||||
.filter((call) => (call[1] as { command: string }).command === "project.children")
|
||||
.map((call) => (call[1] as { params: { dir: string } }).params.dir);
|
||||
}
|
||||
|
||||
describe("ProjectToolWindow", () => {
|
||||
let wrapper: VueWrapper | null = null;
|
||||
|
||||
beforeEach(() => {
|
||||
setActivePinia(createPinia());
|
||||
invoke.mockReset();
|
||||
invoke.mockImplementation(engine);
|
||||
folder = {
|
||||
"": [entry("src", "dir"), entry("vendor", "dir"), entry("node_modules", "dir", true), entry("index.php", "file")],
|
||||
src: [entry("src/Controller", "dir"), entry("src/App.php", "file")],
|
||||
"src/Controller": [entry("src/Controller/Home.php", "file")],
|
||||
};
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
wrapper?.unmount();
|
||||
wrapper = null;
|
||||
});
|
||||
|
||||
it("shows the empty state and runs the open-folder command", async () => {
|
||||
wrapper = mount(ProjectToolWindow);
|
||||
expect(wrapper.find("[data-test=project-empty]").exists()).toBe(true);
|
||||
await wrapper.get("[data-test=open-folder]").trigger("click");
|
||||
await flushPromises();
|
||||
expect(invoke).toHaveBeenCalledWith("engine_execute", { command: "project.openDialog", params: {} });
|
||||
});
|
||||
|
||||
it("shows an open-folder failure", async () => {
|
||||
invoke.mockRejectedValue({ code: "internal", message: "no dialog" });
|
||||
wrapper = mount(ProjectToolWindow);
|
||||
await wrapper.get("[data-test=open-folder]").trigger("click");
|
||||
await flushPromises();
|
||||
expect(wrapper.get("[data-test=project-error]").text()).toBe("no dialog");
|
||||
});
|
||||
|
||||
it("lists the root after ProjectOpened and dims ignored entries", async () => {
|
||||
wrapper = await mountOpen();
|
||||
expect(paths(wrapper)).toEqual(["src", "vendor", "node_modules", "index.php"]);
|
||||
expect(childrenCalls()).toEqual([""]);
|
||||
const rows = wrapper.findAll("[data-test=tree-row]");
|
||||
expect(rows[2]?.classes()).toContain("tree__row--dimmed");
|
||||
expect(rows[0]?.classes()).not.toContain("tree__row--dimmed");
|
||||
});
|
||||
|
||||
it("expands lazily on chevron click and collapses again", async () => {
|
||||
wrapper = await mountOpen();
|
||||
await wrapper.findAll("[data-test=tree-chevron]")[0]?.trigger("click");
|
||||
await flushPromises();
|
||||
expect(paths(wrapper)).toEqual(["src", "src/Controller", "src/App.php", "vendor", "node_modules", "index.php"]);
|
||||
expect(childrenCalls()).toEqual(["", "src"]);
|
||||
await wrapper.findAll("[data-test=tree-chevron]")[0]?.trigger("click");
|
||||
await flushPromises();
|
||||
expect(paths(wrapper)).toEqual(["src", "vendor", "node_modules", "index.php"]);
|
||||
await wrapper.findAll("[data-test=tree-chevron]")[0]?.trigger("click");
|
||||
await flushPromises();
|
||||
expect(childrenCalls()).toEqual(["", "src"]);
|
||||
});
|
||||
|
||||
it("navigates with the keyboard", async () => {
|
||||
wrapper = await mountOpen();
|
||||
await wrapper.get("[data-test=project-tree]").trigger("focus");
|
||||
expect(selectedPath(wrapper)).toBe("src");
|
||||
await press(wrapper, "ArrowRight");
|
||||
expect(paths(wrapper)).toContain("src/App.php");
|
||||
expect(selectedPath(wrapper)).toBe("src");
|
||||
await press(wrapper, "ArrowRight");
|
||||
expect(selectedPath(wrapper)).toBe("src/Controller");
|
||||
await press(wrapper, "Enter");
|
||||
expect(paths(wrapper)).toContain("src/Controller/Home.php");
|
||||
await press(wrapper, "ArrowDown");
|
||||
expect(selectedPath(wrapper)).toBe("src/Controller/Home.php");
|
||||
await press(wrapper, "Enter");
|
||||
expect(invoke).toHaveBeenCalledWith("engine_execute", {
|
||||
command: "file.open",
|
||||
params: { path: "src/Controller/Home.php" },
|
||||
});
|
||||
await press(wrapper, "ArrowLeft");
|
||||
expect(selectedPath(wrapper)).toBe("src/Controller");
|
||||
await press(wrapper, "ArrowLeft");
|
||||
expect(paths(wrapper)).not.toContain("src/Controller/Home.php");
|
||||
await press(wrapper, "ArrowUp");
|
||||
expect(selectedPath(wrapper)).toBe("src");
|
||||
await press(wrapper, "ArrowUp");
|
||||
expect(selectedPath(wrapper)).toBe("src");
|
||||
await press(wrapper, "End");
|
||||
expect(selectedPath(wrapper)).toBe("index.php");
|
||||
await press(wrapper, "ArrowDown");
|
||||
expect(selectedPath(wrapper)).toBe("index.php");
|
||||
await press(wrapper, "Home");
|
||||
expect(selectedPath(wrapper)).toBe("src");
|
||||
const tree = wrapper.get("[data-test=project-tree]");
|
||||
expect(tree.attributes("aria-activedescendant")).toBe(wrapper.get("[aria-selected=true]").attributes("id"));
|
||||
});
|
||||
|
||||
it("reloads a loaded directory on TreeChanged and drops removed entries", async () => {
|
||||
wrapper = await mountOpen();
|
||||
await wrapper.get("[data-test=project-tree]").trigger("focus");
|
||||
await press(wrapper, "ArrowRight");
|
||||
await press(wrapper, "ArrowRight");
|
||||
await press(wrapper, "ArrowRight");
|
||||
expect(selectedPath(wrapper)).toBe("src/Controller");
|
||||
folder.src = [entry("src/App.php", "file"), entry("src/Kernel.php", "file")];
|
||||
emitEngineEvent({ type: "TreeChanged", dir: "src" });
|
||||
await flushPromises();
|
||||
expect(paths(wrapper)).toEqual(["src", "src/App.php", "src/Kernel.php", "vendor", "node_modules", "index.php"]);
|
||||
expect(selectedPath(wrapper)).toBeNull();
|
||||
const store = useProjectStore();
|
||||
expect(store.expanded.has("src/Controller")).toBe(false);
|
||||
expect(store.dirs["src/Controller"]).toBeUndefined();
|
||||
});
|
||||
|
||||
it("ignores TreeChanged for directories never loaded", async () => {
|
||||
wrapper = await mountOpen();
|
||||
emitEngineEvent({ type: "TreeChanged", dir: "vendor" });
|
||||
await flushPromises();
|
||||
expect(childrenCalls()).toEqual([""]);
|
||||
});
|
||||
|
||||
it("shows a project.children error in the tree instead of throwing", async () => {
|
||||
wrapper = await mountOpen();
|
||||
await wrapper.findAll("[data-test=tree-chevron]")[1]?.trigger("click");
|
||||
await flushPromises();
|
||||
const error = wrapper.get("[data-test=tree-error]");
|
||||
expect(error.text()).toBe("cannot list vendor");
|
||||
expect(paths(wrapper)).toEqual(["src", "vendor", "node_modules", "index.php"]);
|
||||
});
|
||||
|
||||
it("keeps old entries when a refresh fails", async () => {
|
||||
wrapper = await mountOpen();
|
||||
Reflect.deleteProperty(folder, "");
|
||||
emitEngineEvent({ type: "TreeChanged", dir: "" });
|
||||
await flushPromises();
|
||||
expect(wrapper.get("[data-test=tree-error]").text()).toBe("cannot list");
|
||||
expect(paths(wrapper)).toEqual(["src", "vendor", "node_modules", "index.php"]);
|
||||
});
|
||||
|
||||
it("returns to the empty state on ProjectClosed and unsubscribes on unmount", async () => {
|
||||
wrapper = await mountOpen();
|
||||
emitEngineEvent({ type: "ProjectClosed" });
|
||||
await flushPromises();
|
||||
expect(wrapper.find("[data-test=project-empty]").exists()).toBe(true);
|
||||
wrapper.unmount();
|
||||
wrapper = null;
|
||||
emitEngineEvent({ type: "ProjectOpened", root: { path: "/tmp/other", name: "other" } });
|
||||
expect(useProjectStore().root).toBeNull();
|
||||
});
|
||||
});
|
||||
51
ui/tests/project/store.test.ts
Normal file
51
ui/tests/project/store.test.ts
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
/**
|
||||
* Tests for the project store on its own: stale listings are dropped and
|
||||
* events of unknown kinds are ignored.
|
||||
*/
|
||||
import { createPinia, setActivePinia } from "pinia";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
const invoke = vi.hoisted(() => vi.fn());
|
||||
vi.mock("@tauri-apps/api/core", () => ({ invoke }));
|
||||
|
||||
import type { EngineEvent } from "../../src/components/project/engineEvents";
|
||||
import { parentOf, useProjectStore } from "../../src/stores/project";
|
||||
|
||||
describe("project store", () => {
|
||||
beforeEach(() => {
|
||||
setActivePinia(createPinia());
|
||||
invoke.mockReset();
|
||||
});
|
||||
|
||||
it("drops a listing that was superseded by a newer request", async () => {
|
||||
const resolvers: ((value: unknown) => void)[] = [];
|
||||
invoke.mockImplementation(() => new Promise((resolve) => resolvers.push(resolve)));
|
||||
const store = useProjectStore();
|
||||
store.handleEvent({ type: "ProjectOpened", root: { path: "/p", name: "p" } });
|
||||
const second = store.loadChildren("");
|
||||
resolvers[1]?.([{ name: "new.php", path: "new.php", kind: "file", ignored: false }]);
|
||||
await second;
|
||||
resolvers[0]?.([{ name: "old.php", path: "old.php", kind: "file", ignored: false }]);
|
||||
await Promise.resolve();
|
||||
expect(store.rows.map((row) => (row.kind === "entry" ? row.entry.path : row.kind))).toEqual(["new.php"]);
|
||||
});
|
||||
|
||||
it("shows a loading row while the root lists", () => {
|
||||
invoke.mockImplementation(() => new Promise(() => undefined));
|
||||
const store = useProjectStore();
|
||||
store.handleEvent({ type: "ProjectOpened", root: { path: "/p", name: "p" } });
|
||||
expect(store.rows).toEqual([{ kind: "loading", dir: "", depth: 0 }]);
|
||||
});
|
||||
|
||||
it("ignores events it does not handle", () => {
|
||||
const store = useProjectStore();
|
||||
store.handleEvent({ type: "BufferOpened" } as unknown as EngineEvent);
|
||||
expect(store.root).toBeNull();
|
||||
expect(invoke).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("computes parents", () => {
|
||||
expect(parentOf("a/b/c.php")).toBe("a/b");
|
||||
expect(parentOf("c.php")).toBe("");
|
||||
});
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue