From 81450313dc8470cbd1a1538b1469d511848807c1 Mon Sep 17 00:00:00 2001 From: "m.huber" Date: Sun, 10 Mar 2024 02:42:49 +0100 Subject: [PATCH 1/7] Expose fuzzy search for issues/pulls Signed-off-by: 6543 <6543@obermui.de> --- options/locale/locale_en-US.ini | 2 ++ routers/web/user/home.go | 12 +++++++-- templates/user/dashboard/issues.tmpl | 40 +++++++++++++++------------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index dc16d78fc7e6e..baba6ddfc9635 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -177,6 +177,8 @@ branch_kind = Search branches... commit_kind = Search commits... runner_kind = Search runners... no_results = No matching results found. +issue_kind = Search issues... +pull_kind = Search pulls... keyword_search_unavailable = Searching by keyword is currently not available. Please contact the site administrator. [aria] diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 4ec6f6be3f36e..6f0fae6f63bc5 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -447,6 +447,8 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { User: ctx.Doer, } + isFuzzy := ctx.FormBool("fuzzy") + // Search all repositories which // // As user: @@ -549,7 +551,9 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { // USING FINAL STATE OF opts FOR A QUERY. var issues issues_model.IssueList { - issueIDs, _, err := issue_indexer.SearchIssues(ctx, issue_indexer.ToSearchOptions(keyword, opts)) + issueSearchOptions := issue_indexer.ToSearchOptions(keyword, opts) + issueSearchOptions.IsFuzzyKeyword = isFuzzy + issueIDs, _, err := issue_indexer.SearchIssues(ctx, issueSearchOptions) if err != nil { ctx.ServerError("issueIDsFromSearch", err) return @@ -570,7 +574,9 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { // ------------------------------- // Fill stats to post to ctx.Data. // ------------------------------- - issueStats, err := getUserIssueStats(ctx, ctxUser, filterMode, issue_indexer.ToSearchOptions(keyword, opts)) + issueSearchOptions := issue_indexer.ToSearchOptions(keyword, opts) + issueSearchOptions.IsFuzzyKeyword = isFuzzy + issueStats, err := getUserIssueStats(ctx, ctxUser, filterMode, issueSearchOptions) if err != nil { ctx.ServerError("getUserIssueStats", err) return @@ -624,6 +630,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { ctx.Data["SortType"] = sortType ctx.Data["IsShowClosed"] = isShowClosed ctx.Data["SelectLabels"] = selectedLabels + ctx.Data["IsFuzzy"] = isFuzzy if isShowClosed { ctx.Data["State"] = "closed" @@ -639,6 +646,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { pager.AddParam(ctx, "labels", "SelectLabels") pager.AddParam(ctx, "milestone", "MilestoneID") pager.AddParam(ctx, "assignee", "AssigneeID") + pager.AddParam(ctx, "fuzzy", "IsFuzzy") ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplIssues) diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 0fbf9a7361b4f..ba575e04abbbb 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -5,29 +5,29 @@
- + {{ctx.Locale.Tr "home.issues.in_your_repos"}} {{CountFmt .IssueStats.YourRepositoriesCount}} - + {{ctx.Locale.Tr "repo.issues.filter_type.assigned_to_you"}} {{CountFmt .IssueStats.AssignCount}} - + {{ctx.Locale.Tr "repo.issues.filter_type.created_by_you"}} {{CountFmt .IssueStats.CreateCount}} {{if .PageIsPulls}} - + {{ctx.Locale.Tr "repo.issues.filter_type.review_requested"}} {{CountFmt .IssueStats.ReviewRequestedCount}} - + {{ctx.Locale.Tr "repo.issues.filter_type.reviewed_by_you"}} {{CountFmt .IssueStats.ReviewedCount}} {{end}} - + {{ctx.Locale.Tr "repo.issues.filter_type.mentioning_you"}} {{CountFmt .IssueStats.MentionCount}} @@ -36,11 +36,11 @@
- + {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{ctx.Locale.PrettyNumber .IssueStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} - + {{svg "octicon-issue-closed" 16 "gt-mr-3"}} {{ctx.Locale.PrettyNumber .IssueStats.ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}} @@ -50,9 +50,11 @@ - {{template "shared/search/input" dict "Value" $.Keyword}} - - {{template "shared/search/button"}} + {{if .PageIsPulls}} + {{template "shared/search/combo_fuzzy" dict "Value" $.Keyword "IsFuzzy" $.IsFuzzy "Placeholder" (ctx.Locale.Tr "search.pull_kind") "Tooltip" (ctx.Locale.Tr "explorer.go")}} + {{else}} + {{template "shared/search/combo_fuzzy" dict "Value" $.Keyword "IsFuzzy" $.IsFuzzy "Placeholder" (ctx.Locale.Tr "search.issue_kind") "Tooltip" (ctx.Locale.Tr "explorer.go")}} + {{end}}
@@ -62,14 +64,14 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.mostcomment"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastcomment"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.nearduedate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.farduedate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.mostcomment"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastcomment"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.nearduedate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.farduedate"}}
From 569fbddb6a94c0fa9055cc8982e98c1b7cfe841d Mon Sep 17 00:00:00 2001 From: "m.huber" Date: Mon, 11 Mar 2024 14:40:05 +0100 Subject: [PATCH 2/7] use SearchOptions.Copy() --- routers/web/user/home.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 6f0fae6f63bc5..43a558920b5bd 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -551,9 +551,9 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { // USING FINAL STATE OF opts FOR A QUERY. var issues issues_model.IssueList { - issueSearchOptions := issue_indexer.ToSearchOptions(keyword, opts) - issueSearchOptions.IsFuzzyKeyword = isFuzzy - issueIDs, _, err := issue_indexer.SearchIssues(ctx, issueSearchOptions) + issueIDs, _, err := issue_indexer.SearchIssues(ctx, issue_indexer.ToSearchOptions(keyword, opts).Copy( + func(o *issue_indexer.SearchOptions) { o.IsFuzzyKeyword = isFuzzy }, + )) if err != nil { ctx.ServerError("issueIDsFromSearch", err) return @@ -574,9 +574,9 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { // ------------------------------- // Fill stats to post to ctx.Data. // ------------------------------- - issueSearchOptions := issue_indexer.ToSearchOptions(keyword, opts) - issueSearchOptions.IsFuzzyKeyword = isFuzzy - issueStats, err := getUserIssueStats(ctx, ctxUser, filterMode, issueSearchOptions) + issueStats, err := getUserIssueStats(ctx, ctxUser, filterMode, issue_indexer.ToSearchOptions(keyword, opts).Copy( + func(o *issue_indexer.SearchOptions) { o.IsFuzzyKeyword = isFuzzy }, + )) if err != nil { ctx.ServerError("getUserIssueStats", err) return From da89c8acdbf8d3f247c6b61bc26ea40ac2f22d48 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 18 Mar 2024 22:31:08 +0100 Subject: [PATCH 3/7] make dropdown smaller --- web_src/css/base.css | 2 +- web_src/css/form.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index ea5ba9ce8756a..1a7f2e81b77b4 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -264,7 +264,7 @@ ol.ui.list li, /* currently used for search bar dropdowns in repo search and explore code */ .ui.action.input:not([class*="left action"]) > .ui.dropdown.selection { - min-width: 10em; + min-width: 7em; } .ui.action.input:not([class*="left action"]) > .ui.dropdown.selection:not(:focus) { border-right: none; diff --git a/web_src/css/form.css b/web_src/css/form.css index ca65b677d7106..cb078e93e9b2a 100644 --- a/web_src/css/form.css +++ b/web_src/css/form.css @@ -43,7 +43,7 @@ textarea, /* fix fomantic small dropdown having inconsistent padding with input */ .ui.small.selection.dropdown { - padding: .67857143em 3.2em .67857143em 1em; + padding: .67857143em 1.6em .67857143em 1em; } input:hover, From ebd5d39187e168efc8258bb354643edb4e19f6f1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 18 Mar 2024 22:32:23 +0100 Subject: [PATCH 4/7] use 6em --- web_src/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 1a7f2e81b77b4..0ae04f63bfb47 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -264,7 +264,7 @@ ol.ui.list li, /* currently used for search bar dropdowns in repo search and explore code */ .ui.action.input:not([class*="left action"]) > .ui.dropdown.selection { - min-width: 7em; + min-width: 6em; } .ui.action.input:not([class*="left action"]) > .ui.dropdown.selection:not(:focus) { border-right: none; From 2a3ed3b04ad432924065bcb1ccc3e66184e2830d Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 18 Mar 2024 22:42:37 +0100 Subject: [PATCH 5/7] match -> exact --- options/locale/locale_en-US.ini | 4 ++-- templates/shared/search/fuzzy.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7947375f58993..fd2dcf1139e54 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -163,8 +163,8 @@ search = Search... type_tooltip = Search type fuzzy = Fuzzy fuzzy_tooltip = Include results that also match the search term closely -match = Match -match_tooltip = Include only results that match the exact search term +exact = Exact +exact_tooltip = Include only results that match the exact search term repo_kind = Search repos... user_kind = Search users... org_kind = Search orgs... diff --git a/templates/shared/search/fuzzy.tmpl b/templates/shared/search/fuzzy.tmpl index 6ddb03c004b0e..5c09d3c15093d 100644 --- a/templates/shared/search/fuzzy.tmpl +++ b/templates/shared/search/fuzzy.tmpl @@ -2,9 +2,9 @@ {{/* IsFuzzy - state of the fuzzy search toggle */}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}} -
{{if .IsFuzzy}}{{ctx.Locale.Tr "search.fuzzy"}}{{else}}{{ctx.Locale.Tr "search.match"}}{{end}}
+
{{if .IsFuzzy}}{{ctx.Locale.Tr "search.fuzzy"}}{{else}}{{ctx.Locale.Tr "search.exact"}}{{end}}
{{ctx.Locale.Tr "search.fuzzy"}}
-
{{ctx.Locale.Tr "search.match"}}
+
{{ctx.Locale.Tr "search.exact"}}
From d0e03af0802ab7f2a5fdd7d7af19c792e205cbe6 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 23 Mar 2024 19:43:57 +0100 Subject: [PATCH 6/7] normal issue search too & conflict fix --- templates/repo/issue/search.tmpl | 3 +-- templates/user/dashboard/issues.tmpl | 27 ++++++++------------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index 4727b26154fb7..1ea3c7e021a99 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -9,10 +9,9 @@ {{end}} - {{template "shared/search/input" dict "Value" .Keyword}} + {{template "shared/search/combo_fuzzy" dict "Value" .Keyword "IsFuzzy" .IsFuzzy "Placeholder" (ctx.Locale.Tr "explore.go_to")}} {{if .PageIsIssueList}} {{end}} - {{template "shared/search/button"}}
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 7387b59002460..e650ce2e29a95 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -65,25 +65,14 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
-<<<<<<< HEAD - {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.mostcomment"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastcomment"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.nearduedate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.farduedate"}} -======= - {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.mostcomment"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastcomment"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.nearduedate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.farduedate"}} ->>>>>>> main + {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.mostcomment"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastcomment"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.nearduedate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.farduedate"}}
From 4b91eab4b45802892421cebdd59bf9c870aaea95 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 23 Mar 2024 20:01:47 +0100 Subject: [PATCH 7/7] Revert "normal issue search too" This reverts commit d0e03af0802ab7f2a5fdd7d7af19c792e205cbe6. --- templates/repo/issue/search.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index 1ea3c7e021a99..4727b26154fb7 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -9,9 +9,10 @@ {{end}} - {{template "shared/search/combo_fuzzy" dict "Value" .Keyword "IsFuzzy" .IsFuzzy "Placeholder" (ctx.Locale.Tr "explore.go_to")}} + {{template "shared/search/input" dict "Value" .Keyword}} {{if .PageIsIssueList}} {{end}} + {{template "shared/search/button"}}