Merge branch 'master' into test-admin-resolver

admin/src/graphql/searchUsers.js

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

admin/src/pages/Creation.spec.js

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

admin/src/pages/Creation.vue

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

admin/src/pages/UserSearch.spec.js

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

admin/src/pages/UserSearch.vue

@@ -3,11 +3,23 @@
     <div class="user-search-first-div">
       <b-button class="unconfirmedRegisterMails" variant="light" @click="unconfirmedRegisterMails">
         <b-icon icon="envelope" variant="danger"></b-icon>
-        {{ filterCheckedEmails ? $t('unregistered_emails') : $t('all_emails') }}
+        {{
+          filterByActivated === null
+            ? $t('all_emails')
+            : filterByActivated === false
+            ? $t('unregistered_emails')
+            : ''
+        }}
       </b-button>
       <b-button class="deletedUserSearch" variant="light" @click="deletedUserSearch">
         <b-icon icon="x-circle" variant="danger"></b-icon>
-        {{ filterDeletedUser ? $t('deleted_user') : $t('all_emails') }}
+        {{
+          filterByDeleted === null
+            ? $t('all_emails')
+            : filterByDeleted === true
+            ? $t('deleted_user')
+            : ''
+        }}
       </b-button>
     </div>
     <label>{{ $t('user_search') }}</label>
@@ -60,8 +72,8 @@ export default {
       searchResult: [],
       massCreation: [],
       criteria: '',
-      filterCheckedEmails: null,
+      filterByActivated: null,
-      filterDeletedUser: null,
+      filterByDeleted: null,
       rows: 0,
       currentPage: 1,
       perPage: 25,
@@ -70,11 +82,11 @@ export default {
   },
   methods: {
     unconfirmedRegisterMails() {
-      this.filterCheckedEmails = this.filterCheckedEmails ? null : true
+      this.filterByActivated = this.filterByActivated === null ? false : null
       this.getUsers()
     },
     deletedUserSearch() {
-      this.filterDeletedUser = this.filterDeletedUser ? null : true
+      this.filterByDeleted = this.filterByDeleted === null ? true : null
       this.getUsers()
     },
     getUsers() {
@@ -85,8 +97,8 @@ export default {
             searchText: this.criteria,
             currentPage: this.currentPage,
             pageSize: this.perPage,
-            notActivated: this.filterCheckedEmails,
+            filterByActivated: this.filterByActivated,
-            isDeleted: this.filterDeletedUser,
+            filterByDeleted: this.filterByDeleted,
           },
           fetchPolicy: 'no-cache',
         })

backend/src/graphql/arg/SearchUsersArgs.ts

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

backend/src/graphql/resolver/AdminResolver.ts

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

deployment/bare_metal/start.sh

@@ -105,7 +105,8 @@ yarn install
 yarn build
 if [ "$DEPLOY_SEED_DATA" = "true" ]; then
   yarn dev_up
-  yarn dev_reset
+# As dev_reset is not running properly (0019-replace_login_user_id_with_state_user_id)  
+# yarn dev_reset
 else
   yarn up
 fi