Rename to filterByActivated and filterByDeleted

admin/src/graphql/searchUsers.js

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

admin/src/pages/Creation.spec.js

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

admin/src/pages/Creation.vue

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

admin/src/pages/UserSearch.spec.js

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

admin/src/pages/UserSearch.vue

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

backend/src/graphql/arg/SearchUsersArgs.ts

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

backend/src/graphql/resolver/AdminResolver.ts

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