Add more issue / pr creation params (#331)

adds assignees, labels, deadline, milestone params

- [x] add flags to `tea issue create` (this is BREAKING, `-b` moved to `-d` for consistency with pr create)
- [x] add interactive mode to `tea issue create`
- [x] add flags to `tea pr create`
- [x] add interactive mode to `tea pr create`

fixes #171, fixes #303

Co-authored-by: Norwin Roosen <git@nroo.de>
Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitea/tea/pulls/331
Reviewed-by: 6543 <6543@obermui.de>
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Norwin <noerw@noreply.gitea.io>
Co-committed-by: Norwin <noerw@noreply.gitea.io>

modules/interact/issue_create.go

@@ -5,6 +5,7 @@
 package interact
 
 import (
+	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/modules/config"
 	"code.gitea.io/tea/modules/task"
 
@@ -13,31 +14,149 @@ import (
 
 // CreateIssue interactively creates an issue
 func CreateIssue(login *config.Login, owner, repo string) error {
-	var title, description string
-
-	// owner, repo
 	owner, repo, err := promptRepoSlug(owner, repo)
 	if err != nil {
 		return err
 	}
 
+	var opts gitea.CreateIssueOption
+	if err := promptIssueProperties(login, owner, repo, &opts); err != nil {
+		return err
+	}
+
+	return task.CreateIssue(login, owner, repo, opts)
+}
+
+func promptIssueProperties(login *config.Login, owner, repo string, o *gitea.CreateIssueOption) error {
+	var milestoneName string
+	var labels []string
+	var err error
+
+	selectableChan := make(chan (issueSelectables), 1)
+	go fetchIssueSelectables(login, owner, repo, selectableChan)
+
 	// title
 	promptOpts := survey.WithValidator(survey.Required)
-	promptI := &survey.Input{Message: "Issue title:"}
-	if err := survey.AskOne(promptI, &title, promptOpts); err != nil {
+	promptI := &survey.Input{Message: "Issue title:", Default: o.Title}
+	if err = survey.AskOne(promptI, &o.Title, promptOpts); err != nil {
 		return err
 	}
 
 	// description
-	promptM := &survey.Multiline{Message: "Issue description:"}
-	if err := survey.AskOne(promptM, &description); err != nil {
+	promptD := &survey.Multiline{Message: "Issue description:", Default: o.Body}
+	if err = survey.AskOne(promptD, &o.Body); err != nil {
 		return err
 	}
 
-	return task.CreateIssue(
-		login,
-		owner,
-		repo,
-		title,
-		description)
+	// wait until selectables are fetched
+	selectables := <-selectableChan
+	if selectables.Err != nil {
+		return selectables.Err
+	}
+
+	// skip remaining props if we don't have permission to set them
+	if !selectables.Repo.Permissions.Push {
+		return nil
+	}
+
+	// assignees
+	if o.Assignees, err = promptMultiSelect("Assignees:", selectables.Collaborators, "[other]"); err != nil {
+		return err
+	}
+
+	// milestone
+	if len(selectables.MilestoneList) != 0 {
+		if milestoneName, err = promptSelect("Milestone:", selectables.MilestoneList, "", "[none]"); err != nil {
+			return err
+		}
+		o.Milestone = selectables.MilestoneMap[milestoneName]
+	}
+
+	// labels
+	if len(selectables.LabelList) != 0 {
+		promptL := &survey.MultiSelect{Message: "Labels:", Options: selectables.LabelList, VimMode: true, Default: o.Labels}
+		if err := survey.AskOne(promptL, &labels); err != nil {
+			return err
+		}
+		o.Labels = make([]int64, len(labels))
+		for i, l := range labels {
+			o.Labels[i] = selectables.LabelMap[l]
+		}
+	}
+
+	// deadline
+	if o.Deadline, err = promptDatetime("Due date:"); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type issueSelectables struct {
+	Repo          *gitea.Repository
+	Collaborators []string
+	MilestoneList []string
+	MilestoneMap  map[string]int64
+	LabelList     []string
+	LabelMap      map[string]int64
+	Err           error
+}
+
+func fetchIssueSelectables(login *config.Login, owner, repo string, done chan issueSelectables) {
+	// TODO PERF make these calls concurrent
+	r := issueSelectables{}
+	c := login.Client()
+
+	r.Repo, _, r.Err = c.GetRepo(owner, repo)
+	if r.Err != nil {
+		done <- r
+		return
+	}
+	// we can set the following properties only if we have write access to the repo
+	// so we fastpath this if not.
+	if !r.Repo.Permissions.Push {
+		done <- r
+		return
+	}
+
+	// FIXME: this should ideally be ListAssignees(), https://github.com/go-gitea/gitea/issues/14856
+	colabs, _, err := c.ListCollaborators(owner, repo, gitea.ListCollaboratorsOptions{})
+	if err != nil {
+		r.Err = err
+		done <- r
+		return
+	}
+	r.Collaborators = make([]string, len(colabs)+1)
+	r.Collaborators[0] = login.User
+	for i, u := range colabs {
+		r.Collaborators[i+1] = u.UserName
+	}
+
+	milestones, _, err := c.ListRepoMilestones(owner, repo, gitea.ListMilestoneOption{})
+	if err != nil {
+		r.Err = err
+		done <- r
+		return
+	}
+	r.MilestoneMap = make(map[string]int64)
+	r.MilestoneList = make([]string, len(milestones))
+	for i, m := range milestones {
+		r.MilestoneMap[m.Title] = m.ID
+		r.MilestoneList[i] = m.Title
+	}
+
+	labels, _, err := c.ListRepoLabels(owner, repo, gitea.ListLabelsOptions{})
+	if err != nil {
+		r.Err = err
+		done <- r
+		return
+	}
+	r.LabelMap = make(map[string]int64)
+	r.LabelList = make([]string, len(labels))
+	for i, l := range labels {
+		r.LabelMap[l.Name] = l.ID
+		r.LabelList[i] = l.Name
+	}
+
+	done <- r
 }

modules/interact/milestone_create.go

@@ -5,7 +5,6 @@
 package interact
 
 import (
-	"fmt"
 	"time"
 
 	"code.gitea.io/tea/modules/config"
@@ -13,12 +12,11 @@ import (
 
 	"code.gitea.io/sdk/gitea"
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/araddon/dateparse"
 )
 
 // CreateMilestone interactively creates a milestone
 func CreateMilestone(login *config.Login, owner, repo string) error {
-	var title, description, dueDate string
+	var title, description string
 	var deadline *time.Time
 
 	// owner, repo
@@ -41,28 +39,7 @@ func CreateMilestone(login *config.Login, owner, repo string) error {
 	}
 
 	// deadline
-	promptI = &survey.Input{Message: "Milestone deadline [no due date]:"}
-	err = survey.AskOne(
-		promptI,
-		&dueDate,
-		survey.WithValidator(func(input interface{}) error {
-			if str, ok := input.(string); ok {
-				if len(str) == 0 {
-					return nil
-				}
-				t, err := dateparse.ParseAny(str)
-				if err != nil {
-					return err
-				}
-				deadline = &t
-			} else {
-				return fmt.Errorf("invalid result type")
-			}
-			return nil
-		}),
-	)
-
-	if err != nil {
+	if deadline, err = promptDatetime("Milestone deadline:"); err != nil {
 		return err
 	}
 

modules/interact/prompts.go

@@ -7,8 +7,11 @@ package interact
 import (
 	"fmt"
 	"strings"
+	"time"
 
+	"code.gitea.io/tea/modules/utils"
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/araddon/dateparse"
 )
 
 // PromptMultiline runs a textfield-style prompt and blocks until input was made.
@@ -27,9 +30,10 @@ func PromptPassword(name string) (pass string, err error) {
 // promptRepoSlug interactively prompts for a Gitea repository or returns the current one
 func promptRepoSlug(defaultOwner, defaultRepo string) (owner, repo string, err error) {
 	prompt := "Target repo:"
+	defaultVal := ""
 	required := true
 	if len(defaultOwner) != 0 && len(defaultRepo) != 0 {
-		prompt = fmt.Sprintf("Target repo [%s/%s]:", defaultOwner, defaultRepo)
+		defaultVal = fmt.Sprintf("%s/%s", defaultOwner, defaultRepo)
 		required = false
 	}
 	var repoSlug string
@@ -38,7 +42,10 @@ func promptRepoSlug(defaultOwner, defaultRepo string) (owner, repo string, err e
 	repo = defaultRepo
 
 	err = survey.AskOne(
-		&survey.Input{Message: prompt},
+		&survey.Input{
+			Message: prompt,
+			Default: defaultVal,
+		},
 		&repoSlug,
 		survey.WithValidator(func(input interface{}) error {
 			if str, ok := input.(string); ok {
@@ -63,3 +70,96 @@ func promptRepoSlug(defaultOwner, defaultRepo string) (owner, repo string, err e
 	}
 	return
 }
+
+// promptDatetime prompts for a date or datetime string.
+// Supports all formats understood by araddon/dateparse.
+func promptDatetime(prompt string) (val *time.Time, err error) {
+	var input string
+	err = survey.AskOne(
+		&survey.Input{Message: prompt},
+		&input,
+		survey.WithValidator(func(input interface{}) error {
+			if str, ok := input.(string); ok {
+				if len(str) == 0 {
+					return nil
+				}
+				t, err := dateparse.ParseAny(str)
+				if err != nil {
+					return err
+				}
+				val = &t
+			} else {
+				return fmt.Errorf("invalid result type")
+			}
+			return nil
+		}),
+	)
+	return
+}
+
+// promptSelect creates a generic multiselect prompt, with processing of custom values.
+func promptMultiSelect(prompt string, options []string, customVal string) ([]string, error) {
+	var selection []string
+	promptA := &survey.MultiSelect{
+		Message: prompt,
+		Options: makeSelectOpts(options, customVal, ""),
+		VimMode: true,
+	}
+	if err := survey.AskOne(promptA, &selection); err != nil {
+		return nil, err
+	}
+	return promptCustomVal(prompt, customVal, selection)
+}
+
+// promptSelect creates a generic select prompt, with processing of custom values or none-option.
+func promptSelect(prompt string, options []string, customVal, noneVal string) (string, error) {
+	var selection string
+	promptA := &survey.Select{
+		Message: prompt,
+		Options: makeSelectOpts(options, customVal, noneVal),
+		VimMode: true,
+		Default: noneVal,
+	}
+	if err := survey.AskOne(promptA, &selection); err != nil {
+		return "", err
+	}
+	if noneVal != "" && selection == noneVal {
+		return "", nil
+	}
+	if customVal != "" {
+		sel, err := promptCustomVal(prompt, customVal, []string{selection})
+		if err != nil {
+			return "", err
+		}
+		selection = sel[0]
+	}
+	return selection, nil
+}
+
+// makeSelectOpts adds cusotmVal & noneVal to opts if set.
+func makeSelectOpts(opts []string, customVal, noneVal string) []string {
+	if customVal != "" {
+		opts = append(opts, customVal)
+	}
+	if noneVal != "" {
+		opts = append(opts, noneVal)
+	}
+	return opts
+}
+
+// promptCustomVal checks if customVal is present in selection, and prompts
+// for custom input to add to the selection instead.
+func promptCustomVal(prompt, customVal string, selection []string) ([]string, error) {
+	// check for custom value & prompt again with text input
+	// HACK until https://github.com/AlecAivazis/survey/issues/339 is implemented
+	if otherIndex := utils.IndexOf(selection, customVal); otherIndex != -1 {
+		var customAssignees string
+		promptA := &survey.Input{Message: prompt, Help: "comma separated list"}
+		if err := survey.AskOne(promptA, &customAssignees); err != nil {
+			return nil, err
+		}
+		selection = append(selection[:otherIndex], selection[otherIndex+1:]...)
+		selection = append(selection, strings.Split(customAssignees, ",")...)
+	}
+	return selection, nil
+}

modules/interact/pull_create.go

@@ -5,6 +5,7 @@
 package interact
 
 import (
+	"code.gitea.io/sdk/gitea"
 	"code.gitea.io/tea/modules/config"
 	"code.gitea.io/tea/modules/git"
 	"code.gitea.io/tea/modules/task"
@@ -14,7 +15,7 @@ import (
 
 // CreatePull interactively creates a PR
 func CreatePull(login *config.Login, owner, repo string) error {
-	var base, head, title, description string
+	var base, head string
 
 	// owner, repo
 	owner, repo, err := promptRepoSlug(owner, repo)
@@ -23,17 +24,14 @@ func CreatePull(login *config.Login, owner, repo string) error {
 	}
 
 	// base
-	baseBranch, err := task.GetDefaultPRBase(login, owner, repo)
+	base, err = task.GetDefaultPRBase(login, owner, repo)
 	if err != nil {
 		return err
 	}
-	promptI := &survey.Input{Message: "Target branch [" + baseBranch + "]:"}
+	promptI := &survey.Input{Message: "Target branch:", Default: base}
 	if err := survey.AskOne(promptI, &base); err != nil {
 		return err
 	}
-	if len(base) == 0 {
-		base = baseBranch
-	}
 
 	// head
 	localRepo, err := git.RepoForWorkdir()
@@ -45,38 +43,19 @@ func CreatePull(login *config.Login, owner, repo string) error {
 	if err == nil {
 		promptOpts = nil
 	}
-	var headOwnerInput, headBranchInput string
-	promptI = &survey.Input{Message: "Source repo owner [" + headOwner + "]:"}
-	if err := survey.AskOne(promptI, &headOwnerInput); err != nil {
+	promptI = &survey.Input{Message: "Source repo owner:", Default: headOwner}
+	if err := survey.AskOne(promptI, &headOwner); err != nil {
 		return err
 	}
-	if len(headOwnerInput) != 0 {
-		headOwner = headOwnerInput
-	}
-	promptI = &survey.Input{Message: "Source branch [" + headBranch + "]:"}
-	if err := survey.AskOne(promptI, &headBranchInput, promptOpts); err != nil {
+	promptI = &survey.Input{Message: "Source branch:", Default: headBranch}
+	if err := survey.AskOne(promptI, &headBranch, promptOpts); err != nil {
 		return err
 	}
-	if len(headBranchInput) != 0 {
-		headBranch = headBranchInput
-	}
 
 	head = task.GetHeadSpec(headOwner, headBranch, owner)
 
-	// title
-	title = task.GetDefaultPRTitle(head)
-	promptOpts = survey.WithValidator(survey.Required)
-	if len(title) != 0 {
-		promptOpts = nil
-	}
-	promptI = &survey.Input{Message: "PR title [" + title + "]:"}
-	if err := survey.AskOne(promptI, &title, promptOpts); err != nil {
-		return err
-	}
-
-	// description
-	promptM := &survey.Multiline{Message: "PR description:"}
-	if err := survey.AskOne(promptM, &description); err != nil {
+	opts := gitea.CreateIssueOption{Title: task.GetDefaultPRTitle(head)}
+	if err = promptIssueProperties(login, owner, repo, &opts); err != nil {
 		return err
 	}
 
@@ -86,6 +65,5 @@ func CreatePull(login *config.Login, owner, repo string) error {
 		repo,
 		base,
 		head,
-		title,
-		description)
+		&opts)
 }