{{end}}
diff --git a/internal/e2e/org_tabs_test.go b/internal/e2e/org_tabs_test.go
new file mode 100644
index 0000000..bb1d4e1
--- /dev/null
+++ b/internal/e2e/org_tabs_test.go
@@ -0,0 +1,52 @@
+//go:build browser
+
+package e2e
+
+import (
+ "strings"
+ "testing"
+
+ cdplog "github.com/chromedp/cdproto/log"
+ "github.com/chromedp/cdproto/network"
+ "github.com/chromedp/chromedp"
+)
+
+// TestE2EOrgActionsConsistent verifies the shared org header: the Actions menu is
+// present on a non-Home org tab (Members) and opens under the strict CSP
+// (Bootstrap data-bs-toggle, no inline JS), exposing the management items.
+func TestE2EOrgActionsConsistent(t *testing.T) {
+ srv := newE2EServer(t)
+ user, cookie := srv.login(t, "e2eorgtabs")
+ // CreateOrg makes the creator an admin member, so the Actions menu (with
+ // Edit configuration) renders.
+ org, err := srv.store.CreateOrg(srv.ctx, "Tabs Org", user.ID)
+ if err != nil {
+ t.Fatalf("create org: %v", err)
+ }
+
+ bctx, cancel, watch := startBrowser(t)
+ defer cancel()
+
+ membersURL := srv.appURL + "/orgs/" + org.Slug + "/members"
+ var items string
+ if err := chromedp.Run(bctx,
+ network.Enable(),
+ cdplog.Enable(),
+ setSessionCookie(cookie),
+ chromedp.Navigate(membersURL),
+ // The Actions button lives in the shared header, so it's here on the Members
+ // tab (not just Home). Opening it exercises Bootstrap JS under the CSP.
+ chromedp.WaitVisible(`[data-testid="org-actions"]`, chromedp.ByQuery),
+ chromedp.Click(`[data-testid="org-actions"]`, chromedp.ByQuery),
+ chromedp.WaitVisible(`.dropdown-menu.show`, chromedp.ByQuery),
+ chromedp.Text(`.dropdown-menu.show`, &items, chromedp.ByQuery),
+ ); err != nil {
+ t.Fatalf("browser run against %s: %v", membersURL, err)
+ }
+ for _, want := range []string{"Edit configuration", "View public page", "Leave organization"} {
+ if !strings.Contains(items, want) {
+ t.Errorf("Actions menu on the Members tab missing %q; got %q", want, items)
+ }
+ }
+ watch.assertClean(t)
+}
diff --git a/internal/marketing/orgs.go b/internal/marketing/orgs.go
index 0c61387..a13c5e5 100644
--- a/internal/marketing/orgs.go
+++ b/internal/marketing/orgs.go
@@ -57,6 +57,16 @@ func (s *Handlers) pageOrgs(w http.ResponseWriter, r *http.Request) {
s.Render(w, r, "orgs.html", data)
}
+// publicCTA computes the public org page's call-to-action state for the current
+// viewer so it's consistent across all public tabs: a member gets "Go to
+// organization", a signed-in non-member gets "Join organization", and anyone else
+// "Sign in to join". The root host detects membership via the shared identity beacon.
+func (s *Handlers) publicCTA(r *http.Request, orgID int64) (canGoToOrg, canJoin bool) {
+ uid := s.Auth.CurrentUserID(r.Context())
+ _, isMember, _ := s.Store.OrgRole(r.Context(), orgID, uid)
+ return isMember, uid != 0 && !isMember
+}
+
// renderOrgPublic renders the public-facing org page (name, description, admins,
// counts, and a map of repeaters opted into public display).
func (s *Handlers) renderOrgPublic(w http.ResponseWriter, r *http.Request, org *store.Org, isMember, isAdmin bool) {
@@ -90,7 +100,11 @@ func (s *Handlers) renderOrgPublic(w http.ResponseWriter, r *http.Request, org *
// The public view never exposes the Members tab — membership isn't public,
// only the admin list is — so build the nav as a non-member regardless of who
// is viewing (the tab also 404s on the root host, which has no members route).
- "Nav": s.OrgNavFor(r.Context(), org.ID, org.Slug, "home", false, isAdmin),
+ "Nav": s.OrgNavFor(r.Context(), web.OrgNavArgs{
+ OrgID: org.ID, Name: org.Name, Slug: org.Slug, Active: "home",
+ IsMember: false, IsAdmin: isAdmin, Manage: false,
+ CanGoToOrg: isMember, CanJoin: uid != 0 && !isMember,
+ }),
"Admins": admins,
"MemberCount": memberCount,
"RepeaterCount": repeaterCount,
@@ -147,7 +161,11 @@ func (s *Handlers) pageOrgConfig(w http.ResponseWriter, r *http.Request) {
s.NotFound(w, r)
return
}
- data := map[string]any{"Org": org, "Nav": s.OrgNavFor(r.Context(), org.ID, org.Slug, "config", false, false), "CanEdit": false}
+ canGoToOrg, canJoin := s.publicCTA(r, id)
+ data := map[string]any{"Org": org, "Nav": s.OrgNavFor(r.Context(), web.OrgNavArgs{
+ OrgID: org.ID, Name: org.Name, Slug: org.Slug, Active: "config", Manage: false,
+ CanGoToOrg: canGoToOrg, CanJoin: canJoin,
+ }), "CanEdit": false}
var latP, lonP *float64
if lat, lon, ok := web.PreviewLatLon(r); ok {
latP, lonP = &lat, &lon
@@ -194,9 +212,13 @@ func (s *Handlers) pageOrgRepeaters(w http.ResponseWriter, r *http.Request) {
last := reps[len(reps)-1]
rv.NextCursor = encodeRepCursor(last.Name, last.RepeaterID)
}
+ canGoToOrg, canJoin := s.publicCTA(r, id)
data := map[string]any{
- "Org": org,
- "Nav": s.OrgNavFor(r.Context(), org.ID, org.Slug, "repeaters", false, false),
+ "Org": org,
+ "Nav": s.OrgNavFor(r.Context(), web.OrgNavArgs{
+ OrgID: org.ID, Name: org.Name, Slug: org.Slug, Active: "repeaters", Manage: false,
+ CanGoToOrg: canGoToOrg, CanJoin: canJoin,
+ }),
"Reps": rv,
"MapURL": orgMapURL(org.Slug),
}
diff --git a/internal/web/orgview.go b/internal/web/orgview.go
index 08e2209..d18cba8 100644
--- a/internal/web/orgview.go
+++ b/internal/web/orgview.go
@@ -123,21 +123,39 @@ func BuildConfigView(ctx context.Context, st *store.Store, orgID int64, selected
return cv, nil
}
-// OrgNav is the data the shared org-tabs sub-nav partial expects: the org slug,
-// which tab is active ("home" | "repeaters" | "members" | "config"), whether the
-// viewer is a member (the Members tab, which exposes personal info, only shows for
-// members), and whether to show the Configuration tab (hidden when the org has no
-// config, unless the viewer can edit it).
-func OrgNav(slug, active string, isMember, showConfig bool) map[string]any {
- return map[string]any{"Slug": slug, "Active": active, "IsMember": isMember, "ShowConfig": showConfig}
+// OrgNavArgs is the input to OrgNavFor and the data the shared org-header +
+// org-tabs partials expect.
+type OrgNavArgs struct {
+ OrgID int64
+ Name string
+ Slug string
+ Active string // "home" | "members" | "repeaters" | "config"
+ // IsMember gates the Members tab (personal info), so it's false on public views
+ // even when a member is previewing. IsAdmin gates the "Edit configuration"
+ // action.
+ IsMember bool
+ IsAdmin bool
+ // Manage selects the header's right-side controls: true renders the member
+ // Actions dropdown, false renders the public "Go to organization / Join" CTA.
+ Manage bool
+ // CanGoToOrg / CanJoin drive that CTA (used only when !Manage): a member
+ // previewing the public page gets "Go to organization", a signed-in non-member
+ // gets "Join organization", and anyone else gets "Sign in to join".
+ CanGoToOrg bool
+ CanJoin bool
}
-// OrgNavFor builds OrgNav, querying whether the org has any config so the
-// Configuration tab hides when empty — for everyone except admins, who always
-// see it so they can create the first profile/region.
-func (e *Env) OrgNavFor(ctx context.Context, orgID int64, slug, active string, isMember, isAdmin bool) map[string]any {
- hasConfig, _ := e.Store.OrgHasConfig(ctx, orgID)
- return OrgNav(slug, active, isMember, hasConfig || isAdmin)
+// OrgNavFor builds the org nav map, querying whether the org has any config so the
+// Configuration tab hides when empty — for everyone except admins, who always see
+// it so they can create the first profile/region.
+func (e *Env) OrgNavFor(ctx context.Context, a OrgNavArgs) map[string]any {
+ hasConfig, _ := e.Store.OrgHasConfig(ctx, a.OrgID)
+ return map[string]any{
+ "Name": a.Name, "Slug": a.Slug, "Active": a.Active,
+ "IsMember": a.IsMember, "IsAdmin": a.IsAdmin,
+ "ShowConfig": hasConfig || a.IsAdmin,
+ "Manage": a.Manage, "CanGoToOrg": a.CanGoToOrg, "CanJoin": a.CanJoin,
+ }
}
// RepeatersView is an org's repeaters for the Repeaters page. Full is true for the
diff --git a/internal/web/templates/org_config.html b/internal/web/templates/org_config.html
index bd441b3..e3fae0f 100644
--- a/internal/web/templates/org_config.html
+++ b/internal/web/templates/org_config.html
@@ -1,17 +1,5 @@
{{define "title"}}Configuration · {{.Org.Name}} · MeshTender{{end}}
-{{define "header"}}
-
-{{end}}
+{{define "header"}}{{template "org-header" .}}{{end}}
{{/* rep-rows renders the repeater list items; shared by the full page and the
htmx "show more" fragment so appended pages match the first. */}}
{{define "rep-rows"}}
diff --git a/internal/web/templates/org_tabs.html b/internal/web/templates/org_tabs.html
index b547fa2..c5e6a1f 100644
--- a/internal/web/templates/org_tabs.html
+++ b/internal/web/templates/org_tabs.html
@@ -4,6 +4,40 @@ Active ("home" | "repeaters" | "members" | "config") and IsMember
missing map renders empty links (harmless for the empty-data compose test). Links
are same-host relative so they work on both the app host (signed-in) and the root
host (anonymous). */}}
+{{/* org-header is the shared chrome for every org tab, so the Actions menu (member
+ views) and the "Go to organization" CTA (public views) stay consistent across
+ tabs — the parallel to repeater-header. Pass the full page data (it reads
+ .Nav.* plus the renderer-injected .AppURL). .Nav.Manage picks Actions vs CTA. */}}
+{{define "org-header"}}
+
+
+
Organization{{if and (not .Nav.Manage) .Nav.CanGoToOrg}} · public preview{{end}}