diff --git a/models/fixtures/project.yml b/models/fixtures/project.yml index 54a3061859..c1011dc5e3 100644 --- a/models/fixtures/project.yml +++ b/models/fixtures/project.yml @@ -78,6 +78,6 @@ is_closed: false creator_id: 2 board_type: 1 - type: 1 + type: 3 created_unix: 1688973000 updated_unix: 1688973000 diff --git a/models/fixtures/project_board.yml b/models/fixtures/project_board.yml index e205c01a21..30708afb55 100644 --- a/models/fixtures/project_board.yml +++ b/models/fixtures/project_board.yml @@ -84,3 +84,13 @@ sorting: 1 created_unix: 1588117528 updated_unix: 1588117528 + +- + id: 10 + project_id: 7 + title: Default + creator_id: 2 + default: true + sorting: 1 + created_unix: 1588117528 + updated_unix: 1588117528 diff --git a/models/fixtures/project_issue.yml b/models/fixtures/project_issue.yml index 61ad79cd3e..606ec56008 100644 --- a/models/fixtures/project_issue.yml +++ b/models/fixtures/project_issue.yml @@ -25,3 +25,24 @@ project_id: 1 project_board_id: 3 sorting: 0 + +- + id: 5 + issue_id: 16 + project_id: 4 + project_board_id: 4 + sorting: 0 + +- + id: 6 + issue_id: 15 + project_id: 7 + project_board_id: 10 + sorting: 0 + +- + id: 7 + issue_id: 17 + project_id: 7 + project_board_id: 10 + sorting: 1 diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 4fe3f7c9a0..d4acdaa7ac 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -18,6 +18,7 @@ import ( "forgejo.org/models/db" issues_model "forgejo.org/models/issues" "forgejo.org/models/organization" + project_model "forgejo.org/models/project" repo_model "forgejo.org/models/repo" "forgejo.org/models/unit" user_model "forgejo.org/models/user" @@ -538,6 +539,37 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { PageSize: setting.UI.IssuePagingNum, } + // Projects + // + // We do not consider listing projects for the individual repos. + // Instead, we only support listing the projects under the scope of an individual/organisation. + // However, this limitation does not affect filtering with a project ID. + { + projOpts := project_model.SearchOptions{ + ListOptions: db.ListOptionsAll, + OwnerID: ctxUser.ID, + IsClosed: optional.None[bool](), + Type: project_model.TypeIndividual, + } + if org != nil { + projOpts.OwnerID = org.ID + projOpts.Type = project_model.TypeOrganization + } + + projects, err := db.Find[project_model.Project](ctx, projOpts) + if err != nil { + ctx.ServerError("GetProjects", err) + return + } + + if projectID := ctx.FormInt64("project"); projectID != 0 { + opts.ProjectID = projectID + ctx.Data["ProjectID"] = projectID + } + + ctx.Data["Projects"] = projects + } + // Get IDs for labels (a filter option for issues/pulls). // Required for IssuesOptions. selectedLabels := ctx.FormString("labels") @@ -688,6 +720,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { pager.AddParam(ctx, "labels", "SelectLabels") pager.AddParam(ctx, "milestone", "MilestoneID") pager.AddParam(ctx, "assignee", "AssigneeID") + pager.AddParam(ctx, "project", "ProjectID") ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplIssues) diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 5ebeac9d14..8bffbcde1d 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -6,11 +6,11 @@
{{$keyword := StringUtils.RemoveAll $.Keyword "is:open" "-is:open" "is:closed" "-is:closed" "is:all"}} - + {{svg "octicon-issue-opened" 16}} {{ctx.Locale.PrettyNumber .IssueStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} - + {{svg "octicon-issue-closed" 16}} {{ctx.Locale.PrettyNumber .IssueStats.ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}} @@ -19,6 +19,7 @@
+ {{$placeholder := ctx.Locale.Tr "search.issue_kind"}} {{if .PageIsPulls}} @@ -37,6 +38,26 @@ {{if .PageIsOrgIssues}} {{template "shared/label_filter" .}} {{end}} +
+ + {{ctx.Locale.Tr "repo.issues.filter_project"}} + + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+ + {{ctx.Locale.Tr "repo.issues.filter_project_all"}} + + + {{ctx.Locale.Tr "repo.issues.filter_project_none"}} + +
+ {{range $project := $.Projects}} + + {{svg $project.IconName 16 "tw-mr-2 tw-shrink-0"}}{{$project.Title}} + + {{end}} +
+
@@ -44,29 +65,29 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- +
{{CountFmt .IssueStats.CreateCount}}
{{ctx.Locale.Tr "repo.issues.filter_type.created_by_you"}} - +
{{CountFmt .IssueStats.YourRepositoriesCount}}
{{ctx.Locale.Tr "home.issues.in_your_repos"}} - +
{{CountFmt .IssueStats.AssignCount}}
{{ctx.Locale.Tr "repo.issues.filter_type.assigned_to_you"}} {{if .PageIsPulls}} - +
{{CountFmt .IssueStats.ReviewRequestedCount}}
{{ctx.Locale.Tr "repo.issues.filter_type.review_requested"}} - +
{{CountFmt .IssueStats.ReviewedCount}}
{{ctx.Locale.Tr "repo.issues.filter_type.reviewed_by_you"}} {{end}} - +
{{CountFmt .IssueStats.MentionCount}}
{{ctx.Locale.Tr "repo.issues.filter_type.mentioning_you"}} @@ -83,7 +104,7 @@ {{$o := .}} {{range $opt := StringUtils.Make "recentupdate" "leastupdate" "latest" "oldest" "mostcomment" "leastcomment" "nearduedate" "farduedate"}} {{$text := ctx.Locale.Tr (printf "repo.issues.filter_sort.%s" $opt)}} - {{ + {{ $text }} {{end}} diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 5285e83df6..04700e2152 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -1462,6 +1462,40 @@ func TestIssueOrgDashboard(t *testing.T) { } } +func TestIssueDashboardProjects(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3, Type: user_model.UserTypeOrganization}) + session := loginUser(t, user.Name) + + testFn := func(t *testing.T, req *RequestWrapper, projectID int64) { + resp := session.MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + projectFilterHref, ok := htmlDoc.Find("[data-test-tag=filter-project] a.active").Attr("href") + assert.True(t, ok) + assert.Contains(t, projectFilterHref, fmt.Sprintf("project=%d", projectID)) + + issues := htmlDoc.Find("#issue-list .issue-meta") + assert.NotZero(t, issues.Length()) + + issues.Each(func(i int, s *goquery.Selection) { + issueProjectHref, ok := s.Find("a.project").Attr("href") + assert.True(t, ok) + assert.Contains(t, issueProjectHref, fmt.Sprintf("projects/%d", projectID)) + }) + } + + t.Run("User", func(t *testing.T) { + testFn(t, NewRequest(t, "GET", "/issues?project=4"), 4) + }) + + t.Run("Org", func(t *testing.T) { + testFn(t, NewRequestf(t, "GET", "/org/%s/issues?project=7", org.Name), 7) + }) +} + func TestIssueCount(t *testing.T) { defer tests.PrepareTestEnv(t)()