fix(web): render sidebar on settings route

Settings page was rendering Outlet directly, omitting the Sidebar nav.
Adds a playwright e2e test asserting sidebar visibility on both
dashboard and settings routes.
This commit is contained in:
Offending Commit
2026-05-03 16:58:43 -05:00
parent 784cbee870
commit 557fecf038
6 changed files with 92 additions and 11 deletions

2
packages/web/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
test-results/
playwright-report/

View File

@@ -0,0 +1,29 @@
import { expect, test } from "@playwright/test";
const CONFIG_KEY = "openconcho:config";
const CONFIG_VALUE = JSON.stringify({ baseUrl: "http://localhost:9999", token: "" });
test.describe("Sidebar", () => {
test.beforeEach(async ({ context }) => {
await context.addInitScript(
([key, value]) => {
window.localStorage.setItem(key, value);
},
[CONFIG_KEY, CONFIG_VALUE],
);
});
test("renders the sidebar nav on the dashboard route", async ({ page }) => {
await page.goto("/");
await expect(page.getByRole("complementary")).toBeVisible();
await expect(page.getByRole("link", { name: /dashboard/i })).toBeVisible();
await expect(page.getByRole("link", { name: /workspaces/i })).toBeVisible();
await expect(page.getByRole("link", { name: /settings/i })).toBeVisible();
});
test("renders the sidebar nav on the settings route", async ({ page }) => {
await page.goto("/settings");
await expect(page.getByRole("complementary")).toBeVisible();
await expect(page.getByRole("link", { name: /dashboard/i })).toBeVisible();
});
});

View File

@@ -10,12 +10,10 @@
"lint": "biome check src/",
"lint:fix": "biome check --write src/",
"test": "vitest run --passWithNoTests",
"test:e2e": "playwright test",
"generate:api": "openapi-typescript openapi.json -o src/api/schema.d.ts"
},
"dependencies": {
"@tauri-apps/api": "^2",
"@tauri-apps/plugin-http": "^2",
"@tauri-apps/plugin-shell": "^2",
"@fontsource/dm-mono": "^5.2.7",
"@fontsource/dm-sans": "^5.2.8",
"@radix-ui/react-collapsible": "^1.1.12",
@@ -27,6 +25,9 @@
"@tailwindcss/vite": "^4.2.4",
"@tanstack/react-query": "^5.74.4",
"@tanstack/react-router": "^1.120.3",
"@tauri-apps/api": "^2",
"@tauri-apps/plugin-http": "^2",
"@tauri-apps/plugin-shell": "^2",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"framer-motion": "^12.38.0",
@@ -42,6 +43,7 @@
"zod": "catalog:"
},
"devDependencies": {
"@playwright/test": "^1.59.1",
"@tanstack/router-plugin": "^1.120.3",
"@testing-library/jest-dom": "catalog:",
"@testing-library/react": "catalog:",

View File

@@ -0,0 +1,17 @@
import { defineConfig, devices } from "@playwright/test";
export default defineConfig({
testDir: "./e2e",
fullyParallel: true,
reporter: "list",
use: {
baseURL: "http://localhost:5173",
},
projects: [{ name: "chromium", use: { ...devices["Desktop Chrome"] } }],
webServer: {
command: "pnpm dev",
url: "http://localhost:5173",
reuseExistingServer: !process.env.CI,
timeout: 60_000,
},
});

View File

@@ -1,4 +1,4 @@
import { createRootRoute, Outlet, redirect, useRouter } from "@tanstack/react-router";
import { createRootRoute, Outlet, redirect } from "@tanstack/react-router";
import { useEffect } from "react";
import { Sidebar } from "@/components/layout/Sidebar";
import { loadConfig } from "@/lib/config";
@@ -7,17 +7,10 @@ import { applyTheme, getStoredTheme } from "@/lib/theme";
const SETTINGS_PATH = "/settings";
function RootLayout() {
const router = useRouter();
const isSettings = router.state.location.pathname === SETTINGS_PATH;
useEffect(() => {
applyTheme(getStoredTheme());
}, []);
if (isSettings) {
return <Outlet />;
}
return (
<div
className="flex h-screen w-full overflow-hidden"