82be59e633
* adding search capability to user's issues dashboard * global issue search * placement of search bar on issues dashboard * fixed some bugs in the issue dashboard search * added unit test because IssueIDs option was added to UserIssueStatsOptions * some renaming of fields in the issue dashboard code to be more clear; also trying to fix issue of searching the right repos based on the filter * added unit test fro GetRepoIDsForIssuesOptions; fixed search lost on pagination; using shown issue status for open/close count; removed some debugging * fix issue with all count showing incorrectly * removed todo comment left in by mistake * typo pulling wrong count * fxied all count being off when selecting repositories * setting the opts.IsClosed after pulling repos to search, this is done so that the list of repo ids to serach for the keyword is not limited, we need to get all the issue ids for the shown issue stats * added "accessibleRepositoryCondition" check on the query to pull the repo ids to search for issues, this is an added protection to ensure we don't search repos the user does not have access to * added code so that in the issues search, we won't use an in clause of issues ids that goes over 1000 * fixed unit test * using 950 as the limit for issue search, removed unneeded group by in GetRepoIDsForIssuesOptions, showing search on pulls dashboard page too (not just issues) Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
188 lines
10 KiB
Cheetah
188 lines
10 KiB
Cheetah
{{template "base/head" .}}
|
|
<div class="dashboard issues">
|
|
{{template "user/dashboard/navbar" .}}
|
|
<div class="ui container">
|
|
<div class="ui stackable grid">
|
|
<div class="four wide column">
|
|
<div class="ui secondary vertical filter menu">
|
|
<a class="{{if eq .ViewType "your_repositories"}}ui basic blue button{{end}} item" href="{{.Link}}?type=your_repositories&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state={{.State}}">
|
|
{{.i18n.Tr "home.issues.in_your_repos"}}
|
|
<strong class="ui right">{{.IssueStats.YourRepositoriesCount}}</strong>
|
|
</a>
|
|
{{if not .ContextUser.IsOrganization}}
|
|
<a class="{{if eq .ViewType "assigned"}}ui basic blue button{{end}} item" href="{{.Link}}?type=assigned&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state={{.State}}">
|
|
{{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}}
|
|
<strong class="ui right">{{.IssueStats.AssignCount}}</strong>
|
|
</a>
|
|
<a class="{{if eq .ViewType "created_by"}}ui basic blue button{{end}} item" href="{{.Link}}?type=created_by&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state={{.State}}">
|
|
{{.i18n.Tr "repo.issues.filter_type.created_by_you"}}
|
|
<strong class="ui right">{{.IssueStats.CreateCount}}</strong>
|
|
</a>
|
|
<a class="{{if eq .ViewType "mentioned"}}ui basic blue button{{end}} item" href="{{.Link}}?type=mentioned&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state={{.State}}">
|
|
{{.i18n.Tr "repo.issues.filter_type.mentioning_you"}}
|
|
<strong class="ui right">{{.IssueStats.MentionCount}}</strong>
|
|
</a>
|
|
{{end}}
|
|
<div class="ui divider"></div>
|
|
<a class="{{if not $.RepoIDs}}ui basic blue button{{end}} repo name item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&q={{$.Keyword}}">
|
|
<span class="text truncate">All</span>
|
|
<div class="ui {{if $.IsShowClosed}}red{{else}}green{{end}} label">{{.TotalIssueCount}}</div>
|
|
</a>
|
|
{{range .Repos}}
|
|
{{with $Repo := .}}
|
|
<a class="{{range $.RepoIDs}}{{if eq . $Repo.ID}}ui basic blue button{{end}}{{end}} repo name item" href="{{$.Link}}?type={{$.ViewType}}&repos=[
|
|
{{with $include := true}}
|
|
{{range $.RepoIDs}}
|
|
{{if eq . $Repo.ID}}
|
|
{{$include = false}}
|
|
{{else}}
|
|
{{.}}%2C
|
|
{{end}}
|
|
{{end}}
|
|
{{if eq $include true}}
|
|
{{$Repo.ID}}%2C
|
|
{{end}}
|
|
{{end}}
|
|
]&sort={{$.SortType}}&state={{$.State}}&q={{$.Keyword}}" title="{{.FullName}}">
|
|
<span class="text truncate">{{$Repo.FullName}}</span>
|
|
<div class="ui {{if $.IsShowClosed}}red{{else}}green{{end}} label">{{index $.Counts $Repo.ID}}</div>
|
|
</a>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
<div class="twelve wide column content">
|
|
<div class="ui three column stackable grid">
|
|
<div class="column">
|
|
<div class="ui tiny basic status buttons">
|
|
<a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}">
|
|
{{svg "octicon-issue-opened" 16}}
|
|
{{.i18n.Tr "repo.issues.open_tab" .ShownIssueStats.OpenCount}}
|
|
</a>
|
|
<a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed&q={{$.Keyword}}">
|
|
{{svg "octicon-issue-closed" 16}}
|
|
{{.i18n.Tr "repo.issues.close_tab" .ShownIssueStats.ClosedCount}}
|
|
</a>
|
|
</div>
|
|
</div>
|
|
<div class="column center aligned">
|
|
<form class="ui form ignore-dirty">
|
|
<div class="ui fluid action input">
|
|
<input type="hidden" name="type" value="{{$.ViewType}}"/>
|
|
<input type="hidden" name="repos" value="[{{range $.RepoIDs}}{{.}}%2C{{end}}]"/>
|
|
<input type="hidden" name="sort" value="{{$.SortType}}"/>
|
|
<input type="hidden" name="state" value="{{$.State}}"/>
|
|
<div class="ui search action input">
|
|
<input name="q" value="{{$.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
|
|
</div>
|
|
<button class="ui blue button" type="submit">{{.i18n.Tr "explore.search"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
<div class="column right aligned">
|
|
<!-- Sort -->
|
|
<div class="ui dropdown type jump item">
|
|
<span class="text">
|
|
{{.i18n.Tr "repo.issues.filter_sort"}}
|
|
<i class="dropdown icon"></i>
|
|
</span>
|
|
<div class="menu">
|
|
<a class="{{if or (eq .SortType "latest") (not .SortType)}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=latest&state={{$.State}}&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
|
|
<a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=oldest&state={{$.State}}&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
|
|
<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=recentupdate&state={{$.State}}&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
|
|
<a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastupdate&state={{$.State}}&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
|
|
<a class="{{if eq .SortType "mostcomment"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=mostcomment&state={{$.State}}&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.mostcomment"}}</a>
|
|
<a class="{{if eq .SortType "leastcomment"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastcomment&state={{$.State}}&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.leastcomment"}}</a>
|
|
<a class="{{if eq .SortType "nearduedate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=nearduedate&state={{$.State}}&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.nearduedate"}}</a>
|
|
<a class="{{if eq .SortType "farduedate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=farduedate&state={{$.State}}&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.farduedate"}}</a>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="issue list">
|
|
{{range .Issues}}
|
|
|
|
{{ $timeStr:= TimeSinceUnix .CreatedUnix $.Lang }}
|
|
{{if .Repo}}
|
|
<li class="item">
|
|
<div class="ui label">{{.Repo.FullName}}#{{.Index}}</div>
|
|
<a class="title has-emoji" href="{{.HTMLURL}}">{{.Title}}</a>
|
|
|
|
{{if .IsPull}}
|
|
{{if (index $.CommitStatus .PullRequest.ID)}}
|
|
{{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}}
|
|
{{end}}
|
|
{{end}}
|
|
|
|
{{with .Labels}}
|
|
{{/* If we have any labels, we should show them
|
|
with a 2.5 line height, this way they don't look
|
|
awful and they don't stack on top of each other,
|
|
especially on mobile views. */}}
|
|
<span style="line-height: 2.5">
|
|
{{range .}}
|
|
<a class="ui label has-emoji" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name}}</a>
|
|
{{end}}
|
|
</span>
|
|
{{end}}
|
|
|
|
{{if .NumComments}}
|
|
<span class="comment ui right">{{svg "octicon-comment" 16}} {{.NumComments}}</span>
|
|
{{end}}
|
|
{{if .TotalTrackedTime}}
|
|
<span class="comment ui right">{{svg "octicon-clock" 16}} {{.TotalTrackedTime | Sec2Time}}</span>
|
|
{{end}}
|
|
|
|
<p class="desc">
|
|
{{if .OriginalAuthor}}
|
|
{{$.i18n.Tr .GetLastEventLabelFake $timeStr .OriginalAuthor | Safe}}
|
|
{{else if gt .Poster.ID 0}}
|
|
{{$.i18n.Tr .GetLastEventLabel $timeStr .Poster.HomeLink (.Poster.GetDisplayName|Escape) | Safe}}
|
|
{{else}}
|
|
{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}}
|
|
{{end}}
|
|
{{if .Milestone}}
|
|
<a class="milestone" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}&assignee={{$.AssigneeID}}">
|
|
{{svg "octicon-milestone" 16}} {{.Milestone.Name}}
|
|
</a>
|
|
{{end}}
|
|
{{if .Ref}}
|
|
<a class="ref" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/src/branch/{{.Ref}}">
|
|
{{svg "octicon-git-branch" 16}} {{.Ref}}
|
|
</a>
|
|
{{end}}
|
|
{{range .Assignees}}
|
|
<a class="ui right assignee poping up" href="{{.HomeLink}}" data-content="{{.GetDisplayName}}" data-variation="inverted" data-position="left center">
|
|
<img class="ui avatar image" src="{{.RelAvatarLink}}">
|
|
</a>
|
|
{{end}}
|
|
{{$tasks := .GetTasks}}
|
|
{{if gt $tasks 0}}
|
|
{{$tasksDone := .GetTasksDone}}
|
|
<span class="checklist">
|
|
{{svg "octicon-checklist" 16}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span>
|
|
</span>
|
|
{{end}}
|
|
{{if ne .DeadlineUnix 0}}
|
|
<span class="due-date poping up" data-content="{{$.i18n.Tr "repo.issues.due_date"}}" data-variation="tiny inverted" data-position="right center">
|
|
{{svg "octicon-calendar" 16}}<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
|
|
</span>
|
|
{{end}}
|
|
{{if .IsPull}}
|
|
{{if and (not .PullRequest.HasMerged) ((len .PullRequest.ConflictedFiles) gt 0)}}
|
|
<span class="conflicting">{{svg "octicon-mirror" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
|
|
{{end}}
|
|
{{end}}
|
|
</p>
|
|
</li>
|
|
{{end}}
|
|
{{end}}
|
|
|
|
{{template "base/paginate" .}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{template "base/footer" .}}
|