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 to filterByActivated and filterByDeleted

Browse Source
This commit is contained in:
Wolfgang Huß 2022-04-21 10:52:11 +02:00
parent 621786c91d
commit 0c0bfe1a10
7 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,15 +5,15 @@ export const searchUsers = gql`
$searchText: String! $searchText: String!
$currentPage: Int $currentPage: Int
$pageSize: Int $pageSize: Int
$withActivated: Boolean $filterByActivated: Boolean
$withDeleted: Boolean $filterByDeleted: Boolean
) { ) {
searchUsers( searchUsers(
searchText: $searchText searchText: $searchText
currentPage: $currentPage currentPage: $currentPage
pageSize: $pageSize pageSize: $pageSize
withActivated: $withActivated filterByActivated: $filterByActivated
withDeleted: $withDeleted filterByDeleted: $filterByDeleted
) { ) {
userCount userCount
userList { userList {
@ -24,8 +24,8 @@ export const searchUsers = gql`
creation creation
hasElopage hasElopage
emailConfirmationSend emailConfirmationSend
withActivated filterByActivated
withDeleted filterByDeleted
} }
} }
} }

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

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

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

@ -102,8 +102,8 @@ export default {
searchText: this.criteria, searchText: this.criteria,
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: this.perPage, pageSize: this.perPage,
withActivated: true, filterByActivated: true,
withDeleted: false, filterByDeleted: false,
}, },
fetchPolicy: 'network-only', fetchPolicy: 'network-only',
}) })

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

@ -82,8 +82,8 @@ describe('UserSearch', () => {
searchText: '', searchText: '',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
withActivated: null, filterByActivated: null,
withDeleted: null, filterByDeleted: null,
}, },
}), }),
) )
@ -101,8 +101,8 @@ describe('UserSearch', () => {
searchText: '', searchText: '',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
withActivated: true, filterByActivated: false,
withDeleted: null, filterByDeleted: null,
}, },
}), }),
) )
@ -121,8 +121,8 @@ describe('UserSearch', () => {
searchText: '', searchText: '',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
withActivated: null, filterByActivated: null,
withDeleted: true, filterByDeleted: true,
}, },
}), }),
) )
@ -141,8 +141,8 @@ describe('UserSearch', () => {
searchText: '', searchText: '',
currentPage: 2, currentPage: 2,
pageSize: 25, pageSize: 25,
withActivated: null, filterByActivated: null,
withDeleted: null, filterByDeleted: null,
}, },
}), }),
) )
@ -161,8 +161,8 @@ describe('UserSearch', () => {
searchText: 'search string', searchText: 'search string',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
withActivated: null, filterByActivated: null,
withDeleted: null, filterByDeleted: null,
}, },
}), }),
) )
@ -178,8 +178,8 @@ describe('UserSearch', () => {
searchText: '', searchText: '',
currentPage: 1, currentPage: 1,
pageSize: 25, pageSize: 25,
withActivated: null, filterByActivated: null,
withDeleted: null, filterByDeleted: null,
}, },
}), }),
) )

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

@ -3,6 +3,7 @@
<div class="user-search-first-div"> <div class="user-search-first-div">
<b-button class="unconfirmedRegisterMails" variant="light" @click="unconfirmedRegisterMails"> <b-button class="unconfirmedRegisterMails" variant="light" @click="unconfirmedRegisterMails">
<b-icon icon="envelope" variant="danger"></b-icon> <b-icon icon="envelope" variant="danger"></b-icon>
<!-- Wolle: check logic -->
{{ filterCheckedEmails ? $t('unregistered_emails') : $t('all_emails') }} {{ filterCheckedEmails ? $t('unregistered_emails') : $t('all_emails') }}
</b-button> </b-button>
<b-button class="deletedUserSearch" variant="light" @click="deletedUserSearch"> <b-button class="deletedUserSearch" variant="light" @click="deletedUserSearch">
@ -85,8 +86,8 @@ export default {
searchText: this.criteria, searchText: this.criteria,
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: this.perPage, pageSize: this.perPage,
withActivated: this.filterCheckedEmails, filterByActivated: this.filterCheckedEmails, // Wolle: check logic
withDeleted: this.filterDeletedUser, filterByDeleted: this.filterDeletedUser,
}, },
fetchPolicy: 'no-cache', fetchPolicy: 'no-cache',
}) })

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

@ -12,8 +12,8 @@ export default class SearchUsersArgs {
pageSize?: number pageSize?: number
@Field(() => Boolean, { nullable: true }) @Field(() => Boolean, { nullable: true })
withActivated?: boolean | null filterByActivated?: boolean | null
@Field(() => Boolean, { nullable: true }) @Field(() => Boolean, { nullable: true })
withDeleted?: boolean | null filterByDeleted?: boolean | null
} }

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

@ -56,19 +56,19 @@ export class AdminResolver {
searchText, searchText,
currentPage = 1, currentPage = 1,
pageSize = 25, pageSize = 25,
withActivated = null, filterByActivated = null,
withDeleted = null, filterByDeleted = null,
}: SearchUsersArgs, }: SearchUsersArgs,
): Promise<SearchUsersResult> { ): Promise<SearchUsersResult> {
const userRepository = getCustomRepository(UserRepository) const userRepository = getCustomRepository(UserRepository)
const filterCriteria: ObjectLiteral[] = [] const filterCriteria: ObjectLiteral[] = []
if (withActivated !== null) { if (filterByActivated !== null) {
filterCriteria.push({ withActivated: withActivated }) filterCriteria.push({ filterByActivated: filterByActivated })
} }
if (withDeleted !== null) { if (filterByDeleted !== null) {
filterCriteria.push({ withDeleted: withDeleted ? Not(IsNull()) : IsNull() }) filterCriteria.push({ filterByDeleted: filterByDeleted ? Not(IsNull()) : IsNull() })
} }
const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt'] const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt']