From fbf0b3d661ad81c14546ca25948942f586e2662c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 18 Mar 2024 19:05:17 +0800 Subject: [PATCH] Only do counting when count_only=true for repo dashboard (#29884) Ref: #29878 (cherry picked from commit b251e608c01392c947f84be387f956541bfea25c) --- routers/web/repo/repo.go | 25 ++++++++++++--------- web_src/js/components/DashboardRepoList.vue | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 07e6c937b0..bda78b0edc 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -618,26 +618,31 @@ func SearchRepo(ctx *context.Context) { } } - var err error + // To improve performance when only the count is requested + if ctx.FormBool("count_only") { + if count, err := repo_model.CountRepository(ctx, opts); err != nil { + log.Error("CountRepository: %v", err) + ctx.JSON(http.StatusInternalServerError, nil) // frontend JS doesn't handle error response (same as below) + } else { + ctx.SetTotalCountHeader(count) + ctx.JSONOK() + } + return + } + repos, count, err := repo_model.SearchRepository(ctx, opts) if err != nil { - ctx.JSON(http.StatusInternalServerError, api.SearchError{ - OK: false, - Error: err.Error(), - }) + log.Error("SearchRepository: %v", err) + ctx.JSON(http.StatusInternalServerError, nil) return } ctx.SetTotalCountHeader(count) - // To improve performance when only the count is requested - if ctx.FormBool("count_only") { - return - } - latestCommitStatuses, err := commitstatus_service.FindReposLastestCommitStatuses(ctx, repos) if err != nil { log.Error("FindReposLastestCommitStatuses: %v", err) + ctx.JSON(http.StatusInternalServerError, nil) return } diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index 825803d939..6c1d031640 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -235,7 +235,7 @@ const sfc = { if (!this.reposTotalCount) { const totalCountSearchURL = `${this.subUrl}/repo/search?count_only=1&uid=${this.uid}&team_id=${this.teamId}&q=&page=1&mode=`; response = await GET(totalCountSearchURL); - this.reposTotalCount = response.headers.get('X-Total-Count'); + this.reposTotalCount = response.headers.get('X-Total-Count') ?? '?'; } response = await GET(searchedURL);