mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Rename isEmailChecked to emailChecked
This commit is contained in:
parent
d71b6fbb60
commit
03e1624c11
@ -5,14 +5,14 @@ export const searchUsers = gql`
|
||||
$searchText: String!
|
||||
$currentPage: Int
|
||||
$pageSize: Int
|
||||
$isEmailChecked: Boolean
|
||||
$emailChecked: Boolean
|
||||
$isDeleted: Boolean
|
||||
) {
|
||||
searchUsers(
|
||||
searchText: $searchText
|
||||
currentPage: $currentPage
|
||||
pageSize: $pageSize
|
||||
isEmailChecked: $isEmailChecked
|
||||
emailChecked: $emailChecked
|
||||
isDeleted: $isDeleted
|
||||
) {
|
||||
userCount
|
||||
|
||||
@ -71,7 +71,7 @@ describe('Creation', () => {
|
||||
searchText: '',
|
||||
currentPage: 1,
|
||||
pageSize: 25,
|
||||
isEmailChecked: true,
|
||||
emailChecked: true,
|
||||
isDeleted: false,
|
||||
},
|
||||
}),
|
||||
@ -271,7 +271,7 @@ describe('Creation', () => {
|
||||
searchText: 'XX',
|
||||
currentPage: 1,
|
||||
pageSize: 25,
|
||||
isEmailChecked: true,
|
||||
emailChecked: true,
|
||||
isDeleted: false,
|
||||
},
|
||||
}),
|
||||
@ -288,7 +288,7 @@ describe('Creation', () => {
|
||||
searchText: '',
|
||||
currentPage: 1,
|
||||
pageSize: 25,
|
||||
isEmailChecked: true,
|
||||
emailChecked: true,
|
||||
isDeleted: false,
|
||||
},
|
||||
}),
|
||||
@ -305,7 +305,7 @@ describe('Creation', () => {
|
||||
searchText: '',
|
||||
currentPage: 2,
|
||||
pageSize: 25,
|
||||
isEmailChecked: true,
|
||||
emailChecked: true,
|
||||
isDeleted: false,
|
||||
},
|
||||
}),
|
||||
|
||||
@ -102,7 +102,7 @@ export default {
|
||||
searchText: this.criteria,
|
||||
currentPage: this.currentPage,
|
||||
pageSize: this.perPage,
|
||||
isEmailChecked: true,
|
||||
emailChecked: true,
|
||||
isDeleted: false,
|
||||
},
|
||||
fetchPolicy: 'network-only',
|
||||
|
||||
@ -82,7 +82,7 @@ describe('UserSearch', () => {
|
||||
searchText: '',
|
||||
currentPage: 1,
|
||||
pageSize: 25,
|
||||
isEmailChecked: null,
|
||||
emailChecked: null,
|
||||
isDeleted: null,
|
||||
},
|
||||
}),
|
||||
@ -101,7 +101,7 @@ describe('UserSearch', () => {
|
||||
searchText: '',
|
||||
currentPage: 1,
|
||||
pageSize: 25,
|
||||
isEmailChecked: true,
|
||||
emailChecked: true,
|
||||
isDeleted: null,
|
||||
},
|
||||
}),
|
||||
@ -121,7 +121,7 @@ describe('UserSearch', () => {
|
||||
searchText: '',
|
||||
currentPage: 1,
|
||||
pageSize: 25,
|
||||
isEmailChecked: null,
|
||||
emailChecked: null,
|
||||
isDeleted: true,
|
||||
},
|
||||
}),
|
||||
@ -141,7 +141,7 @@ describe('UserSearch', () => {
|
||||
searchText: '',
|
||||
currentPage: 2,
|
||||
pageSize: 25,
|
||||
isEmailChecked: null,
|
||||
emailChecked: null,
|
||||
isDeleted: null,
|
||||
},
|
||||
}),
|
||||
@ -161,7 +161,7 @@ describe('UserSearch', () => {
|
||||
searchText: 'search string',
|
||||
currentPage: 1,
|
||||
pageSize: 25,
|
||||
isEmailChecked: null,
|
||||
emailChecked: null,
|
||||
isDeleted: null,
|
||||
},
|
||||
}),
|
||||
@ -178,7 +178,7 @@ describe('UserSearch', () => {
|
||||
searchText: '',
|
||||
currentPage: 1,
|
||||
pageSize: 25,
|
||||
isEmailChecked: null,
|
||||
emailChecked: null,
|
||||
isDeleted: null,
|
||||
},
|
||||
}),
|
||||
|
||||
@ -85,7 +85,7 @@ export default {
|
||||
searchText: this.criteria,
|
||||
currentPage: this.currentPage,
|
||||
pageSize: this.perPage,
|
||||
isEmailChecked: this.filterCheckedEmails,
|
||||
emailChecked: this.filterCheckedEmails,
|
||||
isDeleted: this.filterDeletedUser,
|
||||
},
|
||||
fetchPolicy: 'no-cache',
|
||||
|
||||
@ -12,7 +12,7 @@ export default class SearchUsersArgs {
|
||||
pageSize?: number
|
||||
|
||||
@Field(() => Boolean, { nullable: true })
|
||||
isEmailChecked?: boolean | null
|
||||
emailChecked?: boolean | null
|
||||
|
||||
@Field(() => Boolean, { nullable: true })
|
||||
isDeleted?: boolean | null
|
||||
|
||||
@ -56,15 +56,15 @@ export class AdminResolver {
|
||||
searchText,
|
||||
currentPage = 1,
|
||||
pageSize = 25,
|
||||
isEmailChecked = null,
|
||||
emailChecked = null,
|
||||
isDeleted = null,
|
||||
}: SearchUsersArgs,
|
||||
): Promise<SearchUsersResult> {
|
||||
const userRepository = getCustomRepository(UserRepository)
|
||||
|
||||
const filterCriteria: ObjectLiteral[] = []
|
||||
if (isEmailChecked !== null) {
|
||||
filterCriteria.push({ emailChecked: isEmailChecked })
|
||||
if (emailChecked !== null) {
|
||||
filterCriteria.push({ emailChecked: emailChecked })
|
||||
}
|
||||
|
||||
if (isDeleted !== null) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user