Replace notActivated by isEmailChecked

admin/src/graphql/searchUsers.js

@@ -5,14 +5,14 @@ export const searchUsers = gql`
     $searchText: String!
     $currentPage: Int
     $pageSize: Int
-    $notActivated: Boolean
+    $isEmailChecked: Boolean
     $isDeleted: Boolean
   ) {
     searchUsers(
       searchText: $searchText
       currentPage: $currentPage
       pageSize: $pageSize
-      notActivated: $notActivated
+      isEmailChecked: $isEmailChecked
       isDeleted: $isDeleted
     ) {
       userCount

admin/src/pages/Creation.spec.js

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

admin/src/pages/Creation.vue

@@ -102,7 +102,7 @@ export default {
             searchText: this.criteria,
             currentPage: this.currentPage,
             pageSize: this.perPage,
-            notActivated: false,
+            isEmailChecked: true,
             isDeleted: false,
           },
           fetchPolicy: 'network-only',

admin/src/pages/UserSearch.spec.js

@@ -82,7 +82,7 @@ describe('UserSearch', () => {
             searchText: '',
             currentPage: 1,
             pageSize: 25,
-            notActivated: null,
+            isEmailChecked: null,
             isDeleted: null,
           },
         }),
@@ -101,7 +101,7 @@ describe('UserSearch', () => {
               searchText: '',
               currentPage: 1,
               pageSize: 25,
-              notActivated: true,
+              isEmailChecked: false,
               isDeleted: null,
             },
           }),
@@ -121,7 +121,7 @@ describe('UserSearch', () => {
               searchText: '',
               currentPage: 1,
               pageSize: 25,
-              notActivated: null,
+              isEmailChecked: null,
               isDeleted: true,
             },
           }),
@@ -141,7 +141,7 @@ describe('UserSearch', () => {
               searchText: '',
               currentPage: 2,
               pageSize: 25,
-              notActivated: null,
+              isEmailChecked: null,
               isDeleted: null,
             },
           }),
@@ -161,7 +161,7 @@ describe('UserSearch', () => {
               searchText: 'search string',
               currentPage: 1,
               pageSize: 25,
-              notActivated: null,
+              isEmailChecked: null,
               isDeleted: null,
             },
           }),
@@ -178,7 +178,7 @@ describe('UserSearch', () => {
                 searchText: '',
                 currentPage: 1,
                 pageSize: 25,
-                notActivated: null,
+                isEmailChecked: null,
                 isDeleted: null,
               },
             }),

admin/src/pages/UserSearch.vue

@@ -85,7 +85,7 @@ export default {
             searchText: this.criteria,
             currentPage: this.currentPage,
             pageSize: this.perPage,
-            notActivated: this.filterCheckedEmails,
+            isEmailChecked: !this.filterCheckedEmails,  // Wolle: has this boolean really to be negated as well?
             isDeleted: this.filterDeletedUser,
           },
           fetchPolicy: 'no-cache',

backend/src/graphql/arg/SearchUsersArgs.ts

@@ -12,7 +12,7 @@ export default class SearchUsersArgs {
   pageSize?: number
 
   @Field(() => Boolean, { nullable: true })
-  notActivated?: boolean | null
+  isEmailChecked?: boolean | null
 
   @Field(() => Boolean, { nullable: true })
   isDeleted?: boolean | null

backend/src/graphql/resolver/AdminResolver.ts

@@ -56,15 +56,15 @@ export class AdminResolver {
       searchText,
       currentPage = 1,
       pageSize = 25,
-      notActivated = null,
+      isEmailChecked = null,
       isDeleted = null,
     }: SearchUsersArgs,
   ): Promise<SearchUsersResult> {
     const userRepository = getCustomRepository(UserRepository)
 
     const filterCriteria: ObjectLiteral[] = []
-    if (notActivated !== null) {
-      filterCriteria.push({ emailChecked: !notActivated })
+    if (isEmailChecked !== null) {
+      filterCriteria.push({ emailChecked: isEmailChecked })
     }
 
     if (isDeleted !== null) {