#29 feat(web): merge merge requests asynchronously with htmx

M docs/issues.md +1 -3


@@ -50,9 +50,7 @@ Limits: the 100 most recent commits of the merge request, 16 KiB of each text, 1
50	50
51	51		The signed-in owner has an Inbox at `/-/inbox`, reached from the Inbox button at the top left of the home page, which shows the number of open items. It lists the open merge requests and the open issues of every repository, most recently updated first. The counters at the top (`N merge requests · M issues`) always count everything; `?repo=<name>` restricts the two lists to one repository, and the repository links under the counters set it. Repositories with issues off contribute no issues.
52	52
53		-	The Running section, after Awaiting moderation, lists queued and in-progress CI runs newest first, with links to each run, its repository, ref, and start time. The `N running` counter counts every repository; the repository filter also applies to this section. Shift+I (`I`) opens the inbox from any page for the signed-in owner, unless single-key shortcuts are off; lowercase `i` still opens the issues tab.
54		-
55		-	The page updates live: run status changes, merge request and issue events of any repository refresh the counters and the lists. Anyone who is not the signed-in owner, including a token, gets the same 404 as for an unknown page, and the same answer for the `owner` event stream it follows.
	53	+	The page updates live: merge request and issue events of any repository refresh the counters and the lists. Anyone who is not the signed-in owner, including a token, gets the same 404 as for an unknown page, and the same answer for the `owner` event stream it follows.
56	54
57	55		## Public form and moderation
58	56


@@ -50,9 +50,7 @@ Limits: the 100 most recent commits of the merge request, 16 KiB of each text, 1
50			50
51		The signed-in owner has an Inbox at `/-/inbox`, reached from the Inbox button at the top left of the home page, which shows the number of open items. It lists the open merge requests and the open issues of every repository, most recently updated first. The counters at the top (`N merge requests · M issues`) always count everything; `?repo=<name>` restricts the two lists to one repository, and the repository links under the counters set it. Repositories with issues off contribute no issues.	51		The signed-in owner has an Inbox at `/-/inbox`, reached from the Inbox button at the top left of the home page, which shows the number of open items. It lists the open merge requests and the open issues of every repository, most recently updated first. The counters at the top (`N merge requests · M issues`) always count everything; `?repo=<name>` restricts the two lists to one repository, and the repository links under the counters set it. Repositories with issues off contribute no issues.
52			52
53	-	The Running section, after Awaiting moderation, lists queued and in-progress CI runs newest first, with links to each run, its repository, ref, and start time. The `N running` counter counts every repository; the repository filter also applies to this section. Shift+I (`I`) opens the inbox from any page for the signed-in owner, unless single-key shortcuts are off; lowercase `i` still opens the issues tab.	53	+	The page updates live: merge request and issue events of any repository refresh the counters and the lists. Anyone who is not the signed-in owner, including a token, gets the same 404 as for an unknown page, and the same answer for the `owner` event stream it follows.
54	-
55	-	The page updates live: run status changes, merge request and issue events of any repository refresh the counters and the lists. Anyone who is not the signed-in owner, including a token, gets the same 404 as for an unknown page, and the same answer for the `owner` event stream it follows.
56			54
57		## Public form and moderation	55		## Public form and moderation
58			56

M docs/releases.md +5 -44


@@ -57,60 +57,21 @@ the S3 endpoint. Stored-token publishers need `release:write` and, for private
57	57		repository reads, `repo:read`. The owner component is `ERMITE_OWNER` (`owner` by
58	58		default).
59	59
60		-	GoReleaser does not read `GITHUB_API_URL` or `GITHUB_SERVER_URL` by itself, so
61		-	template `github_urls` from them (replace the fallback host and repository):
	60	+	GoReleaser configuration (replace the host and repository):
62	61
63	62		```yaml
64	63		version: 2
65		-	# In CI the runner sets GITHUB_API_URL and GITHUB_SERVER_URL to the address the
66		-	# job can reach; the public URLs are the fallback for a local run.
67	64		github_urls:
68		-	api: '{{ or (index .Env "GITHUB_API_URL") "https://git.example.org/-/github/api" }}/'
69		-	upload: '{{ or (index .Env "GITHUB_API_URL") "https://git.example.org/-/github/api" }}/uploads/'
70		-	download: '{{ or (index .Env "GITHUB_SERVER_URL") "https://git.example.org" }}/'
	65	+	api: https://git.example.org/-/github/api/
	66	+	upload: https://git.example.org/-/github/api/uploads/
	67	+	download: https://git.example.org/
71	68		release:
72	69		github:
73	70		owner: owner
74	71		name: app
75	72		```
76	73
77		-	In a CI job the runner rewrites the server and API URLs to an origin the job
78		-	can reach, which may differ from the public URL (for example `http://ermite:7341`
79		-	with a relayed forge). Sandboxes block private and CGNAT ranges, so a job that
80		-	targets only the public URL times out (`dial tcp 100.x:443: i/o timeout`). A
81		-	plain-http relay needs no TLS option. The API base gets `api/v3/` appended by
82		-	the client; ermite accepts that alias. Locally, run
83		-	`GITHUB_TOKEN=<token> goreleaser release --clean` from a tagged checkout; the
84		-	fallbacks apply.
85		-
86		-	Workflow:
87		-
88		-	```yaml
89		-	name: release
90		-	on:
91		-	push:
92		-	tags: ['v*']
93		-	permissions:
94		-	contents: write
95		-	jobs:
96		-	release:
97		-	runs-on: ubuntu-latest
98		-	steps:
99		-	- uses: actions/checkout@v4
100		-	with:
101		-	fetch-depth: 0
102		-	- uses: actions/setup-go@v5
103		-	with:
104		-	go-version-file: go.mod
105		-	- uses: goreleaser/goreleaser-action@v6
106		-	with:
107		-	args: release --clean
108		-	env:
109		-	GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
110		-	```
111		-
112		-	An existing GitHub workflow must be enabled on ermite:
113		-	`ermite workflow enable <repo> .github/workflows/release.yml`.
	74	+	Run `GITHUB_TOKEN=<token> goreleaser release --clean` from a tagged checkout.
114	75
115	76		On an ermite runner, the job supplies `GITHUB_API_URL`, `GITHUB_SERVER_URL` and
116	77		`GITHUB_TOKEN`; no endpoint override is needed for action-gh-release:


@@ -57,60 +57,21 @@ the S3 endpoint. Stored-token publishers need `release:write` and, for private
57		repository reads, `repo:read`. The owner component is `ERMITE_OWNER` (`owner` by	57		repository reads, `repo:read`. The owner component is `ERMITE_OWNER` (`owner` by
58		default).	58		default).
59			59
60	-	GoReleaser does not read `GITHUB_API_URL` or `GITHUB_SERVER_URL` by itself, so	60	+	GoReleaser configuration (replace the host and repository):
61	-	template `github_urls` from them (replace the fallback host and repository):
62			61
63		```yaml	62		```yaml
64		version: 2	63		version: 2
65	-	# In CI the runner sets GITHUB_API_URL and GITHUB_SERVER_URL to the address the
66	-	# job can reach; the public URLs are the fallback for a local run.
67		github_urls:	64		github_urls:
68	-	api: '{{ or (index .Env "GITHUB_API_URL") "https://git.example.org/-/github/api" }}/'	65	+	api: https://git.example.org/-/github/api/
69	-	upload: '{{ or (index .Env "GITHUB_API_URL") "https://git.example.org/-/github/api" }}/uploads/'	66	+	upload: https://git.example.org/-/github/api/uploads/
70	-	download: '{{ or (index .Env "GITHUB_SERVER_URL") "https://git.example.org" }}/'	67	+	download: https://git.example.org/
71		release:	68		release:
72		github:	69		github:
73		owner: owner	70		owner: owner
74		name: app	71		name: app
75		```	72		```
76			73
77	-	In a CI job the runner rewrites the server and API URLs to an origin the job	74	+	Run `GITHUB_TOKEN=<token> goreleaser release --clean` from a tagged checkout.
78	-	can reach, which may differ from the public URL (for example `http://ermite:7341`
79	-	with a relayed forge). Sandboxes block private and CGNAT ranges, so a job that
80	-	targets only the public URL times out (`dial tcp 100.x:443: i/o timeout`). A
81	-	plain-http relay needs no TLS option. The API base gets `api/v3/` appended by
82	-	the client; ermite accepts that alias. Locally, run
83	-	`GITHUB_TOKEN=<token> goreleaser release --clean` from a tagged checkout; the
84	-	fallbacks apply.
85	-
86	-	Workflow:
87	-
88	-	```yaml
89	-	name: release
90	-	on:
91	-	push:
92	-	tags: ['v*']
93	-	permissions:
94	-	contents: write
95	-	jobs:
96	-	release:
97	-	runs-on: ubuntu-latest
98	-	steps:
99	-	- uses: actions/checkout@v4
100	-	with:
101	-	fetch-depth: 0
102	-	- uses: actions/setup-go@v5
103	-	with:
104	-	go-version-file: go.mod
105	-	- uses: goreleaser/goreleaser-action@v6
106	-	with:
107	-	args: release --clean
108	-	env:
109	-	GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
110	-	```
111	-
112	-	An existing GitHub workflow must be enabled on ermite:
113	-	`ermite workflow enable <repo> .github/workflows/release.yml`.
114			75
115		On an ermite runner, the job supplies `GITHUB_API_URL`, `GITHUB_SERVER_URL` and	76		On an ermite runner, the job supplies `GITHUB_API_URL`, `GITHUB_SERVER_URL` and
116		`GITHUB_TOKEN`; no endpoint override is needed for action-gh-release:	77		`GITHUB_TOKEN`; no endpoint override is needed for action-gh-release:

M go.mod +5 -5

@@ -1,6 +1,6 @@
1	1		module bnema.dev/ermite
2	2
3		-	go 1.27
	3	+	go 1.27.1
4	4
5	5		tool (
6	6		github.com/a-h/templ/cmd/templ

@@ -12,10 +12,10 @@ tool (
12	12		)
13	13
14	14		require (
15		-	bnema.dev/ermite-actions v0.2.1
16		-	bnema.dev/ermite-api v0.16.1
17		-	bnema.dev/ermite-git v0.1.1
18		-	bnema.dev/ermite-kv v0.1.1
	15	+	bnema.dev/ermite-actions v0.2.0
	16	+	bnema.dev/ermite-api v0.16.0
	17	+	bnema.dev/ermite-git v0.1.0
	18	+	bnema.dev/ermite-kv v0.1.0
19	19		connectrpc.com/connect v1.21.0
20	20		github.com/ProtonMail/go-crypto v1.4.1
21	21		github.com/a-h/templ v0.3.1020

@@ -1,6 +1,6 @@
1		module bnema.dev/ermite	1		module bnema.dev/ermite
2			2
3	-	go 1.27	3	+	go 1.27.1
4			4
5		tool (	5		tool (
6		github.com/a-h/templ/cmd/templ	6		github.com/a-h/templ/cmd/templ

@@ -12,10 +12,10 @@ tool (
12		)	12		)
13			13
14		require (	14		require (
15	-	bnema.dev/ermite-actions v0.2.1	15	+	bnema.dev/ermite-actions v0.2.0
16	-	bnema.dev/ermite-api v0.16.1	16	+	bnema.dev/ermite-api v0.16.0
17	-	bnema.dev/ermite-git v0.1.1	17	+	bnema.dev/ermite-git v0.1.0
18	-	bnema.dev/ermite-kv v0.1.1	18	+	bnema.dev/ermite-kv v0.1.0
19		connectrpc.com/connect v1.21.0	19		connectrpc.com/connect v1.21.0
20		github.com/ProtonMail/go-crypto v1.4.1	20		github.com/ProtonMail/go-crypto v1.4.1
21		github.com/a-h/templ v0.3.1020	21		github.com/a-h/templ v0.3.1020

M go.sum +8 -8 generated file: collapsed

load diff

M internal/adapters/web/fragments.go +15 -0


@@ -6,6 +6,7 @@ import (
6	6		"bytes"
7	7		"context"
8	8		"errors"
	9	+	"net/http"
9	10		"strconv"
10	11		"strings"
11	12		"sync"

@@ -192,6 +193,20 @@ func (l *liveStream) repoPage(ctx context.Context, we ports.WatchEvent) ([]fragm
192	193		case domain.MergeRequestOpened:
193	194		return l.mrNotice(ctx, ev.MergeRequest.Number, "a merge request was opened — reload")
194	195		case domain.MergeRequestMerged:
	196	+	if l.view == "mr" && strconv.FormatInt(ev.MergeRequest.Number, 10) == l.n {
	197	+	r, err := http.NewRequestWithContext(ctx, http.MethodGet, mrHref(l.repo, ev.MergeRequest.Number), nil)
	198	+	if err != nil {
	199	+	return nil, err
	200	+	}
	201	+	r.SetPathValue("repo", l.repo)
	202	+	r.SetPathValue("n", l.n)
	203	+	c, _, err := l.s.mrPageView(ctx, r, false, true)
	204	+	if err != nil {
	205	+	return nil, err
	206	+	}
	207	+	f, err := renderFragment(ctx, "mr-mergeability", c)
	208	+	return []fragment{f}, err
	209	+	}
195	210		return l.mrNotice(ctx, ev.MergeRequest.Number, "this merge request was merged — reload")
196	211		case domain.MergeRequestClosed:
197	212		return l.mrNotice(ctx, ev.MergeRequest.Number, "this merge request was closed — reload")


@@ -6,6 +6,7 @@ import (
6	"bytes"	6		"bytes"
7	"context"	7		"context"
8	"errors"	8		"errors"
		9	+	"net/http"
9	"strconv"	10		"strconv"
10	"strings"	11		"strings"
11	"sync"	12		"sync"

@@ -192,6 +193,20 @@ func (l *liveStream) repoPage(ctx context.Context, we ports.WatchEvent) ([]fragm
192	case domain.MergeRequestOpened:	193		case domain.MergeRequestOpened:
193	return l.mrNotice(ctx, ev.MergeRequest.Number, "a merge request was opened — reload")	194		return l.mrNotice(ctx, ev.MergeRequest.Number, "a merge request was opened — reload")
194	case domain.MergeRequestMerged:	195		case domain.MergeRequestMerged:
		196	+	if l.view == "mr" && strconv.FormatInt(ev.MergeRequest.Number, 10) == l.n {
		197	+	r, err := http.NewRequestWithContext(ctx, http.MethodGet, mrHref(l.repo, ev.MergeRequest.Number), nil)
		198	+	if err != nil {
		199	+	return nil, err
		200	+	}
		201	+	r.SetPathValue("repo", l.repo)
		202	+	r.SetPathValue("n", l.n)
		203	+	c, _, err := l.s.mrPageView(ctx, r, false, true)
		204	+	if err != nil {
		205	+	return nil, err
		206	+	}
		207	+	f, err := renderFragment(ctx, "mr-mergeability", c)
		208	+	return []fragment{f}, err
		209	+	}
195	return l.mrNotice(ctx, ev.MergeRequest.Number, "this merge request was merged — reload")	210		return l.mrNotice(ctx, ev.MergeRequest.Number, "this merge request was merged — reload")
196	case domain.MergeRequestClosed:	211		case domain.MergeRequestClosed:
197	return l.mrNotice(ctx, ev.MergeRequest.Number, "this merge request was closed — reload")	212		return l.mrNotice(ctx, ev.MergeRequest.Number, "this merge request was closed — reload")

M internal/adapters/web/inbox.go +3 -25


@@ -67,17 +67,8 @@ type InboxRepoLink struct {
67	67		Current bool
68	68		}
69	69
70		-	// InboxRunRow adds repository and start time to the Actions run display.
71		-	type InboxRunRow struct {
72		-	RunRow
73		-	Repo, RepoHref, When, WhenAt string
74		-	}
75		-
76		-	// InboxPage is the inbox: counters, repository filter and item lists.
	70	+	// InboxPage is the inbox: the counters, the filter and the two lists.
77	71		type InboxPage struct {
78		-	Running int
79		-	RunsEnabled bool
80		-	Runs []InboxRunRow
81	72		// MergeRequests and Issues count every open item, whatever the filter.
82	73		MergeRequests, Issues int
83	74		// PendingCount counts every issue awaiting moderation.

@@ -115,19 +106,6 @@ func inboxFilter(r *http.Request) (domain.RepoName, error) {
115	106		func (s *Server) inboxPage(ov ports.InboxOverview, filter domain.RepoName) InboxPage {
116	107		now := s.cfg.Now()
117	108		p := InboxPage{MergeRequests: ov.Counts.MergeRequests, Issues: ov.Counts.Issues, PendingCount: ov.Counts.Pending, Filter: filter.String()}
118		-	p.Running, p.RunsEnabled = ov.Counts.Running, ov.RunsEnabled
119		-	for _, run := range ov.Runs {
120		-	r := InboxRunRow{RunRow: s.runRow(run.Repo.String(), run, now), Repo: run.Repo.String(), RepoHref: repoHref(run.Repo.String())}
121		-	if run.Status == domain.CIInProgress {
122		-	r.State = "in progress"
123		-	}
124		-	ts := run.StartedAt
125		-	if ts.IsZero() {
126		-	ts = run.CreatedAt
127		-	}
128		-	r.When, r.WhenAt = whenOf(now, ts)
129		-	p.Runs = append(p.Runs, r)
130		-	}
131	109		for _, pi := range ov.Pending {
132	110		p.Pending = append(p.Pending, s.pendingRow(now, pi, filter))
133	111		}

@@ -288,7 +266,7 @@ func (l *liveStream) inbox(ctx context.Context, we ports.WatchEvent) ([]fragment
288	266		switch we.Event.(type) {
289	267		case domain.MergeRequestOpened, domain.MergeRequestMerged, domain.MergeRequestClosed, domain.MergeRequestReady, domain.CommentAdded, domain.CommentEdited, domain.CommentDeleted, domain.CommentResolved,
290	268		domain.IssueOpened, domain.IssueClosed, domain.IssueReopened, domain.IssueCommented, domain.IssueSubmitted, domain.IssuePendingRemoved,
291		-	domain.RepoUpdated, domain.RepoDeleted, domain.RunUpdated:
	269	+	domain.RepoUpdated, domain.RepoDeleted:
292	270		default:
293	271		return nil, nil
294	272		}

@@ -305,7 +283,7 @@ func (l *liveStream) inbox(ctx context.Context, we ports.WatchEvent) ([]fragment
305	283		}
306	284		p := l.s.inboxPage(ov, filter)
307	285		var out []fragment
308		-	for _, c := range []templ.Component{InboxCounters(p), InboxRepos(p), InboxPending(p), InboxRuns(p), InboxMRs(p), InboxIssues(p)} {
	286	+	for _, c := range []templ.Component{InboxCounters(p), InboxRepos(p), InboxPending(p), InboxMRs(p), InboxIssues(p)} {
309	287		f, err := renderFragment(ctx, inboxEvent, c)
310	288		if err != nil {
311	289		return nil, err

 	Current bool
 }
-// InboxRunRow adds repository and start time to the Actions run display.
+// InboxPage is the inbox: the counters, the filter and the two lists.
-type InboxRunRow struct {
-	RunRow
-	Repo, RepoHref, When, WhenAt string
-}
-// InboxPage is the inbox: counters, repository filter and item lists.
 type InboxPage struct {
-	Running     int
-	RunsEnabled bool
-	Runs        []InboxRunRow
 	// MergeRequests and Issues count every open item, whatever the filter.
 	MergeRequests, Issues int
 	// PendingCount counts every issue awaiting moderation.
 func (s *Server) inboxPage(ov ports.InboxOverview, filter domain.RepoName) InboxPage {
 	now := s.cfg.Now()
 	p := InboxPage{MergeRequests: ov.Counts.MergeRequests, Issues: ov.Counts.Issues, PendingCount: ov.Counts.Pending, Filter: filter.String()}
-	p.Running, p.RunsEnabled = ov.Counts.Running, ov.RunsEnabled
-	for _, run := range ov.Runs {
-		r := InboxRunRow{RunRow: s.runRow(run.Repo.String(), run, now), Repo: run.Repo.String(), RepoHref: repoHref(run.Repo.String())}
-		if run.Status == domain.CIInProgress {
-			r.State = "in progress"
-		}
-		ts := run.StartedAt
-		if ts.IsZero() {
-			ts = run.CreatedAt
-		}
-		r.When, r.WhenAt = whenOf(now, ts)
-		p.Runs = append(p.Runs, r)
-	}
 	for _, pi := range ov.Pending {
 		p.Pending = append(p.Pending, s.pendingRow(now, pi, filter))
 	}
 	switch we.Event.(type) {
 	case domain.MergeRequestOpened, domain.MergeRequestMerged, domain.MergeRequestClosed, domain.MergeRequestReady, domain.CommentAdded, domain.CommentEdited, domain.CommentDeleted, domain.CommentResolved,
 		domain.IssueOpened, domain.IssueClosed, domain.IssueReopened, domain.IssueCommented, domain.IssueSubmitted, domain.IssuePendingRemoved,
-		domain.RepoUpdated, domain.RepoDeleted, domain.RunUpdated:
+		domain.RepoUpdated, domain.RepoDeleted:
 	default:
 		return nil, nil
 	}
 	}
 	p := l.s.inboxPage(ov, filter)
 	var out []fragment
-	for _, c := range []templ.Component{InboxCounters(p), InboxRepos(p), InboxPending(p), InboxRuns(p), InboxMRs(p), InboxIssues(p)} {
+	for _, c := range []templ.Component{InboxCounters(p), InboxRepos(p), InboxPending(p), InboxMRs(p), InboxIssues(p)} {
 		f, err := renderFragment(ctx, inboxEvent, c)
 		if err != nil {
 			return nil, err

M internal/adapters/web/inbox.templ +1 -34


@@ -12,7 +12,6 @@ templ Inbox(l Layout, p InboxPage) {
12	12		@InboxCounters(p)
13	13		@InboxRepos(p)
14	14		@InboxPending(p)
15		-	@InboxRuns(p)
16	15		@InboxMRs(p)
17	16		@InboxIssues(p)
18	17		</div>

@@ -21,7 +20,7 @@ templ Inbox(l Layout, p InboxPage) {
21	20
22	21		templ InboxCounters(p InboxPage) {
23	22		<p id="inbox-counts" class="inbox-counts">
24		-	<strong>{ itoa(p.MergeRequests) }</strong> merge requests · <strong>{ itoa(p.Issues) }</strong> issues · <strong>{ itoa(p.PendingCount) }</strong> awaiting moderation · <strong>{ itoa(p.Running) }</strong> running
	23	+	<strong>{ itoa(p.MergeRequests) }</strong> merge requests · <strong>{ itoa(p.Issues) }</strong> issues · <strong>{ itoa(p.PendingCount) }</strong> awaiting moderation
25	24		</p>
26	25		}
27	26

@@ -114,35 +113,3 @@ templ inboxRows(rows []InboxRow, label string) {
114	113		</table>
115	114		}
116	115		}
117		-
118		-	// InboxRuns stays as an empty fragment when CI is disabled.
119		-	templ InboxRuns(p InboxPage) {
120		-	<section id="inbox-runs" hidden?={ !p.RunsEnabled }
121		-	if p.RunsEnabled {
122		-	aria-labelledby="inbox-runs-h"
123		-	}
124		-	>
125		-	if p.RunsEnabled {
126		-	<h2 id="inbox-runs-h" class="rule-h"><span>Running</span><span class="count">{ itoa(len(p.Runs)) }</span></h2>
127		-	if len(p.Runs) == 0 {
128		-	<p class="lede dim">no runs in progress.</p>
129		-	} else {
130		-	<table class="list mrs" aria-label="Running">
131		-	<tbody data-rows>
132		-	for _, r := range p.Runs {
133		-	<tr>
134		-	<td class="c-st">@CheckIcon(r.Kind, r.State)<span class="dim">{ r.State }</span></td>
135		-	<td class="c-subject"><a href={ templ.SafeURL(r.Href) }>{ r.Workflow }{ " " }{ r.Number }</a> <a class="mute" href={ templ.SafeURL(r.RepoHref) }>{ r.Repo }</a> <span class="dim">{ r.Ref }{ " " }{ r.Event }</span></td>
136		-	<td class="c-when nowrap dim">
137		-	if r.WhenAt != "" {
138		-	<time datetime={ r.WhenAt } title={ r.WhenAt }>{ r.When }</time>
139		-	}
140		-	</td>
141		-	</tr>
142		-	}
143		-	</tbody>
144		-	</table>
145		-	}
146		-	}
147		-	</section>
148		-	}


@@ -12,7 +12,6 @@ templ Inbox(l Layout, p InboxPage) {
12		@InboxCounters(p)	12		@InboxCounters(p)
13		@InboxRepos(p)	13		@InboxRepos(p)
14		@InboxPending(p)	14		@InboxPending(p)
15	-	@InboxRuns(p)
16		@InboxMRs(p)	15		@InboxMRs(p)
17		@InboxIssues(p)	16		@InboxIssues(p)
18		</div>	17		</div>

@@ -21,7 +20,7 @@ templ Inbox(l Layout, p InboxPage) {
21			20
22		templ InboxCounters(p InboxPage) {	21		templ InboxCounters(p InboxPage) {
23		<p id="inbox-counts" class="inbox-counts">	22		<p id="inbox-counts" class="inbox-counts">
24	-	<strong>{ itoa(p.MergeRequests) }</strong> merge requests · <strong>{ itoa(p.Issues) }</strong> issues · <strong>{ itoa(p.PendingCount) }</strong> awaiting moderation · <strong>{ itoa(p.Running) }</strong> running	23	+	<strong>{ itoa(p.MergeRequests) }</strong> merge requests · <strong>{ itoa(p.Issues) }</strong> issues · <strong>{ itoa(p.PendingCount) }</strong> awaiting moderation
25		</p>	24		</p>
26		}	25		}
27			26

@@ -114,35 +113,3 @@ templ inboxRows(rows []InboxRow, label string) {
114		</table>	113		</table>
115		}	114		}
116		}	115		}
117	-
118	-	// InboxRuns stays as an empty fragment when CI is disabled.
119	-	templ InboxRuns(p InboxPage) {
120	-	<section id="inbox-runs" hidden?={ !p.RunsEnabled }
121	-	if p.RunsEnabled {
122	-	aria-labelledby="inbox-runs-h"
123	-	}
124	-	>
125	-	if p.RunsEnabled {
126	-	<h2 id="inbox-runs-h" class="rule-h"><span>Running</span><span class="count">{ itoa(len(p.Runs)) }</span></h2>
127	-	if len(p.Runs) == 0 {
128	-	<p class="lede dim">no runs in progress.</p>
129	-	} else {
130	-	<table class="list mrs" aria-label="Running">
131	-	<tbody data-rows>
132	-	for _, r := range p.Runs {
133	-	<tr>
134	-	<td class="c-st">@CheckIcon(r.Kind, r.State)<span class="dim">{ r.State }</span></td>
135	-	<td class="c-subject"><a href={ templ.SafeURL(r.Href) }>{ r.Workflow }{ " " }{ r.Number }</a> <a class="mute" href={ templ.SafeURL(r.RepoHref) }>{ r.Repo }</a> <span class="dim">{ r.Ref }{ " " }{ r.Event }</span></td>
136	-	<td class="c-when nowrap dim">
137	-	if r.WhenAt != "" {
138	-	<time datetime={ r.WhenAt } title={ r.WhenAt }>{ r.When }</time>
139	-	}
140	-	</td>
141	-	</tr>
142	-	}
143	-	</tbody>
144	-	</table>
145	-	}
146	-	}
147	-	</section>
148	-	}

M internal/adapters/web/inbox_templ.go +173 -451 generated file: collapsed

load diff

M internal/adapters/web/inbox_test.go +4 -6


@@ -180,13 +180,12 @@ func TestInboxLiveFragments(t *testing.T) {
180	180		ls := &liveStream{s: srv, view: "inbox"}
181	181		frags, err := ls.render(withOwner(t.Context()), ports.WatchEvent{ID: "b-1", Event: domain.IssueOpened{Issue: domain.Issue{Repo: repoName(t, "beta"), Number: 7}}})
182	182		require.NoError(t, err)
183		-	require.Len(t, frags, 6)
	183	+	require.Len(t, frags, 5)
184	184		assert.Contains(t, frags[0].html, `id="inbox-counts"`)
185	185		assert.Contains(t, frags[1].html, `id="inbox-repos"`)
186	186		assert.Contains(t, frags[2].html, `id="inbox-pending"`)
187		-	assert.Contains(t, frags[3].html, `id="inbox-runs"`)
188		-	assert.Contains(t, frags[4].html, `id="inbox-mrs"`)
189		-	assert.Contains(t, frags[5].html, `id="inbox-issues"`)
	187	+	assert.Contains(t, frags[3].html, `id="inbox-mrs"`)
	188	+	assert.Contains(t, frags[4].html, `id="inbox-issues"`)
190	189
191	190		none, err := ls.render(withOwner(t.Context()), ports.WatchEvent{Event: domain.PushEvent{Repo: repoName(t, "beta")}})
192	191		require.NoError(t, err)

@@ -287,7 +286,6 @@ func TestInboxRefreshesOnRepoEvents(t *testing.T) {
287	286		t.Parallel()
288	287		for name, ev := range map[string]domain.Event{
289	288		"issues turned off": domain.RepoUpdated{Repo: repoName(t, "beta")},
290		-	"run updated": domain.RunUpdated{},
291	289		"repo deleted": domain.RepoDeleted{Repo: repoName(t, "beta")},
292	290		} {
293	291		t.Run(name, func(t *testing.T) {

@@ -299,7 +297,7 @@ func TestInboxRefreshesOnRepoEvents(t *testing.T) {
299	297		ls := &liveStream{s: srv, view: "inbox"}
300	298		frags, err := ls.render(withOwner(t.Context()), ports.WatchEvent{ID: "b-1", Event: ev})
301	299		require.NoError(t, err)
302		-	require.Len(t, frags, 6)
	300	+	require.Len(t, frags, 5)
303	301		all := ""
304	302		for _, f := range frags {
305	303		all += f.html

 	ls := &liveStream{s: srv, view: "inbox"}
 	frags, err := ls.render(withOwner(t.Context()), ports.WatchEvent{ID: "b-1", Event: domain.IssueOpened{Issue: domain.Issue{Repo: repoName(t, "beta"), Number: 7}}})
 	require.NoError(t, err)
-	require.Len(t, frags, 6)
+	require.Len(t, frags, 5)
 	assert.Contains(t, frags[0].html, `id="inbox-counts"`)
 	assert.Contains(t, frags[1].html, `id="inbox-repos"`)
 	assert.Contains(t, frags[2].html, `id="inbox-pending"`)
-	assert.Contains(t, frags[3].html, `id="inbox-runs"`)
+	assert.Contains(t, frags[3].html, `id="inbox-mrs"`)
-	assert.Contains(t, frags[4].html, `id="inbox-mrs"`)
+	assert.Contains(t, frags[4].html, `id="inbox-issues"`)
-	assert.Contains(t, frags[5].html, `id="inbox-issues"`)
 	none, err := ls.render(withOwner(t.Context()), ports.WatchEvent{Event: domain.PushEvent{Repo: repoName(t, "beta")}})
 	require.NoError(t, err)
 	t.Parallel()
 	for name, ev := range map[string]domain.Event{
 		"issues turned off": domain.RepoUpdated{Repo: repoName(t, "beta")},
-		"run updated":       domain.RunUpdated{},
 		"repo deleted":      domain.RepoDeleted{Repo: repoName(t, "beta")},
 	} {
 		t.Run(name, func(t *testing.T) {
 			ls := &liveStream{s: srv, view: "inbox"}
 			frags, err := ls.render(withOwner(t.Context()), ports.WatchEvent{ID: "b-1", Event: ev})
 			require.NoError(t, err)
-			require.Len(t, frags, 6)
+			require.Len(t, frags, 5)
 			all := ""
 			for _, f := range frags {
 				all += f.html

D internal/adapters/web/jstest/keys.test.mjs +0 -29

@@ -1,29 +0,0 @@
1	-	// Exercise the production keydown handler without loading the rest of the page.
2	-	import assert from 'node:assert/strict';
3	-	import { readFileSync } from 'node:fs';
4	-	import { test } from 'node:test';
5	-	const src = readFileSync(new URL('../static/js/ermite.js', import.meta.url), 'utf8');
6	-	const block = src.slice(src.indexOf(' // 1. Keys.'), src.indexOf(' // 2. A [data-fire]'));
7	-
8	-	function page({ owner = true, off = false, typing = false, dialog = false } = {}) {
9	-	let handler;
10	-	const fired = [];
11	-	const window = { ermiteKeys: { blocks: () => off } };
12	-	const $ = (s) => s === 'dialog[open]' ? dialog : s === '[data-inbox]' ? owner : null;
13	-	new Function('window', '$', 'ermite', 'addEventListener', block)(window, $, { fire: (n) => fired.push(n) }, (_, f) => { handler = f; });
14	-	return (key) => {
15	-	const e = { key, shiftKey: key === 'I', preventDefault() {}, target: { closest: (s) => s.startsWith('input') && typing } };
16	-	handler(e);
17	-	return fired;
18	-	};
19	-	}
20	-	test('Shift+I opens inbox while lowercase i retains the issues tab', () => {
21	-	const press = page();
22	-	assert.deepEqual(press('I'), ['inbox']);
23	-	assert.deepEqual(press('i'), ['inbox', 'i']);
24	-	});
25	-	test('inbox shortcut respects preference, fields, dialogs, and owner target', () => {
26	-	for (const options of [{ off: true }, { typing: true }, { dialog: true }, { owner: false }]) {
27	-	assert.deepEqual(page(options)('I'), [], JSON.stringify(options));
28	-	}
29	-	});

@@ -1,29 +0,0 @@
1	-	// Exercise the production keydown handler without loading the rest of the page.
2	-	import assert from 'node:assert/strict';
3	-	import { readFileSync } from 'node:fs';
4	-	import { test } from 'node:test';
5	-	const src = readFileSync(new URL('../static/js/ermite.js', import.meta.url), 'utf8');
6	-	const block = src.slice(src.indexOf(' // 1. Keys.'), src.indexOf(' // 2. A [data-fire]'));
7	-
8	-	function page({ owner = true, off = false, typing = false, dialog = false } = {}) {
9	-	let handler;
10	-	const fired = [];
11	-	const window = { ermiteKeys: { blocks: () => off } };
12	-	const $ = (s) => s === 'dialog[open]' ? dialog : s === '[data-inbox]' ? owner : null;
13	-	new Function('window', '$', 'ermite', 'addEventListener', block)(window, $, { fire: (n) => fired.push(n) }, (_, f) => { handler = f; });
14	-	return (key) => {
15	-	const e = { key, shiftKey: key === 'I', preventDefault() {}, target: { closest: (s) => s.startsWith('input') && typing } };
16	-	handler(e);
17	-	return fired;
18	-	};
19	-	}
20	-	test('Shift+I opens inbox while lowercase i retains the issues tab', () => {
21	-	const press = page();
22	-	assert.deepEqual(press('I'), ['inbox']);
23	-	assert.deepEqual(press('i'), ['inbox', 'i']);
24	-	});
25	-	test('inbox shortcut respects preference, fields, dialogs, and owner target', () => {
26	-	for (const options of [{ off: true }, { typing: true }, { dialog: true }, { owner: false }]) {
27	-	assert.deepEqual(page(options)('I'), [], JSON.stringify(options));
28	-	}
29	-	});

M internal/adapters/web/jstest/mr.test.mjs +12 -4


@@ -152,8 +152,10 @@ test('footer tabs: closed by default, toggle, switch, arrows, hash', () => {
152	152		test('footer: #mr-ck syncs the checks label; its click opens Checks without toggling', () => {
153	153		const text0 = { v: '' }; let writes = 0;
154	154		const label = { get textContent() { return text0.v; }, set textContent(v) { writes++; text0.v = v; } };
155		-	const summary = { title: '1/2 failed', textContent: ' 1/2 ', parentElement: {} };
156		-	const h = footerHarness({ summary });
	155	+	const bar = {};
	156	+	const summary = { title: '1/2 failed', textContent: ' 1/2 ', closest: (s) => s === '.mr-bar' ? bar : null };
	157	+	const extra = { summary };
	158	+	const h = footerHarness(extra);
157	159		let observed = null, callback = null;
158	160		globalThis.MutationObserver = class { constructor(fn) { callback = fn; } observe(target, opts) { observed = [target, opts]; } };
159	161		const nav = document.querySelector('[data-mr-tabs]');

@@ -161,8 +163,14 @@ test('footer: #mr-ck syncs the checks label; its click opens Checks without togg
161	163		try {
162	164		window.ermiteMR.panels();
163	165		assert.equal(label.textContent, '1/2 failed', 'initial label sync');
164		-	assert.equal(observed[0], summary.parentElement);
165		-	assert.deepEqual(observed[1], { childList: true }, 'only #mr-ck replacements wake the observer');
	166	+	assert.equal(observed[0], bar);
	167	+	assert.deepEqual(observed[1], { childList: true, subtree: true }, 'the stable bar observes action and badge replacements');
	168	+	// Replace #mr-actions, including its badge, then replace the badge alone.
	169	+	extra.summary = { title: 'checks running', textContent: '' }; callback();
	170	+	assert.equal(label.textContent, 'checks running');
	171	+	extra.summary = { title: 'checks passed', textContent: '' }; callback();
	172	+	assert.equal(label.textContent, 'checks passed');
	173	+	extra.summary = summary; callback();
166	174		const before = writes; callback(); callback();
167	175		assert.equal(writes, before, 'an unchanged label is not written');
168	176		summary.title = ''; callback();

 test('footer: #mr-ck syncs the checks label; its click opens Checks without toggling', () => {
   const text0 = { v: '' }; let writes = 0;
   const label = { get textContent() { return text0.v; }, set textContent(v) { writes++; text0.v = v; } };
-  const summary = { title: '1/2 failed', textContent: ' 1/2 ', parentElement: {} };
+  const bar = {};
-  const h = footerHarness({ summary });
+  const summary = { title: '1/2 failed', textContent: ' 1/2 ', closest: (s) => s === '.mr-bar' ? bar : null };
+  const extra = { summary };
+  const h = footerHarness(extra);
   let observed = null, callback = null;
   globalThis.MutationObserver = class { constructor(fn) { callback = fn; } observe(target, opts) { observed = [target, opts]; } };
   const nav = document.querySelector('[data-mr-tabs]');
   try {
     window.ermiteMR.panels();
     assert.equal(label.textContent, '1/2 failed', 'initial label sync');
-    assert.equal(observed[0], summary.parentElement);
+    assert.equal(observed[0], bar);
-    assert.deepEqual(observed[1], { childList: true }, 'only #mr-ck replacements wake the observer');
+    assert.deepEqual(observed[1], { childList: true, subtree: true }, 'the stable bar observes action and badge replacements');
+    // Replace #mr-actions, including its badge, then replace the badge alone.
+    extra.summary = { title: 'checks running', textContent: '' }; callback();
+    assert.equal(label.textContent, 'checks running');
+    extra.summary = { title: 'checks passed', textContent: '' }; callback();
+    assert.equal(label.textContent, 'checks passed');
+    extra.summary = summary; callback();
     const before = writes; callback(); callback();
     assert.equal(writes, before, 'an unchanged label is not written');
     summary.title = ''; callback();

M internal/adapters/web/keys.templ +0 -1


@@ -28,7 +28,6 @@ templ Keys() {
28	28		k-r from:body -> ermite.tab('r');
29	29		k-m from:body -> ermite.tab('m');
30	30		k-i from:body -> ermite.tab('i');
31		-	k-inbox from:body -> ermite.go('[data-inbox]');
32	31		k-next from:body -> ermite.nextNote();
33	32		k-split from:body -> ermite.layout('split');
34	33		k-unified from:body -> ermite.layout('unified');


@@ -28,7 +28,6 @@ templ Keys() {
28		k-r from:body -> ermite.tab('r');	28	k-r from:body -> ermite.tab('r');
29		k-m from:body -> ermite.tab('m');	29	k-m from:body -> ermite.tab('m');
30		k-i from:body -> ermite.tab('i');	30	k-i from:body -> ermite.tab('i');
31	-	k-inbox from:body -> ermite.go('[data-inbox]');
32		k-next from:body -> ermite.nextNote();	31	k-next from:body -> ermite.nextNote();
33		k-split from:body -> ermite.layout('split');	32	k-split from:body -> ermite.layout('split');
34		k-unified from:body -> ermite.layout('unified');	33	k-unified from:body -> ermite.layout('unified');

M internal/adapters/web/keys_templ.go +1 -1


@@ -34,7 +34,7 @@ func Keys() templ.Component {
34	34		templ_7745c5c3_Var1 = templ.NopComponent
35	35		}
36	36		ctx = templ.ClearChildren(ctx)
37		-	templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div id=\"keys\" hidden hx-on=\"k-j from:body -> ermite.move(1);\n k-k from:body -> ermite.move(-1);\n k-top from:body -> ermite.edge(false);\n k-bottom from:body -> ermite.edge(true);\n k-open from:body -> ermite.open();\n k-right from:body -> ermite.rail(true);\n k-left from:body -> ermite.rail(false);\n k-esc from:body -> ermite.closeDialogs();\n k-help from:body -> ermite.dialog('panel-help');\n k-refs from:body -> ermite.dialog('panel-refs', 'refs-filter');\n k-cmd from:body -> ermite.dialog('panel-cmd', 'cmd-q'); ermiteFinder.load();\n k-filter from:body -> ermite.focusFilter();\n k-gh from:body -> ermite.go('.brand');\n k-s from:body -> ermite.tab('s');\n k-t from:body -> ermite.tab('t');\n k-c from:body -> ermite.tab('c');\n k-r from:body -> ermite.tab('r');\n k-m from:body -> ermite.tab('m');\n k-i from:body -> ermite.tab('i');\n k-inbox from:body -> ermite.go('[data-inbox]');\n k-next from:body -> ermite.nextNote();\n k-split from:body -> ermite.layout('split');\n k-unified from:body -> ermite.layout('unified');\n k-collapse from:body -> ermite.collapse();\n k-wide from:body -> window.ermiteWide.toggle();\n k-expand from:body -> ermite.expandFile();\n k-expandAll from:body -> ermite.expandAll();\n k-permalink from:body -> ermite.permalink();\n k-merge from:body -> window.ermiteMR?.openMerge();\n k-read from:body -> window.ermiteMR?.markRead();\n k-gf from:body -> window.ermiteMR?.focusFiles();\n k-keys from:body -> ermite.toggleKeys()\"></div>")
	37	+	templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div id=\"keys\" hidden hx-on=\"k-j from:body -> ermite.move(1);\n k-k from:body -> ermite.move(-1);\n k-top from:body -> ermite.edge(false);\n k-bottom from:body -> ermite.edge(true);\n k-open from:body -> ermite.open();\n k-right from:body -> ermite.rail(true);\n k-left from:body -> ermite.rail(false);\n k-esc from:body -> ermite.closeDialogs();\n k-help from:body -> ermite.dialog('panel-help');\n k-refs from:body -> ermite.dialog('panel-refs', 'refs-filter');\n k-cmd from:body -> ermite.dialog('panel-cmd', 'cmd-q'); ermiteFinder.load();\n k-filter from:body -> ermite.focusFilter();\n k-gh from:body -> ermite.go('.brand');\n k-s from:body -> ermite.tab('s');\n k-t from:body -> ermite.tab('t');\n k-c from:body -> ermite.tab('c');\n k-r from:body -> ermite.tab('r');\n k-m from:body -> ermite.tab('m');\n k-i from:body -> ermite.tab('i');\n k-next from:body -> ermite.nextNote();\n k-split from:body -> ermite.layout('split');\n k-unified from:body -> ermite.layout('unified');\n k-collapse from:body -> ermite.collapse();\n k-wide from:body -> window.ermiteWide.toggle();\n k-expand from:body -> ermite.expandFile();\n k-expandAll from:body -> ermite.expandAll();\n k-permalink from:body -> ermite.permalink();\n k-merge from:body -> window.ermiteMR?.openMerge();\n k-read from:body -> window.ermiteMR?.markRead();\n k-gf from:body -> window.ermiteMR?.focusFiles();\n k-keys from:body -> ermite.toggleKeys()\"></div>")
38	38		if templ_7745c5c3_Err != nil {
39	39		return templ_7745c5c3_Err
40	40		}


@@ -34,7 +34,7 @@ func Keys() templ.Component {
34		templ_7745c5c3_Var1 = templ.NopComponent	34		templ_7745c5c3_Var1 = templ.NopComponent
35		}	35		}
36		ctx = templ.ClearChildren(ctx)	36		ctx = templ.ClearChildren(ctx)
37	-	templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div id=\"keys\" hidden hx-on=\"k-j from:body -> ermite.move(1);\n k-k from:body -> ermite.move(-1);\n k-top from:body -> ermite.edge(false);\n k-bottom from:body -> ermite.edge(true);\n k-open from:body -> ermite.open();\n k-right from:body -> ermite.rail(true);\n k-left from:body -> ermite.rail(false);\n k-esc from:body -> ermite.closeDialogs();\n k-help from:body -> ermite.dialog('panel-help');\n k-refs from:body -> ermite.dialog('panel-refs', 'refs-filter');\n k-cmd from:body -> ermite.dialog('panel-cmd', 'cmd-q'); ermiteFinder.load();\n k-filter from:body -> ermite.focusFilter();\n k-gh from:body -> ermite.go('.brand');\n k-s from:body -> ermite.tab('s');\n k-t from:body -> ermite.tab('t');\n k-c from:body -> ermite.tab('c');\n k-r from:body -> ermite.tab('r');\n k-m from:body -> ermite.tab('m');\n k-i from:body -> ermite.tab('i');\n k-inbox from:body -> ermite.go('[data-inbox]');\n k-next from:body -> ermite.nextNote();\n k-split from:body -> ermite.layout('split');\n k-unified from:body -> ermite.layout('unified');\n k-collapse from:body -> ermite.collapse();\n k-wide from:body -> window.ermiteWide.toggle();\n k-expand from:body -> ermite.expandFile();\n k-expandAll from:body -> ermite.expandAll();\n k-permalink from:body -> ermite.permalink();\n k-merge from:body -> window.ermiteMR?.openMerge();\n k-read from:body -> window.ermiteMR?.markRead();\n k-gf from:body -> window.ermiteMR?.focusFiles();\n k-keys from:body -> ermite.toggleKeys()\"></div>")	37	+	templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div id=\"keys\" hidden hx-on=\"k-j from:body -> ermite.move(1);\n k-k from:body -> ermite.move(-1);\n k-top from:body -> ermite.edge(false);\n k-bottom from:body -> ermite.edge(true);\n k-open from:body -> ermite.open();\n k-right from:body -> ermite.rail(true);\n k-left from:body -> ermite.rail(false);\n k-esc from:body -> ermite.closeDialogs();\n k-help from:body -> ermite.dialog('panel-help');\n k-refs from:body -> ermite.dialog('panel-refs', 'refs-filter');\n k-cmd from:body -> ermite.dialog('panel-cmd', 'cmd-q'); ermiteFinder.load();\n k-filter from:body -> ermite.focusFilter();\n k-gh from:body -> ermite.go('.brand');\n k-s from:body -> ermite.tab('s');\n k-t from:body -> ermite.tab('t');\n k-c from:body -> ermite.tab('c');\n k-r from:body -> ermite.tab('r');\n k-m from:body -> ermite.tab('m');\n k-i from:body -> ermite.tab('i');\n k-next from:body -> ermite.nextNote();\n k-split from:body -> ermite.layout('split');\n k-unified from:body -> ermite.layout('unified');\n k-collapse from:body -> ermite.collapse();\n k-wide from:body -> window.ermiteWide.toggle();\n k-expand from:body -> ermite.expandFile();\n k-expandAll from:body -> ermite.expandAll();\n k-permalink from:body -> ermite.permalink();\n k-merge from:body -> window.ermiteMR?.openMerge();\n k-read from:body -> window.ermiteMR?.markRead();\n k-gf from:body -> window.ermiteMR?.focusFiles();\n k-keys from:body -> ermite.toggleKeys()\"></div>")
38		if templ_7745c5c3_Err != nil {	38		if templ_7745c5c3_Err != nil {
39		return templ_7745c5c3_Err	39		return templ_7745c5c3_Err
40		}	40		}

M internal/adapters/web/mr.go +7 -0


@@ -558,6 +558,10 @@ func (s Server) mrSince(ctx context.Context, r http.Request) (templ.Component,
558	558		}
559	559
560	560		func (s Server) mrPage(ctx context.Context, r http.Request, since bool) (templ.Component, int, error) {
	561	+	return s.mrPageView(ctx, r, since, false)
	562	+	}
	563	+
	564	+	func (s Server) mrPageView(ctx context.Context, r http.Request, since, fragment bool) (templ.Component, int, error) {
561	565		if since && !SignedIn(ctx) {
562	566		return nil, 0, errNotFound
563	567		}

@@ -649,6 +653,9 @@ func (s Server) mrPage(ctx context.Context, r http.Request, since bool) (templ
649	653		}
650	654		}
651	655
	656	+	if fragment {
	657	+	return MRStateFragment(p), http.StatusOK, nil
	658	+	}
652	659		l := s.repoLayout(ctx, d, "merge-requests")
653	660		l.Title = p.Number + " " + p.Title + " · " + d.name() + " · " + s.instance
654	661		if head != "" {


@@ -558,6 +558,10 @@ func (s Server) mrSince(ctx context.Context, r http.Request) (templ.Component,
558	}	558		}
559		559
560	func (s Server) mrPage(ctx context.Context, r http.Request, since bool) (templ.Component, int, error) {	560		func (s Server) mrPage(ctx context.Context, r http.Request, since bool) (templ.Component, int, error) {
		561	+	return s.mrPageView(ctx, r, since, false)
		562	+	}
		563	+
		564	+	func (s Server) mrPageView(ctx context.Context, r http.Request, since, fragment bool) (templ.Component, int, error) {
561	if since && !SignedIn(ctx) {	565		if since && !SignedIn(ctx) {
562	return nil, 0, errNotFound	566		return nil, 0, errNotFound
563	}	567		}

@@ -649,6 +653,9 @@ func (s Server) mrPage(ctx context.Context, r http.Request, since bool) (templ
649	}	653		}
650	}	654		}
651		655
		656	+	if fragment {
		657	+	return MRStateFragment(p), http.StatusOK, nil
		658	+	}
652	l := s.repoLayout(ctx, d, "merge-requests")	659		l := s.repoLayout(ctx, d, "merge-requests")
653	l.Title = p.Number + " " + p.Title + " · " + d.name() + " · " + s.instance	660		l.Title = p.Number + " " + p.Title + " · " + d.name() + " · " + s.instance
654	if head != "" {	661		if head != "" {

M internal/adapters/web/mr.templ +62 -29


@@ -13,7 +13,7 @@ templ MRList(l Layout, p MRListPage) {
13	13		@Shell(l, mrListRail(p)) {
14	14		if p.Live {
15	15		@LiveSlot("mr-notice")
16		-	<div id="mr-refresh-status" role="status" aria-live="polite"></div>
	16	+	<div id="mr-refresh-status" role="status" aria-live="polite"></div>
17	17		}
18	18		<div class="filter">
19	19		<label for="mr-filter" class="sr">filter</label>

@@ -119,12 +119,7 @@ templ MergeRequest(l Layout, p MRPage) {
119	119		<h1><span class="mute">{ p.Number }</span> { p.Title }</h1>
120	120		<dl class="kv show-kv">
121	121		<dt>state</dt>
122		-	<dd class="mr-state" data-state={ p.State }>
123		-	{ p.State }
124		-	if p.MergedShort != "" {
125		-	{ " · " }<a href={ templ.SafeURL(p.MergedHref) }>{ p.MergedShort }</a>{ " · " + p.MergeMode }
126		-	}
127		-	</dd>
	122	+	@mrState(p)
128	123		<dt>branch</dt>
129	124		<dd>
130	125		@branchLink(p.Source, p.SourceHref)

@@ -215,19 +210,19 @@ templ MergeRequest(l Layout, p MRPage) {
215	210		}
216	211		</div>
217	212		<div id="mr-comments">
218		-	<h2 class="rule-h" id="comments"><span>Comments</span><span class="count">{ itoa(p.NUnresolved) } open / { itoa(p.NComments) }</span></h2>
219		-	for _, c := range p.Loose {
220		-	@commentView(c, "")
221		-	}
222		-	for _, c := range p.General {
223		-	@commentView(c, "")
224		-	}
225		-	if p.NComments == 0 {
226		-	<p class="dim">no comments yet.</p>
227		-	}
228		-	if p.GeneralForm != nil {
229		-	@commentForm(*p.GeneralForm, "")
230		-	}
	213	+	<h2 class="rule-h" id="comments"><span>Comments</span><span class="count">{ itoa(p.NUnresolved) } open / { itoa(p.NComments) }</span></h2>
	214	+	for _, c := range p.Loose {
	215	+	@commentView(c, "")
	216	+	}
	217	+	for _, c := range p.General {
	218	+	@commentView(c, "")
	219	+	}
	220	+	if p.NComments == 0 {
	221	+	<p class="dim">no comments yet.</p>
	222	+	}
	223	+	if p.GeneralForm != nil {
	224	+	@commentForm(*p.GeneralForm, "")
	225	+	}
231	226		</div>
232	227		}
233	228		}

@@ -467,13 +462,7 @@ templ mrBar(p MRPage) {
467	462		<div class="diff-tools mr-bar" role="group" aria-label="Diff view and merge">
468	463		<span class="dim">{ plural(p.NFiles, "file", "files") } · <span class="plus">+{ itoa(p.Adds) }</span> <span class="minus">-{ itoa(p.Dels) }</span></span>
469	464		@diffViewMenu(p.DiffView)
470		-	<div class="mr-acts">
471		-	@MRChecksSum(p.ChecksSum)
472		-	if p.Box != nil {
473		-	@mergeMenu(p)
474		-	}
475		-	@moreMenu(p)
476		-	</div>
	465	+	@mrActions(p, false)
477	466		</div>
478	467		}
479	468

@@ -523,7 +512,15 @@ templ mergeMenu(p MRPage) {
523	512		</div>
524	513		</form>
525	514		}
526		-	<form class="d-acts" method="post" action={ templ.SafeURL(p.Box.MergeAction) }>
	515	+	<form
	516	+	class="d-acts"
	517	+	method="post"
	518	+	action={ templ.SafeURL(p.Box.MergeAction) }
	519	+	hx-post={ p.Box.MergeAction }
	520	+	hx-swap="none"
	521	+	hx-sync="this:drop"
	522	+	hx-disable="find button[type=submit]"
	523	+	>
527	524		<input type="hidden" name="head_id" value={ p.Box.Head }/>
528	525		<fieldset class="d-modes">
529	526		<legend class="sr">merge mode</legend>

@@ -557,9 +554,10 @@ templ mergeMenu(p MRPage) {
557	554		data-default
558	555		disabled?={ !p.Box.CanMerge() }
559	556		title={ p.Box.MergeTitle() }
560		-	:disabled="!this.form.querySelector('input[name=mode]:checked:not(:disabled)')"
	557	+	:disabled="this.form.classList.contains('htmx-request') \|\| !this.form.querySelector('input[name=mode]:checked:not(:disabled)')"
561	558		:title="(this.form.querySelector('input[name=mode]:checked') \|\| {}).title \|\| ''"
562	559		>Merge into { p.Target }</button>
	560	+	<span class="htmx-indicator" role="status">Merging…</span>
563	561		</div>
564	562		</form>
565	563		if p.Box.CanAutoMerge {

@@ -779,3 +777,38 @@ templ MRMergeChecks(c ChecksSummary) {
779	777		}
780	778		</div>
781	779		}
	780	+
	781	+	// MRStateFragment updates only state and actions, leaving review drafts alone.
	782	+	templ MRStateFragment(p MRPage) {
	783	+	@mrState(p)
	784	+	@mrActions(p, true)
	785	+	}
	786	+
	787	+	templ mrState(p MRPage) {
	788	+	<dd id="mr-state" hx-swap-oob="true" class="mr-state" data-state={ p.State }>
	789	+	{ p.State }
	790	+	if p.MergedShort != "" {
	791	+	{ " · " }<a href={ templ.SafeURL(p.MergedHref) }>{ p.MergedShort }</a>{ " · " + p.MergeMode }
	792	+	}
	793	+	</dd>
	794	+	}
	795	+
	796	+	templ mrActions(p MRPage, fragment bool) {
	797	+	<div id="mr-actions" hx-swap-oob="true" class="mr-acts">
	798	+	@MRChecksSum(p.ChecksSum)
	799	+	if p.Box != nil {
	800	+	@mergeMenu(p)
	801	+	}
	802	+	@moreMenu(p)
	803	+	if fragment && p.MergeError != "" {
	804	+	<p class="d-err" role="alert">{ p.MergeError }</p>
	805	+	}
	806	+	</div>
	807	+	}
	808	+
	809	+	// MRActionStatus remains visible even when the request detail cannot be read.
	810	+	templ MRActionStatus(message, href string) {
	811	+	<div id="mr-actions" class="mr-acts" hx-swap-oob="true">
	812	+	<p class="d-err" role="alert">{ message } <a href={ templ.SafeURL(href) }>reload</a></p>
	813	+	</div>
	814	+	}

 	@Shell(l, mrListRail(p)) {
 		if p.Live {
 			@LiveSlot("mr-notice")
-		<div id="mr-refresh-status" role="status" aria-live="polite"></div>
+			<div id="mr-refresh-status" role="status" aria-live="polite"></div>
 		}
 		<div class="filter">
 			<label for="mr-filter" class="sr">filter</label>
 				<h1><span class="mute">{ p.Number }</span> { p.Title }</h1>
 				<dl class="kv show-kv">
 					<dt>state</dt>
-					<dd class="mr-state" data-state={ p.State }>
+					@mrState(p)
-						{ p.State }
-						if p.MergedShort != "" {
-							{ " · " }<a href={ templ.SafeURL(p.MergedHref) }>{ p.MergedShort }</a>{ " · " + p.MergeMode }
-						}
-					</dd>
 					<dt>branch</dt>
 					<dd>
 						@branchLink(p.Source, p.SourceHref)
 			}
 		</div>
 		<div id="mr-comments">
-		<h2 class="rule-h" id="comments"><span>Comments</span><span class="count">{ itoa(p.NUnresolved) } open / { itoa(p.NComments) }</span></h2>
+			<h2 class="rule-h" id="comments"><span>Comments</span><span class="count">{ itoa(p.NUnresolved) } open / { itoa(p.NComments) }</span></h2>
-		for _, c := range p.Loose {
+			for _, c := range p.Loose {
-			@commentView(c, "")
+				@commentView(c, "")
-		}
+			}
-		for _, c := range p.General {
+			for _, c := range p.General {
-			@commentView(c, "")
+				@commentView(c, "")
-		}
+			}
-		if p.NComments == 0 {
+			if p.NComments == 0 {
-			<p class="dim">no comments yet.</p>
+				<p class="dim">no comments yet.</p>
-		}
+			}
-		if p.GeneralForm != nil {
+			if p.GeneralForm != nil {
-			@commentForm(*p.GeneralForm, "")
+				@commentForm(*p.GeneralForm, "")
-		}
+			}
 		</div>
 	}
 }
 	<div class="diff-tools mr-bar" role="group" aria-label="Diff view and merge">
 		<span class="dim">{ plural(p.NFiles, "file", "files") } · <span class="plus">+{ itoa(p.Adds) }</span> <span class="minus">-{ itoa(p.Dels) }</span></span>
 		@diffViewMenu(p.DiffView)
-		<div class="mr-acts">
+		@mrActions(p, false)
-			@MRChecksSum(p.ChecksSum)
-			if p.Box != nil {
-				@mergeMenu(p)
-			}
-			@moreMenu(p)
-		</div>
 	</div>
 }
 						</div>
 					</form>
 				}
-				<form class="d-acts" method="post" action={ templ.SafeURL(p.Box.MergeAction) }>
+				<form
+					class="d-acts"
+					method="post"
+					action={ templ.SafeURL(p.Box.MergeAction) }
+					hx-post={ p.Box.MergeAction }
+					hx-swap="none"
+					hx-sync="this:drop"
+					hx-disable="find button[type=submit]"
+				>
 					<input type="hidden" name="head_id" value={ p.Box.Head }/>
 					<fieldset class="d-modes">
 						<legend class="sr">merge mode</legend>
 							data-default
 							disabled?={ !p.Box.CanMerge() }
 							title={ p.Box.MergeTitle() }
-							:disabled="!this.form.querySelector('input[name=mode]:checked:not(:disabled)')"
+							:disabled="this.form.classList.contains('htmx-request') || !this.form.querySelector('input[name=mode]:checked:not(:disabled)')"
 							:title="(this.form.querySelector('input[name=mode]:checked') || {}).title || ''"
 						>Merge into { p.Target }</button>
+						<span class="htmx-indicator" role="status">Merging…</span>
 					</div>
 				</form>
 				if p.Box.CanAutoMerge {
 		}
 	</div>
 }
+// MRStateFragment updates only state and actions, leaving review drafts alone.
+templ MRStateFragment(p MRPage) {
+	@mrState(p)
+	@mrActions(p, true)
+}
+templ mrState(p MRPage) {
+	<dd id="mr-state" hx-swap-oob="true" class="mr-state" data-state={ p.State }>
+		{ p.State }
+		if p.MergedShort != "" {
+			{ " · " }<a href={ templ.SafeURL(p.MergedHref) }>{ p.MergedShort }</a>{ " · " + p.MergeMode }
+		}
+	</dd>
+}
+templ mrActions(p MRPage, fragment bool) {
+	<div id="mr-actions" hx-swap-oob="true" class="mr-acts">
+		@MRChecksSum(p.ChecksSum)
+		if p.Box != nil {
+			@mergeMenu(p)
+		}
+		@moreMenu(p)
+		if fragment && p.MergeError != "" {
+			<p class="d-err" role="alert">{ p.MergeError }</p>
+		}
+	</div>
+}
+// MRActionStatus remains visible even when the request detail cannot be read.
+templ MRActionStatus(message, href string) {
+ <div id="mr-actions" class="mr-acts" hx-swap-oob="true">
+ <p class="d-err" role="alert">{ message } <a href={ templ.SafeURL(href) }>reload</a></p>
+ </div>
+}

A internal/adapters/web/mr_async_test.go +166 -0

@@ -0,0 +1,166 @@
	1	+	// SPDX-License-Identifier: AGPL-3.0-or-later
	2	+
	3	+	package web
	4	+
	5	+	import (
	6	+	"context"
	7	+	"errors"
	8	+	"net/http"
	9	+	"net/http/httptest"
	10	+	"strings"
	11	+	"testing"
	12	+	"time"
	13	+
	14	+	"github.com/stretchr/testify/assert"
	15	+	"github.com/stretchr/testify/mock"
	16	+	"github.com/stretchr/testify/require"
	17	+
	18	+	"bnema.dev/ermite/internal/domain"
	19	+	"bnema.dev/ermite/internal/ports"
	20	+	"bnema.dev/ermite/internal/ports/mocks"
	21	+	)
	22	+
	23	+	func asyncMergeServer(t testing.T, state domain.MRState) (Server, *mocks.MergeRequestService) {
	24	+	t.Helper()
	25	+	svc := mocks.NewMergeRequestService(t)
	26	+	browse := mocks.NewBrowseService(t)
	27	+	browse.EXPECT().ListRefs(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(ports.RefPage{Refs: []domain.Ref{{Kind: domain.RefKindBranch, ShortName: "feature"}}}, nil).Maybe()
	28	+	svc.EXPECT().Get(mock.Anything, mock.Anything, repoName(t, "demo"), int64(3), mock.Anything).Return(ports.MergeRequestDetail{
	29	+	MergeRequest: domain.MergeRequest{Repo: repoName(t, "demo"), Number: 3, State: state, HeadID: objectID(t, strings.Repeat("a", domain.ObjectIDLen)), Source: "feature", Target: "main"},
	30	+	Mergeability: domain.Mergeability{State: domain.MergeabilityUpToDate},
	31	+	}, nil).Maybe()
	32	+	return newTestServer(t, Config{Repos: reposServing(t, publicRepo(t, "demo")), Browse: browse, MergeRequests: svc, Now: time.Now}), svc
	33	+	}
	34	+
	35	+	func TestAsyncMergePost(t *testing.T) {
	36	+	for _, mode := range []domain.MergeMode{domain.MergeModeFastForward, domain.MergeModeSquash, domain.MergeModeMerge} {
	37	+	for _, hx := range []bool{false, true} {
	38	+	t.Run(mode.String()+"/"+boolText(hx), func(t *testing.T) {
	39	+	s, svc := asyncMergeServer(t, domain.MRStateMerged)
	40	+	svc.EXPECT().Merge(mock.Anything, mock.Anything, repoName(t, "demo"), int64(3), ports.MergeParams{Mode: mode}).Return(ports.MergeResult{}, nil).Once()
	41	+	r := autoMergeRequest("/demo/merge-requests/3/merge", "mode="+mode.String())
	42	+	if hx {
	43	+	r.Header.Set("HX-Request", "true")
	44	+	}
	45	+	w := httptest.NewRecorder()
	46	+	s.mrAction(s.mrMerge)(w, r)
	47	+	if !hx {
	48	+	assert.Equal(t, http.StatusSeeOther, w.Code)
	49	+	return
	50	+	}
	51	+	assert.Equal(t, http.StatusOK, w.Code)
	52	+	assert.Empty(t, w.Header().Get("Location"))
	53	+	assert.Contains(t, w.Body.String(), `id="mr-state"`)
	54	+	assert.Contains(t, w.Body.String(), `data-state="merged"`)
	55	+	assert.Contains(t, w.Body.String(), `id="mr-actions"`)
	56	+	assert.NotContains(t, w.Body.String(), "<html")
	57	+	assert.NotContains(t, w.Body.String(), `id="merge-menu"`)
	58	+	})
	59	+	}
	60	+	}
	61	+	}
	62	+
	63	+	func TestAsyncMergeRefusal(t *testing.T) {
	64	+	s, svc := asyncMergeServer(t, domain.MRStateOpen)
	65	+	svc.EXPECT().Merge(mock.Anything, mock.Anything, mock.Anything, int64(3), mock.Anything).Return(ports.MergeResult{}, domain.ErrConflict)
	66	+	r := autoMergeRequest("/demo/merge-requests/3/merge", "mode=squash")
	67	+	r = r.WithContext(context.WithValue(r.Context(), signedInKey{}, struct{}{}))
	68	+	r.Header.Set("HX-Request", "true")
	69	+	w := httptest.NewRecorder()
	70	+	s.mrAction(s.mrMerge)(w, r)
	71	+	assert.Equal(t, http.StatusConflict, w.Code)
	72	+	assert.Contains(t, w.Body.String(), `role="alert"`)
	73	+	assert.Contains(t, w.Body.String(), domain.ErrConflict.Error())
	74	+	assert.Contains(t, w.Body.String(), `hx-post="/demo/merge-requests/3/merge"`)
	75	+	assert.Contains(t, w.Body.String(), `hx-sync="this:drop"`)
	76	+	assert.Contains(t, w.Body.String(), "Merging…")
	77	+	assert.NotContains(t, w.Body.String(), "<html")
	78	+	}
	79	+
	80	+	func TestAsyncMergeLive(t *testing.T) {
	81	+	s, _ := asyncMergeServer(t, domain.MRStateMerged)
	82	+	l := liveStream{s: s, repo: "demo", view: "mr", n: "3"}
	83	+	fs, err := l.repoPage(t.Context(), watchOf(domain.MergeRequestMerged{MergeRequest: domain.MergeRequest{Number: 3}}))
	84	+	require.NoError(t, err)
	85	+	require.Len(t, fs, 1)
	86	+	assert.Equal(t, "mr-mergeability", fs[0].event)
	87	+	assert.Contains(t, fs[0].html, `data-state="merged"`)
	88	+	assert.Contains(t, fs[0].html, `id="mr-actions"`)
	89	+	assert.False(t, strings.Contains(fs[0].html, "reload"))
	90	+	fs, err = l.repoPage(t.Context(), watchOf(domain.MergeRequestMerged{MergeRequest: domain.MergeRequest{Number: 4}}))
	91	+	require.NoError(t, err)
	92	+	assert.Empty(t, fs)
	93	+	}
	94	+
	95	+	func TestAsyncMergeOtherFailures(t *testing.T) {
	96	+	for _, tt := range []struct {
	97	+	name string
	98	+	mergeErr error
	99	+	readFails bool
	100	+	status int
	101	+	message string
	102	+	}{
	103	+	{"forbidden", domain.ErrForbidden, false, http.StatusForbidden, "the session is not allowed"},
	104	+	{"internal", errors.New("private backend detail"), false, http.StatusInternalServerError, "reload to check its state"},
	105	+	{"post-merge read", nil, true, http.StatusOK, "merged, but the updated page could not be loaded"},
	106	+	} {
	107	+	t.Run(tt.name, func(t *testing.T) {
	108	+	s, svc := asyncMergeServer(t, domain.MRStateMerged)
	109	+	if tt.readFails {
	110	+	svc.On("Get", mock.Anything, mock.Anything, repoName(t, "demo"), int64(3), mock.Anything).Unset()
	111	+	svc.EXPECT().Get(mock.Anything, mock.Anything, repoName(t, "demo"), int64(3), mock.Anything).Return(ports.MergeRequestDetail{}, errors.New("private read detail")).Once()
	112	+	}
	113	+	svc.EXPECT().Merge(mock.Anything, mock.Anything, mock.Anything, int64(3), mock.Anything).Return(ports.MergeResult{}, tt.mergeErr).Once()
	114	+	r := autoMergeRequest("/demo/merge-requests/3/merge", "mode=squash")
	115	+	r.Header.Set("HX-Request", "true")
	116	+	w := httptest.NewRecorder()
	117	+	s.mrAction(s.mrMerge)(w, r)
	118	+	assert.Equal(t, tt.status, w.Code)
	119	+	assert.Contains(t, w.Body.String(), `id="mr-actions"`)
	120	+	assert.Contains(t, w.Body.String(), `hx-swap-oob="true"`)
	121	+	assert.Contains(t, w.Body.String(), `role="alert"`)
	122	+	assert.Contains(t, w.Body.String(), tt.message)
	123	+	assert.NotContains(t, w.Body.String(), "private")
	124	+	assert.NotContains(t, w.Body.String(), "<html")
	125	+	})
	126	+	}
	127	+	}
	128	+
	129	+	func TestMergeGateRefusalFragment(t *testing.T) {
	130	+	s, _ := newSessionServer(t, newSessions(t, "tok"), testPublicURL)
	131	+	for _, origin := range []string{testPublicURL, "https://other.example"} {
	132	+	for _, hx := range []bool{false, true} {
	133	+	r := httptest.NewRequest(http.MethodPost, "/demo/merge-requests/3/merge", strings.NewReader("mode=squash"))
	134	+	r.Header.Set("Origin", origin)
	135	+	r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
	136	+	if hx {
	137	+	r.Header.Set("HX-Request", "true")
	138	+	}
	139	+	w := httptest.NewRecorder()
	140	+	s.ServeHTTP(w, r)
	141	+	assert.Equal(t, http.StatusForbidden, w.Code)
	142	+	if hx {
	143	+	assert.Contains(t, w.Body.String(), `hx-swap-oob="true"`)
	144	+	assert.Contains(t, w.Body.String(), `id="mr-actions"`)
	145	+	if origin == testPublicURL {
	146	+	assert.Contains(t, w.Body.String(), "your session has expired")
	147	+	} else {
	148	+	assert.Contains(t, w.Body.String(), "origin was not accepted")
	149	+	}
	150	+	} else {
	151	+	assert.NotContains(t, w.Body.String(), "hx-swap-oob")
	152	+	}
	153	+	}
	154	+	}
	155	+	}
	156	+
	157	+	func TestNonHXMergeRefusalHasOneAlert(t *testing.T) {
	158	+	s, svc := asyncMergeServer(t, domain.MRStateMerged)
	159	+	svc.EXPECT().CountOpen(mock.Anything, mock.Anything, mock.Anything).Return(0, nil)
	160	+	svc.EXPECT().Merge(mock.Anything, mock.Anything, mock.Anything, int64(3), mock.Anything).Return(ports.MergeResult{}, domain.ErrConflict).Once()
	161	+	r := autoMergeRequest("/demo/merge-requests/3/merge", "mode=squash")
	162	+	w := httptest.NewRecorder()
	163	+	s.mrAction(s.mrMerge)(w, r)
	164	+	assert.Equal(t, http.StatusConflict, w.Code)
	165	+	assert.Equal(t, 1, strings.Count(w.Body.String(), `role="alert"`))
	166	+	}

@@ -0,0 +1,166 @@
	1	+	// SPDX-License-Identifier: AGPL-3.0-or-later
	2	+
	3	+	package web
	4	+
	5	+	import (
	6	+	"context"
	7	+	"errors"
	8	+	"net/http"
	9	+	"net/http/httptest"
	10	+	"strings"
	11	+	"testing"
	12	+	"time"
	13	+
	14	+	"github.com/stretchr/testify/assert"
	15	+	"github.com/stretchr/testify/mock"
	16	+	"github.com/stretchr/testify/require"
	17	+
	18	+	"bnema.dev/ermite/internal/domain"
	19	+	"bnema.dev/ermite/internal/ports"
	20	+	"bnema.dev/ermite/internal/ports/mocks"
	21	+	)
	22	+
	23	+	func asyncMergeServer(t testing.T, state domain.MRState) (Server, *mocks.MergeRequestService) {
	24	+	t.Helper()
	25	+	svc := mocks.NewMergeRequestService(t)
	26	+	browse := mocks.NewBrowseService(t)
	27	+	browse.EXPECT().ListRefs(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(ports.RefPage{Refs: []domain.Ref{{Kind: domain.RefKindBranch, ShortName: "feature"}}}, nil).Maybe()
	28	+	svc.EXPECT().Get(mock.Anything, mock.Anything, repoName(t, "demo"), int64(3), mock.Anything).Return(ports.MergeRequestDetail{
	29	+	MergeRequest: domain.MergeRequest{Repo: repoName(t, "demo"), Number: 3, State: state, HeadID: objectID(t, strings.Repeat("a", domain.ObjectIDLen)), Source: "feature", Target: "main"},
	30	+	Mergeability: domain.Mergeability{State: domain.MergeabilityUpToDate},
	31	+	}, nil).Maybe()
	32	+	return newTestServer(t, Config{Repos: reposServing(t, publicRepo(t, "demo")), Browse: browse, MergeRequests: svc, Now: time.Now}), svc
	33	+	}
	34	+
	35	+	func TestAsyncMergePost(t *testing.T) {
	36	+	for _, mode := range []domain.MergeMode{domain.MergeModeFastForward, domain.MergeModeSquash, domain.MergeModeMerge} {
	37	+	for _, hx := range []bool{false, true} {
	38	+	t.Run(mode.String()+"/"+boolText(hx), func(t *testing.T) {
	39	+	s, svc := asyncMergeServer(t, domain.MRStateMerged)
	40	+	svc.EXPECT().Merge(mock.Anything, mock.Anything, repoName(t, "demo"), int64(3), ports.MergeParams{Mode: mode}).Return(ports.MergeResult{}, nil).Once()
	41	+	r := autoMergeRequest("/demo/merge-requests/3/merge", "mode="+mode.String())
	42	+	if hx {
	43	+	r.Header.Set("HX-Request", "true")
	44	+	}
	45	+	w := httptest.NewRecorder()
	46	+	s.mrAction(s.mrMerge)(w, r)
	47	+	if !hx {
	48	+	assert.Equal(t, http.StatusSeeOther, w.Code)
	49	+	return
	50	+	}
	51	+	assert.Equal(t, http.StatusOK, w.Code)
	52	+	assert.Empty(t, w.Header().Get("Location"))
	53	+	assert.Contains(t, w.Body.String(), `id="mr-state"`)
	54	+	assert.Contains(t, w.Body.String(), `data-state="merged"`)
	55	+	assert.Contains(t, w.Body.String(), `id="mr-actions"`)
	56	+	assert.NotContains(t, w.Body.String(), "<html")
	57	+	assert.NotContains(t, w.Body.String(), `id="merge-menu"`)
	58	+	})
	59	+	}
	60	+	}
	61	+	}
	62	+
	63	+	func TestAsyncMergeRefusal(t *testing.T) {
	64	+	s, svc := asyncMergeServer(t, domain.MRStateOpen)
	65	+	svc.EXPECT().Merge(mock.Anything, mock.Anything, mock.Anything, int64(3), mock.Anything).Return(ports.MergeResult{}, domain.ErrConflict)
	66	+	r := autoMergeRequest("/demo/merge-requests/3/merge", "mode=squash")
	67	+	r = r.WithContext(context.WithValue(r.Context(), signedInKey{}, struct{}{}))
	68	+	r.Header.Set("HX-Request", "true")
	69	+	w := httptest.NewRecorder()
	70	+	s.mrAction(s.mrMerge)(w, r)
	71	+	assert.Equal(t, http.StatusConflict, w.Code)
	72	+	assert.Contains(t, w.Body.String(), `role="alert"`)
	73	+	assert.Contains(t, w.Body.String(), domain.ErrConflict.Error())
	74	+	assert.Contains(t, w.Body.String(), `hx-post="/demo/merge-requests/3/merge"`)
	75	+	assert.Contains(t, w.Body.String(), `hx-sync="this:drop"`)
	76	+	assert.Contains(t, w.Body.String(), "Merging…")
	77	+	assert.NotContains(t, w.Body.String(), "<html")
	78	+	}
	79	+
	80	+	func TestAsyncMergeLive(t *testing.T) {
	81	+	s, _ := asyncMergeServer(t, domain.MRStateMerged)
	82	+	l := liveStream{s: s, repo: "demo", view: "mr", n: "3"}
	83	+	fs, err := l.repoPage(t.Context(), watchOf(domain.MergeRequestMerged{MergeRequest: domain.MergeRequest{Number: 3}}))
	84	+	require.NoError(t, err)
	85	+	require.Len(t, fs, 1)
	86	+	assert.Equal(t, "mr-mergeability", fs[0].event)
	87	+	assert.Contains(t, fs[0].html, `data-state="merged"`)
	88	+	assert.Contains(t, fs[0].html, `id="mr-actions"`)
	89	+	assert.False(t, strings.Contains(fs[0].html, "reload"))
	90	+	fs, err = l.repoPage(t.Context(), watchOf(domain.MergeRequestMerged{MergeRequest: domain.MergeRequest{Number: 4}}))
	91	+	require.NoError(t, err)
	92	+	assert.Empty(t, fs)
	93	+	}
	94	+
	95	+	func TestAsyncMergeOtherFailures(t *testing.T) {
	96	+	for _, tt := range []struct {
	97	+	name string
	98	+	mergeErr error
	99	+	readFails bool
	100	+	status int
	101	+	message string
	102	+	}{
	103	+	{"forbidden", domain.ErrForbidden, false, http.StatusForbidden, "the session is not allowed"},
	104	+	{"internal", errors.New("private backend detail"), false, http.StatusInternalServerError, "reload to check its state"},
	105	+	{"post-merge read", nil, true, http.StatusOK, "merged, but the updated page could not be loaded"},
	106	+	} {
	107	+	t.Run(tt.name, func(t *testing.T) {
	108	+	s, svc := asyncMergeServer(t, domain.MRStateMerged)
	109	+	if tt.readFails {
	110	+	svc.On("Get", mock.Anything, mock.Anything, repoName(t, "demo"), int64(3), mock.Anything).Unset()
	111	+	svc.EXPECT().Get(mock.Anything, mock.Anything, repoName(t, "demo"), int64(3), mock.Anything).Return(ports.MergeRequestDetail{}, errors.New("private read detail")).Once()
	112	+	}
	113	+	svc.EXPECT().Merge(mock.Anything, mock.Anything, mock.Anything, int64(3), mock.Anything).Return(ports.MergeResult{}, tt.mergeErr).Once()
	114	+	r := autoMergeRequest("/demo/merge-requests/3/merge", "mode=squash")
	115	+	r.Header.Set("HX-Request", "true")
	116	+	w := httptest.NewRecorder()
	117	+	s.mrAction(s.mrMerge)(w, r)
	118	+	assert.Equal(t, tt.status, w.Code)
	119	+	assert.Contains(t, w.Body.String(), `id="mr-actions"`)
	120	+	assert.Contains(t, w.Body.String(), `hx-swap-oob="true"`)
	121	+	assert.Contains(t, w.Body.String(), `role="alert"`)
	122	+	assert.Contains(t, w.Body.String(), tt.message)
	123	+	assert.NotContains(t, w.Body.String(), "private")
	124	+	assert.NotContains(t, w.Body.String(), "<html")
	125	+	})
	126	+	}
	127	+	}
	128	+
	129	+	func TestMergeGateRefusalFragment(t *testing.T) {
	130	+	s, _ := newSessionServer(t, newSessions(t, "tok"), testPublicURL)
	131	+	for _, origin := range []string{testPublicURL, "https://other.example"} {
	132	+	for _, hx := range []bool{false, true} {
	133	+	r := httptest.NewRequest(http.MethodPost, "/demo/merge-requests/3/merge", strings.NewReader("mode=squash"))
	134	+	r.Header.Set("Origin", origin)
	135	+	r.Header.Set("Content-Type", "application/x-www-form-urlencoded")
	136	+	if hx {
	137	+	r.Header.Set("HX-Request", "true")
	138	+	}
	139	+	w := httptest.NewRecorder()
	140	+	s.ServeHTTP(w, r)
	141	+	assert.Equal(t, http.StatusForbidden, w.Code)
	142	+	if hx {
	143	+	assert.Contains(t, w.Body.String(), `hx-swap-oob="true"`)
	144	+	assert.Contains(t, w.Body.String(), `id="mr-actions"`)
	145	+	if origin == testPublicURL {
	146	+	assert.Contains(t, w.Body.String(), "your session has expired")
	147	+	} else {
	148	+	assert.Contains(t, w.Body.String(), "origin was not accepted")
	149	+	}
	150	+	} else {
	151	+	assert.NotContains(t, w.Body.String(), "hx-swap-oob")
	152	+	}
	153	+	}
	154	+	}
	155	+	}
	156	+
	157	+	func TestNonHXMergeRefusalHasOneAlert(t *testing.T) {
	158	+	s, svc := asyncMergeServer(t, domain.MRStateMerged)
	159	+	svc.EXPECT().CountOpen(mock.Anything, mock.Anything, mock.Anything).Return(0, nil)
	160	+	svc.EXPECT().Merge(mock.Anything, mock.Anything, mock.Anything, int64(3), mock.Anything).Return(ports.MergeResult{}, domain.ErrConflict).Once()
	161	+	r := autoMergeRequest("/demo/merge-requests/3/merge", "mode=squash")
	162	+	w := httptest.NewRecorder()
	163	+	s.mrAction(s.mrMerge)(w, r)
	164	+	assert.Equal(t, http.StatusConflict, w.Code)
	165	+	assert.Equal(t, 1, strings.Count(w.Body.String(), `role="alert"`))
	166	+	}

M internal/adapters/web/mr_post.go +33 -1


@@ -68,6 +68,20 @@ func (s Server) mrAction(h func(ctx context.Context, r http.Request) (to strin
68	68		s.actionFailed(ctx, w, r, err, back)
69	69		return
70	70		}
	71	+	if isHXMerge(r) {
	72	+	c, _, err := s.mrPageView(ctx, r, false, true)
	73	+	if err != nil {
	74	+	id := requestID()
	75	+	log := zerowrap.FromCtx(ctx)
	76	+	log.Error().Err(err).Str("request_id", id).Msg("web merged state failed")
	77	+	w.Header().Set("Cache-Control", "no-store")
	78	+	s.write(ctx, w, r, http.StatusOK, MRActionStatus("merged, but the updated page could not be loaded. reload to see the result. reference: "+id, back))
	79	+	return
	80	+	}
	81	+	w.Header().Set("Cache-Control", "no-store")
	82	+	s.write(ctx, w, r, http.StatusOK, c)
	83	+	return
	84	+	}
71	85		seeOther(w, r, to)
72	86		}
73	87		}

@@ -100,7 +114,7 @@ func mergeErrorOf(ctx context.Context) string {
100	114		// It reports false when the page cannot be built; the caller then answers as
101	115		// for any refused action.
102	116		func (s Server) rerenderMR(ctx context.Context, w http.ResponseWriter, r http.Request, re *rerender) bool {
103		-	c, _, err := s.mrPage(withMergeError(ctx, re.msg), r, false)
	117	+	c, _, err := s.mrPageView(withMergeError(ctx, re.msg), r, false, isHXMerge(r))
104	118		if err != nil {
105	119		return false
106	120		}

@@ -120,6 +134,10 @@ func (s Server) actionFailed(ctx context.Context, w http.ResponseWriter, r htt
120	134		// The browser is gone.
121	135		case errors.Is(err, domain.ErrNotFound):
122	136		w.Header().Set("Cache-Control", "no-store")
	137	+	if isHXMerge(r) {
	138	+	s.write(ctx, w, r, http.StatusNotFound, MRActionStatus("the merge request was not found. reload to check its state.", back))
	139	+	return
	140	+	}
123	141		s.write(ctx, w, r, http.StatusNotFound, s.notFoundPage())
124	142		case errors.Is(err, domain.ErrAlreadyExists):
125	143		s.reject(ctx, w, r, http.StatusConflict, "already there", rule(msg, "this already exists."), back)

@@ -143,6 +161,10 @@ func (s Server) internalFailure(ctx context.Context, w http.ResponseWriter, r
143	161		log := zerowrap.FromCtx(ctx)
144	162		log.Error().Err(err).Str("request_id", id).Str("path", logPath(r.URL.Path)).Msg("web action failed")
145	163		w.Header().Set("Cache-Control", "no-store")
	164	+	if isHXMerge(r) {
	165	+	s.write(ctx, w, r, http.StatusInternalServerError, MRActionStatus("the merge could not be completed. reload to check its state. reference: "+id, strings.TrimSuffix(r.URL.Path, "/merge")))
	166	+	return
	167	+	}
146	168		s.write(ctx, w, r, http.StatusInternalServerError, s.errorPage(id))
147	169		}
148	170

@@ -161,6 +183,11 @@ func (s Server) reject(ctx context.Context, w http.ResponseWriter, r http.Requ
161	183		if back == "" {
162	184		back = "/"
163	185		}
	186	+	if isHXMerge(r) {
	187	+	w.Header().Set("Cache-Control", "no-store")
	188	+	s.write(ctx, w, r, status, MRActionStatus(line, back))
	189	+	return
	190	+	}
164	191		l := s.stateLayout(title, []Crumb{{Label: title, Current: true}})
165	192		w.Header().Set("Cache-Control", "no-store")
166	193		s.write(ctx, w, r, status, State(l, StatePage{

@@ -523,3 +550,8 @@ func (s Server) mrDeleteComment(ctx context.Context, r http.Request) (string,
523	550		c, err := s.cfg.MergeRequests.DeleteComment(ctx, principal(ctx), name, n, commentID(r.PathValue("id")))
524	551		return back + "#c" + strconv.FormatInt(c.ID, 10), back, err
525	552		}
	553	+
	554	+	// isHXMerge limits fragment responses to the progressively enhanced merge form.
	555	+	func isHXMerge(r *http.Request) bool {
	556	+	return r.Header.Get("HX-Request") == "true" && strings.HasSuffix(r.URL.Path, "/merge")
	557	+	}

 			s.actionFailed(ctx, w, r, err, back)
 			return
 		}
+		if isHXMerge(r) {
+			c, _, err := s.mrPageView(ctx, r, false, true)
+			if err != nil {
+				id := requestID()
+				log := zerowrap.FromCtx(ctx)
+				log.Error().Err(err).Str("request_id", id).Msg("web merged state failed")
+				w.Header().Set("Cache-Control", "no-store")
+				s.write(ctx, w, r, http.StatusOK, MRActionStatus("merged, but the updated page could not be loaded. reload to see the result. reference: "+id, back))
+				return
+			}
+			w.Header().Set("Cache-Control", "no-store")
+			s.write(ctx, w, r, http.StatusOK, c)
+			return
+		}
 		seeOther(w, r, to)
 	}
 }
 // It reports false when the page cannot be built; the caller then answers as
 // for any refused action.
 func (s *Server) rerenderMR(ctx context.Context, w http.ResponseWriter, r *http.Request, re *rerender) bool {
-	c, _, err := s.mrPage(withMergeError(ctx, re.msg), r, false)
+	c, _, err := s.mrPageView(withMergeError(ctx, re.msg), r, false, isHXMerge(r))
 	if err != nil {
 		return false
 	}
 		// The browser is gone.
 	case errors.Is(err, domain.ErrNotFound):
 		w.Header().Set("Cache-Control", "no-store")
+		if isHXMerge(r) {
+			s.write(ctx, w, r, http.StatusNotFound, MRActionStatus("the merge request was not found. reload to check its state.", back))
+			return
+		}
 		s.write(ctx, w, r, http.StatusNotFound, s.notFoundPage())
 	case errors.Is(err, domain.ErrAlreadyExists):
 		s.reject(ctx, w, r, http.StatusConflict, "already there", rule(msg, "this already exists."), back)
 	log := zerowrap.FromCtx(ctx)
 	log.Error().Err(err).Str("request_id", id).Str("path", logPath(r.URL.Path)).Msg("web action failed")
 	w.Header().Set("Cache-Control", "no-store")
+	if isHXMerge(r) {
+		s.write(ctx, w, r, http.StatusInternalServerError, MRActionStatus("the merge could not be completed. reload to check its state. reference: "+id, strings.TrimSuffix(r.URL.Path, "/merge")))
+		return
+	}
 	s.write(ctx, w, r, http.StatusInternalServerError, s.errorPage(id))
 }
 	if back == "" {
 		back = "/"
 	}
+	if isHXMerge(r) {
+		w.Header().Set("Cache-Control", "no-store")
+		s.write(ctx, w, r, status, MRActionStatus(line, back))
+		return
+	}
 	l := s.stateLayout(title, []Crumb{{Label: title, Current: true}})
 	w.Header().Set("Cache-Control", "no-store")
 	s.write(ctx, w, r, status, State(l, StatePage{
 	c, err := s.cfg.MergeRequests.DeleteComment(ctx, principal(ctx), name, n, commentID(r.PathValue("id")))
 	return back + "#c" + strconv.FormatInt(c.ID, 10), back, err
 }
+// isHXMerge limits fragment responses to the progressively enhanced merge form.
+func isHXMerge(r *http.Request) bool {
+	return r.Header.Get("HX-Request") == "true" && strings.HasSuffix(r.URL.Path, "/merge")
+}

M internal/adapters/web/mr_templ.go +1226 -1034 generated file: collapsed

load diff

M internal/adapters/web/overlays.templ +0 -3


@@ -27,9 +27,6 @@ templ OverlayHelp(mr bool) {
27	27		<div><dt><kbd>/</kbd></dt><dd>filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)</dd></div>
28	28		<div><dt><kbd>b</kbd></dt><dd>{ "switch" } branch or tag</dd></div>
29	29		<div><dt><kbd>s</kbd> <kbd>t</kbd> <kbd>c</kbd> <kbd>r</kbd> <kbd>m</kbd> <kbd>i</kbd></dt><dd>tabs: summary, files, commits, branches & tags, merge requests, issues</dd></div>
30		-	if SignedIn(ctx) {
31		-	<div><dt><kbd>I</kbd></dt><dd>inbox</dd></div>
32		-	}
33	30		<div><dt><kbd>g h</kbd></dt><dd>home</dd></div>
34	31		<div><dt><kbd>w</kbd></dt><dd>wide mode: use the whole width of the screen, or not (remembered)</dd></div>
35	32		<div><dt><kbd>y</kbd></dt><dd>copy a permalink pinned to the commit</dd></div>


@@ -27,9 +27,6 @@ templ OverlayHelp(mr bool) {
27		<div><dt><kbd>/</kbd></dt><dd>filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)</dd></div>	27	<div><dt><kbd>/</kbd></dt><dd>filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)</dd></div>
28		<div><dt><kbd>b</kbd></dt><dd>{ "switch" } branch or tag</dd></div>	28	<div><dt><kbd>b</kbd></dt><dd>{ "switch" } branch or tag</dd></div>
29		<div><dt><kbd>s</kbd> <kbd>t</kbd> <kbd>c</kbd> <kbd>r</kbd> <kbd>m</kbd> <kbd>i</kbd></dt><dd>tabs: summary, files, commits, branches & tags, merge requests, issues</dd></div>	29	<div><dt><kbd>s</kbd> <kbd>t</kbd> <kbd>c</kbd> <kbd>r</kbd> <kbd>m</kbd> <kbd>i</kbd></dt><dd>tabs: summary, files, commits, branches & tags, merge requests, issues</dd></div>
30	-	if SignedIn(ctx) {
31	-	<div><dt><kbd>I</kbd></dt><dd>inbox</dd></div>
32	-	}
33		<div><dt><kbd>g h</kbd></dt><dd>home</dd></div>	30	<div><dt><kbd>g h</kbd></dt><dd>home</dd></div>
34		<div><dt><kbd>w</kbd></dt><dd>wide mode: use the whole width of the screen, or not (remembered)</dd></div>	31	<div><dt><kbd>w</kbd></dt><dd>wide mode: use the whole width of the screen, or not (remembered)</dd></div>
35		<div><dt><kbd>y</kbd></dt><dd>copy a permalink pinned to the commit</dd></div>	32	<div><dt><kbd>y</kbd></dt><dd>copy a permalink pinned to the commit</dd></div>

M internal/adapters/web/overlays_templ.go +39 -49 generated file: collapsed

load diff

M internal/adapters/web/session.go +12 -2


@@ -178,11 +178,11 @@ func (s Server) gate(w http.ResponseWriter, r http.Request) bool {
178	178		// Host header, which the client chooses. A missing header, "null" and any
179	179		// other origin are refused.
180	180		if r.Header.Get("Origin") != s.origin {
181		-	denyForbidden(w)
	181	+	s.denyMergeGate(w, r, "the request origin was not accepted. reload this page and try again.")
182	182		return false
183	183		}
184	184		if !SignedIn(r.Context()) && !s.anonymousPost(r) {
185		-	denyForbidden(w)
	185	+	s.denyMergeGate(w, r, "your session has expired. sign in again and reload.")
186	186		return false
187	187		}
188	188		return true

@@ -335,3 +335,13 @@ func (s *Server) loginRejectedPage() templ.Component {
335	335		return s.stateOnly("sign in", "404", "login link not valid",
336	336		"this link has expired, was already used, or never existed.", "run `ermite web login` for a new one.")
337	337		}
	338	+
	339	+	// denyMergeGate keeps gate refusals visible to the enhanced merge form.
	340	+	func (s Server) denyMergeGate(w http.ResponseWriter, r http.Request, message string) {
	341	+	if !isHXMerge(r) {
	342	+	denyForbidden(w)
	343	+	return
	344	+	}
	345	+	w.Header().Set("Cache-Control", "no-store")
	346	+	s.write(r.Context(), w, r, http.StatusForbidden, MRActionStatus(message, strings.TrimSuffix(r.URL.Path, "/merge")))
	347	+	}

 	// Host header, which the client chooses. A missing header, "null" and any
 	// other origin are refused.
 	if r.Header.Get("Origin") != s.origin {
-		denyForbidden(w)
+		s.denyMergeGate(w, r, "the request origin was not accepted. reload this page and try again.")
 		return false
 	}
 	if !SignedIn(r.Context()) && !s.anonymousPost(r) {
-		denyForbidden(w)
+		s.denyMergeGate(w, r, "your session has expired. sign in again and reload.")
 		return false
 	}
 	return true
 	return s.stateOnly("sign in", "404", "login link not valid",
 		"this link has expired, was already used, or never existed.", "run `ermite web login` for a new one.")
 }
+// denyMergeGate keeps gate refusals visible to the enhanced merge form.
+func (s *Server) denyMergeGate(w http.ResponseWriter, r *http.Request, message string) {
+	if !isHXMerge(r) {
+		denyForbidden(w)
+		return
+	}
+	w.Header().Set("Cache-Control", "no-store")
+	s.write(r.Context(), w, r, http.StatusForbidden, MRActionStatus(message, strings.TrimSuffix(r.URL.Path, "/merge")))
+}

M internal/adapters/web/shell.templ +1 -5


@@ -67,9 +67,6 @@ templ Shell(l Layout, rail templ.Component) {
67	67		</div>
68	68		@Footer(l)
69	69		@Hint(l)
70		-	if SignedIn(ctx) {
71		-	<a hidden data-inbox href={ inboxPath }>Inbox</a>
72		-	}
73	70		@OverlayHelp(l.MR)
74	71		@OverlayRefs(l)
75	72		@OverlayCmd(l.Cmd)

@@ -90,8 +87,7 @@ templ Header(l Layout) {
90	87		<a
91	88		class="btn inbox-btn"
92	89		href={ templ.SafeURL(l.Inbox.Href) }
93		-	title="inbox (I)"
94		-	aria-keyshortcuts="Shift+I"
	90	+	title="inbox"
95	91		>
96	92		<span class="ico i-mailbox" aria-hidden="true"></span>
97	93		Inbox

 			</div>
 			@Footer(l)
 			@Hint(l)
-			if SignedIn(ctx) {
-				<a hidden data-inbox href={ inboxPath }>Inbox</a>
-			}
 			@OverlayHelp(l.MR)
 			@OverlayRefs(l)
 			@OverlayCmd(l.Cmd)
 				<a
 					class="btn inbox-btn"
 					href={ templ.SafeURL(l.Inbox.Href) }
-					title="inbox (I)"
+					title="inbox"
-					aria-keyshortcuts="Shift+I"
 				>
 					<span class="ico i-mailbox" aria-hidden="true"></span>
 					Inbox

M internal/adapters/web/shell_templ.go +133 -152 generated file: collapsed

load diff

M internal/adapters/web/static/css/60-mr.css +2 -0

@@ -1,6 +1,8 @@
1	1		@layer components {
2	2		/* merge requests: the review page. Hue only where it carries a verdict. */
3	3		.mr-h .show-kv { margin-top: 0; }
	4	+	#merge-menu .htmx-indicator { display: none; }
	5	+	#merge-menu .htmx-request .htmx-indicator { display: inline; }
4	6		/* one card: the header (title, facts) a shade lighter, the description below */
5	7		.mr-card {
6	8		background: var(--bg-surface); border: 1px solid var(--border); border-radius: var(--r); overflow: hidden;

@@ -1,6 +1,8 @@
1	@layer components {	1		@layer components {
2	/* merge requests: the review page. Hue only where it carries a verdict. */	2		/* merge requests: the review page. Hue only where it carries a verdict. */
3	.mr-h .show-kv { margin-top: 0; }	3		.mr-h .show-kv { margin-top: 0; }
		4	+	#merge-menu .htmx-indicator { display: none; }
		5	+	#merge-menu .htmx-request .htmx-indicator { display: inline; }
4	/* one card: the header (title, facts) a shade lighter, the description below */	6		/* one card: the header (title, facts) a shade lighter, the description below */
5	.mr-card {	7		.mr-card {
6	background: var(--bg-surface); border: 1px solid var(--border); border-radius: var(--r); overflow: hidden;	8		background: var(--bg-surface); border: 1px solid var(--border); border-radius: var(--r); overflow: hidden;

M internal/adapters/web/static/js/ermite.js +2 -2


@@ -612,7 +612,7 @@
612	612
613	613		// 1. Keys.
614	614		const single = { j: 'j', k: 'k', G: 'bottom', '/': 'filter', '?': 'help', b: 'refs', f: 'cmd', ':': 'cmd', y: 'permalink',
615		-	s: 's', t: 't', c: 'c', r: 'r', m: 'm', i: 'i', I: 'inbox', n: 'next', h: 'left', l: 'right', d: 'split', u: 'unified', x: 'collapse', w: 'wide', e: 'expand', E: 'expandAll', Enter: 'open', Escape: 'esc',
	615	+	s: 's', t: 't', c: 'c', r: 'r', m: 'm', i: 'i', n: 'next', h: 'left', l: 'right', d: 'split', u: 'unified', x: 'collapse', w: 'wide', e: 'expand', E: 'expandAll', Enter: 'open', Escape: 'esc',
616	616		// the merge request page (mr.js): the merge menu, mark read
617	617		M: 'merge', R: 'read' };
618	618		// "g t" is the key "t": the tabs have one event each.

@@ -654,7 +654,7 @@
654	654		// page-level keys, as on the other lists.
655	655		if (!e.shiftKey && e.target.closest?.('#tree-rows') && window.ermiteTree?.arrow(e.key)) { e.preventDefault(); return; }
656	656		const name = single[e.key];
657		-	if (!name \|\| (name === 'inbox' && !$('[data-inbox]'))) return;
	657	+	if (!name) return;
658	658		if (e.key !== 'Enter' \|\| !$('dialog[open]')) e.preventDefault();
659	659		ermite.fire(name);
660	660		});


@@ -612,7 +612,7 @@
612			612
613		// 1. Keys.	613		// 1. Keys.
614		const single = { j: 'j', k: 'k', G: 'bottom', '/': 'filter', '?': 'help', b: 'refs', f: 'cmd', ':': 'cmd', y: 'permalink',	614		const single = { j: 'j', k: 'k', G: 'bottom', '/': 'filter', '?': 'help', b: 'refs', f: 'cmd', ':': 'cmd', y: 'permalink',
615	-	s: 's', t: 't', c: 'c', r: 'r', m: 'm', i: 'i', I: 'inbox', n: 'next', h: 'left', l: 'right', d: 'split', u: 'unified', x: 'collapse', w: 'wide', e: 'expand', E: 'expandAll', Enter: 'open', Escape: 'esc',	615	+	s: 's', t: 't', c: 'c', r: 'r', m: 'm', i: 'i', n: 'next', h: 'left', l: 'right', d: 'split', u: 'unified', x: 'collapse', w: 'wide', e: 'expand', E: 'expandAll', Enter: 'open', Escape: 'esc',
616		// the merge request page (mr.js): the merge menu, mark read	616		// the merge request page (mr.js): the merge menu, mark read
617		M: 'merge', R: 'read' };	617		M: 'merge', R: 'read' };
618		// "g t" is the key "t": the tabs have one event each.	618		// "g t" is the key "t": the tabs have one event each.

@@ -654,7 +654,7 @@
654		// page-level keys, as on the other lists.	654		// page-level keys, as on the other lists.
655		if (!e.shiftKey && e.target.closest?.('#tree-rows') && window.ermiteTree?.arrow(e.key)) { e.preventDefault(); return; }	655		if (!e.shiftKey && e.target.closest?.('#tree-rows') && window.ermiteTree?.arrow(e.key)) { e.preventDefault(); return; }
656		const name = single[e.key];	656		const name = single[e.key];
657	-	if (!name \|\| (name === 'inbox' && !$('[data-inbox]'))) return;	657	+	if (!name) return;
658		if (e.key !== 'Enter' \|\| !$('dialog[open]')) e.preventDefault();	658		if (e.key !== 'Enter' \|\| !$('dialog[open]')) e.preventDefault();
659		ermite.fire(name);	659		ermite.fire(name);
660		});	660		});

M internal/adapters/web/static/js/mr.js +3 -3

show this file

M internal/app/forge.go +1 -1

show this file

M internal/app/testdata/web/blob-binary.html +0 -1

show this file

M internal/app/testdata/web/blob-code.html +0 -1

show this file

M internal/app/testdata/web/blob-empty.html +0 -1

show this file

M internal/app/testdata/web/blob-image.html +0 -1

show this file

M internal/app/testdata/web/blob-markdown.html +0 -1

show this file

M internal/app/testdata/web/blob-svg.html +0 -1

show this file

M internal/app/testdata/web/blob-text.html +0 -1

show this file

M internal/app/testdata/web/blob-too-large.html +0 -1

show this file

M internal/app/testdata/web/blob-trojan.html +0 -1

show this file

M internal/app/testdata/web/commit-big.html +0 -1

show this file

M internal/app/testdata/web/commit-binary.html +0 -1

show this file

M internal/app/testdata/web/commit-merge.html +0 -1

show this file

M internal/app/testdata/web/commit-modify-split.html +0 -1

show this file

M internal/app/testdata/web/commit-modify.html +0 -1

show this file

M internal/app/testdata/web/commit-rename.html +0 -1

show this file

M internal/app/testdata/web/commit-root.html +0 -1

show this file

M internal/app/testdata/web/commit-trojan.html +0 -1

show this file

M internal/app/testdata/web/commits-page2.html +0 -1

show this file

M internal/app/testdata/web/commits-path.html +0 -1

show this file

M internal/app/testdata/web/commits-root.html +0 -1

show this file

M internal/app/testdata/web/commits-small.html +0 -1

show this file

M internal/app/testdata/web/empty.html +0 -1

show this file

M internal/app/testdata/web/home.html +0 -1

show this file

M internal/app/testdata/web/not-found-page.html +0 -1

show this file

M internal/app/testdata/web/not-found.html +0 -1

show this file

M internal/app/testdata/web/refs.html +0 -1

show this file

M internal/app/testdata/web/summary.html +0 -1

show this file

M internal/app/testdata/web/tree-nested.html +0 -1

show this file

M internal/app/testdata/web/tree-root.html +0 -1

show this file

M internal/app/testdata/web/tree-slash-ref.html +0 -1

show this file

M internal/app/testdata/web/tree-subdir.html +0 -1

show this file

M internal/app/web_inbox_test.go +2 -32

show this file

M internal/ports/dto.go +3 -6

show this file

M internal/usecase/events.go +2 -2

show this file

M internal/usecase/inbox.go +2 -31

show this file

M internal/usecase/inbox_test.go +0 -33

show this file

M skills/ermite/SKILL.md +0 -13

show this file

Merge settings

Comments0 open / 0

Commit	Subject	Author	Date	Signature	Status
e9c6360	fix(web): show session refusals in the async merge box and keep a single merge error alert	brice	12h ago	GPG Verified
5fea81f	feat(web): merge merge requests asynchronously with htmx and live state updates	brice	12h ago	GPG Verified