forked from tangled.org/core
Monorepo for Tangled — https://tangled.org
at interdiff 10 kB view raw
1{{ define "title" }} 2 {{ .Pull.Title }} &middot; pull #{{ .Pull.PullId }} &middot; {{ .RepoInfo.FullName }} 3{{ end }} 4 5{{ define "repoContent" }} 6 {{ template "repo/pulls/fragments/pullHeader" . }} 7{{ end }} 8 9{{ define "repoAfter" }} 10 <section id="submissions" class="mt-4"> 11 <div class="flex flex-col gap-4"> 12 {{ block "submissions" . }} {{ end }} 13 </div> 14 </section> 15 16 <div id="pull-close"></div> 17 <div id="pull-reopen"></div> 18{{ end }} 19 20{{ define "submissions" }} 21 {{ $lastIdx := sub (len .Pull.Submissions) 1 }} 22 {{ $targetBranch := .Pull.TargetBranch }} 23 {{ $repoName := .RepoInfo.FullName }} 24 {{ range $idx, $item := .Pull.Submissions }} 25 {{ with $item }} 26 <details {{ if eq $idx $lastIdx }}open{{ end }}> 27 <summary id="round-#{{ .RoundNumber }}" class="list-none cursor-pointer"> 28 <div class="flex flex-wrap gap-2 items-center"> 29 <!-- round number --> 30 <div class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-3 py-2 dark:text-white"> 31 <span class="flex items-center">{{ i "hash" "w-4 h-4" }}{{ .RoundNumber }}</span> 32 </div> 33 <!-- round summary --> 34 <div class="rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400"> 35 <span> 36 {{ $owner := index $.DidHandleMap $.Pull.OwnerDid }} 37 {{ $re := "re" }} 38 {{ if eq .RoundNumber 0 }} 39 {{ $re = "" }} 40 {{ end }} 41 <span class="hidden md:inline">{{$re}}submitted</span> 42 by <a href="/{{ $owner }}">{{ $owner }}</a> 43 <span class="select-none before:content-['\00B7']"></span> 44 <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500" href="#round-#{{ .RoundNumber }}"><time>{{ .Created | shortTimeFmt }}</time></a> 45 <span class="select-none before:content-['·']"></span> 46 {{ $s := "s" }} 47 {{ if eq (len .Comments) 1 }} 48 {{ $s = "" }} 49 {{ end }} 50 {{ len .Comments }} comment{{$s}} 51 </span> 52 </div> 53 54 <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2" 55 hx-boost="true" 56 href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}"> 57 {{ i "file-diff" "w-4 h-4" }} <span class="hidden md:inline">view patch</span> 58 </a> 59 {{ if not (eq .RoundNumber 0) }} 60 <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2" 61 hx-boost="true" 62 href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff"> 63 {{ i "file-diff" "w-4 h-4" }} <span class="hidden md:inline">interdiff</span> 64 </a> 65 <span id="interdiff-error-{{.RoundNumber}}"></span> 66 {{ end }} 67 </div> 68 </summary> 69 70 {{ if .IsFormatPatch }} 71 {{ $patches := .AsFormatPatch }} 72 {{ $round := .RoundNumber }} 73 <details class="group py-2 md:ml-[3.5rem] text-gray-500 dark:text-gray-400 flex flex-col gap-2 relative text-sm"> 74 <summary class="py-1 list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400"> 75 {{ $s := "s" }} 76 {{ if eq (len $patches) 1 }} 77 {{ $s = "" }} 78 {{ end }} 79 <div class="group-open:hidden flex items-center gap-2 ml-2"> 80 {{ i "chevrons-up-down" "w-4 h-4" }} expand {{ len $patches }} commit{{$s}} 81 </div> 82 <div class="hidden group-open:flex items-center gap-2 ml-2"> 83 {{ i "chevrons-down-up" "w-4 h-4" }} hide {{ len $patches }} commit{{$s}} 84 </div> 85 </summary> 86 {{ range $patches }} 87 <div id="commit-{{.SHA}}" class="py-1 px-2 relative w-full md:max-w-3/5 md:w-fit flex flex-col"> 88 <div class="flex items-center gap-2"> 89 {{ i "git-commit-horizontal" "w-4 h-4" }} 90 <div class="text-sm text-gray-500 dark:text-gray-400"> 91 {{ if not $.Pull.IsPatchBased }} 92 {{ $fullRepo := $.RepoInfo.FullName }} 93 {{ if not $.Pull.IsBranchBased }} 94 {{ $fullRepo = printf "%s/%s" $owner $.PullSourceRepo.Name }} 95 {{ end }} 96 <a href="/{{ $fullRepo }}/commit/{{ .SHA }}" class="font-mono text-gray-500 dark:text-gray-400">{{ slice .SHA 0 8 }}</a> 97 {{ else }} 98 <span class="font-mono">{{ slice .SHA 0 8 }}</span> 99 {{ end }} 100 </div> 101 <div class="flex items-center"> 102 <span>{{ .Title }}</span> 103 {{ if gt (len .Body) 0 }} 104 <button 105 class="py-1/2 px-1 mx-2 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600" 106 hx-on:click="document.getElementById('body-{{$round}}-{{.SHA}}').classList.toggle('hidden')" 107 > 108 {{ i "ellipsis" "w-3 h-3" }} 109 </button> 110 {{ end }} 111 </div> 112 </div> 113 {{ if gt (len .Body) 0 }} 114 <p id="body-{{$round}}-{{.SHA}}" class="hidden mt-1 text-sm pb-2"> 115 {{ nl2br .Body }} 116 </p> 117 {{ end }} 118 </div> 119 {{ end }} 120 </details> 121 {{ end }} 122 123 124 <div class="md:pl-[3.5rem] flex flex-col gap-2 mt-2 relative"> 125 {{ range $cidx, $c := .Comments }} 126 <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit"> 127 {{ if gt $cidx 0 }} 128 <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> 129 {{ end }} 130 <div class="text-sm text-gray-500 dark:text-gray-400"> 131 {{ $owner := index $.DidHandleMap $c.OwnerDid }} 132 <a href="/{{$owner}}">{{$owner}}</a> 133 <span class="before:content-['·']"></span> 134 <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="#comment-{{.ID}}"><time>{{ $c.Created | shortTimeFmt }}</time></a> 135 </div> 136 <div class="prose dark:prose-invert"> 137 {{ $c.Body | markdown }} 138 </div> 139 </div> 140 {{ end }} 141 142 {{ if eq $lastIdx .RoundNumber }} 143 {{ block "mergeStatus" $ }} {{ end }} 144 {{ block "resubmitStatus" $ }} {{ end }} 145 {{ end }} 146 147 {{ if $.LoggedInUser }} 148 {{ template "repo/pulls/fragments/pullActions" (dict "LoggedInUser" $.LoggedInUser "Pull" $.Pull "RepoInfo" $.RepoInfo "RoundNumber" .RoundNumber "MergeCheck" $.MergeCheck "ResubmitCheck" $.ResubmitCheck) }} 149 {{ else }} 150 <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm px-6 py-4 w-fit dark:text-white"> 151 <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> 152 <a href="/login" class="underline">login</a> to join the discussion 153 </div> 154 {{ end }} 155 </div> 156 </details> 157 <hr class="md:hidden border-t border-gray-300 dark:border-gray-600"/> 158 {{ end }} 159 {{ end }} 160{{ end }} 161 162{{ define "mergeStatus" }} 163 {{ if .Pull.State.IsClosed }} 164 <div class="bg-gray-50 dark:bg-gray-700 border border-black dark:border-gray-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 165 <div class="flex items-center gap-2 text-black dark:text-white"> 166 {{ i "ban" "w-4 h-4" }} 167 <span class="font-medium">closed without merging</span 168 > 169 </div> 170 </div> 171 {{ else if .Pull.State.IsMerged }} 172 <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 173 <div class="flex items-center gap-2 text-purple-500 dark:text-purple-300"> 174 {{ i "git-merge" "w-4 h-4" }} 175 <span class="font-medium">pull request successfully merged</span 176 > 177 </div> 178 </div> 179 {{ else if and .MergeCheck .MergeCheck.Error }} 180 <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 181 <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 182 {{ i "triangle-alert" "w-4 h-4" }} 183 <span class="font-medium">{{ .MergeCheck.Error }}</span> 184 </div> 185 </div> 186 {{ else if and .MergeCheck .MergeCheck.IsConflicted }} 187 <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 188 <div class="flex flex-col gap-2 text-red-500 dark:text-red-300"> 189 <div class="flex items-center gap-2"> 190 {{ i "triangle-alert" "w-4 h-4" }} 191 <span class="font-medium">merge conflicts detected</span> 192 </div> 193 <ul class="space-y-1"> 194 {{ range .MergeCheck.Conflicts }} 195 {{ if .Filename }} 196 <li class="flex items-center"> 197 {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 198 <span class="font-mono">{{ slice .Filename 0 (sub (len .Filename) 2) }}</span> 199 </li> 200 {{ end }} 201 {{ end }} 202 </ul> 203 </div> 204 </div> 205 {{ else if .MergeCheck }} 206 <div class="bg-green-50 dark:bg-green-900 border border-green-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 207 <div class="flex items-center gap-2 text-green-500 dark:text-green-300"> 208 {{ i "circle-check-big" "w-4 h-4" }} 209 <span class="font-medium">no conflicts, ready to merge</span> 210 </div> 211 </div> 212 {{ end }} 213{{ end }} 214 215{{ define "resubmitStatus" }} 216 {{ if .ResubmitCheck.Yes }} 217 <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 218 <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> 219 {{ i "triangle-alert" "w-4 h-4" }} 220 <span class="font-medium">this branch has been updated, consider resubmitting</span> 221 </div> 222 </div> 223 {{ end }} 224{{ end }} 225 226{{ define "commits" }} 227{{ end }}