Monorepo for Tangled tangled.org

appview: pull: show resubmit status to all users

any viewer should be able to tell if a PR is outdated.

Signed-off-by: oppiliappan <me@oppi.li>

Changed files
+4 -11
appview
pages
templates
repo
pulls
pulls
+2 -1
appview/pages/templates/repo/pulls/pull.html
··· 250 {{ end }} 251 252 {{ define "resubmitStatus" }} 253 {{ if .ResubmitCheck.Yes }} 254 <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 255 <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> 256 {{ i "triangle-alert" "w-4 h-4" }} 257 - <span class="font-medium">this branch has been updated, consider resubmitting</span> 258 </div> 259 </div> 260 {{ end }}
··· 250 {{ end }} 251 252 {{ define "resubmitStatus" }} 253 + {{ $isAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Pull.OwnerDid) }} 254 {{ if .ResubmitCheck.Yes }} 255 <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 256 <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> 257 {{ i "triangle-alert" "w-4 h-4" }} 258 + <span class="font-medium">this branch has been updated<span class="{{if not $isAuthor}}hidden{{end}}">, consider resubmitting<span></span> 259 </div> 260 </div> 261 {{ end }}
+2 -10
appview/pulls/pulls.go
··· 95 } 96 97 mergeCheckResponse := s.mergeCheck(f, pull, stack) 98 - resubmitResult := pages.Unknown 99 - if user.Did == pull.OwnerDid { 100 - resubmitResult = s.resubmitCheck(f, pull, stack) 101 - } 102 103 s.pages.PullActionsFragment(w, pages.PullActionsParams{ 104 LoggedInUser: user, ··· 160 } 161 162 mergeCheckResponse := s.mergeCheck(f, pull, stack) 163 - resubmitResult := pages.Unknown 164 - if user != nil && user.Did == pull.OwnerDid { 165 - resubmitResult = s.resubmitCheck(f, pull, stack) 166 - } 167 168 s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 169 LoggedInUser: user, ··· 290 top := stack[0] 291 latestSourceRev = top.Submissions[top.LastRoundNumber()].SourceRev 292 } 293 - 294 - log.Println(latestSourceRev, result.Branch.Hash) 295 296 if latestSourceRev != result.Branch.Hash { 297 return pages.ShouldResubmit
··· 95 } 96 97 mergeCheckResponse := s.mergeCheck(f, pull, stack) 98 + resubmitResult := s.resubmitCheck(f, pull, stack) 99 100 s.pages.PullActionsFragment(w, pages.PullActionsParams{ 101 LoggedInUser: user, ··· 157 } 158 159 mergeCheckResponse := s.mergeCheck(f, pull, stack) 160 + resubmitResult := s.resubmitCheck(f, pull, stack) 161 162 s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 163 LoggedInUser: user, ··· 284 top := stack[0] 285 latestSourceRev = top.Submissions[top.LastRoundNumber()].SourceRev 286 } 287 288 if latestSourceRev != result.Branch.Hash { 289 return pages.ShouldResubmit