From 762bdfc505ded7b01ca0c4415dcf4fa5f007a589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 19 May 2022 10:58:48 +0200
Subject: [PATCH] Refactor frontend user search to refactored resolver

---
 admin/src/graphql/searchUsers.js   |  6 ++---
 admin/src/pages/UserSearch.spec.js | 36 ++++++++++++++++++++----------
 admin/src/pages/UserSearch.vue     |  6 +++--
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js
index fc9ac5148..5740e24cc 100644
--- a/admin/src/graphql/searchUsers.js
+++ b/admin/src/graphql/searchUsers.js
@@ -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 {
diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index 079058479..1a23b4292 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -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,
+                },
               },
             }),
           )
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 82eebc0b8..7b638c316 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -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',
         })