{{template "user/dashboard/navbar" .}} +
- + {{ctx.Locale.Tr "home.issues.in_your_repos"}} {{CountFmt .IssueStats.YourRepositoriesCount}} - + {{ctx.Locale.Tr "repo.issues.filter_type.assigned_to_you"}} {{CountFmt .IssueStats.AssignCount}} - + {{ctx.Locale.Tr "repo.issues.filter_type.created_by_you"}} {{CountFmt .IssueStats.CreateCount}} {{if .PageIsPulls}} - + {{ctx.Locale.Tr "repo.issues.filter_type.review_requested"}} {{CountFmt .IssueStats.ReviewRequestedCount}} - + {{ctx.Locale.Tr "repo.issues.filter_type.reviewed_by_you"}} {{CountFmt .IssueStats.ReviewedCount}} {{end}} - + {{ctx.Locale.Tr "repo.issues.filter_type.mentioning_you"}} {{CountFmt .IssueStats.MentionCount}}
- + {{ctx.Locale.Tr "all"}} {{CountFmt .TotalIssueCount}} @@ -62,11 +63,11 @@
- + {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{ctx.Locale.PrettyNumber .IssueStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} - + {{svg "octicon-issue-closed" 16 "gt-mr-3"}} {{ctx.Locale.PrettyNumber .IssueStats.ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}} @@ -106,7 +107,48 @@ {{ctx.Locale.Tr "repo.pulls.new"}} {{end}} {{end}} +
+
+ +
+ + {{.locale.Tr "repo.issues.filter_poster"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+
+ {{svg "octicon-search" 16}} + +
+ {{.locale.Tr "repo.issues.filter_poster_no_select"}} +
+
+ +
+ + {{.locale.Tr "repo.issues.filter_assignee"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+
+ {{svg "octicon-search" 16}} + +
+ {{.locale.Tr "repo.issues.filter_assginee_no_select"}} +
+
+
+
+ {{template "shared/issuelist" dict "." . "listType" "dashboard"}}
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index ca20cfbe387d4..bfe521dcdfcff 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -82,62 +82,66 @@ function initRepoIssueListCheckboxes() { }); } -function initRepoIssueListAuthorDropdown() { - const $searchDropdown = $('.user-remote-search'); - if (!$searchDropdown.length) return; - - let searchUrl = $searchDropdown.attr('data-search-url'); - const actionJumpUrl = $searchDropdown.attr('data-action-jump-url'); - const selectedUserId = $searchDropdown.attr('data-selected-user-id'); - if (!searchUrl.includes('?')) searchUrl += '?'; - - $searchDropdown.dropdown('setting', { - fullTextSearch: true, - selectOnKeydown: false, - apiSettings: { - cache: false, - url: `${searchUrl}&q={query}`, - onResponse(resp) { - // the content is provided by backend IssuePosters handler - const processedResults = []; // to be used by dropdown to generate menu items - for (const item of resp.results) { - let html = `${htmlEscape(item.username)}`; - if (item.full_name) html += `${htmlEscape(item.full_name)}`; - processedResults.push({value: item.user_id, name: html}); - } - resp.results = processedResults; - return resp; +function initRepoIssueListUserDropdowns() { + const userDropdowns = document.getElementsByClassName('user-remote-search'); + if (!userDropdowns.length) return; + + for (let i = 0; i < userDropdowns.length; i++) { + const $searchDropdown = $(userDropdowns[i]); + + let searchUrl = $searchDropdown.attr('data-search-url'); + const actionJumpUrl = $searchDropdown.attr('data-action-jump-url'); + const selectedUserId = $searchDropdown.attr('data-selected-user-id'); + if (!searchUrl.includes('?')) searchUrl += '?'; + + $searchDropdown.dropdown('setting', { + fullTextSearch: true, + selectOnKeydown: false, + apiSettings: { + cache: false, + url: `${searchUrl}&q={query}`, + onResponse(resp) { + // the content is provided by backend IssuePosters handler + const processedResults = []; // to be used by dropdown to generate menu items + for (const item of resp.results) { + let html = `${htmlEscape(item.username)}`; + if (item.full_name) html += `${htmlEscape(item.full_name)}`; + processedResults.push({value: item.user_id, name: html}); + } + resp.results = processedResults; + return resp; + }, }, - }, - action: (_text, value) => { - window.location.href = actionJumpUrl.replace('{user_id}', encodeURIComponent(value)); - }, - onShow: () => { - $searchDropdown.dropdown('filter', ' '); // trigger a search on first show - }, - }); + action: (_text, value) => { + window.location.href = actionJumpUrl.replace('{user_id}', encodeURIComponent(value)); + }, + onShow: () => { + $searchDropdown.dropdown('filter', ' '); // trigger a search on first show + }, + }); - // we want to generate the dropdown menu items by ourselves, replace its internal setup functions - const dropdownSetup = {...$searchDropdown.dropdown('internal', 'setup')}; - const dropdownTemplates = $searchDropdown.dropdown('setting', 'templates'); - $searchDropdown.dropdown('internal', 'setup', dropdownSetup); - dropdownSetup.menu = function (values) { - const $menu = $searchDropdown.find('> .menu'); - $menu.find('> .dynamic-item').remove(); // remove old dynamic items - - const newMenuHtml = dropdownTemplates.menu(values, $searchDropdown.dropdown('setting', 'fields'), true /* html */, $searchDropdown.dropdown('setting', 'className')); - if (newMenuHtml) { - const $newMenuItems = $(newMenuHtml); - $newMenuItems.addClass('dynamic-item'); - $menu.append('
', ...$newMenuItems); - } - $searchDropdown.dropdown('refresh'); - // defer our selection to the next tick, because dropdown will set the selection item after this `menu` function - setTimeout(() => { - $menu.find('.item.active, .item.selected').removeClass('active selected'); - $menu.find(`.item[data-value="${selectedUserId}"]`).addClass('selected'); - }, 0); - }; + // we want to generate the dropdown menu items by ourselves, replace its internal setup functions + const dropdownSetup = {...$searchDropdown.dropdown('internal', 'setup')}; + const dropdownTemplates = $searchDropdown.dropdown('setting', 'templates'); + $searchDropdown.dropdown('internal', 'setup', dropdownSetup); + dropdownSetup.menu = function (values) { + const $menu = $searchDropdown.find('> .menu'); + $menu.find('> .dynamic-item').remove(); // remove old dynamic items + + const newMenuHtml = dropdownTemplates.menu(values, $searchDropdown.dropdown('setting', 'fields'), true /* html */, $searchDropdown.dropdown('setting', 'className')); + if (newMenuHtml) { + const $newMenuItems = $(newMenuHtml); + $newMenuItems.addClass('dynamic-item'); + $menu.append('
', ...$newMenuItems); + } + $searchDropdown.dropdown('refresh'); + // defer our selection to the next tick, because dropdown will set the selection item after this `menu` function + setTimeout(() => { + $menu.find('.item.active, .item.selected').removeClass('active selected'); + $menu.find(`.item[data-value="${selectedUserId}"]`).addClass('selected'); + }, 0); + }; + } } function initPinRemoveButton() { @@ -222,9 +226,9 @@ function initArchivedLabelFilter() { } export function initRepoIssueList() { - if (!document.querySelectorAll('.page-content.repository.issue-list, .page-content.repository.milestone-issue-list').length) return; + if (!document.querySelectorAll('.page-content.repository.issue-list, .page-content.repository.milestone-issue-list, .page-content.dashboard.issues').length) return; initRepoIssueListCheckboxes(); - initRepoIssueListAuthorDropdown(); + initRepoIssueListUserDropdowns(); initIssuePinSort(); initArchivedLabelFilter(); } From 94a1caf8f394052e9e29021aec560ff0eb0f2849 Mon Sep 17 00:00:00 2001 From: iminfinity Date: Tue, 30 Jan 2024 01:18:14 +0530 Subject: [PATCH 2/2] fix pagination --- routers/web/user/home.go | 8 +++--- templates/user/dashboard/issues.tmpl | 37 +++++++++++----------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/routers/web/user/home.go b/routers/web/user/home.go index a20bc056c352b..a3f6e5bbb2cf8 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -658,8 +658,8 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { pager.AddParam(ctx, "state", "State") pager.AddParam(ctx, "labels", "SelectLabels") pager.AddParam(ctx, "milestone", "MilestoneID") - pager.AddParam(ctx, "assignee", "AssigneeID") - pager.AddParam(ctx, "author", "AuthorID") + pager.AddParam(ctx, "assignee", "FilterByAssigneeID") + pager.AddParam(ctx, "author", "FilterByAuthorID") ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplIssues) @@ -781,7 +781,9 @@ func UsernameSubRoute(ctx *context.Context) { } } -func getUserIssueStats(ctx *context.Context, filterMode int, opts *issue_indexer.SearchOptions, doerID int64) (*issues_model.IssueStats, error) { +func getUserIssueStats(ctx *context.Context, ctxUser *user_model.User, filterMode int, opts *issue_indexer.SearchOptions) (*issues_model.IssueStats, error) { + doerID := ctx.Doer.ID + var ( err error ret = &issues_model.IssueStats{} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index e4a76e9a187d3..1157357320e7c 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -6,24 +6,24 @@
- + {{ctx.Locale.Tr "home.issues.in_your_repos"}} {{CountFmt .IssueStats.YourRepositoriesCount}} - + {{ctx.Locale.Tr "repo.issues.filter_type.assigned_to_you"}} {{CountFmt .IssueStats.AssignCount}} - + {{ctx.Locale.Tr "repo.issues.filter_type.created_by_you"}} {{CountFmt .IssueStats.CreateCount}} {{if .PageIsPulls}} - + {{ctx.Locale.Tr "repo.issues.filter_type.review_requested"}} {{CountFmt .IssueStats.ReviewRequestedCount}} - + {{ctx.Locale.Tr "repo.issues.filter_type.reviewed_by_you"}} {{CountFmt .IssueStats.ReviewedCount}} @@ -37,11 +37,11 @@
- + {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{ctx.Locale.PrettyNumber .IssueStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} - + {{svg "octicon-issue-closed" 16 "gt-mr-3"}} {{ctx.Locale.PrettyNumber .IssueStats.ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}} @@ -73,49 +73,42 @@ {{ctx.Locale.Tr "repo.issues.filter_sort.farduedate"}}
- {{if .SingleRepoLink}} - {{if eq .SingleRepoAction "issue"}} - {{ctx.Locale.Tr "repo.issues.new"}} - {{else if eq .SingleRepoAction "pull"}} - {{ctx.Locale.Tr "repo.pulls.new"}} - {{end}} - {{end}}
-
- {{.locale.Tr "repo.issues.filter_poster"}} + {{ctx.Locale.Tr "repo.issues.filter_poster"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{svg "octicon-search" 16}} - +
- {{.locale.Tr "repo.issues.filter_poster_no_select"}} + {{ctx.Locale.Tr "repo.issues.filter_poster_no_select"}}
-
- {{.locale.Tr "repo.issues.filter_assignee"}} + {{ctx.Locale.Tr "repo.issues.filter_assignee"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{svg "octicon-search" 16}} - +
- {{.locale.Tr "repo.issues.filter_assginee_no_select"}} + {{ctx.Locale.Tr "repo.issues.filter_assginee_no_select"}}