lewis.moe
Monorepo for Tangled
appview/issues: fix search not updating count of open/closed issues
searching for issues did not previously update open/closed issue counts
https://tangled.org/tangled.org/core/issues/400.
Signed-off-by: pdewey.com <p@pdewey.com>
authored by
Patrick Dewey
and committed by
+18
-1
appview/issues/issues.go
+18
-1
appview/issues/issues.go
···
822
823
keyword := params.Get("q")
824
825
var issues []models.Issue
826
searchOpts := models.IssueSearchOptions{
827
Keyword: keyword,
···
837
}
838
l.Debug("searched issues with indexer", "count", len(res.Hits))
839
totalIssues = int(res.Total)
840
841
issues, err = db.GetIssues(
842
rp.db,
···
884
885
rp.pages.RepoIssues(w, pages.RepoIssuesParams{
886
LoggedInUser: rp.oauth.GetMultiAccountUser(r),
887
-
RepoInfo: rp.repoResolver.GetRepoInfo(r, user),
888
Issues: issues,
889
IssueCount: totalIssues,
890
LabelDefs: defs,
···
822
823
keyword := params.Get("q")
824
825
+
repoInfo := rp.repoResolver.GetRepoInfo(r, user)
826
+
827
var issues []models.Issue
828
searchOpts := models.IssueSearchOptions{
829
Keyword: keyword,
···
839
}
840
l.Debug("searched issues with indexer", "count", len(res.Hits))
841
totalIssues = int(res.Total)
842
+
843
+
// count matching issues in the opposite state to display correct counts
844
+
countRes, err := rp.indexer.Search(r.Context(), models.IssueSearchOptions{
845
+
Keyword: keyword, RepoAt: f.RepoAt().String(), IsOpen: !isOpen,
846
+
Page: pagination.Page{Limit: 1},
847
+
})
848
+
if err == nil {
849
+
if isOpen {
850
+
repoInfo.Stats.IssueCount.Open = int(res.Total)
851
+
repoInfo.Stats.IssueCount.Closed = int(countRes.Total)
852
+
} else {
853
+
repoInfo.Stats.IssueCount.Closed = int(res.Total)
854
+
repoInfo.Stats.IssueCount.Open = int(countRes.Total)
855
+
}
856
+
}
857
858
issues, err = db.GetIssues(
859
rp.db,
···
901
902
rp.pages.RepoIssues(w, pages.RepoIssuesParams{
903
LoggedInUser: rp.oauth.GetMultiAccountUser(r),
904
+
RepoInfo: repoInfo,
905
Issues: issues,
906
IssueCount: totalIssues,
907
LabelDefs: defs,