Merge branch 'master' into seed-garrick-ollivander

admin/src/components/CreationTransactionListFormular.spec.js

@@ -58,9 +58,7 @@ const mocks = {
     query: apolloQueryMock,
   },
   $toasted: {
-    global: {
+    error: toastedErrorMock,
-      error: toastedErrorMock,
-    },
   },
 }
 

admin/src/components/CreationTransactionListFormular.vue

@@ -33,7 +33,7 @@ export default {
           this.items = result.data.transactionList.transactions
         })
         .catch((error) => {
-          this.$toasted.global.error(error.message)
+          this.$toasted.error(error.message)
         })
     },
   },

admin/src/components/UserTable.spec.js

@@ -3,6 +3,9 @@ import UserTable from './UserTable.vue'
 
 const localVue = global.localVue
 
+const apolloQueryMock = jest.fn()
+apolloQueryMock.mockResolvedValue()
+
 describe('UserTable', () => {
   let wrapper
 
@@ -114,6 +117,12 @@ describe('UserTable', () => {
         }),
       }
     }),
+    $apollo: {
+      query: apolloQueryMock,
+    },
+    $store: {
+      commit: jest.fn(),
+    },
   }
 
   const Wrapper = (propsData) => {

admin/src/pages/UserSearch.vue

@@ -42,15 +42,13 @@ export default {
         { key: 'lastName', label: this.$t('lastname') },
         {
           key: 'creation',
-          // label: this.$t('open_creation') + 'Jan | Feb | März',
+          label: [
-          label:
+            this.$moment().subtract(2, 'month').format('MMM'),
-            this.$moment().subtract(2, 'month').format('MMM') +
+            this.$moment().subtract(1, 'month').format('MMM'),
-            ' | ' +
-            this.$moment().subtract(1, 'month').format('MMM') +
-            ' | ' +
             this.$moment().format('MMM'),
+          ].join(' | '),
           formatter: (value, key, item) => {
-            return String(value[0]) + ` | ` + String(value[1]) + ` |  ` + String(value[2])
+            return value.join(' | ')
           },
         },
         { key: 'show_details', label: this.$t('details') },

backend/src/graphql/resolver/AdminResolver.ts

@@ -65,9 +65,9 @@ export class AdminResolver {
       loginPendingTaskAdmin.memo = memo
       loginPendingTaskAdmin.moderator = moderator
 
-      loginPendingTasksAdminRepository.save(loginPendingTaskAdmin)
+      await loginPendingTasksAdminRepository.save(loginPendingTaskAdmin)
     }
-    return await getUserCreations(user.id)
+    return getUserCreations(user.id)
   }
 
   @Authorized([RIGHTS.CREATE_PENDING_CREATION])