mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
feat: add filtering by service account (#23468)
You can now filter by/out service accounts using `service_account:true/false` or using the filter dropdown.
This commit is contained in:
+16
-13
@@ -270,19 +270,20 @@ func (api *API) paginatedMembers(rw http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
paginatedMemberRows, err := api.Database.PaginatedOrganizationMembers(ctx, database.PaginatedOrganizationMembersParams{
|
||||
AfterID: paginationParams.AfterID,
|
||||
OrganizationID: organization.ID,
|
||||
IncludeSystem: false,
|
||||
Search: userFilterParams.Search,
|
||||
Name: userFilterParams.Name,
|
||||
Status: userFilterParams.Status,
|
||||
RbacRole: userFilterParams.RbacRole,
|
||||
LastSeenBefore: userFilterParams.LastSeenBefore,
|
||||
LastSeenAfter: userFilterParams.LastSeenAfter,
|
||||
CreatedAfter: userFilterParams.CreatedAfter,
|
||||
CreatedBefore: userFilterParams.CreatedBefore,
|
||||
GithubComUserID: userFilterParams.GithubComUserID,
|
||||
LoginType: userFilterParams.LoginType,
|
||||
AfterID: paginationParams.AfterID,
|
||||
OrganizationID: organization.ID,
|
||||
IncludeSystem: false,
|
||||
Search: userFilterParams.Search,
|
||||
Name: userFilterParams.Name,
|
||||
Status: userFilterParams.Status,
|
||||
IsServiceAccount: userFilterParams.IsServiceAccount,
|
||||
RbacRole: userFilterParams.RbacRole,
|
||||
LastSeenBefore: userFilterParams.LastSeenBefore,
|
||||
LastSeenAfter: userFilterParams.LastSeenAfter,
|
||||
CreatedAfter: userFilterParams.CreatedAfter,
|
||||
CreatedBefore: userFilterParams.CreatedBefore,
|
||||
GithubComUserID: userFilterParams.GithubComUserID,
|
||||
LoginType: userFilterParams.LoginType,
|
||||
// #nosec G115 - Pagination offsets are small and fit in int32
|
||||
OffsetOpt: int32(paginationParams.Offset),
|
||||
// #nosec G115 - Pagination limits are small and fit in int32
|
||||
@@ -308,6 +309,7 @@ func (api *API) paginatedMembers(rw http.ResponseWriter, r *http.Request) {
|
||||
GlobalRoles: pRow.GlobalRoles,
|
||||
LastSeenAt: pRow.LastSeenAt,
|
||||
Status: pRow.Status,
|
||||
IsServiceAccount: pRow.IsServiceAccount,
|
||||
LoginType: pRow.LoginType,
|
||||
UserCreatedAt: pRow.UserCreatedAt,
|
||||
UserUpdatedAt: pRow.UserUpdatedAt,
|
||||
@@ -530,6 +532,7 @@ func convertOrganizationMembersWithUserData(ctx context.Context, db database.Sto
|
||||
GlobalRoles: db2sdk.SlimRolesFromNames(rows[i].GlobalRoles),
|
||||
LastSeenAt: rows[i].LastSeenAt,
|
||||
Status: codersdk.UserStatus(rows[i].Status),
|
||||
IsServiceAccount: rows[i].IsServiceAccount,
|
||||
LoginType: codersdk.LoginType(rows[i].LoginType),
|
||||
UserCreatedAt: rows[i].UserCreatedAt,
|
||||
UserUpdatedAt: rows[i].UserUpdatedAt,
|
||||
|
||||
Reference in New Issue
Block a user