From 2ffaaa8bd43831be461101ecd0679fb8eee77397 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 14 Jun 2023 13:45:21 +0200 Subject: [PATCH] fix pagination & adjust to new searchUser query --- admin/src/graphql/searchUsers.js | 13 ++++++++++--- admin/src/pages/UserSearch.vue | 7 ++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index 3e33fe96b..15fb8da32 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -1,12 +1,19 @@ import gql from 'graphql-tag' export const searchUsers = gql` - query ($searchText: String!, $currentPage: Int, $pageSize: Int, $filters: SearchUsersFilters) { + query ( + $query: String! + $filters: SearchUsersFilters + $currentPage: Int = 0 + $pageSize: Int = 25 + $order: Order = ASC + ) { searchUsers( - searchText: $searchText + query: $query + filters: $filters currentPage: $currentPage pageSize: $pageSize - filters: $filters + order: $order ) { userCount userList { diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 8f24181ee..d4e4083c2 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -49,7 +49,7 @@ pills size="lg" v-model="currentPage" - per-page="perPage" + :per-page="perPage" :total-rows="rows" align="center" :hide-ellipsis="true" @@ -97,10 +97,11 @@ export default { .query({ query: searchUsers, variables: { - searchText: this.criteria, + query: this.criteria, + filters: this.filters, currentPage: this.currentPage, pageSize: this.perPage, - filters: this.filters, + order: 'DESC', }, fetchPolicy: 'no-cache', })