From 227a9704836eb95c1c3a286c443a4950f3b27c8d Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Mon, 21 Oct 2019 22:30:56 -0500 Subject: [PATCH 01/28] in progress checkpoint --- models/issue_milestone.go | 51 +++++++ routers/routes/routes.go | 2 + routers/user/home.go | 184 ++++++++++++++++++++++- templates/base/head_navbar.tmpl | 1 + templates/user/dashboard/milestones.tmpl | 4 + 5 files changed, 238 insertions(+), 4 deletions(-) create mode 100644 templates/user/dashboard/milestones.tmpl diff --git a/models/issue_milestone.go b/models/issue_milestone.go index d32cb3c7d1f4a..20867912ba414 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -453,3 +453,54 @@ func DeleteMilestoneByRepoID(repoID, id int64) error { } return sess.Commit() } + +// CountMilestonesByRepo map from repoID to number of milestones matching the options` +func CountMilestonesByRepo(repoIDs []int64, isClosed bool) (map[int64]int64, error) { + sess := x.Where("is_closed = ?", isClosed) + sess.In("repo_id", repoIDs) + + countsSlice := make([]*struct { + RepoID int64 + Count int64 + }, 0, 10) + if err := sess.GroupBy("repo_id"). + Select("repo_id AS repo_id, COUNT(*) AS count"). + Table("milestone"). + Find(&countsSlice); err != nil { + return nil, err + } + + countMap := make(map[int64]int64, len(countsSlice)) + for _, c := range countsSlice { + countMap[c.RepoID] = c.Count + } + return countMap, nil +} + +// GetMilestonesForRepos returns a list of milestones of given repositories and status. +func GetMilestonesForRepos(repoIDs []int64, page int, isClosed bool, sortType string) (MilestoneList, error) { + miles := make([]*Milestone, 0, setting.UI.IssuePagingNum) + sess := x.Where("is_closed = ?", isClosed) + sess.In("repo_id", repoIDs) + if page > 0 { + sess = sess.Limit(setting.UI.IssuePagingNum, (page-1)*setting.UI.IssuePagingNum) + } + + switch sortType { + case "furthestduedate": + sess.Desc("deadline_unix") + case "leastcomplete": + sess.Asc("completeness") + case "mostcomplete": + sess.Desc("completeness") + case "leastissues": + sess.Asc("num_issues") + case "mostissues": + sess.Desc("num_issues") + default: + sess.Asc("deadline_unix") + } + return miles, sess.Find(&miles) +} + +//TODO models.GetUserMilestoneStats(ctxUser.ID, repoID, userRepoIDs, filterMode, isShowClosed) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 9572ea80390a4..c2377e8d01e2b 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -276,6 +276,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Combo("/install", routers.InstallInit).Get(routers.Install). Post(bindIgnErr(auth.InstallForm{}), routers.InstallPost) m.Get("/^:type(issues|pulls)$", reqSignIn, user.Issues) + m.Get("/milestones", reqSignIn, user.Milestones) // ***** START: User ***** m.Group("/user", func() { @@ -555,6 +556,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/:org", func() { m.Get("/dashboard", user.Dashboard) m.Get("/^:type(issues|pulls)$", user.Issues) + m.Get("/milestones", user.Milestones) m.Get("/members", org.Members) m.Get("/members/action/:action", org.MembersAction) diff --git a/routers/user/home.go b/routers/user/home.go index 40b3bc3fc1b81..8d9cba15c7121 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -24,10 +24,11 @@ import ( ) const ( - tplDashboard base.TplName = "user/dashboard/dashboard" - tplIssues base.TplName = "user/dashboard/issues" - tplProfile base.TplName = "user/profile" - tplOrgHome base.TplName = "org/home" + tplDashboard base.TplName = "user/dashboard/dashboard" + tplIssues base.TplName = "user/dashboard/issues" + tplMilestones base.TplName = "user/dashboard/milestones" + tplProfile base.TplName = "user/profile" + tplOrgHome base.TplName = "org/home" ) // getDashboardContextUser finds out dashboard is viewing as which context user. @@ -149,6 +150,181 @@ func Dashboard(ctx *context.Context) { ctx.HTML(200, tplDashboard) } +// Milestones render the user milestones page +func Milestones(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("milestones") + ctx.Data["PageIsMilestones"] = true + + ctxUser := getDashboardContextUser(ctx) + if ctx.Written() { + return + } + + //milestone sorts: closest due date, furthest due date, least complete, most complete, most issues, least issues + + var ( + viewType = "all" + sortType = ctx.Query("sort") + filterMode = models.FilterModeAll + ) + + page := ctx.QueryInt("page") + if page <= 1 { + page = 1 + } + + repoID := ctx.QueryInt64("repo") + isShowClosed := ctx.Query("state") == "closed" + + // Get repositories. + var err error + var userRepoIDs []int64 + if ctxUser.IsOrganization() { + env, err := ctxUser.AccessibleReposEnv(ctx.User.ID) + if err != nil { + ctx.ServerError("AccessibleReposEnv", err) + return + } + userRepoIDs, err = env.RepoIDs(1, ctxUser.NumRepos) + if err != nil { + ctx.ServerError("env.RepoIDs", err) + return + } + } else { + //TODO is unit type issues correct? there's no unit type for milestones + unitType := models.UnitTypeIssues + userRepoIDs, err = ctxUser.GetAccessRepoIDs(unitType) + if err != nil { + ctx.ServerError("ctxUser.GetAccessRepoIDs", err) + return + } + } + if len(userRepoIDs) == 0 { + userRepoIDs = []int64{-1} + } + + var repoIDs []int64 + if repoID > 0 { + repoIDs = []int64{repoID} + if !com.IsSliceContainsInt64(userRepoIDs, repoID) { + // force an empty result + repoIDs = []int64{-1} + } + } else { + repoIDs = userRepoIDs + } + + counts, err := models.CountMilestonesByRepo(repoIDs, isShowClosed) + if err != nil { + ctx.ServerError("CountMilestonesByRepo", err) + return + } + + milestones, err := models.GetMilestonesForRepos(repoIDs, page, isShowClosed, sortType) + if err != nil { + ctx.ServerError("GetMilestones", err) + return + } + + showReposMap := make(map[int64]*models.Repository, len(counts)) + for repoID := range counts { + repo, err := models.GetRepositoryByID(repoID) + if err != nil { + ctx.ServerError("GetRepositoryByID", err) + return + } + showReposMap[repoID] = repo + } + + if repoID > 0 { + if _, ok := showReposMap[repoID]; !ok { + repo, err := models.GetRepositoryByID(repoID) + if models.IsErrRepoNotExist(err) { + ctx.NotFound("GetRepositoryByID", err) + return + } else if err != nil { + ctx.ServerError("GetRepositoryByID", fmt.Errorf("[%d]%v", repoID, err)) + return + } + showReposMap[repoID] = repo + } + + repo := showReposMap[repoID] + + // Check if user has access to given repository. + perm, err := models.GetUserRepoPermission(repo, ctxUser) + if err != nil { + ctx.ServerError("GetUserRepoPermission", fmt.Errorf("[%d]%v", repoID, err)) + return + } + if !perm.CanRead(models.UnitTypeIssues) { + if log.IsTrace() { + log.Trace("Permission Denied: User %-v cannot read %-v of repo %-v\n"+ + "User in repo has Permissions: %-+v", + ctxUser, + models.UnitTypeIssues, + repo, + perm) + } + ctx.Status(404) + return + } + } + + showRepos := models.RepositoryListOfMap(showReposMap) + sort.Sort(showRepos) + if err = showRepos.LoadAttributes(); err != nil { + ctx.ServerError("LoadAttributes", err) + return + } + + //TODO in the issues code, it would do something like this to assign the repo to the issue object, + //but the milestone object does not have a repo reference...is this a problem? + //for _, issue := range issues { + // issue.Repo = showReposMap[issue.RepoID] + + //TODO need to write this method in issue_milestone.go + milestoneStats, err := models.GetUserMilestoneStats(ctxUser.ID, repoID, userRepoIDs, filterMode, isShowClosed) + if err != nil { + ctx.ServerError("GetUserMilestoneStats", err) + return + } + + var total int + if !isShowClosed { + total = int(milestoneStats.OpenCount) + } else { + total = int(milestoneStats.ClosedCount) + } + + ctx.Data["Milestones"] = milestones + ctx.Data["Repos"] = showRepos + ctx.Data["Counts"] = counts + ctx.Data["MilestoneStats"] = milestoneStats + ctx.Data["ViewType"] = viewType + ctx.Data["SortType"] = sortType + ctx.Data["RepoID"] = repoID + ctx.Data["IsShowClosed"] = isShowClosed + + if isShowClosed { + ctx.Data["State"] = "closed" + } else { + ctx.Data["State"] = "open" + } + + pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, 5) + //TODO what are these for??? + pager.AddParam(ctx, "type", "ViewType") + pager.AddParam(ctx, "repo", "RepoID") + pager.AddParam(ctx, "sort", "SortType") + pager.AddParam(ctx, "state", "State") + pager.AddParam(ctx, "milestone", "MilestoneID") + pager.AddParam(ctx, "assignee", "AssigneeID") + ctx.Data["Page"] = pager + + ctx.HTML(200, tplMilestones) +} + // Issues render the user issues page func Issues(ctx *context.Context) { isPullList := ctx.Params(":type") == "pulls" diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 390a1fe8044ca..afe462604c5ac 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -12,6 +12,7 @@ {{.i18n.Tr "dashboard"}} {{.i18n.Tr "issues"}} {{.i18n.Tr "pull_requests"}} + {{.i18n.Tr "milestones"}} {{.i18n.Tr "explore"}} {{else if .IsLandingPageHome}} {{.i18n.Tr "home"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl new file mode 100644 index 0000000000000..65b0b15f57290 --- /dev/null +++ b/templates/user/dashboard/milestones.tmpl @@ -0,0 +1,4 @@ +{{template "base/head" .}} +
+ milestones! +
\ No newline at end of file From 9fe22ba0e01fc5de2ab9093889c9a7b2817ad7b0 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Tue, 22 Oct 2019 22:34:52 -0500 Subject: [PATCH 02/28] an initial crack at the milestones showing up; the expected milestones are showing up for a user, but the UI isn't right; also don't have organizations handled yet --- models/issue_milestone.go | 43 ++++++++++- options/locale/locale_en-US.ini | 1 + routers/user/home.go | 19 ++--- templates/user/dashboard/milestones.tmpl | 94 +++++++++++++++++++++++- 4 files changed, 139 insertions(+), 18 deletions(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index 20867912ba414..81fa1ad5fc66d 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -477,8 +477,8 @@ func CountMilestonesByRepo(repoIDs []int64, isClosed bool) (map[int64]int64, err return countMap, nil } -// GetMilestonesForRepos returns a list of milestones of given repositories and status. -func GetMilestonesForRepos(repoIDs []int64, page int, isClosed bool, sortType string) (MilestoneList, error) { +// GetMilestonesByRepoIDs returns a list of milestones of given repositories and status. +func GetMilestonesByRepoIDs(repoIDs []int64, page int, isClosed bool, sortType string) (MilestoneList, error) { miles := make([]*Milestone, 0, setting.UI.IssuePagingNum) sess := x.Where("is_closed = ?", isClosed) sess.In("repo_id", repoIDs) @@ -503,4 +503,41 @@ func GetMilestonesForRepos(repoIDs []int64, page int, isClosed bool, sortType st return miles, sess.Find(&miles) } -//TODO models.GetUserMilestoneStats(ctxUser.ID, repoID, userRepoIDs, filterMode, isShowClosed) +// UserMilestoneStats represents milestone statistic information. +type UserMilestoneStats struct { + OpenCount, ClosedCount int64 + YourRepositoriesCount int64 +} + +// GetUserMilestoneStats returns milestone statistic information for dashboard by given conditions. +func GetUserMilestoneStats(userID int64, repoID int64, userRepoIDs []int64) (*UserMilestoneStats, error) { + var err error + stats := &UserMilestoneStats{} + + cond := builder.NewCond() + if repoID > 0 { + cond = cond.And(builder.Eq{"repo_id": repoID}) + } + + stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false). + And(builder.In("repo_id", userRepoIDs)). + Count(new(Milestone)) + if err != nil { + return nil, err + } + stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true). + And(builder.In("repo_id", userRepoIDs)). + Count(new(Milestone)) + if err != nil { + return nil, err + } + + stats.YourRepositoriesCount, err = x.Where(cond). + And(builder.In("repo_id", userRepoIDs)). + Count(new(Milestone)) + if err != nil { + return nil, err + } + + return stats, nil +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4923f2f88400d..e2638e29a98a9 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -68,6 +68,7 @@ forks = Forks activities = Activities pull_requests = Pull Requests issues = Issues +milestones = Milestones cancel = Cancel diff --git a/routers/user/home.go b/routers/user/home.go index 8d9cba15c7121..47d8fdcb4ceac 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -162,11 +162,8 @@ func Milestones(ctx *context.Context) { //milestone sorts: closest due date, furthest due date, least complete, most complete, most issues, least issues - var ( - viewType = "all" - sortType = ctx.Query("sort") - filterMode = models.FilterModeAll - ) + viewType := "all" + sortType := ctx.Query("sort") page := ctx.QueryInt("page") if page <= 1 { @@ -191,7 +188,6 @@ func Milestones(ctx *context.Context) { return } } else { - //TODO is unit type issues correct? there's no unit type for milestones unitType := models.UnitTypeIssues userRepoIDs, err = ctxUser.GetAccessRepoIDs(unitType) if err != nil { @@ -220,9 +216,9 @@ func Milestones(ctx *context.Context) { return } - milestones, err := models.GetMilestonesForRepos(repoIDs, page, isShowClosed, sortType) + milestones, err := models.GetMilestonesByRepoIDs(repoIDs, page, isShowClosed, sortType) if err != nil { - ctx.ServerError("GetMilestones", err) + ctx.ServerError("GetMilestonesByRepoIDs", err) return } @@ -283,8 +279,7 @@ func Milestones(ctx *context.Context) { //for _, issue := range issues { // issue.Repo = showReposMap[issue.RepoID] - //TODO need to write this method in issue_milestone.go - milestoneStats, err := models.GetUserMilestoneStats(ctxUser.ID, repoID, userRepoIDs, filterMode, isShowClosed) + milestoneStats, err := models.GetUserMilestoneStats(ctxUser.ID, repoID, userRepoIDs) if err != nil { ctx.ServerError("GetUserMilestoneStats", err) return @@ -318,8 +313,8 @@ func Milestones(ctx *context.Context) { pager.AddParam(ctx, "repo", "RepoID") pager.AddParam(ctx, "sort", "SortType") pager.AddParam(ctx, "state", "State") - pager.AddParam(ctx, "milestone", "MilestoneID") - pager.AddParam(ctx, "assignee", "AssigneeID") + //pager.AddParam(ctx, "milestone", "MilestoneID") + //pager.AddParam(ctx, "assignee", "AssigneeID") ctx.Data["Page"] = pager ctx.HTML(200, tplMilestones) diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 65b0b15f57290..db6fd168b7b96 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -1,4 +1,92 @@ {{template "base/head" .}} -
- milestones! -
\ No newline at end of file +
+ {{template "user/dashboard/navbar" .}} +
+
+
+
+ + {{.i18n.Tr "home.issues.in_your_repos"}} + {{.MilestoneStats.YourRepositoriesCount}} + +
+ {{range .Repos}} + + {{.FullName}} +
{{index $.Counts .ID}}
+ + {{end}} +
+
+
+
+ + + {{.i18n.Tr "repo.milestones.open_tab" .MilestoneStats.OpenCount}} + + + + {{.i18n.Tr "repo.milestones.close_tab" .MilestoneStats.ClosedCount}} + +
+
+ +
+ + {{.i18n.Tr "repo.issues.filter_sort"}} + + +
+ {{.i18n.Tr "repo.milestones.filter_sort.closest_due_date"}} + {{.i18n.Tr "repo.milestones.filter_sort.furthest_due_date"}} + {{.i18n.Tr "repo.milestones.filter_sort.least_complete"}} + {{.i18n.Tr "repo.milestones.filter_sort.most_complete"}} + {{.i18n.Tr "repo.milestones.filter_sort.most_issues"}} + {{.i18n.Tr "repo.milestones.filter_sort.least_issues"}} +
+
+
+ +
+ {{range .Milestones}} +
  • + {{.Name}} +
    +
    +
    +
    +
    +
    + {{ $closedDate:= TimeSinceUnix .ClosedDateUnix $.Lang }} + {{if .IsClosed}} + {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{else}} + + {{if .DeadlineString}} + {{.DeadlineString}} + {{else}} + {{$.i18n.Tr "repo.milestones.no_due_date"}} + {{end}} + {{end}} + + {{$.i18n.Tr "repo.milestones.open_tab" .NumOpenIssues}} + {{$.i18n.Tr "repo.milestones.close_tab" .NumClosedIssues}} + {{if .TotalTrackedTime}} {{.TotalTrackedTime|Sec2Time}}{{end}} + +
    + {{if .Content}} +
    + {{.RenderedContent|Str2html}} +
    + {{end}} +
    • + {{end}} + + {{template "base/paginate" .}} +
    + +
    +
    +
    +
    +{{template "base/footer" .}} From 614f95e33c52ffbc6fba57dbf4427725a71bf582 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Wed, 23 Oct 2019 22:37:49 -0500 Subject: [PATCH 03/28] in progress checkpoint, ui looks better and got the repo name to show on the milestones. still need to add time tracking totals and handle for organizations --- routers/user/home.go | 12 ++++++++++++ templates/user/dashboard/milestones.tmpl | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/routers/user/home.go b/routers/user/home.go index 47d8fdcb4ceac..3a2a3c3fb07cd 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" @@ -231,6 +232,16 @@ func Milestones(ctx *context.Context) { } showReposMap[repoID] = repo } + //TODO yes have to do this... + //if ctx.Repo.Repository.IsTimetrackerEnabled() { + // if err := miles.LoadTotalTrackedTimes(); err != nil { + // ctx.ServerError("LoadTotalTrackedTimes", err) + // return + // } + //} + for _, m := range milestones { + m.RenderedContent = string(markdown.Render([]byte(m.Content), showReposMap[m.RepoID].Link(), showReposMap[m.RepoID].ComposeMetas())) + } if repoID > 0 { if _, ok := showReposMap[repoID]; !ok { @@ -294,6 +305,7 @@ func Milestones(ctx *context.Context) { ctx.Data["Milestones"] = milestones ctx.Data["Repos"] = showRepos + ctx.Data["RepoMap"] = showReposMap ctx.Data["Counts"] = counts ctx.Data["MilestoneStats"] = milestoneStats ctx.Data["ViewType"] = viewType diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index db6fd168b7b96..af25e5279eb7f 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
    +
    {{template "user/dashboard/navbar" .}}
    @@ -50,6 +50,11 @@
    {{range .Milestones}}
  • +
    + {{if not $.RepoID}} + {{ with (index $.RepoMap .RepoID) }}{{ .FullName }}{{ end }} + {{end}} +
    {{.Name}}
    From 7dae2dfaf896c8915026ebcab94a7867b36a128f Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Fri, 25 Oct 2019 21:33:19 -0500 Subject: [PATCH 04/28] in-progress work on adding time tracking totals to the milestones on the dashboard view --- models/issue_milestone.go | 53 +++++++++++++++++++++++- routers/user/home.go | 34 ++++++++------- templates/user/dashboard/milestones.tmpl | 8 +--- 3 files changed, 71 insertions(+), 24 deletions(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index 81fa1ad5fc66d..26c99df6eb0f4 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -17,8 +17,9 @@ import ( // Milestone represents a milestone of repository. type Milestone struct { - ID int64 `xorm:"pk autoincr"` - RepoID int64 `xorm:"INDEX"` + ID int64 `xorm:"pk autoincr"` + RepoID int64 `xorm:"INDEX"` + Repo *Repository `xorm:"-"` Name string Content string `xorm:"TEXT"` RenderedContent string `xorm:"-"` @@ -177,11 +178,59 @@ func (milestones MilestoneList) loadTotalTrackedTimes(e Engine) error { return nil } +func (m *Milestone) loadTotalTrackedTime(e Engine) error { + type totalTimesByMilestone struct { + MilestoneID int64 + Time int64 + } + + //TODO don't do it this way, instead just select out one row (?) + totalTime, err := e.Table("issue"). + Join("INNER", "milestone", "issue.milestone_id = milestone.id"). + Join("LEFT", "tracked_time", "tracked_time.issue_id = issue.id"). + Select("milestone_id, sum(time) as time"). + Where("milestone_id = ?", m.ID). + GroupBy("milestone_id"). + Find(new(totalTimesByMilestone)) + if err != nil { + return err + } + m.TotalTrackedTime = totalTime.Time + //TODO don't do it this way, instead just select out one row (?) + //rows, err := e.Table("issue"). + // Join("INNER", "milestone", "issue.milestone_id = milestone.id"). + // Join("LEFT", "tracked_time", "tracked_time.issue_id = issue.id"). + // Select("milestone_id, sum(time) as time"). + // Where("milestone_id = ?", m.ID). + // GroupBy("milestone_id"). + // Rows(new(totalTimesByMilestone)) + //if err != nil { + // return err + //} + + //defer rows.Close() + + //if rows.Next() { + // var totalTime totalTimesByMilestone + // err = rows.Scan(&totalTime) + // if err != nil { + // return err + // } + // m.TotalTrackedTime = totalTime.Time + //} + return nil +} + // LoadTotalTrackedTimes loads for every milestone in the list the TotalTrackedTime by a batch request func (milestones MilestoneList) LoadTotalTrackedTimes() error { return milestones.loadTotalTrackedTimes(x) } +// LoadTotalTrackedTime loads the tracked time for the milestone +func (m *Milestone) LoadTotalTrackedTime() error { + return m.loadTotalTrackedTime(x) +} + func (milestones MilestoneList) getMilestoneIDs() []int64 { var ids = make([]int64, 0, len(milestones)) for _, ms := range milestones { diff --git a/routers/user/home.go b/routers/user/home.go index 3a2a3c3fb07cd..d33d55ad18237 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -232,16 +232,6 @@ func Milestones(ctx *context.Context) { } showReposMap[repoID] = repo } - //TODO yes have to do this... - //if ctx.Repo.Repository.IsTimetrackerEnabled() { - // if err := miles.LoadTotalTrackedTimes(); err != nil { - // ctx.ServerError("LoadTotalTrackedTimes", err) - // return - // } - //} - for _, m := range milestones { - m.RenderedContent = string(markdown.Render([]byte(m.Content), showReposMap[m.RepoID].Link(), showReposMap[m.RepoID].ComposeMetas())) - } if repoID > 0 { if _, ok := showReposMap[repoID]; !ok { @@ -285,10 +275,23 @@ func Milestones(ctx *context.Context) { return } - //TODO in the issues code, it would do something like this to assign the repo to the issue object, - //but the milestone object does not have a repo reference...is this a problem? - //for _, issue := range issues { - // issue.Repo = showReposMap[issue.RepoID] + //TODO yes have to do this... + //if ctx.Repo.Repository.IsTimetrackerEnabled() { + // if err := miles.LoadTotalTrackedTimes(); err != nil { + // ctx.ServerError("LoadTotalTrackedTimes", err) + // return + // } + //} + //for _, m := range milestones { + // m.RenderedContent = string(markdown.Render([]byte(m.Content), showReposMap[m.RepoID].Link(), showReposMap[m.RepoID].ComposeMetas())) + //} + for _, m := range milestones { + m.Repo = showReposMap[m.RepoID] + m.RenderedContent = string(markdown.Render([]byte(m.Content), m.Repo.Link(), m.Repo.ComposeMetas())) + if m.Repo.IsTimetrackerEnabled() { + m.LoadTotalTrackedTime() + } + } milestoneStats, err := models.GetUserMilestoneStats(ctxUser.ID, repoID, userRepoIDs) if err != nil { @@ -305,7 +308,6 @@ func Milestones(ctx *context.Context) { ctx.Data["Milestones"] = milestones ctx.Data["Repos"] = showRepos - ctx.Data["RepoMap"] = showReposMap ctx.Data["Counts"] = counts ctx.Data["MilestoneStats"] = milestoneStats ctx.Data["ViewType"] = viewType @@ -320,7 +322,7 @@ func Milestones(ctx *context.Context) { } pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, 5) - //TODO what are these for??? + //TODO do I need all these? pager.AddParam(ctx, "type", "ViewType") pager.AddParam(ctx, "repo", "RepoID") pager.AddParam(ctx, "sort", "SortType") diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index af25e5279eb7f..054a04070d8b3 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -50,12 +50,8 @@
    {{range .Milestones}}
  • -
    - {{if not $.RepoID}} - {{ with (index $.RepoMap .RepoID) }}{{ .FullName }}{{ end }} - {{end}} -
    - {{.Name}} +
    {{if not $.RepoID}}{{.Repo.FullName}}{{end}}
    + {{.Name}}
    From 6a2136e2d120eeae4711824525490b559ce16f27 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Fri, 25 Oct 2019 22:22:21 -0500 Subject: [PATCH 05/28] adding time tracking totals to milestrones for the dashboard view --- models/issue_milestone.go | 31 +++++-------------------------- routers/user/home.go | 10 ---------- 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index 26c99df6eb0f4..f63a2cbac8ad9 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -183,41 +183,20 @@ func (m *Milestone) loadTotalTrackedTime(e Engine) error { MilestoneID int64 Time int64 } - - //TODO don't do it this way, instead just select out one row (?) - totalTime, err := e.Table("issue"). + totalTime := &totalTimesByMilestone{MilestoneID: m.ID} + has, err := e.Table("issue"). Join("INNER", "milestone", "issue.milestone_id = milestone.id"). Join("LEFT", "tracked_time", "tracked_time.issue_id = issue.id"). Select("milestone_id, sum(time) as time"). Where("milestone_id = ?", m.ID). GroupBy("milestone_id"). - Find(new(totalTimesByMilestone)) + Get(totalTime) if err != nil { return err + } else if !has { + return nil } m.TotalTrackedTime = totalTime.Time - //TODO don't do it this way, instead just select out one row (?) - //rows, err := e.Table("issue"). - // Join("INNER", "milestone", "issue.milestone_id = milestone.id"). - // Join("LEFT", "tracked_time", "tracked_time.issue_id = issue.id"). - // Select("milestone_id, sum(time) as time"). - // Where("milestone_id = ?", m.ID). - // GroupBy("milestone_id"). - // Rows(new(totalTimesByMilestone)) - //if err != nil { - // return err - //} - - //defer rows.Close() - - //if rows.Next() { - // var totalTime totalTimesByMilestone - // err = rows.Scan(&totalTime) - // if err != nil { - // return err - // } - // m.TotalTrackedTime = totalTime.Time - //} return nil } diff --git a/routers/user/home.go b/routers/user/home.go index d33d55ad18237..7ff6d9cc6feed 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -275,16 +275,6 @@ func Milestones(ctx *context.Context) { return } - //TODO yes have to do this... - //if ctx.Repo.Repository.IsTimetrackerEnabled() { - // if err := miles.LoadTotalTrackedTimes(); err != nil { - // ctx.ServerError("LoadTotalTrackedTimes", err) - // return - // } - //} - //for _, m := range milestones { - // m.RenderedContent = string(markdown.Render([]byte(m.Content), showReposMap[m.RepoID].Link(), showReposMap[m.RepoID].ComposeMetas())) - //} for _, m := range milestones { m.Repo = showReposMap[m.RepoID] m.RenderedContent = string(markdown.Render([]byte(m.Content), m.Repo.Link(), m.Repo.ComposeMetas())) From f770682e4563b1f8fb584950822725c250bfbfaa Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Sat, 26 Oct 2019 21:46:35 -0500 Subject: [PATCH 06/28] fixed issue with in your repositories total on milestones dashboard --- routers/user/home.go | 3 +-- templates/user/dashboard/milestones.tmpl | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/routers/user/home.go b/routers/user/home.go index 7ff6d9cc6feed..6daa1aef4a564 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -161,8 +161,6 @@ func Milestones(ctx *context.Context) { return } - //milestone sorts: closest due date, furthest due date, least complete, most complete, most issues, least issues - viewType := "all" sortType := ctx.Query("sort") @@ -300,6 +298,7 @@ func Milestones(ctx *context.Context) { ctx.Data["Repos"] = showRepos ctx.Data["Counts"] = counts ctx.Data["MilestoneStats"] = milestoneStats + ctx.Data["Total"] = total ctx.Data["ViewType"] = viewType ctx.Data["SortType"] = sortType ctx.Data["RepoID"] = repoID diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 054a04070d8b3..3f15cc358c9ab 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -7,7 +7,7 @@
    {{.i18n.Tr "home.issues.in_your_repos"}} - {{.MilestoneStats.YourRepositoriesCount}} + {{.Total}}
    {{range .Repos}} From 2f6a674071ea1fa147303af33ee4677709ba9431 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Sat, 26 Oct 2019 22:18:47 -0500 Subject: [PATCH 07/28] change to use PageIsMilestonesDashboard for the dashboard active item indicator because PageIsMilestones was already used by the milestones page under issues. Added milestones link to the user/org switcher in the dashboard --- routers/user/home.go | 2 +- templates/base/head_navbar.tmpl | 2 +- templates/user/dashboard/navbar.tmpl | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/routers/user/home.go b/routers/user/home.go index 6daa1aef4a564..d984d15b165f1 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -154,7 +154,7 @@ func Dashboard(ctx *context.Context) { // Milestones render the user milestones page func Milestones(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("milestones") - ctx.Data["PageIsMilestones"] = true + ctx.Data["PageIsMilestonesDashboard"] = true ctxUser := getDashboardContextUser(ctx) if ctx.Written() { diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index afe462604c5ac..d5d35d119d160 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -12,7 +12,7 @@ {{.i18n.Tr "dashboard"}} {{.i18n.Tr "issues"}} {{.i18n.Tr "pull_requests"}} - {{.i18n.Tr "milestones"}} + {{.i18n.Tr "milestones"}} {{.i18n.Tr "explore"}} {{else if .IsLandingPageHome}} {{.i18n.Tr "home"}} diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 25c45325a64cd..ffba7d88ee90d 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -12,12 +12,12 @@ {{.i18n.Tr "home.switch_dashboard_context"}}
    - + {{.SignedUser.Name}} {{range .Orgs}} - + {{.ShortName 20}} @@ -43,6 +43,9 @@  {{.i18n.Tr "pull_requests"}} + +  {{.i18n.Tr "milestones"}} +
    {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 10)}} From 961acccc18ed678339b1e7438c3de37e32945fa3 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Sat, 26 Oct 2019 22:28:52 -0500 Subject: [PATCH 08/28] fixed/removed some comments --- models/issue_milestone.go | 2 +- routers/user/home.go | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index f63a2cbac8ad9..92d93894c4bb5 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -482,7 +482,7 @@ func DeleteMilestoneByRepoID(repoID, id int64) error { return sess.Commit() } -// CountMilestonesByRepo map from repoID to number of milestones matching the options` +// CountMilestonesByRepo map from repoIDs to number of milestones matching the options` func CountMilestonesByRepo(repoIDs []int64, isClosed bool) (map[int64]int64, error) { sess := x.Where("is_closed = ?", isClosed) sess.In("repo_id", repoIDs) diff --git a/routers/user/home.go b/routers/user/home.go index d984d15b165f1..c4673de5d607a 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -311,13 +311,10 @@ func Milestones(ctx *context.Context) { } pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, 5) - //TODO do I need all these? pager.AddParam(ctx, "type", "ViewType") pager.AddParam(ctx, "repo", "RepoID") pager.AddParam(ctx, "sort", "SortType") pager.AddParam(ctx, "state", "State") - //pager.AddParam(ctx, "milestone", "MilestoneID") - //pager.AddParam(ctx, "assignee", "AssigneeID") ctx.Data["Page"] = pager ctx.HTML(200, tplMilestones) From b6f5da89cc39660444652f312be28ca5916dfb18 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Mon, 28 Oct 2019 22:15:57 -0500 Subject: [PATCH 09/28] todo comments on integration tests to write --- models/issue_milestone_test.go | 6 ++++++ routers/user/home_test.go | 3 +++ 2 files changed, 9 insertions(+) diff --git a/models/issue_milestone_test.go b/models/issue_milestone_test.go index 6f8548ec67155..5549a6b8decda 100644 --- a/models/issue_milestone_test.go +++ b/models/issue_milestone_test.go @@ -289,3 +289,9 @@ func TestMilestoneList_LoadTotalTrackedTimes(t *testing.T) { assert.Equal(t, miles[0].TotalTrackedTime, int64(3662)) } + +//TODO write tests for the following... +//func (m *Milestone) LoadTotalTrackedTime() error { +//func CountMilestonesByRepo(repoIDs []int64, isClosed bool) (map[int64]int64, error) { +//func GetMilestonesByRepoIDs(repoIDs []int64, page int, isClosed bool, sortType string) (MilestoneList, error) { +//func GetUserMilestoneStats(userID int64, repoID int64, userRepoIDs []int64) (*UserMilestoneStats, error) { diff --git a/routers/user/home_test.go b/routers/user/home_test.go index 9d4136ac8c950..4d63b4bf9f7c4 100644 --- a/routers/user/home_test.go +++ b/routers/user/home_test.go @@ -31,3 +31,6 @@ func TestIssues(t *testing.T) { assert.Len(t, ctx.Data["Issues"], 1) assert.Len(t, ctx.Data["Repos"], 1) } + +//TODO write test for +//func Milestones(ctx *context.Context) { From 8bbe415eb1ea72068089bd72d4f8a5a0981688e1 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Tue, 29 Oct 2019 21:52:20 -0500 Subject: [PATCH 10/28] checking error on LoadTotalTrackedTime in home.go --- routers/user/home.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/routers/user/home.go b/routers/user/home.go index c4673de5d607a..732c4d7cf51aa 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -277,7 +277,11 @@ func Milestones(ctx *context.Context) { m.Repo = showReposMap[m.RepoID] m.RenderedContent = string(markdown.Render([]byte(m.Content), m.Repo.Link(), m.Repo.ComposeMetas())) if m.Repo.IsTimetrackerEnabled() { - m.LoadTotalTrackedTime() + err := m.LoadTotalTrackedTime() + if err != nil { + ctx.ServerError("LoadTotalTrackedTime", err) + return + } } } From e352efe2287e0efa90c90877d760045abb7ea807 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Thu, 31 Oct 2019 22:20:08 -0500 Subject: [PATCH 11/28] added integration test for CountMilestonesByRepo --- models/issue_milestone_test.go | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/models/issue_milestone_test.go b/models/issue_milestone_test.go index 5549a6b8decda..fd77f9e3b1b3e 100644 --- a/models/issue_milestone_test.go +++ b/models/issue_milestone_test.go @@ -290,8 +290,22 @@ func TestMilestoneList_LoadTotalTrackedTimes(t *testing.T) { assert.Equal(t, miles[0].TotalTrackedTime, int64(3662)) } -//TODO write tests for the following... -//func (m *Milestone) LoadTotalTrackedTime() error { -//func CountMilestonesByRepo(repoIDs []int64, isClosed bool) (map[int64]int64, error) { -//func GetMilestonesByRepoIDs(repoIDs []int64, page int, isClosed bool, sortType string) (MilestoneList, error) { -//func GetUserMilestoneStats(userID int64, repoID int64, userRepoIDs []int64) (*UserMilestoneStats, error) { +func TestCountOpenMilestonesByRepo(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + milestonesCount := func(repoID int64) (int, int) { + repo := AssertExistsAndLoadBean(t, &Repository{ID: repoID}).(*Repository) + return repo.NumOpenMilestones, repo.NumClosedMilestones + } + repo1OpenCount, repo1ClosedCount := milestonesCount(1) + repo2OpenCount, repo2ClosedCount := milestonesCount(2) + + openCounts, err := CountMilestonesByRepo([]int64{1, 2, 3}, false) + assert.NoError(t, err) + assert.EqualValues(t, repo1OpenCount, openCounts[1]) + assert.EqualValues(t, repo2OpenCount, openCounts[2]) + + closedCounts, err := CountMilestonesByRepo([]int64{1, 2, 3}, true) + assert.NoError(t, err) + assert.EqualValues(t, repo1ClosedCount, closedCounts[1]) + assert.EqualValues(t, repo2ClosedCount, closedCounts[2]) +} From ba0f7ff41711ac98c9ed18735972be19f5001988 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Fri, 1 Nov 2019 21:54:12 -0500 Subject: [PATCH 12/28] added test TestGetMilestonesByRepoIDs --- models/issue_milestone_test.go | 52 ++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/models/issue_milestone_test.go b/models/issue_milestone_test.go index fd77f9e3b1b3e..7b574f0794202 100644 --- a/models/issue_milestone_test.go +++ b/models/issue_milestone_test.go @@ -290,7 +290,7 @@ func TestMilestoneList_LoadTotalTrackedTimes(t *testing.T) { assert.Equal(t, miles[0].TotalTrackedTime, int64(3662)) } -func TestCountOpenMilestonesByRepo(t *testing.T) { +func TestCountMilestonesByRepo(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) milestonesCount := func(repoID int64) (int, int) { repo := AssertExistsAndLoadBean(t, &Repository{ID: repoID}).(*Repository) @@ -299,13 +299,59 @@ func TestCountOpenMilestonesByRepo(t *testing.T) { repo1OpenCount, repo1ClosedCount := milestonesCount(1) repo2OpenCount, repo2ClosedCount := milestonesCount(2) - openCounts, err := CountMilestonesByRepo([]int64{1, 2, 3}, false) + openCounts, err := CountMilestonesByRepo([]int64{1, 2}, false) assert.NoError(t, err) assert.EqualValues(t, repo1OpenCount, openCounts[1]) assert.EqualValues(t, repo2OpenCount, openCounts[2]) - closedCounts, err := CountMilestonesByRepo([]int64{1, 2, 3}, true) + closedCounts, err := CountMilestonesByRepo([]int64{1, 2}, true) assert.NoError(t, err) assert.EqualValues(t, repo1ClosedCount, closedCounts[1]) assert.EqualValues(t, repo2ClosedCount, closedCounts[2]) } + +func TestGetMilestonesByRepoIDs(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + repo1 := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository) + repo2 := AssertExistsAndLoadBean(t, &Repository{ID: 2}).(*Repository) + test := func(sortType string, sortCond func(*Milestone) int) { + for _, page := range []int{0, 1} { + openMilestones, err := GetMilestonesByRepoIDs([]int64{repo1.ID, repo2.ID}, page, false, sortType) + assert.NoError(t, err) + assert.Len(t, openMilestones, repo1.NumOpenMilestones+repo2.NumOpenMilestones) + values := make([]int, len(openMilestones)) + for i, milestone := range openMilestones { + values[i] = sortCond(milestone) + } + assert.True(t, sort.IntsAreSorted(values)) + + closedMilestones, err := GetMilestonesByRepoIDs([]int64{repo1.ID, repo2.ID}, page, true, sortType) + assert.NoError(t, err) + assert.Len(t, closedMilestones, repo1.NumClosedMilestones+repo2.NumClosedMilestones) + values = make([]int, len(closedMilestones)) + for i, milestone := range closedMilestones { + values[i] = sortCond(milestone) + } + assert.True(t, sort.IntsAreSorted(values)) + } + } + test("furthestduedate", func(milestone *Milestone) int { + return -int(milestone.DeadlineUnix) + }) + test("leastcomplete", func(milestone *Milestone) int { + return milestone.Completeness + }) + test("mostcomplete", func(milestone *Milestone) int { + return -milestone.Completeness + }) + test("leastissues", func(milestone *Milestone) int { + return milestone.NumIssues + }) + test("mostissues", func(milestone *Milestone) int { + return -milestone.NumIssues + }) + test("soonestduedate", func(milestone *Milestone) int { + return int(milestone.DeadlineUnix) + }) + +} From 04628dc654b2d8f5f9677c40118cfc38e84e9150 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Fri, 1 Nov 2019 22:08:47 -0500 Subject: [PATCH 13/28] added more milestone tests, removed the YourRepositoryCount property for getting UserMilestoneStatus, it wasn't used --- models/issue_milestone.go | 8 -------- models/issue_milestone_test.go | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index aee0235800376..b25cbab54ac6b 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -538,7 +538,6 @@ func GetMilestonesByRepoIDs(repoIDs []int64, page int, isClosed bool, sortType s // UserMilestoneStats represents milestone statistic information. type UserMilestoneStats struct { OpenCount, ClosedCount int64 - YourRepositoriesCount int64 } // GetUserMilestoneStats returns milestone statistic information for dashboard by given conditions. @@ -564,12 +563,5 @@ func GetUserMilestoneStats(userID int64, repoID int64, userRepoIDs []int64) (*Us return nil, err } - stats.YourRepositoriesCount, err = x.Where(cond). - And(builder.In("repo_id", userRepoIDs)). - Count(new(Milestone)) - if err != nil { - return nil, err - } - return stats, nil } diff --git a/models/issue_milestone_test.go b/models/issue_milestone_test.go index 7b574f0794202..119fb608f0c5d 100644 --- a/models/issue_milestone_test.go +++ b/models/issue_milestone_test.go @@ -353,5 +353,26 @@ func TestGetMilestonesByRepoIDs(t *testing.T) { test("soonestduedate", func(milestone *Milestone) int { return int(milestone.DeadlineUnix) }) +} + +func TestLoadTotalTrackedTime(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + milestone := AssertExistsAndLoadBean(t, &Milestone{ID: 1}).(*Milestone) + + assert.NoError(t, milestone.LoadTotalTrackedTime()) + + assert.Equal(t, milestone.TotalTrackedTime, int64(3662)) +} + +func TestGetUserMilestoneStats(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + repo1 := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository) + repo2 := AssertExistsAndLoadBean(t, &Repository{ID: 2}).(*Repository) + user := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) + milestoneStats, err := models.GetUserMilestoneStats(user.ID, repo1.ID, []int64{repo1.ID, repo2.ID}) + assert.NoError(t, err) + assert.EqualValues(t, repo1.NumOpenMilestones, milestoneStats.OpenCount) + assert.EqualValues(t, repo1.NumClosedMilestones, milestoneStats.ClosedCount) } + \ No newline at end of file From afcce09bc425d87af651a61c688657b6d3841c8c Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Fri, 1 Nov 2019 22:27:34 -0500 Subject: [PATCH 14/28] added test for Milestones endpoint --- routers/user/home_test.go | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/routers/user/home_test.go b/routers/user/home_test.go index 4d63b4bf9f7c4..92f2be1dc8025 100644 --- a/routers/user/home_test.go +++ b/routers/user/home_test.go @@ -32,5 +32,21 @@ func TestIssues(t *testing.T) { assert.Len(t, ctx.Data["Repos"], 1) } -//TODO write test for -//func Milestones(ctx *context.Context) { +func TestMilestones(t *testing.T) { + setting.UI.IssuePagingNum = 1 + assert.NoError(t, models.LoadFixtures()) + + ctx := test.MockContext(t, "milestones") + test.LoadUser(t, ctx, 2) + ctx.SetParams("sort", "issues") + ctx.Req.Form.Set("state", "closed") + ctx.Req.Form.Set("sort", "furthestduedate") + Milestones(ctx) + assert.EqualValues(t, http.StatusOK, ctx.Resp.Status()) + assert.EqualValues(t, map[int64]int64{1: 1}, ctx.Data["Counts"]) + assert.EqualValues(t, true, ctx.Data["IsShowClosed"]) + assert.EqualValues(t, "furthestduedate", ctx.Data["SortType"]) + assert.EqualValues(t, 1, ctx.Data["Total"]) + assert.Len(t, ctx.Data["Milestones"], 10) + assert.Len(t, ctx.Data["Repos"], 1) +} From 96d1e11bc2caab7614701d43647047ce20c4b747 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Sat, 2 Nov 2019 09:13:37 -0500 Subject: [PATCH 15/28] fixed unit test --- routers/user/home_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/user/home_test.go b/routers/user/home_test.go index 92f2be1dc8025..4d6fcdade3e4c 100644 --- a/routers/user/home_test.go +++ b/routers/user/home_test.go @@ -47,6 +47,6 @@ func TestMilestones(t *testing.T) { assert.EqualValues(t, true, ctx.Data["IsShowClosed"]) assert.EqualValues(t, "furthestduedate", ctx.Data["SortType"]) assert.EqualValues(t, 1, ctx.Data["Total"]) - assert.Len(t, ctx.Data["Milestones"], 10) + assert.Len(t, ctx.Data["Milestones"], 1) assert.Len(t, ctx.Data["Repos"], 1) } From 70f4614a1a3296347fb3664df279e4bb042febea Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Sat, 2 Nov 2019 22:33:33 -0500 Subject: [PATCH 16/28] fixed unit test --- models/issue_milestone_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/models/issue_milestone_test.go b/models/issue_milestone_test.go index 119fb608f0c5d..5576b686b5c83 100644 --- a/models/issue_milestone_test.go +++ b/models/issue_milestone_test.go @@ -370,9 +370,8 @@ func TestGetUserMilestoneStats(t *testing.T) { repo2 := AssertExistsAndLoadBean(t, &Repository{ID: 2}).(*Repository) user := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) - milestoneStats, err := models.GetUserMilestoneStats(user.ID, repo1.ID, []int64{repo1.ID, repo2.ID}) + milestoneStats, err := GetUserMilestoneStats(user.ID, repo1.ID, []int64{repo1.ID, repo2.ID}) assert.NoError(t, err) assert.EqualValues(t, repo1.NumOpenMilestones, milestoneStats.OpenCount) assert.EqualValues(t, repo1.NumClosedMilestones, milestoneStats.ClosedCount) } - \ No newline at end of file From 92289d200b88d368977ab26e5f0501b36496ef7b Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Sun, 3 Nov 2019 11:01:38 -0600 Subject: [PATCH 17/28] added unit test for milestones endpoint where a repo is selected --- routers/user/home_test.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/routers/user/home_test.go b/routers/user/home_test.go index 4d6fcdade3e4c..e5bbd0e98e642 100644 --- a/routers/user/home_test.go +++ b/routers/user/home_test.go @@ -50,3 +50,23 @@ func TestMilestones(t *testing.T) { assert.Len(t, ctx.Data["Milestones"], 1) assert.Len(t, ctx.Data["Repos"], 1) } + +func TestMilestonesForSpecificRepo(t *testing.T) { + setting.UI.IssuePagingNum = 1 + assert.NoError(t, models.LoadFixtures()) + + ctx := test.MockContext(t, "milestones") + test.LoadUser(t, ctx, 2) + ctx.SetParams("sort", "issues") + ctx.SetParams("repo", "1") + ctx.Req.Form.Set("state", "closed") + ctx.Req.Form.Set("sort", "furthestduedate") + Milestones(ctx) + assert.EqualValues(t, http.StatusOK, ctx.Resp.Status()) + assert.EqualValues(t, map[int64]int64{1: 1}, ctx.Data["Counts"]) + assert.EqualValues(t, true, ctx.Data["IsShowClosed"]) + assert.EqualValues(t, "furthestduedate", ctx.Data["SortType"]) + assert.EqualValues(t, 1, ctx.Data["Total"]) + assert.Len(t, ctx.Data["Milestones"], 1) + assert.Len(t, ctx.Data["Repos"], 1) +} From 02c2bc450f1f0c281f082aa4c2b8d094f13f8450 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Sat, 23 Nov 2019 11:36:47 -0600 Subject: [PATCH 18/28] removed view type param from milestones endpoint because it wasn't being used --- routers/user/home.go | 4 --- templates/user/dashboard/milestones.tmpl | 31 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/routers/user/home.go b/routers/user/home.go index 732c4d7cf51aa..d372dfc577f08 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -161,9 +161,7 @@ func Milestones(ctx *context.Context) { return } - viewType := "all" sortType := ctx.Query("sort") - page := ctx.QueryInt("page") if page <= 1 { page = 1 @@ -303,7 +301,6 @@ func Milestones(ctx *context.Context) { ctx.Data["Counts"] = counts ctx.Data["MilestoneStats"] = milestoneStats ctx.Data["Total"] = total - ctx.Data["ViewType"] = viewType ctx.Data["SortType"] = sortType ctx.Data["RepoID"] = repoID ctx.Data["IsShowClosed"] = isShowClosed @@ -315,7 +312,6 @@ func Milestones(ctx *context.Context) { } pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, 5) - pager.AddParam(ctx, "type", "ViewType") pager.AddParam(ctx, "repo", "RepoID") pager.AddParam(ctx, "sort", "SortType") pager.AddParam(ctx, "state", "State") diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 3f15cc358c9ab..ae99c1b98cc9a 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -5,13 +5,13 @@
    - + {{.i18n.Tr "home.issues.in_your_repos"}} {{.Total}}
    {{range .Repos}} - + {{.FullName}}
    {{index $.Counts .ID}}
     @@ -20,11 +20,11 @@
    - + {{.i18n.Tr "repo.milestones.open_tab" .MilestoneStats.OpenCount}} - + {{.i18n.Tr "repo.milestones.close_tab" .MilestoneStats.ClosedCount}} @@ -37,12 +37,12 @@
    - {{.i18n.Tr "repo.milestones.filter_sort.closest_due_date"}} - {{.i18n.Tr "repo.milestones.filter_sort.furthest_due_date"}} - {{.i18n.Tr "repo.milestones.filter_sort.least_complete"}} - {{.i18n.Tr "repo.milestones.filter_sort.most_complete"}} - {{.i18n.Tr "repo.milestones.filter_sort.most_issues"}} - {{.i18n.Tr "repo.milestones.filter_sort.least_issues"}} + {{.i18n.Tr "repo.milestones.filter_sort.closest_due_date"}} + {{.i18n.Tr "repo.milestones.filter_sort.furthest_due_date"}} + {{.i18n.Tr "repo.milestones.filter_sort.least_complete"}} + {{.i18n.Tr "repo.milestones.filter_sort.most_complete"}} + {{.i18n.Tr "repo.milestones.filter_sort.most_issues"}} + {{.i18n.Tr "repo.milestones.filter_sort.least_issues"}}
    @@ -75,6 +75,17 @@ {{if .TotalTrackedTime}} {{.TotalTrackedTime|Sec2Time}}{{end}}
    + {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} +
    + {{$.i18n.Tr "repo.issues.label_edit"}} + {{if .IsClosed}} + {{$.i18n.Tr "repo.milestones.open"}} + {{else}} + {{$.i18n.Tr "repo.milestones.close"}} + {{end}} + {{$.i18n.Tr "repo.issues.label_delete"}} +
    + {{end}} {{if .Content}}
    {{.RenderedContent|Str2html}} From 875e512c60fae70c054215ad2d242f67ac5b3635 Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Sun, 8 Dec 2019 21:52:04 -0600 Subject: [PATCH 19/28] added configuration to enable/disable the milestones dashboard endpoint (defaults to enabled) --- custom/conf/app.ini.sample | 2 ++ docs/content/doc/advanced/config-cheat-sheet.en-us.md | 1 + modules/context/context.go | 1 + modules/setting/service.go | 2 ++ routers/routes/routes.go | 11 +++++++++-- templates/base/head_navbar.tmpl | 2 +- templates/user/dashboard/navbar.tmpl | 8 +++++--- 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index 050a0db730129..65252f666261f 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -507,6 +507,8 @@ DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME = true NO_REPLY_ADDRESS = noreply.example.org ; Show Registration button SHOW_REGISTRATION_BUTTON = true +; Show milestones dashboard page - a view of all the user's milestones +SHOW_MILESTONES_DASHBOARD_PAGE = true ; Default value for AutoWatchNewRepos ; When adding a repo to a team or creating a new repo all team members will watch the ; repo automatically if enabled diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 0d7a641b1900b..8e9bca61f559d 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -307,6 +307,7 @@ relation to port exhaustion. - `EMAIL_DOMAIN_WHITELIST`: **\**: If non-empty, list of domain names that can only be used to register on this instance. - `SHOW_REGISTRATION_BUTTON`: **! DISABLE\_REGISTRATION**: Show Registration Button +- `SHOW_MILESTONES_DASHBOARD_PAGE`: **true** Enable this to show the milestones dashboard page - a view of all the user's milestones - `AUTO_WATCH_NEW_REPOS`: **true**: Enable this to let all organisation users watch new repos when they are created - `AUTO_WATCH_ON_CHANGES`: **false**: Enable this to make users watch a repository after their first commit to it - `DEFAULT_ORG_VISIBILITY`: **public**: Set default visibility mode for organisations, either "public", "limited" or "private". diff --git a/modules/context/context.go b/modules/context/context.go index ef6c19ed125c3..4b590a7181362 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -334,6 +334,7 @@ func Contexter() macaron.Handler { ctx.Data["IsLandingPageOrganizations"] = setting.LandingPageURL == setting.LandingPageOrganizations ctx.Data["ShowRegistrationButton"] = setting.Service.ShowRegistrationButton + ctx.Data["ShowMilestonesDashboardPage"] = setting.Service.ShowMilestonesDashboardPage ctx.Data["ShowFooterBranding"] = setting.ShowFooterBranding ctx.Data["ShowFooterVersion"] = setting.ShowFooterVersion diff --git a/modules/setting/service.go b/modules/setting/service.go index 6cbee8234d2d1..7c9105870c75c 100644 --- a/modules/setting/service.go +++ b/modules/setting/service.go @@ -21,6 +21,7 @@ var Service struct { DisableRegistration bool AllowOnlyExternalRegistration bool ShowRegistrationButton bool + ShowMilestonesDashboardPage bool RequireSignInView bool EnableNotifyMail bool EnableBasicAuth bool @@ -62,6 +63,7 @@ func newService() { Service.AllowOnlyExternalRegistration = sec.Key("ALLOW_ONLY_EXTERNAL_REGISTRATION").MustBool() Service.EmailDomainWhitelist = sec.Key("EMAIL_DOMAIN_WHITELIST").Strings(",") Service.ShowRegistrationButton = sec.Key("SHOW_REGISTRATION_BUTTON").MustBool(!(Service.DisableRegistration || Service.AllowOnlyExternalRegistration)) + Service.ShowMilestonesDashboardPage = sec.Key("SHOW_MILESTONES_DASHBOARD_PAGE").MustBool(true) Service.RequireSignInView = sec.Key("REQUIRE_SIGNIN_VIEW").MustBool() Service.EnableBasicAuth = sec.Key("ENABLE_BASIC_AUTHENTICATION").MustBool(true) Service.EnableReverseProxyAuth = sec.Key("ENABLE_REVERSE_PROXY_AUTHENTICATION").MustBool() diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 4aa4e79cb3b6b..fbc4d2de35f59 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -254,6 +254,13 @@ func RegisterRoutes(m *macaron.Macaron) { } } + reqMilestonesDashboardPageEnabled := func(ctx *context.Context) { + if !setting.Service.ShowMilestonesDashboardPage { + ctx.Error(403) + return + } + } + m.Use(user.GetNotificationCount) // FIXME: not all routes need go through same middlewares. @@ -276,7 +283,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Combo("/install", routers.InstallInit).Get(routers.Install). Post(bindIgnErr(auth.InstallForm{}), routers.InstallPost) m.Get("/^:type(issues|pulls)$", reqSignIn, user.Issues) - m.Get("/milestones", reqSignIn, user.Milestones) + m.Get("/milestones", reqSignIn, reqMilestonesDashboardPageEnabled, user.Milestones) // ***** START: User ***** m.Group("/user", func() { @@ -557,7 +564,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/:org", func() { m.Get("/dashboard", user.Dashboard) m.Get("/^:type(issues|pulls)$", user.Issues) - m.Get("/milestones", user.Milestones) + m.Get("/milestones", reqMilestonesDashboardPageEnabled, user.Milestones) m.Get("/members", org.Members) m.Get("/members/action/:action", org.MembersAction) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index fd8081e9c1324..a09b4b832e77a 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -12,7 +12,7 @@ {{.i18n.Tr "dashboard"}} {{.i18n.Tr "issues"}} {{.i18n.Tr "pull_requests"}} - {{.i18n.Tr "milestones"}} + {{if .ShowMilestonesDashboardPage}}{{.i18n.Tr "milestones"}}{{end}} {{.i18n.Tr "explore"}} {{else if .IsLandingPageHome}} {{.i18n.Tr "home"}} diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index ffba7d88ee90d..ed44c35377a26 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -43,9 +43,11 @@  {{.i18n.Tr "pull_requests"}} - -  {{.i18n.Tr "milestones"}} - + {{if .ShowMilestonesDashboardPage}} + +  {{.i18n.Tr "milestones"}} + + {{end}}
    {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 10)}} From 3a71b0778670a825c572b55bfa2e57d214fa419b Mon Sep 17 00:00:00 2001 From: Brad Albright Date: Mon, 9 Dec 2019 22:05:30 -0600 Subject: [PATCH 20/28] changed "CountMilestonesByRepo" to "CountMilestonesByRepoIDs" so the naming matches up with the function "GetMilestonesByRepoIDs" --- models/issue_milestone.go | 4 ++-- models/issue_milestone_test.go | 6 +++--- routers/user/home.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index 5d5a707a121bf..a27c797b3c52b 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -494,8 +494,8 @@ func DeleteMilestoneByRepoID(repoID, id int64) error { return sess.Commit() } -// CountMilestonesByRepo map from repoIDs to number of milestones matching the options` -func CountMilestonesByRepo(repoIDs []int64, isClosed bool) (map[int64]int64, error) { +// CountMilestonesByRepoIDs map from repoIDs to number of milestones matching the options` +func CountMilestonesByRepoIDs(repoIDs []int64, isClosed bool) (map[int64]int64, error) { sess := x.Where("is_closed = ?", isClosed) sess.In("repo_id", repoIDs) diff --git a/models/issue_milestone_test.go b/models/issue_milestone_test.go index 5576b686b5c83..71ff9ed5bf7c2 100644 --- a/models/issue_milestone_test.go +++ b/models/issue_milestone_test.go @@ -290,7 +290,7 @@ func TestMilestoneList_LoadTotalTrackedTimes(t *testing.T) { assert.Equal(t, miles[0].TotalTrackedTime, int64(3662)) } -func TestCountMilestonesByRepo(t *testing.T) { +func TestCountMilestonesByRepoIDs(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) milestonesCount := func(repoID int64) (int, int) { repo := AssertExistsAndLoadBean(t, &Repository{ID: repoID}).(*Repository) @@ -299,12 +299,12 @@ func TestCountMilestonesByRepo(t *testing.T) { repo1OpenCount, repo1ClosedCount := milestonesCount(1) repo2OpenCount, repo2ClosedCount := milestonesCount(2) - openCounts, err := CountMilestonesByRepo([]int64{1, 2}, false) + openCounts, err := CountMilestonesByRepoIDs([]int64{1, 2}, false) assert.NoError(t, err) assert.EqualValues(t, repo1OpenCount, openCounts[1]) assert.EqualValues(t, repo2OpenCount, openCounts[2]) - closedCounts, err := CountMilestonesByRepo([]int64{1, 2}, true) + closedCounts, err := CountMilestonesByRepoIDs([]int64{1, 2}, true) assert.NoError(t, err) assert.EqualValues(t, repo1ClosedCount, closedCounts[1]) assert.EqualValues(t, repo2ClosedCount, closedCounts[2]) diff --git a/routers/user/home.go b/routers/user/home.go index e95c66e27bf2a..c51cb1c151992 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -210,9 +210,9 @@ func Milestones(ctx *context.Context) { repoIDs = userRepoIDs } - counts, err := models.CountMilestonesByRepo(repoIDs, isShowClosed) + counts, err := models.CountMilestonesByRepoIDs(repoIDs, isShowClosed) if err != nil { - ctx.ServerError("CountMilestonesByRepo", err) + ctx.ServerError("CountMilestonesByRepoIDs", err) return } From 489a6600b5a6eb607641f2f7c411cf5bd45dda1a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 14 Dec 2019 17:49:53 +0100 Subject: [PATCH 21/28] fix-stats-count --- models/issue_milestone.go | 19 +++++++------------ routers/user/home.go | 4 ++-- templates/user/dashboard/milestones.tmpl | 2 +- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/models/issue_milestone.go b/models/issue_milestone.go index a27c797b3c52b..5fd1e1b8ccf8b 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -543,28 +543,23 @@ func GetMilestonesByRepoIDs(repoIDs []int64, page int, isClosed bool, sortType s return miles, sess.Find(&miles) } -// UserMilestoneStats represents milestone statistic information. -type UserMilestoneStats struct { +// MilestonesStats represents milestone statistic information. +type MilestonesStats struct { OpenCount, ClosedCount int64 } -// GetUserMilestoneStats returns milestone statistic information for dashboard by given conditions. -func GetUserMilestoneStats(userID int64, repoID int64, userRepoIDs []int64) (*UserMilestoneStats, error) { +// GetMilestonesStats returns milestone statistic information for dashboard by given conditions. +func GetMilestonesStats(userRepoIDs []int64) (*MilestonesStats, error) { var err error - stats := &UserMilestoneStats{} + stats := &MilestonesStats{} - cond := builder.NewCond() - if repoID > 0 { - cond = cond.And(builder.Eq{"repo_id": repoID}) - } - - stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false). + stats.OpenCount, err = x.Where("is_closed = ?", false). And(builder.In("repo_id", userRepoIDs)). Count(new(Milestone)) if err != nil { return nil, err } - stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true). + stats.ClosedCount, err = x.Where("is_closed = ?", true). And(builder.In("repo_id", userRepoIDs)). Count(new(Milestone)) if err != nil { diff --git a/routers/user/home.go b/routers/user/home.go index 978f819c0c71a..c68d8421ecc5a 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -285,9 +285,9 @@ func Milestones(ctx *context.Context) { } } - milestoneStats, err := models.GetUserMilestoneStats(ctxUser.ID, repoID, userRepoIDs) + milestoneStats, err := models.GetMilestonesStats(userRepoIDs) if err != nil { - ctx.ServerError("GetUserMilestoneStats", err) + ctx.ServerError("GetMilestoneStats", err) return } diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index ae99c1b98cc9a..836c12349a8ac 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -5,7 +5,7 @@
    - + {{.i18n.Tr "home.issues.in_your_repos"}} {{.Total}} From f2bbc6e055c769cb457794413244b4e94272a835 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 14 Dec 2019 18:05:32 +0100 Subject: [PATCH 22/28] fix test --- models/issue_milestone_test.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/models/issue_milestone_test.go b/models/issue_milestone_test.go index 71ff9ed5bf7c2..787b849cce3d5 100644 --- a/models/issue_milestone_test.go +++ b/models/issue_milestone_test.go @@ -364,14 +364,13 @@ func TestLoadTotalTrackedTime(t *testing.T) { assert.Equal(t, milestone.TotalTrackedTime, int64(3662)) } -func TestGetUserMilestoneStats(t *testing.T) { +func TestGetMilestonesStats(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) repo1 := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository) repo2 := AssertExistsAndLoadBean(t, &Repository{ID: 2}).(*Repository) - user := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User) - milestoneStats, err := GetUserMilestoneStats(user.ID, repo1.ID, []int64{repo1.ID, repo2.ID}) + milestoneStats, err := GetMilestonesStats([]int64{repo1.ID, repo2.ID}) assert.NoError(t, err) - assert.EqualValues(t, repo1.NumOpenMilestones, milestoneStats.OpenCount) - assert.EqualValues(t, repo1.NumClosedMilestones, milestoneStats.ClosedCount) + assert.EqualValues(t, repo1.NumOpenMilestones+repo2.NumOpenMilestones, milestoneStats.OpenCount) + assert.EqualValues(t, repo1.NumClosedMilestones+repo2.NumClosedMilestones, milestoneStats.ClosedCount) } From 3220b65d544bf8307eda2dfcd10c1671913e1908 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 14 Dec 2019 18:07:37 +0100 Subject: [PATCH 23/28] add-integration-tests --- integrations/links_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/integrations/links_test.go b/integrations/links_test.go index fc0f164552c3b..db86b22812526 100644 --- a/integrations/links_test.go +++ b/integrations/links_test.go @@ -86,6 +86,12 @@ func testLinksAsUser(userName string, t *testing.T) { "/pulls?type=your_repositories&repos=[0]&sort=&state=closed", "/pulls?type=assigned&repos=[0]&sort=&state=closed", "/pulls?type=created_by&repos=[0]&sort=&state=closed", + "/milestones", + "/milestones?repo=0&sort=mostcomplete&state=closed", + "/milestones?type=your_repositories&sort=mostcomplete&state=closed", + "/milestones?sort=&repo=1&state=closed", + "/milestones?sort=&repo=1&state=open", + "/milestones?repo=0&sort=mostissues&state=open", "/notifications", "/repo/create", "/repo/migrate", From eb674fcaea0cfcf6a86255a15c1110a8841c70aa Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 14 Dec 2019 19:45:29 +0100 Subject: [PATCH 24/28] make multi selectable --- routers/user/home.go | 87 ++++++++++++++---------- templates/user/dashboard/milestones.tmpl | 41 +++++++---- 2 files changed, 79 insertions(+), 49 deletions(-) diff --git a/routers/user/home.go b/routers/user/home.go index c68d8421ecc5a..426f15bfa7efd 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -169,7 +169,7 @@ func Milestones(ctx *context.Context) { page = 1 } - repoID := ctx.QueryInt64("repo") + reposQuery := ctx.Query("repos") isShowClosed := ctx.Query("state") == "closed" // Get repositories. @@ -199,17 +199,34 @@ func Milestones(ctx *context.Context) { } var repoIDs []int64 - if repoID > 0 { - repoIDs = []int64{repoID} - if !com.IsSliceContainsInt64(userRepoIDs, repoID) { + if issueReposQueryPattern.MatchString(reposQuery) { + // remove "[" and "]" from string + reposQuery = reposQuery[1 : len(reposQuery)-1] + //for each ID (delimiter ",") add to int to repoIDs + reposSet := false + for _, rID := range strings.Split(reposQuery, ",") { + // Ensure nonempty string entries + if rID != "" && rID != "0" { + reposSet = true + rIDint64, err := strconv.ParseInt(rID, 10, 64) + if err == nil && com.IsSliceContainsInt64(userRepoIDs, rIDint64) { + repoIDs = append(repoIDs, rIDint64) + } + } + } + if reposSet && len(repoIDs) == 0 { // force an empty result repoIDs = []int64{-1} } } else { + log.Error("issueReposQueryPattern not match with query") + } + + if len(repoIDs) == 0 { repoIDs = userRepoIDs } - counts, err := models.CountMilestonesByRepoIDs(repoIDs, isShowClosed) + counts, err := models.CountMilestonesByRepoIDs(userRepoIDs, isShowClosed) if err != nil { ctx.ServerError("CountMilestonesByRepoIDs", err) return @@ -222,36 +239,29 @@ func Milestones(ctx *context.Context) { } showReposMap := make(map[int64]*models.Repository, len(counts)) - for repoID := range counts { - repo, err := models.GetRepositoryByID(repoID) - if err != nil { - ctx.ServerError("GetRepositoryByID", err) - return + for rID := range counts { + if rID == -1 { + break } - showReposMap[repoID] = repo - } - - if repoID > 0 { - if _, ok := showReposMap[repoID]; !ok { - repo, err := models.GetRepositoryByID(repoID) + repo, err := models.GetRepositoryByID(rID) + if err != nil { if models.IsErrRepoNotExist(err) { ctx.NotFound("GetRepositoryByID", err) return } else if err != nil { - ctx.ServerError("GetRepositoryByID", fmt.Errorf("[%d]%v", repoID, err)) + ctx.ServerError("GetRepositoryByID", fmt.Errorf("[%d]%v", rID, err)) return } - showReposMap[repoID] = repo } - - repo := showReposMap[repoID] + showReposMap[rID] = repo // Check if user has access to given repository. perm, err := models.GetUserRepoPermission(repo, ctxUser) if err != nil { - ctx.ServerError("GetUserRepoPermission", fmt.Errorf("[%d]%v", repoID, err)) + ctx.ServerError("GetUserRepoPermission", fmt.Errorf("[%d]%v", rID, err)) return } + if !perm.CanRead(models.UnitTypeIssues) { if log.IsTrace() { log.Trace("Permission Denied: User %-v cannot read %-v of repo %-v\n"+ @@ -285,36 +295,41 @@ func Milestones(ctx *context.Context) { } } - milestoneStats, err := models.GetMilestonesStats(userRepoIDs) + milestoneStats, err := models.GetMilestonesStats(repoIDs) if err != nil { ctx.ServerError("GetMilestoneStats", err) return } - var total int - if !isShowClosed { - total = int(milestoneStats.OpenCount) + totalMilestoneStats, err := models.GetMilestonesStats(userRepoIDs) + if err != nil { + ctx.ServerError("GetMilestoneStats", err) + return + } + + var pagerCount int + if isShowClosed { + ctx.Data["State"] = "closed" + ctx.Data["Total"] = totalMilestoneStats.ClosedCount + pagerCount = int(milestoneStats.ClosedCount) } else { - total = int(milestoneStats.ClosedCount) + ctx.Data["State"] = "open" + ctx.Data["Total"] = totalMilestoneStats.OpenCount + pagerCount = int(milestoneStats.OpenCount) } ctx.Data["Milestones"] = milestones ctx.Data["Repos"] = showRepos ctx.Data["Counts"] = counts ctx.Data["MilestoneStats"] = milestoneStats - ctx.Data["Total"] = total ctx.Data["SortType"] = sortType - ctx.Data["RepoID"] = repoID - ctx.Data["IsShowClosed"] = isShowClosed - - if isShowClosed { - ctx.Data["State"] = "closed" - } else { - ctx.Data["State"] = "open" + if len(repoIDs) != len(userRepoIDs) { + ctx.Data["RepoIDs"] = repoIDs } + ctx.Data["IsShowClosed"] = isShowClosed - pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, 5) - pager.AddParam(ctx, "repo", "RepoID") + pager := context.NewPagination(pagerCount, setting.UI.IssuePagingNum, page, 5) + pager.AddParam(ctx, "repos", "RepoIDs") pager.AddParam(ctx, "sort", "SortType") pager.AddParam(ctx, "state", "State") ctx.Data["Page"] = pager diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 836c12349a8ac..495119f442f96 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -11,20 +11,35 @@
    {{range .Repos}} - - {{.FullName}} -
    {{index $.Counts .ID}}
    -     + {{with $Repo := .}} + + {{$Repo.FullName}} +
    {{index $.Counts $Repo.ID}}
    +     + {{end}} {{end}}
    - + {{.i18n.Tr "repo.milestones.open_tab" .MilestoneStats.OpenCount}} - + {{.i18n.Tr "repo.milestones.close_tab" .MilestoneStats.ClosedCount}} @@ -37,12 +52,12 @@
    - {{.i18n.Tr "repo.milestones.filter_sort.closest_due_date"}} - {{.i18n.Tr "repo.milestones.filter_sort.furthest_due_date"}} - {{.i18n.Tr "repo.milestones.filter_sort.least_complete"}} - {{.i18n.Tr "repo.milestones.filter_sort.most_complete"}} - {{.i18n.Tr "repo.milestones.filter_sort.most_issues"}} - {{.i18n.Tr "repo.milestones.filter_sort.least_issues"}} + {{.i18n.Tr "repo.milestones.filter_sort.closest_due_date"}} + {{.i18n.Tr "repo.milestones.filter_sort.furthest_due_date"}} + {{.i18n.Tr "repo.milestones.filter_sort.least_complete"}} + {{.i18n.Tr "repo.milestones.filter_sort.most_complete"}} + {{.i18n.Tr "repo.milestones.filter_sort.most_issues"}} + {{.i18n.Tr "repo.milestones.filter_sort.least_issues"}}
    @@ -50,7 +65,7 @@
    {{range .Milestones}}
  • -
    {{if not $.RepoID}}{{.Repo.FullName}}{{end}}
    +
    {{if not $.RepoIDs}}{{.Repo.FullName}}{{end}}
    {{.Name}}
    From aaad76879b2fad032b1e49bd28df12e9f8787848 Mon Sep 17 00:00:00 2001 From: Brad Albright <32200834+bhalbright@users.noreply.github.com> Date: Sat, 14 Dec 2019 13:51:12 -0600 Subject: [PATCH 25/28] Update integrations/links_test.go Co-Authored-By: 6543 <6543@obermui.de> --- integrations/links_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/links_test.go b/integrations/links_test.go index db86b22812526..39581a6513155 100644 --- a/integrations/links_test.go +++ b/integrations/links_test.go @@ -91,7 +91,7 @@ func testLinksAsUser(userName string, t *testing.T) { "/milestones?type=your_repositories&sort=mostcomplete&state=closed", "/milestones?sort=&repo=1&state=closed", "/milestones?sort=&repo=1&state=open", - "/milestones?repo=0&sort=mostissues&state=open", + "/milestones?repos=[0]&sort=mostissues&state=open", "/notifications", "/repo/create", "/repo/migrate", From f264f5d636b37ac8e54d018252a1e729b8a15080 Mon Sep 17 00:00:00 2001 From: Brad Albright <32200834+bhalbright@users.noreply.github.com> Date: Sat, 14 Dec 2019 13:51:36 -0600 Subject: [PATCH 26/28] Update integrations/links_test.go Co-Authored-By: 6543 <6543@obermui.de> --- integrations/links_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/links_test.go b/integrations/links_test.go index 39581a6513155..97340adcdd0ae 100644 --- a/integrations/links_test.go +++ b/integrations/links_test.go @@ -87,7 +87,7 @@ func testLinksAsUser(userName string, t *testing.T) { "/pulls?type=assigned&repos=[0]&sort=&state=closed", "/pulls?type=created_by&repos=[0]&sort=&state=closed", "/milestones", - "/milestones?repo=0&sort=mostcomplete&state=closed", + "/milestones?sort=mostcomplete&state=closed", "/milestones?type=your_repositories&sort=mostcomplete&state=closed", "/milestones?sort=&repo=1&state=closed", "/milestones?sort=&repo=1&state=open", From b33d30aaf0bf41d3b28853b6b7735030109ecd4f Mon Sep 17 00:00:00 2001 From: Brad Albright <32200834+bhalbright@users.noreply.github.com> Date: Sun, 15 Dec 2019 07:07:35 -0600 Subject: [PATCH 27/28] Update integrations/links_test.go Co-Authored-By: 6543 <6543@obermui.de> --- integrations/links_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/links_test.go b/integrations/links_test.go index 97340adcdd0ae..6fb928173193b 100644 --- a/integrations/links_test.go +++ b/integrations/links_test.go @@ -89,7 +89,7 @@ func testLinksAsUser(userName string, t *testing.T) { "/milestones", "/milestones?sort=mostcomplete&state=closed", "/milestones?type=your_repositories&sort=mostcomplete&state=closed", - "/milestones?sort=&repo=1&state=closed", + "/milestones?sort=&repos=[1]&state=closed", "/milestones?sort=&repo=1&state=open", "/milestones?repos=[0]&sort=mostissues&state=open", "/notifications", From 218aa5be050cdcd33862a4f239c3e94a6a5b7796 Mon Sep 17 00:00:00 2001 From: Brad Albright <32200834+bhalbright@users.noreply.github.com> Date: Sun, 15 Dec 2019 07:08:06 -0600 Subject: [PATCH 28/28] Update integrations/links_test.go Co-Authored-By: 6543 <6543@obermui.de> --- integrations/links_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/links_test.go b/integrations/links_test.go index 6fb928173193b..329e54528a7d4 100644 --- a/integrations/links_test.go +++ b/integrations/links_test.go @@ -90,7 +90,7 @@ func testLinksAsUser(userName string, t *testing.T) { "/milestones?sort=mostcomplete&state=closed", "/milestones?type=your_repositories&sort=mostcomplete&state=closed", "/milestones?sort=&repos=[1]&state=closed", - "/milestones?sort=&repo=1&state=open", + "/milestones?sort=&repos=[1]&state=open", "/milestones?repos=[0]&sort=mostissues&state=open", "/notifications", "/repo/create",