From 287a0b66694f66379f90e8c4659cab4443917ff9 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 15 Sep 2014 23:47:06 +0900 Subject: [PATCH 01/41] (refs #488)Copy listparts.scala.html from issues/pulls to dashboard. --- src/main/scala/app/DashboardController.scala | 4 +- .../twirl/dashboard/issueslist.scala.html | 184 ++++++++++++++++++ src/main/twirl/dashboard/pullslist.scala.html | 100 ++++++++++ 3 files changed, 286 insertions(+), 2 deletions(-) create mode 100644 src/main/twirl/dashboard/issueslist.scala.html create mode 100644 src/main/twirl/dashboard/pullslist.scala.html diff --git a/src/main/scala/app/DashboardController.scala b/src/main/scala/app/DashboardController.scala index d0a40f092..030f875c8 100644 --- a/src/main/scala/app/DashboardController.scala +++ b/src/main/scala/app/DashboardController.scala @@ -54,7 +54,7 @@ trait DashboardControllerBase extends ControllerBase { val page = IssueSearchCondition.page(request) dashboard.html.issues( - issues.html.listparts( + dashboard.html.issueslist( searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*), page, countIssue(condition.copy(state = "open" ), filterUser, false, userRepos: _*), @@ -89,7 +89,7 @@ trait DashboardControllerBase extends ControllerBase { IssueSearchCondition().copy(state = condition.state), Map.empty, true, userRepos: _*) dashboard.html.pulls( - pulls.html.listparts( + dashboard.html.pullslist( searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*), page, countIssue(condition.copy(state = "open" ), filterUser, true, allRepos: _*), diff --git a/src/main/twirl/dashboard/issueslist.scala.html b/src/main/twirl/dashboard/issueslist.scala.html new file mode 100644 index 000000000..8a96492c3 --- /dev/null +++ b/src/main/twirl/dashboard/issueslist.scala.html @@ -0,0 +1,184 @@ +@(issues: List[(model.Issue, List[model.Label], Int)], + page: Int, + openCount: Int, + closedCount: Int, + condition: service.IssuesService.IssueSearchCondition, + collaborators: List[String] = Nil, + milestones: List[model.Milestone] = Nil, + labels: List[model.Label] = Nil, + repository: Option[service.RepositoryService.RepositoryInfo] = None, + hasWritePermission: Boolean = false)(implicit context: app.Context) +@import context._ +@import view.helpers._ + +
+ @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){ + + Clear milestone and label filters + + } + @if(condition.repo.isDefined){ + + Clear filter on @condition.repo + + } +
+ @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 7, condition.toURL) +
+
+ @openCount Open + @closedCount Closed +
+ @helper.html.dropdown( + value = (condition.sort, condition.direction) match { + case ("created" , "desc") => "Newest" + case ("created" , "asc" ) => "Oldest" + case ("comments", "desc") => "Most commented" + case ("comments", "asc" ) => "Least commented" + case ("updated" , "desc") => "Recently updated" + case ("updated" , "asc" ) => "Least recently updated" + }, + prefix = "Sort", + mini = false + ){ +
  • + + @helper.html.checkicon(condition.sort == "created" && condition.direction == "desc") Newest + +
    • +
  • + + @helper.html.checkicon(condition.sort == "created" && condition.direction == "asc") Oldest + +
    • +
  • + + @helper.html.checkicon(condition.sort == "comments" && condition.direction == "desc") Most commented + +
    • +
  • + + @helper.html.checkicon(condition.sort == "comments" && condition.direction == "asc") Least commented + +
    • +
  • + + @helper.html.checkicon(condition.sort == "updated" && condition.direction == "desc") Recently updated + +
    • +
  • + + @helper.html.checkicon(condition.sort == "updated" && condition.direction == "asc") Least recently updated + +
    • + } + + @if(issues.isEmpty){ + + + + } else { + @if(hasWritePermission){ + + + + } + } + @issues.map { case (issue, labels, commentCount) => + + + + } +
    + No issues to show. + @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){ + Clear active filters. + } else { + @if(repository.isDefined){ + Create a new issue. + } + } +
    +
    + +
    + @helper.html.dropdown("Label") { + @labels.map { label => +
  • + + +   + @label.labelName + +
    • + } + } + @helper.html.dropdown("Assignee") { +
  • Clear assignee
    • + @collaborators.map { collaborator => +
  • @avatar(collaborator, 20) @collaborator
    • + } + } + @helper.html.dropdown("Milestone") { +
  • Clear this milestone
    • + @milestones.map { milestone => +
  • + + @milestone.title +
    + @milestone.dueDate.map { dueDate => + @if(isPast(dueDate)){ + Due in @date(dueDate) + } else { + Due in @date(dueDate) + } + }.getOrElse { + No due date + } +
    +     +
    • + } + } +
    + @if(hasWritePermission){ + + } +
    +
    + @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 10, condition.toURL) +
    +
    + diff --git a/src/main/twirl/dashboard/pullslist.scala.html b/src/main/twirl/dashboard/pullslist.scala.html new file mode 100644 index 000000000..c0d0cdc90 --- /dev/null +++ b/src/main/twirl/dashboard/pullslist.scala.html @@ -0,0 +1,100 @@ +@(issues: List[(model.Issue, List[model.Label], Int)], + page: Int, + openCount: Int, + closedCount: Int, + condition: service.IssuesService.IssueSearchCondition, + repository: Option[service.RepositoryService.RepositoryInfo], + hasWritePermission: Boolean)(implicit context: app.Context) +@import context._ +@import view.helpers._ +
    + @repository.map { repository => + @if(hasWritePermission){ +
    + @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 7, condition.toURL) + New pull request +
    + } + } +
    + @openCount Open + @closedCount Closed +
    + @helper.html.dropdown( + value = (condition.sort, condition.direction) match { + case ("created" , "desc") => "Newest" + case ("created" , "asc" ) => "Oldest" + case ("comments", "desc") => "Most commented" + case ("comments", "asc" ) => "Least commented" + case ("updated" , "desc") => "Recently updated" + case ("updated" , "asc" ) => "Least recently updated" + }, + prefix = "Sort", + mini = false + ){ +
  • + + @helper.html.checkicon(condition.sort == "created" && condition.direction == "desc") Newest + +
    • +
  • + + @helper.html.checkicon(condition.sort == "created" && condition.direction == "asc") Oldest + +
    • +
  • + + @helper.html.checkicon(condition.sort == "comments" && condition.direction == "desc") Most commented + +
    • +
  • + + @helper.html.checkicon(condition.sort == "comments" && condition.direction == "asc") Least commented + +
    • +
  • + + @helper.html.checkicon(condition.sort == "updated" && condition.direction == "desc") Recently updated + +
    • +
  • + + @helper.html.checkicon(condition.sort == "updated" && condition.direction == "asc") Least recently updated + +
    • + } + + @if(issues.isEmpty){ + + + + } + @issues.map { case (issue, labels, commentCount) => + + + + } +
    + No pull requests to show. +
    + + @issue.title + #@issue.issueId +
    + @issue.content.map { content => + @cut(content, 90) + }.getOrElse { + No description available + } +
    +
    + @avatarLink(issue.openedUserName, 20) by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)  + @if(commentCount > 0){ + @commentCount @plural(commentCount, "comment") + } +
    +
    +
    + @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 10, condition.toURL) +
    +
    \ No newline at end of file From f4e4506517c2f073174720f1be1ad6233648694f Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 16 Sep 2014 00:46:38 +0900 Subject: [PATCH 02/41] (refs #488)Start to apply new issue UI to the issue list. --- src/main/twirl/issues/list.scala.html | 2 + src/main/twirl/issues/listparts.scala.html | 182 +++++++++--------- src/main/twirl/issues/tab.scala.html | 8 +- .../webapp/assets/common/css/gitbucket.css | 12 +- 4 files changed, 113 insertions(+), 91 deletions(-) diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index 0e41fbae0..4264e54ba 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -19,6 +19,7 @@ @html.menu("issues", repository){ @tab("issues", false, repository)
    + @*
      @@ -131,6 +132,7 @@ @_root_.issues.labels.html.edit(None, repository) }
    + *@ @***** show issue list *****@ @listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
    diff --git a/src/main/twirl/issues/listparts.scala.html b/src/main/twirl/issues/listparts.scala.html index 8a96492c3..972166431 100644 --- a/src/main/twirl/issues/listparts.scala.html +++ b/src/main/twirl/issues/listparts.scala.html @@ -11,7 +11,8 @@ @import context._ @import view.helpers._ -
    +
    + @* @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){ Clear milestone and label filters @@ -72,110 +73,117 @@ } + *@ - @if(issues.isEmpty){ - + - } else { - @if(hasWritePermission){ - - - - } - } - @issues.map { case (issue, labels, commentCount) => - - + + + } else { + @* + @if(hasWritePermission){ + + + + } + *@ + } + @issues.map { case (issue, labels, commentCount) => + + - - } + @if(hasWritePermission){ + + } + + + }
    - No issues to show. - @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){ - Clear active filters. - } else { - @if(repository.isDefined){ - Create a new issue. - } - } - + + @openCount Open + @closedCount Closed +
    -
    - -
    - @helper.html.dropdown("Label") { - @labels.map { label => -
  • - - -   - @label.labelName - -
    • - } - } - @helper.html.dropdown("Assignee") { -
  • Clear assignee
    • - @collaborators.map { collaborator => -
  • @avatar(collaborator, 20) @collaborator
    • - } - } - @helper.html.dropdown("Milestone") { -
  • Clear this milestone
    • - @milestones.map { milestone => -
  • - - @milestone.title -
    - @milestone.dueDate.map { dueDate => - @if(isPast(dueDate)){ - Due in @date(dueDate) - } else { - Due in @date(dueDate) - } - }.getOrElse { - No due date - } -
    -     -
    • - } - } -
    - @if(hasWritePermission){ -
    + No issues to show. + @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){ + Clear active filters. } else { - + @if(repository.isDefined){ + Create a new issue. + } + } +
    +
    + +
    + @helper.html.dropdown("Label") { + @labels.map { label => +
  • + + +   + @label.labelName + +
    • + } + } + @helper.html.dropdown("Assignee") { +
  • Clear assignee
    • + @collaborators.map { collaborator => +
  • @avatar(collaborator, 20) @collaborator
    • + } + } + @helper.html.dropdown("Milestone") { +
  • Clear this milestone
    • + @milestones.map { milestone => +
  • + + @milestone.title +
    + @milestone.dueDate.map { dueDate => + @if(isPast(dueDate)){ + Due in @date(dueDate) + } else { + Due in @date(dueDate) + } + }.getOrElse { + No due date + } +
    +     +
    • + } + } +
    + @if(hasWritePermission){ +
    @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 10, condition.toURL) diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html index b5cfe32f5..f6a4ebded 100644 --- a/src/main/twirl/issues/tab.scala.html +++ b/src/main/twirl/issues/tab.scala.html @@ -1,9 +1,11 @@ @(active: String, create: Boolean, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) @import context._ @import view.helpers._ -
      - Browse Issues - Milestones +
        + Issues + Pull requests + Labels + Milestones @if(loginAccount.isDefined){
      • diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index fecaa3605..a158f357f 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -620,6 +620,16 @@ span.simplified-path { /****************************************************************************/ /* Issues */ /****************************************************************************/ +a.button-link { + font-weight: normal; + color: gray; +} + +a.selected { + font-weight: bold; + color: black; +} + span.issue-status { display: block; font-size: large; @@ -634,7 +644,7 @@ table.table-issues { a.issue-title { color: #333; font-weight: bold; - size: 110%; + font-size: 120%; } ul.label-list { From 3b1367dd8e558fba6f3dc09e925f36e1e3be6825 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 20 Sep 2014 03:02:52 +0900 Subject: [PATCH 03/41] (refs #488)Displays the milestone on the issue list. --- src/main/scala/service/IssuesService.scala | 14 ++++++++------ src/main/twirl/dashboard/issueslist.scala.html | 4 ++-- src/main/twirl/dashboard/pullslist.scala.html | 4 ++-- src/main/twirl/issues/list.scala.html | 2 +- src/main/twirl/issues/listparts.scala.html | 5 +++-- src/main/twirl/pulls/list.scala.html | 2 +- src/main/twirl/pulls/listparts.scala.html | 4 ++-- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index 292b93ae0..c49d98239 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -116,7 +116,7 @@ trait IssuesService { */ def searchIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean, offset: Int, limit: Int, repos: (String, String)*) - (implicit s: Session): List[(Issue, List[Label], Int)] = { + (implicit s: Session): List[(Issue, List[Label], Option[String], Int)] = { // get issues and comment count and labels searchIssueQuery(repos, condition, filterUser, onlyPullRequest) @@ -136,21 +136,23 @@ trait IssuesService { .drop(offset).take(limit) .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) } .leftJoin (Labels) .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) } - .map { case (((t1, t2), t3), t4) => - (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?) + .leftJoin (Milestones) .on { case ((((t1, t2), t3), t4), t5) => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) } + .map { case ((((t1, t2), t3), t4), t5) => + (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?, t5.title.?) } .list .splitWith { (c1, c2) => - c1._1.userName == c2._1.userName && + c1._1.userName == c2._1.userName && c1._1.repositoryName == c2._1.repositoryName && - c1._1.issueId == c2._1.issueId + c1._1.issueId == c2._1.issueId } .map { issues => issues.head match { - case (issue, commentCount, _,_,_) => + case (issue, commentCount, _, _, _, milestone) => (issue, issues.flatMap { t => t._3.map ( Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get) )} toList, + milestone, commentCount) }} toList } diff --git a/src/main/twirl/dashboard/issueslist.scala.html b/src/main/twirl/dashboard/issueslist.scala.html index 8a96492c3..0d861ba9a 100644 --- a/src/main/twirl/dashboard/issueslist.scala.html +++ b/src/main/twirl/dashboard/issueslist.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Int)], +@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], page: Int, openCount: Int, closedCount: Int, @@ -135,7 +135,7 @@ } } - @issues.map { case (issue, labels, commentCount) => + @issues.map { case (issue, labels, milestone, commentCount) => @if(hasWritePermission){ diff --git a/src/main/twirl/dashboard/pullslist.scala.html b/src/main/twirl/dashboard/pullslist.scala.html index c0d0cdc90..ef06e23be 100644 --- a/src/main/twirl/dashboard/pullslist.scala.html +++ b/src/main/twirl/dashboard/pullslist.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Int)], +@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], page: Int, openCount: Int, closedCount: Int, @@ -71,7 +71,7 @@ } - @issues.map { case (issue, labels, commentCount) => + @issues.map { case (issue, labels, milestone, commentCount) => diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index 4264e54ba..ffc11ff9f 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Int)], +@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], page: Int, collaborators: List[String], milestones: List[model.Milestone], diff --git a/src/main/twirl/issues/listparts.scala.html b/src/main/twirl/issues/listparts.scala.html index 972166431..c315bc35e 100644 --- a/src/main/twirl/issues/listparts.scala.html +++ b/src/main/twirl/issues/listparts.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Int)], +@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], page: Int, openCount: Int, closedCount: Int, @@ -146,7 +146,7 @@ } *@ } - @issues.map { case (issue, labels, commentCount) => + @issues.map { case (issue, labels, milestone, commentCount) => @if(hasWritePermission){ @@ -177,6 +177,7 @@
        #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate) + @milestone
        @if(hasWritePermission){ diff --git a/src/main/twirl/pulls/list.scala.html b/src/main/twirl/pulls/list.scala.html index a2fb30d92..e72335fb4 100644 --- a/src/main/twirl/pulls/list.scala.html +++ b/src/main/twirl/pulls/list.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Int)], +@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], counts: List[service.PullRequestService.PullRequestCount], filter: Option[String], page: Int, diff --git a/src/main/twirl/pulls/listparts.scala.html b/src/main/twirl/pulls/listparts.scala.html index c0d0cdc90..ef06e23be 100644 --- a/src/main/twirl/pulls/listparts.scala.html +++ b/src/main/twirl/pulls/listparts.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Int)], +@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], page: Int, openCount: Int, closedCount: Int, @@ -71,7 +71,7 @@ } - @issues.map { case (issue, labels, commentCount) => + @issues.map { case (issue, labels, milestone, commentCount) => From 706fa77de303017c6c7398d20e35fc315d3b9384 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 21 Sep 2014 02:06:38 +0900 Subject: [PATCH 04/41] (refs #488)Add service.IssuesService.IssueInfo --- src/main/scala/service/IssuesService.scala | 6 ++++-- src/main/twirl/dashboard/issueslist.scala.html | 6 +++--- src/main/twirl/dashboard/pullslist.scala.html | 5 +++-- src/main/twirl/issues/list.scala.html | 2 +- src/main/twirl/issues/listparts.scala.html | 6 +++--- src/main/twirl/issues/tab.scala.html | 2 +- src/main/twirl/pulls/list.scala.html | 3 ++- src/main/twirl/pulls/listparts.scala.html | 5 +++-- 8 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index c49d98239..c6d5fc42d 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -116,7 +116,7 @@ trait IssuesService { */ def searchIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean, offset: Int, limit: Int, repos: (String, String)*) - (implicit s: Session): List[(Issue, List[Label], Option[String], Int)] = { + (implicit s: Session): List[IssueInfo] = { // get issues and comment count and labels searchIssueQuery(repos, condition, filterUser, onlyPullRequest) @@ -148,7 +148,7 @@ trait IssuesService { } .map { issues => issues.head match { case (issue, commentCount, _, _, _, milestone) => - (issue, + IssueInfo(issue, issues.flatMap { t => t._3.map ( Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get) )} toList, @@ -385,4 +385,6 @@ object IssuesService { } } + case class IssueInfo(issue: Issue, labels: List[Label], milestone: Option[String], commentCount: Int) + } diff --git a/src/main/twirl/dashboard/issueslist.scala.html b/src/main/twirl/dashboard/issueslist.scala.html index 0d861ba9a..6e8e0fb33 100644 --- a/src/main/twirl/dashboard/issueslist.scala.html +++ b/src/main/twirl/dashboard/issueslist.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], +@(issues: List[service.IssuesService.IssueInfo], page: Int, openCount: Int, closedCount: Int, @@ -10,7 +10,7 @@ hasWritePermission: Boolean = false)(implicit context: app.Context) @import context._ @import view.helpers._ - +@import service.IssuesService.IssueInfo
        @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){ @@ -135,7 +135,7 @@ } } - @issues.map { case (issue, labels, milestone, commentCount) => + @issues.map { case IssueInfo(issue, labels, milestone, commentCount) => @if(hasWritePermission){ diff --git a/src/main/twirl/dashboard/pullslist.scala.html b/src/main/twirl/dashboard/pullslist.scala.html index ef06e23be..46343b46e 100644 --- a/src/main/twirl/dashboard/pullslist.scala.html +++ b/src/main/twirl/dashboard/pullslist.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], +@(issues: List[service.IssuesService.IssueInfo], page: Int, openCount: Int, closedCount: Int, @@ -7,6 +7,7 @@ hasWritePermission: Boolean)(implicit context: app.Context) @import context._ @import view.helpers._ +@import service.IssuesService.IssueInfo
        @repository.map { repository => @if(hasWritePermission){ @@ -71,7 +72,7 @@ } - @issues.map { case (issue, labels, milestone, commentCount) => + @issues.map { case IssueInfo(issue, labels, milestone, commentCount) => diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index ffc11ff9f..00a321eff 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], +@(issues: List[service.IssuesService.IssueInfo], page: Int, collaborators: List[String], milestones: List[model.Milestone], diff --git a/src/main/twirl/issues/listparts.scala.html b/src/main/twirl/issues/listparts.scala.html index c315bc35e..cee20a760 100644 --- a/src/main/twirl/issues/listparts.scala.html +++ b/src/main/twirl/issues/listparts.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], +@(issues: List[service.IssuesService.IssueInfo], page: Int, openCount: Int, closedCount: Int, @@ -10,7 +10,7 @@ hasWritePermission: Boolean = false)(implicit context: app.Context) @import context._ @import view.helpers._ - +@import service.IssuesService.IssueInfo
        @* @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){ @@ -146,7 +146,7 @@ } *@ } - @issues.map { case (issue, labels, milestone, commentCount) => + @issues.map { case IssueInfo(issue, labels, milestone, commentCount) => @if(hasWritePermission){ diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html index f6a4ebded..b74b90c3f 100644 --- a/src/main/twirl/issues/tab.scala.html +++ b/src/main/twirl/issues/tab.scala.html @@ -5,7 +5,7 @@ Issues
        • Pull requests Labels - Milestones + Milestones @if(loginAccount.isDefined){
      • diff --git a/src/main/twirl/pulls/list.scala.html b/src/main/twirl/pulls/list.scala.html index e72335fb4..acc242e45 100644 --- a/src/main/twirl/pulls/list.scala.html +++ b/src/main/twirl/pulls/list.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], +@(issues: List[service.IssuesService.IssueInfo], counts: List[service.PullRequestService.PullRequestCount], filter: Option[String], page: Int, @@ -10,6 +10,7 @@ hasWritePermission: Boolean)(implicit context: app.Context) @import context._ @import view.helpers._ +@import service.IssuesService.IssueInfo @html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("pulls", repository){
        diff --git a/src/main/twirl/pulls/listparts.scala.html b/src/main/twirl/pulls/listparts.scala.html index ef06e23be..46343b46e 100644 --- a/src/main/twirl/pulls/listparts.scala.html +++ b/src/main/twirl/pulls/listparts.scala.html @@ -1,4 +1,4 @@ -@(issues: List[(model.Issue, List[model.Label], Option[String], Int)], +@(issues: List[service.IssuesService.IssueInfo], page: Int, openCount: Int, closedCount: Int, @@ -7,6 +7,7 @@ hasWritePermission: Boolean)(implicit context: app.Context) @import context._ @import view.helpers._ +@import service.IssuesService.IssueInfo
        @repository.map { repository => @if(hasWritePermission){ @@ -71,7 +72,7 @@ } - @issues.map { case (issue, labels, milestone, commentCount) => + @issues.map { case IssueInfo(issue, labels, milestone, commentCount) => From 90487eb7b76eb05f2ec833cfa124ed8445eda457 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 22 Sep 2014 10:08:22 +0900 Subject: [PATCH 05/41] (refs #488)Merge user filter into IssueSearchCondition --- src/main/scala/app/DashboardController.scala | 24 ++--- src/main/scala/app/IssuesController.scala | 30 ++---- .../scala/app/PullRequestsController.scala | 8 +- src/main/scala/service/IssuesService.scala | 37 ++++---- .../scala/servlet/GitRepositoryServlet.scala | 4 +- src/main/twirl/helper/dropdown.scala.html | 11 ++- src/main/twirl/issues/list.scala.html | 1 - src/main/twirl/issues/listparts.scala.html | 92 ++++++++++++++++++- 8 files changed, 147 insertions(+), 60 deletions(-) diff --git a/src/main/scala/app/DashboardController.scala b/src/main/scala/app/DashboardController.scala index 030f875c8..d73cb36c9 100644 --- a/src/main/scala/app/DashboardController.scala +++ b/src/main/scala/app/DashboardController.scala @@ -50,20 +50,20 @@ trait DashboardControllerBase extends ControllerBase { val userName = context.loginAccount.get.userName val userRepos = getUserRepositories(userName, context.baseUrl, true).map(repo => repo.owner -> repo.name) - val filterUser = Map(filter -> userName) + //val filterUser = Map(filter -> userName) val page = IssueSearchCondition.page(request) dashboard.html.issues( dashboard.html.issueslist( - searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*), + searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*), page, - countIssue(condition.copy(state = "open" ), filterUser, false, userRepos: _*), - countIssue(condition.copy(state = "closed"), filterUser, false, userRepos: _*), + countIssue(condition.copy(state = "open" ), false, userRepos: _*), + countIssue(condition.copy(state = "closed"), false, userRepos: _*), condition), - countIssue(condition, Map.empty, false, userRepos: _*), - countIssue(condition, Map("assigned" -> userName), false, userRepos: _*), - countIssue(condition, Map("created_by" -> userName), false, userRepos: _*), - countIssueGroupByRepository(condition, filterUser, false, userRepos: _*), + countIssue(condition.copy(assigned = None, author = None), false, userRepos: _*), + countIssue(condition.copy(assigned = Some(userName), author = None), false, userRepos: _*), + countIssue(condition.copy(assigned = None, author = Some(userName)), false, userRepos: _*), + countIssueGroupByRepository(condition, false, userRepos: _*), condition, filter) @@ -86,14 +86,14 @@ trait DashboardControllerBase extends ControllerBase { val page = IssueSearchCondition.page(request) val counts = countIssueGroupByRepository( - IssueSearchCondition().copy(state = condition.state), Map.empty, true, userRepos: _*) + IssueSearchCondition().copy(state = condition.state), true, userRepos: _*) dashboard.html.pulls( dashboard.html.pullslist( - searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*), + searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*), page, - countIssue(condition.copy(state = "open" ), filterUser, true, allRepos: _*), - countIssue(condition.copy(state = "closed"), filterUser, true, allRepos: _*), + countIssue(condition.copy(state = "open" ), true, allRepos: _*), + countIssue(condition.copy(state = "closed"), true, allRepos: _*), condition, None, false), diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala index b04b31b7b..59478516a 100644 --- a/src/main/scala/app/IssuesController.scala +++ b/src/main/scala/app/IssuesController.scala @@ -48,16 +48,8 @@ trait IssuesControllerBase extends ControllerBase { "content" -> trim(optional(text())) )(IssueStateForm.apply) - get("/:owner/:repository/issues")(referrersOnly { - searchIssues("all", _) - }) - - get("/:owner/:repository/issues/assigned/:userName")(referrersOnly { - searchIssues("assigned", _) - }) - - get("/:owner/:repository/issues/created_by/:userName")(referrersOnly { - searchIssues("created_by", _) + get("/:owner/:repository/issues")(referrersOnly { repository => + searchIssues(repository) }) get("/:owner/:repository/issues/:id")(referrersOnly { repository => @@ -370,9 +362,8 @@ trait IssuesControllerBase extends ControllerBase { } } - private def searchIssues(filter: String, repository: RepositoryService.RepositoryInfo) = { + private def searchIssues(repository: RepositoryService.RepositoryInfo) = { defining(repository.owner, repository.name){ case (owner, repoName) => - val filterUser = Map(filter -> params.getOrElse("userName", "")) val page = IssueSearchCondition.page(request) val sessionKey = Keys.Session.Issues(owner, repoName) @@ -383,19 +374,18 @@ trait IssuesControllerBase extends ControllerBase { ) issues.html.list( - searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName), + searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName), page, (getCollaborators(owner, repoName) :+ owner).sorted, getMilestones(owner, repoName), getLabels(owner, repoName), - countIssue(condition.copy(state = "open"), filterUser, false, owner -> repoName), - countIssue(condition.copy(state = "closed"), filterUser, false, owner -> repoName), - countIssue(condition, Map.empty, false, owner -> repoName), - context.loginAccount.map(x => countIssue(condition, Map("assigned" -> x.userName), false, owner -> repoName)), - context.loginAccount.map(x => countIssue(condition, Map("created_by" -> x.userName), false, owner -> repoName)), - countIssueGroupByLabels(owner, repoName, condition, filterUser), + countIssue(condition.copy(state = "open"), false, owner -> repoName), + countIssue(condition.copy(state = "closed"), false, owner -> repoName), + countIssue(condition.copy(assigned = None, author = None), false, owner -> repoName), + context.loginAccount.map(x => countIssue(condition.copy(assigned = Some(x.userName), author = None), false, owner -> repoName)), + context.loginAccount.map(x => countIssue(condition.copy(assigned = None, author = Some(x.userName)), false, owner -> repoName)), + countIssueGroupByLabels(owner, repoName, condition), condition, - filter, repository, hasWritePermission(owner, repoName, context.loginAccount)) } diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 8fd467283..a5a4a5dc0 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -464,13 +464,13 @@ trait PullRequestsControllerBase extends ControllerBase { ) pulls.html.list( - searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName), + searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName), getPullRequestCountGroupByUser(condition.state == "closed", Some(owner), Some(repoName)), userName, page, - countIssue(condition.copy(state = "open" ), filterUser, true, owner -> repoName), - countIssue(condition.copy(state = "closed"), filterUser, true, owner -> repoName), - countIssue(condition, Map.empty, true, owner -> repoName), + countIssue(condition.copy(state = "open" ), true, owner -> repoName), + countIssue(condition.copy(state = "closed"), true, owner -> repoName), + countIssue(condition.copy(assigned = None, author = None), true, owner -> repoName), condition, repository, hasWritePermission(owner, repoName, context.loginAccount)) diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index c6d5fc42d..7da74d281 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -43,14 +43,13 @@ trait IssuesService { * Returns the count of the search result against issues. * * @param condition the search condition - * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name) * @param onlyPullRequest if true then counts only pull request, false then counts both of issue and pull request. * @param repos Tuple of the repository owner and the repository name * @return the count of the search result */ - def countIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean, - repos: (String, String)*)(implicit s: Session): Int = - Query(searchIssueQuery(repos, condition, filterUser, onlyPullRequest).length).first + def countIssue(condition: IssueSearchCondition, onlyPullRequest: Boolean, repos: (String, String)*) + (implicit s: Session): Int = + Query(searchIssueQuery(repos, condition, onlyPullRequest).length).first /** * Returns the Map which contains issue count for each labels. @@ -58,13 +57,12 @@ trait IssuesService { * @param owner the repository owner * @param repository the repository name * @param condition the search condition - * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name) * @return the Map which contains issue count for each labels (key is label name, value is issue count) */ - def countIssueGroupByLabels(owner: String, repository: String, condition: IssueSearchCondition, - filterUser: Map[String, String])(implicit s: Session): Map[String, Int] = { + def countIssueGroupByLabels(owner: String, repository: String, + condition: IssueSearchCondition)(implicit s: Session): Map[String, Int] = { - searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), filterUser, false) + searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), false) .innerJoin(IssueLabels).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) } @@ -84,15 +82,14 @@ trait IssuesService { * If the issue does not exist, its repository is not included in the result. * * @param condition the search condition - * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name) * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request. * @param repos Tuple of the repository owner and the repository name * @return list which contains issue count for each repository */ def countIssueGroupByRepository( - condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean, + condition: IssueSearchCondition, onlyPullRequest: Boolean, repos: (String, String)*)(implicit s: Session): List[(String, String, Int)] = { - searchIssueQuery(repos, condition.copy(repo = None), filterUser, onlyPullRequest) + searchIssueQuery(repos, condition.copy(repo = None), onlyPullRequest) .groupBy { t => t.userName -> t.repositoryName } @@ -107,19 +104,18 @@ trait IssuesService { * Returns the search result against issues. * * @param condition the search condition - * @param filterUser the filter user name (key is "all", "assigned", "created_by" or "not_created_by", value is the user name) * @param onlyPullRequest if true then returns only pull request, false then returns both of issue and pull request. * @param offset the offset for pagination * @param limit the limit for pagination * @param repos Tuple of the repository owner and the repository name * @return the search result (list of tuples which contain issue, labels and comment count) */ - def searchIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean, + def searchIssue(condition: IssueSearchCondition, onlyPullRequest: Boolean, offset: Int, limit: Int, repos: (String, String)*) (implicit s: Session): List[IssueInfo] = { // get issues and comment count and labels - searchIssueQuery(repos, condition, filterUser, onlyPullRequest) + searchIssueQuery(repos, condition, onlyPullRequest) .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) } .sortBy { case (t1, t2) => (condition.sort match { @@ -161,7 +157,7 @@ trait IssuesService { * Assembles query for conditional issue searching. */ private def searchIssueQuery(repos: Seq[(String, String)], condition: IssueSearchCondition, - filterUser: Map[String, String], onlyPullRequest: Boolean)(implicit s: Session) = + onlyPullRequest: Boolean)(implicit s: Session) = Issues filter { t1 => condition.repo .map { _.split('/') match { case array => Seq(array(0) -> array(1)) } } @@ -171,9 +167,8 @@ trait IssuesService { (t1.closed === (condition.state == "closed").bind) && (t1.milestoneId === condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) && (t1.milestoneId.? isEmpty, condition.milestoneId == Some(None)) && - (t1.assignedUserName === filterUser("assigned").bind, filterUser.get("assigned").isDefined) && - (t1.openedUserName === filterUser("created_by").bind, filterUser.get("created_by").isDefined) && - (t1.openedUserName =!= filterUser("not_created_by").bind, filterUser.get("not_created_by").isDefined) && + (t1.assignedUserName === condition.assigned.get.bind, condition.assigned.isDefined) && + (t1.openedUserName === condition.author.get.bind, condition.author.isDefined) && (t1.pullRequest === true.bind, onlyPullRequest) && (IssueLabels filter { t2 => (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) && @@ -339,6 +334,8 @@ object IssuesService { case class IssueSearchCondition( labels: Set[String] = Set.empty, milestoneId: Option[Option[Int]] = None, + author: Option[String] = None, + assigned: Option[String] = None, repo: Option[String] = None, state: String = "open", sort: String = "created", @@ -351,6 +348,8 @@ object IssuesService { case Some(x) => x.toString case None => "none" })}, + author .map(x => "author=" + urlEncode(x)), + assigned.map(x => "assigned=" + urlEncode(x)), repo.map("for=" + urlEncode(_)), Some("state=" + urlEncode(state)), Some("sort=" + urlEncode(sort)), @@ -372,6 +371,8 @@ object IssuesService { case "none" => None case x => x.toIntOpt }, + param(request, "author"), + param(request, "assigned"), param(request, "for"), param(request, "state", Seq("open", "closed")).getOrElse("open"), param(request, "sort", Seq("created", "comments", "updated")).getOrElse("created"), diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index 012c6ea00..df55d46fd 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -134,8 +134,8 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: // Retrieve all issue count in the repository val issueCount = - countIssue(IssueSearchCondition(state = "open"), Map.empty, false, owner -> repository) + - countIssue(IssueSearchCondition(state = "closed"), Map.empty, false, owner -> repository) + countIssue(IssueSearchCondition(state = "open"), false, owner -> repository) + + countIssue(IssueSearchCondition(state = "closed"), false, owner -> repository) // Extract new commit and apply issue comment val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html index 70d1dce26..49ae716b5 100644 --- a/src/main/twirl/helper/dropdown.scala.html +++ b/src/main/twirl/helper/dropdown.scala.html @@ -1,6 +1,13 @@ -@(value: String = "", prefix: String = "", mini: Boolean = true, style: String = "", right: Boolean = false)(body: Html) +@(value : String = "", + prefix: String = "", + mini : Boolean = true, + style : String = "", + right : Boolean = false, + flat : Boolean = false)(body: Html)
        -