Skip to content

Commit 1effc91

Browse files
MichaelMuresandhose
authored andcommitted
graphql: merge defaultRepository and repository for simplified webUI code
1 parent 76d4006 commit 1effc91

File tree

4 files changed

+21
-73
lines changed

4 files changed

+21
-73
lines changed

graphql/graph/gen_graph.go

Lines changed: 8 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

graphql/graphql_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestQueries(t *testing.T) {
2525

2626
query := `
2727
query {
28-
defaultRepository {
28+
repository {
2929
allBugs(first: 2) {
3030
pageInfo {
3131
endCursor
@@ -162,7 +162,7 @@ func TestQueries(t *testing.T) {
162162
}
163163

164164
var resp struct {
165-
DefaultRepository struct {
165+
Repository struct {
166166
AllBugs struct {
167167
PageInfo models.PageInfo
168168
Nodes []struct {

graphql/resolvers/query.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,15 @@ func (r rootQueryResolver) DefaultRepository(_ context.Context) (*models.Reposit
2727
}, nil
2828
}
2929

30-
func (r rootQueryResolver) Repository(_ context.Context, ref string) (*models.Repository, error) {
31-
repo, err := r.cache.ResolveRepo(ref)
30+
func (r rootQueryResolver) Repository(_ context.Context, ref *string) (*models.Repository, error) {
31+
var repo *cache.RepoCache
32+
var err error
33+
34+
if ref == nil {
35+
repo, err = r.cache.DefaultRepo()
36+
} else {
37+
repo, err = r.cache.ResolveRepo(*ref)
38+
}
3239

3340
if err != nil {
3441
return nil, err

graphql/schema/root.graphql

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
type Query {
2-
"""The default unnamend repository."""
3-
defaultRepository: Repository
4-
"""Access a repository by reference/name."""
5-
repository(ref: String!): Repository
6-
7-
#TODO: connection for all repositories
2+
"""Access a repository by reference/name. If no ref is given, the default repository is returned if any."""
3+
repository(ref: String): Repository
84
}
95

106
type Mutation {

0 commit comments

Comments
 (0)