* fix(app): show New workspace action on non-git sidebar projects The per-project "New workspace" affordance in the sidebar (the project- header + button and the empty-project ghost row) was gated on host.canCreateWorktree, i.e. projectKind === "git". Non-git projects (non_git / directory) therefore showed no way to add a workspace, even though a host with the workspaceMultiplicity capability can create additional local workspaces for them. Thread the per-host workspaceMultiplicity flag into the sidebar project row model and show the affordance when canCreateWorktree || supportsWorkspaceMultiplicity, matching the gate already used by the global "New workspace" button and the Cmd+N handler. Rename the internal trailing-action kind new_worktree -> new_workspace (a client-only UI model, not a wire type) to reflect that it now also covers non-git workspaces. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * test(app): expect the per-row New workspace icon on non-git projects The sidebar "+" now shows for non-git projects on a multiplicity-capable host, so the Model B sidebar spec no longer asserts the non-git project has zero new-worktree icons — it now expects the icon, like git projects. Also refresh the now-stale "no new-worktree icon" comments in the entry-points spec (the picker is still one valid entry point). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
215 lines
6.5 KiB
TypeScript
215 lines
6.5 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import type {
|
|
SidebarProjectEntry,
|
|
SidebarWorkspaceEntry,
|
|
} from "@/hooks/use-sidebar-workspaces-list";
|
|
import {
|
|
buildSidebarProjectRowModel,
|
|
resolveSidebarProjectIconTarget,
|
|
} from "./sidebar-project-row-model";
|
|
|
|
function workspace(overrides: Partial<SidebarWorkspaceEntry> = {}): SidebarWorkspaceEntry {
|
|
return {
|
|
workspaceKey: "srv:ws-root",
|
|
serverId: "srv",
|
|
workspaceId: "ws-root",
|
|
projectKey: "project-1",
|
|
projectName: "paseo",
|
|
workspaceDirectory: "/repo",
|
|
projectKind: "git",
|
|
workspaceKind: "checkout",
|
|
name: "paseo",
|
|
title: null,
|
|
currentBranch: null,
|
|
statusBucket: "done",
|
|
diffStat: null,
|
|
prHint: null,
|
|
archiveHasUncommittedChanges: null,
|
|
archiveUnpushedCommitCount: null,
|
|
scripts: [],
|
|
hasRunningScripts: false,
|
|
statusEnteredAt: null,
|
|
...overrides,
|
|
archivingAt: overrides.archivingAt ?? null,
|
|
};
|
|
}
|
|
|
|
function project(overrides: Partial<SidebarProjectEntry> = {}): SidebarProjectEntry {
|
|
const projectKind = overrides.projectKind ?? "git";
|
|
return {
|
|
projectKey: "project-1",
|
|
projectName: "paseo",
|
|
projectKind,
|
|
iconWorkingDir: "/repo",
|
|
hosts: overrides.hosts ?? [
|
|
{ serverId: "srv", iconWorkingDir: "/repo", canCreateWorktree: projectKind === "git" },
|
|
],
|
|
workspaces: [workspace()],
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
describe("buildSidebarProjectRowModel", () => {
|
|
it("renders a non-git single-workspace project as an expandable section", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({
|
|
projectKind: "directory",
|
|
workspaces: [workspace({ workspaceId: "ws-non-git", workspaceKind: "checkout" })],
|
|
}),
|
|
collapsed: false,
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
kind: "project_section",
|
|
chevron: "collapse",
|
|
trailingAction: { kind: "none" },
|
|
});
|
|
});
|
|
|
|
it("renders a single-workspace git project as an expandable section with the new workspace action", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({
|
|
projectKind: "git",
|
|
workspaces: [workspace({ workspaceId: "ws-main", workspaceKind: "checkout" })],
|
|
}),
|
|
collapsed: true,
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
kind: "project_section",
|
|
chevron: "expand",
|
|
trailingAction: {
|
|
kind: "new_workspace",
|
|
target: { serverId: "srv", iconWorkingDir: "/repo" },
|
|
},
|
|
});
|
|
});
|
|
|
|
it("shows the new workspace action for a non-git project when the host supports workspace multiplicity", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({ projectKind: "directory", workspaces: [] }),
|
|
collapsed: false,
|
|
supportsMultiplicityByServerId: new Map([["srv", true]]),
|
|
});
|
|
|
|
expect(result.trailingAction).toEqual({
|
|
kind: "new_workspace",
|
|
target: { serverId: "srv", iconWorkingDir: "/repo" },
|
|
});
|
|
});
|
|
|
|
it("hides the new workspace action for a non-git project when the host lacks workspace multiplicity", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({ projectKind: "directory", workspaces: [] }),
|
|
collapsed: false,
|
|
supportsMultiplicityByServerId: new Map([["srv", false]]),
|
|
});
|
|
|
|
expect(result.trailingAction).toEqual({ kind: "none" });
|
|
});
|
|
|
|
it("still shows the new workspace action for a git project regardless of multiplicity", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({ projectKind: "git" }),
|
|
collapsed: false,
|
|
supportsMultiplicityByServerId: new Map([["srv", false]]),
|
|
});
|
|
|
|
expect(result.trailingAction).toEqual({
|
|
kind: "new_workspace",
|
|
target: { serverId: "srv", iconWorkingDir: "/repo" },
|
|
});
|
|
});
|
|
|
|
it("targets the project host, not route state, for new workspace actions", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({
|
|
hosts: [
|
|
{ serverId: "host-a", iconWorkingDir: "/repo/a", canCreateWorktree: false },
|
|
{ serverId: "host-b", iconWorkingDir: "/repo/b", canCreateWorktree: true },
|
|
],
|
|
}),
|
|
collapsed: false,
|
|
});
|
|
|
|
expect(result).toMatchObject({
|
|
trailingAction: {
|
|
kind: "new_workspace",
|
|
target: { serverId: "host-b", iconWorkingDir: "/repo/b" },
|
|
},
|
|
});
|
|
});
|
|
|
|
it("targets the first multiplicity-capable host for a non-git project", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({
|
|
projectKind: "directory",
|
|
hosts: [
|
|
{ serverId: "host-a", iconWorkingDir: "/repo/a", canCreateWorktree: false },
|
|
{ serverId: "host-b", iconWorkingDir: "/repo/b", canCreateWorktree: false },
|
|
],
|
|
}),
|
|
collapsed: false,
|
|
supportsMultiplicityByServerId: new Map([["host-b", true]]),
|
|
});
|
|
|
|
expect(result).toMatchObject({
|
|
trailingAction: {
|
|
kind: "new_workspace",
|
|
target: { serverId: "host-b", iconWorkingDir: "/repo/b" },
|
|
},
|
|
});
|
|
});
|
|
|
|
it("renders a multi-workspace git project as an expandable section with a new workspace action", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({
|
|
projectKind: "git",
|
|
workspaces: [
|
|
workspace({ workspaceId: "ws-main", workspaceKind: "checkout" }),
|
|
workspace({ workspaceId: "ws-feature", workspaceKind: "worktree" }),
|
|
],
|
|
}),
|
|
collapsed: true,
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
kind: "project_section",
|
|
chevron: "expand",
|
|
trailingAction: {
|
|
kind: "new_workspace",
|
|
target: { serverId: "srv", iconWorkingDir: "/repo" },
|
|
},
|
|
});
|
|
});
|
|
|
|
it("resolves project icons from the project host, not the focused host", () => {
|
|
const iconTarget = resolveSidebarProjectIconTarget(
|
|
project({
|
|
hosts: [
|
|
{ serverId: "host-b", iconWorkingDir: "/repo/b", canCreateWorktree: true },
|
|
{ serverId: "host-a", iconWorkingDir: "/repo/a", canCreateWorktree: true },
|
|
],
|
|
}),
|
|
);
|
|
|
|
expect(iconTarget).toEqual({ serverId: "host-b", iconWorkingDir: "/repo/b" });
|
|
});
|
|
|
|
it("renders an empty project as an expandable section", () => {
|
|
const result = buildSidebarProjectRowModel({
|
|
project: project({ projectKind: "git", workspaces: [] }),
|
|
collapsed: false,
|
|
});
|
|
|
|
expect(result).toEqual({
|
|
kind: "project_section",
|
|
chevron: "collapse",
|
|
trailingAction: {
|
|
kind: "new_workspace",
|
|
target: { serverId: "srv", iconWorkingDir: "/repo" },
|
|
},
|
|
});
|
|
});
|
|
});
|