2014-04-13 11:27:42 +05:30
|
|
|
// Copyright 2014 The Gogs Authors. All rights reserved.
|
2019-02-08 22:15:43 +05:30
|
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
2022-11-27 23:50:29 +05:30
|
|
|
// SPDX-License-Identifier: MIT
|
2014-04-13 11:27:42 +05:30
|
|
|
|
|
|
|
package user
|
|
|
|
|
|
|
|
import (
|
2014-11-23 13:03:47 +05:30
|
|
|
"bytes"
|
2014-04-13 11:27:42 +05:30
|
|
|
"fmt"
|
2021-04-05 21:00:52 +05:30
|
|
|
"net/http"
|
2019-12-02 09:20:36 +05:30
|
|
|
"regexp"
|
2017-12-04 10:09:01 +05:30
|
|
|
"sort"
|
2019-12-02 09:20:36 +05:30
|
|
|
"strconv"
|
2019-01-23 09:40:38 +05:30
|
|
|
"strings"
|
2014-04-13 11:27:42 +05:30
|
|
|
|
2022-08-25 08:01:57 +05:30
|
|
|
activities_model "code.gitea.io/gitea/models/activities"
|
2021-12-10 13:44:24 +05:30
|
|
|
asymkey_model "code.gitea.io/gitea/models/asymkey"
|
2021-09-24 17:02:56 +05:30
|
|
|
"code.gitea.io/gitea/models/db"
|
2022-04-08 14:41:15 +05:30
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
2022-03-29 11:59:02 +05:30
|
|
|
"code.gitea.io/gitea/models/organization"
|
2021-12-10 06:57:50 +05:30
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
2021-11-10 01:27:58 +05:30
|
|
|
"code.gitea.io/gitea/models/unit"
|
2021-11-24 15:19:20 +05:30
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
2016-11-10 21:54:48 +05:30
|
|
|
"code.gitea.io/gitea/modules/base"
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
"code.gitea.io/gitea/modules/container"
|
2016-11-10 21:54:48 +05:30
|
|
|
"code.gitea.io/gitea/modules/context"
|
2020-02-29 12:22:05 +05:30
|
|
|
issue_indexer "code.gitea.io/gitea/modules/indexer/issues"
|
2021-07-24 21:33:58 +05:30
|
|
|
"code.gitea.io/gitea/modules/json"
|
2019-10-08 23:25:16 +05:30
|
|
|
"code.gitea.io/gitea/modules/log"
|
2021-04-20 03:55:08 +05:30
|
|
|
"code.gitea.io/gitea/modules/markup"
|
2019-12-15 19:50:08 +05:30
|
|
|
"code.gitea.io/gitea/modules/markup/markdown"
|
2016-11-10 21:54:48 +05:30
|
|
|
"code.gitea.io/gitea/modules/setting"
|
2017-01-25 08:13:02 +05:30
|
|
|
"code.gitea.io/gitea/modules/util"
|
2023-04-27 11:36:45 +05:30
|
|
|
"code.gitea.io/gitea/routers/web/feed"
|
|
|
|
context_service "code.gitea.io/gitea/services/context"
|
2020-05-15 04:25:43 +05:30
|
|
|
issue_service "code.gitea.io/gitea/services/issue"
|
2020-04-10 16:56:37 +05:30
|
|
|
pull_service "code.gitea.io/gitea/services/pull"
|
2017-12-26 04:55:16 +05:30
|
|
|
|
2019-04-14 22:13:56 +05:30
|
|
|
"github.com/keybase/go-crypto/openpgp"
|
|
|
|
"github.com/keybase/go-crypto/openpgp/armor"
|
2020-03-31 13:17:00 +05:30
|
|
|
"xorm.io/builder"
|
2014-04-13 11:27:42 +05:30
|
|
|
)
|
|
|
|
|
2014-06-23 08:41:12 +05:30
|
|
|
const (
|
2019-12-15 19:50:08 +05:30
|
|
|
tplDashboard base.TplName = "user/dashboard/dashboard"
|
|
|
|
tplIssues base.TplName = "user/dashboard/issues"
|
|
|
|
tplMilestones base.TplName = "user/dashboard/milestones"
|
|
|
|
tplProfile base.TplName = "user/profile"
|
2014-06-23 08:41:12 +05:30
|
|
|
)
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// getDashboardContextUser finds out which context user dashboard is being viewed as .
|
2021-11-24 15:19:20 +05:30
|
|
|
func getDashboardContextUser(ctx *context.Context) *user_model.User {
|
2022-03-22 12:33:22 +05:30
|
|
|
ctxUser := ctx.Doer
|
2014-07-27 09:23:16 +05:30
|
|
|
orgName := ctx.Params(":org")
|
|
|
|
if len(orgName) > 0 {
|
2021-11-19 17:11:40 +05:30
|
|
|
ctxUser = ctx.Org.Organization.AsUser()
|
|
|
|
ctx.Data["Teams"] = ctx.Org.Teams
|
2015-08-25 20:28:34 +05:30
|
|
|
}
|
|
|
|
ctx.Data["ContextUser"] = ctxUser
|
|
|
|
|
2022-08-25 08:01:57 +05:30
|
|
|
orgs, err := organization.GetUserOrgsList(ctx.Doer)
|
2021-06-14 17:48:09 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetUserOrgsList", err)
|
2015-08-25 20:28:34 +05:30
|
|
|
return nil
|
|
|
|
}
|
2021-06-14 17:48:09 +05:30
|
|
|
ctx.Data["Orgs"] = orgs
|
2015-08-25 20:28:34 +05:30
|
|
|
|
|
|
|
return ctxUser
|
|
|
|
}
|
|
|
|
|
2020-08-17 08:37:38 +05:30
|
|
|
// Dashboard render the dashboard page
|
2016-03-11 22:26:52 +05:30
|
|
|
func Dashboard(ctx *context.Context) {
|
2016-03-10 10:26:03 +05:30
|
|
|
ctxUser := getDashboardContextUser(ctx)
|
2015-08-25 20:28:34 +05:30
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2023-02-25 02:45:10 +05:30
|
|
|
var (
|
|
|
|
date = ctx.FormString("date")
|
|
|
|
page = ctx.FormInt("page")
|
|
|
|
)
|
|
|
|
|
|
|
|
// Make sure page number is at least 1. Will be posted to ctx.Data.
|
|
|
|
if page <= 1 {
|
|
|
|
page = 1
|
|
|
|
}
|
|
|
|
|
2016-07-23 22:38:22 +05:30
|
|
|
ctx.Data["Title"] = ctxUser.DisplayName() + " - " + ctx.Tr("dashboard")
|
|
|
|
ctx.Data["PageIsDashboard"] = true
|
|
|
|
ctx.Data["PageIsNews"] = true
|
2022-03-29 11:59:02 +05:30
|
|
|
cnt, _ := organization.GetOrganizationCount(ctx, ctxUser)
|
2021-11-22 20:51:55 +05:30
|
|
|
ctx.Data["UserOrgsCount"] = cnt
|
2022-06-04 17:12:17 +05:30
|
|
|
ctx.Data["MirrorsEnabled"] = setting.Mirror.Enabled
|
2023-02-25 02:45:10 +05:30
|
|
|
ctx.Data["Date"] = date
|
2021-10-15 08:05:26 +05:30
|
|
|
|
2021-10-19 10:08:33 +05:30
|
|
|
var uid int64
|
|
|
|
if ctxUser != nil {
|
|
|
|
uid = ctxUser.ID
|
|
|
|
}
|
|
|
|
|
2023-07-05 00:06:08 +05:30
|
|
|
ctx.PageData["dashboardRepoList"] = map[string]any{
|
2021-10-15 08:05:26 +05:30
|
|
|
"searchLimit": setting.UI.User.RepoPagingNum,
|
2021-10-19 10:08:33 +05:30
|
|
|
"uid": uid,
|
2021-10-15 08:05:26 +05:30
|
|
|
}
|
2020-12-28 01:28:03 +05:30
|
|
|
|
2021-03-05 04:29:13 +05:30
|
|
|
if setting.Service.EnableUserHeatmap {
|
2022-08-25 08:01:57 +05:30
|
|
|
data, err := activities_model.GetUserHeatmapDataByUserTeam(ctxUser, ctx.Org.Team, ctx.Doer)
|
2020-11-19 03:30:16 +05:30
|
|
|
if err != nil {
|
2020-12-28 01:28:03 +05:30
|
|
|
ctx.ServerError("GetUserHeatmapDataByUserTeam", err)
|
2020-11-19 03:30:16 +05:30
|
|
|
return
|
|
|
|
}
|
|
|
|
ctx.Data["HeatmapData"] = data
|
2023-04-17 23:56:01 +05:30
|
|
|
ctx.Data["HeatmapTotalContributions"] = activities_model.GetTotalContributionsInHeatmap(data)
|
2020-11-19 03:30:16 +05:30
|
|
|
}
|
2016-07-23 22:38:22 +05:30
|
|
|
|
2023-02-25 02:45:10 +05:30
|
|
|
feeds, count, err := activities_model.GetFeeds(ctx, activities_model.GetFeedsOptions{
|
2018-02-21 16:25:34 +05:30
|
|
|
RequestedUser: ctxUser,
|
2020-12-28 01:28:03 +05:30
|
|
|
RequestedTeam: ctx.Org.Team,
|
2022-03-22 12:33:22 +05:30
|
|
|
Actor: ctx.Doer,
|
2017-08-23 07:00:54 +05:30
|
|
|
IncludePrivate: true,
|
|
|
|
OnlyPerformedBy: false,
|
|
|
|
IncludeDeleted: false,
|
2021-08-11 06:01:13 +05:30
|
|
|
Date: ctx.FormString("date"),
|
2023-02-25 02:45:10 +05:30
|
|
|
ListOptions: db.ListOptions{
|
|
|
|
Page: page,
|
|
|
|
PageSize: setting.UI.FeedPagingNum,
|
|
|
|
},
|
2017-08-23 07:00:54 +05:30
|
|
|
})
|
2022-03-13 22:10:47 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetFeeds", err)
|
2014-04-13 11:27:42 +05:30
|
|
|
return
|
|
|
|
}
|
2021-10-16 19:51:16 +05:30
|
|
|
|
2023-02-25 02:45:10 +05:30
|
|
|
ctx.Data["Feeds"] = feeds
|
|
|
|
|
|
|
|
pager := context.NewPagination(int(count), setting.UI.FeedPagingNum, page, 5)
|
|
|
|
pager.AddParam(ctx, "date", "Date")
|
|
|
|
ctx.Data["Page"] = pager
|
|
|
|
|
2021-04-05 21:00:52 +05:30
|
|
|
ctx.HTML(http.StatusOK, tplDashboard)
|
2014-04-13 11:27:42 +05:30
|
|
|
}
|
|
|
|
|
2019-12-15 19:50:08 +05:30
|
|
|
// Milestones render the user milestones page
|
|
|
|
func Milestones(ctx *context.Context) {
|
2021-11-10 01:27:58 +05:30
|
|
|
if unit.TypeIssues.UnitGlobalDisabled() && unit.TypePullRequests.UnitGlobalDisabled() {
|
2020-01-17 13:04:37 +05:30
|
|
|
log.Debug("Milestones overview page not available as both issues and pull requests are globally disabled")
|
2022-03-23 10:24:07 +05:30
|
|
|
ctx.Status(http.StatusNotFound)
|
2020-01-17 13:04:37 +05:30
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-12-15 19:50:08 +05:30
|
|
|
ctx.Data["Title"] = ctx.Tr("milestones")
|
|
|
|
ctx.Data["PageIsMilestonesDashboard"] = true
|
|
|
|
|
|
|
|
ctxUser := getDashboardContextUser(ctx)
|
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2022-06-06 13:31:49 +05:30
|
|
|
repoOpts := repo_model.SearchRepoOptions{
|
2020-12-28 01:28:03 +05:30
|
|
|
Actor: ctxUser,
|
|
|
|
OwnerID: ctxUser.ID,
|
|
|
|
Private: true,
|
2022-06-05 00:00:01 +05:30
|
|
|
AllPublic: false, // Include also all public repositories of users and public organisations
|
|
|
|
AllLimited: false, // Include also all public repositories of limited organisations
|
|
|
|
Archived: util.OptionalBoolFalse,
|
2020-12-28 01:28:03 +05:30
|
|
|
HasMilestones: util.OptionalBoolTrue, // Just needs display repos has milestones
|
|
|
|
}
|
|
|
|
|
|
|
|
if ctxUser.IsOrganization() && ctx.Org.Team != nil {
|
|
|
|
repoOpts.TeamID = ctx.Org.Team.ID
|
|
|
|
}
|
2019-12-15 19:50:08 +05:30
|
|
|
|
2020-12-28 01:28:03 +05:30
|
|
|
var (
|
2022-06-06 13:31:49 +05:30
|
|
|
userRepoCond = repo_model.SearchRepositoryCondition(&repoOpts) // all repo condition user could visit
|
2020-03-31 13:17:00 +05:30
|
|
|
repoCond = userRepoCond
|
|
|
|
repoIDs []int64
|
2019-12-15 19:50:08 +05:30
|
|
|
|
2021-08-11 06:01:13 +05:30
|
|
|
reposQuery = ctx.FormString("repos")
|
|
|
|
isShowClosed = ctx.FormString("state") == "closed"
|
|
|
|
sortType = ctx.FormString("sort")
|
2021-07-29 07:12:15 +05:30
|
|
|
page = ctx.FormInt("page")
|
2021-08-11 20:38:52 +05:30
|
|
|
keyword = ctx.FormTrim("q")
|
2020-03-31 13:17:00 +05:30
|
|
|
)
|
|
|
|
|
|
|
|
if page <= 1 {
|
|
|
|
page = 1
|
2019-12-15 19:50:08 +05:30
|
|
|
}
|
|
|
|
|
2020-01-05 06:53:29 +05:30
|
|
|
if len(reposQuery) != 0 {
|
|
|
|
if issueReposQueryPattern.MatchString(reposQuery) {
|
|
|
|
// remove "[" and "]" from string
|
|
|
|
reposQuery = reposQuery[1 : len(reposQuery)-1]
|
2022-01-20 23:16:10 +05:30
|
|
|
// for each ID (delimiter ",") add to int to repoIDs
|
2020-03-31 13:17:00 +05:30
|
|
|
|
2020-01-05 06:53:29 +05:30
|
|
|
for _, rID := range strings.Split(reposQuery, ",") {
|
|
|
|
// Ensure nonempty string entries
|
|
|
|
if rID != "" && rID != "0" {
|
|
|
|
rIDint64, err := strconv.ParseInt(rID, 10, 64)
|
|
|
|
// If the repo id specified by query is not parseable or not accessible by user, just ignore it.
|
2020-03-31 13:17:00 +05:30
|
|
|
if err == nil {
|
2020-01-05 06:53:29 +05:30
|
|
|
repoIDs = append(repoIDs, rIDint64)
|
|
|
|
}
|
2019-12-15 19:50:08 +05:30
|
|
|
}
|
|
|
|
}
|
2020-03-31 13:17:00 +05:30
|
|
|
if len(repoIDs) > 0 {
|
|
|
|
// Don't just let repoCond = builder.In("id", repoIDs) because user may has no permission on repoIDs
|
|
|
|
// But the original repoCond has a limitation
|
|
|
|
repoCond = repoCond.And(builder.In("id", repoIDs))
|
2020-01-05 06:53:29 +05:30
|
|
|
}
|
|
|
|
} else {
|
|
|
|
log.Warn("issueReposQueryPattern not match with query")
|
2019-12-15 19:50:08 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-04-08 14:41:15 +05:30
|
|
|
counts, err := issues_model.CountMilestonesByRepoCondAndKw(userRepoCond, keyword, isShowClosed)
|
2019-12-15 19:50:08 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("CountMilestonesByRepoIDs", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2022-04-08 14:41:15 +05:30
|
|
|
milestones, err := issues_model.SearchMilestones(repoCond, page, isShowClosed, sortType, keyword)
|
2019-12-15 19:50:08 +05:30
|
|
|
if err != nil {
|
2021-04-08 17:23:59 +05:30
|
|
|
ctx.ServerError("SearchMilestones", err)
|
2019-12-15 19:50:08 +05:30
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2022-11-19 13:42:33 +05:30
|
|
|
showRepos, _, err := repo_model.SearchRepositoryByCondition(ctx, &repoOpts, userRepoCond, false)
|
2020-03-31 13:17:00 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("SearchRepositoryByCondition", err)
|
2019-12-15 19:50:08 +05:30
|
|
|
return
|
|
|
|
}
|
2020-03-31 13:17:00 +05:30
|
|
|
sort.Sort(showRepos)
|
2019-12-15 19:50:08 +05:30
|
|
|
|
2020-03-31 13:17:00 +05:30
|
|
|
for i := 0; i < len(milestones); {
|
|
|
|
for _, repo := range showRepos {
|
|
|
|
if milestones[i].RepoID == repo.ID {
|
|
|
|
milestones[i].Repo = repo
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if milestones[i].Repo == nil {
|
|
|
|
log.Warn("Cannot find milestone %d 's repository %d", milestones[i].ID, milestones[i].RepoID)
|
|
|
|
milestones = append(milestones[:i], milestones[i+1:]...)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2021-04-20 03:55:08 +05:30
|
|
|
milestones[i].RenderedContent, err = markdown.RenderString(&markup.RenderContext{
|
|
|
|
URLPrefix: milestones[i].Repo.Link(),
|
|
|
|
Metas: milestones[i].Repo.ComposeMetas(),
|
2021-08-29 01:45:56 +05:30
|
|
|
Ctx: ctx,
|
2021-04-20 03:55:08 +05:30
|
|
|
}, milestones[i].Content)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("RenderString", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2022-12-10 08:16:31 +05:30
|
|
|
if milestones[i].Repo.IsTimetrackerEnabled(ctx) {
|
2020-03-31 13:17:00 +05:30
|
|
|
err := milestones[i].LoadTotalTrackedTime()
|
2019-12-15 19:50:08 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("LoadTotalTrackedTime", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
2020-03-31 13:17:00 +05:30
|
|
|
i++
|
2019-12-15 19:50:08 +05:30
|
|
|
}
|
|
|
|
|
2022-04-08 14:41:15 +05:30
|
|
|
milestoneStats, err := issues_model.GetMilestonesStatsByRepoCondAndKw(repoCond, keyword)
|
2019-12-15 19:50:08 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetMilestoneStats", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2022-04-08 14:41:15 +05:30
|
|
|
var totalMilestoneStats *issues_model.MilestonesStats
|
2020-03-31 13:17:00 +05:30
|
|
|
if len(repoIDs) == 0 {
|
|
|
|
totalMilestoneStats = milestoneStats
|
|
|
|
} else {
|
2022-04-08 14:41:15 +05:30
|
|
|
totalMilestoneStats, err = issues_model.GetMilestonesStatsByRepoCondAndKw(userRepoCond, keyword)
|
2020-03-31 13:17:00 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetMilestoneStats", err)
|
|
|
|
return
|
|
|
|
}
|
2019-12-15 19:50:08 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
var pagerCount int
|
|
|
|
if isShowClosed {
|
|
|
|
ctx.Data["State"] = "closed"
|
|
|
|
ctx.Data["Total"] = totalMilestoneStats.ClosedCount
|
|
|
|
pagerCount = int(milestoneStats.ClosedCount)
|
|
|
|
} else {
|
|
|
|
ctx.Data["State"] = "open"
|
|
|
|
ctx.Data["Total"] = totalMilestoneStats.OpenCount
|
|
|
|
pagerCount = int(milestoneStats.OpenCount)
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx.Data["Milestones"] = milestones
|
|
|
|
ctx.Data["Repos"] = showRepos
|
|
|
|
ctx.Data["Counts"] = counts
|
|
|
|
ctx.Data["MilestoneStats"] = milestoneStats
|
|
|
|
ctx.Data["SortType"] = sortType
|
2021-04-08 17:23:59 +05:30
|
|
|
ctx.Data["Keyword"] = keyword
|
2020-03-31 13:17:00 +05:30
|
|
|
if milestoneStats.Total() != totalMilestoneStats.Total() {
|
2019-12-15 19:50:08 +05:30
|
|
|
ctx.Data["RepoIDs"] = repoIDs
|
|
|
|
}
|
|
|
|
ctx.Data["IsShowClosed"] = isShowClosed
|
|
|
|
|
|
|
|
pager := context.NewPagination(pagerCount, setting.UI.IssuePagingNum, page, 5)
|
2021-04-08 17:23:59 +05:30
|
|
|
pager.AddParam(ctx, "q", "Keyword")
|
2019-12-15 19:50:08 +05:30
|
|
|
pager.AddParam(ctx, "repos", "RepoIDs")
|
|
|
|
pager.AddParam(ctx, "sort", "SortType")
|
|
|
|
pager.AddParam(ctx, "state", "State")
|
|
|
|
ctx.Data["Page"] = pager
|
|
|
|
|
2021-04-05 21:00:52 +05:30
|
|
|
ctx.HTML(http.StatusOK, tplMilestones)
|
2019-12-15 19:50:08 +05:30
|
|
|
}
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// Pulls renders the user's pull request overview page
|
|
|
|
func Pulls(ctx *context.Context) {
|
2021-11-10 01:27:58 +05:30
|
|
|
if unit.TypePullRequests.UnitGlobalDisabled() {
|
2021-01-13 09:49:17 +05:30
|
|
|
log.Debug("Pull request overview page not available as it is globally disabled.")
|
2022-03-23 10:24:07 +05:30
|
|
|
ctx.Status(http.StatusNotFound)
|
2021-01-13 09:49:17 +05:30
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx.Data["Title"] = ctx.Tr("pull_requests")
|
|
|
|
ctx.Data["PageIsPulls"] = true
|
2022-08-22 18:21:48 +05:30
|
|
|
ctx.Data["SingleRepoAction"] = "pull"
|
2021-11-10 01:27:58 +05:30
|
|
|
buildIssueOverview(ctx, unit.TypePullRequests)
|
2021-01-13 09:49:17 +05:30
|
|
|
}
|
2019-12-02 09:20:36 +05:30
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// Issues renders the user's issues overview page
|
2016-03-11 22:26:52 +05:30
|
|
|
func Issues(ctx *context.Context) {
|
2021-11-10 01:27:58 +05:30
|
|
|
if unit.TypeIssues.UnitGlobalDisabled() {
|
2021-01-13 09:49:17 +05:30
|
|
|
log.Debug("Issues overview page not available as it is globally disabled.")
|
2022-03-23 10:24:07 +05:30
|
|
|
ctx.Status(http.StatusNotFound)
|
2021-01-13 09:49:17 +05:30
|
|
|
return
|
|
|
|
}
|
2020-01-17 13:04:37 +05:30
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
ctx.Data["Title"] = ctx.Tr("issues")
|
|
|
|
ctx.Data["PageIsIssues"] = true
|
2022-08-22 18:21:48 +05:30
|
|
|
ctx.Data["SingleRepoAction"] = "issue"
|
2021-11-10 01:27:58 +05:30
|
|
|
buildIssueOverview(ctx, unit.TypeIssues)
|
2021-01-13 09:49:17 +05:30
|
|
|
}
|
2020-01-17 13:04:37 +05:30
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// Regexp for repos query
|
|
|
|
var issueReposQueryPattern = regexp.MustCompile(`^\[\d+(,\d+)*,?\]$`)
|
|
|
|
|
2021-11-10 01:27:58 +05:30
|
|
|
func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
|
2021-01-13 09:49:17 +05:30
|
|
|
// ----------------------------------------------------
|
|
|
|
// Determine user; can be either user or organization.
|
|
|
|
// Return with NotFound or ServerError if unsuccessful.
|
|
|
|
// ----------------------------------------------------
|
2015-08-25 20:28:34 +05:30
|
|
|
|
|
|
|
ctxUser := getDashboardContextUser(ctx)
|
|
|
|
if ctx.Written() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
var (
|
|
|
|
viewType string
|
2021-08-11 06:01:13 +05:30
|
|
|
sortType = ctx.FormString("sort")
|
2022-03-24 04:27:09 +05:30
|
|
|
filterMode int
|
2015-08-25 20:28:34 +05:30
|
|
|
)
|
2017-02-14 19:45:18 +05:30
|
|
|
|
2023-02-17 12:43:35 +05:30
|
|
|
// Default to recently updated, unlike repository issues list
|
|
|
|
if sortType == "" {
|
|
|
|
sortType = "recentupdate"
|
|
|
|
}
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// --------------------------------------------------------------------------------
|
|
|
|
// Distinguish User from Organization.
|
|
|
|
// Org:
|
|
|
|
// - Remember pre-determined viewType string for later. Will be posted to ctx.Data.
|
|
|
|
// Organization does not have view type and filter mode.
|
|
|
|
// User:
|
2021-08-11 06:01:13 +05:30
|
|
|
// - Use ctx.FormString("type") to determine filterMode.
|
2021-01-13 09:49:17 +05:30
|
|
|
// The type is set when clicking for example "assigned to me" on the overview page.
|
|
|
|
// - Remember either this or a fallback. Will be posted to ctx.Data.
|
|
|
|
// --------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
// TODO: distinguish during routing
|
|
|
|
|
2021-08-11 06:01:13 +05:30
|
|
|
viewType = ctx.FormString("type")
|
2021-01-03 22:59:12 +05:30
|
|
|
switch viewType {
|
|
|
|
case "assigned":
|
2022-06-13 15:07:59 +05:30
|
|
|
filterMode = issues_model.FilterModeAssign
|
2021-01-03 22:59:12 +05:30
|
|
|
case "created_by":
|
2022-06-13 15:07:59 +05:30
|
|
|
filterMode = issues_model.FilterModeCreate
|
2021-01-03 22:59:12 +05:30
|
|
|
case "mentioned":
|
2022-06-13 15:07:59 +05:30
|
|
|
filterMode = issues_model.FilterModeMention
|
2021-01-17 22:04:19 +05:30
|
|
|
case "review_requested":
|
2022-06-13 15:07:59 +05:30
|
|
|
filterMode = issues_model.FilterModeReviewRequested
|
2023-02-25 08:25:50 +05:30
|
|
|
case "reviewed_by":
|
|
|
|
filterMode = issues_model.FilterModeReviewed
|
2022-03-24 04:27:09 +05:30
|
|
|
case "your_repositories":
|
|
|
|
fallthrough
|
2021-01-03 22:59:12 +05:30
|
|
|
default:
|
2022-06-13 15:07:59 +05:30
|
|
|
filterMode = issues_model.FilterModeYourRepositories
|
2019-12-03 11:31:29 +05:30
|
|
|
viewType = "your_repositories"
|
2015-08-25 20:28:34 +05:30
|
|
|
}
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// --------------------------------------------------------------------------
|
|
|
|
// Build opts (IssuesOptions), which contains filter information.
|
|
|
|
// Will eventually be used to retrieve issues relevant for the overview page.
|
|
|
|
// Note: Non-final states of opts are used in-between, namely for:
|
|
|
|
// - Keyword search
|
|
|
|
// - Count Issues by repo
|
|
|
|
// --------------------------------------------------------------------------
|
2017-02-14 19:45:18 +05:30
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// Get repository IDs where User/Org/Team has access.
|
2022-03-29 11:59:02 +05:30
|
|
|
var team *organization.Team
|
|
|
|
var org *organization.Organization
|
2021-01-13 09:49:17 +05:30
|
|
|
if ctx.Org != nil {
|
2021-12-29 18:32:12 +05:30
|
|
|
org = ctx.Org.Organization
|
2021-01-13 09:49:17 +05:30
|
|
|
team = ctx.Org.Team
|
2017-02-17 06:28:19 +05:30
|
|
|
}
|
2021-12-29 18:32:12 +05:30
|
|
|
|
|
|
|
isPullList := unitType == unit.TypePullRequests
|
2022-06-13 15:07:59 +05:30
|
|
|
opts := &issues_model.IssuesOptions{
|
2021-12-29 18:32:12 +05:30
|
|
|
IsPull: util.OptionalBoolOf(isPullList),
|
|
|
|
SortType: sortType,
|
|
|
|
IsArchived: util.OptionalBoolFalse,
|
|
|
|
Org: org,
|
|
|
|
Team: team,
|
2022-03-22 12:33:22 +05:30
|
|
|
User: ctx.Doer,
|
2019-10-08 23:25:16 +05:30
|
|
|
}
|
|
|
|
|
2022-03-24 04:27:09 +05:30
|
|
|
// Search all repositories which
|
|
|
|
//
|
|
|
|
// As user:
|
|
|
|
// - Owns the repository.
|
|
|
|
// - Have collaborator permissions in repository.
|
|
|
|
//
|
|
|
|
// As org:
|
|
|
|
// - Owns the repository.
|
|
|
|
//
|
|
|
|
// As team:
|
|
|
|
// - Team org's owns the repository.
|
|
|
|
// - Team has read permission to repository.
|
2022-06-06 13:31:49 +05:30
|
|
|
repoOpts := &repo_model.SearchRepoOptions{
|
2022-03-24 04:27:09 +05:30
|
|
|
Actor: ctx.Doer,
|
|
|
|
OwnerID: ctx.Doer.ID,
|
|
|
|
Private: true,
|
|
|
|
AllPublic: false,
|
|
|
|
AllLimited: false,
|
|
|
|
}
|
|
|
|
|
2022-05-16 15:19:17 +05:30
|
|
|
if team != nil {
|
|
|
|
repoOpts.TeamID = team.ID
|
2022-03-24 04:27:09 +05:30
|
|
|
}
|
|
|
|
|
2017-02-14 19:45:18 +05:30
|
|
|
switch filterMode {
|
2022-06-13 15:07:59 +05:30
|
|
|
case issues_model.FilterModeAll:
|
|
|
|
case issues_model.FilterModeYourRepositories:
|
|
|
|
case issues_model.FilterModeAssign:
|
2022-03-22 12:33:22 +05:30
|
|
|
opts.AssigneeID = ctx.Doer.ID
|
2022-06-13 15:07:59 +05:30
|
|
|
case issues_model.FilterModeCreate:
|
2022-03-22 12:33:22 +05:30
|
|
|
opts.PosterID = ctx.Doer.ID
|
2022-06-13 15:07:59 +05:30
|
|
|
case issues_model.FilterModeMention:
|
2022-03-22 12:33:22 +05:30
|
|
|
opts.MentionedID = ctx.Doer.ID
|
2022-06-13 15:07:59 +05:30
|
|
|
case issues_model.FilterModeReviewRequested:
|
2022-03-22 12:33:22 +05:30
|
|
|
opts.ReviewRequestedID = ctx.Doer.ID
|
2023-02-25 08:25:50 +05:30
|
|
|
case issues_model.FilterModeReviewed:
|
|
|
|
opts.ReviewedID = ctx.Doer.ID
|
2021-01-03 22:59:12 +05:30
|
|
|
}
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// keyword holds the search term entered into the search field.
|
2021-08-11 06:01:13 +05:30
|
|
|
keyword := strings.Trim(ctx.FormString("q"), " ")
|
2021-01-13 09:49:17 +05:30
|
|
|
ctx.Data["Keyword"] = keyword
|
2020-02-29 12:22:05 +05:30
|
|
|
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
accessibleRepos := container.Set[int64]{}
|
|
|
|
{
|
|
|
|
ids, err := issues_model.GetRepoIDsForIssuesOptions(opts, ctxUser)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetRepoIDsForIssuesOptions", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
for _, id := range ids {
|
|
|
|
accessibleRepos.Add(id)
|
|
|
|
}
|
2021-01-13 09:49:17 +05:30
|
|
|
}
|
2020-02-29 12:22:05 +05:30
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// Educated guess: Do or don't show closed issues.
|
2021-08-11 06:01:13 +05:30
|
|
|
isShowClosed := ctx.FormString("state") == "closed"
|
2020-02-29 12:22:05 +05:30
|
|
|
opts.IsClosed = util.OptionalBoolOf(isShowClosed)
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// Filter repos and count issues in them. Count will be used later.
|
|
|
|
// USING NON-FINAL STATE OF opts FOR A QUERY.
|
|
|
|
var issueCountByRepo map[int64]int64
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
{
|
|
|
|
issueIDs, err := issueIDsFromSearch(ctx, keyword, opts)
|
2020-02-29 12:22:05 +05:30
|
|
|
if err != nil {
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
ctx.ServerError("issueIDsFromSearch", err)
|
2020-02-29 12:22:05 +05:30
|
|
|
return
|
|
|
|
}
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
if len(issueIDs) > 0 { // else, no issues found, just leave issueCountByRepo empty
|
|
|
|
opts.IssueIDs = issueIDs
|
|
|
|
issueCountByRepo, err = issues_model.CountIssuesByRepo(ctx, opts)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("CountIssuesByRepo", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
opts.IssueIDs = nil // reset, the opts will be used later
|
|
|
|
}
|
2019-10-08 23:25:16 +05:30
|
|
|
}
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// Make sure page number is at least 1. Will be posted to ctx.Data.
|
2021-07-29 07:12:15 +05:30
|
|
|
page := ctx.FormInt("page")
|
2021-01-13 09:49:17 +05:30
|
|
|
if page <= 1 {
|
|
|
|
page = 1
|
|
|
|
}
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
opts.Paginator = &db.ListOptions{
|
|
|
|
Page: page,
|
|
|
|
PageSize: setting.UI.IssuePagingNum,
|
|
|
|
}
|
2021-01-13 09:49:17 +05:30
|
|
|
|
|
|
|
// Get IDs for labels (a filter option for issues/pulls).
|
|
|
|
// Required for IssuesOptions.
|
2019-01-23 09:40:38 +05:30
|
|
|
var labelIDs []int64
|
2021-08-11 06:01:13 +05:30
|
|
|
selectedLabels := ctx.FormString("labels")
|
2021-01-13 09:49:17 +05:30
|
|
|
if len(selectedLabels) > 0 && selectedLabels != "0" {
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
var err error
|
2021-01-13 09:49:17 +05:30
|
|
|
labelIDs, err = base.StringsToInt64s(strings.Split(selectedLabels, ","))
|
2019-01-23 09:40:38 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("StringsToInt64s", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
opts.LabelIDs = labelIDs
|
2018-10-28 12:25:01 +05:30
|
|
|
|
2021-08-11 06:01:13 +05:30
|
|
|
// Parse ctx.FormString("repos") and remember matched repo IDs for later.
|
2021-01-13 09:49:17 +05:30
|
|
|
// Gets set when clicking filters on the issues overview page.
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
repoIDs := getRepoIDs(ctx.FormString("repos"))
|
|
|
|
if len(repoIDs) == 0 {
|
|
|
|
repoIDs = accessibleRepos.Values()
|
|
|
|
} else {
|
|
|
|
// Remove repo IDs that are not accessible to the user.
|
|
|
|
repoIDs = util.SliceRemoveAllFunc(repoIDs, func(v int64) bool {
|
|
|
|
return !accessibleRepos.Contains(v)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
opts.RepoIDs = repoIDs
|
2019-12-02 09:20:36 +05:30
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// ------------------------------
|
|
|
|
// Get issues as defined by opts.
|
|
|
|
// ------------------------------
|
|
|
|
|
|
|
|
// Slice of Issues that will be displayed on the overview page
|
|
|
|
// USING FINAL STATE OF opts FOR A QUERY.
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
var issues issues_model.IssueList
|
|
|
|
{
|
|
|
|
issueIDs, err := issueIDsFromSearch(ctx, keyword, opts)
|
2020-02-29 12:22:05 +05:30
|
|
|
if err != nil {
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
ctx.ServerError("issueIDsFromSearch", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
issues, err = issues_model.GetIssuesByIDs(ctx, issueIDs, true)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetIssuesByIDs", err)
|
2020-02-29 12:22:05 +05:30
|
|
|
return
|
|
|
|
}
|
2017-02-17 06:28:19 +05:30
|
|
|
}
|
2015-09-03 01:48:09 +05:30
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// ----------------------------------
|
|
|
|
// Add repository pointers to Issues.
|
|
|
|
// ----------------------------------
|
2019-10-08 23:25:16 +05:30
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// showReposMap maps repository IDs to their Repository pointers.
|
2021-12-29 18:32:12 +05:30
|
|
|
showReposMap, err := loadRepoByIDs(ctxUser, issueCountByRepo, unitType)
|
2021-01-13 09:49:17 +05:30
|
|
|
if err != nil {
|
2021-12-10 06:57:50 +05:30
|
|
|
if repo_model.IsErrRepoNotExist(err) {
|
2021-01-13 09:49:17 +05:30
|
|
|
ctx.NotFound("GetRepositoryByID", err)
|
|
|
|
return
|
2019-10-08 23:25:16 +05:30
|
|
|
}
|
2021-12-29 18:32:12 +05:30
|
|
|
ctx.ServerError("loadRepoByIDs", err)
|
2021-01-13 09:49:17 +05:30
|
|
|
return
|
2019-10-08 23:25:16 +05:30
|
|
|
}
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// a RepositoryList
|
2022-06-06 13:31:49 +05:30
|
|
|
showRepos := repo_model.RepositoryListOfMap(showReposMap)
|
2017-12-04 10:09:01 +05:30
|
|
|
sort.Sort(showRepos)
|
2015-08-25 20:52:05 +05:30
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// maps pull request IDs to their CommitStatus. Will be posted to ctx.Data.
|
2017-08-03 10:39:16 +05:30
|
|
|
for _, issue := range issues {
|
2021-12-29 18:32:12 +05:30
|
|
|
if issue.Repo == nil {
|
|
|
|
issue.Repo = showReposMap[issue.RepoID]
|
|
|
|
}
|
2021-04-15 23:04:43 +05:30
|
|
|
}
|
2019-04-03 01:24:29 +05:30
|
|
|
|
2022-04-27 04:10:01 +05:30
|
|
|
commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, issues)
|
2021-04-15 23:04:43 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetIssuesLastCommitStatus", err)
|
|
|
|
return
|
2017-08-03 10:39:16 +05:30
|
|
|
}
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// -------------------------------
|
|
|
|
// Fill stats to post to ctx.Data.
|
|
|
|
// -------------------------------
|
2022-06-13 15:07:59 +05:30
|
|
|
var issueStats *issues_model.IssueStats
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
{
|
2023-05-19 19:47:48 +05:30
|
|
|
statsOpts := issues_model.IssuesOptions{
|
|
|
|
User: ctx.Doer,
|
|
|
|
IsPull: util.OptionalBoolOf(isPullList),
|
|
|
|
IsClosed: util.OptionalBoolOf(isShowClosed),
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
IssueIDs: nil,
|
2021-12-29 18:32:12 +05:30
|
|
|
IsArchived: util.OptionalBoolFalse,
|
|
|
|
LabelIDs: opts.LabelIDs,
|
|
|
|
Org: org,
|
|
|
|
Team: team,
|
2022-07-24 22:23:40 +05:30
|
|
|
RepoCond: opts.RepoCond,
|
2020-02-29 12:22:05 +05:30
|
|
|
}
|
2022-05-16 15:19:17 +05:30
|
|
|
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
if keyword != "" {
|
|
|
|
statsOpts.RepoIDs = opts.RepoIDs
|
|
|
|
allIssueIDs, err := issueIDsFromSearch(ctx, keyword, &statsOpts)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("issueIDsFromSearch", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
statsOpts.IssueIDs = allIssueIDs
|
|
|
|
}
|
|
|
|
|
|
|
|
if keyword != "" && len(statsOpts.IssueIDs) == 0 {
|
|
|
|
// So it did search with the keyword, but no issue found.
|
|
|
|
// Just set issueStats to empty.
|
|
|
|
issueStats = &issues_model.IssueStats{}
|
|
|
|
} else {
|
|
|
|
// So it did search with the keyword, and found some issues. It needs to get issueStats of these issues.
|
|
|
|
// Or the keyword is empty, so it doesn't need issueIDs as filter, just get issueStats with statsOpts.
|
|
|
|
issueStats, err = issues_model.GetUserIssueStats(filterMode, statsOpts)
|
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("GetUserIssueStats", err)
|
|
|
|
return
|
|
|
|
}
|
2020-02-29 12:22:05 +05:30
|
|
|
}
|
2019-12-02 09:20:36 +05:30
|
|
|
}
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
// Will be posted to ctx.Data.
|
2019-12-02 09:20:36 +05:30
|
|
|
var shownIssues int
|
2015-08-25 20:52:05 +05:30
|
|
|
if !isShowClosed {
|
2021-12-29 18:32:12 +05:30
|
|
|
shownIssues = int(issueStats.OpenCount)
|
2015-08-25 20:52:05 +05:30
|
|
|
} else {
|
2021-12-29 18:32:12 +05:30
|
|
|
shownIssues = int(issueStats.ClosedCount)
|
2015-08-25 20:52:05 +05:30
|
|
|
}
|
2023-05-19 19:47:48 +05:30
|
|
|
if len(opts.RepoIDs) != 0 {
|
2022-06-05 01:42:14 +05:30
|
|
|
shownIssues = 0
|
2023-05-19 19:47:48 +05:30
|
|
|
for _, repoID := range opts.RepoIDs {
|
2022-06-05 01:42:14 +05:30
|
|
|
shownIssues += int(issueCountByRepo[repoID])
|
|
|
|
}
|
|
|
|
}
|
2022-08-17 18:43:41 +05:30
|
|
|
|
|
|
|
var allIssueCount int64
|
|
|
|
for _, issueCount := range issueCountByRepo {
|
|
|
|
allIssueCount += issueCount
|
|
|
|
}
|
|
|
|
ctx.Data["TotalIssueCount"] = allIssueCount
|
|
|
|
|
2023-05-19 19:47:48 +05:30
|
|
|
if len(opts.RepoIDs) == 1 {
|
|
|
|
repo := showReposMap[opts.RepoIDs[0]]
|
2022-08-09 17:00:09 +05:30
|
|
|
if repo != nil {
|
|
|
|
ctx.Data["SingleRepoLink"] = repo.Link()
|
|
|
|
}
|
|
|
|
}
|
2015-08-25 20:52:05 +05:30
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
ctx.Data["IsShowClosed"] = isShowClosed
|
|
|
|
|
2022-01-20 23:16:10 +05:30
|
|
|
ctx.Data["IssueRefEndNames"], ctx.Data["IssueRefURLs"] = issue_service.GetRefEndNamesAndURLs(issues, ctx.FormString("RepoLink"))
|
2020-05-15 04:25:43 +05:30
|
|
|
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
if err := issues.LoadAttributes(ctx); err != nil {
|
|
|
|
ctx.ServerError("issues.LoadAttributes", err)
|
|
|
|
return
|
|
|
|
}
|
2015-08-25 20:28:34 +05:30
|
|
|
ctx.Data["Issues"] = issues
|
2021-01-13 09:49:17 +05:30
|
|
|
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
approvalCounts, err := issues.GetApprovalCounts(ctx)
|
2021-01-13 09:49:17 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("ApprovalCounts", err)
|
|
|
|
return
|
|
|
|
}
|
2020-03-06 09:14:06 +05:30
|
|
|
ctx.Data["ApprovalCounts"] = func(issueID int64, typ string) int64 {
|
|
|
|
counts, ok := approvalCounts[issueID]
|
|
|
|
if !ok || len(counts) == 0 {
|
|
|
|
return 0
|
|
|
|
}
|
2022-06-13 15:07:59 +05:30
|
|
|
reviewTyp := issues_model.ReviewTypeApprove
|
2020-03-06 09:14:06 +05:30
|
|
|
if typ == "reject" {
|
2022-06-13 15:07:59 +05:30
|
|
|
reviewTyp = issues_model.ReviewTypeReject
|
2020-04-06 22:03:34 +05:30
|
|
|
} else if typ == "waiting" {
|
2022-06-13 15:07:59 +05:30
|
|
|
reviewTyp = issues_model.ReviewTypeRequest
|
2020-03-06 09:14:06 +05:30
|
|
|
}
|
|
|
|
for _, count := range counts {
|
|
|
|
if count.Type == reviewTyp {
|
|
|
|
return count.Count
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0
|
|
|
|
}
|
2022-04-27 04:10:01 +05:30
|
|
|
ctx.Data["CommitLastStatus"] = lastStatus
|
|
|
|
ctx.Data["CommitStatuses"] = commitStatuses
|
2017-02-14 19:45:18 +05:30
|
|
|
ctx.Data["Repos"] = showRepos
|
2021-01-13 09:49:17 +05:30
|
|
|
ctx.Data["Counts"] = issueCountByRepo
|
2021-12-29 18:32:12 +05:30
|
|
|
ctx.Data["IssueStats"] = issueStats
|
2015-08-25 20:28:34 +05:30
|
|
|
ctx.Data["ViewType"] = viewType
|
2015-11-04 23:20:02 +05:30
|
|
|
ctx.Data["SortType"] = sortType
|
2023-05-19 19:47:48 +05:30
|
|
|
ctx.Data["RepoIDs"] = opts.RepoIDs
|
2015-08-25 20:28:34 +05:30
|
|
|
ctx.Data["IsShowClosed"] = isShowClosed
|
2021-01-13 09:49:17 +05:30
|
|
|
ctx.Data["SelectLabels"] = selectedLabels
|
2017-02-14 19:45:18 +05:30
|
|
|
|
2015-08-25 20:28:34 +05:30
|
|
|
if isShowClosed {
|
|
|
|
ctx.Data["State"] = "closed"
|
|
|
|
} else {
|
|
|
|
ctx.Data["State"] = "open"
|
|
|
|
}
|
|
|
|
|
2019-12-02 09:20:36 +05:30
|
|
|
// Convert []int64 to string
|
2023-05-19 19:47:48 +05:30
|
|
|
reposParam, _ := json.Marshal(opts.RepoIDs)
|
2019-12-02 09:20:36 +05:30
|
|
|
|
|
|
|
ctx.Data["ReposParam"] = string(reposParam)
|
|
|
|
|
|
|
|
pager := context.NewPagination(shownIssues, setting.UI.IssuePagingNum, page, 5)
|
2020-02-29 12:22:05 +05:30
|
|
|
pager.AddParam(ctx, "q", "Keyword")
|
2019-04-20 09:45:19 +05:30
|
|
|
pager.AddParam(ctx, "type", "ViewType")
|
2019-12-02 09:20:36 +05:30
|
|
|
pager.AddParam(ctx, "repos", "ReposParam")
|
2019-04-20 09:45:19 +05:30
|
|
|
pager.AddParam(ctx, "sort", "SortType")
|
|
|
|
pager.AddParam(ctx, "state", "State")
|
|
|
|
pager.AddParam(ctx, "labels", "SelectLabels")
|
|
|
|
pager.AddParam(ctx, "milestone", "MilestoneID")
|
|
|
|
pager.AddParam(ctx, "assignee", "AssigneeID")
|
|
|
|
ctx.Data["Page"] = pager
|
|
|
|
|
2021-04-05 21:00:52 +05:30
|
|
|
ctx.HTML(http.StatusOK, tplIssues)
|
2015-08-25 20:28:34 +05:30
|
|
|
}
|
|
|
|
|
2021-01-13 09:49:17 +05:30
|
|
|
func getRepoIDs(reposQuery string) []int64 {
|
2021-03-12 08:36:33 +05:30
|
|
|
if len(reposQuery) == 0 || reposQuery == "[]" {
|
2021-01-13 09:49:17 +05:30
|
|
|
return []int64{}
|
|
|
|
}
|
|
|
|
if !issueReposQueryPattern.MatchString(reposQuery) {
|
|
|
|
log.Warn("issueReposQueryPattern does not match query")
|
|
|
|
return []int64{}
|
|
|
|
}
|
|
|
|
|
|
|
|
var repoIDs []int64
|
|
|
|
// remove "[" and "]" from string
|
|
|
|
reposQuery = reposQuery[1 : len(reposQuery)-1]
|
2022-01-20 23:16:10 +05:30
|
|
|
// for each ID (delimiter ",") add to int to repoIDs
|
2021-01-13 09:49:17 +05:30
|
|
|
for _, rID := range strings.Split(reposQuery, ",") {
|
|
|
|
// Ensure nonempty string entries
|
|
|
|
if rID != "" && rID != "0" {
|
|
|
|
rIDint64, err := strconv.ParseInt(rID, 10, 64)
|
|
|
|
if err == nil {
|
|
|
|
repoIDs = append(repoIDs, rIDint64)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return repoIDs
|
|
|
|
}
|
|
|
|
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
func issueIDsFromSearch(ctx *context.Context, keyword string, opts *issues_model.IssuesOptions) ([]int64, error) {
|
|
|
|
ids, _, err := issue_indexer.SearchIssues(ctx, issue_indexer.ToSearchOptions(keyword, opts))
|
2021-01-13 09:49:17 +05:30
|
|
|
if err != nil {
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
return nil, fmt.Errorf("SearchIssues: %w", err)
|
2021-01-13 09:49:17 +05:30
|
|
|
}
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
return ids, nil
|
2021-01-13 09:49:17 +05:30
|
|
|
}
|
|
|
|
|
2021-12-29 18:32:12 +05:30
|
|
|
func loadRepoByIDs(ctxUser *user_model.User, issueCountByRepo map[int64]int64, unitType unit.Type) (map[int64]*repo_model.Repository, error) {
|
2022-01-20 23:16:10 +05:30
|
|
|
totalRes := make(map[int64]*repo_model.Repository, len(issueCountByRepo))
|
|
|
|
repoIDs := make([]int64, 0, 500)
|
2021-01-13 09:49:17 +05:30
|
|
|
for id := range issueCountByRepo {
|
|
|
|
if id <= 0 {
|
|
|
|
continue
|
|
|
|
}
|
2021-12-29 18:32:12 +05:30
|
|
|
repoIDs = append(repoIDs, id)
|
|
|
|
if len(repoIDs) == 500 {
|
|
|
|
if err := repo_model.FindReposMapByIDs(repoIDs, totalRes); err != nil {
|
2021-01-13 09:49:17 +05:30
|
|
|
return nil, err
|
|
|
|
}
|
2021-12-29 18:32:12 +05:30
|
|
|
repoIDs = repoIDs[:0]
|
2021-01-13 09:49:17 +05:30
|
|
|
}
|
2021-12-29 18:32:12 +05:30
|
|
|
}
|
|
|
|
if len(repoIDs) > 0 {
|
|
|
|
if err := repo_model.FindReposMapByIDs(repoIDs, totalRes); err != nil {
|
|
|
|
return nil, err
|
2021-01-13 09:49:17 +05:30
|
|
|
}
|
|
|
|
}
|
2021-12-29 18:32:12 +05:30
|
|
|
return totalRes, nil
|
2021-01-13 09:49:17 +05:30
|
|
|
}
|
|
|
|
|
2016-11-27 17:29:12 +05:30
|
|
|
// ShowSSHKeys output all the ssh keys of user by uid
|
2022-03-26 14:34:22 +05:30
|
|
|
func ShowSSHKeys(ctx *context.Context) {
|
|
|
|
keys, err := asymkey_model.ListPublicKeys(ctx.ContextUser.ID, db.ListOptions{})
|
2014-11-23 13:03:47 +05:30
|
|
|
if err != nil {
|
2018-01-11 03:04:17 +05:30
|
|
|
ctx.ServerError("ListPublicKeys", err)
|
2014-11-23 13:03:47 +05:30
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
var buf bytes.Buffer
|
|
|
|
for i := range keys {
|
|
|
|
buf.WriteString(keys[i].OmitEmail())
|
2015-06-08 13:10:38 +05:30
|
|
|
buf.WriteString("\n")
|
2014-11-23 13:03:47 +05:30
|
|
|
}
|
2021-12-15 12:29:57 +05:30
|
|
|
ctx.PlainTextBytes(http.StatusOK, buf.Bytes())
|
2014-11-23 13:03:47 +05:30
|
|
|
}
|
|
|
|
|
2019-04-14 22:13:56 +05:30
|
|
|
// ShowGPGKeys output all the public GPG keys of user by uid
|
2022-03-26 14:34:22 +05:30
|
|
|
func ShowGPGKeys(ctx *context.Context) {
|
|
|
|
keys, err := asymkey_model.ListGPGKeys(ctx, ctx.ContextUser.ID, db.ListOptions{})
|
2019-04-14 22:13:56 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("ListGPGKeys", err)
|
|
|
|
return
|
|
|
|
}
|
2022-03-02 22:02:18 +05:30
|
|
|
|
2019-04-14 22:13:56 +05:30
|
|
|
entities := make([]*openpgp.Entity, 0)
|
|
|
|
failedEntitiesID := make([]string, 0)
|
|
|
|
for _, k := range keys {
|
2021-12-10 13:44:24 +05:30
|
|
|
e, err := asymkey_model.GPGKeyToEntity(k)
|
2019-04-14 22:13:56 +05:30
|
|
|
if err != nil {
|
2021-12-10 13:44:24 +05:30
|
|
|
if asymkey_model.IsErrGPGKeyImportNotExist(err) {
|
2019-04-14 22:13:56 +05:30
|
|
|
failedEntitiesID = append(failedEntitiesID, k.KeyID)
|
2022-01-20 23:16:10 +05:30
|
|
|
continue // Skip previous import without backup of imported armored key
|
2019-04-14 22:13:56 +05:30
|
|
|
}
|
|
|
|
ctx.ServerError("ShowGPGKeys", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
entities = append(entities, e)
|
|
|
|
}
|
|
|
|
var buf bytes.Buffer
|
|
|
|
|
|
|
|
headers := make(map[string]string)
|
2022-01-20 23:16:10 +05:30
|
|
|
if len(failedEntitiesID) > 0 { // If some key need re-import to be exported
|
2019-04-14 22:13:56 +05:30
|
|
|
headers["Note"] = fmt.Sprintf("The keys with the following IDs couldn't be exported and need to be reuploaded %s", strings.Join(failedEntitiesID, ", "))
|
2022-03-02 22:02:18 +05:30
|
|
|
} else if len(entities) == 0 {
|
|
|
|
headers["Note"] = "This user hasn't uploaded any GPG keys."
|
2019-04-14 22:13:56 +05:30
|
|
|
}
|
|
|
|
writer, _ := armor.Encode(&buf, "PGP PUBLIC KEY BLOCK", headers)
|
|
|
|
for _, e := range entities {
|
2022-01-20 23:16:10 +05:30
|
|
|
err = e.Serialize(writer) // TODO find why key are exported with a different cipherTypeByte as original (should not be blocking but strange)
|
2019-04-14 22:13:56 +05:30
|
|
|
if err != nil {
|
|
|
|
ctx.ServerError("ShowGPGKeys", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
writer.Close()
|
2021-12-15 12:29:57 +05:30
|
|
|
ctx.PlainTextBytes(http.StatusOK, buf.Bytes())
|
2019-04-14 22:13:56 +05:30
|
|
|
}
|
2023-04-27 11:36:45 +05:30
|
|
|
|
|
|
|
func UsernameSubRoute(ctx *context.Context) {
|
|
|
|
// WORKAROUND to support usernames with "." in it
|
|
|
|
// https://github.com/go-chi/chi/issues/781
|
|
|
|
username := ctx.Params("username")
|
|
|
|
reloadParam := func(suffix string) (success bool) {
|
|
|
|
ctx.SetParams("username", strings.TrimSuffix(username, suffix))
|
|
|
|
context_service.UserAssignmentWeb()(ctx)
|
|
|
|
return !ctx.Written()
|
|
|
|
}
|
|
|
|
switch {
|
|
|
|
case strings.HasSuffix(username, ".png"):
|
|
|
|
if reloadParam(".png") {
|
|
|
|
AvatarByUserName(ctx)
|
|
|
|
}
|
|
|
|
case strings.HasSuffix(username, ".keys"):
|
|
|
|
if reloadParam(".keys") {
|
|
|
|
ShowSSHKeys(ctx)
|
|
|
|
}
|
|
|
|
case strings.HasSuffix(username, ".gpg"):
|
|
|
|
if reloadParam(".gpg") {
|
|
|
|
ShowGPGKeys(ctx)
|
|
|
|
}
|
|
|
|
case strings.HasSuffix(username, ".rss"):
|
|
|
|
if !setting.Other.EnableFeed {
|
|
|
|
ctx.Error(http.StatusNotFound)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if reloadParam(".rss") {
|
|
|
|
context_service.UserAssignmentWeb()(ctx)
|
|
|
|
feed.ShowUserFeedRSS(ctx)
|
|
|
|
}
|
|
|
|
case strings.HasSuffix(username, ".atom"):
|
|
|
|
if !setting.Other.EnableFeed {
|
|
|
|
ctx.Error(http.StatusNotFound)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if reloadParam(".atom") {
|
|
|
|
feed.ShowUserFeedAtom(ctx)
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
context_service.UserAssignmentWeb()(ctx)
|
|
|
|
if !ctx.Written() {
|
|
|
|
ctx.Data["EnableFeed"] = setting.Other.EnableFeed
|
2023-07-07 00:29:24 +05:30
|
|
|
OwnerProfile(ctx)
|
2023-04-27 11:36:45 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|