-39

appview/models/pipeline.go

··· 1 1 package models 2 2 3 3 import ( 4 4 - "fmt" 5 4 "slices" 6 6 - "strings" 7 5 "time" 8 6 9 7 "github.com/bluesky-social/indigo/atproto/syntax" ··· 52 50 } 53 51 54 52 return 0 55 55 - } 56 56 - 57 57 - // produces short summary of successes: 58 58 - // - "0/4" when zero successes of 4 workflows 59 59 - // - "4/4" when all successes of 4 workflows 60 60 - // - "0/0" when no workflows run in this pipeline 61 61 - func (p Pipeline) ShortStatusSummary() string { 62 62 - counts := make(map[spindle.StatusKind]int) 63 63 - for _, w := range p.Statuses { 64 64 - counts[w.Latest().Status] += 1 65 65 - } 66 66 - 67 67 - total := len(p.Statuses) 68 68 - successes := counts[spindle.StatusKindSuccess] 69 69 - 70 70 - return fmt.Sprintf("%d/%d", successes, total) 71 71 - } 72 72 - 73 73 - // produces a string of the form "3/4 success, 2/4 failed, 1/4 pending" 74 74 - func (p Pipeline) LongStatusSummary() string { 75 75 - counts := make(map[spindle.StatusKind]int) 76 76 - for _, w := range p.Statuses { 77 77 - counts[w.Latest().Status] += 1 78 78 - } 79 79 - 80 80 - total := len(p.Statuses) 81 81 - 82 82 - var result []string 83 83 - // finish states first, followed by start states 84 84 - states := append(spindle.FinishStates[:], spindle.StartStates[:]...) 85 85 - for _, state := range states { 86 86 - if count, ok := counts[state]; ok { 87 87 - result = append(result, fmt.Sprintf("%d/%d %s", count, total, state.String())) 88 88 - } 89 89 - } 90 90 - 91 91 - return strings.Join(result, ", ") 92 53 } 93 54 94 55 func (p Pipeline) Counts() map[string]int {

+7 -20

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.Pointer && !val.IsNil() { 337 337 + if val.Kind() == reflect.Ptr && !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 - "reverse": func(s any) any { 370 370 - if s == nil { 371 371 - return nil 372 372 - } 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 + }, 373 375 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) 382 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 - }, 389 376 "normalizeForHtmlId": func(s string) string { 390 377 normalized := strings.ReplaceAll(s, ":", "_") 391 378 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 1108 1106 1109 1107 OrderedReactionKinds []models.ReactionKind 1110 1108 Reactions map[models.ReactionKind]models.ReactionDisplayData

-1

appview/pages/templates/fragments/tabSelector.html

··· 9 9 {{ range $index, $value := $all }} 10 10 {{ $isActive := eq $value.Key $active }} 11 11 <a href="?{{ $name }}={{ $value.Key }}" 12 12 - hx-boost=true 13 12 {{ if $include }} 14 13 hx-get="?{{ $name }}={{ $value.Key }}" 15 14 hx-include="{{ $include }}"

+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-2 py-2 px-4 dark:text-white"> 4 4 + <section id="repo-header" class="mb-4 p-2 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">

+1 -1

appview/pages/templates/repo/fragments/diff.html

··· 18 18 {{ range $idx, $hunk := $diff }} 19 19 {{ with $hunk }} 20 20 <details open id="file-{{ .Id }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}"> 21 21 - <summary class="list-none cursor-pointer sticky top-12"> 21 21 + <summary class="list-none cursor-pointer sticky top-0"> 22 22 <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between"> 23 23 <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto"> 24 24 <span class="group-open:hidden inline">{{ i "chevron-right" "w-4 h-4" }}</span>

+8 -1

appview/pages/templates/repo/fragments/diffChangedFiles.html

··· 1 1 {{ define "repo/fragments/diffChangedFiles" }} 2 2 + {{ $stat := .Stat }} 2 3 {{ $fileTree := fileTree .ChangedFiles }} 3 4 <section class="overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto min-h-full rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 4 4 - {{ template "repo/fragments/fileTree" $fileTree }} 5 5 + <div class="diff-stat"> 6 6 + <div class="flex gap-2 items-center"> 7 7 + <strong class="text-sm uppercase dark:text-gray-200">Changed files</strong> 8 8 + {{ template "repo/fragments/diffStatPill" $stat }} 9 9 + </div> 10 10 + {{ template "repo/fragments/fileTree" $fileTree }} 11 11 + </div> 5 12 </section> 6 13 {{ end }}

+25 -22

appview/pages/templates/repo/fragments/diffOpts.html

··· 1 1 {{ define "repo/fragments/diffOpts" }} 2 2 - {{ $active := "unified" }} 3 3 - {{ if .Split }} 4 4 - {{ $active = "split" }} 5 5 - {{ end }} 2 2 + <section class="flex flex-col gap-2 overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 3 3 + <strong class="text-sm uppercase dark:text-gray-200">options</strong> 4 4 + {{ $active := "unified" }} 5 5 + {{ if .Split }} 6 6 + {{ $active = "split" }} 7 7 + {{ end }} 6 8 7 7 - {{ $unified := 8 8 - (dict 9 9 - "Key" "unified" 10 10 - "Value" "unified" 11 11 - "Icon" "square-split-vertical" 12 12 - "Meta" "") }} 13 13 - {{ $split := 14 14 - (dict 15 15 - "Key" "split" 16 16 - "Value" "split" 17 17 - "Icon" "square-split-horizontal" 18 18 - "Meta" "") }} 19 19 - {{ $values := list $unified $split }} 9 9 + {{ $unified := 10 10 + (dict 11 11 + "Key" "unified" 12 12 + "Value" "unified" 13 13 + "Icon" "square-split-vertical" 14 14 + "Meta" "") }} 15 15 + {{ $split := 16 16 + (dict 17 17 + "Key" "split" 18 18 + "Value" "split" 19 19 + "Icon" "square-split-horizontal" 20 20 + "Meta" "") }} 21 21 + {{ $values := list $unified $split }} 20 22 21 21 - {{ template "fragments/tabSelector" 22 22 - (dict 23 23 - "Name" "diff" 24 24 - "Values" $values 25 25 - "Active" $active) }} 23 23 + {{ template "fragments/tabSelector" 24 24 + (dict 25 25 + "Name" "diff" 26 26 + "Values" $values 27 27 + "Active" $active) }} 28 28 + </section> 26 29 {{ end }} 27 30

+22 -35

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

··· 1 1 {{ define "repo/issues/fragments/commentList" }} 2 2 - <div class="flex flex-col gap-4"> 2 2 + <div class="flex flex-col gap-8"> 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-10 border-l-2 border-gray-200 dark:border-gray-700"> 22 22 + <div class="relative ml-4 border-l-2 border-gray-200 dark:border-gray-700"> 23 23 {{ range $index, $reply := $comment.Replies }} 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 - }} 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> 33 38 </div> 34 39 {{ end }} 35 40 </div> ··· 39 44 {{ end }} 40 45 41 46 {{ define "topLevelComment" }} 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> 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" . }} 54 50 </div> 55 51 {{ end }} 56 52 57 53 {{ define "replyComment" }} 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> 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" . }} 70 57 </div> 71 58 {{ 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 }}

+1 -2

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 - {{ resolve .Comment.Did }} 3 3 + {{ template "user/fragments/picHandleLink" .Comment.Did }} 4 4 {{ template "hats" $ }} 5 5 - <span class="before:content-['·']"></span> 6 5 {{ template "timestamp" . }} 7 6 {{ $isCommentOwner := and .LoggedInUser (eq .LoggedInUser.Did .Comment.Did) }} 8 7 {{ if and $isCommentOwner (not .Comment.Deleted) }}

+2 -2

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

··· 21 21 {{ $state = "open" }} 22 22 {{ end }} 23 23 24 24 - <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }}"> 24 24 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 25 25 {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 26 26 - <span class="text-white dark:text-white text-sm">{{ $state }}</span> 26 26 + <span class="text-white dark:text-white">{{ $state }}</span> 27 27 </span> 28 28 29 29 <span class="ml-1">

+1 -1

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

··· 18 18 <textarea 19 19 name="body" 20 20 id="body" 21 21 - rows="15" 21 21 + rows="6" 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="py-2 px-6 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 2 2 + <div class="p-2 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" 7 7 + class="rounded-full h-6 w-6 mr-1 border 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" 11 11 + class="w-full py-2 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"

+5 -5

appview/pages/templates/repo/issues/issue.html

··· 58 58 {{ $icon = "circle-dot" }} 59 59 {{ end }} 60 60 <div class="inline-flex items-center gap-2"> 61 61 - <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }}"> 62 62 - {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 63 63 - <span class="text-white dark:text-white text-sm">{{ .Issue.State }}</span> 64 64 - </span> 65 65 - 61 61 + <div id="state" 62 62 + class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}"> 63 63 + {{ i $icon "w-4 h-4 mr-1.5 text-white" }} 64 64 + <span class="text-white">{{ .Issue.State }}</span> 65 65 + </div> 66 66 <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1"> 67 67 opened by 68 68 {{ template "user/fragments/picHandleLink" .Issue.Did }}

+69 -60

appview/pages/templates/repo/pipelines/fragments/pipelineSymbol.html

··· 1 1 {{ define "repo/pipelines/fragments/pipelineSymbol" }} 2 2 - <div class="cursor-pointer flex gap-2 items-center"> 3 3 - {{ template "symbol" .Pipeline }} 4 4 - {{ if .ShortSummary }} 5 5 - {{ .Pipeline.ShortStatusSummary }} 2 2 + <div class="cursor-pointer"> 3 3 + {{ $c := .Counts }} 4 4 + {{ $statuses := .Statuses }} 5 5 + {{ $total := len $statuses }} 6 6 + {{ $success := index $c "success" }} 7 7 + {{ $fail := index $c "failed" }} 8 8 + {{ $timeout := index $c "timeout" }} 9 9 + {{ $empty := eq $total 0 }} 10 10 + {{ $allPass := eq $success $total }} 11 11 + {{ $allFail := eq $fail $total }} 12 12 + {{ $allTimeout := eq $timeout $total }} 13 13 + 14 14 + {{ if $empty }} 15 15 + <div class="flex gap-1 items-center"> 16 16 + {{ i "hourglass" "size-4 text-gray-600 dark:text-gray-400 " }} 17 17 + <span>0/{{ $total }}</span> 18 18 + </div> 19 19 + {{ else if $allPass }} 20 20 + <div class="flex gap-1 items-center"> 21 21 + {{ i "check" "size-4 text-green-600" }} 22 22 + <span>{{ $total }}/{{ $total }}</span> 23 23 + </div> 24 24 + {{ else if $allFail }} 25 25 + <div class="flex gap-1 items-center"> 26 26 + {{ i "x" "size-4 text-red-500" }} 27 27 + <span>0/{{ $total }}</span> 28 28 + </div> 29 29 + {{ else if $allTimeout }} 30 30 + <div class="flex gap-1 items-center"> 31 31 + {{ i "clock-alert" "size-4 text-orange-500" }} 32 32 + <span>0/{{ $total }}</span> 33 33 + </div> 6 34 {{ else }} 7 7 - {{ .Pipeline.LongStatusSummary }} 35 35 + {{ $radius := f64 8 }} 36 36 + {{ $circumference := mulf64 2.0 (mulf64 3.1416 $radius) }} 37 37 + {{ $offset := 0.0 }} 38 38 + <div class="flex gap-1 items-center"> 39 39 + <svg class="w-4 h-4 transform -rotate-90" viewBox="0 0 20 20"> 40 40 + <circle cx="10" cy="10" r="{{ $radius }}" fill="none" stroke="#f3f4f633" stroke-width="2"/> 41 41 + 42 42 + {{ range $kind, $count := $c }} 43 43 + {{ $color := "" }} 44 44 + {{ if or (eq $kind "pending") (eq $kind "running") }} 45 45 + {{ $color = "#eab308" }} {{/* amber-500 */}} 46 46 + {{ else if eq $kind "success" }} 47 47 + {{ $color = "#10b981" }} {{/* green-500 */}} 48 48 + {{ else if eq $kind "cancelled" }} 49 49 + {{ $color = "#6b7280" }} {{/* gray-500 */}} 50 50 + {{ else if eq $kind "timeout" }} 51 51 + {{ $color = "#fb923c" }} {{/* orange-400 */}} 52 52 + {{ else }} 53 53 + {{ $color = "#ef4444" }} {{/* red-500 for failed or unknown */}} 54 54 + {{ end }} 55 55 + 56 56 + {{ $percent := divf64 (f64 $count) (f64 $total) }} 57 57 + {{ $length := mulf64 $percent $circumference }} 58 58 + 59 59 + <circle 60 60 + cx="10" cy="10" r="{{ $radius }}" 61 61 + fill="none" 62 62 + stroke="{{ $color }}" 63 63 + stroke-width="2" 64 64 + stroke-dasharray="{{ printf "%.2f %.2f" $length (subf64 $circumference $length) }}" 65 65 + stroke-dashoffset="{{ printf "%.2f" (negf64 $offset) }}" 66 66 + /> 67 67 + {{ $offset = addf64 $offset $length }} 68 68 + {{ end }} 69 69 + </svg> 70 70 + <span>{{ $success }}/{{ $total }}</span> 71 71 + </div> 8 72 {{ end }} 9 73 </div> 10 74 {{ end }} 11 11 - 12 12 - {{ define "symbol" }} 13 13 - {{ $c := .Counts }} 14 14 - {{ $statuses := .Statuses }} 15 15 - {{ $total := len $statuses }} 16 16 - {{ $success := index $c "success" }} 17 17 - {{ $fail := index $c "failed" }} 18 18 - {{ $timeout := index $c "timeout" }} 19 19 - {{ $empty := eq $total 0 }} 20 20 - {{ $allPass := eq $success $total }} 21 21 - {{ $allFail := eq $fail $total }} 22 22 - {{ $allTimeout := eq $timeout $total }} 23 23 - 24 24 - {{ if $empty }} 25 25 - {{ i "hourglass" "size-4 text-gray-600 dark:text-gray-400 " }} 26 26 - {{ else if $allPass }} 27 27 - {{ i "check" "size-4 text-green-600 dark:text-green-500" }} 28 28 - {{ else if $allFail }} 29 29 - {{ i "x" "size-4 text-red-600 dark:text-red-500" }} 30 30 - {{ else if $allTimeout }} 31 31 - {{ i "clock-alert" "size-4 text-orange-500" }} 32 32 - {{ else }} 33 33 - {{ $radius := f64 8 }} 34 34 - {{ $circumference := mulf64 2.0 (mulf64 3.1416 $radius) }} 35 35 - {{ $offset := 0.0 }} 36 36 - <svg class="w-4 h-4 transform -rotate-90" viewBox="0 0 20 20"> 37 37 - <circle cx="10" cy="10" r="{{ $radius }}" fill="none" class="stroke-gray-200 dark:stroke-gray-700" stroke-width="2"/> 38 38 - {{ range $kind, $count := $c }} 39 39 - {{ $colorClass := "" }} 40 40 - {{ if or (eq $kind "pending") (eq $kind "running") }} 41 41 - {{ $colorClass = "stroke-yellow-600 dark:stroke-yellow-500" }} 42 42 - {{ else if eq $kind "success" }} 43 43 - {{ $colorClass = "stroke-green-600 dark:stroke-green-500" }} 44 44 - {{ else if eq $kind "cancelled" }} 45 45 - {{ $colorClass = "stroke-gray-600 dark:stroke-gray-500" }} 46 46 - {{ else if eq $kind "timeout" }} 47 47 - {{ $colorClass = "stroke-orange-600 dark:stroke-orange-500" }} 48 48 - {{ else }} 49 49 - {{ $colorClass = "stroke-red-600 dark:stroke-red-500" }} 50 50 - {{ end }} 51 51 - {{ $percent := divf64 (f64 $count) (f64 $total) }} 52 52 - {{ $length := mulf64 $percent $circumference }} 53 53 - <circle 54 54 - cx="10" cy="10" r="{{ $radius }}" 55 55 - fill="none" 56 56 - class="{{ $colorClass }}" 57 57 - stroke-width="2" 58 58 - stroke-dasharray="{{ printf "%.2f %.2f" $length (subf64 $circumference $length) }}" 59 59 - stroke-dashoffset="{{ printf "%.2f" (negf64 $offset) }}" 60 60 - /> 61 61 - {{ $offset = addf64 $offset $length }} 62 62 - {{ end }} 63 63 - </svg> 64 64 - {{ end }} 65 65 - {{ end }}

+1 -1

appview/pages/templates/repo/pipelines/fragments/pipelineSymbolLong.html

··· 4 4 <div class="relative inline-block"> 5 5 <details class="relative"> 6 6 <summary class="cursor-pointer list-none"> 7 7 - {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" true) }} 7 7 + {{ template "repo/pipelines/fragments/pipelineSymbol" .Pipeline }} 8 8 </summary> 9 9 {{ template "repo/pipelines/fragments/tooltip" $ }} 10 10 </details>

+17 -17

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 p-2"> 25 25 + <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative"> 26 26 <button 27 27 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment" 28 28 hx-target="#actions-{{$roundNumber}}" 29 29 hx-swap="outerHtml" 30 30 - class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group"> 31 31 - {{ i "message-square-plus" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 30 30 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group"> 31 31 + {{ i "message-square-plus" "w-4 h-4" }} 32 32 + <span>comment</span> 32 33 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 33 33 - comment 34 34 </button> 35 35 {{ if .BranchDeleteStatus }} 36 36 <button 37 37 hx-delete="/{{ .BranchDeleteStatus.Repo.Did }}/{{ .BranchDeleteStatus.Repo.Name }}/branches" 38 38 hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }' 39 39 hx-swap="none" 40 40 - class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 40 40 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 41 41 {{ i "git-branch" "w-4 h-4" }} 42 42 <span>delete branch</span> 43 43 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} ··· 52 52 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge" 53 53 hx-swap="none" 54 54 hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?" 55 55 - class="btn-flat p-2 flex items-center gap-2 group" {{ $disabled }}> 56 56 - {{ i "git-merge" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 55 55 + class="btn p-2 flex items-center gap-2 group" {{ $disabled }}> 56 56 + {{ i "git-merge" "w-4 h-4" }} 57 57 + <span>merge{{if $stackCount}} {{$stackCount}}{{end}}</span> 57 58 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 58 58 - merge{{if $stackCount}} {{$stackCount}}{{end}} 59 59 </button> 60 60 {{ end }} 61 61 ··· 74 74 {{ end }} 75 75 76 76 hx-disabled-elt="#resubmitBtn" 77 77 - class="btn-flat p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }} 77 77 + class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }} 78 78 79 79 {{ if $disabled }} 80 80 title="Update this branch to resubmit this pull request" ··· 82 82 title="Resubmit this pull request" 83 83 {{ end }} 84 84 > 85 85 - {{ i "rotate-ccw" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 85 85 + {{ i "rotate-ccw" "w-4 h-4" }} 86 86 + <span>resubmit</span> 86 87 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 87 87 - resubmit 88 88 </button> 89 89 {{ end }} 90 90 ··· 92 92 <button 93 93 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close" 94 94 hx-swap="none" 95 95 - class="btn-flat p-2 flex items-center gap-2 group"> 96 96 - {{ i "ban" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 95 95 + class="btn p-2 flex items-center gap-2 group"> 96 96 + {{ i "ban" "w-4 h-4" }} 97 97 + <span>close</span> 97 98 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 98 98 - close 99 99 </button> 100 100 {{ end }} 101 101 ··· 103 103 <button 104 104 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen" 105 105 hx-swap="none" 106 106 - class="btn-flat p-2 flex items-center gap-2 group"> 107 107 - {{ i "refresh-ccw-dot" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 106 106 + class="btn p-2 flex items-center gap-2 group"> 107 107 + {{ i "refresh-ccw-dot" "w-4 h-4" }} 108 108 + <span>reopen</span> 108 109 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 109 109 - reopen 110 110 </button> 111 111 {{ end }} 112 112 </div>

+7 -6

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

··· 1 1 {{ define "repo/pulls/fragments/pullHeader" }} 2 2 - <header class="pb-2"> 2 2 + <header class="pb-4"> 3 3 <h1 class="text-2xl dark:text-white"> 4 4 {{ .Pull.Title | description }} 5 5 <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span> ··· 17 17 {{ $icon = "git-merge" }} 18 18 {{ end }} 19 19 20 20 - <section> 20 20 + <section class="mt-2"> 21 21 <div class="flex items-center gap-2"> 22 22 - <span 23 23 - class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm" 22 22 + <div 23 23 + id="state" 24 24 + class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}" 24 25 > 25 25 - {{ i $icon "w-3 h-3 mr-1.5 text-white" }} 26 26 + {{ i $icon "w-4 h-4 mr-1.5 text-white" }} 26 27 <span class="text-white">{{ .Pull.State.String }}</span> 27 27 - </span> 28 28 + </div> 28 29 <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1"> 29 30 opened by 30 31 {{ template "user/fragments/picHandleLink" .Pull.OwnerDid }}

+24 -39

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

··· 1 1 {{ define "repo/pulls/fragments/pullNewComment" }} 2 2 <div 3 3 id="pull-comment-card-{{ .RoundNumber }}" 4 4 - class="w-full flex flex-col gap-2"> 5 5 - {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }} 4 4 + class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2"> 5 5 + <div class="text-sm text-gray-500 dark:text-gray-400"> 6 6 + {{ resolve .LoggedInUser.Did }} 7 7 + </div> 6 8 <form 7 9 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment" 10 10 + hx-indicator="#create-comment-spinner" 8 11 hx-swap="none" 9 9 - hx-on::after-request="if(event.detail.successful) this.reset()" 10 10 - hx-disabled-elt="#reply-{{ .RoundNumber }}" 11 11 - class="w-full flex flex-wrap gap-2 group" 12 12 + class="w-full flex flex-wrap gap-2" 12 13 > 13 14 <textarea 14 15 name="body" 15 16 class="w-full p-2 rounded border border-gray-200" 16 16 - rows=8 17 17 placeholder="Add to the discussion..."></textarea 18 18 > 19 19 - {{ template "replyActions" . }} 19 19 + <button type="submit" class="btn flex items-center gap-2"> 20 20 + {{ i "message-square" "w-4 h-4" }} 21 21 + <span>comment</span> 22 22 + <span id="create-comment-spinner" class="group"> 23 23 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 24 24 + </span> 25 25 + </button> 26 26 + <button 27 27 + type="button" 28 28 + class="btn flex items-center gap-2 group" 29 29 + hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions" 30 30 + hx-swap="outerHTML" 31 31 + hx-target="#pull-comment-card-{{ .RoundNumber }}" 32 32 + > 33 33 + {{ i "x" "w-4 h-4" }} 34 34 + <span>cancel</span> 35 35 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 36 36 + </button> 20 37 <div id="pull-comment"></div> 21 38 </form> 22 39 </div> 23 40 {{ end }} 24 24 - 25 25 - {{ define "replyActions" }} 26 26 - <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm w-full"> 27 27 - {{ template "cancel" . }} 28 28 - {{ template "reply" . }} 29 29 - </div> 30 30 - {{ end }} 31 31 - 32 32 - {{ define "cancel" }} 33 33 - <button 34 34 - type="button" 35 35 - class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group" 36 36 - hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions" 37 37 - hx-swap="outerHTML" 38 38 - hx-target="#actions-{{.RoundNumber}}" 39 39 - > 40 40 - {{ i "x" "w-4 h-4" }} 41 41 - <span>cancel</span> 42 42 - </button> 43 43 - {{ end }} 44 44 - 45 45 - {{ define "reply" }} 46 46 - <button 47 47 - type="submit" 48 48 - id="reply-{{ .RoundNumber }}" 49 49 - class="btn-create flex items-center gap-2"> 50 50 - {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 51 51 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 52 52 - reply 53 53 - </button> 54 54 - {{ end }} 55 55 -

-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 }}

+1 -1

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

··· 18 18 {{ $lastSubmission := index .Submissions $latestRound }} 19 19 {{ $commentCount := len $lastSubmission.Comments }} 20 20 {{ if and $pipeline $pipeline.Id }} 21 21 - {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" true) }} 21 21 + {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }} 22 22 <span class="before:content-['·'] before:select-none text-gray-500 dark:text-gray-400"></span> 23 23 {{ end }} 24 24 <span>

+77 -334

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 - 17 9 {{ define "repoContentLayout" }} 18 18 - <div class="grid grid-cols-1 md:grid-cols-10 gap-y-2 gap-x-4 w-full"> 19 19 - <div class="col-span-1 md:col-span-7"> 20 20 - <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white h-full"> 10 10 + <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"> 12 12 + <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white"> 21 13 {{ block "repoContent" . }}{{ end }} 22 14 </section> 23 15 {{ block "repoAfter" . }}{{ end }} 24 16 </div> 25 25 - <div class="col-span-1 md:col-span-3 flex flex-col gap-6"> 17 17 + <div class="col-span-1 md:col-span-2 flex flex-col gap-6"> 26 18 {{ template "repo/fragments/labelPanel" 27 19 (dict "RepoInfo" $.RepoInfo 28 20 "Defs" $.LabelDefs ··· 34 26 "Backlinks" $.Backlinks) }} 35 27 {{ template "repo/fragments/externalLinkPanel" $.Pull.AtUri }} 36 28 </div> 37 37 - 38 38 - <style> 39 39 - #filesToggle:checked ~ div label[for="filesToggle"] .show-text { display: none; } 40 40 - #filesToggle:checked ~ div label[for="filesToggle"] .hide-text { display: inline; } 41 41 - #filesToggle:not(:checked) ~ div label[for="filesToggle"] .hide-text { display: none; } 42 42 - 43 43 - #filesToggle:checked ~ div div#files { width: 10vw; margin-right: 1rem; } 44 44 - #filesToggle:not(:checked) ~ div div#files { width: 0; display: hidden; margin-right: 0; } 45 45 - 46 46 - #subsToggle:checked ~ div div#subs { width: 25vw; margin-left: 1rem; } 47 47 - #subsToggle:not(:checked) ~ div div#subs { width: 0; display: hidden; margin-left: 0; } 48 48 - </style> 49 49 - 50 50 - <!-- Checkboxes must come first as siblings --> 51 51 - <input type="checkbox" id="filesToggle" class="peer/files hidden" checked/> 52 52 - <input type="checkbox" id="subsToggle" class="peer/subs hidden" checked/> 53 53 - 54 54 - <!-- Top bar with controls --> 55 55 - <div class="sticky top-0 z-30 bg-slate-100 dark:bg-gray-900 flex items-center gap-2 col-span-full h-12"> 56 56 - <label for="filesToggle" class="inline-flex items-center justify-center rounded cursor-pointer p-2 text-normal font-normal normalcase"> 57 57 - <span class="show-text">{{ i "panel-left-open" "size-5" }}</span> 58 58 - <span class="hide-text">{{ i "panel-left-close" "size-5" }}</span> 59 59 - </label> 60 60 - {{ template "repo/fragments/diffStatPill" .Diff.Stat }} 61 61 - {{ .Diff.Stat.FilesChanged }} changed file{{ if ne .Diff.Stat.FilesChanged 1 }}s{{ end }} 62 62 - <div class="flex-grow"></div> 63 63 - {{ template "repo/fragments/diffOpts" .DiffOpts }} 64 64 - <label for="subsToggle" class="inline-flex items-center justify-center rounded cursor-pointer p-2"> 65 65 - {{ i "message-square-more" "size-5" }} 66 66 - </label> 67 67 - </div> 68 68 - 69 69 - <div class="flex col-span-full"> 70 70 - <!-- left panel --> 71 71 - <div id="files" class="w-0 overflow-hidden sticky top-12 max-h-screen overflow-y-auto pb-12"> 72 72 - {{ template "repo/fragments/diffChangedFiles" .Diff }} 73 73 - </div> 74 74 - 75 75 - <!-- main content --> 76 76 - <div class="flex-1 min-w-0 sticky top-12 pb-12"> 77 77 - {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} 78 78 - </div> 79 79 - 80 80 - <!-- right panel --> 81 81 - <div id="subs" class="w-0 overflow-hidden max-h-screen flex flex-col sticky top-12 pb-12"> 82 82 - <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"> 83 83 - <h2 class="font-bold uppercase">history</h2> 84 84 - </div> 85 85 - <div class="flex flex-col-reverse gap-4 overflow-y-auto"> 86 86 - {{ template "submissions2" . }} 87 87 - </div> 88 88 - </div> 89 89 - </div> 90 29 </div> 91 30 {{ end }} 92 31 93 32 {{ define "repoContent" }} 94 33 {{ template "repo/pulls/fragments/pullHeader" . }} 34 34 + 95 35 {{ if .Pull.IsStacked }} 96 36 <div class="mt-8"> 97 37 {{ template "repo/pulls/fragments/pullStack" . }} ··· 100 40 {{ end }} 101 41 102 42 {{ define "repoAfter" }} 103 103 - <div id="pull-close"></div> 104 104 - <div id="pull-reopen"></div> 105 105 - {{ end }} 106 106 - 107 107 - {{ define "submissions2" }} 108 108 - {{ $lastIdx := sub (len .Pull.Submissions) 1 }} 109 109 - {{ range $ridx, $item := reverse .Pull.Submissions }} 110 110 - {{ $idx := sub $lastIdx $ridx }} 111 111 - <div class="rounded border border-gray-200 dark:border-gray-700 w-full shadow-sm bg-gray-50 dark:bg-gray-800/50"> 112 112 - {{ with $item }} 113 113 - {{ $patches := .AsFormatPatch }} 114 114 - {{ $round := .RoundNumber }} 115 115 - <div class="rounded px-6 py-4 bg-white dark:bg-gray-800 flex gap-2"> 116 116 - <div class="flex-shrink-0"> 117 117 - <img 118 118 - src="{{ tinyAvatar $.Pull.OwnerDid }}" 119 119 - alt="" 120 120 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 121 121 - /> 122 122 - </div> 123 123 - <!-- right column: name and body in two rows --> 124 124 - <div class="flex-1 min-w-0 flex flex-col gap-1"> 125 125 - <div class="flex gap-2 items-center justify-between mb-1"> 126 126 - <span class="inline-flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400"> 127 127 - {{ resolve $.Pull.OwnerDid }} submitted v{{ $round }} 128 128 - <span class="select-none before:content-['\00B7']"></span> 129 129 - <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500" href="#round-#{{ $round }}">{{ template "repo/fragments/shortTimeAgo" .Created }}</a> 130 130 - </span> 131 131 - {{ if ne $idx 0 }} 132 132 - <a class="flex items-center gap-2 no-underline hover:no-underline text-sm" 133 133 - hx-boost="true" 134 134 - href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{$round}}/interdiff"> 135 135 - {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} 136 136 - <span class="hidden md:inline">interdiff</span> 137 137 - </a> 138 138 - {{ end }} 139 139 - </div> 140 140 - <details class="group"> 141 141 - <summary class="list-none cursor-pointer flex items-center gap-2"> 142 142 - <span>{{ i "git-commit-horizontal" "w-4 h-4" }}</span> 143 143 - {{ len $patches }} commit{{ if ne (len $patches) 1 }}s{{ end }} 144 144 - </summary> 145 145 - {{ range $patches }} 146 146 - <div id="commit-{{.SHA}}" class="py-1 relative w-full md:max-w-3/5 md:w-fit flex flex-col text-gray-600 dark:text-gray-300"> 147 147 - <div class="flex items-baseline gap-2"> 148 148 - <div> 149 149 - <!-- attempt to resolve $fullRepo: this is possible only on non-deleted forks and branches --> 150 150 - {{ $fullRepo := "" }} 151 151 - {{ if and $.Pull.IsForkBased $.Pull.PullSource.Repo }} 152 152 - {{ $fullRepo = printf "%s/%s" $.Pull.OwnerDid $.Pull.PullSource.Repo.Name }} 153 153 - {{ else if $.Pull.IsBranchBased }} 154 154 - {{ $fullRepo = $.RepoInfo.FullName }} 155 155 - {{ end }} 156 156 - 157 157 - <!-- if $fullRepo was resolved, link to it, otherwise just span without a link --> 158 158 - {{ if $fullRepo }} 159 159 - <a href="/{{ $fullRepo }}/commit/{{ .SHA }}" class="font-mono text-gray-600 dark:text-gray-300">{{ slice .SHA 0 8 }}</a> 160 160 - {{ else }} 161 161 - <span class="font-mono">{{ slice .SHA 0 8 }}</span> 162 162 - {{ end }} 163 163 - </div> 164 164 - 165 165 - <div> 166 166 - <span>{{ .Title | description }}</span> 167 167 - {{ if gt (len .Body) 0 }} 168 168 - <button 169 169 - 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" 170 170 - hx-on:click="document.getElementById('body-{{$round}}-{{.SHA}}').classList.toggle('hidden')" 171 171 - > 172 172 - {{ i "ellipsis" "w-3 h-3" }} 173 173 - </button> 174 174 - {{ end }} 175 175 - {{ if gt (len .Body) 0 }} 176 176 - <p id="body-{{$round}}-{{.SHA}}" class="hidden mt-1 text-sm pb-2">{{ nl2br .Body }}</p> 177 177 - {{ end }} 178 178 - </div> 179 179 - </div> 180 180 - </div> 181 181 - {{ end }} 182 182 - </details> 183 183 - <div> 184 184 - {{ block "pipelineStatus" (list $ .) }} {{ end }} 185 185 - </div> 186 186 - {{ if eq $lastIdx .RoundNumber }} 187 187 - {{ block "mergeCheck" $ }} {{ end }} 188 188 - {{ end }} 189 189 - </div> 190 190 - </div> 191 191 - <div class="relative ml-10 border-l-2 border-gray-200 dark:border-gray-700"> 192 192 - {{ range $cidx, $c := .Comments }} 193 193 - <div id="comment-{{$c.ID}}" class="flex gap-2 -ml-4 py-4 w-full mx-auto"> 194 194 - <!-- left column: profile picture --> 195 195 - <div class="flex-shrink-0"> 196 196 - <img 197 197 - src="{{ tinyAvatar $c.OwnerDid }}" 198 198 - alt="" 199 199 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 200 200 - /> 201 201 - </div> 202 202 - <!-- right column: name and body in two rows --> 203 203 - <div class="flex-1 min-w-0"> 204 204 - <!-- Row 1: Author and timestamp --> 205 205 - <div class="text-sm text-gray-500 dark:text-gray-400 flex items-center gap-1"> 206 206 - <span>{{ resolve $c.OwnerDid }}</span> 207 207 - <span class="before:content-['·']"></span> 208 208 - <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> 209 209 - </div> 210 210 - <!-- Row 2: Body text --> 211 211 - <div class="prose dark:prose-invert mt-1"> 212 212 - {{ $c.Body | markdown }} 213 213 - </div> 214 214 - </div> 215 215 - </div> 216 216 - {{ end }} 217 217 - </div> 218 218 - {{ end }} 219 219 - {{ if eq $lastIdx .RoundNumber }} 220 220 - {{ block "mergeStatus" $ }} {{ end }} 221 221 - {{ block "resubmitStatus" $ }} {{ end }} 222 222 - {{ end }} 223 223 - {{ if $.LoggedInUser }} 224 224 - {{ template "repo/pulls/fragments/pullActions" 225 225 - (dict 226 226 - "LoggedInUser" $.LoggedInUser 227 227 - "Pull" $.Pull 228 228 - "RepoInfo" $.RepoInfo 229 229 - "RoundNumber" .RoundNumber 230 230 - "MergeCheck" $.MergeCheck 231 231 - "ResubmitCheck" $.ResubmitCheck 232 232 - "BranchDeleteStatus" $.BranchDeleteStatus 233 233 - "Stack" $.Stack) }} 234 234 - {{ else }} 235 235 - <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"> 236 236 - <a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2"> 237 237 - sign up 238 238 - </a> 239 239 - <span class="text-gray-500 dark:text-gray-400">or</span> 240 240 - <a href="/login" class="underline">login</a> 241 241 - to add to the discussion 242 242 - </div> 243 243 - {{ end }} 244 244 - </div> 245 245 - {{ end }} 246 246 - {{ end }} 247 247 - 248 248 - {{ define "newComment" }} 249 249 - {{ $root := index . 0 }} 250 250 - {{ $submission := index . 1 }} 251 251 - <form 252 252 - id="comment-form" 253 253 - hx-post="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ $submission.RoundNumber }}/comment" 254 254 - hx-on::after-request="if(event.detail.successful) this.reset()" 255 255 - > 256 256 - <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full"> 257 257 - <div class="text-sm pb-2 text-gray-500 dark:text-gray-400"> 258 258 - {{ template "user/fragments/picHandleLink" $root.LoggedInUser.Did }} 43 43 + <section id="submissions" class="mt-4"> 44 44 + <div class="flex flex-col gap-4"> 45 45 + {{ block "submissions" . }} {{ end }} 259 46 </div> 260 260 - <textarea 261 261 - id="comment-textarea" 262 262 - name="body" 263 263 - class="w-full p-2 rounded border border-gray-200 dark:border-gray-700" 264 264 - placeholder="Add to the discussion" 265 265 - rows="8" 266 266 - ></textarea> 267 267 - <div id="pull-comment"></div> 268 268 - </div> 269 269 - {{ template "replyActions" . }} 270 270 - </form> 271 271 - {{ end }} 47 47 + </section> 272 48 273 273 - {{ define "replyActions" }} 274 274 - <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm"> 275 275 - {{ template "cancel" . }} 276 276 - {{ template "reply" . }} 277 277 - </div> 278 278 - {{ end }} 279 279 - 280 280 - {{ define "cancel" }} 281 281 - <button 282 282 - class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group" 283 283 - hx-get="TODO" 284 284 - hx-target="TODO" 285 285 - hx-swap="outerHTML"> 286 286 - {{ i "x" "size-4" }} 287 287 - cancel 288 288 - </button> 289 289 - {{ end }} 290 290 - 291 291 - {{ define "reply" }} 292 292 - <button 293 293 - id="TODO" 294 294 - type="submit" 295 295 - class="btn-create flex items-center gap-2 no-underline hover:no-underline"> 296 296 - {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 297 297 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 298 298 - reply 299 299 - </button> 49 49 + <div id="pull-close"></div> 50 50 + <div id="pull-reopen"></div> 300 51 {{ end }} 301 52 302 53 {{ define "submissions" }} ··· 463 214 {{ end }} 464 215 {{ end }} 465 216 466 466 - {{ define "mergeCheck" }} 467 467 - {{ $isOpen := .Pull.State.IsOpen }} 468 468 - {{ if and $isOpen .MergeCheck .MergeCheck.Error }} 469 469 - <div class="flex items-center gap-2"> 470 470 - {{ i "triangle-alert" "w-4 h-4 text-red-500 dark:text-red-300" }} 471 471 - {{ .MergeCheck.Error }} 472 472 - </div> 473 473 - {{ else if and $isOpen .MergeCheck .MergeCheck.IsConflicted }} 474 474 - <details class="group"> 475 475 - <summary class="flex items-center justify-between cursor-pointer list-none"> 476 476 - <div class="flex items-center gap-2 "> 477 477 - {{ i "triangle-alert" "w-4 h-4" }} 478 478 - <span class="font-medium">merge conflicts detected</span> 479 479 - </div> 480 480 - <div> 481 481 - <span class="group-open:hidden inline">{{ i "chevrons-up-down" "w-4 h-4" }}</span> 482 482 - <span class="hidden group-open:inline">{{ i "chevrons-down-up" "w-4 h-4" }}</span> 483 483 - </div> 484 484 - </summary> 485 485 - {{ if gt (len .MergeCheck.Conflicts) 0 }} 486 486 - <ul class="space-y-1 mt-2"> 487 487 - {{ range .MergeCheck.Conflicts }} 488 488 - {{ if .Filename }} 489 489 - <li class="flex items-center"> 490 490 - {{ i "file-warning" "inline-flex w-4 h-4 mr-1.5 text-red-500 dark:text-red-300 flex-shrink-0" }} 491 491 - <span class="font-mono" style="word-break: keep-all; overflow-wrap: break-word;">{{ .Filename }}</span> 492 492 - </li> 493 493 - {{ else if .Reason }} 494 494 - <li class="flex items-center"> 495 495 - {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 496 496 - <span>{{.Reason}}</span> 497 497 - </li> 498 498 - {{ end }} 499 499 - {{ end }} 500 500 - </ul> 501 501 - {{ end }} 502 502 - </details> 503 503 - {{ else if and $isOpen .MergeCheck }} 504 504 - <div class="flex items-center gap-2"> 505 505 - {{ i "check" "w-4 h-4 text-green-600 dark:text-green-500" }} 506 506 - <span>no conflicts, ready to merge</span> 507 507 - </div> 508 508 - {{ end }} 509 509 - {{ end }} 510 510 - 511 217 {{ define "mergeStatus" }} 512 218 {{ if .Pull.State.IsClosed }} 513 513 - <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"> 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"> 514 220 <div class="flex items-center gap-2 text-black dark:text-white"> 515 221 {{ i "ban" "w-4 h-4" }} 516 222 <span class="font-medium">closed without merging</span ··· 518 224 </div> 519 225 </div> 520 226 {{ else if .Pull.State.IsMerged }} 521 521 - <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative"> 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"> 522 228 <div class="flex items-center gap-2 text-purple-500 dark:text-purple-300"> 523 229 {{ i "git-merge" "w-4 h-4" }} 524 230 <span class="font-medium">pull request successfully merged</span ··· 526 232 </div> 527 233 </div> 528 234 {{ else if .Pull.State.IsDeleted }} 529 529 - <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative"> 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"> 530 236 <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 531 237 {{ i "git-pull-request-closed" "w-4 h-4" }} 532 238 <span class="font-medium">This pull has been deleted (possibly by jj abandon or jj squash)</span> 533 239 </div> 534 240 </div> 241 241 + {{ 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"> 243 243 + <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 244 244 + {{ i "triangle-alert" "w-4 h-4" }} 245 245 + <span class="font-medium">{{ .MergeCheck.Error }}</span> 246 246 + </div> 247 247 + </div> 248 248 + {{ 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> 255 255 + {{ if gt (len .MergeCheck.Conflicts) 0 }} 256 256 + <ul class="space-y-1"> 257 257 + {{ range .MergeCheck.Conflicts }} 258 258 + {{ 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> 263 263 + {{ else if .Reason }} 264 264 + <li class="flex items-center"> 265 265 + {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 266 266 + <span>{{.Reason}}</span> 267 267 + </li> 268 268 + {{ end }} 269 269 + {{ end }} 270 270 + </ul> 271 271 + {{ end }} 272 272 + </div> 273 273 + </div> 274 274 + {{ 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"> 276 276 + <div class="flex items-center gap-2 text-green-500 dark:text-green-300"> 277 277 + {{ i "circle-check-big" "w-4 h-4" }} 278 278 + <span class="font-medium">no conflicts, ready to merge</span> 279 279 + </div> 280 280 + </div> 535 281 {{ end }} 536 282 {{ end }} 537 283 538 284 {{ define "resubmitStatus" }} 539 285 {{ if .ResubmitCheck.Yes }} 540 540 - <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative"> 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"> 541 287 <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> 542 288 {{ i "triangle-alert" "w-4 h-4" }} 543 289 <span class="font-medium">this branch has been updated, consider resubmitting</span> ··· 553 299 {{ with $pipeline }} 554 300 {{ $id := .Id }} 555 301 {{ if .Statuses }} 556 556 - <details> 557 557 - <summary class="cursor-pointer list-none">{{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" false) }}</summary> 558 558 - <div class="my-2 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"> 559 559 - {{ range $name, $all := .Statuses }} 560 560 - <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"> 561 561 - <div 562 562 - class="flex gap-2 items-center justify-between p-2"> 563 563 - {{ $lastStatus := $all.Latest }} 564 564 - {{ $kind := $lastStatus.Status.String }} 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"> 303 303 + {{ range $name, $all := .Statuses }} 304 304 + <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 305 + <div 306 306 + class="flex gap-2 items-center justify-between p-2"> 307 307 + {{ $lastStatus := $all.Latest }} 308 308 + {{ $kind := $lastStatus.Status.String }} 565 309 566 566 - <div id="left" class="flex items-center gap-2 flex-shrink-0"> 567 567 - {{ template "repo/pipelines/fragments/workflowSymbol" $all }} 568 568 - {{ $name }} 569 569 - </div> 570 570 - <div id="right" class="flex items-center gap-2 flex-shrink-0"> 571 571 - <span class="font-bold">{{ $kind }}</span> 572 572 - {{ if .TimeTaken }} 573 573 - {{ template "repo/fragments/duration" .TimeTaken }} 574 574 - {{ else }} 575 575 - {{ template "repo/fragments/shortTimeAgo" $lastStatus.Created }} 576 576 - {{ end }} 577 577 - </div> 578 578 - </div> 579 579 - </a> 580 580 - {{ end }} 310 310 + <div id="left" class="flex items-center gap-2 flex-shrink-0"> 311 311 + {{ template "repo/pipelines/fragments/workflowSymbol" $all }} 312 312 + {{ $name }} 313 313 + </div> 314 314 + <div id="right" class="flex items-center gap-2 flex-shrink-0"> 315 315 + <span class="font-bold">{{ $kind }}</span> 316 316 + {{ if .TimeTaken }} 317 317 + {{ template "repo/fragments/duration" .TimeTaken }} 318 318 + {{ else }} 319 319 + {{ template "repo/fragments/shortTimeAgo" $lastStatus.Created }} 320 320 + {{ end }} 321 321 + </div> 581 322 </div> 582 582 - </details> 323 323 + </a> 324 324 + {{ end }} 325 325 + </div> 583 326 {{ end }} 584 327 {{ end }} 585 328 {{ end }}

+1 -1

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

··· 136 136 {{ $pipeline := index $.Pipelines .LatestSha }} 137 137 {{ if and $pipeline $pipeline.Id }} 138 138 <span class="before:content-['·']"></span> 139 139 - {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" true) }} 139 139 + {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }} 140 140 {{ end }} 141 141 142 142 {{ $state := .Labels }}

+2 -11

appview/pulls/pulls.go

··· 232 232 defs[l.AtUri().String()] = &l 233 233 } 234 234 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{ 235 235 + s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 243 236 LoggedInUser: user, 244 237 RepoInfo: s.repoResolver.GetRepoInfo(r, user), 245 238 Pull: pull, ··· 250 243 MergeCheck: mergeCheckResponse, 251 244 ResubmitCheck: resubmitResult, 252 245 Pipelines: m, 253 253 - Diff: &diff, 254 254 - DiffOpts: diffOpts, 255 246 256 247 OrderedReactionKinds: models.OrderedReactionKinds, 257 248 Reactions: reactionMap, 258 249 UserReacted: userReactions, 259 250 260 251 LabelDefs: defs, 261 261 - })) 252 252 + }) 262 253 } 263 254 264 255 func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, stack models.Stack) types.MergeCheckResponse {

+5 -6

docs/template.html

··· 120 120 $endif$ 121 121 $endif$ 122 122 </header> 123 123 - $endif$ 124 124 - 125 125 - $if(abstract)$ 126 126 - <article class="prose dark:prose-invert max-w-none"> 127 127 - $abstract$ 128 128 - </article> 123 123 + $if(abstract)$ 124 124 + <article class="prose dark:prose-invert max-w-none"> 125 125 + $abstract$ 126 126 + </article> 127 127 + $endif$ 129 128 $endif$ 130 129 131 130 <article class="prose dark:prose-invert max-w-none">

-13

input.css

··· 124 124 dark:text-gray-100 dark:before:bg-gray-800 dark:before:border-gray-700; 125 125 } 126 126 127 127 - .btn-flat { 128 128 - @apply relative z-10 inline-flex min-h-[30px] cursor-pointer items-center justify-center 129 129 - bg-transparent px-2 pb-[0.2rem] text-sm text-gray-900 130 130 - before:absolute before:inset-0 before:-z-10 before:block before:rounded 131 131 - before:border before:border-gray-200 before:bg-white 132 132 - before:content-[''] before:transition-all before:duration-150 before:ease-in-out 133 133 - hover:before:bg-gray-50 134 134 - dark:hover:before:bg-gray-700 135 135 - focus:outline-none focus-visible:before:outline focus-visible:before:outline-2 focus-visible:before:outline-gray-400 136 136 - disabled:cursor-not-allowed disabled:opacity-50 137 137 - dark:text-gray-100 dark:before:bg-gray-800 dark:before:border-gray-700; 138 138 - } 139 139 - 140 127 .btn-create { 141 128 @apply btn text-white 142 129 before:bg-green-600 hover:before:bg-green-700

+3

nix/modules/appview.nix

··· 1 1 { 2 2 + pkgs, 2 3 config, 3 4 lib, 4 5 ... ··· 259 260 after = ["redis-appview.service" "network-online.target"]; 260 261 requires = ["redis-appview.service"]; 261 262 wants = ["network-online.target"]; 263 263 + 264 264 + path = [pkgs.diffutils]; 262 265 263 266 serviceConfig = { 264 267 Type = "simple";

+2 -2

spindle/models/models.go

··· 53 53 StatusKindRunning, 54 54 } 55 55 FinishStates [4]StatusKind = [4]StatusKind{ 56 56 - StatusKindFailed, 57 57 - StatusKindTimeout, 58 56 StatusKindCancelled, 57 57 + StatusKindFailed, 59 58 StatusKindSuccess, 59 59 + StatusKindTimeout, 60 60 } 61 61 ) 62 62

+2 -4

types/diff.go

··· 27 27 } 28 28 29 29 type DiffStat struct { 30 30 - Insertions int64 31 31 - Deletions int64 32 32 - FilesChanged int 30 30 + Insertions int64 31 31 + Deletions int64 33 32 } 34 33 35 34 func (d *Diff) Stats() DiffStat { ··· 38 37 stats.Insertions += f.LinesAdded 39 38 stats.Deletions += f.LinesDeleted 40 39 } 41 41 - stats.FilesChanged = len(d.TextFragments) 42 40 return stats 43 41 } 44 42