diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 25787490f..0384b64c5 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -2110,7 +2110,7 @@ describe('UserResolver', () => { describe('search users', () => { const variablesWithoutTextAndFilters = { - searchText: '', + query: '', currentPage: 1, pageSize: 25, filters: null, diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 9934c93de..adf774e80 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -23,7 +23,7 @@ import { v4 as uuidv4 } from 'uuid' import { CreateUserArgs } from '@arg/CreateUserArgs' import { Paginated } from '@arg/Paginated' -import { SearchUsersArgs } from '@arg/SearchUsersArgs' +import { SearchUsersFilters } from '@arg/SearchUsersFilters' import { UnsecureLoginArgs } from '@arg/UnsecureLoginArgs' import { UpdateUserInfosArgs } from '@arg/UpdateUserInfosArgs' import { OptInType } from '@enum/OptInType' @@ -640,8 +640,11 @@ export class UserResolver { @Authorized([RIGHTS.SEARCH_USERS]) @Query(() => SearchUsersResult) async searchUsers( + @Arg('query', () => String) query: string, + @Arg('filters', () => SearchUsersFilters, { nullable: true }) + filters: SearchUsersFilters | null | undefined, @Args() - { searchText, currentPage = 1, pageSize = 25, filters }: SearchUsersArgs, + { currentPage = 1, pageSize = 25, order = Order.ASC }: Paginated, @Ctx() context: Context, ): Promise { const clientTimezoneOffset = getClientTimezoneOffset(context) @@ -659,15 +662,16 @@ export class UserResolver { userFields.map((fieldName) => { return 'user.' + fieldName }), - searchText, + query, filters ?? null, currentPage, pageSize, + order, ) if (users.length === 0) { return { - userCount: 0, + userCount: count, userList: [], } }