Support using label names when changing issue labels (#30943)
Resolve #30917 Make the APIs for adding labels and replacing labels support both label IDs and label names so the [`actions/labeler`](https://github.com/actions/labeler) action can work in Gitea. <img width="600px" src="https://github.com/go-gitea/gitea/assets/15528715/7835c771-f637-4c57-9ce5-e4fbf56fa0d3" /> (cherry picked from commit b3beaed147466739de0c24fd80206b5af8b71617) Conflicts: - modules/structs/issue_label.go Resolved by applying the Gitea change by hand. - tests/integration/api_issue_label_test.go Resolved by copying the new tests.
This commit is contained in:
parent
4fb3f2a1fe
commit
8e1de85980
4 changed files with 86 additions and 12 deletions
|
@ -57,8 +57,9 @@ type DeleteLabelsOption struct {
|
||||||
|
|
||||||
// IssueLabelsOption a collection of labels
|
// IssueLabelsOption a collection of labels
|
||||||
type IssueLabelsOption struct {
|
type IssueLabelsOption struct {
|
||||||
// list of label IDs
|
// Labels can be a list of integers representing label IDs
|
||||||
Labels []int64 `json:"labels"`
|
// or a list of strings representing label names
|
||||||
|
Labels []any `json:"labels"`
|
||||||
// swagger:strfmt date-time
|
// swagger:strfmt date-time
|
||||||
Updated *time.Time `json:"updated_at"`
|
Updated *time.Time `json:"updated_at"`
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,9 @@
|
||||||
package repo
|
package repo
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"reflect"
|
||||||
|
|
||||||
issues_model "code.gitea.io/gitea/models/issues"
|
issues_model "code.gitea.io/gitea/models/issues"
|
||||||
api "code.gitea.io/gitea/modules/structs"
|
api "code.gitea.io/gitea/modules/structs"
|
||||||
|
@ -337,7 +339,32 @@ func prepareForReplaceOrAdd(ctx *context.APIContext, form api.IssueLabelsOption)
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
labels, err := issues_model.GetLabelsByIDs(ctx, form.Labels, "id", "repo_id", "org_id", "name", "exclusive")
|
var (
|
||||||
|
labelIDs []int64
|
||||||
|
labelNames []string
|
||||||
|
)
|
||||||
|
for _, label := range form.Labels {
|
||||||
|
rv := reflect.ValueOf(label)
|
||||||
|
switch rv.Kind() {
|
||||||
|
case reflect.Float64:
|
||||||
|
labelIDs = append(labelIDs, int64(rv.Float()))
|
||||||
|
case reflect.String:
|
||||||
|
labelNames = append(labelNames, rv.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(labelIDs) > 0 && len(labelNames) > 0 {
|
||||||
|
ctx.Error(http.StatusBadRequest, "InvalidLabels", "labels should be an array of strings or integers")
|
||||||
|
return nil, nil, fmt.Errorf("invalid labels")
|
||||||
|
}
|
||||||
|
if len(labelNames) > 0 {
|
||||||
|
labelIDs, err = issues_model.GetLabelIDsInRepoByNames(ctx, ctx.Repo.Repository.ID, labelNames)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "GetLabelIDsInRepoByNames", err)
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
labels, err := issues_model.GetLabelsByIDs(ctx, labelIDs, "id", "repo_id", "org_id", "name", "exclusive")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(http.StatusInternalServerError, "GetLabelsByIDs", err)
|
ctx.Error(http.StatusInternalServerError, "GetLabelsByIDs", err)
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
|
|
7
templates/swagger/v1_json.tmpl
generated
7
templates/swagger/v1_json.tmpl
generated
|
@ -22330,12 +22330,9 @@
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"labels": {
|
"labels": {
|
||||||
"description": "list of label IDs",
|
"description": "Labels can be a list of integers representing label IDs\nor a list of strings representing label names",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {},
|
||||||
"type": "integer",
|
|
||||||
"format": "int64"
|
|
||||||
},
|
|
||||||
"x-go-name": "Labels"
|
"x-go-name": "Labels"
|
||||||
},
|
},
|
||||||
"updated_at": {
|
"updated_at": {
|
||||||
|
|
|
@ -106,7 +106,7 @@ func TestAPIAddIssueLabels(t *testing.T) {
|
||||||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels",
|
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels",
|
||||||
repo.OwnerName, repo.Name, issue.Index)
|
repo.OwnerName, repo.Name, issue.Index)
|
||||||
req := NewRequestWithJSON(t, "POST", urlStr, &api.IssueLabelsOption{
|
req := NewRequestWithJSON(t, "POST", urlStr, &api.IssueLabelsOption{
|
||||||
Labels: []int64{1, 2},
|
Labels: []any{1, 2},
|
||||||
}).AddTokenAuth(token)
|
}).AddTokenAuth(token)
|
||||||
resp := MakeRequest(t, req, http.StatusOK)
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
var apiLabels []*api.Label
|
var apiLabels []*api.Label
|
||||||
|
@ -116,6 +116,32 @@ func TestAPIAddIssueLabels(t *testing.T) {
|
||||||
unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: 2})
|
unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: 2})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestAPIAddIssueLabelsWithLabelNames(t *testing.T) {
|
||||||
|
assert.NoError(t, unittest.LoadFixtures())
|
||||||
|
|
||||||
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
||||||
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID})
|
||||||
|
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
|
||||||
|
|
||||||
|
session := loginUser(t, owner.Name)
|
||||||
|
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue)
|
||||||
|
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels",
|
||||||
|
repo.OwnerName, repo.Name, issue.Index)
|
||||||
|
req := NewRequestWithJSON(t, "POST", urlStr, &api.IssueLabelsOption{
|
||||||
|
Labels: []any{"label1", "label2"},
|
||||||
|
}).AddTokenAuth(token)
|
||||||
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
|
var apiLabels []*api.Label
|
||||||
|
DecodeJSON(t, resp, &apiLabels)
|
||||||
|
assert.Len(t, apiLabels, unittest.GetCount(t, &issues_model.IssueLabel{IssueID: issue.ID}))
|
||||||
|
|
||||||
|
var apiLabelNames []string
|
||||||
|
for _, label := range apiLabels {
|
||||||
|
apiLabelNames = append(apiLabelNames, label.Name)
|
||||||
|
}
|
||||||
|
assert.ElementsMatch(t, apiLabelNames, []string{"label1", "label2"})
|
||||||
|
}
|
||||||
|
|
||||||
func TestAPIAddIssueLabelsAutoDate(t *testing.T) {
|
func TestAPIAddIssueLabelsAutoDate(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
|
@ -132,7 +158,7 @@ func TestAPIAddIssueLabelsAutoDate(t *testing.T) {
|
||||||
defer tests.PrintCurrentTest(t)()
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
req := NewRequestWithJSON(t, "POST", urlStr, &api.IssueLabelsOption{
|
req := NewRequestWithJSON(t, "POST", urlStr, &api.IssueLabelsOption{
|
||||||
Labels: []int64{1},
|
Labels: []any{1},
|
||||||
}).AddTokenAuth(token)
|
}).AddTokenAuth(token)
|
||||||
MakeRequest(t, req, http.StatusOK)
|
MakeRequest(t, req, http.StatusOK)
|
||||||
|
|
||||||
|
@ -147,7 +173,7 @@ func TestAPIAddIssueLabelsAutoDate(t *testing.T) {
|
||||||
|
|
||||||
updatedAt := time.Now().Add(-time.Hour).Truncate(time.Second)
|
updatedAt := time.Now().Add(-time.Hour).Truncate(time.Second)
|
||||||
req := NewRequestWithJSON(t, "POST", urlStr, &api.IssueLabelsOption{
|
req := NewRequestWithJSON(t, "POST", urlStr, &api.IssueLabelsOption{
|
||||||
Labels: []int64{2},
|
Labels: []any{2},
|
||||||
Updated: &updatedAt,
|
Updated: &updatedAt,
|
||||||
}).AddTokenAuth(token)
|
}).AddTokenAuth(token)
|
||||||
MakeRequest(t, req, http.StatusOK)
|
MakeRequest(t, req, http.StatusOK)
|
||||||
|
@ -172,7 +198,7 @@ func TestAPIReplaceIssueLabels(t *testing.T) {
|
||||||
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels",
|
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels",
|
||||||
owner.Name, repo.Name, issue.Index)
|
owner.Name, repo.Name, issue.Index)
|
||||||
req := NewRequestWithJSON(t, "PUT", urlStr, &api.IssueLabelsOption{
|
req := NewRequestWithJSON(t, "PUT", urlStr, &api.IssueLabelsOption{
|
||||||
Labels: []int64{label.ID},
|
Labels: []any{label.ID},
|
||||||
}).AddTokenAuth(token)
|
}).AddTokenAuth(token)
|
||||||
resp := MakeRequest(t, req, http.StatusOK)
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
var apiLabels []*api.Label
|
var apiLabels []*api.Label
|
||||||
|
@ -185,6 +211,29 @@ func TestAPIReplaceIssueLabels(t *testing.T) {
|
||||||
unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: label.ID})
|
unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: label.ID})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestAPIReplaceIssueLabelsWithLabelNames(t *testing.T) {
|
||||||
|
assert.NoError(t, unittest.LoadFixtures())
|
||||||
|
|
||||||
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
||||||
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID})
|
||||||
|
label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{RepoID: repo.ID})
|
||||||
|
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
|
||||||
|
|
||||||
|
session := loginUser(t, owner.Name)
|
||||||
|
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue)
|
||||||
|
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels",
|
||||||
|
owner.Name, repo.Name, issue.Index)
|
||||||
|
req := NewRequestWithJSON(t, "PUT", urlStr, &api.IssueLabelsOption{
|
||||||
|
Labels: []any{label.Name},
|
||||||
|
}).AddTokenAuth(token)
|
||||||
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
|
var apiLabels []*api.Label
|
||||||
|
DecodeJSON(t, resp, &apiLabels)
|
||||||
|
if assert.Len(t, apiLabels, 1) {
|
||||||
|
assert.EqualValues(t, label.Name, apiLabels[0].Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestAPIModifyOrgLabels(t *testing.T) {
|
func TestAPIModifyOrgLabels(t *testing.T) {
|
||||||
assert.NoError(t, unittest.LoadFixtures())
|
assert.NoError(t, unittest.LoadFixtures())
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue