Skip to content

Commit da78eac

Browse files
mdanielsqs
authored andcommitted
Only include tag in the GraphQL query if provided
fixes: sourcegraph/sourcegraph-public-snapshot#273
1 parent 4e548d9 commit da78eac

1 file changed

Lines changed: 15 additions & 9 deletions

File tree

cmd/src/users_list.go

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,26 @@ Examples:
4848
if err != nil {
4949
return err
5050
}
51-
51+
vars := map[string]interface{}{
52+
"first": nullInt(*firstFlag),
53+
"query": nullString(*queryFlag),
54+
"tag": nullString(*tagFlag),
55+
}
56+
queryTagVar := ""
57+
queryTag := ""
58+
if maybeTagVar, ok := vars["tag"].(*string); ok && maybeTagVar != nil {
59+
queryTagVar = `$tag: String,`
60+
queryTag = `tag: $tag,`
61+
}
5262
query := `query Users(
5363
$first: Int,
5464
$query: String,
55-
$tag: String,
65+
` + queryTagVar + `
5666
) {
5767
users(
5868
first: $first,
5969
query: $query,
60-
tag: $tag,
70+
` + queryTag + `
6171
) {
6272
nodes {
6373
...UserFields
@@ -71,12 +81,8 @@ Examples:
7181
}
7282
}
7383
return (&apiRequest{
74-
query: query,
75-
vars: map[string]interface{}{
76-
"first": nullInt(*firstFlag),
77-
"query": nullString(*queryFlag),
78-
"tag": nullString(*tagFlag),
79-
},
84+
query: query,
85+
vars: vars,
8086
result: &result,
8187
done: func() error {
8288
for _, user := range result.Users.Nodes {

0 commit comments

Comments
 (0)