Show empty repos in Admin Repository Management page

[Zettat123]

The Admin Repository Management page and the Explore Repository page both use the RenderRepoSearch function. In this function, the OnlyShowRelevant search option is true when querying repositories for admin page.

gitea/routers/web/explore/repo.go

Lines 99 to 115 in edf98a2

	repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
	ListOptions: db.ListOptions{
	Page: page,
	PageSize: opts.PageSize,
	},
	Actor: ctx.Doer,
	OrderBy: orderBy,
	Private: opts.Private,
	Keyword: keyword,
	OwnerID: opts.OwnerID,
	AllPublic: true,
	AllLimited: true,
	TopicOnly: topicOnly,
	Language: language,
	IncludeDescription: setting.UI.SearchRepoDescription,
	OnlyShowRelevant: onlyShowRelevant,
	})

Refer to #19361, the repositories with is_empty=true will be hidden if OnlyShowRelevant is true.

Administrators should be able to see all repositories. So OnlyShowRelevant shouldn't be set to true .

[wolfogre]

Although isAdmin looks like an ugly parameter, it can remind the developers that RenderRepoSearch is used by the admin page.

Maybe we can avoid mixed use in the future, it's fine for me now.

[zeripath]

Wouldn't it be better to change the callers of this function to just set the only show relevant option as appropriately?

Certainly this parameter should really be referencing the fact that it is setting OnlyShowRelevant to false - and thus be named more appropriately.

[zeripath]

I think adding isAdmin to the function parameters is a mistake and instead we should be moving it into the options. I've applied the attached patch which I think makes this code cleaner.

PATCH

From 971cf6267fe285c740ca42ff5e6f0fe85d2422cd Mon Sep 17 00:00:00 2001
From: Andrew Thornton <[email protected]>
Date: Fri, 24 Feb 2023 14:21:38 +0000
Subject: [PATCH] Move OnlyShowRelevant in to RepoSearchOptions

Signed-off-by: Andrew Thornton <[email protected]>
---
 routers/web/admin/repos.go  |  9 ++++----
 routers/web/explore/repo.go | 41 +++++++++++++++++--------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go
index 17ac253be..1c4754f6d 100644
--- a/routers/web/admin/repos.go
+++ b/routers/web/admin/repos.go
@@ -33,10 +33,11 @@ func Repos(ctx *context.Context) {
 	ctx.Data["PageIsAdminRepositories"] = true
 
 	explore.RenderRepoSearch(ctx, &explore.RepoSearchOptions{
-		Private:  true,
-		PageSize: setting.UI.Admin.RepoPagingNum,
-		TplName:  tplRepos,
-	}, true)
+		Private:          true,
+		PageSize:         setting.UI.Admin.RepoPagingNum,
+		TplName:          tplRepos,
+		OnlyShowRelevant: false,
+	})
 }
 
 // DeleteRepo delete one repository
diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index 77de2f6cb..058971b9b 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -23,17 +23,18 @@ const (
 
 // RepoSearchOptions when calling search repositories
 type RepoSearchOptions struct {
-	OwnerID    int64
-	Private    bool
-	Restricted bool
-	PageSize   int
-	TplName    base.TplName
+	OwnerID          int64
+	Private          bool
+	Restricted       bool
+	PageSize         int
+	OnlyShowRelevant bool
+	TplName          base.TplName
 }
 
 // RenderRepoSearch render repositories search page
 // This function is also used to render the Admin Repository Management page.
 // The isAdmin param should be set to true when rendering the Admin page.
-func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions, isAdmin bool) {
+func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 	// Sitemap index for sitemap paths
 	page := int(ctx.ParamsInt64("idx"))
 	isSitemap := ctx.Params("idx") != ""
@@ -50,11 +51,10 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions, isAdmin boo
 	}
 
 	var (
-		repos            []*repo_model.Repository
-		count            int64
-		err              error
-		orderBy          db.SearchOrderBy
-		onlyShowRelevant bool
+		repos   []*repo_model.Repository
+		count   int64
+		err     error
+		orderBy db.SearchOrderBy
 	)
 
 	ctx.Data["SortType"] = ctx.FormString("sort")
@@ -86,13 +86,9 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions, isAdmin boo
 		orderBy = db.SearchOrderByRecentUpdated
 	}
 
-	if !isAdmin {
-		onlyShowRelevant = !ctx.FormBool(relevantReposOnlyParam)
-	}
-
 	keyword := ctx.FormTrim("q")
 
-	ctx.Data["OnlyShowRelevant"] = onlyShowRelevant
+	ctx.Data["OnlyShowRelevant"] = opts.OnlyShowRelevant
 
 	topicOnly := ctx.FormBool("topic")
 	ctx.Data["TopicOnly"] = topicOnly
@@ -115,7 +111,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions, isAdmin boo
 		TopicOnly:          topicOnly,
 		Language:           language,
 		IncludeDescription: setting.UI.SearchRepoDescription,
-		OnlyShowRelevant:   onlyShowRelevant,
+		OnlyShowRelevant:   opts.OnlyShowRelevant,
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
@@ -162,9 +158,10 @@ func Repos(ctx *context.Context) {
 	}
 
 	RenderRepoSearch(ctx, &RepoSearchOptions{
-		PageSize: setting.UI.ExplorePagingNum,
-		OwnerID:  ownerID,
-		Private:  ctx.Doer != nil,
-		TplName:  tplExploreRepos,
-	}, false)
+		PageSize:         setting.UI.ExplorePagingNum,
+		OwnerID:          ownerID,
+		Private:          ctx.Doer != nil,
+		TplName:          tplExploreRepos,
+		OnlyShowRelevant: !ctx.FormBool(relevantReposOnlyParam),
+	})
 }
-- 
2.34.1

[zeripath]

please send backports to 1.19 and 1.18

[zeripath]

Does this actually need to be backported to v1.19 and v1.18?

[yardenshoham]

Doesn't make much sense on v1.18 without #21962

[wolfogre]

@zeripath

TBH, I could agree with your suggestion, but not with your operation.

Because there is no review for your implemention, we have a strange comment now:

[zeripath]

Damn.

Sorry I thought I'd let long enough for people to review and double check the work.

Feel free to send a quick patch to fix the comment.