From aa3c71852253c6229ba1609056f6cdaffd3ef79e Mon Sep 17 00:00:00 2001 From: bluebluesoda <300733005+bluebluesoda@users.noreply.github.com> Date: Mon, 24 Aug 2026 11:41:35 +0000 Subject: [PATCH] feat(panel): expand admin-keys disclosure by default when a key is granted - Default the 'admin public keys' list to expanded (button shows collapse) whenever the user has activated at least one admin key; otherwise keep it collapsed. JS derives the initial state from the DOM. --- src/internal/panel/panel.go | 7 +++++- src/internal/panel/panel_test.go | 26 +++++++++++++++++++++- src/internal/panel/templates/overview.html | 8 ++++--- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/internal/panel/panel.go b/src/internal/panel/panel.go index d6679eb..f245d3c 100644 --- a/src/internal/panel/panel.go +++ b/src/internal/panel/panel.go @@ -160,6 +160,7 @@ type pageData struct { SnapshotLimit int // configured per-container snapshot cap (for display) SSHKeys []sshKeyRow AdminSSHKeys []sshKeyRow // operator's own public keys, shown read-only + AdminKeysAnyActive bool // at least one admin key is granted: expand the disclosure by default Impersonated bool // operator "log in as user": show a banner AdminPrefix string // admin panel path, for the banner's return link MaxNotesPlaintext int // sticky-notes plaintext byte cap (client-side check) @@ -381,7 +382,11 @@ func (s *Server) buildData(u *db.User, msg, errMsg string) pageData { } } for _, k := range akeys { - d.AdminSSHKeys = append(d.AdminSSHKeys, sshKeyRow{ID: k.ID, Name: k.Name, Key: k.Key, Active: granted[k.ID]}) + granted := granted[k.ID] + d.AdminSSHKeys = append(d.AdminSSHKeys, sshKeyRow{ID: k.ID, Name: k.Name, Key: k.Key, Active: granted}) + if granted { + d.AdminKeysAnyActive = true + } } } return d diff --git a/src/internal/panel/panel_test.go b/src/internal/panel/panel_test.go index cf10aed..3d51c63 100644 --- a/src/internal/panel/panel_test.go +++ b/src/internal/panel/panel_test.go @@ -1230,9 +1230,10 @@ func TestOverviewAdminKeysDisclosure(t *testing.T) { {ID: 1, Name: "ops", Key: k1, Active: true}, // already granted {ID: 2, Name: "ci", Key: k2, Active: false}, // not granted }, + AdminKeysAnyActive: true, // one key granted -> default expanded }) for _, want := range []string{ - `id="adminKeysToggle"`, "展开来自管理员的公钥", + `id="adminKeysToggle"`, "收起来自管理员的公钥", "激活以下公钥则授权管理员登录你的机器", `data-aid="1"`, `data-aid="2"`, `class="keyrow admin-keyrow"`, } { @@ -1240,6 +1241,13 @@ func TestOverviewAdminKeysDisclosure(t *testing.T) { t.Errorf("overview missing %q", want) } } + // Granted keys default the disclosure to EXPANDED: no hidden attribute. + if !strings.Contains(html, `id="adminKeysList">`) { + t.Error("granted admin keys should render the list expanded (no hidden)") + } + if strings.Contains(html, `id="adminKeysList" hidden`) { + t.Error("granted admin keys must not render the list hidden") + } // Exactly one granted (checked) row and one plain row. if n := strings.Count(html, `class="kact" checked>`); n != 1 { t.Errorf("checked admin rows = %d, want 1", n) @@ -1248,6 +1256,22 @@ func TestOverviewAdminKeysDisclosure(t *testing.T) { t.Errorf("unchecked admin rows = %d, want 1", n) } + // No granted keys -> default COLLAPSED: list hidden, button shows expand. + collapsed := srv.renderToString(t, "overview.html", pageData{ + User: &db.User{Name: "alice"}, + Prefix: "/" + testSecret, + Lang: langZh, + AdminSSHKeys: []sshKeyRow{ + {ID: 1, Name: "ops", Key: k1, Active: false}, + }, + }) + if !strings.Contains(collapsed, `id="adminKeysList" hidden`) { + t.Error("no granted admin keys should default the list to hidden") + } + if !strings.Contains(collapsed, "展开来自管理员的公钥") { + t.Error("collapsed disclosure should show the expand label") + } + // Without operator keys the disclosure block is not rendered at all. The // JS always references these ids, so assert on the rendered-only strings. plain := srv.renderToString(t, "overview.html", pageData{ diff --git a/src/internal/panel/templates/overview.html b/src/internal/panel/templates/overview.html index 791851a..5f92479 100644 --- a/src/internal/panel/templates/overview.html +++ b/src/internal/panel/templates/overview.html @@ -345,8 +345,8 @@ footer a{color:var(--muted);text-decoration:underline}
{{if .AdminSSHKeys}}
- -