From b801bad9e00576c9a049ee37c637092389c98bef Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Sun, 25 Jan 2026 16:36:06 +0900 Subject: [PATCH] appview: specify current tab from `pages` package Signed-off-by: Seongmin Lee --- appview/knots/knots.go | 2 -- appview/pages/pages.go | 9 +++++++++ appview/repo/settings.go | 3 --- appview/settings/settings.go | 4 ---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/appview/knots/knots.go b/appview/knots/knots.go index bd8e79dd..23a6ac50 100644 --- a/appview/knots/knots.go +++ b/appview/knots/knots.go @@ -71,7 +71,6 @@ func (k *Knots) knots(w http.ResponseWriter, r *http.Request) { k.Pages.Knots(w, pages.KnotsParams{ LoggedInUser: user, Registrations: registrations, - Tab: "knots", }) } @@ -134,7 +133,6 @@ func (k *Knots) dashboard(w http.ResponseWriter, r *http.Request) { Members: members, Repos: repoMap, IsOwner: true, - Tab: "knots", }) } diff --git a/appview/pages/pages.go b/appview/pages/pages.go index 19aa7bca..9dd46cb0 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -342,6 +342,7 @@ type UserProfileSettingsParams struct { } func (p *Pages) UserProfileSettings(w io.Writer, params UserProfileSettingsParams) error { + params.Tab = "profile" return p.execute("user/settings/profile", w, params) } @@ -380,6 +381,7 @@ type UserKeysSettingsParams struct { } func (p *Pages) UserKeysSettings(w io.Writer, params UserKeysSettingsParams) error { + params.Tab = "keys" return p.execute("user/settings/keys", w, params) } @@ -390,6 +392,7 @@ type UserEmailsSettingsParams struct { } func (p *Pages) UserEmailsSettings(w io.Writer, params UserEmailsSettingsParams) error { + params.Tab = "emails" return p.execute("user/settings/emails", w, params) } @@ -400,6 +403,7 @@ type UserNotificationSettingsParams struct { } func (p *Pages) UserNotificationSettings(w io.Writer, params UserNotificationSettingsParams) error { + params.Tab = "notifications" return p.execute("user/settings/notifications", w, params) } @@ -419,6 +423,7 @@ type KnotsParams struct { } func (p *Pages) Knots(w io.Writer, params KnotsParams) error { + params.Tab = "knots" return p.execute("knots/index", w, params) } @@ -450,6 +455,7 @@ type SpindlesParams struct { } func (p *Pages) Spindles(w io.Writer, params SpindlesParams) error { + params.Tab = "spindles" return p.execute("spindles/index", w, params) } @@ -883,6 +889,7 @@ type RepoGeneralSettingsParams struct { func (p *Pages) RepoGeneralSettings(w io.Writer, params RepoGeneralSettingsParams) error { params.Active = "settings" + params.Tab = "general" return p.executeRepo("repo/settings/general", w, params) } @@ -896,6 +903,7 @@ type RepoAccessSettingsParams struct { func (p *Pages) RepoAccessSettings(w io.Writer, params RepoAccessSettingsParams) error { params.Active = "settings" + params.Tab = "access" return p.executeRepo("repo/settings/access", w, params) } @@ -911,6 +919,7 @@ type RepoPipelineSettingsParams struct { func (p *Pages) RepoPipelineSettings(w io.Writer, params RepoPipelineSettingsParams) error { params.Active = "settings" + params.Tab = "pipelines" return p.executeRepo("repo/settings/pipelines", w, params) } diff --git a/appview/repo/settings.go b/appview/repo/settings.go index 1b82f8f3..ff537f44 100644 --- a/appview/repo/settings.go +++ b/appview/repo/settings.go @@ -251,7 +251,6 @@ func (rp *Repo) generalSettings(w http.ResponseWriter, r *http.Request) { DefaultLabels: defaultLabels, SubscribedLabels: subscribedLabels, ShouldSubscribeAll: shouldSubscribeAll, - Tab: "general", }) } @@ -296,7 +295,6 @@ func (rp *Repo) accessSettings(w http.ResponseWriter, r *http.Request) { rp.pages.RepoAccessSettings(w, pages.RepoAccessSettingsParams{ LoggedInUser: user, RepoInfo: rp.repoResolver.GetRepoInfo(r, user), - Tab: "access", Collaborators: collaborators, }) } @@ -356,7 +354,6 @@ func (rp *Repo) pipelineSettings(w http.ResponseWriter, r *http.Request) { rp.pages.RepoPipelineSettings(w, pages.RepoPipelineSettingsParams{ LoggedInUser: user, RepoInfo: rp.repoResolver.GetRepoInfo(r, user), - Tab: "pipelines", Spindles: spindles, CurrentSpindle: f.Spindle, Secrets: niceSecret, diff --git a/appview/settings/settings.go b/appview/settings/settings.go index cbe783e0..df40e9a1 100644 --- a/appview/settings/settings.go +++ b/appview/settings/settings.go @@ -72,7 +72,6 @@ func (s *Settings) profileSettings(w http.ResponseWriter, r *http.Request) { s.Pages.UserProfileSettings(w, pages.UserProfileSettingsParams{ LoggedInUser: user, - Tab: "profile", }) } @@ -90,7 +89,6 @@ func (s *Settings) notificationsSettings(w http.ResponseWriter, r *http.Request) s.Pages.UserNotificationSettings(w, pages.UserNotificationSettingsParams{ LoggedInUser: user, Preferences: prefs, - Tab: "notifications", }) } @@ -131,7 +129,6 @@ func (s *Settings) keysSettings(w http.ResponseWriter, r *http.Request) { s.Pages.UserKeysSettings(w, pages.UserKeysSettingsParams{ LoggedInUser: user, PubKeys: pubKeys, - Tab: "keys", }) } @@ -145,7 +142,6 @@ func (s *Settings) emailsSettings(w http.ResponseWriter, r *http.Request) { s.Pages.UserEmailsSettings(w, pages.UserEmailsSettingsParams{ LoggedInUser: user, Emails: emails, - Tab: "emails", }) } -- 2.51.2