diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index 98c03d277..47a111215 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, - filterByActivated: true, - filterByDeleted: false, + byActivated: true, // Wolle: used 'filters' object? + byDeleted: false, }, }), ) @@ -271,8 +271,8 @@ describe('Creation', () => { searchText: 'XX', currentPage: 1, pageSize: 25, - filterByActivated: true, - filterByDeleted: false, + byActivated: true, // Wolle: used 'filters' object? + byDeleted: false, }, }), ) @@ -288,8 +288,8 @@ describe('Creation', () => { searchText: '', currentPage: 1, pageSize: 25, - filterByActivated: true, - filterByDeleted: false, + byActivated: true, // Wolle: used 'filters' object? + byDeleted: false, }, }), ) @@ -305,8 +305,8 @@ describe('Creation', () => { searchText: '', currentPage: 2, pageSize: 25, - filterByActivated: true, - filterByDeleted: false, + byActivated: true, // Wolle: used 'filters' object? + byDeleted: false, }, }), ) diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 54bc0d735..8d3f3edaa 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, - filterByActivated: true, - filterByDeleted: false, + byActivated: true, // Wolle: used 'filters' object? + byDeleted: false, }, fetchPolicy: 'network-only', }) diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js index 1a23b4292..e990fd0ad 100644 --- a/admin/src/pages/UserSearch.spec.js +++ b/admin/src/pages/UserSearch.spec.js @@ -83,8 +83,8 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, filters: { - filterByActivated: null, - filterByDeleted: null, + byActivated: null, + byDeleted: null, }, }, }), @@ -104,8 +104,8 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, filters: { - filterByActivated: false, - filterByDeleted: null, + byActivated: false, + byDeleted: null, }, }, }), @@ -126,8 +126,8 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, filters: { - filterByActivated: null, - filterByDeleted: true, + byActivated: null, + byDeleted: true, }, }, }), @@ -148,8 +148,8 @@ describe('UserSearch', () => { currentPage: 2, pageSize: 25, filters: { - filterByActivated: null, - filterByDeleted: null, + byActivated: null, + byDeleted: null, }, }, }), @@ -170,8 +170,8 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, filters: { - filterByActivated: null, - filterByDeleted: null, + byActivated: null, + byDeleted: null, }, }, }), @@ -189,8 +189,8 @@ describe('UserSearch', () => { currentPage: 1, pageSize: 25, filters: { - filterByActivated: null, - filterByDeleted: null, + byActivated: null, + byDeleted: null, }, }, }), diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 7b638c316..29ead3e25 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -4,22 +4,16 @@ {{ - filterByActivated === null + byActivated === null ? $t('all_emails') - : filterByActivated === false + : byActivated === false ? $t('unregistered_emails') : '' }} - {{ - filterByDeleted === null - ? $t('all_emails') - : filterByDeleted === true - ? $t('deleted_user') - : '' - }} + {{ byDeleted === null ? $t('all_emails') : byDeleted === true ? $t('deleted_user') : '' }} @@ -72,8 +66,8 @@ export default { searchResult: [], massCreation: [], criteria: '', - filterByActivated: null, - filterByDeleted: null, + byActivated: null, // Wolle: used 'filters' object? + byDeleted: null, rows: 0, currentPage: 1, perPage: 25, @@ -82,11 +76,11 @@ export default { }, methods: { unconfirmedRegisterMails() { - this.filterByActivated = this.filterByActivated === null ? false : null + this.byActivated = this.byActivated === null ? false : null this.getUsers() }, deletedUserSearch() { - this.filterByDeleted = this.filterByDeleted === null ? true : null + this.byDeleted = this.byDeleted === null ? true : null this.getUsers() }, getUsers() { @@ -98,8 +92,8 @@ export default { currentPage: this.currentPage, pageSize: this.perPage, filters: { - filterByActivated: this.filterByActivated, - filterByDeleted: this.filterByDeleted, + byActivated: this.byActivated, + byDeleted: this.byDeleted, }, }, fetchPolicy: 'no-cache', diff --git a/backend/src/graphql/arg/SearchUsersFilters.ts b/backend/src/graphql/arg/SearchUsersFilters.ts index de7c7c20a..8cc1426b3 100644 --- a/backend/src/graphql/arg/SearchUsersFilters.ts +++ b/backend/src/graphql/arg/SearchUsersFilters.ts @@ -4,8 +4,8 @@ import { Field, InputType, ObjectType } from 'type-graphql' @InputType('SearchUsersFiltersInput') export default class SearchUsersFilters { @Field(() => Boolean, { nullable: true, defaultValue: null }) - filterByActivated?: boolean | null + byActivated?: boolean | null @Field(() => Boolean, { nullable: true, defaultValue: null }) - filterByDeleted?: boolean | null + byDeleted?: boolean | null } diff --git a/backend/src/graphql/arg/TransactionLinkFilters.ts b/backend/src/graphql/arg/TransactionLinkFilters.ts index b009a3180..98c12703e 100644 --- a/backend/src/graphql/arg/TransactionLinkFilters.ts +++ b/backend/src/graphql/arg/TransactionLinkFilters.ts @@ -3,11 +3,11 @@ import { ArgsType, Field } from 'type-graphql' @ArgsType() export default class TransactionLinkFilters { @Field(() => Boolean, { nullable: true, defaultValue: true }) - filterByDeleted?: boolean + byDeleted?: boolean @Field(() => Boolean, { nullable: true, defaultValue: true }) - filterByExpired?: boolean + byExpired?: boolean @Field(() => Boolean, { nullable: true, defaultValue: true }) - filterByRedeemed?: boolean + byRedeemed?: boolean } diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index 1df80aa1a..b4a4f0d46 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -373,15 +373,15 @@ describe('AdminResolver', () => { ) }) - it('all users by "filterByActivated === null && filterByDeleted === null"', async () => { + it('all users by "byActivated === null && byDeleted === null"', async () => { await expect( query({ query: searchUsers, variables: { ...variablesWithoutTextAndFilters, filters: { - filterByActivated: null, - filterByDeleted: null, + byActivated: null, + byDeleted: null, }, }, }), @@ -404,8 +404,8 @@ describe('AdminResolver', () => { variables: { ...variablesWithoutTextAndFilters, filters: { - filterByActivated: false, - filterByDeleted: null, + byActivated: false, + byDeleted: null, }, }, }), @@ -428,8 +428,8 @@ describe('AdminResolver', () => { variables: { ...variablesWithoutTextAndFilters, filters: { - filterByActivated: null, - filterByDeleted: true, + byActivated: null, + byDeleted: true, }, }, }), @@ -452,8 +452,8 @@ describe('AdminResolver', () => { variables: { ...variablesWithoutTextAndFilters, filters: { - filterByActivated: false, - filterByDeleted: true, + byActivated: false, + byDeleted: true, }, }, }), diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index fe4075cd1..0cf57ac53 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -57,12 +57,12 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const filterCriteria: ObjectLiteral[] = [] - if (filters && filters.filterByActivated !== null) { - filterCriteria.push({ emailChecked: filters.filterByActivated }) + if (filters && filters.byActivated !== null) { + filterCriteria.push({ emailChecked: filters.byActivated }) } - if (filters && filters.filterByDeleted !== null) { - filterCriteria.push({ deletedAt: filters.filterByDeleted ? Not(IsNull()) : IsNull() }) + if (filters && filters.byDeleted !== null) { + filterCriteria.push({ deletedAt: filters.byDeleted ? Not(IsNull()) : IsNull() }) } const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt'] @@ -436,11 +436,11 @@ export class AdminResolver { } = { userId, } - if (!filters.filterByRedeemed) where.redeemedBy = null - if (!filters.filterByExpired) where.validUntil = MoreThan(new Date()) + if (!filters.byRedeemed) where.redeemedBy = null + if (!filters.byExpired) where.validUntil = MoreThan(new Date()) const [transactionLinks, count] = await dbTransactionLink.findAndCount({ where, - withDeleted: filters.filterByDeleted, + withDeleted: filters.byDeleted, order: { createdAt: order, },