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

Replace notActivated by isEmailChecked

Browse Source
This commit is contained in:
Wolfgang Huß 2022-04-19 14:43:25 +02:00
parent 111b32cb11
commit 145989e284
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/graphql/searchUsers.js
View File

@ -5,14 +5,14 @@ export const searchUsers = gql`
$searchText: String! $searchText: String!
$currentPage: Int $currentPage: Int
$pageSize: Int $pageSize: Int
$notActivated: Boolean $isEmailChecked: Boolean
$isDeleted: Boolean $isDeleted: Boolean
) { ) {
searchUsers( searchUsers(
searchText: $searchText searchText: $searchText
currentPage: $currentPage currentPage: $currentPage
pageSize: $pageSize pageSize: $pageSize
notActivated: $notActivated isEmailChecked: $isEmailChecked
isDeleted: $isDeleted isDeleted: $isDeleted
) { ) {
userCount userCount

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

@ -71,8 +71,8 @@ describe('Creation', () => {
searchText: '', searchText: '',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
isEmailChecked: true,
isDeleted: false, isDeleted: false,
notActivated: false,
}, },
}), }),
) )
@ -271,8 +271,8 @@ describe('Creation', () => {
searchText: 'XX', searchText: 'XX',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
isEmailChecked: true,
isDeleted: false, isDeleted: false,
notActivated: false,
}, },
}), }),
) )
@ -288,8 +288,8 @@ describe('Creation', () => {
searchText: '', searchText: '',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
isEmailChecked: true,
isDeleted: false, isDeleted: false,
notActivated: false,
}, },
}), }),
) )
@ -305,8 +305,8 @@ describe('Creation', () => {
searchText: '', searchText: '',
currentPage: 2, currentPage: 2,
pageSize: 25, pageSize: 25,
isEmailChecked: true,
isDeleted: false, isDeleted: false,
notActivated: false,
}, },
}), }),
) )

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

@ -102,7 +102,7 @@ export default {
searchText: this.criteria, searchText: this.criteria,
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: this.perPage, pageSize: this.perPage,
notActivated: false, isEmailChecked: true,
isDeleted: false, isDeleted: false,
}, },
fetchPolicy: 'network-only', fetchPolicy: 'network-only',

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

@ -82,7 +82,7 @@ describe('UserSearch', () => {
searchText: '', searchText: '',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
notActivated: null, isEmailChecked: null,
isDeleted: null, isDeleted: null,
}, },
}), }),
@ -101,7 +101,7 @@ describe('UserSearch', () => {
searchText: '', searchText: '',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
notActivated: true, isEmailChecked: false,
isDeleted: null, isDeleted: null,
}, },
}), }),
@ -121,7 +121,7 @@ describe('UserSearch', () => {
searchText: '', searchText: '',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
notActivated: null, isEmailChecked: null,
isDeleted: true, isDeleted: true,
}, },
}), }),
@ -141,7 +141,7 @@ describe('UserSearch', () => {
searchText: '', searchText: '',
currentPage: 2, currentPage: 2,
pageSize: 25, pageSize: 25,
notActivated: null, isEmailChecked: null,
isDeleted: null, isDeleted: null,
}, },
}), }),
@ -161,7 +161,7 @@ describe('UserSearch', () => {
searchText: 'search string', searchText: 'search string',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
notActivated: null, isEmailChecked: null,
isDeleted: null, isDeleted: null,
}, },
}), }),
@ -178,7 +178,7 @@ describe('UserSearch', () => {
searchText: '', searchText: '',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
notActivated: null, isEmailChecked: null,
isDeleted: null, isDeleted: null,
}, },
}), }),

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

@ -85,7 +85,7 @@ export default {
searchText: this.criteria, searchText: this.criteria,
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: this.perPage, pageSize: this.perPage,
notActivated: this.filterCheckedEmails, isEmailChecked: !this.filterCheckedEmails, // Wolle: has this boolean really to be negated as well?
isDeleted: this.filterDeletedUser, isDeleted: this.filterDeletedUser,
}, },
fetchPolicy: 'no-cache', fetchPolicy: 'no-cache',

2
backend/src/graphql/arg/SearchUsersArgs.ts
View File

@ -12,7 +12,7 @@ export default class SearchUsersArgs {
pageSize?: number pageSize?: number
@Field(() => Boolean, { nullable: true }) @Field(() => Boolean, { nullable: true })
notActivated?: boolean | null isEmailChecked?: boolean | null
@Field(() => Boolean, { nullable: true }) @Field(() => Boolean, { nullable: true })
isDeleted?: boolean | null isDeleted?: boolean | null

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

@ -56,15 +56,15 @@ export class AdminResolver {
searchText, searchText,
currentPage = 1, currentPage = 1,
pageSize = 25, pageSize = 25,
notActivated = null, isEmailChecked = null,
isDeleted = null, isDeleted = null,
}: SearchUsersArgs, }: SearchUsersArgs,
): Promise<SearchUsersResult> { ): Promise<SearchUsersResult> {
const userRepository = getCustomRepository(UserRepository) const userRepository = getCustomRepository(UserRepository)
const filterCriteria: ObjectLiteral[] = [] const filterCriteria: ObjectLiteral[] = []
if (notActivated !== null) { if (isEmailChecked !== null) {
filterCriteria.push({ emailChecked: !notActivated }) filterCriteria.push({ emailChecked: isEmailChecked })
} }
if (isDeleted !== null) { if (isDeleted !== null) {