From 145989e2848af0a9c32e32c99327d0616d1bf5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 19 Apr 2022 14:43:25 +0200 Subject: [PATCH 01/12] Replace notActivated by isEmailChecked --- admin/src/graphql/searchUsers.js | 4 ++-- admin/src/pages/Creation.spec.js | 8 ++++---- admin/src/pages/Creation.vue | 2 +- admin/src/pages/UserSearch.spec.js | 12 ++++++------ admin/src/pages/UserSearch.vue | 2 +- backend/src/graphql/arg/SearchUsersArgs.ts | 2 +- backend/src/graphql/resolver/AdminResolver.ts | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index e28508d1b..889b01972 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 - $notActivated: Boolean + $isEmailChecked: Boolean $isDeleted: Boolean ) { searchUsers( searchText: $searchText currentPage: $currentPage pageSize: $pageSize - notActivated: $notActivated + isEmailChecked: $isEmailChecked isDeleted: $isDeleted ) { userCount diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index 204c35817..58c7e3796 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, + isEmailChecked: true, isDeleted: false, - notActivated: false, }, }), ) @@ -271,8 +271,8 @@ describe('Creation', () => { searchText: 'XX', currentPage: 1, pageSize: 25, + isEmailChecked: true, isDeleted: false, - notActivated: false, }, }), ) @@ -288,8 +288,8 @@ describe('Creation', () => { searchText: '', currentPage: 1, pageSize: 25, + isEmailChecked: true, isDeleted: false, - notActivated: false, }, }), ) @@ -305,8 +305,8 @@ describe('Creation', () => { searchText: '', currentPage: 2, pageSize: 25, + isEmailChecked: true, isDeleted: false, - notActivated: false, }, }), ) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index e5b93350f..ab4993beb 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, - notActivated: false, + isEmailChecked: true, isDeleted: false, }, fetchPolicy: 'network-only', diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js index 0b98d4d11..c2bceaade 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, - notActivated: null, + isEmailChecked: null, isDeleted: null, }, }), @@ -101,7 +101,7 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - notActivated: true, + isEmailChecked: false, isDeleted: null, }, }), @@ -121,7 +121,7 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - notActivated: null, + isEmailChecked: null, isDeleted: true, }, }), @@ -141,7 +141,7 @@ describe('UserSearch', () => { searchText: '', currentPage: 2, pageSize: 25, - notActivated: null, + isEmailChecked: null, isDeleted: null, }, }), @@ -161,7 +161,7 @@ describe('UserSearch', () => { searchText: 'search string', currentPage: 1, pageSize: 25, - notActivated: null, + isEmailChecked: null, isDeleted: null, }, }), @@ -178,7 +178,7 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - notActivated: null, + isEmailChecked: null, isDeleted: null, }, }), diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index b2737bae6..718656b9f 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, - notActivated: this.filterCheckedEmails, + isEmailChecked: !this.filterCheckedEmails, // Wolle: has this boolean really to be negated as well? isDeleted: this.filterDeletedUser, }, fetchPolicy: 'no-cache', diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts index 2a94d8998..72fdf0499 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 }) - notActivated?: boolean | null + isEmailChecked?: 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 7ca3460ee..62e64f7f5 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, - notActivated = null, + isEmailChecked = null, isDeleted = null, }: SearchUsersArgs, ): Promise { const userRepository = getCustomRepository(UserRepository) const filterCriteria: ObjectLiteral[] = [] - if (notActivated !== null) { - filterCriteria.push({ emailChecked: !notActivated }) + if (isEmailChecked !== null) { + filterCriteria.push({ emailChecked: isEmailChecked }) } if (isDeleted !== null) { From 3344dfc771e641498ec0046d46d1cc7984087b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 19 Apr 2022 15:13:59 +0200 Subject: [PATCH 02/12] Fix admin tests --- admin/src/pages/UserSearch.spec.js | 2 +- admin/src/pages/UserSearch.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js index c2bceaade..0f11a0435 100644 --- a/admin/src/pages/UserSearch.spec.js +++ b/admin/src/pages/UserSearch.spec.js @@ -101,7 +101,7 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - isEmailChecked: false, + isEmailChecked: true, isDeleted: null, }, }), diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 718656b9f..f1c222a78 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, // Wolle: has this boolean really to be negated as well? + isEmailChecked: this.filterCheckedEmails, isDeleted: this.filterDeletedUser, }, fetchPolicy: 'no-cache', From 03e1624c11394d98a2804e65384c8bc39d56d9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 20 Apr 2022 08:48:13 +0200 Subject: [PATCH 03/12] Rename isEmailChecked to emailChecked --- admin/src/graphql/searchUsers.js | 4 ++-- admin/src/pages/Creation.spec.js | 8 ++++---- admin/src/pages/Creation.vue | 2 +- admin/src/pages/UserSearch.spec.js | 12 ++++++------ admin/src/pages/UserSearch.vue | 2 +- backend/src/graphql/arg/SearchUsersArgs.ts | 2 +- backend/src/graphql/resolver/AdminResolver.ts | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) 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) { From e8aba864309665c5842c24cf95a94856e1aceb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 20 Apr 2022 08:53:12 +0200 Subject: [PATCH 04/12] Rename isDeleted to deletedAt --- admin/src/graphql/searchUsers.js | 4 ++-- admin/src/pages/Creation.spec.js | 8 ++++---- admin/src/pages/Creation.vue | 2 +- admin/src/pages/UserSearch.spec.js | 12 ++++++------ admin/src/pages/UserSearch.vue | 2 +- backend/src/graphql/arg/SearchUsersArgs.ts | 2 +- backend/src/graphql/resolver/AdminResolver.ts | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index ca7bc4718..fc81f3f1b 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -6,14 +6,14 @@ export const searchUsers = gql` $currentPage: Int $pageSize: Int $emailChecked: Boolean - $isDeleted: Boolean + $deletedAt: Boolean ) { searchUsers( searchText: $searchText currentPage: $currentPage pageSize: $pageSize emailChecked: $emailChecked - isDeleted: $isDeleted + deletedAt: $deletedAt ) { userCount userList { diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index 1f172139b..e60625dd2 100644 --- a/admin/src/pages/Creation.spec.js +++ b/admin/src/pages/Creation.spec.js @@ -72,7 +72,7 @@ describe('Creation', () => { currentPage: 1, pageSize: 25, emailChecked: true, - isDeleted: false, + deletedAt: false, }, }), ) @@ -272,7 +272,7 @@ describe('Creation', () => { currentPage: 1, pageSize: 25, emailChecked: true, - isDeleted: false, + deletedAt: false, }, }), ) @@ -289,7 +289,7 @@ describe('Creation', () => { currentPage: 1, pageSize: 25, emailChecked: true, - isDeleted: false, + deletedAt: false, }, }), ) @@ -306,7 +306,7 @@ describe('Creation', () => { currentPage: 2, pageSize: 25, emailChecked: true, - isDeleted: false, + deletedAt: false, }, }), ) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 6657b5915..30900a468 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -103,7 +103,7 @@ export default { currentPage: this.currentPage, pageSize: this.perPage, emailChecked: true, - isDeleted: false, + deletedAt: false, }, fetchPolicy: 'network-only', }) diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js index 18950c46a..907cbd7e0 100644 --- a/admin/src/pages/UserSearch.spec.js +++ b/admin/src/pages/UserSearch.spec.js @@ -83,7 +83,7 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, emailChecked: null, - isDeleted: null, + deletedAt: null, }, }), ) @@ -102,7 +102,7 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, emailChecked: true, - isDeleted: null, + deletedAt: null, }, }), ) @@ -122,7 +122,7 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, emailChecked: null, - isDeleted: true, + deletedAt: true, }, }), ) @@ -142,7 +142,7 @@ describe('UserSearch', () => { currentPage: 2, pageSize: 25, emailChecked: null, - isDeleted: null, + deletedAt: null, }, }), ) @@ -162,7 +162,7 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, emailChecked: null, - isDeleted: null, + deletedAt: null, }, }), ) @@ -179,7 +179,7 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, emailChecked: null, - isDeleted: null, + deletedAt: null, }, }), ) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 06abd25aa..e5f584a25 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -86,7 +86,7 @@ export default { currentPage: this.currentPage, pageSize: this.perPage, emailChecked: this.filterCheckedEmails, - isDeleted: this.filterDeletedUser, + deletedAt: this.filterDeletedUser, }, fetchPolicy: 'no-cache', }) diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts index 677d1958b..103152bac 100644 --- a/backend/src/graphql/arg/SearchUsersArgs.ts +++ b/backend/src/graphql/arg/SearchUsersArgs.ts @@ -15,5 +15,5 @@ export default class SearchUsersArgs { emailChecked?: boolean | null @Field(() => Boolean, { nullable: true }) - isDeleted?: boolean | null + deletedAt?: boolean | null } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 2801a2b81..495e6fb3f 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -57,7 +57,7 @@ export class AdminResolver { currentPage = 1, pageSize = 25, emailChecked = null, - isDeleted = null, + deletedAt = null, }: SearchUsersArgs, ): Promise { const userRepository = getCustomRepository(UserRepository) @@ -67,8 +67,8 @@ export class AdminResolver { filterCriteria.push({ emailChecked: emailChecked }) } - if (isDeleted !== null) { - filterCriteria.push({ deletedAt: isDeleted ? Not(IsNull()) : IsNull() }) + if (deletedAt !== null) { + filterCriteria.push({ deletedAt: deletedAt ? Not(IsNull()) : IsNull() }) } const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt'] 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 05/12] 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'] From 0c0bfe1a1034816047c95d04ce2cb33adeaca76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 21 Apr 2022 10:52:11 +0200 Subject: [PATCH 06/12] Rename to filterByActivated and filterByDeleted --- 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 | 5 ++-- backend/src/graphql/arg/SearchUsersArgs.ts | 4 ++-- backend/src/graphql/resolver/AdminResolver.ts | 12 +++++----- 7 files changed, 39 insertions(+), 38 deletions(-) diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index 706927eb1..34c962678 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 - $withActivated: Boolean - $withDeleted: Boolean + $filterByActivated: Boolean + $filterByDeleted: Boolean ) { searchUsers( searchText: $searchText currentPage: $currentPage pageSize: $pageSize - withActivated: $withActivated - withDeleted: $withDeleted + filterByActivated: $filterByActivated + filterByDeleted: $filterByDeleted ) { userCount userList { @@ -24,8 +24,8 @@ export const searchUsers = gql` creation hasElopage emailConfirmationSend - withActivated - withDeleted + filterByActivated + filterByDeleted } } } diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index d1d6f0f2e..98c03d277 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, - withActivated: true, - withDeleted: false, + filterByActivated: true, + filterByDeleted: false, }, }), ) @@ -271,8 +271,8 @@ describe('Creation', () => { searchText: 'XX', currentPage: 1, pageSize: 25, - withActivated: true, - withDeleted: false, + filterByActivated: true, + filterByDeleted: false, }, }), ) @@ -288,8 +288,8 @@ describe('Creation', () => { searchText: '', currentPage: 1, pageSize: 25, - withActivated: true, - withDeleted: false, + filterByActivated: true, + filterByDeleted: false, }, }), ) @@ -305,8 +305,8 @@ describe('Creation', () => { searchText: '', currentPage: 2, pageSize: 25, - withActivated: true, - withDeleted: false, + filterByActivated: true, + filterByDeleted: false, }, }), ) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 76d6077f5..54bc0d735 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, - withActivated: true, - withDeleted: false, + filterByActivated: true, + filterByDeleted: false, }, fetchPolicy: 'network-only', }) diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js index 602852608..2eb24f84b 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, - withActivated: null, - withDeleted: null, + filterByActivated: null, + filterByDeleted: null, }, }), ) @@ -101,8 +101,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - withActivated: true, - withDeleted: null, + filterByActivated: false, + filterByDeleted: null, }, }), ) @@ -121,8 +121,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - withActivated: null, - withDeleted: true, + filterByActivated: null, + filterByDeleted: true, }, }), ) @@ -141,8 +141,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 2, pageSize: 25, - withActivated: null, - withDeleted: null, + filterByActivated: null, + filterByDeleted: null, }, }), ) @@ -161,8 +161,8 @@ describe('UserSearch', () => { searchText: 'search string', currentPage: 1, pageSize: 25, - withActivated: null, - withDeleted: null, + filterByActivated: null, + filterByDeleted: null, }, }), ) @@ -178,8 +178,8 @@ describe('UserSearch', () => { searchText: '', currentPage: 1, pageSize: 25, - withActivated: null, - withDeleted: null, + filterByActivated: null, + filterByDeleted: null, }, }), ) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index f0bf60ae1..8a0a4b86f 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -3,6 +3,7 @@
+ {{ filterCheckedEmails ? $t('unregistered_emails') : $t('all_emails') }} @@ -85,8 +86,8 @@ export default { searchText: this.criteria, currentPage: this.currentPage, pageSize: this.perPage, - withActivated: this.filterCheckedEmails, - withDeleted: this.filterDeletedUser, + filterByActivated: this.filterCheckedEmails, // Wolle: check logic + filterByDeleted: this.filterDeletedUser, }, fetchPolicy: 'no-cache', }) diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts index fab17e527..b47f39d56 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 }) - withActivated?: boolean | null + filterByActivated?: boolean | null @Field(() => Boolean, { nullable: true }) - withDeleted?: boolean | null + filterByDeleted?: boolean | null } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index bdb078ad1..7cc578a87 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, - withActivated = null, - withDeleted = null, + filterByActivated = null, + filterByDeleted = null, }: SearchUsersArgs, ): Promise { const userRepository = getCustomRepository(UserRepository) const filterCriteria: ObjectLiteral[] = [] - if (withActivated !== null) { - filterCriteria.push({ withActivated: withActivated }) + if (filterByActivated !== null) { + filterCriteria.push({ filterByActivated: filterByActivated }) } - if (withDeleted !== null) { - filterCriteria.push({ withDeleted: withDeleted ? Not(IsNull()) : IsNull() }) + if (filterByDeleted !== null) { + filterCriteria.push({ filterByDeleted: filterByDeleted ? Not(IsNull()) : IsNull() }) } const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt'] From 206737581fd1f58e423a3f90a2967e29f835acdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 21 Apr 2022 11:05:13 +0200 Subject: [PATCH 07/12] Fix logic of filterByActivated - Fix test with this. --- admin/src/pages/UserSearch.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 8a0a4b86f..44d3e4a03 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -3,8 +3,13 @@
- - {{ filterCheckedEmails ? $t('unregistered_emails') : $t('all_emails') }} + {{ + filterByActivated === null + ? $t('all_emails') + : filterByActivated === false + ? $t('unregistered_emails') + : '' + }} @@ -61,7 +66,7 @@ export default { searchResult: [], massCreation: [], criteria: '', - filterCheckedEmails: null, + filterByActivated: null, filterDeletedUser: null, rows: 0, currentPage: 1, @@ -71,7 +76,7 @@ export default { }, methods: { unconfirmedRegisterMails() { - this.filterCheckedEmails = this.filterCheckedEmails ? null : true + this.filterByActivated = this.filterByActivated === null ? false : null this.getUsers() }, deletedUserSearch() { @@ -86,7 +91,7 @@ export default { searchText: this.criteria, currentPage: this.currentPage, pageSize: this.perPage, - filterByActivated: this.filterCheckedEmails, // Wolle: check logic + filterByActivated: this.filterByActivated, filterByDeleted: this.filterDeletedUser, }, fetchPolicy: 'no-cache', From 0bf18a4f2b2c2f1cdaa3eb89e305a24a0e6e17d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 21 Apr 2022 11:08:28 +0200 Subject: [PATCH 08/12] Revert unintenionally renamimngs --- admin/src/graphql/searchUsers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index 34c962678..ddf759031 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -22,10 +22,10 @@ export const searchUsers = gql` lastName email creation + emailChecked hasElopage emailConfirmationSend - filterByActivated - filterByDeleted + deletedAt } } } From e67a04b30f0bb6c63896ba08893c8164fcde4c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 21 Apr 2022 11:21:14 +0200 Subject: [PATCH 09/12] Renamed filterDeletedUser to filterByDeleted - Clarify logic. --- admin/src/pages/UserSearch.vue | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 44d3e4a03..f8ceac36c 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -13,7 +13,13 @@ - {{ filterDeletedUser ? $t('deleted_user') : $t('all_emails') }} + {{ + filterByDeleted === null + ? $t('all_emails') + : filterByDeleted === true + ? $t('deleted_user') + : '' + }}
@@ -67,7 +73,7 @@ export default { massCreation: [], criteria: '', filterByActivated: null, - filterDeletedUser: null, + filterByDeleted: null, rows: 0, currentPage: 1, perPage: 25, @@ -80,7 +86,7 @@ export default { this.getUsers() }, deletedUserSearch() { - this.filterDeletedUser = this.filterDeletedUser ? null : true + this.filterByDeleted = this.filterByDeleted === null ? true : null this.getUsers() }, getUsers() { @@ -92,7 +98,7 @@ export default { currentPage: this.currentPage, pageSize: this.perPage, filterByActivated: this.filterByActivated, - filterByDeleted: this.filterDeletedUser, + filterByDeleted: this.filterByDeleted, }, fetchPolicy: 'no-cache', }) From 778c9568e6ef43e6ebfe00e3a1cf12ecb388ad59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 28 Apr 2022 10:48:50 +0200 Subject: [PATCH 10/12] Resolved Ulf's error detection --- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index bac58bbb4..84f7519f5 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -64,11 +64,11 @@ export class AdminResolver { const filterCriteria: ObjectLiteral[] = [] if (filterByActivated !== null) { - filterCriteria.push({ filterByActivated: filterByActivated }) + filterCriteria.push({ emailChecked: filterByActivated }) } if (filterByDeleted !== null) { - filterCriteria.push({ filterByDeleted: filterByDeleted ? Not(IsNull()) : IsNull() }) + filterCriteria.push({ deletedAt: filterByDeleted ? Not(IsNull()) : IsNull() }) } const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt'] From 2041951e4245ce1fdbfb7c309933b475dd8a6b89 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 28 Apr 2022 15:49:08 +0200 Subject: [PATCH 11/12] devops: Disable DB reset on stage 1 --- deployment/bare_metal/start.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 95b89241f..8d75e11b8 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -105,7 +105,8 @@ yarn install yarn build if [ "$DEPLOY_SEED_DATA" = "true" ]; then yarn dev_up - yarn dev_reset +# As de_reset is not running properly (0019-replace_login_user_id_with_state_user_id) +# yarn dev_reset else yarn up fi From 856ee5cc0ac729c1af7352c4d7d020e9ef77e3e5 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 28 Apr 2022 15:58:01 +0200 Subject: [PATCH 12/12] Update deployment/bare_metal/start.sh --- deployment/bare_metal/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 8d75e11b8..b608952c0 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -105,7 +105,7 @@ yarn install yarn build if [ "$DEPLOY_SEED_DATA" = "true" ]; then yarn dev_up -# As de_reset is not running properly (0019-replace_login_user_id_with_state_user_id) +# As dev_reset is not running properly (0019-replace_login_user_id_with_state_user_id) # yarn dev_reset else yarn up