github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-04 01:11:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add label scope to label activity (#2545)

Browse Source 
* Add label scope to label activity
This commit is contained in:
Darko Draskovic 2024-08-20 13:54:43 +00:00 committed by Harness
parent 516fd5c1ca
commit 0952d00a31
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/api/controller/pullreq/label_assign.go
View File

@ -95,6 +95,7 @@ func activityPayload(out *label.AssignToPullReqOut) *types.PullRequestActivityLa
return &types.PullRequestActivityLabel{ return &types.PullRequestActivityLabel{
Label: out.Label.Key, Label: out.Label.Key,
LabelColor: out.Label.Color, LabelColor: out.Label.Color,
LabelScope: out.Label.Scope,
Value: value, Value: value,
ValueColor: valueColor, ValueColor: valueColor,
OldValue: oldValue, OldValue: oldValue,

1
app/api/controller/pullreq/label_unassign.go
View File

@ -68,6 +68,7 @@ func (c *Controller) UnassignLabel(
payload := &types.PullRequestActivityLabel{ payload := &types.PullRequestActivityLabel{
Label: label.Key, Label: label.Key,
LabelColor: label.Color, LabelColor: label.Color,
LabelScope: label.Scope,
Value: value, Value: value,
ValueColor: color, ValueColor: color,
Type: enum.LabelActivityUnassign, Type: enum.LabelActivityUnassign,

3
app/services/label/label.go
View File

@ -148,6 +148,9 @@ func (s *Service) Save(
for i, value := range valuesToCreate { for i, value := range valuesToCreate {
valuesToReturn[i] = newLabelValue(principalID, label.ID, &value.DefineValueInput) valuesToReturn[i] = newLabelValue(principalID, label.ID, &value.DefineValueInput)
if err = s.labelValueStore.Define(ctx, valuesToReturn[i]); err != nil { if err = s.labelValueStore.Define(ctx, valuesToReturn[i]); err != nil {
if errors.Is(err, store.ErrDuplicate) {
return errors.Conflict("value %s already exists", valuesToReturn[i].Value)
}
return err return err
} }
} }

1
types/pullreq_activity_payload.go
View File

@ -160,6 +160,7 @@ func (a *PullRequestActivityPayloadBranchDelete) ActivityType() enum.PullReqActi
type PullRequestActivityLabel struct { type PullRequestActivityLabel struct {
Label string `json:"label"` Label string `json:"label"`
LabelColor enum.LabelColor `json:"label_color"` LabelColor enum.LabelColor `json:"label_color"`
LabelScope int64 `json:"label_scope"`
Value *string `json:"value,omitempty"` Value *string `json:"value,omitempty"`
ValueColor *enum.LabelColor `json:"value_color,omitempty"` ValueColor *enum.LabelColor `json:"value_color,omitempty"`
OldValue *string `json:"old_value,omitempty"` OldValue *string `json:"old_value,omitempty"`