issue/pr create: hide "Add metadata" if viewer does not have triage permission

mislav · mislav · commit 1128439cd1c7 · 2020-05-08T18:37:08.000+02:00
diff --git a/api/queries_repo.go b/api/queries_repo.go
@@ -66,13 +66,24 @@ func (r Repository) ViewerCanPush() bool {
 	}
 }
 
+// ViewerCanTriage is true when the requesting user can triage issues and pull requests
+func (r Repository) ViewerCanTriage() bool {
+	switch r.ViewerPermission {
+	case "ADMIN", "MAINTAIN", "WRITE", "TRIAGE":
+		return true
+	default:
+		return false
+	}
+}
+
 func GitHubRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
 	query := `
 	query($owner: String!, $name: String!) {
 		repository(owner: $owner, name: $name) {
 			id
 			hasIssuesEnabled
 			description
+			viewerPermission
 		}
 	}`
 	variables := map[string]interface{}{
diff --git a/command/issue.go b/command/issue.go
@@ -428,7 +428,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {
 	interactive := !(cmd.Flags().Changed("title") && cmd.Flags().Changed("body"))
 
 	if interactive {
-		err := titleBodySurvey(cmd, &tb, apiClient, baseRepo, title, body, defaults{}, templateFiles, false)
+		err := titleBodySurvey(cmd, &tb, apiClient, baseRepo, title, body, defaults{}, templateFiles, false, repo.ViewerCanTriage())
 		if err != nil {
 			return fmt.Errorf("could not collect title and/or body: %w", err)
 		}
diff --git a/command/pr_create.go b/command/pr_create.go
@@ -217,7 +217,7 @@ func prCreate(cmd *cobra.Command, _ []string) error {
 			templateFiles = githubtemplate.Find(rootDir, "PULL_REQUEST_TEMPLATE")
 		}
 
-		err := titleBodySurvey(cmd, &tb, client, baseRepo, title, body, defs, templateFiles, true)
+		err := titleBodySurvey(cmd, &tb, client, baseRepo, title, body, defs, templateFiles, true, baseRepo.ViewerCanTriage())
 		if err != nil {
 			return fmt.Errorf("could not collect title and/or body: %w", err)
 		}
diff --git a/command/title_body_survey.go b/command/title_body_survey.go
@@ -126,7 +126,7 @@ func selectTemplate(templatePaths []string) (string, error) {
 	return string(templateContents), nil
 }
 
-func titleBodySurvey(cmd *cobra.Command, issueState *issueMetadataState, apiClient *api.Client, repo ghrepo.Interface, providedTitle, providedBody string, defs defaults, templatePaths []string, allowReviewers bool) error {
+func titleBodySurvey(cmd *cobra.Command, issueState *issueMetadataState, apiClient *api.Client, repo ghrepo.Interface, providedTitle, providedBody string, defs defaults, templatePaths []string, allowReviewers, allowMetadata bool) error {
 	editorCommand := os.Getenv("GH_EDITOR")
 	if editorCommand == "" {
 		ctx := contextForCommand(cmd)
@@ -192,7 +192,6 @@ func titleBodySurvey(cmd *cobra.Command, issueState *issueMetadataState, apiClie
 	}
 
 	allowPreview := !issueState.HasMetadata()
-	allowMetadata := true
 	confirmA, err := confirmSubmission(allowPreview, allowMetadata)
 	if err != nil {
 		return fmt.Errorf("unable to confirm: %w", err)
@@ -324,8 +323,8 @@ func titleBodySurvey(cmd *cobra.Command, issueState *issueMetadataState, apiClie
 			issueState.Milestone = ""
 		}
 
-		allowPreview := !issueState.HasMetadata()
-		allowMetadata := false
+		allowPreview = !issueState.HasMetadata()
+		allowMetadata = false
 		confirmA, err = confirmSubmission(allowPreview, allowMetadata)
 		if err != nil {
 			return fmt.Errorf("unable to confirm: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {`
`428`	`428`	`interactive := !(cmd.Flags().Changed("title") && cmd.Flags().Changed("body"))`
`429`	`429`
`430`	`430`	`if interactive {`
`431`		`- err := titleBodySurvey(cmd, &tb, apiClient, baseRepo, title, body, defaults{}, templateFiles, false)`
	`431`	`+ err := titleBodySurvey(cmd, &tb, apiClient, baseRepo, title, body, defaults{}, templateFiles, false, repo.ViewerCanTriage())`
`432`	`432`	`if err != nil {`
`433`	`433`	`return fmt.Errorf("could not collect title and/or body: %w", err)`
`434`	`434`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ func prCreate(cmd *cobra.Command, _ []string) error {`
`217`	`217`	`templateFiles = githubtemplate.Find(rootDir, "PULL_REQUEST_TEMPLATE")`
`218`	`218`	`}`
`219`	`219`
`220`		`- err := titleBodySurvey(cmd, &tb, client, baseRepo, title, body, defs, templateFiles, true)`
	`220`	`+ err := titleBodySurvey(cmd, &tb, client, baseRepo, title, body, defs, templateFiles, true, baseRepo.ViewerCanTriage())`
`221`	`221`	`if err != nil {`
`222`	`222`	`return fmt.Errorf("could not collect title and/or body: %w", err)`
`223`	`223`	`}`