test/gitea-mirror
1
0
Fork 0
mirror of https://gitea.com/gitea/gitea-mirror.git synced 2026-03-20 03:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature to be able to filter project boards by milestones (#36321)

Browse Source 
This pull request adds milestone filtering support to both repository
and organization project boards. Users can now filter project issues by
milestone, similar to how they filter by label or assignee. The
implementation includes backend changes to fetch and filter milestones,
as well as frontend updates to display a milestone filter dropdown in
the project board UI.

**Milestone filtering support:**

* Added support for filtering project board issues by milestone in both
repository and organization contexts, including handling for "no
milestone" and "all milestones" options. (`routers/web/repo/projects.go`
[[1]](diffhunk://#diff-5cba331a1ddf1eea017178cfefaaff9ad72a4b05797fb84bf508b0939aae2972R316-R330)
[[2]](diffhunk://#diff-5cba331a1ddf1eea017178cfefaaff9ad72a4b05797fb84bf508b0939aae2972R421-R441);
`routers/web/org/projects.go`
[[3]](diffhunk://#diff-f4279417070a8e33829c338abeb42877500377f490abb1495ae6357d50b6a765R344-R357)
[[4]](diffhunk://#diff-f4279417070a8e33829c338abeb42877500377f490abb1495ae6357d50b6a765R433-R485)
* Updated the project board template to include a milestone filter
dropdown, displaying open and closed milestones and integrating with the
query string for filtering. (`templates/projects/view.tmpl`
[[1]](diffhunk://#diff-e2c7e14d247ce381c352263a8fa639b8341690ff85f6dbebfa166ee3306542feL8-R8)
[[2]](diffhunk://#diff-e2c7e14d247ce381c352263a8fa639b8341690ff85f6dbebfa166ee3306542feR19-R58)

Solves Issue #35224

---------

Signed-off-by: josetduarte <6619440+josetduarte@users.noreply.github.com>
Co-authored-by: joseduarte <joseduarte@aidhound.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
josetduarte
2026-02-12 22:09:32 +00:00
committed by GitHub
parent 4b36f01bf4
commit f76f5207a7
8 changed files with 313 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
tests/integration/project_test.go
View File

@@ -6,15 +6,20 @@ package integration
import (
"fmt"
"net/http"
"strconv"
"testing"
issues_model "code.gitea.io/gitea/models/issues"
project_model "code.gitea.io/gitea/models/project"
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/tests"
"github.com/PuerkitoBio/goquery"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestPrivateRepoProject(t *testing.T) {
@@ -83,3 +88,163 @@ func TestMoveRepoProjectColumns(t *testing.T) {
assert.NoError(t, project_model.DeleteProjectByID(t.Context(), project1.ID))
}
// getProjectIssueIDs returns the set of issue IDs rendered as cards on the project board page.
func getProjectIssueIDs(t *testing.T, htmlDoc *HTMLDoc) map[int64]struct{} {
t.Helper()
ids := make(map[int64]struct{})
htmlDoc.Find(".issue-card[data-issue]").Each(func(_ int, s *goquery.Selection) {
idStr, exists := s.Attr("data-issue")
require.True(t, exists)
id, err := strconv.ParseInt(idStr, 10, 64)
require.NoError(t, err)
ids[id] = struct{}{}
})
return ids
}
func TestRepoProjectFilterByMilestone(t *testing.T) {
// Project 1 is on repo 1 (user2/repo1) and has issues:
// issue 1 (milestone_id=0), issue 2 (milestone_id=1), issue 3 (milestone_id=3), issue 5 (milestone_id=0)
defer tests.PrepareTestEnv(t)()
sess := loginUser(t, "user2")
t.Run("NoFilter", func(t *testing.T) {
req := NewRequest(t, "GET", "/user2/repo1/projects/1")
resp := sess.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issueIDs := getProjectIssueIDs(t, htmlDoc)
// All issues should be visible
assert.Contains(t, issueIDs, int64(1))
assert.Contains(t, issueIDs, int64(2))
assert.Contains(t, issueIDs, int64(3))
assert.Contains(t, issueIDs, int64(5))
})
t.Run("FilterByMilestone", func(t *testing.T) {
// milestone_id=1 is "milestone1" (open), only issue 2 has it
req := NewRequest(t, "GET", "/user2/repo1/projects/1?milestone=1")
resp := sess.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issueIDs := getProjectIssueIDs(t, htmlDoc)
assert.Contains(t, issueIDs, int64(2))
assert.NotContains(t, issueIDs, int64(1))
assert.NotContains(t, issueIDs, int64(3))
assert.NotContains(t, issueIDs, int64(5))
})
t.Run("FilterByNoMilestone", func(t *testing.T) {
// milestone=-1 means "no milestone", issues 1 and 5 have no milestone
req := NewRequest(t, "GET", "/user2/repo1/projects/1?milestone=-1")
resp := sess.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issueIDs := getProjectIssueIDs(t, htmlDoc)
assert.Contains(t, issueIDs, int64(1))
assert.Contains(t, issueIDs, int64(5))
assert.NotContains(t, issueIDs, int64(2))
assert.NotContains(t, issueIDs, int64(3))
})
t.Run("FilterByClosedMilestone", func(t *testing.T) {
// milestone_id=3 is "milestone3" (closed), only issue 3 has it
req := NewRequest(t, "GET", "/user2/repo1/projects/1?milestone=3")
resp := sess.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issueIDs := getProjectIssueIDs(t, htmlDoc)
assert.Contains(t, issueIDs, int64(3))
assert.NotContains(t, issueIDs, int64(1))
assert.NotContains(t, issueIDs, int64(2))
assert.NotContains(t, issueIDs, int64(5))
})
}
func TestOrgProjectFilterByMilestone(t *testing.T) {
defer tests.PrepareTestEnv(t)()
// org3 owns repo32 (public) which has issues 16 and 17
org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 32})
issue16 := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 16})
issue17 := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 17})
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
// Create a milestone on repo32 and assign it to issue16
milestone := &issues_model.Milestone{
RepoID: repo.ID,
Name: "org-test-milestone",
}
require.NoError(t, issues_model.NewMilestone(t.Context(), milestone))
issue16.MilestoneID = milestone.ID
require.NoError(t, issues_model.UpdateIssueCols(t.Context(), issue16, "milestone_id"))
// Create an org-level project
project := project_model.Project{
Title: "org milestone filter test",
OwnerID: org.ID,
Type: project_model.TypeOrganization,
TemplateType: project_model.TemplateTypeBasicKanban,
}
require.NoError(t, project_model.NewProject(t.Context(), &project))
// Get the default column
columns, err := project.GetColumns(t.Context())
require.NoError(t, err)
require.NotEmpty(t, columns)
defaultColumnID := columns[0].ID
// Add issues to the project
require.NoError(t, issues_model.IssueAssignOrRemoveProject(t.Context(), issue16, user1, project.ID, defaultColumnID))
require.NoError(t, issues_model.IssueAssignOrRemoveProject(t.Context(), issue17, user1, project.ID, defaultColumnID))
sess := loginUser(t, "user1")
projectURL := fmt.Sprintf("/org3/-/projects/%d", project.ID)
t.Run("NoFilter", func(t *testing.T) {
req := NewRequest(t, "GET", projectURL)
resp := sess.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issueIDs := getProjectIssueIDs(t, htmlDoc)
assert.Contains(t, issueIDs, issue16.ID)
assert.Contains(t, issueIDs, issue17.ID)
})
t.Run("FilterByMilestone", func(t *testing.T) {
req := NewRequest(t, "GET", fmt.Sprintf("%s?milestone=%d", projectURL, milestone.ID))
resp := sess.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issueIDs := getProjectIssueIDs(t, htmlDoc)
assert.Contains(t, issueIDs, issue16.ID)
assert.NotContains(t, issueIDs, issue17.ID)
})
t.Run("FilterByNoMilestone", func(t *testing.T) {
req := NewRequest(t, "GET", projectURL+"?milestone=-1")
resp := sess.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issueIDs := getProjectIssueIDs(t, htmlDoc)
assert.Contains(t, issueIDs, issue17.ID)
assert.NotContains(t, issueIDs, issue16.ID)
})
t.Run("AnonymousAccess", func(t *testing.T) {
// Anonymous users should be able to view org project boards for public orgs
// and the milestone filter should work without exposing private repo data
req := NewRequest(t, "GET", projectURL)
resp := MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
issueIDs := getProjectIssueIDs(t, htmlDoc)
// repo32 is public, so anonymous users should see its issues
assert.Contains(t, issueIDs, issue16.ID)
assert.Contains(t, issueIDs, issue17.ID)
// Milestone filtering should also work for anonymous users
req = NewRequest(t, "GET", fmt.Sprintf("%s?milestone=%d", projectURL, milestone.ID))
resp = MakeRequest(t, req, http.StatusOK)
htmlDoc = NewHTMLParser(t, resp.Body)
issueIDs = getProjectIssueIDs(t, htmlDoc)
assert.Contains(t, issueIDs, issue16.ID)
assert.NotContains(t, issueIDs, issue17.ID)
})
}