From c5086510f047c0de7d584bb0ec488c3837a9f5b3 Mon Sep 17 00:00:00 2001
From: Mix <public@mixeme.ru>
Date: Sat, 10 Oct 2026 23:57:35 +0300
Subject: [PATCH] panel-redesign: links into Domain settings carry no anchor

Follows the design commit before it: the domain page's menu entries
Report address / Rate limit / Export, the DMARC record's note and the
delete page's "Export the domain" lead to /outbound/domains/{id}/settings
as it opens, not scrolled to a box.

  go test -count=1 ./internal/web/...: ok

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 internal/web/handlers/handlers_dmarc_test.go          |  6 +++---
 internal/web/handlers/handlers_outbound_pages_test.go |  4 ++--
 internal/web/view/outbound.go                         | 10 +++++-----
 internal/web/view/outbound_test.go                    |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/internal/web/handlers/handlers_dmarc_test.go b/internal/web/handlers/handlers_dmarc_test.go
index 7c10c10..094a987 100644
--- a/internal/web/handlers/handlers_dmarc_test.go
+++ b/internal/web/handlers/handlers_dmarc_test.go
@@ -105,7 +105,7 @@ func TestNewDomainHasNoReports(t *testing.T) {
 
 	// The domain the stand started with has none either.
 	has(t, "domain page", pageOf(t, s.h.HandleDomainDetail, "/outbound/domains/1"),
-		`Report address: <a href="/outbound/domains/1/settings#reports">no reports</a>`)
+		`Report address: <a href="/outbound/domains/1/settings">no reports</a>`)
 }
 
 // Each of the three choices is saved, comes back selected, and is what the
@@ -130,7 +130,7 @@ func TestDomainReportAddressThreeChoices(t *testing.T) {
 	has(t, "settings after hosted", settings(), `<option value="hosted" selected>`)
 	lacks(t, "settings after hosted", settings(), `value="`+hostedForExample+`"`) // the typed field stays empty
 	has(t, "domain page after hosted", pageOf(t, s.h.HandleDomainDetail, "/outbound/domains/1"),
-		`Report address: <a href="/outbound/domains/1/settings#reports">`+hostedEscaped+`</a>`,
+		`Report address: <a href="/outbound/domains/1/settings">`+hostedEscaped+`</a>`,
 		`rua=mailto:`+hostedEscaped)
 	// The ingest allow-list was rebuilt for the new address.
 	if last := maps.got[len(maps.got)-1]; !contains(last.Recipients, hostedForExample) {
@@ -145,7 +145,7 @@ func TestDomainReportAddressThreeChoices(t *testing.T) {
 	}
 	has(t, "settings after custom", settings(), `<option value="custom" selected>`, `value="reports@hub.example"`)
 	has(t, "domain page after custom", pageOf(t, s.h.HandleDomainDetail, "/outbound/domains/1"),
-		`Report address: <a href="/outbound/domains/1/settings#reports">reports@hub.example</a>`, `rua=mailto:reports@hub.example`,
+		`Report address: <a href="/outbound/domains/1/settings">reports@hub.example</a>`, `rua=mailto:reports@hub.example`,
 		`<h3>Report authorization</h3>`) // the address is on another domain than the senders
 	if last := maps.got[len(maps.got)-1]; contains(last.Recipients, hostedForExample) || contains(last.Recipients, "reports@hub.example") {
 		t.Errorf("the allow-list after choosing another host: %v", last.Recipients)
diff --git a/internal/web/handlers/handlers_outbound_pages_test.go b/internal/web/handlers/handlers_outbound_pages_test.go
index eebc2d0..f180c41 100644
--- a/internal/web/handlers/handlers_outbound_pages_test.go
+++ b/internal/web/handlers/handlers_outbound_pages_test.go
@@ -98,7 +98,7 @@ func TestDomainPageShowsRecordsApplicationsAndConnection(t *testing.T) {
 		`<td class="sp-mono sp-nowrap"><strong>prod-server</strong></td>`, `alerts@<wbr>example.org`, `200 / h`, `2 IPs`,
 		`href="/outbound/domains/1/applications/`+idStr(a.ID)+`">Edit</a>`,
 		`mail.example.org`, `STARTTLS (submission)`, `action="/outbound/domains/1/dns-recheck"`,
-		`href="/outbound/log?domain=example.org"`, `href="/outbound/domains/1/settings#reports"`, `href="/outbound/domains/1/delete"`)
+		`href="/outbound/log?domain=example.org"`, `href="/outbound/domains/1/settings"`, `href="/outbound/domains/1/delete"`)
 
 	// The flash the redirects carry.
 	rec := send(s.h.HandleDomainDetail, &globalPrincipal, "GET", "/outbound/domains/1?appsaved=1", s.paths, nil)
@@ -339,7 +339,7 @@ func TestDeleteConfirmNamesTheApplicationsThatGoWithTheDomain(t *testing.T) {
 		t.Fatalf("delete confirmation = %d:\n%s", rec.Code, body)
 	}
 	has(t, "delete", body, `<h1 class="title is-3">Delete example.org</h1>`, `permanently delete its DKIM signing key;`,
-		`<form method="post" action="/outbound/domains/1/delete">`, `Delete example.org</button>`, `href="/outbound/domains/1/settings#export"`)
+		`<form method="post" action="/outbound/domains/1/delete">`, `Delete example.org</button>`, `href="/outbound/domains/1/settings"`)
 	lacks(t, "delete", body, `credentials`)
 
 	for _, login := range []string{"prod-server", "alerts"} {
diff --git a/internal/web/view/outbound.go b/internal/web/view/outbound.go
index fe11279..b9bfd5a 100644
--- a/internal/web/view/outbound.go
+++ b/internal/web/view/outbound.go
@@ -196,7 +196,7 @@ type DMARCRecordInput struct {
 // delivery, so the standing note says how to tighten it.
 func DMARCRecord(in DMARCRecordInput) Record {
 	r := Record{Name: "DMARC", Host: in.Host, Type: "TXT", Value: in.Value,
-		Note: Rich("Report address: ", Link(in.SettingsHref+"#reports", in.Source))}
+		Note: Rich("Report address: ", Link(in.SettingsHref, in.Source))}
 	reports := Rich("reports")
 	if in.ReportsHref != "" {
 		reports = Rich(Link(in.ReportsHref, "reports"))
@@ -497,9 +497,9 @@ func (p *OutDomain) Menu() SideMenu {
 	}
 	settings := DomainHref(p.id) + "/settings"
 	rare := MenuGroup{Label: "Rarely changed", Items: []MenuItem{
-		{Label: "Report address", Icon: "ti-mail-forward", Href: settings + "#reports"},
-		{Label: "Rate limit", Icon: "ti-gauge", Href: settings + "#limit", Tag: p.limitTag},
-		{Label: "Export", Icon: "ti-file-export", Href: settings + "#export"},
+		{Label: "Report address", Icon: "ti-mail-forward", Href: settings},
+		{Label: "Rate limit", Icon: "ti-gauge", Href: settings, Tag: p.limitTag},
+		{Label: "Export", Icon: "ti-file-export", Href: settings},
 	}}
 	if p.canDelete {
 		rare.Items = append(rare.Items, MenuItem{Label: "Delete domain", Icon: "ti-trash", Href: DomainHref(p.id) + "/delete", Danger: true})
@@ -748,7 +748,7 @@ func NewOutDomainDelete(m Meta, id int64, name string, logins []string) *OutDoma
 		Confirm:      "Delete " + name,
 		KeepHref:     href,
 		Moving:       Box{Icon: "ti-file-export", Title: "Moving it instead?"},
-		MovingText: Rich(Link(href+"/settings#export", "Export the domain"),
+		MovingText: Rich(Link(href+"/settings", "Export the domain"),
 			" first. The file carries the key and the application passwords, so the new instance needs no DNS change."),
 	}
 	if n := appsPhrase(len(logins)); n != "" {
diff --git a/internal/web/view/outbound_test.go b/internal/web/view/outbound_test.go
index b8d682f..80d8bbe 100644
--- a/internal/web/view/outbound_test.go
+++ b/internal/web/view/outbound_test.go
@@ -99,7 +99,7 @@ func TestOutDomainRecordsSayWhatDNSHolds(t *testing.T) {
 		`sp2026._domainkey.example.org`, `<textarea class="textarea" rows="3" readonly>`,
 		`<h3>SPF</h3>`, `<span class="tag is-danger is-light">mismatch</span>`, `v=spf1 ip4:203.0.113.25 ~all`,
 		`In DNS now`, `v=spf1 include:_spf.google.com ~all`, `Shallow check: <code>include:</code> is not followed.`,
-		`<h3>DMARC</h3>`, `Report address: <a href="/outbound/domains/1/settings#reports">example.org@dmarc.mail.example.org</a>`,
+		`<h3>DMARC</h3>`, `Report address: <a href="/outbound/domains/1/settings">example.org@dmarc.mail.example.org</a>`,
 		`<code>p=none</code> does not affect delivery.`, `<a href="/outbound/dmarc/domains/1">reports</a>`,
 	)
 	if got := strings.Count(out, `In DNS now`); got != 1 {
@@ -180,7 +180,7 @@ func TestOutDomainMenuFollowsTheViewer(t *testing.T) {
 	out := renderSignedIn(t, "out-domain", outDomainFixture())
 	pageHas(t, "Domain", out,
 		`href="#dns"`, `href="#apps"`, `href="#connection"`, `href="/outbound/log?domain=example.org"`, `href="/outbound/dmarc/domains/1"`,
-		`href="/outbound/domains/1/settings#reports"`, `href="/outbound/domains/1/settings#limit"`, `href="/outbound/domains/1/settings#export"`,
+		`href="/outbound/domains/1/settings"`, `href="/outbound/domains/1/settings"`, `href="/outbound/domains/1/settings"`,
 		`href="/outbound/domains/1/delete"`, `id="dns"`, `id="apps"`, `id="connection"`,
 		`class="sp-help" href="/help#dns"`, `class="sp-help" href="/help#apps"`,
 	)
@@ -437,7 +437,7 @@ func TestOutDomainDeleteNamesWhatGoesWithIt(t *testing.T) {
 		`reload OpenDKIM so the domain is no longer signed.`, `Inbound domains are not touched.`,
 		`<form method="post" action="/outbound/domains/1/delete">`, `class="button is-danger"`, `Delete example.org</button>`,
 		`href="/outbound/domains/1">Keep it</a>`,
-		`<h2>Moving it instead?</h2>`, `<a href="/outbound/domains/1/settings#export">Export the domain</a>`,
+		`<h2>Moving it instead?</h2>`, `<a href="/outbound/domains/1/settings">Export the domain</a>`,
 	)
 
 	// No applications: nothing to say about them.