Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add unlabelled issues to the dashboard for triaging. #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions app/model/Issue.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package model

case class Issue(number: Int, url: String, labels: Seq[Label], comments: Int)
case class Label(name: String, color: String)
24 changes: 22 additions & 2 deletions app/model/Json.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,18 @@ object GitHubJsonReaders {
implicit def pullRequestReads: Reads[PullRequest] = (
(__ \ "number").read[Int] and
(__ \ "html_url").read[String] and
(__ \ "_links" \ "comments" \ "href").read[String])(PullRequest)
(__ \ "_links" \ "comments" \ "href").read[String]).apply(PullRequest)


implicit def labelReads: Reads[Label] = (
(__ \ "name").read[String] and
(__ \ "color").read[String]) apply (Label)

implicit def issueReads: Reads[Issue] = (
(__ \ "number").read[Int] and
(__ \ "url").read[String] and
(__ \ "labels").read[Seq[Label]] and
(__ \ "comments").read[Int]).apply(Issue)

}

Expand All @@ -25,10 +36,19 @@ object WebAppJsonWriters {
"url" -> pr.url)
}
}

implicit def issueWrites = new Writes[Issue] {
def writes(i: Issue): JsValue = {
Json.obj(
"number" -> i.number,
"url" -> i.url)
}
}

implicit def projectWrites: Writes[Project] = (
(__ \ "name").write[String] and
(__ \ "category").write[String] and
(__ \ "githubRepo").write[String] and
(__ \ "pullRequests").lazyWrite(list[PullRequest](pullRequestWrites)))(unlift(Project.unapply))
(__ \ "pullRequests").lazyWrite(list[PullRequest](pullRequestWrites)) and
(__ \ "issues").lazyWrite(list[Issue](issueWrites)))(unlift(Project.unapply))
}
2 changes: 1 addition & 1 deletion app/model/Project.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ object Project {
}
}

case class Project(name: String, category: String, githubRepo: String, val pullRequests: List[PullRequest] = Nil) {
case class Project(name: String, category: String, githubRepo: String, val pullRequests: List[PullRequest] = Nil, val issues: List[Issue] = Nil) {

}
41 changes: 30 additions & 11 deletions app/org/scalaide/dashboard/projects/DataProcessorActor.scala
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,41 @@ object DataProcessorActor {
private val RepoAPI = "repos/"

private val PullRequestCommand = "/pulls?"
private val IssuesRequestCommand = "/issues?"

private val AccessTokenParam = s"access_token=$OAuthToken"

private def fetchProjectPullRequests(p: model.Project): Future[List[model.PullRequest]] = {
WS.url(BaseGitHubURL + RepoAPI + p.githubRepo + PullRequestCommand + AccessTokenParam).get().map { response =>
import model.GitHubJsonReaders._
val pullRequestsa = (response.json).validate[List[PullRequest]]
pullRequestsa.recover {
case a =>
println(a)
Nil
}.get
}
}
private def fetchProjectIssues(p: model.Project): Future[List[model.Issue]] = {
WS.url(BaseGitHubURL + RepoAPI + p.githubRepo + IssuesRequestCommand + AccessTokenParam).get().map { response =>
import model.GitHubJsonReaders._
val issuesA = (response.json).validate[List[model.Issue]]
issuesA.recover {
case a =>
println(a)
Nil
}.get.filter(_.labels.isEmpty) // TODO - Filter here or later?
}
}

def fetchAllProjects(sender: ActorRef) {
val f = Future.traverse(Project.allProjects) { p =>
WS.url(BaseGitHubURL + RepoAPI + p.githubRepo + PullRequestCommand + AccessTokenParam).get().map { response =>
import model.GitHubJsonReaders._

val pullRequestsa = (response.json).validate[List[PullRequest]]
val prs = pullRequestsa.recover {
case a =>
println(a)
Nil
}.get
p.copy(pullRequests = prs.sortBy(_.number))
}
val pulls = fetchProjectPullRequests(p)
val issues = fetchProjectIssues(p)
for {
ps <- pulls
is <- issues
} yield p.copy(pullRequests = ps.sortBy(_.number), issues = is)
}

f.map {
Expand Down
28 changes: 28 additions & 0 deletions public/javascripts/projects.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ function createPullRequestDom(pullRequest) {
return nPullRequest;
}

function createIssueDom(issue) {
var nPullRequest = document.createElement("a");
nPullRequest.className = "pr";
nPullRequest.target = "_blank"
nPullRequest.href = issue.url
nPullRequest.appendChild(document.createTextNode(issue.number))
return nPullRequest;
}

function projectId(project) {
return project.githubRepo.replace("/", "_").replace(".", "-");
}
Expand Down Expand Up @@ -48,6 +57,25 @@ function createProjectDom(project) {
nPR.appendChild(createPullRequestDom(prs[i]));
}
}

var nPI = document.createElement("div");
nPI.className = "project-pr";
nProject.appendChild(nPI);

var nPRIssue = document.createElement("span");
nPRIssue.className = "label";
nPRIssue.appendChild(document.createTextNode("unlabeled Issues:"))
nPI.appendChild(nPRIssue);

var issues = project.issues;

if (issues.length == 0) {
nPI.appendChild(document.createTextNode(" -"));
} else {
for ( var i = 0; i < issues.length; i++) {
nPI.appendChild(createIssueDom(issues[i]));
}
}

return nProject;
}
Expand Down