From 6e824ad96ef193071c2c3f6a22a8ae89c1117d71 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Thu, 10 Jul 2025 23:37:12 +0100 Subject: [PATCH] appview: show pipeline status indicators on PR stacks Change-Id: snssmzxqqmmoyrzzwlmxttkwmsnonvmm Signed-off-by: oppiliappan --- .../repo/pulls/fragments/pullStack.html | 5 +- .../pulls/fragments/summarizedPullHeader.html | 62 +++++++++++-------- appview/pages/templates/repo/pulls/pulls.html | 2 +- appview/pulls/pulls.go | 6 ++ 4 files changed, 46 insertions(+), 29 deletions(-) diff --git a/appview/pages/templates/repo/pulls/fragments/pullStack.html b/appview/pages/templates/repo/pulls/fragments/pullStack.html index 9543a21..4de5e43 100644 --- a/appview/pages/templates/repo/pulls/fragments/pullStack.html +++ b/appview/pages/templates/repo/pulls/fragments/pullStack.html @@ -10,7 +10,7 @@ {{ i "chevrons-down-up" "w-4 h-4" }} STACK - {{ len .Stack }} + {{ len .Stack }} {{ block "pullList" (list .Stack $) }} {{ end }} @@ -41,6 +41,7 @@
{{ range $pull := $list }} {{ $isCurrent := false }} + {{ $pipeline := index $root.Pipelines $pull.LatestSha }} {{ with $root.Pull }} {{ $isCurrent = eq $pull.PullId $root.Pull.PullId }} {{ end }} @@ -52,7 +53,7 @@
{{ end }}
- {{ template "repo/pulls/fragments/summarizedHeader" $pull }} + {{ template "repo/pulls/fragments/summarizedHeader" (list $pull $pipeline) }}
diff --git a/appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html b/appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html index ca855b1..964dc98 100644 --- a/appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html +++ b/appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html @@ -1,32 +1,42 @@ {{ define "repo/pulls/fragments/summarizedHeader" }} -
-
-
- {{ template "repo/pulls/fragments/summarizedPullState" .State }} + {{ $pull := index . 0 }} + {{ $pipeline := index . 1 }} + {{ with $pull }} +
+
+
+ {{ template "repo/pulls/fragments/summarizedPullState" .State }} +
+ + #{{ .PullId }} + {{ .Title }} +
- - #{{ .PullId }} - {{ .Title }} - -
-
- {{ $latestRound := .LastRoundNumber }} - {{ $lastSubmission := index .Submissions $latestRound }} - {{ $commentCount := len $lastSubmission.Comments }} - -
- {{ i "message-square" "w-3 h-3 md:hidden" }} - {{ $commentCount }} - -
- - - - - #{{ $latestRound }} - +
+ {{ $latestRound := .LastRoundNumber }} + {{ $lastSubmission := index .Submissions $latestRound }} + {{ $commentCount := len $lastSubmission.Comments }} + {{ if $pipeline }} +
+ {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }} + +
+ {{ end }} + +
+ {{ i "message-square" "w-3 h-3 md:hidden" }} + {{ $commentCount }} + +
+ + + + + #{{ $latestRound }} + +
-
+ {{ end }} {{ end }} diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html index ddf63b1..2c46070 100644 --- a/appview/pages/templates/repo/pulls/pulls.html +++ b/appview/pages/templates/repo/pulls/pulls.html @@ -156,7 +156,7 @@
- {{ template "repo/pulls/fragments/summarizedHeader" $pull }} + {{ template "repo/pulls/fragments/summarizedHeader" (list $pull 0) }}
diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go index d05facf..37e82c8 100644 --- a/appview/pulls/pulls.go +++ b/appview/pulls/pulls.go @@ -175,6 +175,12 @@ func (s *Pulls) RepoSinglePull(w http.ResponseWriter, r *http.Request) { for _, s := range pull.Submissions { shas = append(shas, s.SourceRev) } + for _, p := range stack { + shas = append(shas, p.LatestSha()) + } + for _, p := range abandonedPulls { + shas = append(shas, p.LatestSha()) + } ps, err := db.GetPipelineStatuses( s.db, -- 2.43.0