* feat(app): let the file panel close its tree rail The file panel's tree rail was permanent on desktop — the changes panel had a folder-tree toggle in its toolbar, the file toolbar had nothing, so the rail was there whether you wanted it or not. The changes panel's private DesktopTreeToggle becomes a shared TreeRailToggle so both toolbars render the same affordance; that also drops the treeToggleStyle prop threaded through ChangesToolbarProps, which recomputed exactly what the component already built internally. The i18n keys move out of workspace.git.diff into workspace.tree, since a shared component reaching into the git namespace would rot. The two rails keep independent flags — the file rail in panel-store, the changes rail in useChangesPreferences — so closing one leaves the other alone. FileTreeToggle wires itself to the store rather than taking a callback: the bar renders several components below FilePanel, where the rail actually lives. Both rails also get narrower (320 -> 260 default, 200 -> 180 minimum). The persist version bump resets treeRailWidth on purpose: nearly every existing install carries the old 320 default, so without the reset the narrower rail would only ever reach new users. Anyone who dragged their rail to a deliberate custom width loses it once. Note that MIN_CONTENT_WIDTH still clamps the rail to `containerWidth - 240`, so in a narrow pane the new default never applies — that floor, not the default, is what sets the width there. * feat(app): make the side panel an empty workspace surface The fixed, hideable side panel keeps supporting context beside an agent without seeding content. Pane-local choices stay local, while implicit supporting opens follow a persisted routing preference. * test(app): exercise side panel policy through its capability boundary The browser rail journey already covers the real tree-toggle behavior. Side-panel policy tests now pass their platform capability through the public boundary instead of replacing a production module. * test(app): expect an empty side panel after upgrade * test(app): expect an empty first split pane * test(app): account for the empty side panel in split retention * feat(app): make workspace panel tabs independent Give explicit New actions fresh tab instances, keep panel state opaque to tab management, preserve File navigation context, and stabilize uncached File transitions. * fix(app): preserve file conflicts during preview refresh Keep the current preview mounted for same-target reads and conversions so the editor retains its conflict observation state. Clear retained previews only when the file target changes.
126 lines
5.2 KiB
TypeScript
126 lines
5.2 KiB
TypeScript
import { execFileSync } from "node:child_process";
|
|
import { writeFile } from "node:fs/promises";
|
|
import path from "node:path";
|
|
import type { Locator } from "@playwright/test";
|
|
import { test, expect } from "../support/fixtures";
|
|
import { openChangesPanel } from "../support/helpers/workspace-tabs";
|
|
|
|
const COMMIT_SUBJECT = "Show commit timestamps";
|
|
|
|
test("commit history explains when the workspace has no commits ahead of its base", async ({
|
|
page,
|
|
withWorkspace,
|
|
}) => {
|
|
const workspace = await withWorkspace({ prefix: "commit-history-empty-workspace-" });
|
|
execFileSync("git", ["checkout", "-b", "feature"], { cwd: workspace.repoPath, stdio: "ignore" });
|
|
await workspace.navigateTo();
|
|
|
|
await openChangesPanel(page);
|
|
const commitsSection = page.getByRole("button", { name: /Commits/i });
|
|
await expect(commitsSection).toBeVisible({ timeout: 30_000 });
|
|
await commitsSection.click();
|
|
|
|
await expect(page.getByTestId("commits-section-no-workspace-commits")).toHaveText(
|
|
"No commits ahead of main yet",
|
|
{ timeout: 30_000 },
|
|
);
|
|
});
|
|
|
|
test("commit history shows dates and shares diff layout preferences", async ({
|
|
page,
|
|
withWorkspace,
|
|
}) => {
|
|
const workspace = await withWorkspace({ prefix: "commit-diff-panel-" });
|
|
await createFeatureCommit(workspace.repoPath);
|
|
await page.setViewportSize({ width: 1400, height: 900 });
|
|
await workspace.navigateTo();
|
|
|
|
await openChangesPanel(page);
|
|
const commitsSection = page.getByRole("button", { name: /Commits/i });
|
|
await expect(commitsSection).toBeVisible({ timeout: 30_000 });
|
|
await commitsSection.click();
|
|
|
|
const commitRow = page.locator('[data-testid^="commit-row-"]').filter({
|
|
hasText: COMMIT_SUBJECT,
|
|
});
|
|
await expect(commitRow).toContainText(COMMIT_SUBJECT, { timeout: 30_000 });
|
|
await expect(page.locator('[data-testid^="commit-row-"]')).toHaveCount(1);
|
|
await expect(commitRow).toContainText("Jan 15");
|
|
await commitRow.click();
|
|
|
|
const panel = page.getByTestId("commit-diff-panel").filter({ visible: true });
|
|
await expect(panel.getByTestId("commit-diff-toolbar")).toBeVisible({ timeout: 30_000 });
|
|
const layoutToggle = panel.getByTestId("commit-diff-toggle-layout");
|
|
const [commitToolbarBox, layoutToggleBox, layoutToggleGlyphBox] = await Promise.all([
|
|
panel.getByTestId("commit-diff-header").boundingBox(),
|
|
layoutToggle.boundingBox(),
|
|
layoutToggle.locator("svg").boundingBox(),
|
|
]);
|
|
if (!commitToolbarBox || !layoutToggleBox || !layoutToggleGlyphBox) {
|
|
throw new Error("Commit-diff toolbar geometry could not be measured");
|
|
}
|
|
expect(commitToolbarBox.height).toBe(36);
|
|
expect(layoutToggleBox.width).toBe(24);
|
|
expect(layoutToggleBox.height).toBe(24);
|
|
expect(layoutToggleGlyphBox.width).toBe(14);
|
|
expect(layoutToggleGlyphBox.height).toBe(14);
|
|
await expect(layoutToggle).toHaveAccessibleName("Switch to side-by-side diff");
|
|
await expect(panel.getByTestId("git-diff-canvas")).toBeVisible({ timeout: 30_000 });
|
|
await expectCommitDiffHeaderGeometry(panel);
|
|
|
|
await layoutToggle.click();
|
|
await expect(layoutToggle).toHaveAccessibleName("Switch to unified diff");
|
|
await expect(panel.locator('[data-testid^="diff-code-row-"]')).toHaveCount(0);
|
|
await expect(panel.getByTestId("diff-file-0-body")).toBeVisible();
|
|
|
|
await page.getByTestId(/^workspace-tab-commit_diff_/).hover();
|
|
await page.getByTestId(/^workspace-commit-diff-close-/).click();
|
|
await expect(panel).toHaveCount(0);
|
|
await commitRow.click();
|
|
await expect(panel.getByTestId("commit-diff-toggle-layout")).toHaveAccessibleName(
|
|
"Switch to unified diff",
|
|
{ timeout: 30_000 },
|
|
);
|
|
|
|
await page.setViewportSize({ width: 480, height: 900 });
|
|
await expect(panel.getByTestId("commit-diff-toolbar")).toHaveCount(0);
|
|
await expect(panel.getByTestId("git-diff-canvas")).toBeVisible();
|
|
});
|
|
|
|
async function createFeatureCommit(repoPath: string): Promise<void> {
|
|
execFileSync("git", ["checkout", "-b", "feature"], { cwd: repoPath, stdio: "ignore" });
|
|
await writeFile(path.join(repoPath, "feature.txt"), "before\nafter\n");
|
|
execFileSync("git", ["add", "feature.txt"], { cwd: repoPath, stdio: "ignore" });
|
|
execFileSync("git", ["commit", "-m", COMMIT_SUBJECT], {
|
|
cwd: repoPath,
|
|
stdio: "ignore",
|
|
env: {
|
|
...process.env,
|
|
GIT_AUTHOR_DATE: "2020-01-15T12:00:00Z",
|
|
GIT_COMMITTER_DATE: "2020-01-15T12:00:00Z",
|
|
},
|
|
});
|
|
}
|
|
|
|
async function expectCommitDiffHeaderGeometry(panel: Locator): Promise<void> {
|
|
const [header, content, name, stat] = await Promise.all([
|
|
panel.getByTestId("diff-file-0").boundingBox(),
|
|
panel.getByTestId("diff-file-0-header-content").boundingBox(),
|
|
panel.getByTestId("diff-file-0-name").boundingBox(),
|
|
panel.getByTestId("diff-file-0-stat").boundingBox(),
|
|
]);
|
|
expect(header).not.toBeNull();
|
|
expect(content).not.toBeNull();
|
|
expect(name).not.toBeNull();
|
|
expect(stat).not.toBeNull();
|
|
expect(header!.height).toBeCloseTo(30, 0);
|
|
expect(content!.x).toBeCloseTo(header!.x, 0);
|
|
expect(content!.width).toBeCloseTo(header!.width, 0);
|
|
expect(name!.x - header!.x).toBeCloseTo(12, 0);
|
|
expect(name!.x + name!.width).toBeLessThan(stat!.x);
|
|
expect(Math.abs(name!.y + name!.height / 2 - (stat!.y + stat!.height / 2))).toBeLessThanOrEqual(
|
|
1,
|
|
);
|
|
expect(stat!.x + stat!.width).toBeLessThan(header!.x + header!.width);
|
|
}
|