Draw one menu on every page
Each page wrote its own nav: the same links in a different order, some missing, the current page sometimes listed and sometimes not. A shared "nav" template now draws it everywhere — Cluster, People, Quotas, Usage, Mirror for an administrator, then Chat, Your keys and Sign out — with the current page marked by aria-current. Pages rendered outside the account pages (the dashboard, node logs) get it through the request context their admin wrapper sets. The admin listener's own page keeps its metrics/pprof/api links. The chat and key pages said "project proj-3kq7…"; they now show the project's path, and the key page no longer repeats the email. A test renders several admin pages and requires the same menu on each. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
c22c3a309b
commit
c9cd25efc2
23 files changed
+209
-44
No files matched your search
@@ -14,6 +14,8 @@ import (
|
||||
|
||||
// DashboardData is the whole page.
|
||||
type DashboardData struct {
|
||||
// Menu is the shared top menu; Nav below is what the cluster page adds.
|
||||
Menu Nav
|
||||
Nodes []adminapi.NodeView
|
||||
Models []adminapi.ModelView
|
||||
Replicas []adminapi.ReplicaView
|
||||
@@ -139,6 +141,7 @@ func Dashboard(src Source, usage UsageSource, version string, refresh time.Durat
|
||||
}
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
d := DashboardData{
|
||||
Menu: navFrom(r, "cluster"),
|
||||
OnAdminListener: onAdminListener,
|
||||
Nav: nav,
|
||||
Fleet: LoadFleetCharts(r.Context(), nav.History, nav.Window, log),
|
||||
@@ -173,6 +176,9 @@ func Dashboard(src Source, usage UsageSource, version string, refresh time.Durat
|
||||
d.addCharts(r.Context(), usage, log)
|
||||
d.addPeopleAndModels(r.Context(), usage, log)
|
||||
}
|
||||
// Only ever shown to an administrator, whatever wrapped it.
|
||||
d.Menu.Admin = true
|
||||
d.Menu.Mirror = d.Menu.Mirror || nav.Mirror
|
||||
render(w, "dashboard", d)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user