diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index 889b01972..ca7bc4718 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -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 diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index 58c7e3796..1f172139b 100644 --- a/admin/src/pages/Creation.spec.js +++ b/admin/src/pages/Creation.spec.js @@ -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, }, }), diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index ab4993beb..6657b5915 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -102,7 +102,7 @@ export default { searchText: this.criteria, currentPage: this.currentPage, pageSize: this.perPage, - isEmailChecked: true, + emailChecked: true, isDeleted: false, }, fetchPolicy: 'network-only', diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js index 0f11a0435..18950c46a 100644 --- a/admin/src/pages/UserSearch.spec.js +++ b/admin/src/pages/UserSearch.spec.js @@ -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, }, }), diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index f1c222a78..06abd25aa 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -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', diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts index 72fdf0499..677d1958b 100644 --- a/backend/src/graphql/arg/SearchUsersArgs.ts +++ b/backend/src/graphql/arg/SearchUsersArgs.ts @@ -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 diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 62e64f7f5..2801a2b81 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -56,15 +56,15 @@ export class AdminResolver { searchText, currentPage = 1, pageSize = 25, - isEmailChecked = null, + emailChecked = null, isDeleted = null, }: SearchUsersArgs, ): Promise { const userRepository = getCustomRepository(UserRepository) const filterCriteria: ObjectLiteral[] = [] - if (isEmailChecked !== null) { - filterCriteria.push({ emailChecked: isEmailChecked }) + if (emailChecked !== null) { + filterCriteria.push({ emailChecked: emailChecked }) } if (isDeleted !== null) {