Add reviewers selection to new pull request form

options/locale/locale_en-US.ini

@@ -1350,6 +1350,7 @@ issues.new.assignees = Assignees
 issues.new.clear_assignees = Clear assignees
 issues.new.no_assignees = No Assignees
 issues.new.no_reviewers = No reviewers
+issues.new.clear_reviewers = Clear reviewers
 issues.choose.get_started = Get Started
 issues.choose.open_external_link = Open
 issues.choose.blank = Default

routers/api/v1/repo/pull.go

@@ -417,7 +417,7 @@ func CreatePullRequest(ctx *context.APIContext) {
 		}
 	}
 
-	if err := pull_service.NewPullRequest(ctx, repo, prIssue, labelIDs, []string{}, pr, assigneeIDs); err != nil {
+	if err := pull_service.NewPullRequest(ctx, repo, prIssue, labelIDs, []string{}, pr, assigneeIDs, []int64{}); err != nil {
 		if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
 			ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err)
 			return

routers/web/repo/compare.go

@@ -19,6 +19,7 @@ import (
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
 	issues_model "code.gitea.io/gitea/models/issues"
+	"code.gitea.io/gitea/models/organization"
 	access_model "code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unit"
@@ -35,6 +36,7 @@ import (
 	"code.gitea.io/gitea/modules/upload"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/gitdiff"
+	repo_service "code.gitea.io/gitea/services/repository"
 )
 
 const (
@@ -791,6 +793,47 @@ func CompareDiff(ctx *context.Context) {
 			if ctx.Written() {
 				return
 			}
+
+			// Get reviewer info for pr
+			var (
+				reviewers       []*user_model.User
+				teamReviewers   []*organization.Team
+				reviewersResult []*repoReviewerSelection
+			)
+			reviewers, err = repo_model.GetReviewers(ctx, ctx.Repo.Repository, ctx.Doer.ID, ctx.Doer.ID)
+			if err != nil {
+				ctx.ServerError("GetReviewers", err)
+				return
+			}
+
+			teamReviewers, err = repo_service.GetReviewerTeams(ctx, ctx.Repo.Repository)
+			if err != nil {
+				ctx.ServerError("GetReviewerTeams", err)
+				return
+			}
+
+			for _, user := range reviewers {
+				reviewersResult = append(reviewersResult, &repoReviewerSelection{
+					IsTeam:    false,
+					CanChange: true,
+					User:      user,
+					ItemID:    user.ID,
+				})
+			}
+
+			// negative reviewIDs represent team requests
+			for _, team := range teamReviewers {
+				reviewersResult = append(reviewersResult, &repoReviewerSelection{
+					IsTeam:    true,
+					CanChange: true,
+					Team:      team,
+					ItemID:    -team.ID,
+				})
+			}
+			ctx.Data["Reviewers"] = reviewersResult
+			if ctx.Written() {
+				return
+			}
 		}
 	}
 	beforeCommitID := ctx.Data["BeforeCommitID"].(string)

routers/web/repo/issue.go

@@ -1045,15 +1045,15 @@ func DeleteIssue(ctx *context.Context) {
 }
 
 // ValidateRepoMetas check and returns repository's meta information
-func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull bool) ([]int64, []int64, int64, int64) {
+func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull bool) ([]int64, []int64, []int64, int64, int64) {
 	var (
 		repo = ctx.Repo.Repository
 		err  error
 	)
 
 	labels := RetrieveRepoMetas(ctx, ctx.Repo.Repository, isPull)
 	if ctx.Written() {
-		return nil, nil, 0, 0
+		return nil, nil, nil, 0, 0
 	}
 
 	var labelIDs []int64
@@ -1062,7 +1062,7 @@ func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull
 	if len(form.LabelIDs) > 0 {
 		labelIDs, err = base.StringsToInt64s(strings.Split(form.LabelIDs, ","))
 		if err != nil {
-			return nil, nil, 0, 0
+			return nil, nil, nil, 0, 0
 		}
 		labelIDMark := make(container.Set[int64])
 		labelIDMark.AddMultiple(labelIDs...)
@@ -1085,11 +1085,11 @@ func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull
 		milestone, err := issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, milestoneID)
 		if err != nil {
 			ctx.ServerError("GetMilestoneByID", err)
-			return nil, nil, 0, 0
+			return nil, nil, nil, 0, 0
 		}
 		if milestone.RepoID != repo.ID {
 			ctx.ServerError("GetMilestoneByID", err)
-			return nil, nil, 0, 0
+			return nil, nil, nil, 0, 0
 		}
 		ctx.Data["Milestone"] = milestone
 		ctx.Data["milestone_id"] = milestoneID
@@ -1099,11 +1099,11 @@ func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull
 		p, err := project_model.GetProjectByID(ctx, form.ProjectID)
 		if err != nil {
 			ctx.ServerError("GetProjectByID", err)
-			return nil, nil, 0, 0
+			return nil, nil, nil, 0, 0
 		}
 		if p.RepoID != ctx.Repo.Repository.ID && p.OwnerID != ctx.Repo.Repository.OwnerID {
 			ctx.NotFound("", nil)
-			return nil, nil, 0, 0
+			return nil, nil, nil, 0, 0
 		}
 
 		ctx.Data["Project"] = p
@@ -1115,26 +1115,26 @@ func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull
 	if len(form.AssigneeIDs) > 0 {
 		assigneeIDs, err = base.StringsToInt64s(strings.Split(form.AssigneeIDs, ","))
 		if err != nil {
-			return nil, nil, 0, 0
+			return nil, nil, nil, 0, 0
 		}
 
 		// Check if the passed assignees actually exists and is assignable
 		for _, aID := range assigneeIDs {
 			assignee, err := user_model.GetUserByID(ctx, aID)
 			if err != nil {
 				ctx.ServerError("GetUserByID", err)
-				return nil, nil, 0, 0
+				return nil, nil, nil, 0, 0
 			}
 
 			valid, err := access_model.CanBeAssigned(ctx, assignee, repo, isPull)
 			if err != nil {
 				ctx.ServerError("CanBeAssigned", err)
-				return nil, nil, 0, 0
+				return nil, nil, nil, 0, 0
 			}
 
 			if !valid {
 				ctx.ServerError("canBeAssigned", repo_model.ErrUserDoesNotHaveAccessToRepo{UserID: aID, RepoName: repo.Name})
-				return nil, nil, 0, 0
+				return nil, nil, nil, 0, 0
 			}
 		}
 	}
@@ -1144,7 +1144,35 @@ func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull
 		assigneeIDs = append(assigneeIDs, form.AssigneeID)
 	}
 
-	return labelIDs, assigneeIDs, milestoneID, form.ProjectID
+	// Check reviewers
+	var reviewerIDs []int64
+	if len(form.ReviewerIDs) > 0 {
+		reviewerIDs, err = base.StringsToInt64s(strings.Split(form.ReviewerIDs, ","))
+		if err != nil {
+			return nil, nil, nil, 0, 0
+		}
+
+		// Check if the passed reviewers (user/team) actually exist
+		for _, rID := range reviewerIDs {
+			// negative reviewIDs represent team requests
+			if rID < 0 {
+				_, err := organization.GetTeamByID(ctx, -rID)
+				if err != nil {
+					ctx.ServerError("GetTeamByID", err)
+					return nil, nil, nil, 0, 0
+				}
+				continue
+			}
+
+			_, err := user_model.GetUserByID(ctx, rID)
+			if err != nil {
+				ctx.ServerError("GetUserByID", err)
+				return nil, nil, nil, 0, 0
+			}
+		}
+	}
+
+	return labelIDs, assigneeIDs, reviewerIDs, milestoneID, form.ProjectID
 }
 
 // NewIssuePost response for creating new issue
@@ -1162,7 +1190,7 @@ func NewIssuePost(ctx *context.Context) {
 		attachments []string
 	)
 
-	labelIDs, assigneeIDs, milestoneID, projectID := ValidateRepoMetas(ctx, *form, false)
+	labelIDs, assigneeIDs, _, milestoneID, projectID := ValidateRepoMetas(ctx, *form, false)
 	if ctx.Written() {
 		return
 	}

routers/web/repo/pull.go

@@ -1363,7 +1363,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
 		return
 	}
 
-	labelIDs, assigneeIDs, milestoneID, _ := ValidateRepoMetas(ctx, *form, true)
+	labelIDs, assigneeIDs, reviewerIDs, milestoneID, _ := ValidateRepoMetas(ctx, *form, true)
 	if ctx.Written() {
 		return
 	}
@@ -1413,7 +1413,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
 	// FIXME: check error in the case two people send pull request at almost same time, give nice error prompt
 	// instead of 500.
 
-	if err := pull_service.NewPullRequest(ctx, repo, pullIssue, labelIDs, attachments, pullRequest, assigneeIDs); err != nil {
+	if err := pull_service.NewPullRequest(ctx, repo, pullIssue, labelIDs, attachments, pullRequest, assigneeIDs, reviewerIDs); err != nil {
 		if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
 			ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
 			return

services/agit/agit.go

@@ -142,7 +142,7 @@ func ProcReceive(ctx context.Context, repo *repo_model.Repository, gitRepo *git.
 				Flow:         issues_model.PullRequestFlowAGit,
 			}
 
-			if err := pull_service.NewPullRequest(ctx, repo, prIssue, []int64{}, []string{}, pr, []int64{}); err != nil {
+			if err := pull_service.NewPullRequest(ctx, repo, prIssue, []int64{}, []string{}, pr, []int64{}, []int64{}); err != nil {
 				return nil, err
 			}
 

services/forms/repo_form.go

@@ -439,6 +439,7 @@ type CreateIssueForm struct {
 	Title               string `binding:"Required;MaxSize(255)"`
 	LabelIDs            string `form:"label_ids"`
 	AssigneeIDs         string `form:"assignee_ids"`
+	ReviewerIDs         string `form:"reviewer_ids"`
 	Ref                 string `form:"ref"`
 	MilestoneID         int64
 	ProjectID           int64

services/pull/pull.go

@@ -16,6 +16,8 @@ import (
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
 	issues_model "code.gitea.io/gitea/models/issues"
+	"code.gitea.io/gitea/models/organization"
+	access_model "code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/base"
@@ -37,7 +39,7 @@ import (
 var pullWorkingPool = sync.NewExclusivePool()
 
 // NewPullRequest creates new pull request with labels for repository.
-func NewPullRequest(ctx context.Context, repo *repo_model.Repository, issue *issues_model.Issue, labelIDs []int64, uuids []string, pr *issues_model.PullRequest, assigneeIDs []int64) error {
+func NewPullRequest(ctx context.Context, repo *repo_model.Repository, issue *issues_model.Issue, labelIDs []int64, uuids []string, pr *issues_model.PullRequest, assigneeIDs []int64, reviewerIDs []int64) error {
 	prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr)
 	if err != nil {
 		if !git_model.IsErrBranchNotExist(err) {
@@ -80,6 +82,42 @@ func NewPullRequest(ctx context.Context, repo *repo_model.Repository, issue *iss
 			assigneeCommentMap[assigneeID] = comment
 		}
 
+		for _, reviewerID := range reviewerIDs {
+			// negative reviewIDs represent team requests
+			if reviewerID < 0 {
+				team, err := organization.GetTeamByID(ctx, -reviewerID)
+				if err != nil {
+					return err
+				}
+				err = issue_service.IsValidTeamReviewRequest(ctx, team, issue.Poster, true, issue)
+				if err != nil {
+					return err
+				}
+				_, err = issue_service.TeamReviewRequest(ctx, issue, issue.Poster, team, true)
+				if err != nil {
+					return err
+				}
+				continue
+			}
+
+			reviewer, err := user_model.GetUserByID(ctx, reviewerID)
+			if err != nil {
+				return err
+			}
+			permDoer, err := access_model.GetUserRepoPermission(ctx, issue.Repo, issue.Poster)
+			if err != nil {
+				return err
+			}
+			err = issue_service.IsValidReviewRequest(ctx, reviewer, issue.Poster, true, issue, &permDoer)
+			if err != nil {
+				return err
+			}
+			_, err = issue_service.ReviewRequest(ctx, issue, issue.Poster, reviewer, true)
+			if err != nil {
+				return err
+			}
+		}
+
 		pr.Issue = issue
 		issue.PullRequest = pr
 

templates/repo/issue/new_form.tmpl

@@ -50,6 +50,62 @@
 
 	<div class="issue-content-right ui segment">
 		{{template "repo/issue/branch_selector_field" .}}
+		{{if .PageIsComparePull}}
+			<input id="reviewer_ids" name="reviewer_ids" type="hidden" value="{{.reviewer_ids}}">
+			<div class="ui {{if not .Reviewers}}disabled{{end}} floating jump select-reviewers dropdown">
+				<span class="text flex-text-block">
+					<strong>{{.locale.Tr "repo.issues.review.reviewers"}}</strong>
+					{{svg "octicon-gear" 16 "gt-ml-2"}}
+				</span>
+				<div class="filter menu" data-id="#reviewer_ids">
+					<div class="ui icon search input">
+						<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
+						<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_reviewers"}}">
+					</div>
+					<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_reviewers"}}</div>
+					{{range .Reviewers}}
+						{{if .User}}
+							<a class="item muted" data-id="{{.ItemID}}" data-id-selector="#reviewer_{{.ItemID}}">
+								<span class="octicon-check invisible">{{svg "octicon-check"}}</span>
+								<span class="text">
+									{{ctx.AvatarUtils.Avatar .User 28 "gt-mr-3"}}{{template "repo/search_name" .User}}
+								</span>
+							</a>
+						{{end}}
+					{{end}}
+					<div class="divider"></div>
+					{{range .Reviewers}}
+						{{if .Team}}
+							<a class="item muted" data-id="{{.ItemID}}" data-id-selector="#reviewer_{{.ItemID}}">
+								<span class="octicon-check invisible">{{svg "octicon-check" 16}}</span>
+								<span class="text">
+									{{svg "octicon-people" 16 "gt-ml-4 gt-mr-2"}}{{$.Repository.OwnerName}}/{{.Team.Name}}
+								</span>
+							</a>
+						{{end}}
+					{{end}}
+				</div>
+			</div>
+			<div class="ui reviewers list">
+				<span class="no-select item">
+					{{.locale.Tr "repo.issues.new.no_reviewers"}}
+				</span>
+				<div class="selected">
+					{{range .Reviewers}}
+						{{if .User}}
+							<a class="item gt-p-2 muted gt-hidden" id="reviewer_{{.ItemID}}" href="#">
+								{{ctx.AvatarUtils.Avatar .User 28 "gt-mr-3 gt-vm"}}{{.User.GetDisplayName}}
+							</a>
+						{{else if .Team}}
+							<a class="item gt-p-2 muted gt-hidden" id="reviewer_{{.ItemID}}" href="#">
+								{{svg "octicon-people" 20 "gt-mr-3"}}{{$.Repository.OwnerName}}/{{.Team.Name}}
+							</a>
+						{{end}}
+					{{end}}
+				</div>
+			</div>
+			<div class="divider"></div>
+		{{end}}
 
 		<input id="label_ids" name="label_ids" type="hidden" value="{{.label_ids}}">
 		{{template "repo/issue/labels/labels_selector_field" .}}

tests/integration/actions_trigger_test.go

@@ -134,7 +134,7 @@ func TestPullRequestTargetEvent(t *testing.T) {
 			BaseRepo:   baseRepo,
 			Type:       issues_model.PullRequestGitea,
 		}
-		err = pull_service.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil)
+		err = pull_service.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil, nil)
 		assert.NoError(t, err)
 
 		// load and compare ActionRun
@@ -188,7 +188,7 @@ func TestPullRequestTargetEvent(t *testing.T) {
 			BaseRepo:   baseRepo,
 			Type:       issues_model.PullRequestGitea,
 		}
-		err = pull_service.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil)
+		err = pull_service.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil, nil)
 		assert.NoError(t, err)
 
 		// the new pull request cannot trigger actions, so there is still only 1 record

tests/integration/pull_merge_test.go

@@ -414,7 +414,7 @@ func TestConflictChecking(t *testing.T) {
 			BaseRepo:   baseRepo,
 			Type:       issues_model.PullRequestGitea,
 		}
-		err = pull.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil)
+		err = pull.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil, nil)
 		assert.NoError(t, err)
 
 		issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: "PR with conflict!"})