Refactor frontend user search to refactored resolver

This commit is contained in:
Wolfgang Huß 2022-05-19 10:58:48 +02:00
parent 3ba19359a3
commit 762bdfc505
3 changed files with 30 additions and 18 deletions

View File

@ -5,15 +5,13 @@ export const searchUsers = gql`
$searchText: String!
$currentPage: Int
$pageSize: Int
$filterByActivated: Boolean
$filterByDeleted: Boolean
$filters: SearchUsersFiltersInput
) {
searchUsers(
searchText: $searchText
currentPage: $currentPage
pageSize: $pageSize
filterByActivated: $filterByActivated # Wolle: put in 'filters' object?
filterByDeleted: $filterByDeleted
filters: $filters
) {
userCount
userList {

View File

@ -82,8 +82,10 @@ describe('UserSearch', () => {
searchText: '',
currentPage: 1,
pageSize: 25,
filterByActivated: null, // Wolle: put in 'filters' object?
filterByDeleted: null,
filters: {
filterByActivated: null,
filterByDeleted: null,
},
},
}),
)
@ -101,8 +103,10 @@ describe('UserSearch', () => {
searchText: '',
currentPage: 1,
pageSize: 25,
filterByActivated: false, // Wolle: put in 'filters' object?
filterByDeleted: null,
filters: {
filterByActivated: false,
filterByDeleted: null,
},
},
}),
)
@ -121,8 +125,10 @@ describe('UserSearch', () => {
searchText: '',
currentPage: 1,
pageSize: 25,
filterByActivated: null, // Wolle: put in 'filters' object?
filterByDeleted: true,
filters: {
filterByActivated: null,
filterByDeleted: true,
},
},
}),
)
@ -141,8 +147,10 @@ describe('UserSearch', () => {
searchText: '',
currentPage: 2,
pageSize: 25,
filterByActivated: null, // Wolle: put in 'filters' object?
filterByDeleted: null,
filters: {
filterByActivated: null,
filterByDeleted: null,
},
},
}),
)
@ -161,8 +169,10 @@ describe('UserSearch', () => {
searchText: 'search string',
currentPage: 1,
pageSize: 25,
filterByActivated: null, // Wolle: put in 'filters' object?
filterByDeleted: null,
filters: {
filterByActivated: null,
filterByDeleted: null,
},
},
}),
)
@ -178,8 +188,10 @@ describe('UserSearch', () => {
searchText: '',
currentPage: 1,
pageSize: 25,
filterByActivated: null, // Wolle: put in 'filters' object?
filterByDeleted: null,
filters: {
filterByActivated: null,
filterByDeleted: null,
},
},
}),
)

View File

@ -97,8 +97,10 @@ export default {
searchText: this.criteria,
currentPage: this.currentPage,
pageSize: this.perPage,
filterByActivated: this.filterByActivated, // Wolle: put in 'filters' object?
filterByDeleted: this.filterByDeleted,
filters: {
filterByActivated: this.filterByActivated,
filterByDeleted: this.filterByDeleted,
},
},
fetchPolicy: 'no-cache',
})