Add pagination and search box to org teams list

models/organization/team_list.go

@@ -88,7 +88,7 @@ func SearchTeam(ctx context.Context, opts *SearchTeamOptions) (TeamList, int64,
 	sess = db.SetSessionPagination(sess, opts)
 
 	teams := make([]*Team, 0, opts.PageSize)
-	count, err := sess.Where(cond).OrderBy("lower_name").FindAndCount(&teams)
+	count, err := sess.Where(cond).OrderBy("CASE WHEN name=? THEN '' ELSE lower_name END", OwnerTeamName).FindAndCount(&teams)
 	if err != nil {
 		return nil, 0, err
 	}

routers/web/org/home.go

@@ -24,6 +24,8 @@ import (
 
 const tplOrgHome templates.TplName = "org/home"
 
+const numOfTeamsAtMostInOverview = 5
+
 // Home show organization home page
 func Home(ctx *context.Context) {
 	uname := ctx.PathParam("username")
@@ -99,7 +101,7 @@ func home(ctx *context.Context, viewRepositories bool) {
 		return
 	}
 	ctx.Data["Members"] = members
-	ctx.Data["Teams"] = ctx.Org.Teams
+	ctx.Data["Teams"] = ctx.Org.Teams[:min(len(ctx.Org.Teams), numOfTeamsAtMostInOverview)]
 	ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull
 	ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0
 

routers/web/org/teams.go

@@ -54,13 +54,49 @@ func Teams(ctx *context.Context) {
 	ctx.Data["Title"] = org.FullName
 	ctx.Data["PageIsOrgTeams"] = true
 
-	for _, t := range ctx.Org.Teams {
+	keyword := ctx.FormTrim("q")
+	page := max(ctx.FormInt("page"), 1)
+
+	opts := &org_model.SearchTeamOptions{
+		OrgID: org.ID,
+		ListOptions: db.ListOptions{
+			Page:     page,
+			PageSize: setting.UI.MembersPagingNum,
+		},
+	}
+
+	shouldSeeAllOrgTeams, err := context.UserShouldSeeAllOrgTeams(ctx)
+	if err != nil {
+		ctx.ServerError("UserShouldSeeAllOrgTeams", err)
+		return
+	}
+
+	if !shouldSeeAllOrgTeams {
+		opts.UserID = ctx.Doer.ID
+	}
+
+	if keyword != "" {
+		opts.Keyword = keyword
+		opts.IncludeDesc = true
+	}
+
+	teams, count, err := org_model.SearchTeam(ctx, opts)
+	if err != nil {
+		ctx.ServerError("SearchTeam", err)
+		return
+	}
+
+	for _, t := range teams {
 		if err := t.LoadMembers(ctx); err != nil {
 			ctx.ServerError("GetMembers", err)
 			return
 		}
 	}
-	ctx.Data["Teams"] = ctx.Org.Teams
+	ctx.Data["Teams"] = teams
+	ctx.Data["Keyword"] = keyword
+	pager := context.NewPagination(count, setting.UI.MembersPagingNum, page, 5)
+	pager.AddParamFromRequest(ctx.Req)
+	ctx.Data["Page"] = pager
 
 	ctx.HTML(http.StatusOK, tplTeams)
 }

services/context/org.go

@@ -174,23 +174,12 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) {
 		}
 
 		// Team.
+		shouldSeeAllTeams, err := UserShouldSeeAllOrgTeams(ctx)
+		if err != nil {
+			ctx.ServerError("UserShouldSeeAllOrgTeams", err)
+			return
+		}
 		if ctx.Org.IsMember {
-			shouldSeeAllTeams := false
-			if ctx.Org.IsOwner {
-				shouldSeeAllTeams = true
-			} else {
-				teams, err := org.GetUserTeams(ctx, ctx.Doer.ID)
-				if err != nil {
-					ctx.ServerError("GetUserTeams", err)
-					return
-				}
-				for _, team := range teams {
-					if team.IncludesAllRepositories && team.HasAdminAccess() {
-						shouldSeeAllTeams = true
-						break
-					}
-				}
-			}
 			if shouldSeeAllTeams {
 				ctx.Org.Teams, err = org.LoadTeams(ctx)
 				if err != nil {
@@ -255,3 +244,25 @@ func OrgAssignment(orgAssignmentOpts OrgAssignmentOptions) func(ctx *Context) {
 		}
 	}
 }
+
+// UserShouldSeeAllOrgTeams tells if a user has permission to view all teams in the org.
+func UserShouldSeeAllOrgTeams(ctx *Context) (bool, error) {
+	if !ctx.Org.IsMember {
+		return false, nil
+	}
+
+	if ctx.Org.IsOwner {
+		return true, nil
+	}
+
+	teams, err := ctx.Org.Organization.GetUserTeams(ctx, ctx.Doer.ID)
+	if err != nil {
+		return false, err
+	}
+	for _, team := range teams {
+		if team.IncludesAllRepositories && team.HasAdminAccess() {
+			return true, nil
+		}
+	}
+	return false, nil
+}

templates/org/team/teams.tmpl

@@ -8,9 +8,19 @@
 				<div class="tw-flex-1">{{ctx.Locale.Tr "org.teams.manage_team_member_prompt"}}</div>
 				<a class="ui primary button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus"}} {{ctx.Locale.Tr "org.create_new_team"}}</a>
 			</div>
-			<div class="divider"></div>
 		{{end}}
 
+		<div class="ui secondary filter menu tw-mx-0">
+			<form class="ui form ignore-dirty tw-flex-1" method="get">
+				<div class="ui fluid action input">
+					<input type="search" name="q" value="{{$.Keyword}}" placeholder="{{ctx.Locale.Tr "search.team_kind"}}" maxlength="255" spellcheck="false">
+					<button class="ui button" type="submit">{{svg "octicon-search"}}</button>
+				</div>
+			</form>
+		</div>
+
+		<div class="divider"></div>
+
 		<div class="ui two column stackable grid">
 			{{range .Teams}}
 				<div class="column">
@@ -42,6 +52,7 @@
 				</div>
 			{{end}}
 		</div>
+	{{template "base/paginate" .}}
 	</div>
 </div>
 <div class="ui g-modal-confirm delete modal" id="leave-team">

tests/integration/org_test.go

@@ -16,9 +16,12 @@ import (
 	"code.gitea.io/gitea/models/unit"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/tests"
 
+	"github.com/PuerkitoBio/goquery"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -31,6 +34,7 @@ func TestOrg(t *testing.T) {
 	t.Run("OrgMembers", testOrgMembers)
 	t.Run("OrgRestrictedUser", testOrgRestrictedUser)
 	t.Run("TeamSearch", testTeamSearch)
+	t.Run("TeamsPage", testTeamsPage)
 	t.Run("OrgSettings", testOrgSettings)
 }
 
@@ -251,6 +255,46 @@ func testTeamSearch(t *testing.T) {
 	})
 }
 
+func testTeamsPage(t *testing.T) {
+	// org 17 has three teams in fixtures: Owners (id 5), test_team (id 8), review_team (id 9).
+	// user15 is in Owners; user20 is in review_team only; user5 is not a member.
+	org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 17})
+
+	listTeams := func(t *testing.T, session *TestSession, query string) []string {
+		req := NewRequestf(t, "GET", "/org/%s/teams%s", org.Name, query)
+		resp := session.MakeRequest(t, req, http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		sel := htmlDoc.doc.Find(".ui.top.attached.header strong")
+		names := make([]string, 0, sel.Length())
+		sel.Each(func(_ int, s *goquery.Selection) {
+			names = append(names, s.Text())
+		})
+		return names
+	}
+
+	// Owner sees all teams, "Owners" sorted first regardless of alphabetical order
+	ownerSession := loginUser(t, "user15")
+	assert.Equal(t, []string{"Owners", "review_team", "test_team"}, listTeams(t, ownerSession, ""))
+
+	// Keyword filter narrows by name
+	assert.Equal(t, []string{"review_team"}, listTeams(t, ownerSession, "?q=review"))
+
+	// Non-admin org member sees only the teams they belong to
+	memberSession := loginUser(t, "user20")
+	assert.Equal(t, []string{"review_team"}, listTeams(t, memberSession, ""))
+
+	// Non-member is denied
+	nonMemberSession := loginUser(t, "user5")
+	req := NewRequestf(t, "GET", "/org/%s/teams", org.Name)
+	nonMemberSession.MakeRequest(t, req, http.StatusNotFound)
+
+	t.Run("Pagination", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.UI.MembersPagingNum, 2)()
+		assert.Len(t, listTeams(t, ownerSession, "?page=1"), 2)
+		assert.Equal(t, []string{"test_team"}, listTeams(t, ownerSession, "?page=2"))
+	})
+}
+
 func testOrgSettings(t *testing.T) {
 	session := loginUser(t, "user2")