commit ac6cb315277f3eeece7776c9d245697e52098edb · nel.pet/core

+1 -1

appview/db/issues.go

···

       174
       174
        
       	return i.ReplyTo == nil

     

       175
       175
        
       }

     

       176
       176
        
       

     

       177
       177
       -
       func IssueCommentFromRecord(e Execer, did, rkey string, record tangled.RepoIssueComment) (*IssueComment, error) {

     

       177
       177
       +
       func IssueCommentFromRecord(did, rkey string, record tangled.RepoIssueComment) (*IssueComment, error) {

     

       178
       178
        
       	created, err := time.Parse(time.RFC3339, record.CreatedAt)

     

       179
       179
        
       	if err != nil {

     

       180
       180
        
       		created = time.Now()

appview/db/repos.go

···

       53
       53
        
       		CreatedAt:   r.Created.Format(time.RFC3339),

     

       54
       54
        
       		Source:      source,

     

       55
       55
        
       		Spindle:     spindle,

     

       56
       56
       +
       		Labels:      r.Labels,

     

       56
       57
        
       	}

     

       57
       58
        
       }

     

       58
       59

+71 -48

appview/labels/labels.go

···

       53
       53
        
       func (l *Labels) Router(mw *middleware.Middleware) http.Handler {

     

       54
       54
        
       	r := chi.NewRouter()

     

       55
       55
        
       

     

       56
       56
       -
       	r.With(middleware.AuthMiddleware(l.oauth)).Put("/perform", l.PerformLabelOp)

     

       56
       56
       +
       	r.Use(middleware.AuthMiddleware(l.oauth))

     

       57
       57
       +
       	r.Put("/perform", l.PerformLabelOp)

     

       57
       58
        
       

     

       58
       59
        
       	return r

     

       59
       60
        
       }

     

       60
       61
        
       

     

       62
       62
       +
       // this is a tricky handler implementation:

     

       63
       63
       +
       // - the user selects the new state of all the labels in the label panel and hits save

     

       64
       64
       +
       // - this handler should calculate the diff in order to create the labelop record

     

       65
       65
       +
       // - we need the diff in order to maintain a "history" of operations performed by users

     

       61
       66
        
       func (l *Labels) PerformLabelOp(w http.ResponseWriter, r *http.Request) {

     

       62
       67
        
       	user := l.oauth.GetUser(r)

     

       63
       68
        
       

     

       69
       69
       +
       	noticeId := "add-label-error"

     

       70
       70
       +
       

     

       71
       71
       +
       	fail := func(msg string, err error) {

     

       72
       72
       +
       		l.logger.Error("failed to add label", "err", err)

     

       73
       73
       +
       		l.pages.Notice(w, noticeId, msg)

     

       74
       74
       +
       	}

     

       75
       75
       +
       

     

       64
       76
        
       	if err := r.ParseForm(); err != nil {

     

       65
       65
       -
       		l.logger.Error("failed to parse form data", "error", err)

     

       66
       66
       -
       		http.Error(w, "Invalid form data", http.StatusBadRequest)

     

       77
       77
       +
       		fail("Invalid form.", err)

     

       67
       78
        
       		return

     

       68
       79
        
       	}

     

       69
       80
        
       

     
···

       73
       84
        
       	indexedAt := time.Now()

     

       74
       85
        
       	repoAt := r.Form.Get("repo")

     

       75
       86
        
       	subjectUri := r.Form.Get("subject")

     

       76
       76
       -
       	keys := r.Form["operand-key"]

     

       77
       77
       -
       	vals := r.Form["operand-val"]

     

       78
       78
       -
       

     

       79
       79
       -
       	var labelOps []db.LabelOp

     

       80
       80
       -
       	for i := range len(keys) {

     

       81
       81
       -
       		op := r.FormValue(fmt.Sprintf("op-%d", i))

     

       82
       82
       -
       		if op == "" {

     

       83
       83
       -
       			op = string(db.LabelOperationDel)

     

       84
       84
       -
       		}

     

       85
       85
       -
       		key := keys[i]

     

       86
       86
       -
       		val := vals[i]

     

       87
       87
       -
       

     

       88
       88
       -
       		labelOps = append(labelOps, db.LabelOp{

     

       89
       89
       -
       			Did:          did,

     

       90
       90
       -
       			Rkey:         rkey,

     

       91
       91
       -
       			Subject:      syntax.ATURI(subjectUri),

     

       92
       92
       -
       			Operation:    db.LabelOperation(op),

     

       93
       93
       -
       			OperandKey:   key,

     

       94
       94
       -
       			OperandValue: val,

     

       95
       95
       -
       			PerformedAt:  performedAt,

     

       96
       96
       -
       			IndexedAt:    indexedAt,

     

       97
       97
       -
       		})

     

       98
       98
       -
       	}

     

       99
       87
        
       

     

       100
       88
        
       	// find all the labels that this repo subscribes to

     

       101
       89
        
       	repoLabels, err := db.GetRepoLabels(l.db, db.FilterEq("repo_at", repoAt))

     

       102
       90
        
       	if err != nil {

     

       103
       103
       -
       		http.Error(w, "Invalid form data", http.StatusBadRequest)

     

       91
       91
       +
       		fail("Failed to get labels for this repository.", err)

     

       104
       92
        
       		return

     

       105
       93
        
       	}

     

       106
       94
        
       

     
···

       111
       99
        
       

     

       112
       100
        
       	actx, err := db.NewLabelApplicationCtx(l.db, db.FilterIn("at_uri", labelAts))

     

       113
       101
        
       	if err != nil {

     

       114
       114
       -
       		http.Error(w, "Invalid form data", http.StatusBadRequest)

     

       102
       102
       +
       		fail("Invalid form data.", err)

     

       115
       103
        
       		return

     

       116
       104
        
       	}

     

       117
       105
        
       

     

       118
       118
       -
       	for i := range labelOps {

     

       119
       119
       -
       		def := actx.Defs[labelOps[i].OperandKey]

     

       120
       120
       -
       		if err := l.validator.ValidateLabelOp(def, &labelOps[i]); err != nil {

     

       121
       121
       -
       			l.logger.Error("form failed to validate", "err", err)

     

       122
       122
       -
       			http.Error(w, "Invalid form data", http.StatusBadRequest)

     

       123
       123
       -
       			return

     

       124
       124
       -
       		}

     

       125
       125
       -
       

     

       126
       126
       -
       		l.logger.Info("value changed to: ", "v", labelOps[i].OperandValue)

     

       127
       127
       -
       	}

     

       106
       106
       +
       	l.logger.Info("actx", "labels", labelAts)

     

       107
       107
       +
       	l.logger.Info("actx", "defs", actx.Defs)

     

       128
       108
        
       

     

       129
       109
        
       	// calculate the start state by applying already known labels

     

       130
       110
        
       	existingOps, err := db.GetLabelOps(l.db, db.FilterEq("subject", subjectUri))

     

       131
       111
        
       	if err != nil {

     

       132
       132
       -
       		http.Error(w, "Invalid form data", http.StatusBadRequest)

     

       112
       112
       +
       		fail("Invalid form data.", err)

     

       133
       113
        
       		return

     

       134
       114
        
       	}

     

       135
       115
        
       

     

       136
       116
        
       	labelState := db.NewLabelState()

     

       137
       117
        
       	actx.ApplyLabelOps(labelState, existingOps)

     

       138
       118
        
       

     

       139
       139
       -
       	l.logger.Info("state", "state", labelState)

     

       119
       119
       +
       	var labelOps []db.LabelOp

     

       120
       120
       +
       

     

       121
       121
       +
       	// first delete all existing state

     

       122
       122
       +
       	for key, vals := range labelState.Inner() {

     

       123
       123
       +
       		for val := range vals {

     

       124
       124
       +
       			labelOps = append(labelOps, db.LabelOp{

     

       125
       125
       +
       				Did:          did,

     

       126
       126
       +
       				Rkey:         rkey,

     

       127
       127
       +
       				Subject:      syntax.ATURI(subjectUri),

     

       128
       128
       +
       				Operation:    db.LabelOperationDel,

     

       129
       129
       +
       				OperandKey:   key,

     

       130
       130
       +
       				OperandValue: val,

     

       131
       131
       +
       				PerformedAt:  performedAt,

     

       132
       132
       +
       				IndexedAt:    indexedAt,

     

       133
       133
       +
       			})

     

       134
       134
       +
       		}

     

       135
       135
       +
       	}

     

       136
       136
       +
       

     

       137
       137
       +
       	// add all the new state the user specified

     

       138
       138
       +
       	for key, vals := range r.Form {

     

       139
       139
       +
       		if _, ok := actx.Defs[key]; !ok {

     

       140
       140
       +
       			continue

     

       141
       141
       +
       		}

     

       142
       142
       +
       

     

       143
       143
       +
       		for _, val := range vals {

     

       144
       144
       +
       			labelOps = append(labelOps, db.LabelOp{

     

       145
       145
       +
       				Did:          did,

     

       146
       146
       +
       				Rkey:         rkey,

     

       147
       147
       +
       				Subject:      syntax.ATURI(subjectUri),

     

       148
       148
       +
       				Operation:    db.LabelOperationAdd,

     

       149
       149
       +
       				OperandKey:   key,

     

       150
       150
       +
       				OperandValue: val,

     

       151
       151
       +
       				PerformedAt:  performedAt,

     

       152
       152
       +
       				IndexedAt:    indexedAt,

     

       153
       153
       +
       			})

     

       154
       154
       +
       		}

     

       155
       155
       +
       	}

     

       156
       156
       +
       

     

       157
       157
       +
       	// reduce the opset

     

       158
       158
       +
       	labelOps = db.ReduceLabelOps(labelOps)

     

       159
       159
       +
       

     

       160
       160
       +
       	for i := range labelOps {

     

       161
       161
       +
       		def := actx.Defs[labelOps[i].OperandKey]

     

       162
       162
       +
       		if err := l.validator.ValidateLabelOp(def, &labelOps[i]); err != nil {

     

       163
       163
       +
       			fail(fmt.Sprintf("Invalid form data: %s", err), err)

     

       164
       164
       +
       			return

     

       165
       165
       +
       		}

     

       166
       166
       +
       	}

     

       140
       167
        
       

     

       141
       168
        
       	// next, apply all ops introduced in this request and filter out ones that are no-ops

     

       142
       169
        
       	validLabelOps := labelOps[:0]

     
···

       157
       184
        
       

     

       158
       185
        
       	client, err := l.oauth.AuthorizedClient(r)

     

       159
       186
        
       	if err != nil {

     

       160
       160
       -
       		l.logger.Error("failed to create client", "error", err)

     

       161
       161
       -
       		http.Error(w, "Invalid form data", http.StatusBadRequest)

     

       187
       187
       +
       		fail("Failed to authorize user.", err)

     

       162
       188
        
       		return

     

       163
       189
        
       	}

     

       164
       190
        
       

     
···

       171
       197
        
       		},

     

       172
       198
        
       	})

     

       173
       199
        
       	if err != nil {

     

       174
       174
       -
       		l.logger.Error("failed to write to PDS", "error", err)

     

       175
       175
       -
       		http.Error(w, "failed to write to PDS", http.StatusInternalServerError)

     

       200
       200
       +
       		fail("Failed to create record on PDS for user.", err)

     

       176
       201
        
       		return

     

       177
       202
        
       	}

     

       178
       203
        
       	atUri := resp.Uri

     

       179
       204
        
       

     

       180
       205
        
       	tx, err := l.db.BeginTx(r.Context(), nil)

     

       181
       206
        
       	if err != nil {

     

       182
       182
       -
       		l.logger.Error("failed to start tx", "error", err)

     

       207
       207
       +
       		fail("Failed to update labels. Try again later.", err)

     

       183
       208
        
       		return

     

       184
       209
        
       	}

     

       185
       210
        
       

     
···

       200
       225
        
       

     

       201
       226
        
       	for _, o := range validLabelOps {

     

       202
       227
        
       		if _, err := db.AddLabelOp(l.db, &o); err != nil {

     

       203
       203
       -
       			l.logger.Error("failed to add op", "err", err)

     

       228
       228
       +
       			fail("Failed to update labels. Try again later.", err)

     

       204
       229
        
       			return

     

       205
       230
        
       		}

     

       206
       206
       -
       

     

       207
       207
       -
       		l.logger.Info("performed label op", "did", o.Did, "rkey", o.Rkey, "kind", o.Operation, "subjcet", o.Subject, "key", o.OperandKey)

     

       208
       231
        
       	}

     

       209
       232
        
       

     

       210
       233
        
       	err = tx.Commit()

+11

appview/pages/funcmap.go

···

       29
       29
        
       		"split": func(s string) []string {

     

       30
       30
        
       			return strings.Split(s, "\n")

     

       31
       31
        
       		},

     

       32
       32
       +
       		"trimPrefix": func(s, prefix string) string {

     

       33
       33
       +
       			return strings.TrimPrefix(s, prefix)

     

       34
       34
       +
       		},

     

       32
       35
        
       		"join": func(elems []string, sep string) string {

     

       33
       36
        
       			return strings.Join(elems, sep)

     

       34
       37
        
       		},

     

       35
       38
        
       		"contains": func(s string, target string) bool {

     

       36
       39
        
       			return strings.Contains(s, target)

     

       40
       40
       +
       		},

     

       41
       41
       +
       		"mapContains": func(m any, key any) bool {

     

       42
       42
       +
       			mapValue := reflect.ValueOf(m)

     

       43
       43
       +
       			if mapValue.Kind() != reflect.Map {

     

       44
       44
       +
       				return false

     

       45
       45
       +
       			}

     

       46
       46
       +
       			keyValue := reflect.ValueOf(key)

     

       47
       47
       +
       			return mapValue.MapIndex(keyValue).IsValid()

     

       37
       48
        
       		},

     

       38
       49
        
       		"resolve": func(s string) string {

     

       39
       50
        
       			identity, err := p.resolver.ResolveIdent(context.Background(), s)

+33 -7

appview/pages/pages.go

···

       838
       838
        
       }

     

       839
       839
        
       

     

       840
       840
        
       type RepoGeneralSettingsParams struct {

     

       841
       841
       -
       	LoggedInUser *oauth.User

     

       842
       842
       -
       	RepoInfo     repoinfo.RepoInfo

     

       843
       843
       -
       	Labels       []db.LabelDefinition

     

       844
       844
       -
       	Active       string

     

       845
       845
       -
       	Tabs         []map[string]any

     

       846
       846
       -
       	Tab          string

     

       847
       847
       -
       	Branches     []types.Branch

     

       841
       841
       +
       	LoggedInUser     *oauth.User

     

       842
       842
       +
       	RepoInfo         repoinfo.RepoInfo

     

       843
       843
       +
       	Labels           []db.LabelDefinition

     

       844
       844
       +
       	DefaultLabels    []db.LabelDefinition

     

       845
       845
       +
       	SubscribedLabels map[string]struct{}

     

       846
       846
       +
       	Active           string

     

       847
       847
       +
       	Tabs             []map[string]any

     

       848
       848
       +
       	Tab              string

     

       849
       849
       +
       	Branches         []types.Branch

     

       848
       850
        
       }

     

       849
       851
        
       

     

       850
       852
        
       func (p *Pages) RepoGeneralSettings(w io.Writer, params RepoGeneralSettingsParams) error {

     
···

       1228
       1230
        
       

     

       1229
       1231
        
       func (p *Pages) RepoCompareDiff(w io.Writer, params RepoCompareDiffParams) error {

     

       1230
       1232
        
       	return p.executePlain("repo/fragments/diff", w, []any{params.RepoInfo.FullName, &params.Diff})

     

       1233
       1233
       +
       }

     

       1234
       1234
       +
       

     

       1235
       1235
       +
       type LabelPanelParams struct {

     

       1236
       1236
       +
       	LoggedInUser *oauth.User

     

       1237
       1237
       +
       	RepoInfo     repoinfo.RepoInfo

     

       1238
       1238
       +
       	Defs         map[string]*db.LabelDefinition

     

       1239
       1239
       +
       	Subject      string

     

       1240
       1240
       +
       	State        db.LabelState

     

       1241
       1241
       +
       }

     

       1242
       1242
       +
       

     

       1243
       1243
       +
       func (p *Pages) LabelPanel(w io.Writer, params LabelPanelParams) error {

     

       1244
       1244
       +
       	return p.executePlain("repo/fragments/labelPanel", w, params)

     

       1245
       1245
       +
       }

     

       1246
       1246
       +
       

     

       1247
       1247
       +
       type EditLabelPanelParams struct {

     

       1248
       1248
       +
       	LoggedInUser *oauth.User

     

       1249
       1249
       +
       	RepoInfo     repoinfo.RepoInfo

     

       1250
       1250
       +
       	Defs         map[string]*db.LabelDefinition

     

       1251
       1251
       +
       	Subject      string

     

       1252
       1252
       +
       	State        db.LabelState

     

       1253
       1253
       +
       }

     

       1254
       1254
       +
       

     

       1255
       1255
       +
       func (p *Pages) EditLabelPanel(w io.Writer, params EditLabelPanelParams) error {

     

       1256
       1256
       +
       	return p.executePlain("repo/fragments/editLabelPanel", w, params)

     

       1231
       1257
        
       }

     

       1232
       1258
        
       

     

       1233
       1259
        
       type PipelinesParams struct {

appview/pages/repoinfo/repoinfo.go

···

       52
       52
        
       

     

       53
       53
        
       type RepoInfo struct {

     

       54
       54
        
       	Name         string

     

       55
       55
       +
       	Rkey         string

     

       55
       56
        
       	OwnerDid     string

     

       56
       57
        
       	OwnerHandle  string

     

       57
       58
        
       	Description  string

+7 -34

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

···

       17
       17
        
             {{ block "repoAfter" . }}{{ end }}

     

       18
       18
        
           </div>

     

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

     

       20
       20
       -
             {{ template "issueLabels" . }}

     

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

     

       21
       21
       +
               (dict "RepoInfo" $.RepoInfo

     

       22
       22
       +
                     "Defs" $.LabelDefs

     

       23
       23
       +
                     "Subject" $.Issue.AtUri

     

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

     

       21
       25
        
             {{ template "issueParticipants" . }}

     

       22
       26
        
           </div>

     

       23
       27
        
         </div>

     
···

       118
       122
        
         </div>

     

       119
       123
        
       {{ end }}

     

       120
       124
        
       

     

       121
       121
       -
       {{ define "issueLabels" }}

     

       122
       122
       -
         <div>

     

       123
       123
       -
           <div class="text-sm py-1 flex items-center gap-2 font-bold text-gray-500 dark:text-gray-400 capitalize">

     

       124
       124
       -
             Labels

     

       125
       125
       -
             <button

     

       126
       126
       -
               class="inline-flex text-gray-500 dark:text-gray-400 {{ if not (or .RepoInfo.Roles.IsOwner .RepoInfo.Roles.IsCollaborator) }}hidden{{ end }}"

     

       127
       127
       -
               popovertarget="add-label-modal"

     

       128
       128
       -
               popovertargetaction="toggle">

     

       129
       129
       -
               {{ i "plus" "size-4" }}

     

       130
       130
       -
             </button>

     

       131
       131
       -
           </div>

     

       132
       132
       -
           <div class="flex gap-1 items-center flex-wrap">

     

       133
       133
       -
             {{ range $k, $valset := $.Issue.Labels.Inner }}

     

       134
       134
       -
               {{ $d := index $.LabelDefs $k }}

     

       135
       135
       -
               {{ range $v, $s := $valset }}

     

       136
       136
       -
                 {{ template "labels/fragments/label" (dict "def" $d "val" $v) }}

     

       137
       137
       -
               {{ end }}

     

       138
       138
       -
             {{ else }}

     

       139
       139
       -
               <p class="text-gray-500 dark:text-gray-400 ">No labels yet.</p>

     

       140
       140
       -
             {{ end }}

     

       141
       141
       -
       

     

       142
       142
       -
             <div

     

       143
       143
       -
               id="add-label-modal"

     

       144
       144
       -
               popover

     

       145
       145
       -
               class="bg-white w-full sm:w-[30rem] dark:bg-gray-800 p-6 rounded border border-gray-200 dark:border-gray-700 drop-shadow dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50">

     

       146
       146
       -
               {{ template "repo/fragments/addLabelModal" (dict "root" $ "subject" $.Issue.AtUri.String "state" $.Issue.Labels) }}

     

       147
       147
       -
             </div>

     

       148
       148
       -
           </div>

     

       149
       149
       -
         </div>

     

       150
       150
       -
       {{ end }}

     

       151
       151
       -
       

     

       152
       125
        
       {{ define "issueParticipants" }}

     

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

     

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

     
···

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

     

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

     

       159
       132
        
           </div>

     

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

     

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

     

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

     

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

     

       163
       136
        
               <img

     

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

     

       165
       138
        
                   alt=""

     

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

     

       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"

     

       167
       140
        
               />

     

       168
       141
        
             {{ end }}

     

       169
       142

+4 -7

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

···

       80
       80
        
                 <a href="/{{ $.RepoInfo.FullName }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a>

     

       81
       81
        
               </span>

     

       82
       82
        
       

     

       83
       83
       -
               {{ if .Labels.Inner }}

     

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

     

       85
       85
       -
                 {{ range $k, $valset := .Labels.Inner }}

     

       86
       86
       -
                   {{ $d := index $.LabelDefs $k }}

     

       87
       87
       -
                   {{ range $v, $s := $valset }}

     

       88
       88
       -
                     {{ template "labels/fragments/label" (dict "def" $d "val" $v) }}

     

       89
       89
       -
                   {{ end }}

     

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

     

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

     

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

     

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

     

       90
       87
        
                 {{ end }}

     

       91
       88
        
               {{ end }}

     

       92
       89
        
             </div>