+20 -7

appview/pages/funcmap.go

··· 334 334 }, 335 335 "deref": func(v any) any { 336 336 val := reflect.ValueOf(v) 337 337 - if val.Kind() == reflect.Ptr && !val.IsNil() { 337 337 + if val.Kind() == reflect.Pointer && !val.IsNil() { 338 338 return val.Elem().Interface() 339 339 } 340 340 return nil ··· 366 366 return p.AvatarUrl(handle, "") 367 367 }, 368 368 "langColor": enry.GetColor, 369 369 - "layoutSide": func() string { 370 370 - return "col-span-1 md:col-span-2 lg:col-span-3" 371 371 - }, 372 372 - "layoutCenter": func() string { 373 373 - return "col-span-1 md:col-span-8 lg:col-span-6" 374 374 - }, 369 369 + "reverse": func(s any) any { 370 370 + if s == nil { 371 371 + return nil 372 372 + } 373 373 + 374 374 + v := reflect.ValueOf(s) 375 375 + 376 376 + if v.Kind() != reflect.Slice { 377 377 + return s 378 378 + } 379 379 + 380 380 + length := v.Len() 381 381 + reversed := reflect.MakeSlice(v.Type(), length, length) 375 382 383 383 + for i := range length { 384 384 + reversed.Index(i).Set(v.Index(length - 1 - i)) 385 385 + } 386 386 + 387 387 + return reversed.Interface() 388 388 + }, 376 389 "normalizeForHtmlId": func(s string) string { 377 390 normalized := strings.ReplaceAll(s, ":", "_") 378 391 normalized = strings.ReplaceAll(normalized, ".", "_")

+2

appview/pages/pages.go

··· 1103 1103 MergeCheck types.MergeCheckResponse 1104 1104 ResubmitCheck ResubmitResult 1105 1105 Pipelines map[string]models.Pipeline 1106 1106 + Diff *types.NiceDiff 1107 1107 + DiffOpts types.DiffOpts 1106 1108 1107 1109 OrderedReactionKinds []models.ReactionKind 1108 1110 Reactions map[models.ReactionKind]models.ReactionDisplayData

+1 -1

appview/pages/templates/layouts/repobase.html

··· 1 1 {{ define "title" }}{{ .RepoInfo.FullName }}{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <section id="repo-header" class="mb-4 p-2 dark:text-white"> 4 4 + <section id="repo-header" class="mb-2 py-2 px-4 dark:text-white"> 5 5 <div class="text-lg flex flex-col sm:flex-row items-start gap-4 justify-between"> 6 6 <!-- left items --> 7 7 <div class="flex flex-col gap-2">

+35 -22

appview/pages/templates/repo/issues/fragments/commentList.html

··· 1 1 {{ define "repo/issues/fragments/commentList" }} 2 2 - <div class="flex flex-col gap-8"> 2 2 + <div class="flex flex-col gap-4"> 3 3 {{ range $item := .CommentList }} 4 4 {{ template "commentListing" (list $ .) }} 5 5 {{ end }} ··· 19 19 <div class="rounded border border-gray-200 dark:border-gray-700 w-full overflow-hidden shadow-sm bg-gray-50 dark:bg-gray-800/50"> 20 20 {{ template "topLevelComment" $params }} 21 21 22 22 - <div class="relative ml-4 border-l-2 border-gray-200 dark:border-gray-700"> 22 22 + <div class="relative ml-10 border-l-2 border-gray-200 dark:border-gray-700"> 23 23 {{ range $index, $reply := $comment.Replies }} 24 24 - <div class="relative "> 25 25 - <!-- Horizontal connector --> 26 26 - <div class="absolute left-0 top-6 w-4 h-1 bg-gray-200 dark:bg-gray-700"></div> 27 27 - 28 28 - <div class="pl-2"> 29 29 - {{ 30 30 - template "replyComment" 31 31 - (dict 32 32 - "RepoInfo" $root.RepoInfo 33 33 - "LoggedInUser" $root.LoggedInUser 34 34 - "Issue" $root.Issue 35 35 - "Comment" $reply) 36 36 - }} 37 37 - </div> 24 24 + <div class="-ml-4"> 25 25 + {{ 26 26 + template "replyComment" 27 27 + (dict 28 28 + "RepoInfo" $root.RepoInfo 29 29 + "LoggedInUser" $root.LoggedInUser 30 30 + "Issue" $root.Issue 31 31 + "Comment" $reply) 32 32 + }} 38 33 </div> 39 34 {{ end }} 40 35 </div> ··· 44 39 {{ end }} 45 40 46 41 {{ define "topLevelComment" }} 47 47 - <div class="rounded px-6 py-4 bg-white dark:bg-gray-800"> 48 48 - {{ template "repo/issues/fragments/issueCommentHeader" . }} 49 49 - {{ template "repo/issues/fragments/issueCommentBody" . }} 42 42 + <div class="rounded px-6 py-4 bg-white dark:bg-gray-800 flex gap-2 "> 43 43 + <div class="flex-shrink-0"> 44 44 + <img 45 45 + src="{{ tinyAvatar .Comment.Did }}" 46 46 + alt="" 47 47 + class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 48 48 + /> 49 49 + </div> 50 50 + <div class="flex-1 min-w-0"> 51 51 + {{ template "repo/issues/fragments/issueCommentHeader" . }} 52 52 + {{ template "repo/issues/fragments/issueCommentBody" . }} 53 53 + </div> 50 54 </div> 51 55 {{ end }} 52 56 53 57 {{ define "replyComment" }} 54 54 - <div class="p-4 w-full mx-auto overflow-hidden"> 55 55 - {{ template "repo/issues/fragments/issueCommentHeader" . }} 56 56 - {{ template "repo/issues/fragments/issueCommentBody" . }} 58 58 + <div class="py-4 pr-4 w-full mx-auto overflow-hidden flex gap-2 "> 59 59 + <div class="flex-shrink-0"> 60 60 + <img 61 61 + src="{{ tinyAvatar .Comment.Did }}" 62 62 + alt="" 63 63 + class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 64 64 + /> 65 65 + </div> 66 66 + <div class="flex-1 min-w-0"> 67 67 + {{ template "repo/issues/fragments/issueCommentHeader" . }} 68 68 + {{ template "repo/issues/fragments/issueCommentBody" . }} 69 69 + </div> 57 70 </div> 58 71 {{ end }}

-63

appview/pages/templates/repo/issues/fragments/globalIssueListing.html

··· 1 1 - {{ define "repo/issues/fragments/globalIssueListing" }} 2 2 - <div class="flex flex-col gap-2"> 3 3 - {{ range .Issues }} 4 4 - <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 5 5 - <div class="pb-2 mb-3"> 6 6 - <div class="flex items-center gap-3 mb-2"> 7 7 - <a 8 8 - href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}" 9 9 - class="text-blue-600 dark:text-blue-400 font-medium hover:underline text-sm" 10 10 - > 11 11 - {{ resolve .Repo.Did }}/{{ .Repo.Name }} 12 12 - </a> 13 13 - </div> 14 14 - <a 15 15 - href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" 16 16 - class="no-underline hover:underline" 17 17 - > 18 18 - {{ .Title | description }} 19 19 - <span class="text-gray-500">#{{ .IssueId }}</span> 20 20 - </a> 21 21 - </div> 22 22 - <div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 23 23 - {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 24 24 - {{ $icon := "ban" }} 25 25 - {{ $state := "closed" }} 26 26 - {{ if .Open }} 27 27 - {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 28 28 - {{ $icon = "circle-dot" }} 29 29 - {{ $state = "open" }} 30 30 - {{ end }} 31 31 - 32 32 - <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 33 33 - {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 34 34 - <span class="text-white dark:text-white">{{ $state }}</span> 35 35 - </span> 36 36 - 37 37 - <span class="ml-1"> 38 38 - {{ template "user/fragments/picHandleLink" .Did }} 39 39 - </span> 40 40 - 41 41 - <span class="before:content-['·']"> 42 42 - {{ template "repo/fragments/time" .Created }} 43 43 - </span> 44 44 - 45 45 - <span class="before:content-['·']"> 46 46 - {{ $s := "s" }} 47 47 - {{ if eq (len .Comments) 1 }} 48 48 - {{ $s = "" }} 49 49 - {{ end }} 50 50 - <a href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a> 51 51 - </span> 52 52 - 53 53 - {{ $state := .Labels }} 54 54 - {{ range $k, $d := $.LabelDefs }} 55 55 - {{ range $v, $s := $state.GetValSet $d.AtUri.String }} 56 56 - {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }} 57 57 - {{ end }} 58 58 - {{ end }} 59 59 - </div> 60 60 - </div> 61 61 - {{ end }} 62 62 - </div> 63 63 - {{ end }}

+2 -1

appview/pages/templates/repo/issues/fragments/issueCommentHeader.html

··· 1 1 {{ define "repo/issues/fragments/issueCommentHeader" }} 2 2 <div class="flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-400 "> 3 3 - {{ template "user/fragments/picHandleLink" .Comment.Did }} 3 3 + {{ resolve .Comment.Did }} 4 4 {{ template "hats" $ }} 5 5 + <span class="before:content-['·']"></span> 5 6 {{ template "timestamp" . }} 6 7 {{ $isCommentOwner := and .LoggedInUser (eq .LoggedInUser.Did .Comment.Did) }} 7 8 {{ if and $isCommentOwner (not .Comment.Deleted) }}

+1 -1

appview/pages/templates/repo/issues/fragments/putIssue.html

··· 18 18 <textarea 19 19 name="body" 20 20 id="body" 21 21 - rows="6" 21 21 + rows="15" 22 22 class="w-full resize-y" 23 23 placeholder="Describe your issue. Markdown is supported." 24 24 >{{ if .Issue }}{{ .Issue.Body }}{{ end }}</textarea>

+3 -3

appview/pages/templates/repo/issues/fragments/replyIssueCommentPlaceholder.html

··· 1 1 {{ define "repo/issues/fragments/replyIssueCommentPlaceholder" }} 2 2 - <div class="p-2 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 2 2 + <div class="py-2 px-6 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 3 3 {{ if .LoggedInUser }} 4 4 <img 5 5 src="{{ tinyAvatar .LoggedInUser.Did }}" 6 6 alt="" 7 7 - class="rounded-full h-6 w-6 mr-1 border border-gray-300 dark:border-gray-700" 7 7 + class="rounded-full size-8 mr-1 border-2 border-gray-300 dark:border-gray-700" 8 8 /> 9 9 {{ end }} 10 10 <input 11 11 - class="w-full py-2 border-none focus:outline-none" 11 11 + class="w-full p-0 border-none focus:outline-none" 12 12 placeholder="Leave a reply..." 13 13 hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/reply" 14 14 hx-trigger="focus"

+1 -1

appview/pages/templates/repo/pulls/fragments/pullActions.html

··· 22 22 {{ $isLastRound := eq $roundNumber $lastIdx }} 23 23 {{ $isSameRepoBranch := .Pull.IsBranchBased }} 24 24 {{ $isUpToDate := .ResubmitCheck.No }} 25 25 - <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative"> 25 25 + <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative py-2 px-4"> 26 26 <button 27 27 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment" 28 28 hx-target="#actions-{{$roundNumber}}"

+20

appview/pages/templates/repo/pulls/fragments/replyPullCommentPlaceholder.html

··· 1 1 + {{ define "repo/pulls/fragments/replyPullCommentPlaceholder" }} 2 2 + <div class="py-2 px-6 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 3 3 + {{ if .LoggedInUser }} 4 4 + <img 5 5 + src="{{ tinyAvatar .LoggedInUser.Did }}" 6 6 + alt="" 7 7 + class="rounded-full size-8 mr-1 border-2 border-gray-300 dark:border-gray-700" 8 8 + /> 9 9 + {{ end }} 10 10 + <input 11 11 + class="w-full p-0 border-none focus:outline-none" 12 12 + placeholder="Leave a reply..." 13 13 + hx-get="/{{ .Submission.ID }}/reply" 14 14 + hx-trigger="focus" 15 15 + hx-target="closest div" 16 16 + hx-swap="outerHTML" 17 17 + > 18 18 + </input> 19 19 + </div> 20 20 + {{ end }}

+229 -27

appview/pages/templates/repo/pulls/pull.html

··· 6 6 {{ template "repo/pulls/fragments/og" (dict "RepoInfo" .RepoInfo "Pull" .Pull) }} 7 7 {{ end }} 8 8 9 9 + {{ define "mainLayout" }} 10 10 + <div class="px-1 col-span-full flex-grow flex flex-col gap-4"> 11 11 + {{ block "contentLayout" . }} 12 12 + {{ block "content" . }}{{ end }} 13 13 + {{ end }} 14 14 + </div> 15 15 + {{ end }} 16 16 + 9 17 {{ define "repoContentLayout" }} 10 18 <div class="grid grid-cols-1 md:grid-cols-10 gap-4 w-full"> 11 11 - <div class="col-span-1 md:col-span-8"> 19 19 + <div class="col-span-1 md:col-span-7"> 12 20 <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white"> 13 21 {{ block "repoContent" . }}{{ end }} 14 22 </section> 15 23 {{ block "repoAfter" . }}{{ end }} 16 24 </div> 17 17 - <div class="col-span-1 md:col-span-2 flex flex-col gap-6"> 25 25 + <div class="col-span-1 md:col-span-3 flex flex-col gap-6"> 18 26 {{ template "repo/fragments/labelPanel" 19 27 (dict "RepoInfo" $.RepoInfo 20 28 "Defs" $.LabelDefs ··· 26 34 "Backlinks" $.Backlinks) }} 27 35 {{ template "repo/fragments/externalLinkPanel" $.Pull.AtUri }} 28 36 </div> 37 37 + 38 38 + <div class="col-span-1 md:col-span-7"> 39 39 + {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} 40 40 + </div> 41 41 + <div class="col-span-1 md:col-span-3 flex flex-col max-h-dvh sticky top-0"> 42 42 + <div class="z-20 sticky top-0 rounded-t p-3 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700"> 43 43 + <h2 class="font-bold uppercase">history</h2> 44 44 + </div> 45 45 + <div class="flex flex-col-reverse gap-4 overflow-y-auto"> 46 46 + {{ template "submissions2" . }} 47 47 + </div> 48 48 + </div> 29 49 </div> 30 50 {{ end }} 31 51 ··· 40 60 {{ end }} 41 61 42 62 {{ define "repoAfter" }} 43 43 - <section id="submissions" class="mt-4"> 44 44 - <div class="flex flex-col gap-4"> 45 45 - {{ block "submissions" . }} {{ end }} 63 63 + <div id="pull-close"></div> 64 64 + <div id="pull-reopen"></div> 65 65 + {{ end }} 66 66 + 67 67 + {{ define "submissions2" }} 68 68 + {{ $lastIdx := sub (len .Pull.Submissions) 1 }} 69 69 + {{ range $ridx, $item := reverse .Pull.Submissions }} 70 70 + {{ $idx := sub $lastIdx $ridx }} 71 71 + <div class="rounded border border-gray-200 dark:border-gray-700 w-full shadow-sm bg-gray-50 dark:bg-gray-800/50"> 72 72 + {{ with $item }} 73 73 + {{ $patches := .AsFormatPatch }} 74 74 + {{ $round := .RoundNumber }} 75 75 + <div class="rounded px-6 py-4 bg-white dark:bg-gray-800 flex gap-2"> 76 76 + <div class="flex-shrink-0"> 77 77 + <img 78 78 + src="{{ tinyAvatar $.Pull.OwnerDid }}" 79 79 + alt="" 80 80 + class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 81 81 + /> 82 82 + </div> 83 83 + <!-- right column: name and body in two rows --> 84 84 + <div class="flex-1 min-w-0 flex flex-col gap-2"> 85 85 + <div class="flex gap-2 items-center justify-between mb-1"> 86 86 + <span class="inline-flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400 hover:text-gray-500"> 87 87 + {{ resolve $.Pull.OwnerDid }} submitted v{{ $round }} 88 88 + <span class="select-none before:content-['\00B7']"></span> 89 89 + <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500" href="#round-#{{ $round }}">{{ template "repo/fragments/shortTimeAgo" .Created }}</a> 90 90 + </span> 91 91 + {{ if ne $idx 0 }} 92 92 + <a class="flex items-center gap-2 no-underline hover:no-underline text-sm" 93 93 + hx-boost="true" 94 94 + href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{$round}}/interdiff"> 95 95 + {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} 96 96 + <span class="hidden md:inline">interdiff</span> 97 97 + </a> 98 98 + {{ end }} 99 99 + </div> 100 100 + <div> 101 101 + {{ if eq 1 (len $patches) }} 102 102 + <!-- only one commit, just inline the message into the round header --> 103 103 + {{ $commit := index $patches 0 }} 104 104 + <span>{{ $commit.Title | description }}</span> 105 105 + {{ if gt (len $commit.Body) 0 }} 106 106 + <p id="body-{{$round}}-{{$commit.SHA}}" class="mt-1 pb-2"> 107 107 + {{ nl2br $commit.Body }} 108 108 + </p> 109 109 + {{ end }} 110 110 + {{ else }} 111 111 + <span>Commits:</span> 112 112 + {{ range $patches }} 113 113 + <div id="commit-{{.SHA}}" class="py-1 px-2 relative w-full md:max-w-3/5 md:w-fit flex flex-col"> 114 114 + <div class="flex items-center gap-2"> 115 115 + {{ i "git-commit-horizontal" "w-4 h-4 flex-shrink-0" }} 116 116 + <div class="flex items-center"> 117 117 + <span>{{ .Title | description }}</span> 118 118 + {{ if gt (len .Body) 0 }} 119 119 + <button 120 120 + 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" 121 121 + hx-on:click="document.getElementById('body-{{$round}}-{{.SHA}}').classList.toggle('hidden')" 122 122 + > 123 123 + {{ i "ellipsis" "w-3 h-3" }} 124 124 + </button> 125 125 + {{ end }} 126 126 + </div> 127 127 + </div> 128 128 + {{ if gt (len .Body) 0 }} 129 129 + <p id="body-{{$round}}-{{.SHA}}" class="hidden mt-1 text-sm pb-2"> 130 130 + {{ nl2br .Body }} 131 131 + </p> 132 132 + {{ end }} 133 133 + </div> 134 134 + {{ end }} 135 135 + {{ end }} 136 136 + </div> 137 137 + <div> 138 138 + {{ block "pipelineStatus" (list $ .) }} {{ end }} 139 139 + </div> 140 140 + </div> 141 141 + </div> 142 142 + <div class="relative ml-10 border-l-2 border-gray-200 dark:border-gray-700"> 143 143 + {{ range $cidx, $c := .Comments }} 144 144 + <div id="comment-{{$c.ID}}" class="flex gap-2 -ml-4 py-4 w-full mx-auto"> 145 145 + <!-- left column: profile picture --> 146 146 + <div class="flex-shrink-0"> 147 147 + <img 148 148 + src="{{ tinyAvatar $c.OwnerDid }}" 149 149 + alt="" 150 150 + class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 151 151 + /> 152 152 + </div> 153 153 + <!-- right column: name and body in two rows --> 154 154 + <div class="flex-1 min-w-0"> 155 155 + <!-- Row 1: Author and timestamp --> 156 156 + <div class="text-sm text-gray-500 dark:text-gray-400 flex items-center gap-1"> 157 157 + <span>{{ resolve $c.OwnerDid }}</span> 158 158 + <span class="before:content-['·']"></span> 159 159 + <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="#comment-{{.ID}}">{{ template "repo/fragments/time" $c.Created }}</a> 160 160 + </div> 161 161 + <!-- Row 2: Body text --> 162 162 + <div class="prose dark:prose-invert mt-1"> 163 163 + {{ $c.Body | markdown }} 164 164 + </div> 165 165 + </div> 166 166 + </div> 167 167 + {{ end }} 168 168 + </div> 169 169 + {{ end }} 170 170 + {{ if eq $lastIdx .RoundNumber }} 171 171 + {{ block "mergeStatus" $ }} {{ end }} 172 172 + {{ block "resubmitStatus" $ }} {{ end }} 173 173 + {{ end }} 174 174 + {{ if $.LoggedInUser }} 175 175 + {{ if eq $lastIdx .RoundNumber }} 176 176 + {{ template "newComment" (list $ .) }} 177 177 + {{ else }} 178 178 + {{ template "repo/pulls/fragments/replyPullCommentPlaceholder" (dict "LoggedInUser" $.LoggedInUser "Submission" .) }} 179 179 + {{ end }} 180 180 + {{ else }} 181 181 + <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm p-2 relative flex gap-2 items-center"> 182 182 + <a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2"> 183 183 + sign up 184 184 + </a> 185 185 + <span class="text-gray-500 dark:text-gray-400">or</span> 186 186 + <a href="/login" class="underline">login</a> 187 187 + to add to the discussion 188 188 + </div> 189 189 + {{ end }} 190 190 + </div> 191 191 + {{ end }} 192 192 + {{ end }} 193 193 + 194 194 + {{ define "newComment" }} 195 195 + {{ $root := index . 0 }} 196 196 + {{ $submission := index . 1 }} 197 197 + <form 198 198 + id="comment-form" 199 199 + hx-post="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ $submission.RoundNumber }}/comment" 200 200 + hx-on::after-request="if(event.detail.successful) this.reset()" 201 201 + > 202 202 + <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full"> 203 203 + <div class="text-sm pb-2 text-gray-500 dark:text-gray-400"> 204 204 + {{ template "user/fragments/picHandleLink" $root.LoggedInUser.Did }} 46 205 </div> 47 47 - </section> 206 206 + <textarea 207 207 + id="comment-textarea" 208 208 + name="body" 209 209 + class="w-full p-2 rounded border border-gray-200 dark:border-gray-700" 210 210 + placeholder="Add to the discussion" 211 211 + rows="8" 212 212 + ></textarea> 213 213 + <div id="pull-comment"></div> 214 214 + </div> 215 215 + {{ template "replyActions" . }} 216 216 + </form> 217 217 + {{ end }} 48 218 49 49 - <div id="pull-close"></div> 50 50 - <div id="pull-reopen"></div> 219 219 + {{ define "replyActions" }} 220 220 + <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm"> 221 221 + {{ template "cancel" . }} 222 222 + {{ template "reply" . }} 223 223 + </div> 224 224 + {{ end }} 225 225 + 226 226 + {{ define "cancel" }} 227 227 + <button 228 228 + class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group" 229 229 + hx-get="TODO" 230 230 + hx-target="TODO" 231 231 + hx-swap="outerHTML"> 232 232 + {{ i "x" "size-4" }} 233 233 + cancel 234 234 + </button> 235 235 + {{ end }} 236 236 + 237 237 + {{ define "reply" }} 238 238 + <button 239 239 + id="TODO" 240 240 + type="submit" 241 241 + class="btn-create flex items-center gap-2 no-underline hover:no-underline"> 242 242 + {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 243 243 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 244 244 + reply 245 245 + </button> 51 246 {{ end }} 52 247 53 248 {{ define "submissions" }} ··· 216 411 217 412 {{ define "mergeStatus" }} 218 413 {{ if .Pull.State.IsClosed }} 219 219 - <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"> 414 414 + <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"> 220 415 <div class="flex items-center gap-2 text-black dark:text-white"> 221 416 {{ i "ban" "w-4 h-4" }} 222 417 <span class="font-medium">closed without merging</span ··· 224 419 </div> 225 420 </div> 226 421 {{ else if .Pull.State.IsMerged }} 227 227 - <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 422 422 + <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative"> 228 423 <div class="flex items-center gap-2 text-purple-500 dark:text-purple-300"> 229 424 {{ i "git-merge" "w-4 h-4" }} 230 425 <span class="font-medium">pull request successfully merged</span ··· 232 427 </div> 233 428 </div> 234 429 {{ else if .Pull.State.IsDeleted }} 235 235 - <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 430 430 + <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative"> 236 431 <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 237 432 {{ i "git-pull-request-closed" "w-4 h-4" }} 238 433 <span class="font-medium">This pull has been deleted (possibly by jj abandon or jj squash)</span> 239 434 </div> 240 435 </div> 241 436 {{ else if and .MergeCheck .MergeCheck.Error }} 242 242 - <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 437 437 + <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative"> 243 438 <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 244 439 {{ i "triangle-alert" "w-4 h-4" }} 245 440 <span class="font-medium">{{ .MergeCheck.Error }}</span> 246 441 </div> 247 442 </div> 248 443 {{ else if and .MergeCheck .MergeCheck.IsConflicted }} 249 249 - <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 250 250 - <div class="flex flex-col gap-2 text-red-500 dark:text-red-300"> 251 251 - <div class="flex items-center gap-2"> 252 252 - {{ i "triangle-alert" "w-4 h-4" }} 253 253 - <span class="font-medium">merge conflicts detected</span> 254 254 - </div> 444 444 + <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative"> 445 445 + <details class="text-red-500 dark:text-red-300 group"> 446 446 + <summary class="flex items-center justify-between cursor-pointer list-none"> 447 447 + <div class="flex items-center gap-2 "> 448 448 + {{ i "triangle-alert" "w-4 h-4" }} 449 449 + <span class="font-medium">merge conflicts detected</span> 450 450 + </div> 451 451 + <div> 452 452 + <span class="group-open:hidden inline">{{ i "chevrons-up-down" "w-4 h-4" }}</span> 453 453 + <span class="hidden group-open:inline">{{ i "chevrons-down-up" "w-4 h-4" }}</span> 454 454 + </div> 455 455 + </summary> 255 456 {{ if gt (len .MergeCheck.Conflicts) 0 }} 256 256 - <ul class="space-y-1"> 457 457 + <ul class="space-y-1 mt-2"> 257 458 {{ range .MergeCheck.Conflicts }} 258 459 {{ if .Filename }} 259 259 - <li class="flex items-center"> 260 260 - {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 261 261 - <span class="font-mono">{{ .Filename }}</span> 262 262 - </li> 460 460 + <li class="flex items-center"> 461 461 + {{ i "file-warning" "inline-flex w-4 h-4 mr-1.5 text-red-500 dark:text-red-300 flex-shrink-0" }} 462 462 + <span class="font-mono" style="word-break: keep-all; overflow-wrap: break-word;">{{ .Filename }}</span> 463 463 + </li> 263 464 {{ else if .Reason }} 264 465 <li class="flex items-center"> 265 466 {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} ··· 269 470 {{ end }} 270 471 </ul> 271 472 {{ end }} 272 272 - </div> 473 473 + </details> 273 474 </div> 274 475 {{ else if .MergeCheck }} 275 275 - <div class="bg-green-50 dark:bg-green-900 border border-green-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 476 476 + <div class="bg-green-50 dark:bg-green-900 border border-green-500 rounded drop-shadow-sm px-6 py-2 relative"> 276 477 <div class="flex items-center gap-2 text-green-500 dark:text-green-300"> 277 478 {{ i "circle-check-big" "w-4 h-4" }} 278 479 <span class="font-medium">no conflicts, ready to merge</span> ··· 283 484 284 485 {{ define "resubmitStatus" }} 285 486 {{ if .ResubmitCheck.Yes }} 286 286 - <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 487 487 + <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative"> 287 488 <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> 288 489 {{ i "triangle-alert" "w-4 h-4" }} 289 490 <span class="font-medium">this branch has been updated, consider resubmitting</span> ··· 299 500 {{ with $pipeline }} 300 501 {{ $id := .Id }} 301 502 {{ if .Statuses }} 302 302 - <div class="max-w-80 grid grid-cols-1 bg-white dark:bg-gray-800 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700"> 503 503 + <span>Workflows:</span> 504 504 + <div class=" grid grid-cols-1 bg-white dark:bg-gray-800 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700"> 303 505 {{ range $name, $all := .Statuses }} 304 506 <a href="/{{ $root.RepoInfo.FullName }}/pipelines/{{ $id }}/workflow/{{ $name }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 305 507 <div

+11 -2

appview/pulls/pulls.go

··· 232 232 defs[l.AtUri().String()] = &l 233 233 } 234 234 235 235 - s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 235 235 + patch := pull.LatestSubmission().CombinedPatch() 236 236 + diff := patchutil.AsNiceDiff(patch, pull.TargetBranch) 237 237 + var diffOpts types.DiffOpts 238 238 + if d := r.URL.Query().Get("diff"); d == "split" { 239 239 + diffOpts.Split = true 240 240 + } 241 241 + 242 242 + log.Println(s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 236 243 LoggedInUser: user, 237 244 RepoInfo: s.repoResolver.GetRepoInfo(r, user), 238 245 Pull: pull, ··· 243 250 MergeCheck: mergeCheckResponse, 244 251 ResubmitCheck: resubmitResult, 245 252 Pipelines: m, 253 253 + Diff: &diff, 254 254 + DiffOpts: diffOpts, 246 255 247 256 OrderedReactionKinds: models.OrderedReactionKinds, 248 257 Reactions: reactionMap, 249 258 UserReacted: userReactions, 250 259 251 260 LabelDefs: defs, 252 252 - }) 261 261 + })) 253 262 } 254 263 255 264 func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, stack models.Stack) types.MergeCheckResponse {