Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 15 additions & 3 deletions coderd/coderdtest/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,19 @@ func UsersFilter(
Search: "a",
},
FilterF: func(_ codersdk.UsersRequest, u codersdk.User) bool {
return (strings.ContainsAny(u.Username, "aA") || strings.ContainsAny(u.Email, "aA"))
return (strings.ContainsAny(u.Username, "aA") || strings.ContainsAny(u.Email, "aA") || strings.ContainsAny(u.Name, "aA"))
},
},
{
Name: "DisplayNameSearch",
Filter: codersdk.UsersRequest{
Search: "user",
},
FilterF: func(_ codersdk.UsersRequest, u codersdk.User) bool {
const term = "user"
return strings.Contains(strings.ToLower(u.Username), term) ||
strings.Contains(strings.ToLower(u.Email), term) ||
strings.Contains(strings.ToLower(u.Name), term)
},
},
{
Expand Down Expand Up @@ -470,7 +482,7 @@ func UsersFilter(
FilterF: func(_ codersdk.UsersRequest, u codersdk.User) bool {
for _, r := range u.Roles {
if r.Name == codersdk.RoleOwner {
return (strings.ContainsAny(u.Username, "iI") || strings.ContainsAny(u.Email, "iI")) &&
return (strings.ContainsAny(u.Username, "iI") || strings.ContainsAny(u.Email, "iI") || strings.ContainsAny(u.Name, "iI")) &&
u.Status == codersdk.UserStatusActive
}
}
Expand All @@ -485,7 +497,7 @@ func UsersFilter(
FilterF: func(_ codersdk.UsersRequest, u codersdk.User) bool {
for _, r := range u.Roles {
if r.Name == codersdk.RoleOwner {
return (strings.ContainsAny(u.Username, "iI") || strings.ContainsAny(u.Email, "iI")) &&
return (strings.ContainsAny(u.Username, "iI") || strings.ContainsAny(u.Email, "iI") || strings.ContainsAny(u.Name, "iI")) &&
u.Status == codersdk.UserStatusActive
}
}
Expand Down
9 changes: 6 additions & 3 deletions coderd/database/queries.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion coderd/database/queries/groupmembers.sql
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ WHERE
ELSE true
END
-- Start filters
-- Filter by email or username
-- Filter by email, username, or name (display name)
AND CASE
WHEN @search :: text != '' THEN (
user_email ILIKE concat('%', @search, '%')
OR user_username ILIKE concat('%', @search, '%')
OR user_name ILIKE concat('%', @search, '%')
)
ELSE true
END
Expand Down
3 changes: 2 additions & 1 deletion coderd/database/queries/organizationmembers.sql
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,12 @@ WHERE
organization_id = @organization_id
ELSE true
END
-- Filter by email or username
-- Filter by email, username, or name (display name)
AND CASE
WHEN @search :: text != '' THEN (
users.email ILIKE concat('%', @search, '%')
OR users.username ILIKE concat('%', @search, '%')
OR users.name ILIKE concat('%', @search, '%')
)
ELSE true
END
Expand Down
3 changes: 2 additions & 1 deletion coderd/database/queries/users.sql
Original file line number Diff line number Diff line change
Expand Up @@ -472,11 +472,12 @@ WHERE
ELSE true
END
-- Start filters
-- Filter by email or username
-- Filter by email, username, or name (display name)
AND CASE
WHEN @search :: text != '' THEN (
email ILIKE concat('%', @search, '%')
OR username ILIKE concat('%', @search, '%')
OR name ILIKE concat('%', @search, '%')
)
ELSE true
END
Expand Down
5 changes: 5 additions & 0 deletions docs/admin/users/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ to use the Coder's filter query:
`login_type:github`
- To find service accounts: `service_account:true`.

Any text that is not part of a `key:value` filter is treated as a free-text
search and matches against a user's username, email, and display name. For
example, entering `jane` returns users whose username, email, or display name
contains `jane`.

The following filters are supported:

- `status` - Indicates the status of the user. It can be either `active`,
Expand Down
7 changes: 6 additions & 1 deletion site/src/components/UserAutocomplete/UserAutocomplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { prepareQuery } from "#/utils/filters";
type SelectedUser = {
avatar_url?: string;
email?: string;
name?: string;
username: string;
};

Expand Down Expand Up @@ -233,7 +234,11 @@ const InnerAutocomplete = <T extends SelectedUser>({
<ComboboxItem
key={option.username}
value={option.username}
keywords={[option.username, option.email ?? ""]}
keywords={[
option.username,
option.email ?? "",
option.name ?? "",
]}
className="m-1"
>
<AvatarData
Expand Down
Loading