Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve user search display name #29002

Merged
merged 11 commits into from
Feb 1, 2024
Merged

Improve user search display name #29002

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
081334f
Use description for extra info.
KN4CK3R Jan 31, 2024
07cf3bb
Re-Add escaping.
KN4CK3R Feb 1, 2024
3325feb
Remove unused variable.
KN4CK3R Feb 1, 2024
9a3470d
css fixes for search box
silverwind Feb 1, 2024
bfcca71
move selector
silverwind Feb 1, 2024
28be871
remove outdated comment
silverwind Feb 1, 2024
6da0685
fix margin and add comment
silverwind Feb 1, 2024
cd61872
Update web_src/js/features/comp/SearchUserBox.js
silverwind Feb 1, 2024
e7cb124
Add TODO
silverwind Feb 1, 2024
9eceb9a
fix typo
silverwind Feb 1, 2024
376178f
Merge branch 'main' into improve-search-displayname
GiteaBot Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions routers/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ import (
"code.gitea.io/gitea/modules/setting"
)

// RemoveUsernameParameterSuffix returns the username parameter without the (fullname) suffix - leaving just the username
func RemoveUsernameParameterSuffix(name string) string {
if index := strings.Index(name, " ("); index >= 0 {
name = name[:index]
}
return name
}

// SanitizeFlashErrorString will sanitize a flash error string
func SanitizeFlashErrorString(x string) string {
return strings.ReplaceAll(html.EscapeString(x), "\n", "<br>")
Expand Down
6 changes: 0 additions & 6 deletions routers/utils/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ import (
"github.com/stretchr/testify/assert"
)

func TestRemoveUsernameParameterSuffix(t *testing.T) {
assert.Equal(t, "foobar", RemoveUsernameParameterSuffix("foobar (Foo Bar)"))
assert.Equal(t, "foobar", RemoveUsernameParameterSuffix("foobar"))
assert.Equal(t, "", RemoveUsernameParameterSuffix(""))
}

func TestIsExternalURL(t *testing.T) {
setting.AppURL = "https://try.gitea.io/"
type test struct {
Expand Down
3 changes: 1 addition & 2 deletions routers/web/org/teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/routers/utils"
shared_user "code.gitea.io/gitea/routers/web/shared/user"
"code.gitea.io/gitea/services/convert"
"code.gitea.io/gitea/services/forms"
Expand Down Expand Up @@ -127,7 +126,7 @@ func TeamsAction(ctx *context.Context) {
ctx.Error(http.StatusNotFound)
return
}
uname := utils.RemoveUsernameParameterSuffix(strings.ToLower(ctx.FormString("uname")))
uname := strings.ToLower(ctx.FormString("uname"))
var u *user_model.User
u, err = user_model.GetUserByName(ctx, uname)
if err != nil {
Expand Down
5 changes: 2 additions & 3 deletions routers/web/repo/setting/collaboration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"code.gitea.io/gitea/modules/log"
repo_module "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/routers/utils"
"code.gitea.io/gitea/services/mailer"
org_service "code.gitea.io/gitea/services/org"
repo_service "code.gitea.io/gitea/services/repository"
Expand Down Expand Up @@ -52,7 +51,7 @@ func Collaboration(ctx *context.Context) {

// CollaborationPost response for actions for a collaboration of a repository
func CollaborationPost(ctx *context.Context) {
name := utils.RemoveUsernameParameterSuffix(strings.ToLower(ctx.FormString("collaborator")))
name := strings.ToLower(ctx.FormString("collaborator"))
if len(name) == 0 || ctx.Repo.Owner.LowerName == name {
ctx.Redirect(setting.AppSubURL + ctx.Req.URL.EscapedPath())
return
Expand Down Expand Up @@ -144,7 +143,7 @@ func AddTeamPost(ctx *context.Context) {
return
}

name := utils.RemoveUsernameParameterSuffix(strings.ToLower(ctx.FormString("team")))
name := strings.ToLower(ctx.FormString("team"))
if len(name) == 0 {
ctx.Redirect(ctx.Repo.RepoLink + "/settings/collaboration")
return
Expand Down
4 changes: 4 additions & 0 deletions web_src/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,14 @@ a.label,
.ui.search > .results {
background: var(--color-body);
border-color: var(--color-secondary);
overflow-wrap: anywhere; /* allow text to wrap as fomantic limits this to 18em width */
}

.ui.search > .results .result {
background: var(--color-body);
border-color: var(--color-secondary);
display: flex;
align-items: center;
wxiaoguang marked this conversation as resolved.
Show resolved Hide resolved
}

.ui.search > .results .result .title {
Expand Down
8 changes: 5 additions & 3 deletions web_src/css/repo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2128,14 +2128,16 @@
}

#search-user-box .results .result .image {
float: left;
margin-right: 8px;
order: 0;
margin-right: 12px;
width: 2em;
height: 2em;
min-width: 2em;
min-height: 2em;
}

#search-user-box .results .result .content {
margin: 6px 0; /* this trick is used to align with the sibling avatar image */
margin: 0; /* remove margin reserved for avatar becaue we move it to left via `order: 0` */
silverwind marked this conversation as resolved.
Show resolved Hide resolved
}

.ui.menu .item > img:not(.ui) {
Expand Down
9 changes: 4 additions & 5 deletions web_src/js/features/comp/SearchUserBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@ export function initCompSearchUserBox() {
const searchQuery = $searchUserBox.find('input').val();
const searchQueryUppercase = searchQuery.toUpperCase();
$.each(response.data, (_i, item) => {
let title = item.login;
if (item.full_name && item.full_name.length > 0) {
title += ` (${htmlEscape(item.full_name)})`;
}
const resultItem = {
title,
title: item.login,
image: item.avatar_url
};
if (item.full_name) {
resultItem.description = htmlEscape(item.full_name);
}
if (searchQueryUppercase === item.login.toUpperCase()) {
items.unshift(resultItem);
} else {
Expand Down
4 changes: 2 additions & 2 deletions web_src/js/features/repo-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ export function initRepoSettingSearchTeamBox() {
onResponse(response) {
const items = [];
$.each(response.data, (_i, item) => {
const title = `${item.name} (${item.permission} access)`;
items.push({
title,
title: item.name,
description: `${item.permission} access`
silverwind marked this conversation as resolved.
Show resolved Hide resolved
});
});

Expand Down
Loading