From f361f29e1420e86e42a76c849b30999c4b2ebf6f Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Sun, 1 Jun 2025 13:08:14 +0100
Subject: [PATCH] appview: pulls: group stacked pulls in all-pulls view
Change-Id: ykwytywspowpxxvpornqsnzwztywnyol

the pull listing should be less noisy now.

Signed-off-by: oppiliappan <me@oppi.li>
---
 appview/pages/pages.go                        |  1 +
 appview/pages/templates/repo/pulls/pulls.html | 38 ++++++++++++++++++-
 appview/pulls/pulls.go                        | 23 +++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index acea227..67a7583 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -721,6 +721,7 @@ type RepoPullsParams struct {
 	Active       string
 	DidHandleMap map[string]string
 	FilteringBy  db.PullState
+	Stacks       map[string]db.Stack
 }
 
 func (p *Pages) RepoPulls(w io.Writer, params RepoPullsParams) error {
diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html
index ea5c9ea..f9afe60 100644
--- a/appview/pages/templates/repo/pulls/pulls.html
+++ b/appview/pages/templates/repo/pulls/pulls.html
@@ -46,7 +46,8 @@
 {{ define "repoAfter" }}
     <div class="flex flex-col gap-2 mt-2">
         {{ range .Pulls }}
-            <div class="rounded drop-shadow-sm bg-white dark:bg-gray-800 px-6 py-4">
+          <div class="rounded bg-white dark:bg-gray-800">
+            <div class="px-6 py-4 z-5">
                 <div class="pb-2">
                     <a href="/{{ $.RepoInfo.FullName }}/pulls/{{ .PullId }}" class="dark:text-white">
                         {{ .Title }}
@@ -123,7 +124,42 @@
                         {{ end }}
                     </span>
                 </p>
+              </div>
+              {{ if .StackId }}
+                {{ $otherPulls := index $.Stacks .StackId }}
+                <details class="bg-white dark:bg-gray-800 group">
+                  <summary class="pb-4 px-6 text-xs list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">
+                    {{ $s := "s" }}
+                    {{ if eq (len $otherPulls) 1 }}
+                      {{ $s = "" }}
+                    {{ end }}
+                    <div class="group-open:hidden flex items-center gap-2">
+                      {{ i "chevrons-up-down" "w-4 h-4" }} expand {{ len $otherPulls }} pull{{$s}} in this stack
+                    </div>
+                    <div class="hidden group-open:flex items-center gap-2">
+                      {{ i "chevrons-down-up" "w-4 h-4" }} hide {{ len $otherPulls }} pull{{$s}} in this stack
+                    </div>
+                  </summary>
+                  {{ block "pullList" (list $otherPulls $) }} {{ end }}
+                </details>
+              {{ end }}
             </div>
         {{ end }}
     </div>
 {{ end }}
+
+{{ define "pullList" }}
+  {{ $list := index . 0 }}
+  {{ $root := index . 1 }}
+  <div class="grid grid-cols-1 rounded-b border-b border-t border-gray-200 dark:border-gray-900 divide-y divide-gray-200 dark:divide-gray-900">
+    {{ range $pull := $list }}
+      <a href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $pull.PullId }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25">
+        <div class="flex gap-2 items-center px-6">
+          <div class="flex-grow min-w-0 w-full py-2">
+            {{ template "repo/pulls/fragments/summarizedHeader" $pull }}
+          </div>
+        </div>
+      </a>
+    {{ end }}
+  </div>
+{{ end }}
diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go
index 6cbd3c6..abc59a9 100644
--- a/appview/pulls/pulls.go
+++ b/appview/pulls/pulls.go
@@ -495,6 +495,28 @@ func (s *Pulls) RepoPulls(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	// we want to group all stacked PRs into just one list
+	stacks := make(map[string]db.Stack)
+	n := 0
+	for _, p := range pulls {
+		// this PR is stacked
+		if p.StackId != "" {
+			// we have already seen this PR stack
+			if _, seen := stacks[p.StackId]; seen {
+				stacks[p.StackId] = append(stacks[p.StackId], p)
+				// skip this PR
+			} else {
+				stacks[p.StackId] = nil
+				pulls[n] = p
+				n++
+			}
+		} else {
+			pulls[n] = p
+			n++
+		}
+	}
+	pulls = pulls[:n]
+
 	identsToResolve := make([]string, len(pulls))
 	for i, pull := range pulls {
 		identsToResolve[i] = pull.OwnerDid
@@ -515,6 +537,7 @@ func (s *Pulls) RepoPulls(w http.ResponseWriter, r *http.Request) {
 		Pulls:        pulls,
 		DidHandleMap: didHandleMap,
 		FilteringBy:  state,
+		Stacks:       stacks,
 	})
 	return
 }
-- 
2.43.0