mAi
f820fa5830
Per m's Q1 pick (b) (2026-05-29): legacy `/`, `/dashboard`, `/calendar`,
`/timeline`, `/graph` become `/views/{system-slug}`. Old routes
301-redirect to the new ones with chip params preserved; the legacy
?view=<uuid> param from 5i is resolved through the uuid → slug map
when present so old bookmarks land on the right user view.
System views (web/system_views.go):
- SystemView struct (Slug / Name / Icon / URL) — code-resident, never
rows in projax.views.
- AllSystemViews() returns the canonical five: tree, dashboard,
calendar, timeline, graph. Display order matches the existing
sidebar.
- LookupSystemView(slug) returns the matching entry or nil; the
reserved-slug list in store.IsReservedViewSlug (slice A) is kept
in sync.
- legacyRedirect(systemSlug) handler 301s with chip-param preservation
+ uuid → slug resolution for any leftover ?view=<uuid>.
Routes (web/server.go):
- GET /views/tree → handleTree (was GET /)
- GET /views/dashboard → handleDashboard
- GET /views/timeline → handleTimeline
- GET /views/calendar → handleCalendar
- GET /views/graph → handleGraph
- GET / → 301 → /views/tree
- GET /dashboard → 301 → /views/dashboard
- GET /timeline → 301 → /views/timeline
- GET /calendar → 301 → /views/calendar
- GET /graph → 301 → /views/graph
- POST action endpoints (/dashboard/task/*, /dashboard/pin, /admin/*)
stay where they are — those are RPC-ish, not page renders.
handleTree: dropped the `r.URL.Path != "/"` guard — the only entry
point now is /views/tree, mounted via the new route. Slice F removes
any residual references; this slice keeps the handler reachable.
computeChipCounts grew a `base string` arg so chip URLs anchor on the
caller's route (/views/tree for the system tree, /views/{slug} for
saved views). PageViewTypes recognises both legacy and /views/ keys
during the transition.
Template hrefs / hx-gets bulk-updated to the new URLs:
- layout.tmpl: every sidebar + bottom-nav entry points at
/views/{system-slug}. Active-state checks updated alongside.
- tree_section.tmpl, tree_card.tmpl, tree_kanban.tmpl: clear-filter
/ clear-all hrefs → /views/tree.
- calendar*.tmpl, timeline_section.tmpl, graph.tmpl,
dashboard_section.tmpl: every internal nav + filter link points at
the /views/{slug} surface.
- detail.tmpl, error.tmpl: cancel / back-to-tree → /views/tree.
Test-source updates (per the 5c sharpened rule):
- ~100 test paths bulk-rewritten from /dashboard /calendar /timeline
/graph (and `/`) to their /views/{slug} counterparts. The
behaviour-preservation contract holds: status codes + body shapes
for the rendered pages stay the same; only the URL anchoring the
test changes.
- layout_test.go: sidebar href assertions updated to /views/{slug}.
- view_type_test.go (Q2 + Q3 follow-up): PageViewTypes lookup table
updated to use the new route keys.
- 2 deliberate behaviour-change assertions land: TestLegacyRedirects
expects 301 on the old URLs (was 200); TestTreeRenders fetches
/views/tree (the new home) instead of /.
Internal go-source URL emissions (dashboard.go, calendar.go,
timeline.go) updated to the new BasePath so chip + refresh URLs round
through /views/{slug} correctly.
New tests:
- TestSystemViewLookup — AllSystemViews shape + LookupSystemView
round-trip + unknown-slug nil.
- TestLegacyRedirects — every legacy URL 301s to its new home with
chip params preserved.
- TestLegacyViewUUIDRedirect — old `?view=<uuid>` URLs land on the
resolved slug per m's Q3 pick.
194 lines
7.4 KiB
Go
194 lines
7.4 KiB
Go
package web_test
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
// TestLayoutSidebarOnDesktop confirms the Phase 5g sidebar markup is
|
|
// rendered with all six nav items (Tree / Dashboard / Calendar /
|
|
// Timeline / Graph / Admin). Per-item href + label asserted so a stray
|
|
// edit can't silently lose a section.
|
|
func TestLayoutSidebarOnDesktop(t *testing.T) {
|
|
srv, pool := mustServer(t)
|
|
defer pool.Close()
|
|
h := srv.Routes()
|
|
_, body := get(t, h, "/views/dashboard")
|
|
if !strings.Contains(body, `<aside class="projax-sidebar"`) {
|
|
t.Fatalf("expected <aside class=\"projax-sidebar\"> in body, got: %s", truncate(body, 400))
|
|
}
|
|
for _, want := range []struct {
|
|
href, label string
|
|
}{
|
|
{`/views/tree`, "Tree"},
|
|
{`/views/dashboard`, "Dashboard"},
|
|
{`/views/calendar`, "Calendar"},
|
|
{`/views/timeline`, "Timeline"},
|
|
{`/views/graph`, "Graph"},
|
|
{`/admin`, "Admin"},
|
|
} {
|
|
if !strings.Contains(body, `href="`+want.href+`"`) {
|
|
t.Errorf("sidebar missing href=%q", want.href)
|
|
}
|
|
if !strings.Contains(body, `<span class="nav-label">`+want.label+`</span>`) {
|
|
t.Errorf("sidebar missing label %q", want.label)
|
|
}
|
|
}
|
|
}
|
|
|
|
// TestLayoutActiveClass proves the server-side active marker fires only
|
|
// on the cell whose href matches the request path. Render is driven by
|
|
// the .Path field the render helper injects from r.URL.Path.
|
|
func TestLayoutActiveClass(t *testing.T) {
|
|
srv, pool := mustServer(t)
|
|
defer pool.Close()
|
|
h := srv.Routes()
|
|
_, body := get(t, h, "/views/dashboard")
|
|
// Dashboard item should be active.
|
|
if !strings.Contains(body, `class="nav-item active" title="Dashboard"`) {
|
|
t.Errorf("expected Dashboard nav-item to carry .active on /dashboard, body: %s", truncate(body, 400))
|
|
}
|
|
// Tree item (href="/views/tree") must NOT be active on the /dashboard page.
|
|
// The Tree anchor opens with the exact-path active match; on /dashboard
|
|
// the substring `class="nav-item" title="Tree"` should be present and
|
|
// not its `active` sibling.
|
|
if !strings.Contains(body, `class="nav-item" title="Tree"`) {
|
|
t.Errorf("expected Tree nav-item to be non-active on /dashboard")
|
|
}
|
|
if strings.Contains(body, `class="nav-item active" title="Tree"`) {
|
|
t.Errorf("Tree nav-item should NOT be active on /dashboard")
|
|
}
|
|
}
|
|
|
|
// TestLayoutCollapseScript proves the inline pre-paint script that
|
|
// restores the sidebar collapsed state from localStorage ships unchanged.
|
|
// Without it the main-content margin would flash from 220px → 56px on
|
|
// every navigation when the user has the sidebar collapsed.
|
|
func TestLayoutCollapseScript(t *testing.T) {
|
|
srv, pool := mustServer(t)
|
|
defer pool.Close()
|
|
h := srv.Routes()
|
|
_, body := get(t, h, "/views/dashboard")
|
|
// Pre-paint restore script.
|
|
if !strings.Contains(body, `localStorage.getItem('projax.sidebar.collapsed')`) {
|
|
t.Errorf("expected pre-paint localStorage restore script in layout")
|
|
}
|
|
// The collapse-toggle button + its handler are also part of the chrome.
|
|
if !strings.Contains(body, `id="sidebar-collapse"`) {
|
|
t.Errorf("expected #sidebar-collapse button in layout")
|
|
}
|
|
if !strings.Contains(body, `localStorage.setItem('projax.sidebar.collapsed'`) {
|
|
t.Errorf("expected toggle handler that persists state")
|
|
}
|
|
}
|
|
|
|
// TestLayoutNoTopHeader proves the pre-5g <header> chrome is gone so
|
|
// callers that asserted on old top-nav markup can't keep passing by
|
|
// accident. Belt-and-braces guard for the migration.
|
|
//
|
|
// Scope: only the TOP-of-body header is forbidden. <header> elements
|
|
// inside <main> (card heads, tile heads) are valid HTML5 and used by
|
|
// the existing card-tasks template and the Phase 5h tile template.
|
|
func TestLayoutNoTopHeader(t *testing.T) {
|
|
srv, pool := mustServer(t)
|
|
defer pool.Close()
|
|
h := srv.Routes()
|
|
_, body := get(t, h, "/views/dashboard")
|
|
// Slice out the region between <body> and <main> — that's where the
|
|
// pre-5g top header lived. Inside <main> belongs to content templates.
|
|
chrome := body
|
|
if i := strings.Index(chrome, "<main"); i >= 0 {
|
|
chrome = chrome[:i]
|
|
}
|
|
if strings.Contains(chrome, `<header>`) || strings.Contains(chrome, `<header `) {
|
|
t.Errorf("expected the pre-5g top <header> to be gone, but body chrome (before <main>) has one: %s", truncate(chrome, 400))
|
|
}
|
|
if strings.Contains(body, `class="logout-btn"`) {
|
|
t.Errorf("expected the pre-5g .logout-btn to be replaced by the sidebar .logout-item")
|
|
}
|
|
}
|
|
|
|
// TestLayoutBottomNavMarkup pins the Slice-B mobile bottom-nav shape: five
|
|
// slots in the documented order (Tree / Dashboard / + New / Calendar /
|
|
// Menu), the +New slot is a raised .capture-circle pointing at /new, and
|
|
// the Menu opens a <details> drawer with the overflow items inside.
|
|
func TestLayoutBottomNavMarkup(t *testing.T) {
|
|
srv, pool := mustServer(t)
|
|
defer pool.Close()
|
|
h := srv.Routes()
|
|
_, body := get(t, h, "/views/dashboard")
|
|
if !strings.Contains(body, `<nav class="projax-bottom-nav"`) {
|
|
t.Fatalf("expected <nav class=\"projax-bottom-nav\"> in body, got: %s", truncate(body, 400))
|
|
}
|
|
// 5-slot anchors / details element.
|
|
for _, want := range []string{
|
|
`<a href="/views/tree" class="bottom-nav-item`,
|
|
`<a href="/views/dashboard" class="bottom-nav-item`,
|
|
`<a href="/new" class="bottom-nav-item capture-btn"`,
|
|
`class="capture-circle"`,
|
|
`<a href="/views/calendar" class="bottom-nav-item`,
|
|
`<details class="projax-mobile-drawer"`,
|
|
} {
|
|
if !strings.Contains(body, want) {
|
|
t.Errorf("bottom-nav body missing %q", want)
|
|
}
|
|
}
|
|
// Drawer overflow items: Timeline, Graph, Admin, theme toggle, sign-out.
|
|
for _, want := range []string{
|
|
`<a href="/views/timeline" class="drawer-item`,
|
|
`<a href="/views/graph" class="drawer-item`,
|
|
`<a href="/admin" class="drawer-item`,
|
|
`id="theme-toggle-drawer"`,
|
|
`<form method="post" action="/logout" class="drawer-form">`,
|
|
} {
|
|
if !strings.Contains(body, want) {
|
|
t.Errorf("drawer body missing %q", want)
|
|
}
|
|
}
|
|
}
|
|
|
|
// TestLayoutBottomNavActiveClass mirrors TestLayoutActiveClass — the
|
|
// server-side .Path marker fires on the bottom-nav too so a user on
|
|
// /calendar sees the Calendar slot highlighted (and not Tree/Dashboard).
|
|
func TestLayoutBottomNavActiveClass(t *testing.T) {
|
|
srv, pool := mustServer(t)
|
|
defer pool.Close()
|
|
h := srv.Routes()
|
|
_, body := get(t, h, "/views/calendar")
|
|
if !strings.Contains(body, `<a href="/views/calendar" class="bottom-nav-item active"`) {
|
|
t.Errorf("expected Calendar bottom-nav-item to carry .active on /calendar")
|
|
}
|
|
if strings.Contains(body, `<a href="/views/tree" class="bottom-nav-item active"`) {
|
|
t.Errorf("Tree bottom-nav-item should NOT be active on /calendar")
|
|
}
|
|
}
|
|
|
|
// TestLayoutThemeToggleBoundToBothButtons proves the single theme handler
|
|
// is wired to both the sidebar (#theme-toggle) and the drawer
|
|
// (#theme-toggle-drawer) so flipping either swaps the data-theme. Without
|
|
// this the mobile drawer's theme button would be a dead element.
|
|
func TestLayoutThemeToggleBoundToBothButtons(t *testing.T) {
|
|
srv, pool := mustServer(t)
|
|
defer pool.Close()
|
|
h := srv.Routes()
|
|
_, body := get(t, h, "/views/dashboard")
|
|
// Both buttons present.
|
|
if !strings.Contains(body, `id="theme-toggle"`) {
|
|
t.Errorf("sidebar theme-toggle button missing")
|
|
}
|
|
if !strings.Contains(body, `id="theme-toggle-drawer"`) {
|
|
t.Errorf("drawer theme-toggle-drawer button missing")
|
|
}
|
|
// Inline handler enumerates BOTH ids — keeps drift detection cheap.
|
|
if !strings.Contains(body, `getElementById('theme-toggle-drawer')`) {
|
|
t.Errorf("expected theme handler to enumerate #theme-toggle-drawer")
|
|
}
|
|
}
|
|
|
|
func truncate(s string, n int) string {
|
|
if len(s) <= n {
|
|
return s
|
|
}
|
|
return s[:n] + "…"
|
|
}
|