From 2b37b1094c9ff937a6186d3d4742bfc970c4a12c Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 27 Mar 2023 17:05:03 +0800 Subject: [PATCH 01/72] save changes --- modules/structs/miscellaneous.go | 5 +++++ routers/web/repo/issue.go | 28 ++++++++++++++++++++++++++++ routers/web/web.go | 5 ++++- web_src/js/features/common-issue.js | 11 +++++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/modules/structs/miscellaneous.go b/modules/structs/miscellaneous.go index 8acea84d6cc17..717c1593559ed 100644 --- a/modules/structs/miscellaneous.go +++ b/modules/structs/miscellaneous.go @@ -77,3 +77,8 @@ type APIError struct { Message string `json:"message"` URL string `json:"url"` } + +type UserSearchResults struct { + OK bool `json:"ok"` + Data []*User `json:"data"` +} diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 3715320f10c84..d87af96b14a6d 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3300,3 +3300,31 @@ func handleTeamMentions(ctx *context.Context) { ctx.Data["MentionableTeamsOrg"] = ctx.Repo.Owner.Name ctx.Data["MentionableTeamsOrgAvatar"] = ctx.Repo.Owner.AvatarLink(ctx) } + +func IssuePosters(ctx *context.Context) { + fmt.Println("IssuePostersIssuePostersIssuePostersIssuePosters") + var err error + repo := ctx.Repo.Repository + fmt.Println(repo) + isPullList := ctx.Params(":type") == "pulls" + fmt.Println(ctx.Params(":type")) + fmt.Println(isPullList) + isPullOption := util.OptionalBoolOf(isPullList) + posters, err := repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) + fmt.Println("posters") + fmt.Println(posters) + if err != nil { + ctx.JSON(http.StatusInternalServerError, api.SearchError{ + OK: false, + Error: err.Error(), + }) + return + } + results := make([]*api.User, len(posters)) + fmt.Println("results") + fmt.Println(results) + ctx.JSON(http.StatusOK, api.UserSearchResults{ + OK: true, + Data: results, + }) +} diff --git a/routers/web/web.go b/routers/web/web.go index 4bd2f76c571f1..9a6dbb55e1dd9 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1227,7 +1227,10 @@ func RegisterRoutes(m *web.Route) { m.Group("/{username}/{reponame}", func() { m.Group("", func() { - m.Get("/{type:issues|pulls}", repo.Issues) + m.Group("/{type:issues|pulls}", func() { + m.Get("", repo.Issues) + m.Get("/posters", repo.IssuePosters) + }) m.Get("/{type:issues|pulls}/{index}", repo.ViewIssue) m.Group("/{type:issues|pulls}/{index}/content-history", func() { m.Get("/overview", repo.GetContentHistoryOverview) diff --git a/web_src/js/features/common-issue.js b/web_src/js/features/common-issue.js index ebc851d676336..92ef8a3d4813d 100644 --- a/web_src/js/features/common-issue.js +++ b/web_src/js/features/common-issue.js @@ -2,7 +2,17 @@ import $ from 'jquery'; import {updateIssuesMeta} from './repo-issue.js'; import {toggleElem} from '../utils/dom.js'; +async function fetchData() { + const res = await fetch("/hester/testRepo/issues/posters", { + method: 'GET' + }); + const json = await res.json(); + console.log(res) + console.log(json) +} + export function initCommonIssue() { + console.log('initCommonIssue') const $issueSelectAllWrapper = $('.issue-checkbox-all'); const $issueSelectAll = $('.issue-checkbox-all input'); const $issueCheckboxes = $('.issue-checkbox input'); @@ -24,6 +34,7 @@ export function initCommonIssue() { toggleElem($('#issue-actions'), anyChecked); // there are two panels but only one select-all checkbox, so move the checkbox to the visible panel $('#issue-filters, #issue-actions').filter(':visible').find('.column:first').prepend($issueSelectAllWrapper); + fetchData(); }; $issueCheckboxes.on('change', syncIssueSelectionState); From b7371213831df25d44bcdf897f77ff60ce2c7a5b Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 28 Mar 2023 09:31:54 +0800 Subject: [PATCH 02/72] save --- routers/web/repo/issue.go | 34 +++++++++++++++++++++++++++-- web_src/js/features/common-issue.js | 7 +++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index d87af96b14a6d..c283e585d267e 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -12,10 +12,12 @@ import ( "math/big" "net/http" "net/url" + "reflect" "sort" "strconv" "strings" "time" + "unsafe" activities_model "code.gitea.io/gitea/models/activities" "code.gitea.io/gitea/models/db" @@ -3301,18 +3303,46 @@ func handleTeamMentions(ctx *context.Context) { ctx.Data["MentionableTeamsOrgAvatar"] = ctx.Repo.Owner.AvatarLink(ctx) } +func printContextInternals(ctx interface{}, inner bool) { + contextValues := reflect.ValueOf(ctx).Elem() + contextKeys := reflect.TypeOf(ctx).Elem() + + if !inner { + fmt.Printf("\nFields for %s.%s\n", contextKeys.PkgPath(), contextKeys.Name()) + } + + if contextKeys.Kind() == reflect.Struct { + for i := 0; i < contextValues.NumField(); i++ { + reflectValue := contextValues.Field(i) + reflectValue = reflect.NewAt(reflectValue.Type(), unsafe.Pointer(reflectValue.UnsafeAddr())).Elem() + + reflectField := contextKeys.Field(i) + + if reflectField.Name == "Context" { + printContextInternals(reflectValue.Interface(), true) + } else { + fmt.Printf("field name: %+v\n", reflectField.Name) + fmt.Printf("value: %+v\n", reflectValue.Interface()) + } + } + } else { + fmt.Printf("context is empty (int)\n") + } +} + func IssuePosters(ctx *context.Context) { fmt.Println("IssuePostersIssuePostersIssuePostersIssuePosters") var err error repo := ctx.Repo.Repository - fmt.Println(repo) + // fmt.Println(repo) + printContextInternals(ctx, true) isPullList := ctx.Params(":type") == "pulls" fmt.Println(ctx.Params(":type")) fmt.Println(isPullList) isPullOption := util.OptionalBoolOf(isPullList) posters, err := repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) fmt.Println("posters") - fmt.Println(posters) + // fmt.Println(posters) if err != nil { ctx.JSON(http.StatusInternalServerError, api.SearchError{ OK: false, diff --git a/web_src/js/features/common-issue.js b/web_src/js/features/common-issue.js index 92ef8a3d4813d..ae240cedc1430 100644 --- a/web_src/js/features/common-issue.js +++ b/web_src/js/features/common-issue.js @@ -3,7 +3,8 @@ import {updateIssuesMeta} from './repo-issue.js'; import {toggleElem} from '../utils/dom.js'; async function fetchData() { - const res = await fetch("/hester/testRepo/issues/posters", { + console.log('fetch Data') + const res = await fetch('/hester/testRepo/issues/posters', { method: 'GET' }); const json = await res.json(); @@ -12,7 +13,8 @@ async function fetchData() { } export function initCommonIssue() { - console.log('initCommonIssue') + console.log('initCommonIssue'); + fetchData(); const $issueSelectAllWrapper = $('.issue-checkbox-all'); const $issueSelectAll = $('.issue-checkbox-all input'); const $issueCheckboxes = $('.issue-checkbox input'); @@ -34,7 +36,6 @@ export function initCommonIssue() { toggleElem($('#issue-actions'), anyChecked); // there are two panels but only one select-all checkbox, so move the checkbox to the visible panel $('#issue-filters, #issue-actions').filter(':visible').find('.column:first').prepend($issueSelectAllWrapper); - fetchData(); }; $issueCheckboxes.on('change', syncIssueSelectionState); From 62c030c0536b1b54207d68831fd28ae2e7844da4 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 29 Mar 2023 08:59:16 +0800 Subject: [PATCH 03/72] save changes --- modules/structs/miscellaneous.go | 5 --- modules/structs/user.go | 12 +++++++ routers/web/repo/issue.go | 50 ++++++++++++++--------------- services/convert/user.go | 13 ++++++++ templates/repo/issue/list.tmpl | 11 ++++--- web_src/js/features/common-issue.js | 12 ------- web_src/js/features/repo-issue.js | 49 ++++++++++++++++++++++++++++ 7 files changed, 104 insertions(+), 48 deletions(-) diff --git a/modules/structs/miscellaneous.go b/modules/structs/miscellaneous.go index 717c1593559ed..8acea84d6cc17 100644 --- a/modules/structs/miscellaneous.go +++ b/modules/structs/miscellaneous.go @@ -77,8 +77,3 @@ type APIError struct { Message string `json:"message"` URL string `json:"url"` } - -type UserSearchResults struct { - OK bool `json:"ok"` - Data []*User `json:"data"` -} diff --git a/modules/structs/user.go b/modules/structs/user.go index f68b92ac069e2..c41c16ae8722d 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -54,6 +54,18 @@ type User struct { StarredRepos int `json:"starred_repos_count"` } +// UserBrief represents user info needed when using search dropdown +type UserBrief struct { + // the user's id + ID int64 `json:"id"` + // the user's username + UserName string `json:"username"` + // URL to the user's avatar + AvatarURL string `json:"avatar_url"` + // the user's full name + FullName string `json:"full_name"` +} + // MarshalJSON implements the json.Marshaler interface for User, adding field(s) for backward compatibility func (u User) MarshalJSON() ([]byte, error) { // Re-declaring User to avoid recursion diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index c283e585d267e..258b14deaafec 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -311,11 +311,11 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti return } - ctx.Data["Posters"], err = repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) - if err != nil { - ctx.ServerError("GetIssuePosters", err) - return - } + // ctx.Data["Posters"], err = repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) + // if err != nil { + // ctx.ServerError("GetIssuePosters", err) + // return + // } handleTeamMentions(ctx) if ctx.Written() { @@ -3331,30 +3331,28 @@ func printContextInternals(ctx interface{}, inner bool) { } func IssuePosters(ctx *context.Context) { - fmt.Println("IssuePostersIssuePostersIssuePostersIssuePosters") - var err error repo := ctx.Repo.Repository - // fmt.Println(repo) printContextInternals(ctx, true) isPullList := ctx.Params(":type") == "pulls" - fmt.Println(ctx.Params(":type")) - fmt.Println(isPullList) isPullOption := util.OptionalBoolOf(isPullList) - posters, err := repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) - fmt.Println("posters") - // fmt.Println(posters) - if err != nil { - ctx.JSON(http.StatusInternalServerError, api.SearchError{ - OK: false, - Error: err.Error(), - }) - return + var allPosters []*user_model.User + for i := 1; i < 200; i++ { + var err error + posters, err := repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) + if err != nil { + ctx.JSON(http.StatusInternalServerError, api.SearchError{ + OK: false, + Error: err.Error(), + }) + return + } + allPosters = append(allPosters, posters...) } - results := make([]*api.User, len(posters)) - fmt.Println("results") - fmt.Println(results) - ctx.JSON(http.StatusOK, api.UserSearchResults{ - OK: true, - Data: results, - }) + + results := make([]*api.UserBrief, len(allPosters)) + for i, poster := range allPosters { + results[i] = convert.ToUserBrief(ctx, poster) + } + // fmt.Println(results) + ctx.JSON(http.StatusOK, results) } diff --git a/services/convert/user.go b/services/convert/user.go index 79fcba0176f9a..d169c62a77ed5 100644 --- a/services/convert/user.go +++ b/services/convert/user.go @@ -26,6 +26,19 @@ func ToUser(ctx context.Context, user, doer *user_model.User) *api.User { return toUser(ctx, user, signed, authed) } +func ToUserBrief(ctx context.Context, user *user_model.User) *api.UserBrief { + if user == nil { + return nil + } + result := &api.UserBrief{ + ID: user.ID, + UserName: user.Name, + FullName: user.FullName, + AvatarURL: user.AvatarLink(ctx), + } + return result +} + // ToUsers convert list of user_model.User to list of api.User func ToUsers(ctx context.Context, doer *user_model.User, users []*user_model.User) []*api.User { result := make([]*api.User, len(users)) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 38ed3873ba4c8..c3c3c89684f4f 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -119,22 +119,23 @@ -
+ +
+ +
diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 74090d1d19f56..e7728faf2b4cb 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import {hideElem, showElem, toggleElem, setAttributes} from '../utils/dom.js'; -const {csrfToken} = window.config; +const {appSubUrl, csrfToken} = window.config; function getArchive($target, url, first) { $.ajax({ @@ -161,3 +161,47 @@ export async function initPostersDropdown() { $('#author-search').dropdown(); } } + +export async function initPostersDropdownTest() { + console.log('fetch posters data 1'); + const $autherSearch = document.getElementById('author-search-1'); + if (!$autherSearch) { + return; + } + const url = $autherSearch.getAttribute('data-url'); + const posterID = $autherSearch.getAttribute('data-poster-id'); + const isShowFullName = $autherSearch.getAttribute('data-show-fullname'); + const posterGeneralHref = $autherSearch.getAttribute('data-general-poster-href'); + const posterList = document.querySelector('.poster-list'); + console.log('url', `${appSubUrl}${url}`) + $('#author-search-1').dropdown({ + apiSettings: { + fullTextSearch: 'exact', + saveRemoteData: false, + // this url parses query server side and returns filtered results + url: `${appSubUrl}${url}`, + onResponse(response) { + console.log(response) + const formattedResponse = {success: true, results: []}; + // Parse the response from the api to work with our dropdown + $.each(response, (_, poster) => { + const {id, avatar_url, username, full_name} = poster; + console.log(poster) + formattedResponse.results.push({ + name: ` + + ${username}${isShowFullName === 'true' ? ` ${full_name}`: ''} + `, + value: id, + }); + }); + return formattedResponse; + }, + cache: false, + }, + // fields: { + // the remote api has a different structure than expected, which we can adjust + // remoteValues: 'item' + // } + }); +} diff --git a/web_src/js/index.js b/web_src/js/index.js index be93335721ef8..3e29380c3a2e4 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -64,7 +64,7 @@ import {initRepoTemplateSearch} from './features/repo-template.js'; import {initRepoCodeView} from './features/repo-code.js'; import {initSshKeyFormParser} from './features/sshkey-helper.js'; import {initUserSettings} from './features/user-settings.js'; -import {initRepoArchiveLinks, initPostersDropdown} from './features/repo-common.js'; +import {initRepoArchiveLinks, initPostersDropdown, initPostersDropdownTest} from './features/repo-common.js'; import {initRepoMigrationStatusChecker} from './features/repo-migrate.js'; import { initRepoSettingGitHook, @@ -185,7 +185,8 @@ $(document).ready(() => { initRepoWikiForm(); initRepository(); initRepositoryActionView(); - initPostersDropdown(); + // initPostersDropdown(); + initPostersDropdownTest(); initCommitStatuses(); initCaptcha(); From 4634fa4cb98c6f6916a8bf7282dd3a8c1a5d8fe2 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 29 Mar 2023 17:53:33 +0800 Subject: [PATCH 09/72] test native --- templates/repo/issue/list.tmpl | 12 +++++--- web_src/js/features/repo-common.js | 48 +++++++++++++++++++++++++----- web_src/js/index.js | 2 +- 3 files changed, 49 insertions(+), 13 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index b11f5ec4d0c51..8b02bc343d3ca 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -139,18 +139,22 @@
- diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index e7728faf2b4cb..62ba3be0140db 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -133,7 +133,7 @@ export async function initPostersDropdown() { const {id, avatar_url, username, full_name} = postersJson[i]; const $a = document.createElement('a'); setAttributes($a, { - 'class': `item gt-df poster-item${posterID === id ? ' active selected' : ''}`, + 'class': `item gt-df poster-item${+posterID === id ? ' active selected' : ''}`, 'href': `${posterGeneralHref}${id}`, }); const $img = document.createElement('img'); @@ -158,7 +158,29 @@ export async function initPostersDropdown() { posterList.appendChild($a); } delete $('#author-search')[0]['_giteaAriaPatchDropdown']; - $('#author-search').dropdown(); + $('#author-search').dropdown({ + fullTextSearch: 'exact', + selectOnKeydown: false, + action: 'hide', + onShow() { + // hide associated tooltip while dropdown is open + this._tippy?.hide(); + this._tippy?.disable(); + }, + onHide() { + this._tippy?.enable(); + + // hide all tippy elements of items after a while. eg: use Enter to click "Copy Link" in the Issue Context Menu + setTimeout(() => { + const $dropdown = $(this); + if ($dropdown.dropdown('is hidden')) { + $(this).find('.menu > .item').each((_, item) => { + item._tippy?.hide(); + }); + } + }, 2000); + }, + }); } } @@ -171,10 +193,12 @@ export async function initPostersDropdownTest() { const url = $autherSearch.getAttribute('data-url'); const posterID = $autherSearch.getAttribute('data-poster-id'); const isShowFullName = $autherSearch.getAttribute('data-show-fullname'); - const posterGeneralHref = $autherSearch.getAttribute('data-general-poster-href'); + const noFilterUrl = $autherSearch.getAttribute('data-no-filter-url'); + const posterGeneralUrl = $autherSearch.getAttribute('data-general-poster-url'); + const noSelectText = $autherSearch.getAttribute('data-no-select-text'); const posterList = document.querySelector('.poster-list'); - console.log('url', `${appSubUrl}${url}`) $('#author-search-1').dropdown({ + selectOnKeydown: false, apiSettings: { fullTextSearch: 'exact', saveRemoteData: false, @@ -183,16 +207,22 @@ export async function initPostersDropdownTest() { onResponse(response) { console.log(response) const formattedResponse = {success: true, results: []}; + formattedResponse.results.push({ + name: `${noSelectText}`, + value: '000', + }) + // Parse the response from the api to work with our dropdown $.each(response, (_, poster) => { const {id, avatar_url, username, full_name} = poster; console.log(poster) formattedResponse.results.push({ - name: ` + name: ` ${username}${isShowFullName === 'true' ? ` ${full_name}`: ''} - `, + `, value: id, + class: `item gt-df${posterID === id ? ' active selected' : ''}` }); }); return formattedResponse; @@ -200,8 +230,10 @@ export async function initPostersDropdownTest() { cache: false, }, // fields: { - // the remote api has a different structure than expected, which we can adjust - // remoteValues: 'item' + // // the remote api has a different structure than expected, which we can adjust + // remoteValues: 'posters' // } }); } + +// href="${posterGeneralUrl}${id}" \ No newline at end of file diff --git a/web_src/js/index.js b/web_src/js/index.js index 3e29380c3a2e4..052742a71221f 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -185,7 +185,7 @@ $(document).ready(() => { initRepoWikiForm(); initRepository(); initRepositoryActionView(); - // initPostersDropdown(); + initPostersDropdown(); initPostersDropdownTest(); initCommitStatuses(); From e94588ff1a1fa1c8e07a9bd5e8df1fa13e51a053 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 29 Mar 2023 17:59:11 +0800 Subject: [PATCH 10/72] fomantic dropdown demo --- web_src/js/features/repo-common.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 62ba3be0140db..009c7c5ec8df2 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -217,12 +217,12 @@ export async function initPostersDropdownTest() { const {id, avatar_url, username, full_name} = poster; console.log(poster) formattedResponse.results.push({ - name: ` + name: ` ${username}${isShowFullName === 'true' ? ` ${full_name}`: ''} + `, value: id, - class: `item gt-df${posterID === id ? ' active selected' : ''}` }); }); return formattedResponse; @@ -235,5 +235,3 @@ export async function initPostersDropdownTest() { // } }); } - -// href="${posterGeneralUrl}${id}" \ No newline at end of file From f45d666d99f781b92c4d9a5e65c280fb883e2b5a Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 29 Mar 2023 18:03:56 +0800 Subject: [PATCH 11/72] comment --- web_src/js/features/repo-common.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 009c7c5ec8df2..2ae4987ce3e4a 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -108,6 +108,7 @@ export function initRepoCommonLanguageStats() { } } +// native js approach export async function initPostersDropdown() { console.log('fetch posters data'); const $autherSearch = document.getElementById('author-search'); @@ -184,6 +185,7 @@ export async function initPostersDropdown() { } } +// fomantic dropdown approach export async function initPostersDropdownTest() { console.log('fetch posters data 1'); const $autherSearch = document.getElementById('author-search-1'); From 37e82feecde96cee556195cd70a21c28c4ad4386 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 29 Mar 2023 18:16:39 +0800 Subject: [PATCH 12/72] comment --- web_src/js/features/repo-common.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 2ae4987ce3e4a..1c69be6f0690e 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -109,6 +109,7 @@ export function initRepoCommonLanguageStats() { } // native js approach +// generate dropdown options using fetched data (posters) export async function initPostersDropdown() { console.log('fetch posters data'); const $autherSearch = document.getElementById('author-search'); @@ -186,6 +187,7 @@ export async function initPostersDropdown() { } // fomantic dropdown approach +// generate dropdown options using fetched data (posters) export async function initPostersDropdownTest() { console.log('fetch posters data 1'); const $autherSearch = document.getElementById('author-search-1'); From fefb59ecffb1d20c56d7007ad9ffecc0db8ac954 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 30 Mar 2023 14:56:14 +0800 Subject: [PATCH 13/72] use dropdown setting --- templates/repo/issue/list.tmpl | 28 +----- web_src/js/features/repo-common.js | 139 +++++------------------------ web_src/js/index.js | 1 - 3 files changed, 24 insertions(+), 144 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 8b02bc343d3ca..29eea315d77b3 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -119,41 +119,19 @@ - - - - - -
+
{{.locale.Tr "repo.issues.filter_poster"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -75,11 +76,6 @@
{{.locale.Tr "repo.issues.filter_poster_no_select"}} - {{range .Posters}} - - {{avatar $.Context .}}{{template "repo/search_name" .}} - - {{end}}
diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index a45aed664567c..8a3ea040b0be5 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import {hideElem, showElem, toggleElem, setAttributes} from '../utils/dom.js'; +import {hideElem, showElem, toggleElem} from '../utils/dom.js'; -const {appSubUrl, csrfToken} = window.config; +const {csrfToken} = window.config; function getArchive($target, url, first) { $.ajax({ @@ -108,11 +108,10 @@ export function initRepoCommonLanguageStats() { } } -// fomantic dropdown approach -// generate dropdown options using fetched data (posters) +// generate dropdown options for authors search dropdown using fetched data export async function initPostersDropdown() { console.log('fetch posters data'); - const $authorSearchDropdown = $('#author-search'); + const $authorSearchDropdown = $('.author-search'); if (!$authorSearchDropdown.length) { return; } diff --git a/web_src/js/index.js b/web_src/js/index.js index e1437bc3818d9..be93335721ef8 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -64,7 +64,7 @@ import {initRepoTemplateSearch} from './features/repo-template.js'; import {initRepoCodeView} from './features/repo-code.js'; import {initSshKeyFormParser} from './features/sshkey-helper.js'; import {initUserSettings} from './features/user-settings.js'; -import {initRepoArchiveLinks, initPostersDropdown, initPostersDropdownTest} from './features/repo-common.js'; +import {initRepoArchiveLinks, initPostersDropdown} from './features/repo-common.js'; import {initRepoMigrationStatusChecker} from './features/repo-migrate.js'; import { initRepoSettingGitHook, diff --git a/web_src/js/utils/dom.js b/web_src/js/utils/dom.js index 5cd0396994245..d94d4cb092210 100644 --- a/web_src/js/utils/dom.js +++ b/web_src/js/utils/dom.js @@ -67,9 +67,3 @@ export function hideElem(el) { export function toggleElem(el, force) { elementsCall(el, toggleShown, force); } - -export function setAttributes(el, options) { - for (const key of Object.keys(options)) { - el.setAttribute(key, options[key]); - } -} From d352b421e1d73bfcb988582ed6f24df0cdf8090b Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 30 Mar 2023 15:25:59 +0800 Subject: [PATCH 15/72] remove console logs --- web_src/js/features/repo-common.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 8a3ea040b0be5..33d91f91784d6 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -110,7 +110,6 @@ export function initRepoCommonLanguageStats() { // generate dropdown options for authors search dropdown using fetched data export async function initPostersDropdown() { - console.log('fetch posters data'); const $authorSearchDropdown = $('.author-search'); if (!$authorSearchDropdown.length) { return; @@ -128,16 +127,13 @@ export async function initPostersDropdown() { const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); const values = $authorSearchDropdown.dropdown('setting values'); - let $defaultMenu = $(values[0]).find('.menu'); - console.dir(values) + const $defaultMenu = $(values[0]).find('.menu'); for (let i = 0; i < postersJson.length; i++) { const {id, avatar_url, username, full_name} = postersJson[i]; $defaultMenu.append(` - ${username}${isShowFullName === 'true' ? ` ${full_name}`: ''} + ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} `); } - console.log('new values') - console.dir(values) $authorSearchDropdown.dropdown('setting', 'values', values); } From c6c485d4b21a85883fcbfc9bf53054bde0abfbab Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 30 Mar 2023 17:19:18 +0800 Subject: [PATCH 16/72] remove test --- routers/web/repo/issue.go | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index ea8a4b934c794..d28856e9250ae 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3355,20 +3355,6 @@ func IssuePosters(ctx *context.Context) { repo := ctx.Repo.Repository isPullList := ctx.Params(":type") == "pulls" isPullOption := util.OptionalBoolOf(isPullList) - var allPosters []*user_model.User - // test sending more posters to frontend - for i := 1; i < 300; i++ { - var err error - posters, err := repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) - if err != nil { - ctx.JSON(http.StatusInternalServerError, api.SearchError{ - OK: false, - Error: err.Error(), - }) - return - } - allPosters = append(allPosters, posters...) - } var err error posters, err := repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) if err != nil { @@ -3378,9 +3364,8 @@ func IssuePosters(ctx *context.Context) { }) return } - allPosters = append(allPosters, posters...) - results := make([]*api.UserSearchInfo, len(allPosters)) - for i, poster := range allPosters { + results := make([]*api.UserSearchInfo, len(posters)) + for i, poster := range posters { results[i] = convert.ToUserSearchInfo(ctx, poster) } // fmt.Println(results) From e619f6a0a5213d99b63a1096d0647b31c6d9eb10 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 30 Mar 2023 17:22:12 +0800 Subject: [PATCH 17/72] remove comments --- routers/web/repo/issue.go | 1 - 1 file changed, 1 deletion(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index d28856e9250ae..fdd4f20be6bb2 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3368,6 +3368,5 @@ func IssuePosters(ctx *context.Context) { for i, poster := range posters { results[i] = convert.ToUserSearchInfo(ctx, poster) } - // fmt.Println(results) ctx.JSON(http.StatusOK, results) } From d30b3b4c5bf37f8fe94cecbb6b3a66079ec5d209 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 30 Mar 2023 17:55:57 +0800 Subject: [PATCH 18/72] add aria --- web_src/js/features/repo-common.js | 5 ++++- web_src/js/modules/aria/dropdown.js | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 33d91f91784d6..1d4d354c62f08 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import {hideElem, showElem, toggleElem} from '../utils/dom.js'; - +import {updateMenuItem, ariaPatchKey} from '../modules/aria/dropdown.js'; const {csrfToken} = window.config; function getArchive($target, url, first) { @@ -135,5 +135,8 @@ export async function initPostersDropdown() { ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} `); } + const $items = $defaultMenu.find('> .item'); + $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); + $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); $authorSearchDropdown.dropdown('setting', 'values', values); } diff --git a/web_src/js/modules/aria/dropdown.js b/web_src/js/modules/aria/dropdown.js index e4c881b6af3ce..3072dec7b3946 100644 --- a/web_src/js/modules/aria/dropdown.js +++ b/web_src/js/modules/aria/dropdown.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import {generateAriaId} from './base.js'; -const ariaPatchKey = '_giteaAriaPatchDropdown'; +export const ariaPatchKey = '_giteaAriaPatchDropdown'; const fomanticDropdownFn = $.fn.dropdown; // use our own `$().dropdown` function to patch Fomantic's dropdown module @@ -34,7 +34,7 @@ function ariaDropdownFn(...args) { // make the item has role=option/menuitem, add an id if there wasn't one yet, make items as non-focusable // the elements inside the dropdown menu item should not be focusable, the focus should always be on the dropdown primary element. -function updateMenuItem(dropdown, item) { +export function updateMenuItem(dropdown, item) { if (!item.id) item.id = generateAriaId(); item.setAttribute('role', dropdown[ariaPatchKey].listItemRole); item.setAttribute('tabindex', '-1'); From ad83d135c683240882956264163148503125e0aa Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 31 Mar 2023 09:33:53 +0800 Subject: [PATCH 19/72] onresponse demo --- templates/repo/issue/list.tmpl | 17 +++++++ web_src/js/features/repo-common.js | 70 +++++++++++++++++++++++++++++ web_src/js/index.js | 5 ++- web_src/js/modules/aria/dropdown.js | 18 ++++++++ 4 files changed, 108 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 534115a2c02e4..ad5bd1b645d94 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -133,6 +133,23 @@ + + +
diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 1d4d354c62f08..32a96ae6463da 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -108,6 +108,76 @@ export function initRepoCommonLanguageStats() { } } +// generate dropdown options for authors search dropdown using fetched data +export async function initPostersDropdownTest() { + const $authorSearchDropdown = $('.author-search-1'); + if (!$authorSearchDropdown.length) { + return; + } + const url = $authorSearchDropdown.attr('data-url'); + $authorSearchDropdown.dropdown({ + fullTextSearch: 'exact', + selectOnKeydown: false, + action: 'hide', + onShow() { + // hide associated tooltip while dropdown is open + this._tippy?.hide(); + this._tippy?.disable(); + }, + onHide() { + this._tippy?.enable(); + + // hide all tippy elements of items after a while. eg: use Enter to click "Copy Link" in the Issue Context Menu + setTimeout(() => { + const $dropdown = $(this); + if ($dropdown.dropdown('is hidden')) { + $(this).find('.menu > .item').each((_, item) => { + item._tippy?.hide(); + }); + } + }, 2000); + }, + apiSettings: { + url, + throttle: 500, + cache: false, + // minCharacters: 2, + onResponse(res) { + console.log(res); + const postersJson = res; + if (!postersJson) { + $authorSearchDropdown.addClass('disabled'); + return; + } + const posterID = $authorSearchDropdown.attr('data-poster-id'); + const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); + const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); + // const values = $authorSearchDropdown.dropdown('setting values'); + const formattedResponse = { + success: true, + results: [], + }; + const userInput = $('#author-search-1-input').val(); + console.log(userInput); + $.each(postersJson, (_, poster) => { + const {id, avatar_url, username, full_name} = poster; + if (username.includes(userInput)) { + console.log(username); + formattedResponse.results.push({ + name: ` + + ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} + `, + value: id, + }); + } + }); + return formattedResponse; + }, + }, + }); +} + // generate dropdown options for authors search dropdown using fetched data export async function initPostersDropdown() { const $authorSearchDropdown = $('.author-search'); diff --git a/web_src/js/index.js b/web_src/js/index.js index be93335721ef8..6f7148a9564d5 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -64,7 +64,7 @@ import {initRepoTemplateSearch} from './features/repo-template.js'; import {initRepoCodeView} from './features/repo-code.js'; import {initSshKeyFormParser} from './features/sshkey-helper.js'; import {initUserSettings} from './features/user-settings.js'; -import {initRepoArchiveLinks, initPostersDropdown} from './features/repo-common.js'; +import {initRepoArchiveLinks, initPostersDropdown, initPostersDropdownTest} from './features/repo-common.js'; import {initRepoMigrationStatusChecker} from './features/repo-migrate.js'; import { initRepoSettingGitHook, @@ -186,7 +186,8 @@ $(document).ready(() => { initRepository(); initRepositoryActionView(); initPostersDropdown(); - + initPostersDropdownTest(); + initCommitStatuses(); initCaptcha(); diff --git a/web_src/js/modules/aria/dropdown.js b/web_src/js/modules/aria/dropdown.js index 3072dec7b3946..d8e16e78bdd76 100644 --- a/web_src/js/modules/aria/dropdown.js +++ b/web_src/js/modules/aria/dropdown.js @@ -69,6 +69,24 @@ function delegateOne($dropdown) { $dropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); return $wrapper.html(); }; + + if ($dropdown.attr('id') === 'author-search-1') { + dropdownTemplates.menu = function(response, fields, preserveHTML, className) { + console.log('menuuu') + // when the dropdown menu items are loaded from AJAX requests, the items are created dynamically + // const menuItems = dropdownTemplatesMenuOld(response, fields, preserveHTML, className); + let menuItems = $('#menu-default-input').prop('outerHTML') + $('#menu-default-search-all').prop('outerHTML'); + let values = response[fields.values] || []; + $.each(values, function(_, option) { + menuItems += option[fields.name]; + }) + const $wrapper = $('
').append(menuItems); + const $items = $wrapper.find('> .item'); + $items.each((_, item) => updateMenuItem($dropdown[0], item)); + $dropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); + return menuItems; + }; + } dropdownCall('setting', 'templates', dropdownTemplates); // the `onLabelCreate` is used to add necessary aria attributes for dynamically created selection labels From 3abfabb1089f915f5ab83c7f1d0989380ad9bc1e Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 31 Mar 2023 09:38:38 +0800 Subject: [PATCH 20/72] demo --- web_src/js/features/repo-common.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 32a96ae6463da..8dc13f9a6e445 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -141,7 +141,7 @@ export async function initPostersDropdownTest() { url, throttle: 500, cache: false, - // minCharacters: 2, + minCharacters: 2, onResponse(res) { console.log(res); const postersJson = res; @@ -161,7 +161,7 @@ export async function initPostersDropdownTest() { console.log(userInput); $.each(postersJson, (_, poster) => { const {id, avatar_url, username, full_name} = poster; - if (username.includes(userInput)) { + if (username.includes(userInput) || userInput === '') { console.log(username); formattedResponse.results.push({ name: ` From f09614035dd515caf127d6fad7ba279f49f80689 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 31 Mar 2023 09:54:07 +0800 Subject: [PATCH 21/72] modify --- web_src/js/features/repo-common.js | 4 +--- web_src/js/modules/aria/dropdown.js | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 8dc13f9a6e445..c74db2c67d0d0 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -108,7 +108,7 @@ export function initRepoCommonLanguageStats() { } } -// generate dropdown options for authors search dropdown using fetched data +// generate dropdown options for authors search dropdown using fetched data (onResponse) export async function initPostersDropdownTest() { const $authorSearchDropdown = $('.author-search-1'); if (!$authorSearchDropdown.length) { @@ -158,11 +158,9 @@ export async function initPostersDropdownTest() { results: [], }; const userInput = $('#author-search-1-input').val(); - console.log(userInput); $.each(postersJson, (_, poster) => { const {id, avatar_url, username, full_name} = poster; if (username.includes(userInput) || userInput === '') { - console.log(username); formattedResponse.results.push({ name: ` diff --git a/web_src/js/modules/aria/dropdown.js b/web_src/js/modules/aria/dropdown.js index d8e16e78bdd76..c5e945dba4da5 100644 --- a/web_src/js/modules/aria/dropdown.js +++ b/web_src/js/modules/aria/dropdown.js @@ -74,14 +74,14 @@ function delegateOne($dropdown) { dropdownTemplates.menu = function(response, fields, preserveHTML, className) { console.log('menuuu') // when the dropdown menu items are loaded from AJAX requests, the items are created dynamically - // const menuItems = dropdownTemplatesMenuOld(response, fields, preserveHTML, className); + // TODO: everytime after onresponse, the input is cleared.. should fix this in a proper way let menuItems = $('#menu-default-input').prop('outerHTML') + $('#menu-default-search-all').prop('outerHTML'); let values = response[fields.values] || []; $.each(values, function(_, option) { menuItems += option[fields.name]; }) const $wrapper = $('
').append(menuItems); - const $items = $wrapper.find('> .item'); + const $items = $wrapper.find('.menu > .item'); $items.each((_, item) => updateMenuItem($dropdown[0], item)); $dropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); return menuItems; From 5259ae9a83de866dda586bed897be517e34e42ca Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 31 Mar 2023 14:49:44 +0800 Subject: [PATCH 22/72] save for now --- models/repo/user_repo.go | 12 +++++++ routers/web/repo/issue.go | 6 +++- templates/repo/issue/list.tmpl | 2 +- web_src/js/features/repo-common.js | 56 +++++++++++++++++------------- 4 files changed, 49 insertions(+), 27 deletions(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index cdb266e014a96..1ac6a2e4d0fad 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -166,3 +166,15 @@ func GetIssuePosters(ctx context.Context, repo *Repository, isPull bool) ([]*use ) return users, db.GetEngine(ctx).Where(cond).OrderBy(user_model.GetOrderByName()).Find(&users) } + +// GetIssuePosters returns all users that have authored an issue/pull request for the given repository +func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull bool, prefix string) ([]*user_model.User, error) { + users := make([]*user_model.User, 0, 8) + cond := builder.In("`user`.id", + builder.Select("poster_id").From("issue").Where( + builder.Eq{"repo_id": repo.ID}. + And(builder.Eq{"is_pull": isPull}), + ).GroupBy("poster_id"), + ) + return users, db.GetEngine(ctx).Where(cond).Table("user").Where("name LIKE ?", prefix+"%").OrderBy(user_model.GetOrderByName()).Find(&users) +} diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index fdd4f20be6bb2..e614dd39bd91f 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3356,7 +3356,11 @@ func IssuePosters(ctx *context.Context) { isPullList := ctx.Params(":type") == "pulls" isPullOption := util.OptionalBoolOf(isPullList) var err error - posters, err := repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) + // posters, err := repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) + prefix := strings.Trim(ctx.FormString("q"), " ") + fmt.Println("prefixprefixprefix") + fmt.Println(prefix) + posters, err := repo_model.GetIssuePostersWithPrefix(ctx, repo, isPullOption.IsTrue(), prefix) if err != nil { ctx.JSON(http.StatusInternalServerError, api.SearchError{ OK: false, diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index ad5bd1b645d94..1c2d7dd7ef3e2 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -127,7 +127,7 @@
{{svg "octicon-search" 16}} - +
{{.locale.Tr "repo.issues.filter_poster_no_select"}}
diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index c74db2c67d0d0..44ffd5f0fec91 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -177,34 +177,40 @@ export async function initPostersDropdownTest() { } // generate dropdown options for authors search dropdown using fetched data -export async function initPostersDropdown() { +export function initPostersDropdown() { const $authorSearchDropdown = $('.author-search'); if (!$authorSearchDropdown.length) { return; } const url = $authorSearchDropdown.attr('data-url'); - const res = await fetch(url, { - method: 'GET' - }); - const postersJson = await res.json(); - if (!postersJson) { - $authorSearchDropdown.addClass('disabled'); - return; - } - const posterID = $authorSearchDropdown.attr('data-poster-id'); - const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); - const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); - const values = $authorSearchDropdown.dropdown('setting values'); - const $defaultMenu = $(values[0]).find('.menu'); - for (let i = 0; i < postersJson.length; i++) { - const {id, avatar_url, username, full_name} = postersJson[i]; - $defaultMenu.append(` - - ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} - `); - } - const $items = $defaultMenu.find('> .item'); - $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); - $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); - $authorSearchDropdown.dropdown('setting', 'values', values); + const $authorSearchInput = $('#author-search-input'); + $authorSearchInput.on('input', async function getFilteredPosters(e) { + e.stopImmediatePropagation(); + const res = await fetch(`${url}?q=${$('#author-search-input').val()}`, { + method: 'GET' + }); + const postersJson = await res.json(); + console.log(postersJson) + if (!postersJson) { + $authorSearchDropdown.addClass('disabled'); + return; + } + const posterID = $authorSearchDropdown.attr('data-poster-id'); + const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); + const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); + const values = $authorSearchDropdown.dropdown('setting values'); + const $defaultMenu = $(values[0]).find('.menu'); + $defaultMenu.find(".item:gt(0)").remove(); + for (let i = 0; i < postersJson.length; i++) { + const {id, avatar_url, username, full_name} = postersJson[i]; + $defaultMenu.append(` + + ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} + `); + } + const $items = $defaultMenu.find('> .item'); + $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); + $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); + $authorSearchDropdown.dropdown('setting', 'values', values); + }) } From 02643bec3ba9773f024b3fdb67f40bfc84040a75 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 31 Mar 2023 16:08:55 +0800 Subject: [PATCH 23/72] remove onresponse demo --- models/repo/user_repo.go | 2 +- templates/repo/issue/list.tmpl | 17 ---- web_src/js/features/repo-common.js | 135 ++++++++-------------------- web_src/js/index.js | 3 +- web_src/js/modules/aria/dropdown.js | 18 ---- 5 files changed, 38 insertions(+), 137 deletions(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 1ac6a2e4d0fad..f9b1edba1051b 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -176,5 +176,5 @@ func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull boo And(builder.Eq{"is_pull": isPull}), ).GroupBy("poster_id"), ) - return users, db.GetEngine(ctx).Where(cond).Table("user").Where("name LIKE ?", prefix+"%").OrderBy(user_model.GetOrderByName()).Find(&users) + return users, db.GetEngine(ctx).Where(cond).Table("user").Where("name LIKE ?", prefix+"%").OrderBy(user_model.GetOrderByName()).Limit(30).Find(&users) } diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 1c2d7dd7ef3e2..ca7919551a073 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -133,23 +133,6 @@
- - -
diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 44ffd5f0fec91..974307240e51e 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -108,109 +108,46 @@ export function initRepoCommonLanguageStats() { } } -// generate dropdown options for authors search dropdown using fetched data (onResponse) -export async function initPostersDropdownTest() { - const $authorSearchDropdown = $('.author-search-1'); - if (!$authorSearchDropdown.length) { - return; - } - const url = $authorSearchDropdown.attr('data-url'); - $authorSearchDropdown.dropdown({ - fullTextSearch: 'exact', - selectOnKeydown: false, - action: 'hide', - onShow() { - // hide associated tooltip while dropdown is open - this._tippy?.hide(); - this._tippy?.disable(); - }, - onHide() { - this._tippy?.enable(); - - // hide all tippy elements of items after a while. eg: use Enter to click "Copy Link" in the Issue Context Menu - setTimeout(() => { - const $dropdown = $(this); - if ($dropdown.dropdown('is hidden')) { - $(this).find('.menu > .item').each((_, item) => { - item._tippy?.hide(); - }); - } - }, 2000); - }, - apiSettings: { - url, - throttle: 500, - cache: false, - minCharacters: 2, - onResponse(res) { - console.log(res); - const postersJson = res; - if (!postersJson) { - $authorSearchDropdown.addClass('disabled'); - return; - } - const posterID = $authorSearchDropdown.attr('data-poster-id'); - const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); - const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); - // const values = $authorSearchDropdown.dropdown('setting values'); - const formattedResponse = { - success: true, - results: [], - }; - const userInput = $('#author-search-1-input').val(); - $.each(postersJson, (_, poster) => { - const {id, avatar_url, username, full_name} = poster; - if (username.includes(userInput) || userInput === '') { - formattedResponse.results.push({ - name: ` - - ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} - `, - value: id, - }); - } - }); - return formattedResponse; - }, - }, - }); -} - // generate dropdown options for authors search dropdown using fetched data export function initPostersDropdown() { const $authorSearchDropdown = $('.author-search'); + $('#author-search-input').on('input', function(e) { + e.stopImmediatePropagation(); + fetchPostersData($authorSearchDropdown, false); + }); + $authorSearchDropdown.on('click', function() { + fetchPostersData($authorSearchDropdown, true); + }); +} + +async function fetchPostersData($authorSearchDropdown, isShowAll) { if (!$authorSearchDropdown.length) { return; } - const url = $authorSearchDropdown.attr('data-url'); - const $authorSearchInput = $('#author-search-input'); - $authorSearchInput.on('input', async function getFilteredPosters(e) { - e.stopImmediatePropagation(); - const res = await fetch(`${url}?q=${$('#author-search-input').val()}`, { - method: 'GET' - }); - const postersJson = await res.json(); - console.log(postersJson) - if (!postersJson) { - $authorSearchDropdown.addClass('disabled'); - return; - } - const posterID = $authorSearchDropdown.attr('data-poster-id'); - const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); - const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); - const values = $authorSearchDropdown.dropdown('setting values'); - const $defaultMenu = $(values[0]).find('.menu'); - $defaultMenu.find(".item:gt(0)").remove(); - for (let i = 0; i < postersJson.length; i++) { - const {id, avatar_url, username, full_name} = postersJson[i]; - $defaultMenu.append(` - - ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} - `); - } - const $items = $defaultMenu.find('> .item'); - $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); - $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); - $authorSearchDropdown.dropdown('setting', 'values', values); - }) + const baseUrl = $authorSearchDropdown.attr('data-url'); + const url = isShowAll ? baseUrl: `${baseUrl}?q=${$('#author-search-input').val()}`; + const res = await fetch(url); + const postersJson = await res.json(); + if (!postersJson) { + $authorSearchDropdown.addClass('disabled'); + return; + } + const posterID = $authorSearchDropdown.attr('data-poster-id'); + const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); + const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); + const values = $authorSearchDropdown.dropdown('setting values'); + const $defaultMenu = $(values[0]).find('.menu'); + // remove former options, then append newly searched options + $defaultMenu.find(".item:gt(0)").remove(); + for (let i = 0; i < postersJson.length; i++) { + const {id, avatar_url, username, full_name} = postersJson[i]; + $defaultMenu.append(` + + ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} + `); + } + const $items = $defaultMenu.find('> .item'); + $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); + $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); + $authorSearchDropdown.dropdown('setting', 'values', values); } diff --git a/web_src/js/index.js b/web_src/js/index.js index 6f7148a9564d5..416a28fd604aa 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -64,7 +64,7 @@ import {initRepoTemplateSearch} from './features/repo-template.js'; import {initRepoCodeView} from './features/repo-code.js'; import {initSshKeyFormParser} from './features/sshkey-helper.js'; import {initUserSettings} from './features/user-settings.js'; -import {initRepoArchiveLinks, initPostersDropdown, initPostersDropdownTest} from './features/repo-common.js'; +import {initRepoArchiveLinks, initPostersDropdown} from './features/repo-common.js'; import {initRepoMigrationStatusChecker} from './features/repo-migrate.js'; import { initRepoSettingGitHook, @@ -186,7 +186,6 @@ $(document).ready(() => { initRepository(); initRepositoryActionView(); initPostersDropdown(); - initPostersDropdownTest(); initCommitStatuses(); initCaptcha(); diff --git a/web_src/js/modules/aria/dropdown.js b/web_src/js/modules/aria/dropdown.js index c5e945dba4da5..3072dec7b3946 100644 --- a/web_src/js/modules/aria/dropdown.js +++ b/web_src/js/modules/aria/dropdown.js @@ -69,24 +69,6 @@ function delegateOne($dropdown) { $dropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); return $wrapper.html(); }; - - if ($dropdown.attr('id') === 'author-search-1') { - dropdownTemplates.menu = function(response, fields, preserveHTML, className) { - console.log('menuuu') - // when the dropdown menu items are loaded from AJAX requests, the items are created dynamically - // TODO: everytime after onresponse, the input is cleared.. should fix this in a proper way - let menuItems = $('#menu-default-input').prop('outerHTML') + $('#menu-default-search-all').prop('outerHTML'); - let values = response[fields.values] || []; - $.each(values, function(_, option) { - menuItems += option[fields.name]; - }) - const $wrapper = $('
').append(menuItems); - const $items = $wrapper.find('.menu > .item'); - $items.each((_, item) => updateMenuItem($dropdown[0], item)); - $dropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); - return menuItems; - }; - } dropdownCall('setting', 'templates', dropdownTemplates); // the `onLabelCreate` is used to add necessary aria attributes for dynamically created selection labels From e08561c4af1721109130f53ab040712482ea6b45 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 31 Mar 2023 16:43:49 +0800 Subject: [PATCH 24/72] fullname logic --- models/repo/user_repo.go | 7 +++++-- routers/web/repo/issue.go | 6 ++---- web_src/js/features/repo-common.js | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index f9b1edba1051b..5cd868a75e38e 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -167,8 +167,8 @@ func GetIssuePosters(ctx context.Context, repo *Repository, isPull bool) ([]*use return users, db.GetEngine(ctx).Where(cond).OrderBy(user_model.GetOrderByName()).Find(&users) } -// GetIssuePosters returns all users that have authored an issue/pull request for the given repository -func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull bool, prefix string) ([]*user_model.User, error) { +// GetIssuePosters returns all users whose user name started with prefix that have authored an issue/pull request for the given repository +func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull bool, prefix string, isShowFullName bool) ([]*user_model.User, error) { users := make([]*user_model.User, 0, 8) cond := builder.In("`user`.id", builder.Select("poster_id").From("issue").Where( @@ -176,5 +176,8 @@ func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull boo And(builder.Eq{"is_pull": isPull}), ).GroupBy("poster_id"), ) + if isShowFullName { + return users, db.GetEngine(ctx).Where(cond).Table("user").Where("name LIKE ? or full_name LIKE ?", prefix+"%", prefix+"%").OrderBy(user_model.GetOrderByName()).Limit(30).Find(&users) + } return users, db.GetEngine(ctx).Where(cond).Table("user").Where("name LIKE ?", prefix+"%").OrderBy(user_model.GetOrderByName()).Limit(30).Find(&users) } diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index e614dd39bd91f..a53b87f813e0b 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3355,12 +3355,10 @@ func IssuePosters(ctx *context.Context) { repo := ctx.Repo.Repository isPullList := ctx.Params(":type") == "pulls" isPullOption := util.OptionalBoolOf(isPullList) + isShowFullName := setting.UI.DefaultShowFullName var err error - // posters, err := repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue()) prefix := strings.Trim(ctx.FormString("q"), " ") - fmt.Println("prefixprefixprefix") - fmt.Println(prefix) - posters, err := repo_model.GetIssuePostersWithPrefix(ctx, repo, isPullOption.IsTrue(), prefix) + posters, err := repo_model.GetIssuePostersWithPrefix(ctx, repo, isPullOption.IsTrue(), prefix, isShowFullName) if err != nil { ctx.JSON(http.StatusInternalServerError, api.SearchError{ OK: false, diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 974307240e51e..9fc1c97b1c3bd 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -137,7 +137,7 @@ async function fetchPostersData($authorSearchDropdown, isShowAll) { const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); const values = $authorSearchDropdown.dropdown('setting values'); const $defaultMenu = $(values[0]).find('.menu'); - // remove former options, then append newly searched options + // remove former options, then append newly searched posters $defaultMenu.find(".item:gt(0)").remove(); for (let i = 0; i < postersJson.length; i++) { const {id, avatar_url, username, full_name} = postersJson[i]; From 7e7868cbf7c7a099564a0acad238627f6851e248 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 31 Mar 2023 16:45:49 +0800 Subject: [PATCH 25/72] remove unnecessary --- web_src/js/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index 416a28fd604aa..be93335721ef8 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -186,7 +186,7 @@ $(document).ready(() => { initRepository(); initRepositoryActionView(); initPostersDropdown(); - + initCommitStatuses(); initCaptcha(); From 33df17b6bcdfb6abf83afd522acd63e3cf901bd1 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 31 Mar 2023 16:54:18 +0800 Subject: [PATCH 26/72] comments --- models/repo/user_repo.go | 1 + routers/web/repo/issue.go | 1 + web_src/js/features/repo-common.js | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 5cd868a75e38e..44e7ce3bb74fc 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -168,6 +168,7 @@ func GetIssuePosters(ctx context.Context, repo *Repository, isPull bool) ([]*use } // GetIssuePosters returns all users whose user name started with prefix that have authored an issue/pull request for the given repository +// if isShowFullName is set to true, also include full name prefix search func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull bool, prefix string, isShowFullName bool) ([]*user_model.User, error) { users := make([]*user_model.User, 0, 8) cond := builder.In("`user`.id", diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index a53b87f813e0b..9b8700dc5f62e 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3366,6 +3366,7 @@ func IssuePosters(ctx *context.Context) { }) return } + // only pass user info needed for generating options used by authors search dropdown to the frontend results := make([]*api.UserSearchInfo, len(posters)) for i, poster := range posters { results[i] = convert.ToUserSearchInfo(ctx, poster) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 9fc1c97b1c3bd..f8bee1b14fe77 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -115,11 +115,13 @@ export function initPostersDropdown() { e.stopImmediatePropagation(); fetchPostersData($authorSearchDropdown, false); }); - $authorSearchDropdown.on('click', function() { + // show all results when clicking on the dropdown + $authorSearchDropdown.on('click', function(e) { fetchPostersData($authorSearchDropdown, true); }); } +// isShowAll decides if fetching all data or fetching data with search query async function fetchPostersData($authorSearchDropdown, isShowAll) { if (!$authorSearchDropdown.length) { return; @@ -132,6 +134,7 @@ async function fetchPostersData($authorSearchDropdown, isShowAll) { $authorSearchDropdown.addClass('disabled'); return; } + // get data needed from data- attributes for generating the poster options const posterID = $authorSearchDropdown.attr('data-poster-id'); const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); @@ -146,6 +149,7 @@ async function fetchPostersData($authorSearchDropdown, isShowAll) { ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} `); } + // append aria related attributes to newly added menu items const $items = $defaultMenu.find('> .item'); $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); From 03a9654be382128965a54d4c6a53024f533ce487 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 31 Mar 2023 16:59:49 +0800 Subject: [PATCH 27/72] comments --- web_src/js/features/repo-common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index f8bee1b14fe77..b65a579326bce 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -121,7 +121,7 @@ export function initPostersDropdown() { }); } -// isShowAll decides if fetching all data or fetching data with search query +// isShowAll decides if fetching all data or fetching data with search query from user input async function fetchPostersData($authorSearchDropdown, isShowAll) { if (!$authorSearchDropdown.length) { return; From 88dbd4f3adbaf4e4dd847f852045d0fdde91996d Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 11:19:42 +0800 Subject: [PATCH 28/72] fix pulls param --- routers/web/repo/issue.go | 30 ++++++++++++++++++++++++++++++ templates/repo/issue/list.tmpl | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 9b8700dc5f62e..e46bb27eeb39b 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -12,10 +12,12 @@ import ( "math/big" "net/http" "net/url" + "reflect" "sort" "strconv" "strings" "time" + "unsafe" activities_model "code.gitea.io/gitea/models/activities" "code.gitea.io/gitea/models/db" @@ -415,6 +417,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti // Issues render issues page func Issues(ctx *context.Context) { isPullList := ctx.Params(":type") == "pulls" + ctx.Data["listType"] = ctx.Params(":type") if isPullList { MustAllowPulls(ctx) if ctx.Written() { @@ -3351,6 +3354,33 @@ func handleTeamMentions(ctx *context.Context) { ctx.Data["MentionableTeamsOrgAvatar"] = ctx.Repo.Owner.AvatarLink(ctx) } +func printContextInternals(ctx interface{}, inner bool) { + contextValues := reflect.ValueOf(ctx).Elem() + contextKeys := reflect.TypeOf(ctx).Elem() + + if !inner { + fmt.Printf("\nFields for %s.%s\n", contextKeys.PkgPath(), contextKeys.Name()) + } + + if contextKeys.Kind() == reflect.Struct { + for i := 0; i < contextValues.NumField(); i++ { + reflectValue := contextValues.Field(i) + reflectValue = reflect.NewAt(reflectValue.Type(), unsafe.Pointer(reflectValue.UnsafeAddr())).Elem() + + reflectField := contextKeys.Field(i) + + if reflectField.Name == "Context" { + printContextInternals(reflectValue.Interface(), true) + } else { + fmt.Printf("field name: %+v\n", reflectField.Name) + fmt.Printf("value: %+v\n", reflectValue.Interface()) + } + } + } else { + fmt.Printf("context is empty (int)\n") + } +} + func IssuePosters(ctx *context.Context) { repo := ctx.Repo.Repository isPullList := ctx.Params(":type") == "pulls" diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index f9b7d1c8cf186..d30a8c49c3f76 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -117,7 +117,7 @@
-
From 1fa5f30f6c0a562890eb39e376945ac4177686b3 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 11:20:13 +0800 Subject: [PATCH 29/72] remove print --- routers/web/repo/issue.go | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index e46bb27eeb39b..2f046433975a8 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -12,12 +12,10 @@ import ( "math/big" "net/http" "net/url" - "reflect" "sort" "strconv" "strings" "time" - "unsafe" activities_model "code.gitea.io/gitea/models/activities" "code.gitea.io/gitea/models/db" @@ -3354,33 +3352,6 @@ func handleTeamMentions(ctx *context.Context) { ctx.Data["MentionableTeamsOrgAvatar"] = ctx.Repo.Owner.AvatarLink(ctx) } -func printContextInternals(ctx interface{}, inner bool) { - contextValues := reflect.ValueOf(ctx).Elem() - contextKeys := reflect.TypeOf(ctx).Elem() - - if !inner { - fmt.Printf("\nFields for %s.%s\n", contextKeys.PkgPath(), contextKeys.Name()) - } - - if contextKeys.Kind() == reflect.Struct { - for i := 0; i < contextValues.NumField(); i++ { - reflectValue := contextValues.Field(i) - reflectValue = reflect.NewAt(reflectValue.Type(), unsafe.Pointer(reflectValue.UnsafeAddr())).Elem() - - reflectField := contextKeys.Field(i) - - if reflectField.Name == "Context" { - printContextInternals(reflectValue.Interface(), true) - } else { - fmt.Printf("field name: %+v\n", reflectField.Name) - fmt.Printf("value: %+v\n", reflectValue.Interface()) - } - } - } else { - fmt.Printf("context is empty (int)\n") - } -} - func IssuePosters(ctx *context.Context) { repo := ctx.Repo.Repository isPullList := ctx.Params(":type") == "pulls" From 87e55e18127c48f633ff17ab225f5d658e824df6 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 11:50:57 +0800 Subject: [PATCH 30/72] comments --- models/repo/user_repo.go | 4 ++-- modules/structs/user.go | 2 +- routers/web/repo/issue.go | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 44e7ce3bb74fc..4f70fe8e22afd 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -167,8 +167,8 @@ func GetIssuePosters(ctx context.Context, repo *Repository, isPull bool) ([]*use return users, db.GetEngine(ctx).Where(cond).OrderBy(user_model.GetOrderByName()).Find(&users) } -// GetIssuePosters returns all users whose user name started with prefix that have authored an issue/pull request for the given repository -// if isShowFullName is set to true, also include full name prefix search +// GetIssuePosters returns users with limit of 30 whose user name started with prefix that have authored an issue/pull request for the given repository +// If isShowFullName is set to true, also include full name prefix search func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull bool, prefix string, isShowFullName bool) ([]*user_model.User, error) { users := make([]*user_model.User, 0, 8) cond := builder.In("`user`.id", diff --git a/modules/structs/user.go b/modules/structs/user.go index ea2bf6f30e130..908b26b7b55ea 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -54,7 +54,7 @@ type User struct { StarredRepos int `json:"starred_repos_count"` } -// UserSearchInfo represents user info needed when using user search dropdown +// UserSearchInfo represents user info needed to be displayed in author search dropdown in frontend type UserSearchInfo struct { // the user's id ID int64 `json:"id"` diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 2f046433975a8..32b9b6327bf05 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -415,6 +415,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti // Issues render issues page func Issues(ctx *context.Context) { isPullList := ctx.Params(":type") == "pulls" + // pass listType which will be used by GET /{type:issues|pulls}/posters request ctx.Data["listType"] = ctx.Params(":type") if isPullList { MustAllowPulls(ctx) From 7eec9e7367d023b0a554b81cc7b2e98469172c36 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 13:16:40 +0800 Subject: [PATCH 31/72] use native for now --- web_src/js/features/repo-common.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index b65a579326bce..6a816d0c1a505 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -138,8 +138,7 @@ async function fetchPostersData($authorSearchDropdown, isShowAll) { const posterID = $authorSearchDropdown.attr('data-poster-id'); const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); - const values = $authorSearchDropdown.dropdown('setting values'); - const $defaultMenu = $(values[0]).find('.menu'); + const $defaultMenu = $authorSearchDropdown.find('.menu'); // remove former options, then append newly searched posters $defaultMenu.find(".item:gt(0)").remove(); for (let i = 0; i < postersJson.length; i++) { @@ -153,5 +152,4 @@ async function fetchPostersData($authorSearchDropdown, isShowAll) { const $items = $defaultMenu.find('> .item'); $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); - $authorSearchDropdown.dropdown('setting', 'values', values); } From 8e8ab907e374171d13f8ace85623ceaf40c2ccb5 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 13:31:46 +0800 Subject: [PATCH 32/72] add tooltip --- options/locale/locale_en-US.ini | 1 + templates/repo/issue/list.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b7180d7967119..e7fb6c4cba631 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -933,6 +933,7 @@ delete_preexisting = Delete pre-existing files delete_preexisting_content = Delete files in %s delete_preexisting_success = Deleted unadopted files in %s blame_prior = View blame prior to this change +author_search_tooltip = Shows former 30 authors matching the prefix transfer.accept = Accept Transfer transfer.accept_desc = Transfer to "%s" diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index d30a8c49c3f76..0afee405b7dcb 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -117,7 +117,7 @@
-
From a9d4e0103f00b2886204a57b578835ab7aaaa901 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 13:33:13 +0800 Subject: [PATCH 33/72] tooltip add to milestone issues --- templates/repo/issue/milestone_issues.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 6fa04e3ff3e09..2f5bc7dc09efc 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -71,7 +71,7 @@
-
{{.locale.Tr "repo.issues.filter_poster"}} From c1f82df83fe6638c1f087188ce8dc02221da78fe Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 14:19:43 +0800 Subject: [PATCH 34/72] reset input --- web_src/js/features/repo-common.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 6a816d0c1a505..410e48957a488 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -116,7 +116,8 @@ export function initPostersDropdown() { fetchPostersData($authorSearchDropdown, false); }); // show all results when clicking on the dropdown - $authorSearchDropdown.on('click', function(e) { + $authorSearchDropdown.on('click', function() { + $('#author-search-input').val(''); fetchPostersData($authorSearchDropdown, true); }); } From 74f5a8fe84169db52835f14469e5b9a2a9352c86 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 14:28:05 +0800 Subject: [PATCH 35/72] lint --- web_src/js/features/repo-common.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 410e48957a488..523930944ce9a 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -111,12 +111,17 @@ export function initRepoCommonLanguageStats() { // generate dropdown options for authors search dropdown using fetched data export function initPostersDropdown() { const $authorSearchDropdown = $('.author-search'); - $('#author-search-input').on('input', function(e) { + $('#author-search-input').on('input', (e) => { e.stopImmediatePropagation(); fetchPostersData($authorSearchDropdown, false); }); // show all results when clicking on the dropdown - $authorSearchDropdown.on('click', function() { + $authorSearchDropdown.on('click', () => { + // if dropdown is from visible to not, do not need to fetch data + if ($authorSearchDropdown.attr('aria-expanded') === 'true') { + return; + } + // reset input value $('#author-search-input').val(''); fetchPostersData($authorSearchDropdown, true); }); @@ -128,7 +133,7 @@ async function fetchPostersData($authorSearchDropdown, isShowAll) { return; } const baseUrl = $authorSearchDropdown.attr('data-url'); - const url = isShowAll ? baseUrl: `${baseUrl}?q=${$('#author-search-input').val()}`; + const url = isShowAll ? baseUrl : `${baseUrl}?q=${$('#author-search-input').val()}`; const res = await fetch(url); const postersJson = await res.json(); if (!postersJson) { @@ -141,7 +146,7 @@ async function fetchPostersData($authorSearchDropdown, isShowAll) { const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); const $defaultMenu = $authorSearchDropdown.find('.menu'); // remove former options, then append newly searched posters - $defaultMenu.find(".item:gt(0)").remove(); + $defaultMenu.find('.item:gt(0)').remove(); for (let i = 0; i < postersJson.length; i++) { const {id, avatar_url, username, full_name} = postersJson[i]; $defaultMenu.append(` From 11927182c9730462bc06348bcd72c68b4a36086f Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 14:30:40 +0800 Subject: [PATCH 36/72] comment --- routers/web/repo/issue.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 32b9b6327bf05..29024fe6d1ef0 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -415,7 +415,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti // Issues render issues page func Issues(ctx *context.Context) { isPullList := ctx.Params(":type") == "pulls" - // pass listType which will be used by GET /{type:issues|pulls}/posters request + // pass listType to ctx.Data which will be used by GET /{type:issues|pulls}/posters request ctx.Data["listType"] = ctx.Params(":type") if isPullList { MustAllowPulls(ctx) @@ -3353,6 +3353,7 @@ func handleTeamMentions(ctx *context.Context) { ctx.Data["MentionableTeamsOrgAvatar"] = ctx.Repo.Owner.AvatarLink(ctx) } +// get posters for current repo's issues/pull requests func IssuePosters(ctx *context.Context) { repo := ctx.Repo.Repository isPullList := ctx.Params(":type") == "pulls" From 5a6d3037a5d0cb0804a4ad1f278a3be1ae1fd5a6 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 14:51:24 +0800 Subject: [PATCH 37/72] add missing id to milestone issues --- templates/repo/issue/milestone_issues.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 2f5bc7dc09efc..ecf6bb98f6ddb 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -80,7 +80,7 @@
{{svg "octicon-search" 16}} - +
{{.locale.Tr "repo.issues.filter_poster_no_select"}}
From b184a0707444a3997f2d853743a42a7e42551369 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 14:55:13 +0800 Subject: [PATCH 38/72] move .length --- web_src/js/features/repo-common.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 523930944ce9a..07c29890671b4 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -111,6 +111,9 @@ export function initRepoCommonLanguageStats() { // generate dropdown options for authors search dropdown using fetched data export function initPostersDropdown() { const $authorSearchDropdown = $('.author-search'); + if (!$authorSearchDropdown.length) { + return; + } $('#author-search-input').on('input', (e) => { e.stopImmediatePropagation(); fetchPostersData($authorSearchDropdown, false); @@ -129,9 +132,7 @@ export function initPostersDropdown() { // isShowAll decides if fetching all data or fetching data with search query from user input async function fetchPostersData($authorSearchDropdown, isShowAll) { - if (!$authorSearchDropdown.length) { - return; - } + console.log('fetch') const baseUrl = $authorSearchDropdown.attr('data-url'); const url = isShowAll ? baseUrl : `${baseUrl}?q=${$('#author-search-input').val()}`; const res = await fetch(url); From 4fb76f58003478121faae356a2a6eb9a002bf3fa Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 14:55:57 +0800 Subject: [PATCH 39/72] move .length --- web_src/js/features/repo-common.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 07c29890671b4..9fd54db89a74d 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -132,7 +132,6 @@ export function initPostersDropdown() { // isShowAll decides if fetching all data or fetching data with search query from user input async function fetchPostersData($authorSearchDropdown, isShowAll) { - console.log('fetch') const baseUrl = $authorSearchDropdown.attr('data-url'); const url = isShowAll ? baseUrl : `${baseUrl}?q=${$('#author-search-input').val()}`; const res = await fetch(url); From 23831e5634e14b007bc97d9c27dbd9c661e53f9a Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 15:06:27 +0800 Subject: [PATCH 40/72] fix lint --- templates/repo/issue/list.tmpl | 2 +- templates/repo/issue/milestone_issues.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 0afee405b7dcb..6d3c3b2e0ee64 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -117,7 +117,7 @@
-
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index ecf6bb98f6ddb..c2a556d364d3c 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -71,7 +71,7 @@
-
{{.locale.Tr "repo.issues.filter_poster"}} From 2baaa7f065e90aeb8235a50c72db62dc80b4fe53 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 17:13:45 +0800 Subject: [PATCH 41/72] only get necesssary columns from database --- models/repo/user_repo.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 4f70fe8e22afd..8456b30d757d8 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -178,7 +178,21 @@ func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull boo ).GroupBy("poster_id"), ) if isShowFullName { - return users, db.GetEngine(ctx).Where(cond).Table("user").Where("name LIKE ? or full_name LIKE ?", prefix+"%", prefix+"%").OrderBy(user_model.GetOrderByName()).Limit(30).Find(&users) + return users, db.GetEngine(ctx). + Where(cond). + Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar"). + Table("user"). + Where("name LIKE ? or full_name LIKE ?", prefix+"%", prefix+"%"). + OrderBy(user_model.GetOrderByName()). + Limit(30). + Find(&users) } - return users, db.GetEngine(ctx).Where(cond).Table("user").Where("name LIKE ?", prefix+"%").OrderBy(user_model.GetOrderByName()).Limit(30).Find(&users) + return users, db.GetEngine(ctx). + Where(cond). + Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar"). + Table("user"). + Where("name LIKE ?", prefix+"%"). + OrderBy(user_model.GetOrderByName()). + Limit(30). + Find(&users) } From bb97213a5c9aff72b5f194fa0df383c8969f3e40 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 17:42:42 +0800 Subject: [PATCH 42/72] use builder.like --- models/repo/user_repo.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 8456b30d757d8..02487fe8dbbdc 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -171,27 +171,20 @@ func GetIssuePosters(ctx context.Context, repo *Repository, isPull bool) ([]*use // If isShowFullName is set to true, also include full name prefix search func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull bool, prefix string, isShowFullName bool) ([]*user_model.User, error) { users := make([]*user_model.User, 0, 8) + var prefixCond builder.Cond = builder.Like{"name", prefix + "%"} + if isShowFullName { + prefixCond = prefixCond.Or(builder.Like{"full_name", prefix + "%"}) + } cond := builder.In("`user`.id", builder.Select("poster_id").From("issue").Where( builder.Eq{"repo_id": repo.ID}. And(builder.Eq{"is_pull": isPull}), - ).GroupBy("poster_id"), - ) - if isShowFullName { - return users, db.GetEngine(ctx). - Where(cond). - Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar"). - Table("user"). - Where("name LIKE ? or full_name LIKE ?", prefix+"%", prefix+"%"). - OrderBy(user_model.GetOrderByName()). - Limit(30). - Find(&users) - } + ).GroupBy("poster_id")) + cond = cond.And(prefixCond) return users, db.GetEngine(ctx). Where(cond). Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar"). Table("user"). - Where("name LIKE ?", prefix+"%"). OrderBy(user_model.GetOrderByName()). Limit(30). Find(&users) From 3cda924398665391052e66b4affd1ad1eee41d0f Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 3 Apr 2023 18:05:34 +0800 Subject: [PATCH 43/72] remove autocomplete --- templates/repo/issue/list.tmpl | 2 +- templates/repo/issue/milestone_issues.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 6d3c3b2e0ee64..4da2297e513c4 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -127,7 +127,7 @@
{{svg "octicon-search" 16}} - +
{{.locale.Tr "repo.issues.filter_poster_no_select"}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index c2a556d364d3c..f0b17e3dbb1a2 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -80,7 +80,7 @@
{{svg "octicon-search" 16}} - +
{{.locale.Tr "repo.issues.filter_poster_no_select"}}
From e670baa1a105339d8f1c11743dd7b22dd26e04e7 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 4 Apr 2023 09:17:13 +0800 Subject: [PATCH 44/72] change orderby --- models/repo/user_repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 02487fe8dbbdc..2b164bb330bdc 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -185,7 +185,7 @@ func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull boo Where(cond). Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar"). Table("user"). - OrderBy(user_model.GetOrderByName()). + OrderBy("name"). Limit(30). Find(&users) } From cea1970fe9fe7bffd8b93d5d61703c8286ad96f9 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 4 Apr 2023 09:28:06 +0800 Subject: [PATCH 45/72] avoid using same name --- routers/web/repo/issue.go | 4 ++-- templates/repo/issue/list.tmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 1182fc8fe8001..8d0dcf88eaa62 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -415,8 +415,8 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti // Issues render issues page func Issues(ctx *context.Context) { isPullList := ctx.Params(":type") == "pulls" - // pass listType to ctx.Data which will be used by GET /{type:issues|pulls}/posters request - ctx.Data["listType"] = ctx.Params(":type") + // pass RepoListType to ctx.Data which will be used by GET /{type:issues|pulls}/posters request + ctx.Data["RepoListType"] = ctx.Params(":type") if isPullList { MustAllowPulls(ctx) if ctx.Written() { diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 4da2297e513c4..3cf501cc392a9 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -117,7 +117,7 @@
-
From 76dc49d8a3dff6f6ded3df7ff0d2f7c405f64440 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 4 Apr 2023 10:50:39 +0800 Subject: [PATCH 46/72] update tooltip text --- models/repo/user_repo.go | 5 +++-- options/locale/locale_en-US.ini | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 2b164bb330bdc..f4781535fdf1b 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -175,12 +175,13 @@ func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull boo if isShowFullName { prefixCond = prefixCond.Or(builder.Like{"full_name", prefix + "%"}) } + cond := builder.In("`user`.id", builder.Select("poster_id").From("issue").Where( builder.Eq{"repo_id": repo.ID}. And(builder.Eq{"is_pull": isPull}), - ).GroupBy("poster_id")) - cond = cond.And(prefixCond) + ).GroupBy("poster_id")).And(prefixCond) + return users, db.GetEngine(ctx). Where(cond). Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar"). diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9a725421debef..4e711ffad2ca5 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -933,7 +933,7 @@ delete_preexisting = Delete pre-existing files delete_preexisting_content = Delete files in %s delete_preexisting_success = Deleted unadopted files in %s blame_prior = View blame prior to this change -author_search_tooltip = Shows former 30 authors matching the prefix +author_search_tooltip = Shows a maximum of 30 users transfer.accept = Accept Transfer transfer.accept_desc = Transfer to "%s" From 406524933ccd49d39525291ce37e70e536c8b1df Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 11:08:47 +0800 Subject: [PATCH 47/72] refactor --- templates/repo/issue/list.tmpl | 2 +- templates/repo/issue/milestone_issues.tmpl | 2 +- web_src/js/features/common-issue.js | 59 ----------- web_src/js/features/repo-common.js | 54 +--------- web_src/js/features/repo-issue-list.js | 117 +++++++++++++++++++++ web_src/js/features/repo-issue.js | 2 +- web_src/js/index.js | 10 +- web_src/js/modules/aria/dropdown.js | 4 +- 8 files changed, 127 insertions(+), 123 deletions(-) delete mode 100644 web_src/js/features/common-issue.js create mode 100644 web_src/js/features/repo-issue-list.js diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 3cf501cc392a9..d896545f35877 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index f0b17e3dbb1a2..1cc2978ff47ba 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
diff --git a/web_src/js/features/common-issue.js b/web_src/js/features/common-issue.js deleted file mode 100644 index 25d41edde348d..0000000000000 --- a/web_src/js/features/common-issue.js +++ /dev/null @@ -1,59 +0,0 @@ -import $ from 'jquery'; -import {updateIssuesMeta} from './repo-issue.js'; -import {toggleElem} from '../utils/dom.js'; - -export function initCommonIssue() { - const $issueSelectAll = $('.issue-checkbox-all'); - const $issueCheckboxes = $('.issue-checkbox'); - - const syncIssueSelectionState = () => { - const $checked = $issueCheckboxes.filter(':checked'); - const anyChecked = $checked.length !== 0; - const allChecked = anyChecked && $checked.length === $issueCheckboxes.length; - - if (allChecked) { - $issueSelectAll.prop({'checked': true, 'indeterminate': false}); - } else if (anyChecked) { - $issueSelectAll.prop({'checked': false, 'indeterminate': true}); - } else { - $issueSelectAll.prop({'checked': false, 'indeterminate': false}); - } - // if any issue is selected, show the action panel, otherwise show the filter panel - toggleElem($('#issue-filters'), !anyChecked); - toggleElem($('#issue-actions'), anyChecked); - // there are two panels but only one select-all checkbox, so move the checkbox to the visible panel - $('#issue-filters, #issue-actions').filter(':visible').find('.column:first').prepend($issueSelectAll); - }; - - $issueCheckboxes.on('change', syncIssueSelectionState); - - $issueSelectAll.on('change', () => { - $issueCheckboxes.prop('checked', $issueSelectAll.is(':checked')); - syncIssueSelectionState(); - }); - - $('.issue-action').on('click', async function (e) { - e.preventDefault(); - let action = this.getAttribute('data-action'); - let elementId = this.getAttribute('data-element-id'); - const url = this.getAttribute('data-url'); - const issueIDs = $('.issue-checkbox:checked').map((_, el) => { - return el.getAttribute('data-issue-id'); - }).get().join(','); - if (elementId === '0' && url.slice(-9) === '/assignee') { - elementId = ''; - action = 'clear'; - } - if (action === 'toggle' && e.altKey) { - action = 'toggle-alt'; - } - updateIssuesMeta( - url, - action, - issueIDs, - elementId - ).then(() => { - window.location.reload(); - }); - }); -} diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 9fd54db89a74d..1a32d7cb64422 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import {hideElem, showElem, toggleElem} from '../utils/dom.js'; -import {updateMenuItem, ariaPatchKey} from '../modules/aria/dropdown.js'; + const {csrfToken} = window.config; function getArchive($target, url, first) { @@ -107,55 +107,3 @@ export function initRepoCommonLanguageStats() { }); } } - -// generate dropdown options for authors search dropdown using fetched data -export function initPostersDropdown() { - const $authorSearchDropdown = $('.author-search'); - if (!$authorSearchDropdown.length) { - return; - } - $('#author-search-input').on('input', (e) => { - e.stopImmediatePropagation(); - fetchPostersData($authorSearchDropdown, false); - }); - // show all results when clicking on the dropdown - $authorSearchDropdown.on('click', () => { - // if dropdown is from visible to not, do not need to fetch data - if ($authorSearchDropdown.attr('aria-expanded') === 'true') { - return; - } - // reset input value - $('#author-search-input').val(''); - fetchPostersData($authorSearchDropdown, true); - }); -} - -// isShowAll decides if fetching all data or fetching data with search query from user input -async function fetchPostersData($authorSearchDropdown, isShowAll) { - const baseUrl = $authorSearchDropdown.attr('data-url'); - const url = isShowAll ? baseUrl : `${baseUrl}?q=${$('#author-search-input').val()}`; - const res = await fetch(url); - const postersJson = await res.json(); - if (!postersJson) { - $authorSearchDropdown.addClass('disabled'); - return; - } - // get data needed from data- attributes for generating the poster options - const posterID = $authorSearchDropdown.attr('data-poster-id'); - const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); - const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); - const $defaultMenu = $authorSearchDropdown.find('.menu'); - // remove former options, then append newly searched posters - $defaultMenu.find('.item:gt(0)').remove(); - for (let i = 0; i < postersJson.length; i++) { - const {id, avatar_url, username, full_name} = postersJson[i]; - $defaultMenu.append(` - - ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} - `); - } - // append aria related attributes to newly added menu items - const $items = $defaultMenu.find('> .item'); - $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); - $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); -} diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js new file mode 100644 index 0000000000000..02fac18c087fa --- /dev/null +++ b/web_src/js/features/repo-issue-list.js @@ -0,0 +1,117 @@ +import $ from 'jquery'; +import {updateIssuesMeta} from './repo-issue.js'; +import {toggleElem} from '../utils/dom.js'; + +function initRepoIssueListCheckboxes() { + const $issueSelectAll = $('.issue-checkbox-all'); + const $issueCheckboxes = $('.issue-checkbox'); + + const syncIssueSelectionState = () => { + const $checked = $issueCheckboxes.filter(':checked'); + const anyChecked = $checked.length !== 0; + const allChecked = anyChecked && $checked.length === $issueCheckboxes.length; + + if (allChecked) { + $issueSelectAll.prop({'checked': true, 'indeterminate': false}); + } else if (anyChecked) { + $issueSelectAll.prop({'checked': false, 'indeterminate': true}); + } else { + $issueSelectAll.prop({'checked': false, 'indeterminate': false}); + } + // if any issue is selected, show the action panel, otherwise show the filter panel + toggleElem($('#issue-filters'), !anyChecked); + toggleElem($('#issue-actions'), anyChecked); + // there are two panels but only one select-all checkbox, so move the checkbox to the visible panel + $('#issue-filters, #issue-actions').filter(':visible').find('.column:first').prepend($issueSelectAll); + }; + + $issueCheckboxes.on('change', syncIssueSelectionState); + + $issueSelectAll.on('change', () => { + $issueCheckboxes.prop('checked', $issueSelectAll.is(':checked')); + syncIssueSelectionState(); + }); + + $('.issue-action').on('click', async function (e) { + e.preventDefault(); + let action = this.getAttribute('data-action'); + let elementId = this.getAttribute('data-element-id'); + const url = this.getAttribute('data-url'); + const issueIDs = $('.issue-checkbox:checked').map((_, el) => { + return el.getAttribute('data-issue-id'); + }).get().join(','); + if (elementId === '0' && url.slice(-9) === '/assignee') { + elementId = ''; + action = 'clear'; + } + if (action === 'toggle' && e.altKey) { + action = 'toggle-alt'; + } + updateIssuesMeta( + url, + action, + issueIDs, + elementId + ).then(() => { + window.location.reload(); + }); + }); +} + +function initRepoIssueListAuthorDropdown() { + + const $authorSearchDropdown = $('.author-search'); + if (!$authorSearchDropdown.length) { + return; + } + $('#author-search-input').on('input', (e) => { + e.stopImmediatePropagation(); + fetchPostersData($authorSearchDropdown, false); + }); + // show all results when clicking on the dropdown + $authorSearchDropdown.on('click', () => { + // if dropdown is from visible to not, do not need to fetch data + if ($authorSearchDropdown.attr('aria-expanded') === 'true') { + return; + } + // reset input value + $('#author-search-input').val(''); + fetchPostersData($authorSearchDropdown, true); + }); + +// isShowAll decides if fetching all data or fetching data with search query from user input + async function fetchPostersData($authorSearchDropdown, isShowAll) { + const baseUrl = $authorSearchDropdown.attr('data-url'); + const url = isShowAll ? baseUrl : `${baseUrl}?q=${$('#author-search-input').val()}`; + const res = await fetch(url); + const postersJson = await res.json(); + if (!postersJson) { + $authorSearchDropdown.addClass('disabled'); + return; + } + // get data needed from data- attributes for generating the poster options + const posterID = $authorSearchDropdown.attr('data-poster-id'); + const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); + const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); + const $defaultMenu = $authorSearchDropdown.find('.menu'); + // remove former options, then append newly searched posters + $defaultMenu.find('.item:gt(0)').remove(); + for (let i = 0; i < postersJson.length; i++) { + const {id, avatar_url, username, full_name} = postersJson[i]; + $defaultMenu.append(` + + ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} + `); + } + // append aria related attributes to newly added menu items + const $items = $defaultMenu.find('> .item'); + $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); + $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); + } +} + +export function initRepoIssueList() { + if (!document.querySelectorAll('.page-content.repository.issue-list, .page-content.repository.milestone-issue-list').length) return; + initRepoIssueListCheckboxes(); + initRepoIssueListAuthorDropdown(); +} diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 03c9977f49328..0e287fc0fc899 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -86,7 +86,7 @@ export function initRepoIssueDue() { }); } -export function initRepoIssueList() { +export function initRepoIssueSidebarList() { const repolink = $('#repolink').val(); const repoId = $('#repoId').val(); const crossRepoSearch = $('#crossRepoSearch').val(); diff --git a/web_src/js/index.js b/web_src/js/index.js index b4a8f82a22ab6..f5584d29403a3 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -31,13 +31,12 @@ import { } from './features/repo-diff.js'; import { initRepoIssueDue, - initRepoIssueList, initRepoIssueReferenceRepositorySearch, initRepoIssueTimeTracking, initRepoIssueWipTitle, initRepoPullRequestMergeInstruction, initRepoPullRequestAllowMaintainerEdit, - initRepoPullRequestReview, + initRepoPullRequestReview, initRepoIssueSidebarList, } from './features/repo-issue.js'; import { initRepoEllipsisButton, @@ -62,7 +61,7 @@ import {initRepoTemplateSearch} from './features/repo-template.js'; import {initRepoCodeView} from './features/repo-code.js'; import {initSshKeyFormParser} from './features/sshkey-helper.js'; import {initUserSettings} from './features/user-settings.js'; -import {initRepoArchiveLinks, initPostersDropdown} from './features/repo-common.js'; +import {initRepoArchiveLinks} from './features/repo-common.js'; import {initRepoMigrationStatusChecker} from './features/repo-migrate.js'; import { initRepoSettingGitHook, @@ -77,7 +76,6 @@ import {initRepoEditor} from './features/repo-editor.js'; import {initCompSearchUserBox} from './features/comp/SearchUserBox.js'; import {initInstall} from './features/install.js'; import {initCompWebHookEditor} from './features/comp/WebHookEditor.js'; -import {initCommonIssue} from './features/common-issue.js'; import {initRepoBranchButton} from './features/repo-branch.js'; import {initCommonOrganization} from './features/common-organization.js'; import {initRepoWikiForm} from './features/repo-wiki.js'; @@ -89,6 +87,7 @@ import {initRepositoryActionView} from './components/RepoActionView.vue'; import {initGlobalTooltips} from './modules/tippy.js'; import {initGiteaFomantic} from './modules/fomantic.js'; import {onDomReady} from './utils/dom.js'; +import {initRepoIssueList} from './features/repo-issue-list.js'; // Run time-critical code as soon as possible. This is safe to do because this // script appears at the end of and rendered HTML is accessible at that point. @@ -109,7 +108,6 @@ onDomReady(() => { initGlobalFormDirtyLeaveConfirm(); initGlobalLinkActions(); - initCommonIssue(); initCommonOrganization(); initCompSearchUserBox(); @@ -163,6 +161,7 @@ onDomReady(() => { initRepoIssueContentHistory(); initRepoIssueDue(); initRepoIssueList(); + initRepoIssueSidebarList(); initRepoIssueReferenceRepositorySearch(); initRepoIssueTimeTracking(); initRepoIssueWipTitle(); @@ -182,7 +181,6 @@ onDomReady(() => { initRepoWikiForm(); initRepository(); initRepositoryActionView(); - initPostersDropdown(); initCommitStatuses(); initCaptcha(); diff --git a/web_src/js/modules/aria/dropdown.js b/web_src/js/modules/aria/dropdown.js index 3072dec7b3946..e4c881b6af3ce 100644 --- a/web_src/js/modules/aria/dropdown.js +++ b/web_src/js/modules/aria/dropdown.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import {generateAriaId} from './base.js'; -export const ariaPatchKey = '_giteaAriaPatchDropdown'; +const ariaPatchKey = '_giteaAriaPatchDropdown'; const fomanticDropdownFn = $.fn.dropdown; // use our own `$().dropdown` function to patch Fomantic's dropdown module @@ -34,7 +34,7 @@ function ariaDropdownFn(...args) { // make the item has role=option/menuitem, add an id if there wasn't one yet, make items as non-focusable // the elements inside the dropdown menu item should not be focusable, the focus should always be on the dropdown primary element. -export function updateMenuItem(dropdown, item) { +function updateMenuItem(dropdown, item) { if (!item.id) item.id = generateAriaId(); item.setAttribute('role', dropdown[ariaPatchKey].listItemRole); item.setAttribute('tabindex', '-1'); From bebc99af0ed54ce641a922995d888a4d3fc74fb9 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 11:13:59 +0800 Subject: [PATCH 48/72] use aria framework to provide autocomplete=off --- templates/repo/issue/list.tmpl | 4 +- templates/repo/issue/milestone_issues.tmpl | 4 +- web_src/js/features/repo-issue-list.js | 44 +++++++++++----------- web_src/js/modules/aria/dropdown.js | 5 +++ 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index d896545f35877..8f019926a078e 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -117,7 +117,7 @@
-
@@ -127,7 +127,7 @@
{{svg "octicon-search" 16}} - +
{{.locale.Tr "repo.issues.filter_poster_no_select"}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 1cc2978ff47ba..4266f114fd275 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -71,7 +71,7 @@
-
{{.locale.Tr "repo.issues.filter_poster"}} @@ -80,7 +80,7 @@
{{svg "octicon-search" 16}} - +
{{.locale.Tr "repo.issues.filter_poster_no_select"}}
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index 02fac18c087fa..b8e862d0e09c7 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -60,27 +60,8 @@ function initRepoIssueListCheckboxes() { function initRepoIssueListAuthorDropdown() { - const $authorSearchDropdown = $('.author-search'); - if (!$authorSearchDropdown.length) { - return; - } - $('#author-search-input').on('input', (e) => { - e.stopImmediatePropagation(); - fetchPostersData($authorSearchDropdown, false); - }); - // show all results when clicking on the dropdown - $authorSearchDropdown.on('click', () => { - // if dropdown is from visible to not, do not need to fetch data - if ($authorSearchDropdown.attr('aria-expanded') === 'true') { - return; - } - // reset input value - $('#author-search-input').val(''); - fetchPostersData($authorSearchDropdown, true); - }); - -// isShowAll decides if fetching all data or fetching data with search query from user input - async function fetchPostersData($authorSearchDropdown, isShowAll) { + /* + const fetchPostersData= async function ($authorSearchDropdown, isShowAll) { const baseUrl = $authorSearchDropdown.attr('data-url'); const url = isShowAll ? baseUrl : `${baseUrl}?q=${$('#author-search-input').val()}`; const res = await fetch(url); @@ -108,6 +89,27 @@ function initRepoIssueListAuthorDropdown() { $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); } + + const $authorSearchDropdown = $('.author-search'); + if (!$authorSearchDropdown.length) { + return; + } + + $('#author-search-input').on('input', (e) => { + e.stopImmediatePropagation(); + fetchPostersData($authorSearchDropdown, false); + }); + // show all results when clicking on the dropdown + $authorSearchDropdown.on('click', () => { + // if dropdown is from visible to not, do not need to fetch data + if ($authorSearchDropdown.attr('aria-expanded') === 'true') { + return; + } + // reset input value + $('#author-search-input').val(''); + fetchPostersData($authorSearchDropdown, true); + }); + */ } export function initRepoIssueList() { diff --git a/web_src/js/modules/aria/dropdown.js b/web_src/js/modules/aria/dropdown.js index e4c881b6af3ce..26c135241682c 100644 --- a/web_src/js/modules/aria/dropdown.js +++ b/web_src/js/modules/aria/dropdown.js @@ -132,6 +132,11 @@ function attachInit($dropdown) { const $focusable = $textSearch.length ? $textSearch : $dropdown; // the primary element for focus, see comment above if (!$focusable.length) return; + // as a combobox, the input should not have autocomplete by default + if ($textSearch.length && !$textSearch.attr('autocomplete')) { + $textSearch.attr('autocomplete', 'off'); + } + let $menu = $dropdown.find('> .menu'); if (!$menu.length) { // some "multiple selection" dropdowns don't have a static menu element in HTML, we need to pre-create it to make it have correct aria attributes From 5d29c6ebf4e5ba9119c2d028678465d656d6a117 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 11:51:00 +0800 Subject: [PATCH 49/72] refactor --- modules/structs/user.go | 12 ------- routers/web/repo/issue.go | 35 +++++++++++++------ services/convert/user.go | 13 -------- templates/repo/issue/list.tmpl | 4 +-- templates/repo/issue/milestone_issues.tmpl | 3 +- web_src/js/features/repo-issue-list.js | 39 ++++++++++++++++++++++ 6 files changed, 65 insertions(+), 41 deletions(-) diff --git a/modules/structs/user.go b/modules/structs/user.go index 908b26b7b55ea..f68b92ac069e2 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -54,18 +54,6 @@ type User struct { StarredRepos int `json:"starred_repos_count"` } -// UserSearchInfo represents user info needed to be displayed in author search dropdown in frontend -type UserSearchInfo struct { - // the user's id - ID int64 `json:"id"` - // the user's username - UserName string `json:"username"` - // URL to the user's avatar - AvatarURL string `json:"avatar_url"` - // the user's full name - FullName string `json:"full_name"` -} - // MarshalJSON implements the json.Marshaler interface for User, adding field(s) for backward compatibility func (u User) MarshalJSON() ([]byte, error) { // Re-declaring User to avoid recursion diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 8d0dcf88eaa62..8390c4ff6286c 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3351,26 +3351,39 @@ func handleTeamMentions(ctx *context.Context) { ctx.Data["MentionableTeamsOrgAvatar"] = ctx.Repo.Owner.AvatarLink(ctx) } -// get posters for current repo's issues/pull requests +type UserSearchInfo struct { + UserID int64 `json:"id"` + UserName string `json:"username"` + AvatarURL string `json:"avatar_url"` + FullName string `json:"full_name"` +} + +type UserSearchResponse struct { + Results []*UserSearchInfo `json:"results"` +} + +// IssuePosters get posters for current repo's issues/pull requests func IssuePosters(ctx *context.Context) { repo := ctx.Repo.Repository isPullList := ctx.Params(":type") == "pulls" isPullOption := util.OptionalBoolOf(isPullList) isShowFullName := setting.UI.DefaultShowFullName - var err error prefix := strings.Trim(ctx.FormString("q"), " ") posters, err := repo_model.GetIssuePostersWithPrefix(ctx, repo, isPullOption.IsTrue(), prefix, isShowFullName) if err != nil { - ctx.JSON(http.StatusInternalServerError, api.SearchError{ - OK: false, - Error: err.Error(), - }) + ctx.JSON(http.StatusInternalServerError, err) return } - // only pass user info needed for generating options used by authors search dropdown to the frontend - results := make([]*api.UserSearchInfo, len(posters)) - for i, poster := range posters { - results[i] = convert.ToUserSearchInfo(ctx, poster) + + resp := &UserSearchResponse{} + resp.Results = make([]*UserSearchInfo, len(posters)) + for i, user := range posters { + resp.Results[i] = &UserSearchInfo{ + UserID: user.ID, + UserName: user.Name, + FullName: user.FullName, + AvatarURL: user.AvatarLink(ctx), + } } - ctx.JSON(http.StatusOK, results) + ctx.JSON(http.StatusOK, resp) } diff --git a/services/convert/user.go b/services/convert/user.go index 7a01fbc26ec41..79fcba0176f9a 100644 --- a/services/convert/user.go +++ b/services/convert/user.go @@ -26,19 +26,6 @@ func ToUser(ctx context.Context, user, doer *user_model.User) *api.User { return toUser(ctx, user, signed, authed) } -func ToUserSearchInfo(ctx context.Context, user *user_model.User) *api.UserSearchInfo { - if user == nil { - return nil - } - result := &api.UserSearchInfo{ - ID: user.ID, - UserName: user.Name, - FullName: user.FullName, - AvatarURL: user.AvatarLink(ctx), - } - return result -} - // ToUsers convert list of user_model.User to list of api.User func ToUsers(ctx context.Context, doer *user_model.User, users []*user_model.User) []*api.User { result := make([]*api.User, len(users)) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 8f019926a078e..5e976d5d76f31 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -117,9 +117,7 @@
-
+
{{.locale.Tr "repo.issues.filter_poster"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 4266f114fd275..ad902d77a9867 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -71,8 +71,7 @@
-
+
{{.locale.Tr "repo.issues.filter_poster"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index b8e862d0e09c7..dcf61ae57bf91 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -1,6 +1,7 @@ import $ from 'jquery'; import {updateIssuesMeta} from './repo-issue.js'; import {toggleElem} from '../utils/dom.js'; +import {htmlEscape} from 'escape-goat'; function initRepoIssueListCheckboxes() { const $issueSelectAll = $('.issue-checkbox-all'); @@ -110,6 +111,44 @@ function initRepoIssueListAuthorDropdown() { fetchPostersData($authorSearchDropdown, true); }); */ + + const $searchDropdown = $('.user-remote-search'); + if (!$searchDropdown.length) { + return; + } + const selectedUserId = $searchDropdown.attr('data-selected-user-id'); + let searchUrl = $searchDropdown.attr('data-search-url'); + if (searchUrl.indexOf('?') === -1) searchUrl += '?'; + $searchDropdown.dropdown({ + fullTextSearch: true, + apiSettings: { + url: `${searchUrl}&q={query}`, + onResponse1(response) { + /* + const filteredResponse = {success: true, results: []}; + filteredResponse.results.push({ + name: '', + value: '' + }); + // Parse the response from the api to work with our dropdown + $.each(response.data, (_r, repo) => { + filteredResponse.results.push({ + name: htmlEscape(repo.full_name), + value: repo.id + }); + }); + return filteredResponse; + + */ + console.log('response', response); + return []; + }, + }, + }); + const dropdownSetup =$searchDropdown.dropdown('internal', 'setup'); + dropdownSetup.menu = function (values) { + console.log('setup menu', values); + } } export function initRepoIssueList() { From be6791f37ea5c1afc7a2b13543fbcc7d5ff1101e Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 12:52:15 +0800 Subject: [PATCH 50/72] refactor --- routers/web/repo/issue.go | 6 +- templates/repo/issue/list.tmpl | 8 +- templates/repo/issue/milestone_issues.tmpl | 8 +- web_src/js/features/repo-issue-list.js | 116 ++++++++------------- 4 files changed, 58 insertions(+), 80 deletions(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 8390c4ff6286c..7391e34214d3a 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3352,7 +3352,7 @@ func handleTeamMentions(ctx *context.Context) { } type UserSearchInfo struct { - UserID int64 `json:"id"` + UserID int64 `json:"user_id"` UserName string `json:"username"` AvatarURL string `json:"avatar_url"` FullName string `json:"full_name"` @@ -3381,9 +3381,11 @@ func IssuePosters(ctx *context.Context) { resp.Results[i] = &UserSearchInfo{ UserID: user.ID, UserName: user.Name, - FullName: user.FullName, AvatarURL: user.AvatarLink(ctx), } + if setting.UI.DefaultShowFullName { + resp.Results[i].FullName = user.FullName + } } ctx.JSON(http.StatusOK, resp) } diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 5e976d5d76f31..5f38a0f6fe107 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -117,7 +117,11 @@
-
+
{{.locale.Tr "repo.issues.filter_poster"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -127,7 +131,7 @@ {{svg "octicon-search" 16}}
- {{.locale.Tr "repo.issues.filter_poster_no_select"}} + {{.locale.Tr "repo.issues.filter_poster_no_select"}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index ad902d77a9867..7da35061cbc5f 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -71,7 +71,11 @@
-
+
{{.locale.Tr "repo.issues.filter_poster"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -81,7 +85,7 @@ {{svg "octicon-search" 16}}
- {{.locale.Tr "repo.issues.filter_poster_no_select"}} + {{.locale.Tr "repo.issues.filter_poster_no_select"}}
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index dcf61ae57bf91..aeb83dac37ef7 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -60,94 +60,62 @@ function initRepoIssueListCheckboxes() { } function initRepoIssueListAuthorDropdown() { - - /* - const fetchPostersData= async function ($authorSearchDropdown, isShowAll) { - const baseUrl = $authorSearchDropdown.attr('data-url'); - const url = isShowAll ? baseUrl : `${baseUrl}?q=${$('#author-search-input').val()}`; - const res = await fetch(url); - const postersJson = await res.json(); - if (!postersJson) { - $authorSearchDropdown.addClass('disabled'); - return; - } - // get data needed from data- attributes for generating the poster options - const posterID = $authorSearchDropdown.attr('data-poster-id'); - const isShowFullName = $authorSearchDropdown.attr('data-show-fullname'); - const posterGeneralUrl = $authorSearchDropdown.attr('data-general-poster-url'); - const $defaultMenu = $authorSearchDropdown.find('.menu'); - // remove former options, then append newly searched posters - $defaultMenu.find('.item:gt(0)').remove(); - for (let i = 0; i < postersJson.length; i++) { - const {id, avatar_url, username, full_name} = postersJson[i]; - $defaultMenu.append(` - - ${username}${isShowFullName === 'true' ? ` ${full_name}` : ''} - `); - } - // append aria related attributes to newly added menu items - const $items = $defaultMenu.find('> .item'); - $items.each((_, item) => updateMenuItem($authorSearchDropdown[0], item)); - $authorSearchDropdown[0][ariaPatchKey].deferredRefreshAriaActiveItem(); - } - - const $authorSearchDropdown = $('.author-search'); - if (!$authorSearchDropdown.length) { - return; - } - - $('#author-search-input').on('input', (e) => { - e.stopImmediatePropagation(); - fetchPostersData($authorSearchDropdown, false); - }); - // show all results when clicking on the dropdown - $authorSearchDropdown.on('click', () => { - // if dropdown is from visible to not, do not need to fetch data - if ($authorSearchDropdown.attr('aria-expanded') === 'true') { - return; - } - // reset input value - $('#author-search-input').val(''); - fetchPostersData($authorSearchDropdown, true); - }); - */ - const $searchDropdown = $('.user-remote-search'); if (!$searchDropdown.length) { return; } - const selectedUserId = $searchDropdown.attr('data-selected-user-id'); + + // TODO: the data-selected-user-id is not used yet, it seems unnecessary let searchUrl = $searchDropdown.attr('data-search-url'); + let actionJumpUrl = $searchDropdown.attr('data-action-jump-url'); if (searchUrl.indexOf('?') === -1) searchUrl += '?'; $searchDropdown.dropdown({ fullTextSearch: true, + selectOnKeydown: false, apiSettings: { + cache: false, url: `${searchUrl}&q={query}`, - onResponse1(response) { - /* - const filteredResponse = {success: true, results: []}; - filteredResponse.results.push({ - name: '', - value: '' - }); - // Parse the response from the api to work with our dropdown - $.each(response.data, (_r, repo) => { - filteredResponse.results.push({ - name: htmlEscape(repo.full_name), - value: repo.id - }); - }); - return filteredResponse; - - */ - console.log('response', response); - return []; + onResponse(resp) { + // the content is provided by backend IssuePosters handler + for (const item of resp.results) { + item.value = item.user_id; + item.name = `${htmlEscape(item.username)}`; + if (item.full_name) { + item.name += `(${htmlEscape(item.full_name)})`; + } + } + return resp; }, }, + action: (_text, value) => { + window.location.href = actionJumpUrl.replace('{user_id}', encodeURIComponent(value)); + }, }); - const dropdownSetup =$searchDropdown.dropdown('internal', 'setup'); + + const dropdownSetup = {...$searchDropdown.dropdown('internal', 'setup')}; + const dropdownSetting = (...args) => $searchDropdown.dropdown('setting', ...args); + const dropdownTemplates = dropdownSetting('templates'); + $searchDropdown.dropdown('internal', 'setup', dropdownSetup); dropdownSetup.menu = function (values) { - console.log('setup menu', values); + // we want to generate the dropdown menu items by ourselves + const $menu = $searchDropdown.find('> .menu'); + const menusHtml = dropdownTemplates.menu(values, dropdownSetting('fields'), true /* html */, dropdownSetting('className')); + const $items = $menu.find('> .ui.divider, > .item'); + + // replace the menu items after the divider + let afterDivider = false; + for (const el of $items) { + if (el.classList.contains('divider')) { + afterDivider = true; + continue; + } + if (afterDivider) el.remove(); + } + if (!afterDivider) { + $menu.append('
'); + } + $menu.append(...$(menusHtml)); + $searchDropdown.dropdown('refresh'); } } From 8daf6bdb344de29322cfe634d80a082eb54617b5 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 13:13:22 +0800 Subject: [PATCH 51/72] more fixes --- models/repo/user_repo.go | 8 ++++---- routers/web/repo/issue.go | 14 ++++---------- templates/repo/issue/list.tmpl | 2 +- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index f4781535fdf1b..89d37e98d3cff 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -167,13 +167,13 @@ func GetIssuePosters(ctx context.Context, repo *Repository, isPull bool) ([]*use return users, db.GetEngine(ctx).Where(cond).OrderBy(user_model.GetOrderByName()).Find(&users) } -// GetIssuePosters returns users with limit of 30 whose user name started with prefix that have authored an issue/pull request for the given repository +// GetIssuePostersWithSearch returns users with limit of 30 whose username started with prefix that have authored an issue/pull request for the given repository // If isShowFullName is set to true, also include full name prefix search -func GetIssuePostersWithPrefix(ctx context.Context, repo *Repository, isPull bool, prefix string, isShowFullName bool) ([]*user_model.User, error) { - users := make([]*user_model.User, 0, 8) +func GetIssuePostersWithSearch(ctx context.Context, repo *Repository, isPull bool, prefix string, isShowFullName bool) ([]*user_model.User, error) { + users := make([]*user_model.User, 0, 30) var prefixCond builder.Cond = builder.Like{"name", prefix + "%"} if isShowFullName { - prefixCond = prefixCond.Or(builder.Like{"full_name", prefix + "%"}) + prefixCond = prefixCond.Or(builder.Like{"full_name", "%" + prefix + "%"}) } cond := builder.In("`user`.id", diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 7391e34214d3a..7965af896e893 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -415,8 +415,6 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti // Issues render issues page func Issues(ctx *context.Context) { isPullList := ctx.Params(":type") == "pulls" - // pass RepoListType to ctx.Data which will be used by GET /{type:issues|pulls}/posters request - ctx.Data["RepoListType"] = ctx.Params(":type") if isPullList { MustAllowPulls(ctx) if ctx.Written() { @@ -3368,8 +3366,8 @@ func IssuePosters(ctx *context.Context) { isPullList := ctx.Params(":type") == "pulls" isPullOption := util.OptionalBoolOf(isPullList) isShowFullName := setting.UI.DefaultShowFullName - prefix := strings.Trim(ctx.FormString("q"), " ") - posters, err := repo_model.GetIssuePostersWithPrefix(ctx, repo, isPullOption.IsTrue(), prefix, isShowFullName) + prefix := strings.TrimSpace(ctx.FormString("q")) + posters, err := repo_model.GetIssuePostersWithSearch(ctx, repo, isPullOption.IsTrue(), prefix, isShowFullName) if err != nil { ctx.JSON(http.StatusInternalServerError, err) return @@ -3378,12 +3376,8 @@ func IssuePosters(ctx *context.Context) { resp := &UserSearchResponse{} resp.Results = make([]*UserSearchInfo, len(posters)) for i, user := range posters { - resp.Results[i] = &UserSearchInfo{ - UserID: user.ID, - UserName: user.Name, - AvatarURL: user.AvatarLink(ctx), - } - if setting.UI.DefaultShowFullName { + resp.Results[i] = &UserSearchInfo{UserID: user.ID, UserName: user.Name, AvatarURL: user.AvatarLink(ctx)} + if isShowFullName { resp.Results[i].FullName = user.FullName } } diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 5f38a0f6fe107..7aaf90d64e577 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -118,7 +118,7 @@
From aa878d529c234ccb5432e0139620319ceadc1efe Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 13:16:09 +0800 Subject: [PATCH 52/72] clean up --- models/repo/user_repo.go | 18 +++--------------- routers/web/repo/issue.go | 10 +++++----- web_src/js/features/repo-issue-list.js | 2 +- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 89d37e98d3cff..580e0a1cff2d3 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -155,25 +155,13 @@ func GetReviewers(ctx context.Context, repo *Repository, doerID, posterID int64) return users, db.GetEngine(ctx).Where(cond).OrderBy(user_model.GetOrderByName()).Find(&users) } -// GetIssuePosters returns all users that have authored an issue/pull request for the given repository -func GetIssuePosters(ctx context.Context, repo *Repository, isPull bool) ([]*user_model.User, error) { - users := make([]*user_model.User, 0, 8) - cond := builder.In("`user`.id", - builder.Select("poster_id").From("issue").Where( - builder.Eq{"repo_id": repo.ID}. - And(builder.Eq{"is_pull": isPull}), - ).GroupBy("poster_id"), - ) - return users, db.GetEngine(ctx).Where(cond).OrderBy(user_model.GetOrderByName()).Find(&users) -} - // GetIssuePostersWithSearch returns users with limit of 30 whose username started with prefix that have authored an issue/pull request for the given repository // If isShowFullName is set to true, also include full name prefix search -func GetIssuePostersWithSearch(ctx context.Context, repo *Repository, isPull bool, prefix string, isShowFullName bool) ([]*user_model.User, error) { +func GetIssuePostersWithSearch(ctx context.Context, repo *Repository, isPull bool, search string, isShowFullName bool) ([]*user_model.User, error) { users := make([]*user_model.User, 0, 30) - var prefixCond builder.Cond = builder.Like{"name", prefix + "%"} + var prefixCond builder.Cond = builder.Like{"name", search + "%"} if isShowFullName { - prefixCond = prefixCond.Or(builder.Like{"full_name", "%" + prefix + "%"}) + prefixCond = prefixCond.Or(builder.Like{"full_name", "%" + search + "%"}) } cond := builder.In("`user`.id", diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 7965af896e893..0fbb7c3b24728 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3350,10 +3350,10 @@ func handleTeamMentions(ctx *context.Context) { } type UserSearchInfo struct { - UserID int64 `json:"user_id"` - UserName string `json:"username"` - AvatarURL string `json:"avatar_url"` - FullName string `json:"full_name"` + UserID int64 `json:"user_id"` + UserName string `json:"username"` + AvatarLink string `json:"avatar_link"` + FullName string `json:"full_name"` } type UserSearchResponse struct { @@ -3376,7 +3376,7 @@ func IssuePosters(ctx *context.Context) { resp := &UserSearchResponse{} resp.Results = make([]*UserSearchInfo, len(posters)) for i, user := range posters { - resp.Results[i] = &UserSearchInfo{UserID: user.ID, UserName: user.Name, AvatarURL: user.AvatarLink(ctx)} + resp.Results[i] = &UserSearchInfo{UserID: user.ID, UserName: user.Name, AvatarLink: user.AvatarLink(ctx)} if isShowFullName { resp.Results[i].FullName = user.FullName } diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index aeb83dac37ef7..cab25d3289a34 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -79,7 +79,7 @@ function initRepoIssueListAuthorDropdown() { // the content is provided by backend IssuePosters handler for (const item of resp.results) { item.value = item.user_id; - item.name = `${htmlEscape(item.username)}`; + item.name = `${htmlEscape(item.username)}`; if (item.full_name) { item.name += `(${htmlEscape(item.full_name)})`; } From 454091ff478697765811541d24b2c07f9f8f4189 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 13:19:08 +0800 Subject: [PATCH 53/72] clean up --- models/repo/user_repo.go | 1 - routers/web/repo/issue.go | 20 +++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go index 580e0a1cff2d3..dd2ef6220116b 100644 --- a/models/repo/user_repo.go +++ b/models/repo/user_repo.go @@ -173,7 +173,6 @@ func GetIssuePostersWithSearch(ctx context.Context, repo *Repository, isPull boo return users, db.GetEngine(ctx). Where(cond). Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar"). - Table("user"). OrderBy("name"). Limit(30). Find(&users) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 0fbb7c3b24728..70b5687e28caa 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3349,35 +3349,33 @@ func handleTeamMentions(ctx *context.Context) { ctx.Data["MentionableTeamsOrgAvatar"] = ctx.Repo.Owner.AvatarLink(ctx) } -type UserSearchInfo struct { +type userSearchInfo struct { UserID int64 `json:"user_id"` UserName string `json:"username"` AvatarLink string `json:"avatar_link"` FullName string `json:"full_name"` } -type UserSearchResponse struct { - Results []*UserSearchInfo `json:"results"` +type userSearchResponse struct { + Results []*userSearchInfo `json:"results"` } // IssuePosters get posters for current repo's issues/pull requests func IssuePosters(ctx *context.Context) { repo := ctx.Repo.Repository isPullList := ctx.Params(":type") == "pulls" - isPullOption := util.OptionalBoolOf(isPullList) - isShowFullName := setting.UI.DefaultShowFullName - prefix := strings.TrimSpace(ctx.FormString("q")) - posters, err := repo_model.GetIssuePostersWithSearch(ctx, repo, isPullOption.IsTrue(), prefix, isShowFullName) + search := strings.TrimSpace(ctx.FormString("q")) + posters, err := repo_model.GetIssuePostersWithSearch(ctx, repo, isPullList, search, setting.UI.DefaultShowFullName) if err != nil { ctx.JSON(http.StatusInternalServerError, err) return } - resp := &UserSearchResponse{} - resp.Results = make([]*UserSearchInfo, len(posters)) + resp := &userSearchResponse{} + resp.Results = make([]*userSearchInfo, len(posters)) for i, user := range posters { - resp.Results[i] = &UserSearchInfo{UserID: user.ID, UserName: user.Name, AvatarLink: user.AvatarLink(ctx)} - if isShowFullName { + resp.Results[i] = &userSearchInfo{UserID: user.ID, UserName: user.Name, AvatarLink: user.AvatarLink(ctx)} + if setting.UI.DefaultShowFullName { resp.Results[i].FullName = user.FullName } } From dbbeb490bb094ee0cc5c5576762301fc9326dbf2 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 13:37:38 +0800 Subject: [PATCH 54/72] fine tune --- web_src/js/features/repo-issue-list.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index cab25d3289a34..8d77c973f66fb 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -61,15 +61,14 @@ function initRepoIssueListCheckboxes() { function initRepoIssueListAuthorDropdown() { const $searchDropdown = $('.user-remote-search'); - if (!$searchDropdown.length) { - return; - } + if (!$searchDropdown.length) return; // TODO: the data-selected-user-id is not used yet, it seems unnecessary let searchUrl = $searchDropdown.attr('data-search-url'); let actionJumpUrl = $searchDropdown.attr('data-action-jump-url'); if (searchUrl.indexOf('?') === -1) searchUrl += '?'; - $searchDropdown.dropdown({ + + $searchDropdown.dropdown('setting', { fullTextSearch: true, selectOnKeydown: false, apiSettings: { @@ -103,18 +102,19 @@ function initRepoIssueListAuthorDropdown() { const $items = $menu.find('> .ui.divider, > .item'); // replace the menu items after the divider - let afterDivider = false; + let elDivider; for (const el of $items) { - if (el.classList.contains('divider')) { - afterDivider = true; - continue; + if (!elDivider && el.classList.contains('divider')) { + elDivider = el; + } else if (elDivider) { + el.remove(); } - if (afterDivider) el.remove(); } - if (!afterDivider) { + elDivider?.remove(); + if (menusHtml) { $menu.append('
'); + $menu.append(...$(menusHtml)); } - $menu.append(...$(menusHtml)); $searchDropdown.dropdown('refresh'); } } From 2702687cf46ebbd591b27afde8e74dcd2dbd6532 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 13:39:59 +0800 Subject: [PATCH 55/72] fix lint --- web_src/js/features/repo-issue-list.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index 8d77c973f66fb..e191d0a835c25 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -65,8 +65,8 @@ function initRepoIssueListAuthorDropdown() { // TODO: the data-selected-user-id is not used yet, it seems unnecessary let searchUrl = $searchDropdown.attr('data-search-url'); - let actionJumpUrl = $searchDropdown.attr('data-action-jump-url'); - if (searchUrl.indexOf('?') === -1) searchUrl += '?'; + const actionJumpUrl = $searchDropdown.attr('data-action-jump-url'); + if (!searchUrl.includes('?')) searchUrl += '?'; $searchDropdown.dropdown('setting', { fullTextSearch: true, @@ -116,7 +116,7 @@ function initRepoIssueListAuthorDropdown() { $menu.append(...$(menusHtml)); } $searchDropdown.dropdown('refresh'); - } + }; } export function initRepoIssueList() { From 3e6451aca2d2c00c0b936e757bd971cc8f1df2c8 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 13:49:19 +0800 Subject: [PATCH 56/72] fix lint --- templates/repo/issue/list.tmpl | 6 +++--- templates/repo/issue/milestone_issues.tmpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 7aaf90d64e577..814eb79c304ca 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -118,9 +118,9 @@
{{.locale.Tr "repo.issues.filter_poster"}} diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 7da35061cbc5f..55a7752d11586 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -72,9 +72,9 @@
{{.locale.Tr "repo.issues.filter_poster"}} From 1d396ad201d36b1df497eea1f08bf577b112b620 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 4 Apr 2023 14:52:42 +0800 Subject: [PATCH 57/72] modify dom css for options, remove data-selected-user-id, add throttle --- templates/repo/issue/list.tmpl | 1 - templates/repo/issue/milestone_issues.tmpl | 1 - web_src/js/features/repo-issue-list.js | 6 +++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 814eb79c304ca..cad364e399349 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -119,7 +119,6 @@
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 55a7752d11586..476817be30f4e 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -73,7 +73,6 @@
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index e191d0a835c25..e179d34dafb7a 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -63,7 +63,6 @@ function initRepoIssueListAuthorDropdown() { const $searchDropdown = $('.user-remote-search'); if (!$searchDropdown.length) return; - // TODO: the data-selected-user-id is not used yet, it seems unnecessary let searchUrl = $searchDropdown.attr('data-search-url'); const actionJumpUrl = $searchDropdown.attr('data-action-jump-url'); if (!searchUrl.includes('?')) searchUrl += '?'; @@ -74,13 +73,14 @@ function initRepoIssueListAuthorDropdown() { apiSettings: { cache: false, url: `${searchUrl}&q={query}`, + throttle: 500, onResponse(resp) { // the content is provided by backend IssuePosters handler for (const item of resp.results) { item.value = item.user_id; - item.name = `${htmlEscape(item.username)}`; + item.name = `${htmlEscape(item.username)}`; if (item.full_name) { - item.name += `(${htmlEscape(item.full_name)})`; + item.name += `${htmlEscape(item.full_name)}`; } } return resp; From 28594c8aac5c1cd0d6153eee52b536aa14c57a34 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 16:38:38 +0800 Subject: [PATCH 58/72] add aria-hidden to avatar img, use DOM operation instead of for loop --- web_src/js/features/repo-issue-list.js | 28 +++++++++----------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index e179d34dafb7a..a65ac45a518b1 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -78,7 +78,7 @@ function initRepoIssueListAuthorDropdown() { // the content is provided by backend IssuePosters handler for (const item of resp.results) { item.value = item.user_id; - item.name = `${htmlEscape(item.username)}`; + item.name = `${htmlEscape(item.username)}`; if (item.full_name) { item.name += `${htmlEscape(item.full_name)}`; } @@ -91,29 +91,19 @@ function initRepoIssueListAuthorDropdown() { }, }); + // we want to generate the dropdown menu items by ourselves, replace its internal setup functions const dropdownSetup = {...$searchDropdown.dropdown('internal', 'setup')}; - const dropdownSetting = (...args) => $searchDropdown.dropdown('setting', ...args); - const dropdownTemplates = dropdownSetting('templates'); + const dropdownTemplates = $searchDropdown.dropdown('setting', 'templates'); $searchDropdown.dropdown('internal', 'setup', dropdownSetup); dropdownSetup.menu = function (values) { - // we want to generate the dropdown menu items by ourselves const $menu = $searchDropdown.find('> .menu'); - const menusHtml = dropdownTemplates.menu(values, dropdownSetting('fields'), true /* html */, dropdownSetting('className')); - const $items = $menu.find('> .ui.divider, > .item'); + $menu.find('> .dynamic-item').each((_, el) => el.remove()); // remove old dynamic items - // replace the menu items after the divider - let elDivider; - for (const el of $items) { - if (!elDivider && el.classList.contains('divider')) { - elDivider = el; - } else if (elDivider) { - el.remove(); - } - } - elDivider?.remove(); - if (menusHtml) { - $menu.append('
'); - $menu.append(...$(menusHtml)); + const newMenuHtml = dropdownTemplates.menu(values, $searchDropdown.dropdown('setting', 'fields'), true /* html */, $searchDropdown.dropdown('setting', 'className')); + if (newMenuHtml) { + const $newMenuItems = $(newMenuHtml); + $newMenuItems.each((_, el) => el.classList.add('dynamic-item')); + $menu.append('
', ...$newMenuItems); } $searchDropdown.dropdown('refresh'); }; From 8481c351d68247f5284d76aff145619d155a1044 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 4 Apr 2023 17:12:16 +0800 Subject: [PATCH 59/72] use onshow to show default options and add active class to selected option --- templates/repo/issue/list.tmpl | 1 + templates/repo/issue/milestone_issues.tmpl | 1 + web_src/js/features/repo-issue-list.js | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index cad364e399349..814eb79c304ca 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -119,6 +119,7 @@
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 476817be30f4e..55a7752d11586 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -73,6 +73,7 @@
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index a65ac45a518b1..2ce873f635bd5 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -65,6 +65,7 @@ function initRepoIssueListAuthorDropdown() { let searchUrl = $searchDropdown.attr('data-search-url'); const actionJumpUrl = $searchDropdown.attr('data-action-jump-url'); + const dataSelectedId = $searchDropdown.attr('data-selected-user-id'); if (!searchUrl.includes('?')) searchUrl += '?'; $searchDropdown.dropdown('setting', { @@ -73,7 +74,6 @@ function initRepoIssueListAuthorDropdown() { apiSettings: { cache: false, url: `${searchUrl}&q={query}`, - throttle: 500, onResponse(resp) { // the content is provided by backend IssuePosters handler for (const item of resp.results) { @@ -82,6 +82,8 @@ function initRepoIssueListAuthorDropdown() { if (item.full_name) { item.name += `${htmlEscape(item.full_name)}`; } + // TODO: right now selected always on "all authors" option, need to fix this + item.class = `item gt-df${Number(dataSelectedId) === item.user_id ? ' active selected' : ''}`; } return resp; }, @@ -89,6 +91,9 @@ function initRepoIssueListAuthorDropdown() { action: (_text, value) => { window.location.href = actionJumpUrl.replace('{user_id}', encodeURIComponent(value)); }, + onShow: () => { + $searchDropdown.dropdown('filter', ' '); + }, }); // we want to generate the dropdown menu items by ourselves, replace its internal setup functions From eaa90b8342aa9a7ac0b17322ecd133b7716374fd Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 18:38:55 +0800 Subject: [PATCH 60/72] respect selected user id --- web_src/js/features/repo-issue-list.js | 21 ++++++++++++--------- web_src/js/modules/aria/dropdown.js | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index 2ce873f635bd5..439dcb6f682ff 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -65,7 +65,7 @@ function initRepoIssueListAuthorDropdown() { let searchUrl = $searchDropdown.attr('data-search-url'); const actionJumpUrl = $searchDropdown.attr('data-action-jump-url'); - const dataSelectedId = $searchDropdown.attr('data-selected-user-id'); + const selectedUserId = $searchDropdown.attr('data-selected-user-id'); if (!searchUrl.includes('?')) searchUrl += '?'; $searchDropdown.dropdown('setting', { @@ -76,15 +76,13 @@ function initRepoIssueListAuthorDropdown() { 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) { - item.value = item.user_id; - item.name = `${htmlEscape(item.username)}`; - if (item.full_name) { - item.name += `${htmlEscape(item.full_name)}`; - } - // TODO: right now selected always on "all authors" option, need to fix this - item.class = `item gt-df${Number(dataSelectedId) === item.user_id ? ' active selected' : ''}`; + 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; }, }, @@ -92,7 +90,7 @@ function initRepoIssueListAuthorDropdown() { window.location.href = actionJumpUrl.replace('{user_id}', encodeURIComponent(value)); }, onShow: () => { - $searchDropdown.dropdown('filter', ' '); + $searchDropdown.dropdown('filter', ' '); // trigger a search on first show }, }); @@ -111,6 +109,11 @@ function initRepoIssueListAuthorDropdown() { $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').each((_, el) => el.classList.remove('active', 'selected')); + $menu.find(`.item[data-value="${selectedUserId}"]`).addClass('selected'); + }, 0); }; } diff --git a/web_src/js/modules/aria/dropdown.js b/web_src/js/modules/aria/dropdown.js index 26c135241682c..d32e85b0488eb 100644 --- a/web_src/js/modules/aria/dropdown.js +++ b/web_src/js/modules/aria/dropdown.js @@ -176,7 +176,7 @@ function attachDomEvents($dropdown, $focusable, $menu) { } else if (dropdown[ariaPatchKey].listPopupRole === 'menu') { // for menu, when the popup is hidden, no need to keep the aria-activedescendant, and clear the active/selected item $focusable.removeAttr('aria-activedescendant'); - $active.removeClass('active').removeClass('selected'); + $active.each((_, el) => el.classList.remove('active', 'selected')); } }; From ea440c21dcf486d6c3e9b51c2e03e77f71767e20 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 18:55:28 +0800 Subject: [PATCH 61/72] always add self --- routers/web/repo/issue.go | 18 ++++++++++++++++++ web_src/js/features/repo-issue-list.js | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 70b5687e28caa..21ab706402bc1 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3371,6 +3371,24 @@ func IssuePosters(ctx *context.Context) { return } + if search == "" && ctx.Doer != nil { + hasSelf := false + for _, user := range posters { + if hasSelf = user.ID == ctx.Doer.ID; hasSelf { + break + } + } + if !hasSelf { + posters = append(posters, ctx.Doer) + } + sort.Slice(posters, func(i, j int) bool { + if posters[i].ID == posters[j].ID { + return false + } + return posters[i].ID == ctx.Doer.ID // if posters[i] is self, put it before others, so less=true + }) + } + resp := &userSearchResponse{} resp.Results = make([]*userSearchInfo, len(posters)) for i, user := range posters { diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index 439dcb6f682ff..5c63086419a86 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -78,7 +78,7 @@ function initRepoIssueListAuthorDropdown() { // 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)}`; + let html = `${htmlEscape(item.username)}`; if (item.full_name) html += `${htmlEscape(item.full_name)}`; processedResults.push({value: item.user_id, name: html}); } From e0fba0423a6324dbb15d45702f10cf4b8b3725ef Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 19:09:35 +0800 Subject: [PATCH 62/72] show self on top --- routers/web/repo/helper.go | 23 +++++++++++++++++++++++ routers/web/repo/helper_test.go | 27 +++++++++++++++++++++++++++ routers/web/repo/issue.go | 10 ++++++---- routers/web/repo/pull.go | 7 +++++-- routers/web/repo/release.go | 12 ++++++------ templates/repo/issue/list.tmpl | 2 +- 6 files changed, 68 insertions(+), 13 deletions(-) create mode 100644 routers/web/repo/helper.go create mode 100644 routers/web/repo/helper_test.go diff --git a/routers/web/repo/helper.go b/routers/web/repo/helper.go new file mode 100644 index 0000000000000..6f9ca4874b002 --- /dev/null +++ b/routers/web/repo/helper.go @@ -0,0 +1,23 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package repo + +import ( + "sort" + + "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/context" +) + +func makeSelfOnTop(ctx *context.Context, users []*user.User) []*user.User { + if ctx.Doer != nil { + sort.Slice(users, func(i, j int) bool { + if users[i].ID == users[j].ID { + return false + } + return users[i].ID == ctx.Doer.ID // if users[i] is self, put it before others, so less=true + }) + } + return users +} diff --git a/routers/web/repo/helper_test.go b/routers/web/repo/helper_test.go new file mode 100644 index 0000000000000..e9ab44fe69f95 --- /dev/null +++ b/routers/web/repo/helper_test.go @@ -0,0 +1,27 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package repo + +import ( + "testing" + + "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/context" + + "github.com/stretchr/testify/assert" +) + +func TestMakeSelfOnTop(t *testing.T) { + users := makeSelfOnTop(&context.Context{}, []*user.User{{ID: 2}, {ID: 1}}) + assert.Len(t, users, 2) + assert.EqualValues(t, 2, users[0].ID) + + users = makeSelfOnTop(&context.Context{Doer: &user.User{ID: 1}}, []*user.User{{ID: 2}, {ID: 1}}) + assert.Len(t, users, 2) + assert.EqualValues(t, 1, users[0].ID) + + users = makeSelfOnTop(&context.Context{Doer: &user.User{ID: 2}}, []*user.User{{ID: 2}, {ID: 1}}) + assert.Len(t, users, 2) + assert.EqualValues(t, 2, users[0].ID) +} diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 21ab706402bc1..d9792a0f8cce6 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -303,11 +303,12 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti ctx.Data["CommitStatuses"] = commitStatuses // Get assignees. - ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, repo) + assigneeUsers, err := repo_model.GetRepoAssignees(ctx, repo) if err != nil { - ctx.ServerError("GetAssignees", err) + ctx.ServerError("GetRepoAssignees", err) return } + ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers) handleTeamMentions(ctx) if ctx.Written() { @@ -473,11 +474,12 @@ func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.R return } - ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, repo) + assigneeUsers, err := repo_model.GetRepoAssignees(ctx, repo) if err != nil { - ctx.ServerError("GetAssignees", err) + ctx.ServerError("GetRepoAssignees", err) return } + ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers) handleTeamMentions(ctx) } diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 30004cefb70be..070fc109dcec9 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -792,10 +792,13 @@ func ViewPullFiles(ctx *context.Context) { setCompareContext(ctx, baseCommit, commit, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) - if ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository); err != nil { - ctx.ServerError("GetAssignees", err) + assigneeUsers, err := repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository) + if err != nil { + ctx.ServerError("GetRepoAssignees", err) return } + ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers) + handleTeamMentions(ctx) if ctx.Written() { return diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index b8c5f67f45a7e..5083056ebb1e7 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -333,13 +333,12 @@ func NewRelease(ctx *context.Context) { } } ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled - var err error - // Get assignees. - ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository) + assigneeUsers, err := repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository) if err != nil { - ctx.ServerError("GetAssignees", err) + ctx.ServerError("GetRepoAssignees", err) return } + ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers) upload.AddUploadContext(ctx, "release") ctx.HTML(http.StatusOK, tplReleaseNew) @@ -496,11 +495,12 @@ func EditRelease(ctx *context.Context) { ctx.Data["attachments"] = rel.Attachments // Get assignees. - ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, rel.Repo) + assigneeUsers, err := repo_model.GetRepoAssignees(ctx, rel.Repo) if err != nil { - ctx.ServerError("GetAssignees", err) + ctx.ServerError("GetRepoAssignees", err) return } + ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers) ctx.HTML(http.StatusOK, tplReleaseNew) } diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 814eb79c304ca..41820a88bacfa 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -149,7 +149,7 @@ {{.locale.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - {{avatar $.Context .}}{{template "repo/search_name" .}} + {{avatar $.Context . 16}}{{template "repo/search_name" .}} {{end}}
From ca8b8577791bc48cad7a5137fc2205116502952c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 19:15:29 +0800 Subject: [PATCH 63/72] show self on top --- routers/web/repo/issue.go | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index d9792a0f8cce6..08e1ea1550cef 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3374,23 +3374,13 @@ func IssuePosters(ctx *context.Context) { } if search == "" && ctx.Doer != nil { - hasSelf := false - for _, user := range posters { - if hasSelf = user.ID == ctx.Doer.ID; hasSelf { - break - } - } - if !hasSelf { + if !util.SliceContainsFunc(posters, func(user *user_model.User) bool { return user.ID == ctx.Doer.ID }) { posters = append(posters, ctx.Doer) } - sort.Slice(posters, func(i, j int) bool { - if posters[i].ID == posters[j].ID { - return false - } - return posters[i].ID == ctx.Doer.ID // if posters[i] is self, put it before others, so less=true - }) } + posters = makeSelfOnTop(ctx, posters) + resp := &userSearchResponse{} resp.Results = make([]*userSearchInfo, len(posters)) for i, user := range posters { From aa8dca3fc354c8d184b17a64abf95f3d8d69bb6a Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 20:08:04 +0800 Subject: [PATCH 64/72] revert mistakes --- web_src/js/features/repo-issue-list.js | 6 +++--- web_src/js/modules/aria/dropdown.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index 5c63086419a86..92db480ddaba0 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -100,18 +100,18 @@ function initRepoIssueListAuthorDropdown() { $searchDropdown.dropdown('internal', 'setup', dropdownSetup); dropdownSetup.menu = function (values) { const $menu = $searchDropdown.find('> .menu'); - $menu.find('> .dynamic-item').each((_, el) => el.remove()); // remove old dynamic items + $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.each((_, el) => el.classList.add('dynamic-item')); + $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').each((_, el) => el.classList.remove('active', 'selected')); + $menu.find('.item.active, .item.selected').removeClass('active selected'); $menu.find(`.item[data-value="${selectedUserId}"]`).addClass('selected'); }, 0); }; diff --git a/web_src/js/modules/aria/dropdown.js b/web_src/js/modules/aria/dropdown.js index d32e85b0488eb..26c135241682c 100644 --- a/web_src/js/modules/aria/dropdown.js +++ b/web_src/js/modules/aria/dropdown.js @@ -176,7 +176,7 @@ function attachDomEvents($dropdown, $focusable, $menu) { } else if (dropdown[ariaPatchKey].listPopupRole === 'menu') { // for menu, when the popup is hidden, no need to keep the aria-activedescendant, and clear the active/selected item $focusable.removeAttr('aria-activedescendant'); - $active.each((_, el) => el.classList.remove('active', 'selected')); + $active.removeClass('active').removeClass('selected'); } }; From 6789a61503d2ba2070c6f2b23383977c75db5fa1 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 20:43:35 +0800 Subject: [PATCH 65/72] patch fomantic api bug --- web_src/js/modules/fomantic.js | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/web_src/js/modules/fomantic.js b/web_src/js/modules/fomantic.js index 2109ff1726a4f..b79b0a658d077 100644 --- a/web_src/js/modules/fomantic.js +++ b/web_src/js/modules/fomantic.js @@ -19,7 +19,44 @@ export function initGiteaFomantic() { return escape(text, preserveHTML) + svg('octicon-x', 16, `${className.delete} icon`); }; + initFomanticApiPatch(); + // Use the patches to improve accessibility, these patches are designed to be as independent as possible, make it easy to modify or remove in the future. initAriaCheckboxPatch(); initAriaDropdownPatch(); } + +function initFomanticApiPatch() { + /* + Fomantic API module has some very buggy behaviors: + + If encodeParameters=true, it calls `urlEncodedValue` to encode the parameter. + However, `urlEncodedValue` just tries to "guess" whether the parameter is already encoded, by decoding the parameter and encoding it again. + + There are 2 problems: + 1. It may guess wrong, and skip encoding a parameter which looks like encoded. + 2. If the parameter can't be decoded, `decodeURIComponent` will throw an error, and the whole request will fail. + + This patch only fixes the second error behavior at the moment. + */ + const oldApi = $.api; + $.api = $.fn.api = function(...args) { + const apiCall = oldApi.bind(this); + const ret = oldApi.apply(this, args); + + if (typeof args[0] !== 'string') { + const internalGet = apiCall('internal', 'get'); + const oldUrlEncodedValue = internalGet.urlEncodedValue; + internalGet.urlEncodedValue = function (value) { + try { + return oldUrlEncodedValue(value); + } catch { + // if Fomantic API module's `urlEncodedValue` throws an error, we encode it by ourselves. + return encodeURIComponent(value); + } + }; + } + return ret; + } + $.api.settings = oldApi.settings; +} From c0cd3a47efa7c52117ed2ffee9fa2aa5e3bbb7db Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 20:45:23 +0800 Subject: [PATCH 66/72] fix lint --- web_src/js/modules/fomantic.js | 48 ++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/web_src/js/modules/fomantic.js b/web_src/js/modules/fomantic.js index b79b0a658d077..1495b311ca60b 100644 --- a/web_src/js/modules/fomantic.js +++ b/web_src/js/modules/fomantic.js @@ -27,18 +27,19 @@ export function initGiteaFomantic() { } function initFomanticApiPatch() { - /* - Fomantic API module has some very buggy behaviors: - - If encodeParameters=true, it calls `urlEncodedValue` to encode the parameter. - However, `urlEncodedValue` just tries to "guess" whether the parameter is already encoded, by decoding the parameter and encoding it again. - - There are 2 problems: - 1. It may guess wrong, and skip encoding a parameter which looks like encoded. - 2. If the parameter can't be decoded, `decodeURIComponent` will throw an error, and the whole request will fail. - - This patch only fixes the second error behavior at the moment. - */ + // + // Fomantic API module has some very buggy behaviors: + // + // If encodeParameters=true, it calls `urlEncodedValue` to encode the parameter. + // However, `urlEncodedValue` just tries to "guess" whether the parameter is already encoded, by decoding the parameter and encoding it again. + // + // There are 2 problems: + // 1. It may guess wrong, and skip encoding a parameter which looks like encoded. + // 2. If the parameter can't be decoded, `decodeURIComponent` will throw an error, and the whole request will fail. + // + // This patch only fixes the second error behavior at the moment. + // + const patchKey = '_giteaFomanticApiPatch'; const oldApi = $.api; $.api = $.fn.api = function(...args) { const apiCall = oldApi.bind(this); @@ -46,17 +47,20 @@ function initFomanticApiPatch() { if (typeof args[0] !== 'string') { const internalGet = apiCall('internal', 'get'); - const oldUrlEncodedValue = internalGet.urlEncodedValue; - internalGet.urlEncodedValue = function (value) { - try { - return oldUrlEncodedValue(value); - } catch { - // if Fomantic API module's `urlEncodedValue` throws an error, we encode it by ourselves. - return encodeURIComponent(value); - } - }; + if (!internalGet.urlEncodedValue[patchKey]) { + const oldUrlEncodedValue = internalGet.urlEncodedValue; + internalGet.urlEncodedValue = function (value) { + try { + return oldUrlEncodedValue(value); + } catch { + // if Fomantic API module's `urlEncodedValue` throws an error, we encode it by ourselves. + return encodeURIComponent(value); + } + }; + internalGet.urlEncodedValue[patchKey] = true; + } } return ret; - } + }; $.api.settings = oldApi.settings; } From 61c0d9d6b0b8c495faf5331ca0e1b965768985d1 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 21:04:06 +0800 Subject: [PATCH 67/72] fine tune avatar size --- templates/repo/issue/list.tmpl | 4 ++-- templates/repo/issue/milestone_issues.tmpl | 4 ++-- web_src/js/features/repo-issue-list.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 41820a88bacfa..fd888657d6b4e 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -149,7 +149,7 @@ {{.locale.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - {{avatar $.Context . 16}}{{template "repo/search_name" .}} + {{avatar $.Context . 20}}{{template "repo/search_name" .}} {{end}}
@@ -298,7 +298,7 @@
{{range .Assignees}}
- {{avatar $.Context .}} {{.GetDisplayName}} + {{avatar $.Context . 20}} {{.GetDisplayName}}
{{end}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 55a7752d11586..ed7ea7ac0aaf3 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -103,7 +103,7 @@ {{.locale.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - {{avatar $.Context . 28 "gt-mr-2"}}{{template "repo/search_name" .}} + {{avatar $.Context . 20}}{{template "repo/search_name" .}} {{end}}
@@ -189,7 +189,7 @@
{{range .Assignees}}
- {{avatar $.Context . 28 "gt-mr-2"}} + {{avatar $.Context . 28}} {{.GetDisplayName}}
{{end}} diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js index 92db480ddaba0..6c5d1244fd7ed 100644 --- a/web_src/js/features/repo-issue-list.js +++ b/web_src/js/features/repo-issue-list.js @@ -78,7 +78,7 @@ function initRepoIssueListAuthorDropdown() { // 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)}`; + let html = `${htmlEscape(item.username)}`; if (item.full_name) html += `${htmlEscape(item.full_name)}`; processedResults.push({value: item.user_id, name: html}); } From 4811e8ab33e0016b4a1f4c1ac5df64d4d92263d1 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 21:06:28 +0800 Subject: [PATCH 68/72] fine tune avatar size --- templates/repo/issue/milestone_issues.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index ed7ea7ac0aaf3..3f7bf17668789 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -189,7 +189,7 @@
{{range .Assignees}}
- {{avatar $.Context . 28}} + {{avatar $.Context . 20}} {{.GetDisplayName}}
{{end}} From 288f3013aed3861dd51e46d0cf41687b8369cbe5 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 4 Apr 2023 21:14:39 +0800 Subject: [PATCH 69/72] fix issue sidebar avatar --- templates/repo/issue/view_content/sidebar.tmpl | 2 +- web_src/css/repository.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 25df29e5fb387..521d6ba1d3da8 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -254,7 +254,7 @@ {{end}} {{svg "octicon-check"}} - {{avatar $.Context . 28 "gt-mr-3"}}{{template "repo/search_name" .}} + {{avatar $.Context . 20 "gt-mr-3"}}{{template "repo/search_name" .}} {{end}} diff --git a/web_src/css/repository.css b/web_src/css/repository.css index d1af6b063df94..0426321fa8314 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -72,8 +72,8 @@ max-height: 500px; } -.repository .metas .ui.list.assignees .icon { - line-height: 2em; +.repository .metas .ui.list.assignees .item { + line-height: 2.5em; } .repository .metas .ui.list.assignees .teamavatar { From 5bfd0b0e17a94132d6fe4f1e55a8717629a7ca44 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 5 Apr 2023 00:03:08 +0200 Subject: [PATCH 70/72] Update templates/repo/issue/list.tmpl --- templates/repo/issue/list.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index fd888657d6b4e..06cc3aba910f9 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -118,9 +118,9 @@
{{.locale.Tr "repo.issues.filter_poster"}} From 37141e4921086d6dbef8b9a470a98e6a570a7d1f Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 5 Apr 2023 00:05:56 +0200 Subject: [PATCH 71/72] Update templates/repo/issue/milestone_issues.tmpl --- templates/repo/issue/milestone_issues.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 3f7bf17668789..148a23db66752 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -72,9 +72,9 @@
{{.locale.Tr "repo.issues.filter_poster"}} From cc4a1fa208823d7d88ff01b27a7b9b37716d21ee Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 6 Apr 2023 10:47:39 +0800 Subject: [PATCH 72/72] add comment for adding self --- routers/web/repo/issue.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 08e1ea1550cef..5401d60b55092 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3374,6 +3374,8 @@ func IssuePosters(ctx *context.Context) { } if search == "" && ctx.Doer != nil { + // the returned posters slice only contains limited number of users, + // to make the current user (doer) can quickly filter their own issues, always add doer to the posters slice if !util.SliceContainsFunc(posters, func(user *user_model.User) bool { return user.ID == ctx.Doer.ID }) { posters = append(posters, ctx.Doer) }