commit 8e4a85c0301c01cdbdb8565099bc312985ff1864 · nel.pet/core

+19 -1

appview/db/pulls.go

···

       1
       1
        
       package db

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"cmp"

     

       4
       5
        
       	"database/sql"

     

       5
       6
        
       	"fmt"

     

       6
       7
        
       	"maps"

     
···

       229
       230
        
       			p.Submissions = submissions

     

       230
       231
        
       		}

     

       231
       232
        
       	}

     

       233
       233
       +
       	// collect allLabels for each issue

     

       234
       234
       +
       	allLabels, err := GetLabels(e, FilterIn("subject", pullAts))

     

       235
       235
       +
       	if err != nil {

     

       236
       236
       +
       		return nil, fmt.Errorf("failed to query labels: %w", err)

     

       237
       237
       +
       	}

     

       238
       238
       +
       	for pullAt, labels := range allLabels {

     

       239
       239
       +
       		if p, ok := pulls[pullAt]; ok {

     

       240
       240
       +
       			p.Labels = labels

     

       241
       241
       +
       		}

     

       242
       242
       +
       	}

     

       232
       243
        
       

     

       233
       244
        
       	orderedByPullId := []*models.Pull{}

     

       234
       245
        
       	for _, p := range pulls {

     
···

       339
       350
        
       		}

     

       340
       351
        
       	}

     

       341
       352
        
       

     

       342
       342
       -
       	// order the submissions by pull_at

     

       353
       353
       +
       	// group the submissions by pull_at

     

       343
       354
        
       	m := make(map[syntax.ATURI][]*models.PullSubmission)

     

       344
       355
        
       	for _, s := range submissionMap {

     

       345
       356
        
       		m[s.PullAt] = append(m[s.PullAt], s)

     

       357
       357
       +
       	}

     

       358
       358
       +
       

     

       359
       359
       +
       	// sort each one by round number

     

       360
       360
       +
       	for _, s := range m {

     

       361
       361
       +
       		slices.SortFunc(s, func(a, b *models.PullSubmission) int {

     

       362
       362
       +
       			return cmp.Compare(a.RoundNumber, b.RoundNumber)

     

       363
       363
       +
       		})

     

       346
       364
        
       	}

     

       347
       365
        
       

     

       348
       366
        
       	return m, nil

+5 -1

appview/issues/issues.go

···

       798
       798
        
       		return

     

       799
       799
        
       	}

     

       800
       800
        
       

     

       801
       801
       -
       	labelDefs, err := db.GetLabelDefinitions(rp.db, db.FilterIn("at_uri", f.Repo.Labels))

     

       801
       801
       +
       	labelDefs, err := db.GetLabelDefinitions(

     

       802
       802
       +
       		rp.db,

     

       803
       803
       +
       		db.FilterIn("at_uri", f.Repo.Labels),

     

       804
       804
       +
       		db.FilterContains("scope", tangled.RepoIssueNSID),

     

       805
       805
       +
       	)

     

       802
       806
        
       	if err != nil {

     

       803
       807
        
       		log.Println("failed to fetch labels", err)

     

       804
       808
        
       		rp.pages.Error503(w)

+44 -1

appview/models/pull.go

···

       77
       77
        
       	PullSource *PullSource

     

       78
       78
        
       

     

       79
       79
        
       	// optionally, populate this when querying for reverse mappings

     

       80
       80
       -
       	Repo *Repo

     

       80
       80
       +
       	Labels LabelState

     

       81
       81
       +
       	Repo   *Repo

     

       81
       82
        
       }

     

       82
       83
        
       

     

       83
       84
        
       func (p Pull) AsRecord() tangled.RepoPull {

     
···

       206
       207
        
       	return p.StackId != ""

     

       207
       208
        
       }

     

       208
       209
        
       

     

       210
       210
       +
       func (p *Pull) Participants() []string {

     

       211
       211
       +
       	participantSet := make(map[string]struct{})

     

       212
       212
       +
       	participants := []string{}

     

       213
       213
       +
       

     

       214
       214
       +
       	addParticipant := func(did string) {

     

       215
       215
       +
       		if _, exists := participantSet[did]; !exists {

     

       216
       216
       +
       			participantSet[did] = struct{}{}

     

       217
       217
       +
       			participants = append(participants, did)

     

       218
       218
       +
       		}

     

       219
       219
       +
       	}

     

       220
       220
       +
       

     

       221
       221
       +
       	addParticipant(p.OwnerDid)

     

       222
       222
       +
       

     

       223
       223
       +
       	for _, s := range p.Submissions {

     

       224
       224
       +
       		for _, sp := range s.Participants() {

     

       225
       225
       +
       			addParticipant(sp)

     

       226
       226
       +
       		}

     

       227
       227
       +
       	}

     

       228
       228
       +
       

     

       229
       229
       +
       	return participants

     

       230
       230
       +
       }

     

       231
       231
       +
       

     

       209
       232
        
       func (s PullSubmission) IsFormatPatch() bool {

     

       210
       233
        
       	return patchutil.IsFormatPatch(s.Patch)

     

       211
       234
        
       }

     
···

       218
       241
        
       	}

     

       219
       242
        
       

     

       220
       243
        
       	return patches

     

       244
       244
       +
       }

     

       245
       245
       +
       

     

       246
       246
       +
       func (s *PullSubmission) Participants() []string {

     

       247
       247
       +
       	participantSet := make(map[string]struct{})

     

       248
       248
       +
       	participants := []string{}

     

       249
       249
       +
       

     

       250
       250
       +
       	addParticipant := func(did string) {

     

       251
       251
       +
       		if _, exists := participantSet[did]; !exists {

     

       252
       252
       +
       			participantSet[did] = struct{}{}

     

       253
       253
       +
       			participants = append(participants, did)

     

       254
       254
       +
       		}

     

       255
       255
       +
       	}

     

       256
       256
       +
       

     

       257
       257
       +
       	addParticipant(s.PullAt.Authority().String())

     

       258
       258
       +
       

     

       259
       259
       +
       	for _, c := range s.Comments {

     

       260
       260
       +
       		addParticipant(c.OwnerDid)

     

       261
       261
       +
       	}

     

       262
       262
       +
       

     

       263
       263
       +
       	return participants

     

       221
       264
        
       }

     

       222
       265
        
       

     

       223
       266
        
       type Stack []*Pull

appview/pages/pages.go

···

       1087
       1087
        
       	FilteringBy  models.PullState

     

       1088
       1088
        
       	Stacks       map[string]models.Stack

     

       1089
       1089
        
       	Pipelines    map[string]models.Pipeline

     

       1090
       1090
       +
       	LabelDefs    map[string]*models.LabelDefinition

     

       1090
       1091
        
       }

     

       1091
       1092
        
       

     

       1092
       1093
        
       func (p *Pages) RepoPulls(w io.Writer, params RepoPullsParams) error {

     
···

       1126
       1127
        
       	OrderedReactionKinds []models.ReactionKind

     

       1127
       1128
        
       	Reactions            map[models.ReactionKind]int

     

       1128
       1129
        
       	UserReacted          map[models.ReactionKind]bool

     

       1130
       1130
       +
       

     

       1131
       1131
       +
       	LabelDefs map[string]*models.LabelDefinition

     

       1129
       1132
        
       }

     

       1130
       1133
        
       

     

       1131
       1134
        
       func (p *Pages) RepoSinglePull(w io.Writer, params RepoSinglePullParams) error {

+1 -1

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

···

       1
       1
        
       {{ define "repo/fragments/labelPanel" }}

     

       2
       2
       -
         <div id="label-panel" class="flex flex-col gap-6">

     

       2
       2
       +
         <div id="label-panel" class="flex flex-col gap-6 px-6 md:px-0">

     

       3
       3
        
           {{ template "basicLabels" . }}

     

       4
       4
        
           {{ template "kvLabels" . }}

     

       5
       5
        
         </div>

+26

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

···

       1
       1
       +
       {{ define "repo/fragments/participants" }}

     

       2
       2
       +
         {{ $all := . }}

     

       3
       3
       +
         {{ $ps := take $all 5 }}

     

       4
       4
       +
         <div class="px-6 md:px-0">

     

       5
       5
       +
           <div class="py-1 flex items-center text-sm">

     

       6
       6
       +
             <span class="font-bold text-gray-500 dark:text-gray-400 capitalize">Participants</span>

     

       7
       7
       +
             <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 ml-1">{{ len $all }}</span>

     

       8
       8
       +
           </div>

     

       9
       9
       +
           <div class="flex items-center -space-x-3 mt-2">

     

       10
       10
       +
             {{ $c := "z-50 z-40 z-30 z-20 z-10" }}

     

       11
       11
       +
             {{ range $i, $p := $ps }}

     

       12
       12
       +
               <img

     

       13
       13
       +
                   src="{{ tinyAvatar . }}"

     

       14
       14
       +
                   alt=""

     

       15
       15
       +
                   class="rounded-full h-8 w-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0"

     

       16
       16
       +
               />

     

       17
       17
       +
             {{ end }}

     

       18
       18
       +
       

     

       19
       19
       +
             {{ if gt (len $all) 5 }}

     

       20
       20
       +
               <span class="pl-4 text-gray-500 dark:text-gray-400 text-sm">

     

       21
       21
       +
                 +{{ sub (len $all) 5 }}

     

       22
       22
       +
               </span>

     

       23
       23
       +
             {{ end }}

     

       24
       24
       +
           </div>

     

       25
       25
       +
         </div>

     

       26
       26
       +
       {{ end }}

+1 -27

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

···

       22
       22
        
                     "Defs" $.LabelDefs

     

       23
       23
        
                     "Subject" $.Issue.AtUri

     

       24
       24
        
                     "State" $.Issue.Labels) }}

     

       25
       25
       -
             {{ template "issueParticipants" . }}

     

       25
       25
       +
             {{ template "repo/fragments/participants" $.Issue.Participants }}

     

       26
       26
        
           </div>

     

       27
       27
        
         </div>

     

       28
       28
        
       {{ end }}

     
···

       122
       122
        
         </div>

     

       123
       123
        
       {{ end }}

     

       124
       124
        
       

     

       125
       125
       -
       {{ define "issueParticipants" }}

     

       126
       126
       -
         {{ $all := .Issue.Participants }}

     

       127
       127
       -
         {{ $ps := take $all 5 }}

     

       128
       128
       -
         <div>

     

       129
       129
       -
           <div class="py-1 flex items-center text-sm">

     

       130
       130
       -
             <span class="font-bold text-gray-500 dark:text-gray-400 capitalize">Participants</span>

     

       131
       131
       -
             <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 ml-1">{{ len $all }}</span>

     

       132
       132
       -
           </div>

     

       133
       133
       -
           <div class="flex items-center -space-x-3 mt-2">

     

       134
       134
       -
             {{ $c := "z-50 z-40 z-30 z-20 z-10" }}

     

       135
       135
       -
             {{ range $i, $p := $ps }}

     

       136
       136
       -
               <img

     

       137
       137
       -
                   src="{{ tinyAvatar . }}"

     

       138
       138
       -
                   alt=""

     

       139
       139
       -
                   class="rounded-full h-8 w-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0"

     

       140
       140
       -
               />

     

       141
       141
       -
             {{ end }}

     

       142
       142
       -
       

     

       143
       143
       -
             {{ if gt (len $all) 5 }}

     

       144
       144
       -
               <span class="pl-4 text-gray-500 dark:text-gray-400 text-sm">

     

       145
       145
       -
                 +{{ sub (len $all) 5 }}

     

       146
       146
       -
               </span>

     

       147
       147
       -
             {{ end }}

     

       148
       148
       -
           </div>

     

       149
       149
       -
         </div>

     

       150
       150
       -
       {{ end }}

     

       151
       125
        
       

     

       152
       126
        
       {{ define "repoAfter" }}

     

       153
       127
        
         <div class="flex flex-col gap-4 mt-4">

+30 -12

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

···

       9
       9
        
           {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}

     

       10
       10
        
       {{ end }}

     

       11
       11
        
       

     

       12
       12
       +
       {{ define "repoContentLayout" }}

     

       13
       13
       +
         <div class="grid grid-cols-1 md:grid-cols-10 gap-4 w-full">

     

       14
       14
       +
           <div class="col-span-1 md:col-span-8">

     

       15
       15
       +
             <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white">

     

       16
       16
       +
               {{ block "repoContent" . }}{{ end }}

     

       17
       17
       +
             </section>

     

       18
       18
       +
             {{ block "repoAfter" . }}{{ end }}

     

       19
       19
       +
           </div>

     

       20
       20
       +
           <div class="col-span-1 md:col-span-2 flex flex-col gap-6">

     

       21
       21
       +
             {{ template "repo/fragments/labelPanel"

     

       22
       22
       +
               (dict "RepoInfo" $.RepoInfo

     

       23
       23
       +
                     "Defs" $.LabelDefs

     

       24
       24
       +
                     "Subject" $.Pull.PullAt

     

       25
       25
       +
                     "State" $.Pull.Labels) }}

     

       26
       26
       +
             {{ template "repo/fragments/participants" $.Pull.Participants }}

     

       27
       27
       +
           </div>

     

       28
       28
       +
         </div>

     

       29
       29
       +
       {{ end }}

     

       12
       30
        
       

     

       13
       31
        
       {{ define "repoContent" }}

     

       14
       32
        
         {{ template "repo/pulls/fragments/pullHeader" . }}

     
···

       39
       57
        
           {{ with $item }}

     

       40
       58
        
           <details {{ if eq $idx $lastIdx }}open{{ end }}>

     

       41
       59
        
               <summary id="round-#{{ .RoundNumber }}" class="list-none cursor-pointer">

     

       42
       42
       -
                 <div class="flex flex-wrap gap-2 items-center">

     

       60
       60
       +
                 <div class="flex flex-wrap gap-2 items-stretch">

     

       43
       61
        
                   <!-- round number -->

     

       44
       62
        
                   <div class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-3 py-2 dark:text-white">

     

       45
       63
        
                     <span class="flex items-center">{{ i "hash" "w-4 h-4" }}{{ .RoundNumber }}</span>

     

       46
       64
        
                   </div>

     

       47
       65
        
                   <!-- round summary -->

     

       48
       48
       -
                   <div class="rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400">

     

       66
       66
       +
                   <div class="flex-1 rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400">

     

       49
       67
        
                     <span class="gap-1 flex items-center">

     

       50
       68
        
                       {{ $owner := resolve $.Pull.OwnerDid }}

     

       51
       69
        
                       {{ $re := "re" }}

     
···

       72
       90
        
                     <span class="hidden md:inline">diff</span>

     

       73
       91
        
                     {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       74
       92
        
                   </a>

     

       75
       75
       -
                   {{ if not (eq .RoundNumber 0) }}

     

       76
       76
       -
                   <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group"

     

       77
       77
       -
                      hx-boost="true"

     

       78
       78
       -
                      href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff">

     

       79
       79
       -
                     {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }}

     

       80
       80
       -
                     <span class="hidden md:inline">interdiff</span>

     

       81
       81
       -
                     {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       82
       82
       -
                   </a>

     

       83
       83
       -
                   <span id="interdiff-error-{{.RoundNumber}}"></span>

     

       93
       93
       +
                   {{ if ne $idx 0 }}

     

       94
       94
       +
                     <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group"

     

       95
       95
       +
                        hx-boost="true"

     

       96
       96
       +
                        href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff">

     

       97
       97
       +
                       {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }}

     

       98
       98
       +
                       <span class="hidden md:inline">interdiff</span>

     

       99
       99
       +
                       {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       100
       100
       +
                     </a>

     

       84
       101
        
                   {{ end }}

     

       102
       102
       +
                   <span id="interdiff-error-{{.RoundNumber}}"></span>

     

       85
       103
        
                 </div>

     

       86
       104
        
               </summary>

     

       87
       105
        
       

     
···

       146
       164
        
       

     

       147
       165
        
               <div class="md:pl-[3.5rem] flex flex-col gap-2 mt-2 relative">

     

       148
       166
        
                 {{ range $cidx, $c := .Comments }}

     

       149
       149
       -
                   <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">

     

       167
       167
       +
                   <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full">

     

       150
       168
        
                     {{ if gt $cidx 0 }}

     

       151
       169
        
                     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       152
       170
        
                     {{ end }}

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

···

       108
       108
        
                             <span class="before:content-['·']"></span>

     

       109
       109
        
                             {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }}

     

       110
       110
        
                           {{ end }}

     

       111
       111
       +
       

     

       112
       112
       +
                           {{ $state := .Labels }}

     

       113
       113
       +
                           {{ range $k, $d := $.LabelDefs }}

     

       114
       114
       +
                             {{ range $v, $s := $state.GetValSet $d.AtUri.String }}

     

       115
       115
       +
                               {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }}

     

       116
       116
       +
                             {{ end }}

     

       117
       117
       +
                           {{ end }}

     

       111
       118
        
                       </div>

     

       112
       119
        
                     </div>

     

       113
       120
        
                     {{ if .StackId }}

+35

appview/pulls/pulls.go

···

       200
       200
        
       		userReactions = db.GetReactionStatusMap(s.db, user.Did, pull.PullAt())

     

       201
       201
        
       	}

     

       202
       202
        
       

     

       203
       203
       +
       	labelDefs, err := db.GetLabelDefinitions(

     

       204
       204
       +
       		s.db,

     

       205
       205
       +
       		db.FilterIn("at_uri", f.Repo.Labels),

     

       206
       206
       +
       		db.FilterContains("scope", tangled.RepoPullNSID),

     

       207
       207
       +
       	)

     

       208
       208
       +
       	if err != nil {

     

       209
       209
       +
       		log.Println("failed to fetch labels", err)

     

       210
       210
       +
       		s.pages.Error503(w)

     

       211
       211
       +
       		return

     

       212
       212
       +
       	}

     

       213
       213
       +
       

     

       214
       214
       +
       	defs := make(map[string]*models.LabelDefinition)

     

       215
       215
       +
       	for _, l := range labelDefs {

     

       216
       216
       +
       		defs[l.AtUri().String()] = &l

     

       217
       217
       +
       	}

     

       218
       218
       +
       

     

       203
       219
        
       	s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{

     

       204
       220
        
       		LoggedInUser:   user,

     

       205
       221
        
       		RepoInfo:       repoInfo,

     
···

       213
       229
        
       		OrderedReactionKinds: models.OrderedReactionKinds,

     

       214
       230
        
       		Reactions:            reactionCountMap,

     

       215
       231
        
       		UserReacted:          userReactions,

     

       232
       232
       +
       

     

       233
       233
       +
       		LabelDefs: defs,

     

       216
       234
        
       	})

     

       217
       235
        
       }

     

       218
       236
        
       

     
···

       557
       575
        
       		m[p.Sha] = p

     

       558
       576
        
       	}

     

       559
       577
        
       

     

       578
       578
       +
       	labelDefs, err := db.GetLabelDefinitions(

     

       579
       579
       +
       		s.db,

     

       580
       580
       +
       		db.FilterIn("at_uri", f.Repo.Labels),

     

       581
       581
       +
       		db.FilterContains("scope", tangled.RepoPullNSID),

     

       582
       582
       +
       	)

     

       583
       583
       +
       	if err != nil {

     

       584
       584
       +
       		log.Println("failed to fetch labels", err)

     

       585
       585
       +
       		s.pages.Error503(w)

     

       586
       586
       +
       		return

     

       587
       587
       +
       	}

     

       588
       588
       +
       

     

       589
       589
       +
       	defs := make(map[string]*models.LabelDefinition)

     

       590
       590
       +
       	for _, l := range labelDefs {

     

       591
       591
       +
       		defs[l.AtUri().String()] = &l

     

       592
       592
       +
       	}

     

       593
       593
       +
       

     

       560
       594
        
       	s.pages.RepoPulls(w, pages.RepoPullsParams{

     

       561
       595
        
       		LoggedInUser: s.oauth.GetUser(r),

     

       562
       596
        
       		RepoInfo:     f.RepoInfo(user),

     

       563
       597
        
       		Pulls:        pulls,

     

       598
       598
       +
       		LabelDefs:    defs,

     

       564
       599
        
       		FilteringBy:  state,

     

       565
       600
        
       		Stacks:       stacks,

     

       566
       601
        
       		Pipelines:    m,