diff --git a/packages/app/e2e/regression/settings-loading.spec.ts b/packages/app/e2e/regression/settings-loading.spec.ts new file mode 100644 index 00000000000..9911c544905 --- /dev/null +++ b/packages/app/e2e/regression/settings-loading.spec.ts @@ -0,0 +1,121 @@ +import { expect, test } from "@playwright/test" +import { mockOpenCodeServer } from "../utils/mock-server" + +const directory = "C:/Projects/settings-demo" +const sandboxes = Array.from({ length: 12 }, (_, index) => `${directory}/workspace-${index + 1}`) + +test.use({ viewport: { width: 1440, height: 1000 }, colorScheme: "dark" }) + +test.beforeEach(async ({ page }) => { + await mockOpenCodeServer(page, { + directory, + project: { + id: "proj_settings_demo", + canonical: directory, + name: "Settings demo", + vcs: "git", + time: { created: 1700000000000, updated: 1700000000000 }, + sandboxes, + }, + provider: { all: [], connected: [], default: {} }, + sessions: sandboxes.map((directory, index) => ({ + id: `ses_settings_${index + 1}`, + title: `Workspace ${index + 1} session`, + directory, + projectID: "proj_settings_demo", + time: { created: 1700000000000, updated: 1700000000000 }, + })), + pageMessages: () => ({ items: [] }), + }) + await page.goto("/") + await page.getByRole("button", { name: "Settings", exact: true }).click() + await expect(page.getByTestId("settings-screen").getByRole("tab", { name: "Preferences" })).toBeVisible() +}) + +test("workspaces opens without waiting for inventory or sessions", async ({ page }) => { + const inventory = Promise.withResolvers() + const sessions = Promise.withResolvers() + await page.route("**/api/worktree/*", async (route) => { + await inventory.promise + await route.fallback() + }) + await page.route("**/api/session?*", async (route) => { + if (new URL(route.request().url()).searchParams.has("directory")) await sessions.promise + await route.fallback() + }) + const settings = page.getByTestId("settings-screen") + const requested = page.waitForRequest((request) => new URL(request.url()).pathname.startsWith("/api/worktree/")) + await settings.getByRole("tab", { name: "Workspaces", exact: true }).click() + await requested + await expect(settings.getByRole("heading", { name: "Workspaces", exact: true })).toBeVisible() + await expect(settings.getByRole("button", { name: "Back to app" })).toBeVisible() + await expect(settings.getByText("No workspaces", { exact: true })).toHaveCount(0) + + inventory.resolve() + await expect(settings.getByText(sandboxes[0], { exact: true })).toBeVisible() + await expect(settings.getByText("12 workspaces", { exact: true })).toBeVisible() + sessions.resolve() + await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible() + + const refresh = Promise.withResolvers() + await page.route("**/api/worktree/*", async (route) => { + await refresh.promise + await route.fallback() + }) + await settings.getByRole("tab", { name: "Preferences", exact: true }).click() + await settings.getByRole("tab", { name: "Workspaces", exact: true }).click() + await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible() + refresh.resolve() +}) + +test("extensions opens without waiting for MCPs or plugins", async ({ page }) => { + const mcps = Promise.withResolvers() + const plugins = Promise.withResolvers() + await page.route("**/api/mcp", async (route) => { + await mcps.promise + await route.fulfill({ + json: { location: { directory }, data: [{ name: "demo-mcp", status: { status: "connected" } }] }, + }) + }) + await page.route("**/api/plugin", async (route) => { + await plugins.promise + await route.fulfill({ + json: { + location: { directory }, + data: [ + { id: "demo-plugin", source: { type: "package", package: "demo-plugin" }, status: "active", tui: false }, + ], + }, + }) + }) + const settings = page.getByTestId("settings-screen") + const requested = page.waitForRequest((request) => new URL(request.url()).pathname === "/api/mcp") + await settings.getByRole("tab", { name: "Extensions", exact: true }).click() + await requested + await expect(settings.getByRole("heading", { name: "Extensions", exact: true })).toBeVisible() + await expect(settings.getByRole("button", { name: "Back to app" })).toBeVisible() + await settings.getByRole("tab", { name: "Plugins", exact: true }).click() + await expect(settings.getByRole("tab", { name: "Plugins", exact: true })).toHaveAttribute("aria-selected", "true") + plugins.resolve() + await expect(settings.getByText("demo-plugin", { exact: true })).toBeVisible() + mcps.resolve() + await settings.getByRole("tab", { name: "MCPs", exact: true }).click() + await expect(settings.getByRole("switch", { name: "demo-mcp" })).toBeChecked() +}) + +test("workspace inventory uses the settings panel scroll area", async ({ page }) => { + const settings = page.getByTestId("settings-screen") + await settings.getByRole("tab", { name: "Workspaces", exact: true }).click() + await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible() + const list = settings.locator('[data-component="settings-list"]') + await expect(list).toHaveCSS("max-height", "none") + await expect(list).toHaveCSS("overflow-y", "visible") + await settings.getByText("Workspace 12 session", { exact: true }).scrollIntoViewIfNeeded() + await expect(settings.getByText("Workspace 12 session", { exact: true })).toBeInViewport() + await expect(settings.getByRole("button", { name: "Back to app" })).toBeInViewport() + await page.setViewportSize({ width: 390, height: 844 }) + await expect(list).toHaveCSS("max-height", "none") + await expect(list).toHaveCSS("overflow-y", "visible") + await settings.getByText("Workspace 12 session", { exact: true }).scrollIntoViewIfNeeded() + await expect(settings.getByText("Workspace 12 session", { exact: true })).toBeInViewport() +}) diff --git a/packages/app/src/settings/providers/extensions.tsx b/packages/app/src/settings/providers/extensions.tsx index 70732a515cb..747adeebf2b 100644 --- a/packages/app/src/settings/providers/extensions.tsx +++ b/packages/app/src/settings/providers/extensions.tsx @@ -27,6 +27,7 @@ export const SettingsExtensions: Component = () => { const [mcpList, { refetch: refetchMcp }] = createResource( () => serverSdk.connection.status() === "connected", () => serverSdk.api.mcp.list().then((result) => result.data), + { initialValue: [] }, ) const toggleMcp = useMcpToggle(() => undefined, refetchMcp) const mcps = createMemo(() => { @@ -44,6 +45,7 @@ export const SettingsExtensions: Component = () => { const [pluginList] = createResource( () => serverSdk.connection.status() === "connected", () => serverSdk.api.plugin.list().then((result) => result.data), + { initialValue: [] }, ) const plugins = createMemo(() => pluginLabels(pluginList.latest ?? []).map((name) => ({ name }))) diff --git a/packages/app/src/settings/settings.css b/packages/app/src/settings/settings.css index 941eff4039c..18bc9393195 100644 --- a/packages/app/src/settings/settings.css +++ b/packages/app/src/settings/settings.css @@ -885,8 +885,6 @@ display: flex; flex-direction: column; gap: 0; - max-height: 480px; - overflow-y: auto; padding: 20px; border-radius: 6px; background-color: var(--v2-background-bg-base); @@ -1048,8 +1046,6 @@ } .settings-workspaces-inventory [data-component="settings-list"] { - max-height: none; - overflow-y: visible; padding: 14px; } @@ -1082,8 +1078,6 @@ } .settings-workspaces-inventory [data-component="settings-list"] { - max-height: none; - overflow-y: visible; padding: 14px; } diff --git a/packages/app/src/settings/workspaces/workspaces.tsx b/packages/app/src/settings/workspaces/workspaces.tsx index ae125334976..f7dcb72b7f2 100644 --- a/packages/app/src/settings/workspaces/workspaces.tsx +++ b/packages/app/src/settings/workspaces/workspaces.tsx @@ -60,6 +60,7 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop const projectQuery = useQuery(() => ({ queryKey: [serverSDK.scope, "settings-workspace-projects"] as const, + enabled: serverSDK.connection.status() === "connected", queryFn: async () => Promise.all( (await serverSDK.api.project.list()).map(async (project) => { @@ -71,10 +72,9 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop ), refetchOnMount: "always", })) - const workspaces = createMemo(() => workspaceInventory(projectQuery.data ?? [])) - const projects = createMemo(() => - (projectQuery.data ?? []).filter((project) => managedWorkspaceDirectories(project).length > 0), - ) + const inventory = createMemo(() => (projectQuery.isPending ? [] : (projectQuery.data ?? []))) + const workspaces = createMemo(() => workspaceInventory(inventory())) + const projects = createMemo(() => inventory().filter((project) => managedWorkspaceDirectories(project).length > 0)) const projectName = (project: Project) => project.name || getFilename(project.worktree) const projectOptions = createMemo(() => [ { id: "all", label: language.t("settings.workspaces.filter.all") }, @@ -110,18 +110,18 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop workspaceDirectories().map((directory) => String(pathKey(directory))), ] as const, queryFn: () => loadSessions(workspaceDirectories()), - enabled: workspaceDirectories().length > 0, + enabled: serverSDK.connection.status() === "connected" && workspaceDirectories().length > 0, refetchOnMount: "always", })) - const sessionsByWorkspace = createMemo( - () => - new Map( - workspaces().map((workspace) => [ - pathKey(workspace.directory), - sessionQuery.data ? sessionsForWorkspace(sessionQuery.data, workspace.directory) : [], - ]), - ), - ) + const sessionsByWorkspace = createMemo(() => { + const sessions = sessionQuery.isPending ? [] : (sessionQuery.data ?? []) + return new Map( + workspaces().map((workspace) => [ + pathKey(workspace.directory), + sessionsForWorkspace(sessions, workspace.directory), + ]), + ) + }) const workspaceSessions = (workspace: Workspace) => sessionsByWorkspace().get(pathKey(workspace.directory)) ?? [] const sessionCount = (workspace: Workspace) => { if (sessionQuery.isPending) return language.t("session.messages.loading") @@ -279,7 +279,9 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop
- {language.plural("settings.workspaces.count", filtered().length)} + + {language.plural("settings.workspaces.count", filtered().length)} +
1}> @@ -332,7 +334,17 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop
0} - fallback={
{language.t("settings.workspaces.empty")}
} + fallback={ +
+ {language.t( + projectQuery.isPending + ? "common.loading" + : projectQuery.isError + ? "common.requestFailed" + : "settings.workspaces.empty", + )} +
+ } >