IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename filters properties

Browse Source
This commit is contained in:
Wolfgang Huß 2022-05-19 17:09:40 +02:00
parent 5373d9747d
commit a9a3f5b55a
8 changed files with 52 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/src/pages/Creation.spec.js
View File

@ -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,
},
}),
)

4
admin/src/pages/Creation.vue
View File

@ -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',
})

24
admin/src/pages/UserSearch.spec.js
View File

@ -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,
},
},
}),

24
admin/src/pages/UserSearch.vue
View File

@ -4,22 +4,16 @@
<b-button class="unconfirmedRegisterMails" variant="light" @click="unconfirmedRegisterMails">
<b-icon icon="envelope" variant="danger"></b-icon>
{{
filterByActivated === null
byActivated === null
? $t('all_emails')
: filterByActivated === false
: byActivated === false
? $t('unregistered_emails')
: ''
}}
</b-button>
<b-button class="deletedUserSearch" variant="light" @click="deletedUserSearch">
<b-icon icon="x-circle" variant="danger"></b-icon>
{{
filterByDeleted === null
? $t('all_emails')
: filterByDeleted === true
? $t('deleted_user')
: ''
}}
{{ byDeleted === null ? $t('all_emails') : byDeleted === true ? $t('deleted_user') : '' }}
</b-button>
</div>
<label>{{ $t('user_search') }}</label>
@ -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',

4
backend/src/graphql/arg/SearchUsersFilters.ts
View File

@ -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
}

6
backend/src/graphql/arg/TransactionLinkFilters.ts
View File

@ -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
}

18
backend/src/graphql/resolver/AdminResolver.test.ts
View File

@ -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,
},
},
}),

14
backend/src/graphql/resolver/AdminResolver.ts
View File

@ -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,
},