Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Feature/show issues and pr count #2767

Merged
merged 6 commits into from
Jun 10, 2019
Merged

Feature/show issues and pr count #2767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ebf995
fetching and displaying issueCount within RepositoryIssuesViewController
Jun 3, 2019
61b014f
proper naming of certain methods
Jun 3, 2019
fc58658
applying changes from pr
Jun 4, 2019
86b8cd2
applying changes from pr
Jun 4, 2019
c22f2d8
adding new lines
Jun 4, 2019
7a15532
fetching count of issues and prs from RepositoryViewController instea…
Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Classes/Repository/RepositoryClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ extension RepoSearchPagesQuery: RepositoryQuery {
results.search.pageInfo.hasNextPage else { return nil }
return results.search.pageInfo.endCursor
}

}

func createSummaryModel(
Expand Down
42 changes: 32 additions & 10 deletions Classes/Repository/RepositoryIssuesViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ IndicatorInfoProvider {
private let debouncer = Debouncer()
private var previousSearchString = "is:open "
private var label: String?
private var numberOfItems: Int?

init(client: GithubClient, owner: String, repo: String, type: RepositoryIssuesType, label: String? = nil) {
init(client: GithubClient, owner: String, repo: String, type: RepositoryIssuesType, label: String? = nil, numberOfItems: Int? = nil) {
self.owner = owner
self.repo = repo
self.client = RepositoryClient(githubClient: client, owner: owner, name: repo)
self.type = type
self.label = label
self.numberOfItems = numberOfItems
if let label = label {
previousSearchString += "label:\"\(label)\" "
}
Expand All @@ -49,10 +51,12 @@ IndicatorInfoProvider {
self.dataSource = self
self.emptyDataSource = self
self.headerDataSource = self

switch type {
case .issues: title = NSLocalizedString("Issues", comment: "")
case .pullRequests: title = NSLocalizedString("Pull Requests", comment: "")

if let itemCount = numberOfItems,
itemCount > 0 {
title = self.composeLocalizedTitle(using: itemCount)
} else {
title = self.composeLocalizedTitle()
}
}

Expand Down Expand Up @@ -81,20 +85,39 @@ IndicatorInfoProvider {
nextPage: page as String?,
containerWidth: view.safeContentWidth(with: feed.collectionView)
) { [weak self] (result: Result<RepositoryClient.RepositoryPayload>) in
guard let `self` = self else { return }
switch result {
case .error:
self?.error(animated: trueUnlessReduceMotionEnabled)
self.error(animated: trueUnlessReduceMotionEnabled)
case .success(let payload):
if page != nil {
self?.models += payload.models
self.models += payload.models
} else {
self?.models = payload.models
self.models = payload.models
}
self?.update(page: payload.nextPage, animated: trueUnlessReduceMotionEnabled)
self.update(page: payload.nextPage, animated: trueUnlessReduceMotionEnabled)
}
}
}

func composeLocalizedTitle(using itemCount: Int) -> String {
let newTitle: String
switch type {
case .issues: newTitle = "Issues (\(itemCount))"
case .pullRequests: newTitle = "Pull Requests (\(itemCount))"
}
return NSLocalizedString(newTitle, comment: "")
}

func composeLocalizedTitle() -> String {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could combine these two functions, keeping the logic in the function rather than the caller?
To me that seems to make the code a little easier to grasp, and putting all the logic in the function.

// set the title
title = composeLocalizedTitle(using: itemCount)

func composeLocalizedTitle(using itemCount: Int?) -> String {
    let newTitle: String
    if let itemCount = itemCount, itemCount > 0 {
        switch type {
        case .issues: newTitle = "Issues (\(itemCount))"
        case .pullRequests: newTitle = "Pull Requests (\(itemCount))"
        }
    } else {
        switch type {
        case .issues: newTitle = "Issues"
        case .pullRequests: newTitle = "Pull Requests"
        }
    }
    return NSLocalizedString(newTitle, comment: "")
}

What do you think?

let localizedTitle: String
switch type {
case .issues: localizedTitle = "Issues"
case .pullRequests: localizedTitle = "Pull Requests"
}
return NSLocalizedString(localizedTitle, comment: "")
}

// MARK: SearchBarSectionControllerDelegate

func didChangeSelection(sectionController: SearchBarSectionController, query: String) {
Expand Down Expand Up @@ -159,5 +182,4 @@ IndicatorInfoProvider {
func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo {
return IndicatorInfo(title: title)
}

}
26 changes: 21 additions & 5 deletions Classes/Repository/RepositoryViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ EmptyViewDelegate {
let hasIssuesEnabled: Bool
let defaultBranch: String
let graphQLID: String
let numberOfIssues: Int?
let numberOfPullRequests: Int?
}

private enum State {
Expand Down Expand Up @@ -135,15 +137,18 @@ EmptyViewDelegate {
client: client,
owner: repo.owner,
repo: repo.name,
type: .issues
type: .issues,
numberOfItems: details.numberOfIssues
))
}
controllers += [
RepositoryIssuesViewController(
client: client,
owner: repo.owner,
repo: repo.name,
type: .pullRequests
type: .pullRequests,
numberOfItems: details.numberOfPullRequests

),
RepositoryCodeDirectoryViewController.createRoot(
client: client,
Expand All @@ -157,14 +162,23 @@ EmptyViewDelegate {

self.controllers = controllers
}

func buildQueryString(using repo: RepositoryDetails, _ searchString: String) -> String {
return "repo:\(repo.owner)/\(repo.name) \(searchString) ".lowercased()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be two spaces ( ) between the name and the string?

}

func fetchDetails() {
state = .loading
buildViewControllers()
reloadPagerTabStripView()

let issueSearchQueryString = "is:issue is:open"
let prSearchQueryString = "is:pr is:open"
client.client.query(
RepositoryInfoQuery(owner: repo.owner, name: repo.name),
RepositoryInfoQuery(owner: repo.owner,
name: repo.name,
issueQuery: buildQueryString(using: repo, issueSearchQueryString),
prQuery: buildQueryString(using: repo, prSearchQueryString)
),
result: { $0 },
completion: { [weak self] result in
switch result {
Expand All @@ -176,7 +190,9 @@ EmptyViewDelegate {
let details = Details(
hasIssuesEnabled: repo.hasIssuesEnabled,
defaultBranch: repo.defaultBranchRef?.name ?? "master",
graphQLID: repo.id
graphQLID: repo.id,
numberOfIssues: data.repoIssueOverview.issueCount,
numberOfPullRequests: data.repoPullRequestOverView.issueCount
)
self?.state = .value(details)
} else {
Expand Down
112 changes: 107 additions & 5 deletions gql/API.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2088,25 +2088,31 @@ public final class RepoFileHistoryQuery: GraphQLQuery {

public final class RepositoryInfoQuery: GraphQLQuery {
public let operationDefinition =
"query RepositoryInfo($owner: String!, $name: String!) {\n repository(owner: $owner, name: $name) {\n __typename\n id\n defaultBranchRef {\n __typename\n name\n }\n hasIssuesEnabled\n }\n}"
"query RepositoryInfo($owner: String!, $name: String!, $issueQuery: String!, $prQuery: String!) {\n repository(owner: $owner, name: $name) {\n __typename\n id\n defaultBranchRef {\n __typename\n name\n }\n hasIssuesEnabled\n }\n repoIssueOverview: search(query: $issueQuery, type: ISSUE) {\n __typename\n issueCount\n }\n repoPullRequestOverView: search(query: $prQuery, type: ISSUE) {\n __typename\n issueCount\n }\n}"

public var owner: String
public var name: String
public var issueQuery: String
public var prQuery: String

public init(owner: String, name: String) {
public init(owner: String, name: String, issueQuery: String, prQuery: String) {
self.owner = owner
self.name = name
self.issueQuery = issueQuery
self.prQuery = prQuery
}

public var variables: GraphQLMap? {
return ["owner": owner, "name": name]
return ["owner": owner, "name": name, "issueQuery": issueQuery, "prQuery": prQuery]
}

public struct Data: GraphQLSelectionSet {
public static let possibleTypes = ["Query"]

public static let selections: [GraphQLSelection] = [
GraphQLField("repository", arguments: ["owner": GraphQLVariable("owner"), "name": GraphQLVariable("name")], type: .object(Repository.selections)),
GraphQLField("search", alias: "repoIssueOverview", arguments: ["query": GraphQLVariable("issueQuery"), "type": "ISSUE"], type: .nonNull(.object(RepoIssueOverview.selections))),
GraphQLField("search", alias: "repoPullRequestOverView", arguments: ["query": GraphQLVariable("prQuery"), "type": "ISSUE"], type: .nonNull(.object(RepoPullRequestOverView.selections))),
]

public private(set) var resultMap: ResultMap
Expand All @@ -2115,8 +2121,8 @@ public final class RepositoryInfoQuery: GraphQLQuery {
self.resultMap = unsafeResultMap
}

public init(repository: Repository? = nil) {
self.init(unsafeResultMap: ["__typename": "Query", "repository": repository.flatMap { (value: Repository) -> ResultMap in value.resultMap }])
public init(repository: Repository? = nil, repoIssueOverview: RepoIssueOverview, repoPullRequestOverView: RepoPullRequestOverView) {
self.init(unsafeResultMap: ["__typename": "Query", "repository": repository.flatMap { (value: Repository) -> ResultMap in value.resultMap }, "repoIssueOverview": repoIssueOverview.resultMap, "repoPullRequestOverView": repoPullRequestOverView.resultMap])
}

/// Lookup a given repository by the owner and repository name.
Expand All @@ -2129,6 +2135,26 @@ public final class RepositoryInfoQuery: GraphQLQuery {
}
}

/// Perform a search across resources.
public var repoIssueOverview: RepoIssueOverview {
get {
return RepoIssueOverview(unsafeResultMap: resultMap["repoIssueOverview"]! as! ResultMap)
}
set {
resultMap.updateValue(newValue.resultMap, forKey: "repoIssueOverview")
}
}

/// Perform a search across resources.
public var repoPullRequestOverView: RepoPullRequestOverView {
get {
return RepoPullRequestOverView(unsafeResultMap: resultMap["repoPullRequestOverView"]! as! ResultMap)
}
set {
resultMap.updateValue(newValue.resultMap, forKey: "repoPullRequestOverView")
}
}

public struct Repository: GraphQLSelectionSet {
public static let possibleTypes = ["Repository"]

Expand Down Expand Up @@ -2225,6 +2251,82 @@ public final class RepositoryInfoQuery: GraphQLQuery {
}
}
}

public struct RepoIssueOverview: GraphQLSelectionSet {
public static let possibleTypes = ["SearchResultItemConnection"]

public static let selections: [GraphQLSelection] = [
GraphQLField("__typename", type: .nonNull(.scalar(String.self))),
GraphQLField("issueCount", type: .nonNull(.scalar(Int.self))),
]

public private(set) var resultMap: ResultMap

public init(unsafeResultMap: ResultMap) {
self.resultMap = unsafeResultMap
}

public init(issueCount: Int) {
self.init(unsafeResultMap: ["__typename": "SearchResultItemConnection", "issueCount": issueCount])
}

public var __typename: String {
get {
return resultMap["__typename"]! as! String
}
set {
resultMap.updateValue(newValue, forKey: "__typename")
}
}

/// The number of issues that matched the search query.
public var issueCount: Int {
get {
return resultMap["issueCount"]! as! Int
}
set {
resultMap.updateValue(newValue, forKey: "issueCount")
}
}
}

public struct RepoPullRequestOverView: GraphQLSelectionSet {
public static let possibleTypes = ["SearchResultItemConnection"]

public static let selections: [GraphQLSelection] = [
GraphQLField("__typename", type: .nonNull(.scalar(String.self))),
GraphQLField("issueCount", type: .nonNull(.scalar(Int.self))),
]

public private(set) var resultMap: ResultMap

public init(unsafeResultMap: ResultMap) {
self.resultMap = unsafeResultMap
}

public init(issueCount: Int) {
self.init(unsafeResultMap: ["__typename": "SearchResultItemConnection", "issueCount": issueCount])
}

public var __typename: String {
get {
return resultMap["__typename"]! as! String
}
set {
resultMap.updateValue(newValue, forKey: "__typename")
}
}

/// The number of issues that matched the search query.
public var issueCount: Int {
get {
return resultMap["issueCount"]! as! Int
}
set {
resultMap.updateValue(newValue, forKey: "issueCount")
}
}
}
}
}

Expand Down
9 changes: 8 additions & 1 deletion gql/RepositoryInfo.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
query RepositoryInfo($owner: String!, $name: String!) {
query RepositoryInfo($owner: String!, $name: String!, $issueQuery: String!, $prQuery: String!) {
repository(owner: $owner, name: $name) {
id
defaultBranchRef {
name
}
hasIssuesEnabled
}

repoIssueOverview: search(query: $issueQuery, type: ISSUE) {
issueCount
}
repoPullRequestOverView: search(query: $prQuery, type: ISSUE) {
issueCount
}
}
Loading