* fix(projects): restore cross-host grouping Random host-local project IDs replaced the remote-derived value that had also served as grouping identity. Persist a separate opaque group key and let normal boot reconciliation backfill older records without a migration. * fix(projects): keep ambiguous clones separate A shared remote can identify a project across hosts, but it cannot distinguish two independent clones on one host. Treat those keys as ambiguous so host-local project IDs remain separate. * fix(projects): preserve host-local project identity * fix(projects): strengthen grouping identity * test(app): update project host shape contract * fix(projects): preserve selected host identity * fix(projects): close grouped routing gaps * fix(projects): stabilize legacy subproject grouping * fix(projects): preserve selected project identity * fix(projects): isolate legacy host identity * fix(projects): preserve symlinked bootstrap roots * fix(projects): reconcile grouped custom names * fix(projects): stabilize settings and path identity * fix(projects): normalize default remote ports * fix(projects): harden host and remote identity * fix(projects): preserve host-scoped actions * fix(projects): preserve remote path semantics * fix(projects): model SCP remote semantics * fix(projects): keep settings on routed host * fix(projects): preserve SSH URL path semantics * fix(projects): separate identity from presentation * test(projects): use grouped identity in UI specs * fix(projects): harden grouped project routing * test(projects): expect framed settings route * fix(projects): preserve exact placement identity * fix(projects): harden grouping identity and routing * fix(projects): restore project key as grouping identity Random host-local project IDs had replaced the persisted cross-host value carried by projectKey. Keep projectId for routing while reconciliation owns and persists projectKey for grouping. * fix(projects): prevent project key collisions Preserve platform path semantics and generic remote transports in cross-host keys, and compare legacy checkout roots using filesystem equivalence before materializing ownership. * test(projects): assert host-scoped project keys * fix(projects): preserve project key compatibility Resolve legacy workspace project references at the daemon boundary while keeping projectKey as the cross-host identity. Complete generic SSH normalization without collapsing distinct repositories. * fix(projects): harden project reference identity * fix(projects): retain archived reference errors * fix(projects): scope legacy paths to hosts * test(app): model persisted project keys * fix(projects): retain absolute scp users * fix(projects): resolve legacy mutation aliases * fix(projects): preserve conservative identity boundaries * fix(projects): preserve legacy placement identity * test(projects): assert legacy placement identity * test(projects): expect canonical Windows keys * fix(projects): separate bootstrap identity fields * fix(projects): scope legacy paths by host * fix(projects): stabilize opaque project identity * fix(projects): preserve remaining opaque identities * fix(projects): classify forward-slash UNC roots * fix(projects): preserve opaque selection keys * fix(projects): frame host-local project keys * fix(projects): canonicalize framed identities * test(projects): isolate repeated remote fixtures * fix(projects): keep project key as UI identity * fix(projects): reconcile hydrated project references * fix(projects): preserve archived project identity * refactor(projects): group projects from project records, not workspaces Cross-host grouping had been built by hanging a projectKey off every workspace descriptor. That scoped the key to the wrong entity: the app then had to reconstruct project identity per workspace in six modules, which forced projectKey fallbacks into RPC arguments and a server-side resolver that turned grouping keys back into project ids. A workspace has a projectId. The key belongs to the project, and grouping is a display concern, so the daemon now publishes projects over project.list plus the existing project.update channel and the app groups them in one place. Projects are addressed by host-local projectId everywhere, including the settings route. Projects persisted without a key are backfilled by ordinary boot reconciliation, with no migration. Old daemons advertise no projectList capability and simply do not group. * test(projects): seed projects alongside workspaces in fixtures Sidebar fixtures seeded workspaces without their projects, which the daemon cannot produce now that projects arrive on their own channel, so nothing rendered. Adds a seeding helper that supplies both. Also drops the provisioning test for accepting a project key where a project id belongs; that resolver was removed deliberately. * fix(projects): keep derived project identity stable Four gaps left by shrinking the key derivation: Local keys used a bare path resolve, so one directory reached by a different spelling produced a different key and reset grouped identity. Windows CI caught this with the 8.3 and long-name forms of one temp path. Canonicalize through the shared realpath-aware normalization. Subproject display names lost their selected-path input, so every subproject of a monorepo rendered under the same remote-derived name. Reconciliation only ever backfilled a missing key, so a project whose remote changed stayed grouped with hosts on the old remote. Project settings kept a disconnected host selected and rendered a dead end with no way back to an editable host. * fix(projects): read scheme remotes as URLs, not scp form An `ssh://user@host:22/org/repo` remote matched the scp-form pattern first, because `[^@]+` happily eats `ssh://git`, so the port landed in the path and the project keyed as `remote:host/22/org/repo`. Two spellings of one remote therefore never grouped. Try scp form only when there is no scheme, and drop protocol-default ports so an explicitly written `:22` matches the same remote without it.
246 lines
9.8 KiB
TypeScript
246 lines
9.8 KiB
TypeScript
import path from "node:path";
|
|
import { existsSync } from "node:fs";
|
|
import { test, expect, type Page } from "./fixtures";
|
|
import { gotoAppShell } from "./helpers/app";
|
|
import {
|
|
addProjectFlowInput,
|
|
chooseAddProjectMethod,
|
|
openAddProjectFlow,
|
|
} from "./helpers/add-project-flow";
|
|
import { expectOpenedProject } from "./helpers/project-picker-ui";
|
|
import { connectSeedClient, seedWorkspace } from "./helpers/seed-client";
|
|
import { getServerId } from "./helpers/server-id";
|
|
import { createTempGitRepo } from "./helpers/workspace";
|
|
import { waitForSidebarHydration } from "./helpers/workspace-ui";
|
|
|
|
function workspaceRowTestId(workspaceId: string): string {
|
|
return `sidebar-workspace-row-${getServerId()}:${workspaceId}`;
|
|
}
|
|
|
|
async function archiveWorkspaceFromSidebar(page: Page, workspaceId: string): Promise<void> {
|
|
const serverId = getServerId();
|
|
const row = page.getByTestId(workspaceRowTestId(workspaceId));
|
|
await expect(row).toBeVisible({ timeout: 30_000 });
|
|
await row.hover();
|
|
|
|
const kebab = page.getByTestId(`sidebar-workspace-kebab-${serverId}:${workspaceId}`);
|
|
await expect(kebab).toBeVisible({ timeout: 10_000 });
|
|
await kebab.click();
|
|
|
|
const archiveItem = page.getByTestId(`sidebar-workspace-menu-archive-${serverId}:${workspaceId}`);
|
|
await expect(archiveItem).toBeVisible({ timeout: 10_000 });
|
|
await archiveItem.click();
|
|
}
|
|
|
|
async function removeProjectFromSidebar(page: Page, projectKey: string): Promise<void> {
|
|
const projectRow = page.getByTestId(`sidebar-project-row-${projectKey}`);
|
|
await expect(projectRow).toBeVisible({ timeout: 30_000 });
|
|
await projectRow.hover();
|
|
|
|
const kebab = page.getByTestId(`sidebar-project-kebab-${projectKey}`);
|
|
await expect(kebab).toBeVisible({ timeout: 10_000 });
|
|
await kebab.click();
|
|
|
|
// Removing a project raises a browser confirm; accept it so the
|
|
// user-confirmed removal proceeds deterministically.
|
|
page.once("dialog", (dialog) => void dialog.accept());
|
|
|
|
const removeItem = page.getByTestId(`sidebar-project-menu-remove-${projectKey}`);
|
|
await expect(removeItem).toBeVisible({ timeout: 10_000 });
|
|
await removeItem.click();
|
|
}
|
|
|
|
async function addProjectFromPicker(page: Page, projectPath: string): Promise<string> {
|
|
await openAddProjectFlow(page);
|
|
await chooseAddProjectMethod(page, "directory-search");
|
|
|
|
const input = addProjectFlowInput(page);
|
|
await input.fill(projectPath);
|
|
await page.keyboard.press("Enter");
|
|
|
|
const projectRow = page
|
|
.locator('[data-testid^="sidebar-project-row-"]')
|
|
.filter({ hasText: path.basename(projectPath) })
|
|
.first();
|
|
await expect(projectRow).toBeVisible({ timeout: 30_000 });
|
|
|
|
const testId = await projectRow.getAttribute("data-testid");
|
|
expect(testId).not.toBeNull();
|
|
return testId!.replace("sidebar-project-row-", "");
|
|
}
|
|
|
|
async function waitForSidebarProjectListReady(page: Page): Promise<void> {
|
|
await page
|
|
.locator('[data-testid="sidebar-project-empty-state"], [data-testid^="sidebar-project-row-"]')
|
|
.first()
|
|
.waitFor({ state: "visible", timeout: 60_000 });
|
|
}
|
|
|
|
test.describe("Project picker search", () => {
|
|
test("opens a project from a fuzzy directory-name search", async ({
|
|
page,
|
|
projectPickerFixture,
|
|
}) => {
|
|
await gotoAppShell(page);
|
|
await waitForSidebarProjectListReady(page);
|
|
await openAddProjectFlow(page);
|
|
await chooseAddProjectMethod(page, "directory-search");
|
|
|
|
const input = addProjectFlowInput(page);
|
|
await input.fill(projectPickerFixture.fuzzyQuery);
|
|
|
|
const suggestion = page.getByText(projectPickerFixture.projectName, { exact: false }).first();
|
|
await expect(suggestion).toBeVisible({ timeout: 30_000 });
|
|
await suggestion.click();
|
|
|
|
const projectId = await expectOpenedProject(page, projectPickerFixture.projectName);
|
|
projectPickerFixture.rememberProjectId(projectId);
|
|
});
|
|
|
|
test("shows a loading state after typing while directory suggestions are pending", async ({
|
|
page,
|
|
}) => {
|
|
await gotoAppShell(page);
|
|
await waitForSidebarProjectListReady(page);
|
|
await openAddProjectFlow(page);
|
|
await chooseAddProjectMethod(page, "directory-search");
|
|
|
|
const input = addProjectFlowInput(page);
|
|
await input.fill("paseo-loading-state-no-match");
|
|
|
|
await expect(page.getByText("Start typing a path", { exact: true })).toHaveCount(0);
|
|
await expect(page.getByText("Loading...", { exact: true })).toBeVisible();
|
|
});
|
|
});
|
|
|
|
// Projects are parents in the sidebar. Archiving the last workspace leaves the
|
|
// project row in place with a ghost "+ New workspace" child row.
|
|
test.describe("Project with no workspaces persists", () => {
|
|
test("adding a project starts with only a new-workspace child row", async ({ page }) => {
|
|
const repo = await createTempGitRepo("empty-project-add-");
|
|
const client = await connectSeedClient();
|
|
let projectId: string | null = null;
|
|
|
|
try {
|
|
await gotoAppShell(page);
|
|
await waitForSidebarProjectListReady(page);
|
|
|
|
projectId = await addProjectFromPicker(page, repo.path);
|
|
const projectRow = page.getByTestId(`sidebar-project-row-${projectId}`);
|
|
await expect(projectRow).toBeVisible({ timeout: 30_000 });
|
|
await expect(projectRow).toContainText(path.basename(repo.path));
|
|
await expect(page.getByTestId(`sidebar-workspace-list-${projectId}`)).toHaveCount(0);
|
|
|
|
const newWorkspaceRow = page.getByTestId(`sidebar-project-new-workspace-row-${projectId}`);
|
|
await expect(newWorkspaceRow).toBeVisible({ timeout: 30_000 });
|
|
await expect(newWorkspaceRow).toContainText("New workspace");
|
|
|
|
const workspaces = await client.fetchWorkspaces({ filter: { projectId } });
|
|
expect(workspaces.entries).toEqual([]);
|
|
} finally {
|
|
if (projectId) {
|
|
await client.removeProject(projectId).catch(() => undefined);
|
|
}
|
|
await client.close().catch(() => undefined);
|
|
await repo.cleanup().catch(() => undefined);
|
|
}
|
|
});
|
|
|
|
test("archiving the only workspace keeps the project row with creation still reachable", async ({
|
|
page,
|
|
}) => {
|
|
const workspace = await seedWorkspace({ repoPrefix: "empty-project-persists-" });
|
|
|
|
try {
|
|
const projectRow = page.getByTestId(`sidebar-project-row-${workspace.projectKey}`);
|
|
const newWorkspaceRow = page.getByTestId(
|
|
`sidebar-project-new-workspace-row-${workspace.projectKey}`,
|
|
);
|
|
const globalNewWorkspace = page.getByTestId("sidebar-global-new-workspace");
|
|
|
|
await gotoAppShell(page);
|
|
await waitForSidebarHydration(page);
|
|
await expect(projectRow).toBeVisible({ timeout: 30_000 });
|
|
const workspaceRow = page.getByTestId(workspaceRowTestId(workspace.workspaceId));
|
|
await expect(workspaceRow).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
await workspaceRow.click();
|
|
await expect(page.getByTestId("changes-primary-cta")).toHaveCount(0);
|
|
|
|
await archiveWorkspaceFromSidebar(page, workspace.workspaceId);
|
|
|
|
// The workspace row goes away, but its project parent stays and exposes a
|
|
// child row for creating the next workspace.
|
|
await expect(page.getByTestId(workspaceRowTestId(workspace.workspaceId))).toHaveCount(0, {
|
|
timeout: 30_000,
|
|
});
|
|
expect(existsSync(workspace.repoPath)).toBe(true);
|
|
await expect(projectRow).toBeVisible({ timeout: 30_000 });
|
|
await expect(newWorkspaceRow).toBeVisible({ timeout: 30_000 });
|
|
await expect(newWorkspaceRow).toContainText("New workspace");
|
|
await expect(globalNewWorkspace).toBeVisible({ timeout: 30_000 });
|
|
|
|
// The project survives a reload after its last workspace is archived.
|
|
await page.reload();
|
|
await waitForSidebarHydration(page);
|
|
await expect(projectRow).toBeVisible({ timeout: 30_000 });
|
|
await expect(newWorkspaceRow).toBeVisible({ timeout: 30_000 });
|
|
} finally {
|
|
await workspace.cleanup();
|
|
}
|
|
});
|
|
});
|
|
|
|
test.describe("Project remove", () => {
|
|
test("removing a project from project actions removes it from the sidebar", async ({ page }) => {
|
|
const workspace = await seedWorkspace({ repoPrefix: "project-remove-sidebar-" });
|
|
let readdedProjectId: string | null = null;
|
|
|
|
try {
|
|
const projectRow = page.getByTestId(`sidebar-project-row-${workspace.projectKey}`);
|
|
|
|
await gotoAppShell(page);
|
|
await waitForSidebarHydration(page);
|
|
await expect(projectRow).toBeVisible({ timeout: 30_000 });
|
|
await expect(page.getByTestId(workspaceRowTestId(workspace.workspaceId))).toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
|
|
await removeProjectFromSidebar(page, workspace.projectKey);
|
|
|
|
await expect(page.getByTestId(workspaceRowTestId(workspace.workspaceId))).toHaveCount(0, {
|
|
timeout: 30_000,
|
|
});
|
|
await expect(projectRow).toHaveCount(0, { timeout: 30_000 });
|
|
|
|
await page.reload();
|
|
await waitForSidebarProjectListReady(page);
|
|
await expect(projectRow).toHaveCount(0, { timeout: 30_000 });
|
|
|
|
const readded = await workspace.client.addProject(workspace.repoPath);
|
|
expect(readded.error).toBeNull();
|
|
expect(readded.project).not.toBeNull();
|
|
readdedProjectId = readded.project?.projectId ?? "";
|
|
const readdedProjectKey = readded.project?.projectKey ?? "";
|
|
expect(readdedProjectId).not.toBe(workspace.projectId);
|
|
expect(readdedProjectKey).toBe(workspace.projectKey);
|
|
expect(readded.project?.projectDisplayName).toBe(workspace.projectDisplayName);
|
|
|
|
await page.reload();
|
|
await waitForSidebarHydration(page);
|
|
await expect(projectRow).toBeVisible({ timeout: 30_000 });
|
|
await expect(projectRow).toContainText(workspace.projectDisplayName);
|
|
await expect(projectRow).not.toContainText(workspace.repoPath);
|
|
await expect(
|
|
page.getByTestId(`sidebar-project-new-workspace-row-${readdedProjectKey}`),
|
|
).toBeVisible({ timeout: 30_000 });
|
|
} finally {
|
|
if (readdedProjectId) {
|
|
await workspace.client.removeProject(readdedProjectId).catch(() => undefined);
|
|
}
|
|
await workspace.cleanup();
|
|
}
|
|
});
|
|
});
|