From 868830262093aaacdd14a246fec11b7071cc34e2 Mon Sep 17 00:00:00 2001
From: Akshay <nerdy@peppe.rs>
Date: Tue, 22 Apr 2025 10:18:04 +0100
Subject: [PATCH] appview: fix pull header template

---
 appview/db/pulls.go                           | 12 ++++++++++
 appview/pages/pages.go                        | 15 ++++++------
 .../repo/pulls/fragments/pullHeader.html      | 16 ++++++-------
 appview/pages/templates/repo/pulls/pull.html  | 10 +++++---
 appview/state/pull.go                         | 24 +++++--------------
 5 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/appview/db/pulls.go b/appview/db/pulls.go
index ac35efaf..f2774b7e 100644
--- a/appview/db/pulls.go
+++ b/appview/db/pulls.go
@@ -654,6 +654,18 @@ func GetPull(e Execer, repoAt syntax.ATURI, pullId int) (*Pull, error) {
 		return nil, err
 	}
 
+	var pullSourceRepo *Repo
+	if pull.PullSource != nil {
+		if pull.PullSource.RepoAt != nil {
+			pullSourceRepo, err = GetRepoByAtUri(e, pull.PullSource.RepoAt.String())
+			if err != nil {
+				log.Printf("failed to get repo by at uri: %v", err)
+			} else {
+				pull.PullSource.Repo = pullSourceRepo
+			}
+		}
+	}
+
 	pull.Submissions = make([]*PullSubmission, len(submissionsMap))
 	for _, submission := range submissionsMap {
 		pull.Submissions[submission.RoundNumber] = submission
diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 93e8117d..14075bd4 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -679,14 +679,13 @@ func (r ResubmitResult) Unknown() bool {
 }
 
 type RepoSinglePullParams struct {
-	LoggedInUser   *auth.User
-	RepoInfo       RepoInfo
-	Active         string
-	DidHandleMap   map[string]string
-	Pull           *db.Pull
-	PullSourceRepo *db.Repo
-	MergeCheck     types.MergeCheckResponse
-	ResubmitCheck  ResubmitResult
+	LoggedInUser  *auth.User
+	RepoInfo      RepoInfo
+	Active        string
+	DidHandleMap  map[string]string
+	Pull          *db.Pull
+	MergeCheck    types.MergeCheckResponse
+	ResubmitCheck ResubmitResult
 }
 
 func (p *Pages) RepoSinglePull(w io.Writer, params RepoSinglePullParams) error {
diff --git a/appview/pages/templates/repo/pulls/fragments/pullHeader.html b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
index 5dbac400..49a2498a 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullHeader.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
@@ -43,16 +43,16 @@
             </span>
             {{ if not .Pull.IsPatchBased }}
             <span>from
-              {{ if not .Pull.IsBranchBased }}
-                <a href="/{{ $owner }}/{{ .PullSourceRepo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSourceRepo.Name }}</a>
+              {{ if .Pull.IsForkBased }}
+                {{ if .Pull.PullSource.Repo }}
+                <a href="/{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}</a>
+                {{ else }}
+                <span class="italic">[deleted fork]</span>
+                {{ end }}
               {{ end }}
 
-              {{ $fullRepo := .RepoInfo.FullName }}
-              {{ if not .Pull.IsBranchBased }}
-                {{ $fullRepo = printf "%s/%s" $owner .PullSourceRepo.Name }}
-              {{ end }}
               <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">
-                <a href="/{{ $fullRepo }}/tree/{{ .Pull.PullSource.Branch }}" class="no-underline hover:underline">{{ .Pull.PullSource.Branch }}</a>
+                {{ .Pull.PullSource.Branch }}
               </span>
             </span>
             {{ end }}
@@ -67,4 +67,4 @@
 </section>
 
 
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/appview/pages/templates/repo/pulls/pull.html b/appview/pages/templates/repo/pulls/pull.html
index d692e3b7..1b2f5596 100644
--- a/appview/pages/templates/repo/pulls/pull.html
+++ b/appview/pages/templates/repo/pulls/pull.html
@@ -90,10 +90,14 @@
                  <div class="text-sm text-gray-500 dark:text-gray-400">
                    {{ if not $.Pull.IsPatchBased }}
                      {{ $fullRepo := $.RepoInfo.FullName }}
-                     {{ if not $.Pull.IsBranchBased }}
-                       {{ $fullRepo = printf "%s/%s" $owner $.PullSourceRepo.Name }}
+                     {{ if $.Pull.IsForkBased }}
+                        {{ if $.Pull.PullSource.Repo }}
+                          {{ $fullRepo = printf "%s/%s" $owner $.Pull.PullSource.Repo.Name }}
+                          <a href="/{{ $fullRepo }}/commit/{{ .SHA }}" class="font-mono text-gray-500 dark:text-gray-400">{{ slice .SHA 0 8 }}</a>
+                        {{ else }}
+                          <span class="font-mono">{{ slice .SHA 0 8 }}</span>
+                        {{ end }}
                      {{ end }}
-                     <a href="/{{ $fullRepo }}/commit/{{ .SHA }}" class="font-mono text-gray-500 dark:text-gray-400">{{ slice .SHA 0 8 }}</a>
                    {{ else }}
                      <span class="font-mono">{{ slice .SHA 0 8 }}</span>
                    {{ end }}
diff --git a/appview/state/pull.go b/appview/state/pull.go
index 994fe4ed..fc1e07df 100644
--- a/appview/state/pull.go
+++ b/appview/state/pull.go
@@ -120,25 +120,13 @@ func (s *State) RepoSinglePull(w http.ResponseWriter, r *http.Request) {
 		resubmitResult = s.resubmitCheck(f, pull)
 	}
 
-	var pullSourceRepo *db.Repo
-	if pull.PullSource != nil {
-		if pull.PullSource.RepoAt != nil {
-			pullSourceRepo, err = db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())
-			if err != nil {
-				log.Printf("failed to get repo by at uri: %v", err)
-				return
-			}
-		}
-	}
-
 	s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{
-		LoggedInUser:   user,
-		RepoInfo:       f.RepoInfo(s, user),
-		DidHandleMap:   didHandleMap,
-		Pull:           pull,
-		PullSourceRepo: pullSourceRepo,
-		MergeCheck:     mergeCheckResponse,
-		ResubmitCheck:  resubmitResult,
+		LoggedInUser:  user,
+		RepoInfo:      f.RepoInfo(s, user),
+		DidHandleMap:  didHandleMap,
+		Pull:          pull,
+		MergeCheck:    mergeCheckResponse,
+		ResubmitCheck: resubmitResult,
 	})
 }
 
-- 
2.51.2