* 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.
132 lines
5.2 KiB
TypeScript
132 lines
5.2 KiB
TypeScript
// Reported on 0.5.0-beta.1 desktop: after upgrading, the old docked explorer
|
|
// sidebar and the new explorer pane were both visible, and on Windows the
|
|
// sidebar had no close button because the window controls own that corner.
|
|
//
|
|
// The sidebar rendered off a persisted `desktop.fileExplorerOpen` flag that no
|
|
// migration cleared and that the rerouted explorer toggle no longer wrote. The
|
|
// explorer is now one surface per layout, so that flag must not resurrect it.
|
|
import { expect, type Locator, type Page } from "@playwright/test";
|
|
import { test } from "../support/fixtures";
|
|
import { gotoWorkspace } from "../support/helpers/launcher";
|
|
import { seedWorkspace } from "../support/helpers/seed-client";
|
|
import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
|
|
|
|
function visible(page: Page, testId: string): Locator {
|
|
return page.getByTestId(testId).filter({ visible: true });
|
|
}
|
|
|
|
function readPersistedPanelState(page: Page): Promise<string | null> {
|
|
return page.evaluate(() => localStorage.getItem("panel-state"));
|
|
}
|
|
|
|
/** Only the docked sidebar ever rendered `explorer-header` on a wide layout. */
|
|
function dockedSidebar(page: Page): Locator {
|
|
return visible(page, "explorer-header");
|
|
}
|
|
|
|
/** The desktop companion surface is a hideable side panel. */
|
|
function sidePanel(page: Page): Locator {
|
|
return visible(page, "workspace-side-panel");
|
|
}
|
|
|
|
/** Seed exactly what a pre-pane build wrote after the user opened the sidebar once. */
|
|
async function seedRetiredSidebarState(page: Page): Promise<void> {
|
|
await page.addInitScript(() => {
|
|
localStorage.setItem(
|
|
"panel-state",
|
|
JSON.stringify({
|
|
version: 14,
|
|
state: {
|
|
desktop: { agentListOpen: true, fileExplorerOpen: true, focusModeEnabled: false },
|
|
explorerTab: "changes",
|
|
explorerTabByCheckout: {},
|
|
expandedPathsByWorkspace: {},
|
|
diffCollapsedFoldersByWorkspace: {},
|
|
collapsedFilePathsByWorkspace: {},
|
|
sidebarWidth: 340,
|
|
explorerWidth: 400,
|
|
explorerSortOption: "name",
|
|
explorerShowHiddenFiles: true,
|
|
treeRailWidth: 320,
|
|
},
|
|
}),
|
|
);
|
|
});
|
|
}
|
|
|
|
test.describe("explorer surface after upgrading from the docked sidebar", () => {
|
|
test("a persisted fileExplorerOpen flag no longer renders a second explorer", async ({
|
|
page,
|
|
}) => {
|
|
const workspace = await seedWorkspace({ repoPrefix: "explorer-surface-upgrade-" });
|
|
|
|
try {
|
|
await seedRetiredSidebarState(page);
|
|
await gotoWorkspace(page, workspace.workspaceId);
|
|
await waitForWorkspaceTabsVisible(page);
|
|
|
|
await test.step("no docked sidebar, on load or after toggling", async () => {
|
|
await expect(dockedSidebar(page)).toHaveCount(0);
|
|
|
|
const toggle = visible(page, "workspace-explorer-toggle").first();
|
|
await toggle.click();
|
|
await expect(sidePanel(page)).toHaveCount(1, { timeout: 15_000 });
|
|
await expect(sidePanel(page).getByTestId("workspace-pane-empty-state")).toBeVisible();
|
|
await expect(dockedSidebar(page)).toHaveCount(0);
|
|
|
|
await toggle.click();
|
|
await expect(sidePanel(page)).toHaveCount(0, { timeout: 15_000 });
|
|
await expect(dockedSidebar(page)).toHaveCount(0);
|
|
});
|
|
|
|
await test.step("the retired keys are migrated out of storage", async () => {
|
|
const persisted = await readPersistedPanelState(page);
|
|
expect(persisted).not.toBeNull();
|
|
expect(persisted).not.toContain("fileExplorerOpen");
|
|
expect(persisted).not.toContain("explorerWidth");
|
|
// Everything else the user had must survive the migration.
|
|
expect(persisted).toContain('"sidebarWidth":340');
|
|
});
|
|
} finally {
|
|
await workspace.cleanup();
|
|
}
|
|
});
|
|
|
|
test("toggle-both-sidebars closes and restores the agent list and the explorer", async ({
|
|
page,
|
|
}) => {
|
|
const workspace = await seedWorkspace({ repoPrefix: "explorer-surface-both-" });
|
|
const modifier = process.platform === "darwin" ? "Meta" : "Control";
|
|
|
|
try {
|
|
await gotoWorkspace(page, workspace.workspaceId);
|
|
await waitForWorkspaceTabsVisible(page);
|
|
|
|
const agentList = visible(page, "sidebar-sessions");
|
|
const toggle = visible(page, "workspace-explorer-toggle").first();
|
|
|
|
await test.step("open the explorer so both sides are showing", async () => {
|
|
await toggle.click();
|
|
await expect(sidePanel(page)).toHaveCount(1, { timeout: 15_000 });
|
|
await expect(sidePanel(page).getByTestId("workspace-pane-empty-state")).toBeVisible();
|
|
await expect(agentList).toHaveCount(1);
|
|
});
|
|
|
|
await test.step("the shortcut collapses both", async () => {
|
|
await page.keyboard.press(`${modifier}+.`);
|
|
await expect(sidePanel(page)).toHaveCount(0, { timeout: 15_000 });
|
|
await expect(agentList).toHaveCount(0);
|
|
});
|
|
|
|
await test.step("the shortcut restores both", async () => {
|
|
await page.keyboard.press(`${modifier}+.`);
|
|
await expect(agentList).toHaveCount(1, { timeout: 15_000 });
|
|
await expect(sidePanel(page)).toHaveCount(1, { timeout: 15_000 });
|
|
await expect(sidePanel(page).getByTestId("workspace-pane-empty-state")).toBeVisible();
|
|
});
|
|
} finally {
|
|
await workspace.cleanup();
|
|
}
|
|
});
|
|
});
|