STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use url package for setting query params

Browse source
This commit is contained in:
AliabbasMerchant 2020-05-26 07:45:14 +05:30
parent 42edd42da1
commit f95b8916f3
3 changed files with 37 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

17
command/issue.go
View file

@ -394,13 +394,16 @@ func issueCreate(cmd *cobra.Command, args []string) error {
if isWeb, err := cmd.Flags().GetBool("web"); err == nil && isWeb {
// TODO: move URL generation into GitHubRepository
openURL := fmt.Sprintf("https://github.com/%s/issues/new?", ghrepo.FullName(baseRepo))
openURL := fmt.Sprintf("https://github.com/%s/issues/new", ghrepo.FullName(baseRepo))
if title != "" || body != "" {
milestone := ""
if len(milestoneTitles) > 0 {
milestone = milestoneTitles[0]
}
openURL += getPrAndIssueQueryParams(title, body, assignees, labelNames, projectNames, milestone)
openURL, err = withPrAndIssueQueryParams(openURL, title, body, assignees, labelNames, projectNames, milestone)
if err != nil {
return err
}
} else if len(templateFiles) > 1 {
openURL += "/choose"
}
@ -455,15 +458,15 @@ func issueCreate(cmd *cobra.Command, args []string) error {
}
if action == PreviewAction {
openURL := fmt.Sprintf(
"https://github.com/%s/issues/new/?",
ghrepo.FullName(baseRepo),
)
openURL := fmt.Sprintf("https://github.com/%s/issues/new/", ghrepo.FullName(baseRepo))
milestone := ""
if len(milestoneTitles) > 0 {
milestone = milestoneTitles[0]
}
openURL += getPrAndIssueQueryParams(title, body, assignees, labelNames, projectNames, milestone)
openURL, err = withPrAndIssueQueryParams(openURL, title, body, assignees, labelNames, projectNames, milestone)
if err != nil {
return err
}
// TODO could exceed max url length for explorer
fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
return utils.OpenInBrowser(openURL)

4
command/issue_test.go
View file

@ -611,7 +611,7 @@ func TestIssueCreate_web(t *testing.T) {
t.Fatal("expected a command to run")
}
url := seenCmd.Args[len(seenCmd.Args)-1]
eq(t, url, "https://github.com/OWNER/REPO/issues/new?")
eq(t, url, "https://github.com/OWNER/REPO/issues/new")
eq(t, output.String(), "Opening github.com/OWNER/REPO/issues/new in your browser.\n")
eq(t, output.Stderr(), "")
}
@ -637,7 +637,7 @@ func TestIssueCreate_webTitleBody(t *testing.T) {
t.Fatal("expected a command to run")
}
url := strings.ReplaceAll(seenCmd.Args[len(seenCmd.Args)-1], "^", "")
eq(t, url, "https://github.com/OWNER/REPO/issues/new?title=mytitle&body=mybody")
eq(t, url, "https://github.com/OWNER/REPO/issues/new?body=mybody&title=mytitle")
eq(t, output.String(), "Opening github.com/OWNER/REPO/issues/new in your browser.\n")
}

41
command/pr_create.go
View file

@ -3,6 +3,7 @@ package command
import (
"errors"
"fmt"
"log"
"net/url"
"strings"
"time"
@ -251,7 +252,7 @@ func prCreate(cmd *cobra.Command, _ []string) error {
return errors.New("the --draft flag is not supported with --web")
}
if len(reviewers) > 0 && isWeb {
return errors.New("the --reviewers flag is not supported with --web")
return errors.New("the --reviewer flag is not supported with --web")
}
didForkRepo := false
@ -344,7 +345,10 @@ func prCreate(cmd *cobra.Command, _ []string) error {
if len(milestoneTitles) > 0 {
milestone = milestoneTitles[0]
}
openURL := generateCompareURL(baseRepo, baseBranch, headBranchLabel, title, body, assignees, labelNames, projectNames, milestone)
openURL, err := generateCompareURL(baseRepo, baseBranch, headBranchLabel, title, body, assignees, labelNames, projectNames, milestone)
if err != nil {
return err
}
// TODO could exceed max url length for explorer
fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
return utils.OpenInBrowser(openURL)
@ -396,41 +400,46 @@ func determineTrackingBranch(remotes context.Remotes, headBranch string) *git.Tr
return nil
}
func getPrAndIssueQueryParams(title, body string, assignees, labels, projects []string, milestone string) string {
queryParams := ""
func withPrAndIssueQueryParams(baseURL, title, body string, assignees, labels, projects []string, milestone string) (string, error) {
u, err := url.Parse(baseURL)
if err != nil {
log.Fatal(err)
}
q := u.Query()
if title != "" {
queryParams += "&title=" + url.QueryEscape(title)
q.Set("title", title)
}
if body != "" {
queryParams += "&body=" + url.QueryEscape(body)
q.Set("body", body)
}
if len(assignees) > 0 {
queryParams += "&assignees=" + url.QueryEscape(strings.Join(assignees, ","))
q.Set("assignees", strings.Join(assignees, ","))
}
if len(labels) > 0 {
queryParams += "&labels=" + url.QueryEscape(strings.Join(labels, ","))
q.Set("labels", strings.Join(labels, ","))
}
if len(projects) > 0 {
queryParams += "&projects=" + url.QueryEscape(strings.Join(projects, ","))
q.Set("projects", strings.Join(projects, ","))
}
if milestone != "" {
queryParams += "&milestone=" + url.QueryEscape(milestone)
q.Set("milestone", milestone)
}
return strings.TrimLeft(queryParams, "&")
u.RawQuery = q.Encode()
return u.String(), nil
}
func generateCompareURL(r ghrepo.Interface, base, head, title, body string, assignees, labels, projects []string, milestone string) string {
func generateCompareURL(r ghrepo.Interface, base, head, title, body string, assignees, labels, projects []string, milestone string) (string, error) {
u := fmt.Sprintf(
"https://github.com/%s/compare/%s...%s?expand=1",
ghrepo.FullName(r),
base,
head,
)
queryParams := getPrAndIssueQueryParams(title, body, assignees, labels, projects, milestone)
if len(queryParams) > 0 {
u += "&" + getPrAndIssueQueryParams(title, body, assignees, labels, projects, milestone)
url, err := withPrAndIssueQueryParams(u, title, body, assignees, labels, projects, milestone)
if err != nil {
return "", err
}
return u
return url, nil
}
var prCreateCmd = &cobra.Command{