Skip to content

fix(frontend): remove stale spawn modal references #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yyovil merged 1 commit into from
Jun 13, 2026
+7 −88
Merged

fix(frontend): remove stale spawn modal references #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 2 additions & 31 deletions frontend/src/renderer/components/Sidebar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { SidebarProvider } from "@/components/ui/sidebar";
import { render, screen, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { render, screen } from "@testing-library/react";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { Sidebar } from "./Sidebar";
import type { WorkspaceSummary } from "../types/workspace";
Expand All @@ -25,55 +24,27 @@
sessions: [],
};

function renderSidebar(onRemoveProject = vi.fn().mockResolvedValue(undefined)) {
function renderSidebar() {
render(
<SidebarProvider>
<Sidebar
daemonStatus={{ state: "running" }}
onCreateProject={vi.fn()}
onRemoveProject={onRemoveProject}
workspaces={[workspace]}
/>
</SidebarProvider>,
);
return onRemoveProject;
}

beforeEach(() => {
navigateMock.mockReset();
vi.spyOn(window, "confirm").mockReturnValue(true);
vi.spyOn(window, "alert").mockImplementation(() => undefined);
});

afterEach(() => {
vi.restoreAllMocks();
});

describe("Sidebar", () => {
it("confirms project removal before calling the remove handler", async () => {
const user = userEvent.setup();
const onRemoveProject = renderSidebar();

await user.click(screen.getByLabelText("Project actions for Project One"));
await user.click(await screen.findByRole("menuitem", { name: "Remove project" }));

expect(window.confirm).toHaveBeenCalledWith(
"Remove project Project One? This stops its live sessions and removes it from the sidebar, but keeps the repository folder and stored history on disk.",
);
await waitFor(() => expect(onRemoveProject).toHaveBeenCalledTimes(1));
});

it("does not remove the project when confirmation is cancelled", async () => {
vi.mocked(window.confirm).mockReturnValue(false);
const user = userEvent.setup();
const onRemoveProject = renderSidebar();

await user.click(screen.getByLabelText("Project actions for Project One"));
await user.click(await screen.findByRole("menuitem", { name: "Remove project" }));

expect(onRemoveProject).not.toHaveBeenCalled();
});

it("hides the worker count in every state that reveals project actions", () => {
renderSidebar();

Expand All @@ -81,7 +52,7 @@
const count = screen.getByText("0");

if (!projectRow) throw new Error("Project row button not found");
expect(projectRow).toHaveClass("group-hover/menu-item:pr-[34px]");

Check failure on line 55 in frontend/src/renderer/components/Sidebar.test.tsx

View workflow job for this annotation

GitHub Actions / test

src/renderer/components/Sidebar.test.tsx > Sidebar > hides the worker count in every state that reveals project actions 

Error: expect(element).toHaveClass("group-hover/menu-item:pr-[34px]")

Expected the element to have class:
  group-hover/menu-item:pr-[34px]
Received:
  peer/menu-button flex w-full items-center overflow-hidden p-2 text-left ring-sidebar-ring outline-hidden group-has-data-[sidebar=menu-action]/menu-item:pr-8 focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 h-auto gap-[9px] rounded-[5px] px-1.5 py-[7px] text-[13px] font-medium text-muted-foreground transition-[padding] hover:bg-interactive-hover hover:text-muted-foreground active:bg-interactive-hover active:text-muted-foreground data-[active=true]:bg-interactive-active data-[active=true]:font-semibold data-[active=true]:text-foreground group-data-[collapsible=icon]:size-9! group-data-[collapsible=icon]:justify-center group-data-[collapsible=icon]:rounded-lg group-data-[collapsible=icon]:p-0! group-data-[collapsible=icon]:font-semibold
 ❯ src/renderer/components/Sidebar.test.tsx:55:22
expect(projectRow).toHaveClass("group-focus-within/menu-item:pr-[34px]");
expect(projectRow).toHaveClass("group-has-data-[state=open]/menu-item:pr-[34px]");
expect(count).toHaveClass("group-hover/menu-item:opacity-0");
Expand Down
32 changes: 1 addition & 31 deletions frontend/src/renderer/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
import { useNavigate, useParams, useRouterState } from "@tanstack/react-router";
import {
ChevronRight,
GitPullRequest,
Moon,
MoreHorizontal,
Plus,
Search,
Settings,
Sun,
Trash2,
Waypoints,
} from "lucide-react";
import { ChevronRight, GitPullRequest, Moon, Plus, Search, Settings, Sun, Waypoints } from "lucide-react";
import { useState } from "react";
import {
attentionZone,
Expand Down Expand Up @@ -377,25 +366,6 @@ function ProjectItem({
}
};

const removeProject = async () => {
setRemoveError(null);
const confirmed = window.confirm(
`Remove project ${workspace.name}? This stops its live sessions and removes it from the sidebar, but keeps the repository folder and stored history on disk.`,
);
if (!confirmed) return;

setIsRemoving(true);
try {
await onRemoveProject();
} catch (err) {
const message = err instanceof Error ? err.message : "Could not remove project";
setRemoveError(message);
window.alert(message);
} finally {
setIsRemoving(false);
}
};

return (
<SidebarMenuItem className="mb-px group-data-[collapsible=icon]:mb-0">
{/* project-sidebar__proj-row */}
Expand Down
30 changes: 4 additions & 26 deletions frontend/src/renderer/routes/_shell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createFileRoute, Outlet, useNavigate, useParams } from "@tanstack/react-router";
import { createFileRoute, Outlet, useNavigate } from "@tanstack/react-router";
import { useQueryClient } from "@tanstack/react-query";
import { useCallback, useEffect, useState } from "react";
import { type CSSProperties, useCallback, useEffect } from "react";
import { ShellTopbar } from "../components/ShellTopbar";
import { Sidebar } from "../components/Sidebar";
import { SidebarProvider } from "../components/ui/sidebar";
Expand Down Expand Up @@ -34,7 +34,6 @@ function errorMessage(error: unknown) {
// instead of Zustand. The daemon-status effect runs here exactly once.
function ShellLayout() {
const navigate = useNavigate();
const params = useParams({ strict: false }) as { projectId?: string };
const queryClient = useQueryClient();
const workspaceQuery = useWorkspaceQuery();
const workspaces = workspaceQuery.data ?? [];
Expand Down Expand Up @@ -67,20 +66,6 @@ function ShellLayout() {
[navigate, updateWorkspaces],
);

const removeProject = useCallback(
async (projectId: string) => {
const { error } = await apiClient.DELETE("/api/v1/projects/{id}", { params: { path: { id: projectId } } });
if (error) throw new Error(apiErrorMessage(error));

updateWorkspaces((current) => current.filter((item) => item.id !== projectId));
await queryClient.invalidateQueries({ queryKey: workspaceQueryKey });
if (params.projectId === projectId) {
void navigate({ to: "/" });
}
},
[navigate, params.projectId, queryClient, updateWorkspaces],
);

useEffect(() => {
document.documentElement.dataset.theme = theme;
document.documentElement.style.colorScheme = theme;
Expand Down Expand Up @@ -113,7 +98,7 @@ function ShellLayout() {
}, [navigate, workspaces]);

return (
<ShellProvider value={{ daemonStatus, openSpawn, createProject, createTask }}>
<ShellProvider value={{ daemonStatus, createProject }}>
{/* The topbar spans the full window width above the sidebar row (the
macOS traffic lights + TitlebarNav cluster sit in its left inset),
and the sidebar hangs below it — so the sidebar border stops at the
Expand All @@ -130,7 +115,7 @@ function ShellLayout() {
onOpenChange={(open) => open !== isSidebarOpen && toggleSidebar()}
open={isSidebarOpen}
style={
{ "--sidebar-width": "var(--ao-sidebar-w, 240px)", "--sidebar-width-icon": "48px" } as React.CSSProperties
{ "--sidebar-width": "var(--ao-sidebar-w, 240px)", "--sidebar-width-icon": "48px" } as CSSProperties
}
>
<Sidebar
Expand All @@ -155,13 +140,6 @@ function ShellLayout() {
<TitlebarNav />
</SidebarProvider>
</div>
<SpawnWorkerModal
defaultProjectId={spawnProjectId}
onCreateTask={createTask}
onOpenChange={setSpawnOpen}
open={spawnOpen}
workspaces={workspaces}
/>
</ShellProvider>
);
}
Loading