From 83e399999642663492ecd9a6f32af2c3a8ce032a Mon Sep 17 00:00:00 2001 From: usrnk1 <7547651+usrnk1@users.noreply.github.com> Date: Thu, 29 Oct 2026 22:49:27 +0100 Subject: [PATCH] feat(app): group added projects in settings (#60221) --- .../app/e2e/regression/mobile-session.spec.ts | 1 + .../app/e2e/regression/multi-server.spec.ts | 2 +- .../e2e/regression/settings-search.spec.ts | 8 +- packages/app/e2e/regression/settings.spec.ts | 42 ++++++- packages/app/src/runtime/i18n/en.ts | 1 + .../settings/workspaces/project-options.tsx | 35 ++++-- .../src/settings/workspaces/project-row.tsx | 15 ++- .../app/src/settings/workspaces/projects.tsx | 109 +++++++++++++++--- 8 files changed, 176 insertions(+), 37 deletions(-) diff --git a/packages/app/e2e/regression/mobile-session.spec.ts b/packages/app/e2e/regression/mobile-session.spec.ts index 7af867b036a..f5209a13b5c 100644 --- a/packages/app/e2e/regression/mobile-session.spec.ts +++ b/packages/app/e2e/regression/mobile-session.spec.ts @@ -347,6 +347,7 @@ test.describe("touch", () => { await expect(page).toHaveURL(new RegExp(`/session/${fixture.sourceID}$`)) await expect(drawer).toBeHidden() await expect(trigger).toContainText(fixture.expected.sourceTitle) + await expect(trigger).toBeFocused() await trigger.click() await drawer.getByRole("button", { name: "Home", exact: true }).click() await expect(page).toHaveURL("/") diff --git a/packages/app/e2e/regression/multi-server.spec.ts b/packages/app/e2e/regression/multi-server.spec.ts index 288cc0b1aa1..1caa8e119cf 100644 --- a/packages/app/e2e/regression/multi-server.spec.ts +++ b/packages/app/e2e/regression/multi-server.spec.ts @@ -233,7 +233,7 @@ test("a project's auto-accept choice overrides the default in both directions", onPermissionReply: (reply) => replies.push(reply.permissionID), }, }) - await seed(page, { tabs: [api.id, web.id] }) + await seed(page, { tabs: [api.id, web.id], usedProjects: { local: ["proj_api", "proj_web"] } }) const dock = page.locator('[data-component="dock-prompt"][data-kind="permission"]') const settings = page.getByTestId("settings-screen") diff --git a/packages/app/e2e/regression/settings-search.spec.ts b/packages/app/e2e/regression/settings-search.spec.ts index 9706862f8b7..0f882095ef4 100644 --- a/packages/app/e2e/regression/settings-search.spec.ts +++ b/packages/app/e2e/regression/settings-search.spec.ts @@ -311,8 +311,12 @@ test("section search takes typed input, clears in place, and escapes in steps", }) for (const count of [0, 7, 8]) { - test(`Projects search appears from 8 projects (${count} projects)`, async ({ page }) => { - const view = await open(page, { count }) + test(`Projects search appears from 8 added projects (${count} projects)`, async ({ page }) => { + const view = await open(page, { + count, + seed: { usedProjects: { local: Array.from({ length: count }, (_, index) => `proj_search_${index}`) } }, + }) + await view.settings.getByRole("tab", { name: "Projects", exact: true }).click() const search = view.settings.getByRole("searchbox", { name: "Search projects", exact: true }) const projects = view.settings.getByRole("button", { name: /^OpenCode / }) diff --git a/packages/app/e2e/regression/settings.spec.ts b/packages/app/e2e/regression/settings.spec.ts index 9c2309b408b..de157215d68 100644 --- a/packages/app/e2e/regression/settings.spec.ts +++ b/packages/app/e2e/regression/settings.spec.ts @@ -491,11 +491,45 @@ test("project list menus rename, edit, add, and stay inside the scrollport", asy await settings.getByRole("tab", { name: "Projects", exact: true }).click() const panel = settings.getByRole("tabpanel") const list = panel.getByRole("list") - await expect(list.getByRole("listitem")).toHaveCount(4) - const card = list.getByRole("listitem").filter({ hasText: "rebase" }) + await expect(list.getByRole("listitem")).toHaveCount(1) + await expect(list.getByRole("button", { name: "rebase", exact: true })).toBeVisible() + const others = panel.getByRole("button", { name: "Other projects", exact: true }) + await expect(others).toContainText("3") + await expect(others).toHaveAttribute("aria-expanded", "false") + await others.click() + await expect(others).toHaveAttribute("aria-expanded", "true") + await expect(panel.getByRole("listitem")).toHaveCount(4) + await others.click() + const search = panel.getByRole("searchbox", { name: "Search projects" }) + await search.fill("/projects/dinocms") + await expect(panel.getByRole("listitem")).toHaveCount(1) + await expect(panel.getByRole("button", { name: "dinocms", exact: true })).toBeVisible() + await expect(panel.getByRole("heading", { name: "Other projects", exact: true })).toBeVisible() + await search.fill("") + await expect(panel.getByRole("listitem")).toHaveCount(1) + await others.click() + await expect(panel.getByRole("listitem")).toHaveCount(4) + + const addTrigger = panel + .getByRole("listitem") + .filter({ hasText: "dinocms" }) + .getByRole("button", { name: "More options", exact: true }) + + await addTrigger.focus() + await addTrigger.press("Enter") + const menu = page.getByRole("menu") + await expect(menu.getByRole("menuitem")).toHaveText(["Add project", "Edit", "Rename"]) + const addProject = menu.getByRole("menuitem", { name: "Add project", exact: true }) + await expect(addProject).toBeFocused() + await addProject.press("Enter") + await expect(menu).toBeHidden() + await expect(others).toContainText("2") + const addedProjects = panel.getByRole("list").filter({ hasText: "rebase" }) + await expect(addedProjects.getByRole("listitem")).toHaveCount(2) + await expect(addedProjects.getByRole("button", { name: "dinocms", exact: true })).toBeFocused() + const card = panel.getByRole("listitem").filter({ hasText: "rebase" }) const more = card.getByRole("button", { name: "More options", exact: true }) await more.click() - const menu = page.getByRole("menu") await expect(menu.getByRole("menuitem")).toHaveText(["Edit", "Rename", "Clear notifications"]) await menu.getByRole("menuitem", { name: "Edit", exact: true }).click() await expect(panel.getByRole("heading", { name: "rebase", exact: true })).toBeVisible() @@ -545,6 +579,8 @@ test("project list menus rename, edit, add, and stay inside the scrollport", asy await select.click() await expect(picker).toBeHidden() await expect(panel.getByRole("heading", { name: "added", exact: true })).toBeVisible() + await page.getByRole("button", { name: "Home", exact: true }).click() + await expect(page.locator('[data-component="home-project-row"]').filter({ hasText: "dinocms" })).toBeVisible() }) test("project settings open as a nested view that keeps its route", async ({ page }) => { diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index aa2b8c7b68f..82c47307bc6 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -878,6 +878,7 @@ export const dict = { "settings.server.preferences.websearch.description": "Select the search provider agents use to search the web", "settings.projects.title": "Projects", "settings.projects.description": "Manage projects and their settings", + "settings.projects.other": "Other projects", "settings.projects.empty": "No projects found", "settings.projects.empty.title": "No projects yet", "settings.projects.empty.description": "Add a project to get started", diff --git a/packages/app/src/settings/workspaces/project-options.tsx b/packages/app/src/settings/workspaces/project-options.tsx index 6e38025a79b..a131d8f73ae 100644 --- a/packages/app/src/settings/workspaces/project-options.tsx +++ b/packages/app/src/settings/workspaces/project-options.tsx @@ -9,6 +9,7 @@ import { ServerConnection } from "@/runtime/server/registry" import type { LocalProject } from "@/shell/state/layout" import { fileManagerApp } from "@/home/projects/file-manager" import { useRevealProject } from "@/home/projects/reveal" +import { pathKey } from "@/workspaces/path-key" export const ProjectOptions: Component<{ server: ServerConnection.Any @@ -17,6 +18,7 @@ export const ProjectOptions: Component<{ onOpenChange?: (open: boolean) => void onEdit?: () => void onRename?: () => void + onAdd?: () => void class?: string size?: "small" | "normal" | "large" }> = (props) => { @@ -28,6 +30,11 @@ export const ProjectOptions: Component<{ const directories = () => [props.project.worktree, ...(props.project.sandboxes ?? [])] + const added = () => + context() + .projects.used() + .some((project) => pathKey(project.worktree) === pathKey(props.project.worktree)) + const hasUnread = () => directories().some((directory) => context().notification.project.hasUnread(directory)) const clearNotifications = () => { @@ -35,14 +42,13 @@ export const ProjectOptions: Component<{ directories().forEach((directory) => notification.project.markViewed(directory)) } + const addProject = () => { + props.onAdd?.() + context().projects.touch(props.project.worktree) + } + return ( - + + + {language.t("home.project.add")} + {(edit) => {language.t("common.edit")}} @@ -60,11 +69,15 @@ export const ProjectOptions: Component<{ {(rename) => {language.t("common.rename")}} - revealProject.reveal(props.server, props.project)}>{language.t(fileManagerApp(platform.os ?? "unknown").actionLabel)} + revealProject.reveal(props.server, props.project)}> + {language.t(fileManagerApp(platform.os ?? "unknown").actionLabel)} + + + + + {language.t("sidebar.project.clearNotifications")} + - - {language.t("sidebar.project.clearNotifications")} - diff --git a/packages/app/src/settings/workspaces/project-row.tsx b/packages/app/src/settings/workspaces/project-row.tsx index e53d5860487..cadffa622dc 100644 --- a/packages/app/src/settings/workspaces/project-row.tsx +++ b/packages/app/src/settings/workspaces/project-row.tsx @@ -1,4 +1,4 @@ -import { Show } from "solid-js" +import { Show, onMount } from "solid-js" import { createStore } from "solid-js/store" import { InlineInput } from "@opencode/ui/inline-input" import { getFilename } from "@opencode/util/path" @@ -16,18 +16,26 @@ export function SettingsProjectRow(props: { project: LocalProject server: ServerConnection.Any onOpen: (project: LocalProject) => void + onAdd?: () => void + onMount?: (button: HTMLButtonElement) => void }) { const language = useLanguage() const global = useGlobal() - const [store, setStore] = createStore({ + const [store, setStore] = createStore<{ + menu: boolean + editor?: { draft: string; saving: boolean } + }>({ menu: false, - editor: undefined as { draft: string; saving: boolean } | undefined, }) let button: HTMLButtonElement | undefined let input: HTMLInputElement | undefined + onMount(() => { + if (button) props.onMount?.(button) + }) + const openEditor = () => { setStore("editor", { draft: displayName(props.project), saving: false }) requestAnimationFrame(() => { @@ -147,6 +155,7 @@ export function SettingsProjectRow(props: { onOpenChange={(open) => setStore("menu", open)} onEdit={() => props.onOpen(props.project)} onRename={openEditor} + onAdd={props.onAdd} /> diff --git a/packages/app/src/settings/workspaces/projects.tsx b/packages/app/src/settings/workspaces/projects.tsx index 8935345f1e7..e887da6125c 100644 --- a/packages/app/src/settings/workspaces/projects.tsx +++ b/packages/app/src/settings/workspaces/projects.tsx @@ -1,4 +1,4 @@ -import { Show, createEffect, createMemo, type Component, type JSX } from "solid-js" +import { Show, createEffect, createMemo, on, type Component, type JSX } from "solid-js" import { Key } from "@solid-primitives/keyed" import { createStore } from "solid-js/store" import { Button } from "@opencode/ui/button" @@ -16,6 +16,7 @@ import { SettingsSearchField } from "../search-field" import { SettingsProjectRow } from "./project-row" import "@/settings/search.css" import "@/settings/settings.css" +import "./project.css" export const SettingsProjects: Component<{ server: ServerConnection.Any @@ -26,21 +27,42 @@ export const SettingsProjects: Component<{ const language = useLanguage() const global = useGlobal() const pickDirectory = useDirectoryPicker() - const [store, setStore] = createStore({ filter: "" }) + const [store, setStore] = createStore({ filter: "", others: false }) const context = createMemo(() => global.ensureServerCtx(props.server)) - const projects = createMemo(() => context().projects.list()) - const searchable = createMemo(() => projects().length > 7) - const filtered = createMemo(() => { - const query = searchable() ? store.filter.trim().toLowerCase() : "" + let focus: string | undefined - return query ? projects().filter((project) => displayName(project).toLowerCase().includes(query)) : projects() - }) + const projects = createMemo(() => context().projects.unique()) + + const used = createMemo( + () => + new Set( + context() + .projects.used() + .map((project) => project.id), + ), + ) + + const others = createMemo(() => projects().filter((project) => !used().has(project.id))) + const searchable = createMemo(() => projects().length > 7 || others().length > 0) + const query = createMemo(() => (searchable() ? store.filter.trim().toLowerCase() : "")) + + const filtered = createMemo(() => + projects().filter( + (project) => + !query() || [displayName(project), project.worktree].some((value) => value.toLowerCase().includes(query())), + ), + ) + + const added = createMemo(() => filtered().filter((project) => used().has(project.id))) + const otherResults = createMemo(() => filtered().filter((project) => !used().has(project.id))) createEffect(() => { if (!searchable()) setStore("filter", "") }) + createEffect(on(context, () => setStore("others", false))) + const addProject = () => pickDirectory({ server: props.server, @@ -108,9 +130,7 @@ export const SettingsProjects: Component<{ class="settings-project-empty-card flex flex-col items-center gap-2 py-24 text-center" > -
- {language.t("settings.projects.empty.title")} -
+
{language.t("settings.projects.empty.title")}
{language.t("settings.projects.empty.description")}
@@ -121,12 +141,67 @@ export const SettingsProjects: Component<{ } > -
- - {(project) => ( - - )} - +
+ 0}> +
+ + {(project) => ( + { + if (focus !== project().worktree) return + focus = undefined + requestAnimationFrame(() => button.focus()) + }} + /> + )} + +
+
+ 0}> + {language.t("settings.projects.other")} + } + > + + + +
+ + {(project) => ( + (focus = project().worktree)} + /> + )} + +
+
+