From 621786c91d7615774bc7d1a955c0304c54e86a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 21 Apr 2022 07:51:00 +0200 Subject: [PATCH] Rename after suggestion emailChecked withActivated and deletedAt to withDeleted --- admin/src/graphql/searchUsers.js | 12 +++++----- admin/src/pages/Creation.spec.js | 16 ++++++------- admin/src/pages/Creation.vue | 4 ++-- admin/src/pages/UserSearch.spec.js | 24 +++++++++---------- admin/src/pages/UserSearch.vue | 4 ++-- backend/src/graphql/arg/SearchUsersArgs.ts | 4 ++-- backend/src/graphql/resolver/AdminResolver.ts | 12 +++++----- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index fc81f3f1b..706927eb1 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -5,15 +5,15 @@ export const searchUsers = gql` $searchText: String! $currentPage: Int $pageSize: Int - $emailChecked: Boolean - $deletedAt: Boolean + $withActivated: Boolean + $withDeleted: Boolean ) { searchUsers( searchText: $searchText currentPage: $currentPage pageSize: $pageSize - emailChecked: $emailChecked - deletedAt: $deletedAt + withActivated: $withActivated + withDeleted: $withDeleted ) { userCount userList { @@ -22,10 +22,10 @@ export const searchUsers = gql` lastName email creation - emailChecked hasElopage emailConfirmationSend - deletedAt + withActivated + withDeleted } } } diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index e60625dd2..d1d6f0f2e 100644 --- a/admin/src/pages/Creation.spec.js +++ b/admin/src/pages/Creation.spec.js @@ -71,8 +71,8 @@ describe('Creation', () => { searchText: '', currentPage: 1, pageSize: 25, - emailChecked: true, - deletedAt: false, + withActivated: true, + withDeleted: false, }, }), ) @@ -271,8 +271,8 @@ describe('Creation', () => { searchText: 'XX', currentPage: 1, pageSize: 25, - emailChecked: true, - deletedAt: false, + withActivated: true, + withDeleted: false, }, }), ) @@ -288,8 +288,8 @@ describe('Creation', () => { searchText: '', currentPage: 1, pageSize: 25, - emailChecked: true, - deletedAt: false, + withActivated: true, + withDeleted: false, }, }), ) @@ -305,8 +305,8 @@ describe('Creation', () => { searchText: '', currentPage: 2, pageSize: 25, - emailChecked: true, - deletedAt: false, + withActivated: true, + withDeleted: false, }, }), ) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 30900a468..76d6077f5 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -102,8 +102,8 @@ export default { searchText: this.criteria, currentPage: this.currentPage, pageSize: this.perPage, - emailChecked: true, - deletedAt: false, + withActivated: true, + withDeleted: false, }, fetchPolicy: 'network-only', }) diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js index 907cbd7e0..602852608 100644 --- a/admin/src/pages/UserSearch.spec.js +++ b/admin/src/pages/UserSearch.spec.js @@ -82,8 +82,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - emailChecked: null, - deletedAt: null, + withActivated: null, + withDeleted: null, }, }), ) @@ -101,8 +101,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - emailChecked: true, - deletedAt: null, + withActivated: true, + withDeleted: null, }, }), ) @@ -121,8 +121,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - emailChecked: null, - deletedAt: true, + withActivated: null, + withDeleted: true, }, }), ) @@ -141,8 +141,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 2, pageSize: 25, - emailChecked: null, - deletedAt: null, + withActivated: null, + withDeleted: null, }, }), ) @@ -161,8 +161,8 @@ describe('UserSearch', () => { searchText: 'search string', currentPage: 1, pageSize: 25, - emailChecked: null, - deletedAt: null, + withActivated: null, + withDeleted: null, }, }), ) @@ -178,8 +178,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - emailChecked: null, - deletedAt: null, + withActivated: null, + withDeleted: null, }, }), ) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index e5f584a25..f0bf60ae1 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -85,8 +85,8 @@ export default { searchText: this.criteria, currentPage: this.currentPage, pageSize: this.perPage, - emailChecked: this.filterCheckedEmails, - deletedAt: this.filterDeletedUser, + withActivated: this.filterCheckedEmails, + withDeleted: this.filterDeletedUser, }, fetchPolicy: 'no-cache', }) diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts index 103152bac..fab17e527 100644 --- a/backend/src/graphql/arg/SearchUsersArgs.ts +++ b/backend/src/graphql/arg/SearchUsersArgs.ts @@ -12,8 +12,8 @@ export default class SearchUsersArgs { pageSize?: number @Field(() => Boolean, { nullable: true }) - emailChecked?: boolean | null + withActivated?: boolean | null @Field(() => Boolean, { nullable: true }) - deletedAt?: boolean | null + withDeleted?: boolean | null } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 495e6fb3f..bdb078ad1 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -56,19 +56,19 @@ export class AdminResolver { searchText, currentPage = 1, pageSize = 25, - emailChecked = null, - deletedAt = null, + withActivated = null, + withDeleted = null, }: SearchUsersArgs, ): Promise { const userRepository = getCustomRepository(UserRepository) const filterCriteria: ObjectLiteral[] = [] - if (emailChecked !== null) { - filterCriteria.push({ emailChecked: emailChecked }) + if (withActivated !== null) { + filterCriteria.push({ withActivated: withActivated }) } - if (deletedAt !== null) { - filterCriteria.push({ deletedAt: deletedAt ? Not(IsNull()) : IsNull() }) + if (withDeleted !== null) { + filterCriteria.push({ withDeleted: withDeleted ? Not(IsNull()) : IsNull() }) } const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt']